new upstream release.

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

3 files changed, 120 insertions, 5 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 2c820b19abd8..a969660b494d 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.72 2009/07/22 13:20:53 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.73 2009/08/02 01:25:55 pebenito Exp $
+
+*policycoreutils-2.0.69 (02 Aug 2009)
+
+  02 Aug 2009; Chris PeBenito <pebenito@gentoo.org>
+  +policycoreutils-2.0.69.ebuild:
+  New upstream release.
 
   18 Jul 2009; Chris PeBenito <pebenito@gentoo.org>
   -policycoreutils-1.34.15.ebuild, policycoreutils-2.0.55.ebuild:
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index aa50caebd6e5..37d49e6b2db8 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -2,14 +2,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
 EBUILD policycoreutils-2.0.55.ebuild 2697 RMD160 1da78827255848d2a62a8f8b3fa59240c488da69 SHA1 6cd2e778a1e56c1a3b339dfe104f9b6a997590ab SHA256 de8835165f811d12b387be2fbe7bddbf054bbaeebeb0bad86d62fbf632a43a16
-MISC ChangeLog 11328 RMD160 bb04fa264a4544d85e6029ebd42ac2c6bd775a00 SHA1 68096599b0d00be39835f4f57cea6f38dd798211 SHA256 a23c98701fb924ed1a2737425f58edb7eeaa5c49306eac98d62bacd55c350378
+EBUILD policycoreutils-2.0.69.ebuild 2737 RMD160 35bdee4db404b49a1992c0239012bdc89e791c79 SHA1 da12ea42b7fa84836c8aa6784fcfd15378b447b3 SHA256 fcd1a6de51ce3c2b40809ebd1412f1579067c57b2b802d4ac2bde9ee5ba2aa08
+MISC ChangeLog 11478 RMD160 fe4733a9fcb5d0c8e2ab7109b49b948f3e7108a0 SHA1 9419becea359332b165c60b9ceb184dee866a991 SHA256 8e0f3967d7b467036f1bcf64fdc30d79c04973134a43eeca5f21157a2efd4efd
 MISC metadata.xml 836 RMD160 421e492e89112f8436f8c5535aa2340cc8795929 SHA1 91c830f5358b9786f2b61e1967214f49212c4e3a SHA256 1d14250f52ecf63b67bed2289833d6f1ff2eba3cad9a80794b356e747917cdb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpnEjoACgkQWczwbOluxW8moACfeZ6pbvOVzdnJNtQUVZCoUMYf
-ITkAoK271Y2iH6HFzxJVhlG3pJ3J5p85
-=6FB4
+iEYEARECAAYFAkp06ygACgkQWczwbOluxW9FygCfbRVQNtDy++beqeVYXMLBi8Ja
+yeQAoNHZRGKGOU2R0Vck/DqMOPBJnXMh
+=tl79
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-2.0.69.ebuild b/sys-apps/policycoreutils/policycoreutils-2.0.69.ebuild
new file mode 100644
index 000000000000..e500f1f82faa
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.0.69.ebuild
@@ -0,0 +1,107 @@
+# 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.ebuild,v 1.1 2009/08/02 01:25:55 pebenito Exp $
+
+IUSE="nls"
+
+inherit eutils python
+
+EXTRAS_VER="1.19"
+SEMNG_VER="2.0"
+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}*"
+
+RDEPEND="${COMMON_DEPS}
+	dev-python/sepolgen"
+
+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
+
+	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
+}