policycoreutils: Update rlpkg for ext4 and btrfs.

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

3 files changed, 123 insertions, 5 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index df72bc8cb74b..a87d70c809a2 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.75 2009/09/14 18:25:54 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.76 2009/09/20 23:24:54 pebenito Exp $
+
+*policycoreutils-2.0.69-r1 (20 Sep 2009)
+
+  20 Sep 2009; Chris PeBenito <pebenito@gentoo.org>
+  +policycoreutils-2.0.69-r1.ebuild:
+  Update rlpkg for ext4 and btrfs.
 
   14 Sep 2009; Chris PeBenito <pebenito@gentoo.org>
   policycoreutils-2.0.69.ebuild:
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index bf477f432de7..fafeebf1f161 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -4,14 +4,16 @@ Hash: SHA1
 DIST policycoreutils-2.0.55.tar.gz 306314 RMD160 f4f8e5eec52603e4a23424c7d0e419ee088bcad7 SHA1 b2eacc4d0e520749b182945ca7aebe537ac27ffc SHA256 4f1a880f4784bec8a06241438a854e5b438c039193e53d0c3b1b68324418f19f
 DIST policycoreutils-2.0.69.tar.gz 832883 RMD160 f94527fcf5952d477741d62445cd5a2f593f6c58 SHA1 a82eb4b0208531dee65692919c7b4fd77a68e421 SHA256 bdbe0789885363c47c304758545b75b07a475b1f1b94b7007dd0bda2e4ad2b6b
 DIST policycoreutils-extra-1.19.tar.bz2 19139 RMD160 26a696ce304392f3fb2345cf4937420dbd0cdc16 SHA1 8fd3e22bb58c36eabdd9f18d7c55c8a565a71cb1 SHA256 7461733113f273b297c843cd90447d24110650ed6f1bf2ccd4bc94b4807eac5c
+DIST policycoreutils-extra-1.20.tar.bz2 18532 RMD160 f2f837b6759036581453bb51683d3ee9ca7de01b SHA1 44a1eb06a21217da5c4dcdbdb7204771abe81d4e SHA256 2965e81dd39b0c4b0bb29439c0c8e816e0445ec42699b8a78c3361e988c54cc0
 EBUILD policycoreutils-2.0.55.ebuild 2718 RMD160 cb047ece9f61178a5e742654c80cf3705f889e79 SHA1 2852a3f2f217cc6dc12fc83279d713332e118f9b SHA256 a60a447dcd7f3ad9ecbf4b1ecc0138fc32a68dc6cdf1a68f621141409309204a
+EBUILD policycoreutils-2.0.69-r1.ebuild 2786 RMD160 619f081b0a7466da54848ca101088cf4468c8910 SHA1 b92fc9da95a91d15a119bc57709df9e876e50d1c SHA256 4972c06a38af134e4161065b88a02b4dfeda56992671292a33719fbb47fadf19
 EBUILD policycoreutils-2.0.69.ebuild 2725 RMD160 49560b6518be26a98414db833457fd5791c4b621 SHA1 8aab337ba2e68576a3fa52f055da4b36233d2d06 SHA256 5e097816268950078ffde55882c0297db8ce39d29ec8787b40aef37223d91b99
-MISC ChangeLog 11731 RMD160 2e9febe15eacfcef04d1a4630edc2d552a83559c SHA1 0027aceb905ee369f469e1e3e32e02f9954c703f SHA256 86b62342f2914420cea523639f3fdd28e1de8dc961927295ad30915fe324217b
+MISC ChangeLog 11898 RMD160 44138a97719084bf9c5c89b15c3da7561e856e6d SHA1 ba87d2e49fbe010fbe98c253f24bccd6223e3d6e SHA256 1c1189a441c3923ffb704d02b10f2acf291ea99e6533c402f0558088ba5996ba
 MISC metadata.xml 836 RMD160 421e492e89112f8436f8c5535aa2340cc8795929 SHA1 91c830f5358b9786f2b61e1967214f49212c4e3a SHA256 1d14250f52ecf63b67bed2289833d6f1ff2eba3cad9a80794b356e747917cdb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkquirsACgkQWczwbOluxW+BsACg0LPw4mymcyF2ptap61evcQg9
-mIoAoL4DWUGXtgdZCnObmEXnL0t0I4ds
-=725M
+iEYEARECAAYFAkq2udYACgkQWczwbOluxW8kZQCfeRg/qdXQE/JyMGZHZz1wh+/9
+oeYAnicwTPvTDBRBGmfIGR73LgYR/BcD
+=TLgu
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-2.0.69-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.0.69-r1.ebuild
new file mode 100644
index 000000000000..703cb936e781
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.0.69-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.69-r1.ebuild,v 1.1 2009/09/20 23:24:54 pebenito Exp $
+
+IUSE="nls"
+
+inherit eutils python
+
+EXTRAS_VER="1.20"
+SEMNG_VER="2.0.33"
+SELNX_VER="2.0"
+
+#BUGFIX_PATCH="${FILESDIR}/policycoreutils-2.0.62-po.diff"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/current/devel/${P}.tar.gz
+	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}
+	>=sys-libs/glibc-2.4
+	>=sys-process/audit-1.5.1
+	>=sys-libs/libcap-1.10-r10
+	sys-libs/pam
+	>=sys-libs/libsemanage-${SEMNG_VER}"
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${COMMON_DEPS}
+	dev-python/sepolgen
+	app-misc/pax-utils"
+
+DEPEND="${COMMON_DEPS}
+	nls? ( sys-devel/gettext )"
+
+S2=${WORKDIR}/policycoreutils-extra
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	[ ! -z "${BUGFIX_PATCH}" ] && epatch "${BUGFIX_PATCH}"
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`"
+
+	if ! useq nls; then
+		for i in ${SUBDIRS}; do
+			# disable locale stuff
+			sed -i -e s/-DUSE_NLS// "${S}/${i}/Makefile" \
+				|| die "${i} NLS sed failed"
+		done
+	fi
+
+	# Gentoo Fixes
+	for i in ${SUBDIRS}; do
+		# add in CFLAGS
+		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" "${S}/${i}/Makefile" \
+			|| die "${i} Makefile CFLAGS fix failed."
+	done
+}
+
+src_compile() {
+	python_version
+
+	einfo "Compiling policycoreutils"
+	emake -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y || die
+	einfo "Compiling policycoreutils-extra"
+	emake -C "${S2}" || die
+}
+
+src_install() {
+	python_version
+	python_need_rebuild
+
+	einfo "Installing policycoreutils"
+	make DESTDIR="${D}" -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y install || die
+	einfo "Installing policycoreutils-extra"
+	make DESTDIR="${D}" -C "${S2}" install || die
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d"
+
+	# compatibility symlinks
+	dosym /sbin/setfiles /usr/sbin/setfiles
+	dosym /lib/rc/runscript_selinux.so /lib/rcscripts/runscript_selinux.so
+
+	if has_version '<sys-libs/pam-0.99'; then
+		# install compat pam.d entries
+		# for older pam
+		make DESTDIR="${D}" -C "${S2}/pam.d" install || die
+	fi
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
+}