Fix bugs 467268, 468832 and 468830

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xCDBA2FDB

3 files changed, 154 insertions, 5 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 6fb60161e20a..e4c2a0e586b1 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.118 2013/04/25 18:55:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.119 2013/05/07 09:34:31 swift Exp $
+
+*policycoreutils-2.1.14-r2 (07 May 2013)
+
+  07 May 2013; Sven Vermeulen <swift@gentoo.org>
+  +policycoreutils-2.1.14-r2.ebuild:
+  Fix bugs 467268 (yum bindings), 468832 (key error), 468830 (mls range
+  dependency)
 
 *policycoreutils-2.1.14-r1 (25 Apr 2013)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 62c0d8919e5c..eaf8e6c38fbc 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -7,6 +7,7 @@ DIST patchbundle-policycoreutils-2.1.13-gentoo-r3.tar.gz 35961 SHA256 75022f9af2
 DIST patchbundle-policycoreutils-2.1.13-gentoo-r4.tar.gz 7075 SHA256 922cc5a08e9c973957ef06dc00ee92e11df2a5f0347c9002cbff758a48407db1 SHA512 d32095869a9c10ba35b2862875dccfc4ee744d16c6a106dd9ec4b93465a7429d6f035ffc49e9dfc62a003aaa344b2353d38842f43f959c2c9f4d4a4139029383 WHIRLPOOL ab072e56aeba07066a84ebb45b27815a1b7a257e50721fa61aa558c6265261b1187b07561dd3add398360af814ccc6ab713aac0132dc8854dd3d06e2b9cc7288
 DIST patchbundle-policycoreutils-2.1.13-gentoo-r5.tar.gz 7290 SHA256 349bd3ff7cabc91766a195b3c48b9cc5a5487fa0737036869e44f8f2e5904997 SHA512 3a30b2dbaedced8d18e0ced3c3784d9f917eb83987ba10a144283b67423ed8571d2b46fe8d5920b85fcc0b698e5b4996899f9213a94b7adea26c8fb93c790808 WHIRLPOOL 1eb224aa8e99b82eda2cfa765ad7b81b8bf38921637513d3df7191d06eeefb8eacfa2eed6ad27165bf01818bfed65eb216304a24eefea3cdd79b02fa21c69818
 DIST patchbundle-policycoreutils-2.1.14-gentoo-r1.tar.gz 7366 SHA256 47ed230f9cc416f5565e0b314de8cb7fd482ec9034a06c31aba8a1875fd4a04a SHA512 c1b6ae16118f9d61bf19c42d12baa32125833ad4ccf1a3bbdb314c6a5a870b1096de82cec5234fb5ea0a36cab15b0811d04640aeeb0cbcfb1cc5172610ffeb41 WHIRLPOOL 14aece5c402a742178771fd0c2799c800d2f80125a85e924a133304c588dc88d41db3ec0b3dc51ad296802677ce091c07a2c3acfec3e20a59931c37a3165bf77
+DIST patchbundle-policycoreutils-2.1.14-gentoo-r2.tar.gz 11496 SHA256 d2fcadd657ed892620dd6abba23686b8010f34c09948d423533286c31f402175 SHA512 87935553c07f6200722c2ce597c4c3b14378f8fba2ce613e2bf4ecfcc4f149a14486aeff2cae3f69cf348de4a5adaaf2707c418b673581f85ae827dc246c4470 WHIRLPOOL 5cf2aa7fd2320bfb2a86ec285469ad5a604fcfc87823ae6f720bbe0e95f1d997898c2f521a800ffbe8f1d727ed224caddf7d8290314671134692470e270b4027
 DIST policycoreutils-2.1.10.tar.gz 907554 SHA256 8bbbc36b7d375edff891503932da93e37553f0dd7bdceded7ce9a45c80bec3d1 SHA512 7dd06daf2094f21703c9e84b7f591a4f31a4ea8813aac7c26e2264a0c972f5b566e981b5fdcc38ae2924ec45f0d3f2c0ac08accaaa647f9e5b4e99072dc49534 WHIRLPOOL a3208af4effb2c949fce25937872b9d849cfa57e043a5b41993cfe07b5b0763571354904147e005d8e8cefbf979e228dd2310b966399d13deb2b858ba6e9930f
 DIST policycoreutils-2.1.13.tar.gz 1188940 SHA256 34040f06f3111d9ee957576e4095841d35b9ca9141ee8d80aab036cbefb28584 SHA512 901a966ee61dc0935767f2ee8e8659fca13c96b6ce464a00060a0005764c0d7a0cfce0e2b6b00850ff2b4b20675a16d9a6da427284818e93efd83864ab086c1b WHIRLPOOL e123e474830e66fec70ee850674b0767ab3e115966dc8cae9c6aa6cdd4f9297d7c22a92a41cea9a1b24c994cc44d06af23459a0184546bbd263e4f74b756419e
 DIST policycoreutils-2.1.14.tar.gz 1675951 SHA256 b6881741f9f9988346a73bfeccb0299941dc117349753f0ef3f23ee86f06c1b5 SHA512 d4d1710ff6974a829efcff87c5c33ae47a2e0bfe881e4babe6e2b2f0991c8c1d6f9101bb34f41ec11eb26c9c989c85c5fff0157a354c40c403393d75203cef45 WHIRLPOOL bf92ea6870194c68d5faf4a0e7ba158028d5449570c73abf77fcc78385857209365000121fec21b09d5944d262476dedf5d096241bc0342f814a41b2e0adf0b4
@@ -28,12 +29,13 @@ EBUILD policycoreutils-2.1.13-r7.ebuild 4251 SHA256 6f10ab09b54b2dcc2a9f13a4f0f2
 EBUILD policycoreutils-2.1.13-r8.ebuild 4251 SHA256 603e0ae76517cc9fc7eb925de09bda9c37db0253d94b0be3975bf0c94fccb096 SHA512 530c58553e71bf1eea121a1bd61dac004592172b46237b834fc13f7be03d71c33bcb4234cccf8d147b87a3bb9937676dc7dd6d3d1f30b8d751cb940e1e974ab3 WHIRLPOOL d3002ead8435ca849b8dd3edddc1800e6fb4b38bd99288da1033820d4b74607ba83fdcb0a1d5fd0be80d9ffe1ae1a9f1a9feff986f75699a35584b1a44b98c67
 EBUILD policycoreutils-2.1.13-r9.ebuild 4249 SHA256 c421a149fd21e4d85042c336bf74a2a5d6d557b269c1b312b451cf40ef0042ea SHA512 22619dcf963571720bd8c3641be2b1d7a6d74b924b38dfc5a07852dac49e7aa58f1b8172dc00c545def3ec595d84a1320825adf889acd0644605faca3332a30a WHIRLPOOL 51ce06f2f13eb2c0b40b93113734e5b075585d1a23c40134483d39da6cee55850b6efd87106312b019ab57df7b7d0cd80beb22a0293716c6a3da40c095954bd7
 EBUILD policycoreutils-2.1.14-r1.ebuild 4255 SHA256 077b2ed1463c504972b66a42375ceb954c778be3462ce614be90d3faff42826b SHA512 b709c1f22b29510905eecd193ea11a2f82d1ca3d99abe32c94eda85e8291780f1e49cb2e557e3dc08be0ffb466748d46298c9fd8e7f6cfdc2a12f01308c81693 WHIRLPOOL e6f02dad2cdd5b3762a6f1d5cd4ef98fef08e186003e46449ec3caf85ee98f24e4b2d87a8b2b03be2a861c6508b99ced38e884adb0da0b00f1b560b065dcff2a
-MISC ChangeLog 19306 SHA256 bd937bfc0788f7c1167079385b59c616e7b007076282bccf236284b18c252b8f SHA512 8e0704296ca77c1a386f5ea5b9eb702e70b6e311f4e9a6d192eed772c0019c22de27b8a01dae9ade35437f8b092ed816e47c84691a1ecb215bae65022496c27b WHIRLPOOL dfa26ef53d39e6aecffac7526f997dda603ff7752453832e0876b07038bf3ceaa01d712342d51ea93bea559c8033bf4e6dea42617f17b89cc140fabc408df2bb
+EBUILD policycoreutils-2.1.14-r2.ebuild 4255 SHA256 2514604111cabecda5a3860324c210b75f4b0a32a52cfcbc58a0554ebdbe7fb5 SHA512 a417844cf71a2fcbdc3e3b308fd54610f2daca26c1389680869617b3f7f3aad0fab912ae8a04eb77583c08ad7e41c9927842c693ba937666a79fdfbb03b1fc3c WHIRLPOOL 480ccc1f8db8cb266d5989060f88fb1fd811a0e2ddbcb2a8f3ba8ee0a5f33f279c9efdd128b6ed0042dc9f00fc499abacbf8bd4afa879ce877f20bd556da7be5
+MISC ChangeLog 19521 SHA256 71dd8b58c484e6f640a187e2cb1f2d23642dfea5b77196a17cc7ee0fe0028501 SHA512 01e34b095124a2a0263390bd75ec96132ec16d1a54123cb3e0e05bd5d57ab8bdd66c2865220a99dc4fe3cbc54056fb424feaa9fa7dc8a2cadeee006dee7fb177 WHIRLPOOL 5f30be1071fdd08f36bd5676fef4dc5498670f7313af81d32ce5a10d3746575192e63418cb3743b43538ca97d53d25c5bf73a5c05291b5cfc79692b360572293
 MISC metadata.xml 959 SHA256 6683014987dd67dfbeb80ad329550fc20a0b09f5eaa7828054be62fff6aee391 SHA512 d44168511571036289259b0709fcb12f934bd789d872e256bf00b7b88247f08b5c5f6bbcf60e0ed654f391606f6c41baca92aa7208a80526ef01c2c34f06b962 WHIRLPOOL 59c9757a028d1731dac9abd05ee768fd153c303257a14acf4d53290e4108eecc45abbb879ef2143141b9d03cf3dc94e0ba1bdc8ed7b01f0d2ad84db5fb9f347e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlF5fA4ACgkQXfqz7M26L9tfawCdGP9BIStiNcCovA3zOGXwS7gS
-guEAmwWpwwE2rOUwmFK/dtjFEP5SwTdQ
-=6iIz
+iEYEAREIAAYFAlGIynoACgkQXfqz7M26L9u/sACgiRtDGq9Fdp4u5pDqBdY1lU1x
+uMsAnAyOBVbdyQ6ppQjO6oj0pWQGJSA8
+=yvxc
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.14-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.14-r2.ebuild
new file mode 100644
index 000000000000..3662411f92ca
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.14-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.1.14-r2.ebuild,v 1.1 2013/05/07 09:34:31 swift Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-* 3.*"
+
+inherit multilib python toolchain-funcs eutils
+
+EXTRAS_VER="1.28"
+SEMNG_VER="2.1.10"
+SELNX_VER="2.1.13"
+SEPOL_VER="2.1.9"
+
+IUSE="audit pam dbus sesandbox"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20130423/${P}.tar.gz
+http://dev.gentoo.org/~swift/patches/policycoreutils/patchbundle-${P}-gentoo-r2.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}[python]
+	>=sys-libs/glibc-2.4
+	>=sys-libs/libcap-1.10-r10
+	>=sys-libs/libsemanage-${SEMNG_VER}[python]
+	sys-libs/libcap-ng
+	>=sys-libs/libsepol-${SEPOL_VER}
+	sys-devel/gettext
+	dev-python/ipy
+	sesandbox? ( dev-libs/libcgroup )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	audit? ( >=sys-process/audit-1.5.1 )
+	pam? ( sys-libs/pam )"
+
+### libcgroup -> seunshare
+### dbus -> restorecond
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${COMMON_DEPS}
+	dev-python/sepolgen
+	app-misc/pax-utils"
+
+DEPEND="${COMMON_DEPS}"
+
+S2=${WORKDIR}/policycoreutils-extra
+
+src_prepare() {
+	# 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"
+
+	EPATCH_MULTI_MSG="Applying policycoreutils patches ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	# Overwrite gl.po, id.po and et.po with valid PO file
+	#cp "${S}/po/sq.po" "${S}/po/gl.po" || die "failed to copy ${S}/po/sq.po to gl.po"
+	#cp "${S}/po/sq.po" "${S}/po/id.po" || die "failed to copy ${S}/po/sq.po to id.po"
+	#cp "${S}/po/sq.po" "${S}/po/et.po" || die "failed to copy ${S}/po/sq.po to et.po"
+
+	epatch_user
+}
+
+src_compile() {
+	local use_audit="n";
+	local use_pam="n";
+	local use_dbus="n";
+	local use_sesandbox="n";
+
+	use audit && use_audit="y";
+	use pam && use_pam="y";
+	use dbus && use_dbus="y";
+	use sesandbox && use_sesandbox="y";
+
+	python_copy_sources semanage sandbox
+	building() {
+		einfo "Compiling policycoreutils"
+		emake -C "${S}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" || die
+		einfo "Compiling policycoreutils-extra "
+		emake -C "${S2}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" || die
+	}
+	python_execute_function -s --source-dir semanage building
+}
+
+src_install() {
+	local use_audit="n";
+	local use_pam="n";
+	local use_dbus="n";
+	local use_sesandbox="n";
+
+	use audit && use_audit="y";
+	use pam && use_pam="y";
+	use dbus && use_dbus="y";
+	use sesandbox && use_sesandbox="y";
+
+	# Python scripts are present in many places. There are no extension modules.
+	installation() {
+		einfo "Installing policycoreutils"
+		emake -C "${S}" DESTDIR="${T}/images/${PYTHON_ABI}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="python$(python_get_version)" install || return 1
+
+		einfo "Installing policycoreutils-extra"
+		emake -C "${S2}" DESTDIR="${T}/images/${PYTHON_ABI}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+	}
+	python_execute_function installation
+	python_merge_intermediate_installation_images "${T}/images"
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d"
+
+	# compatibility symlinks
+	dosym /sbin/setfiles /usr/sbin/setfiles
+	dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
+
+	# location for permissive definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+}
+
+pkg_postinst() {
+	python_mod_optimize seobject.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup seobject.py
+}