New upstream release

Package-Manager: portage-2.1.11.60/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 18b6c829d9da..6fb60161e20a 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.117 2013/04/19 10:27:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.118 2013/04/25 18:55:43 swift Exp $
+
+*policycoreutils-2.1.14-r1 (25 Apr 2013)
+
+  25 Apr 2013; Sven Vermeulen <swift@gentoo.org>
+  +policycoreutils-2.1.14-r1.ebuild:
+  New upstream release
 
 *policycoreutils-2.1.13-r11 (19 Apr 2013)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index d3d8363fca74..62c0d8919e5c 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -6,8 +6,10 @@ DIST patchbundle-policycoreutils-2.1.10-gentoo-r3.tar.gz 26116 SHA256 661e18c14a
 DIST patchbundle-policycoreutils-2.1.13-gentoo-r3.tar.gz 35961 SHA256 75022f9af208cbeddb770f1504a51845865ec2fac51ca1bde9c562f6af2e340e SHA512 1c81f41f7e9ea70be492bee9eafe6421d516a009f8cd4f5d5c636490acc8819bcb75bc16fac5398ea275c7336f1eb0604b725399028f12ce3c0be2190d3998e8 WHIRLPOOL 1e6a1c2a57f6d314ba2df1b42421c219748cf840d20a5e62c01acb28deb4816b4c1720a97877a7c3ae8a033f6c294c3496a633e54a9b61708fb4272bb4787831
 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 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
 DIST policycoreutils-extra-1.22.tar.bz2 12858 SHA256 7013f77fbbc0eceeffdae6ad7eb31547d1334afe4a6929654440540f6e50b8df SHA512 c9fb2f75ab11e82b6ef366f7ef891a046ade41b87f4c82680ea79c1e3f0cf24edec5d3b68c7f5c8e5da01e754a2100dd8adfc90ac4b2b353745ee4f8c468b036 WHIRLPOOL dd3a30c9f4f57d1640838b755646f33a173012d745ca1a93bf95faea50e01c4d430d4361c77c14e994323b00cfba2c6bb1d9db276ee499dee1a318f02e0b24f8
 DIST policycoreutils-extra-1.23.tar.bz2 12865 SHA256 ad758323fe88ecc5c8689e9a8cdabaaa919d14ade9cc2c6d39761f7d7f14ae9f SHA512 ee92796be2b4eb77f8f25e5174b752fda5bffd5941860a20ebc550e3c0e6e836997f636aeafbaa7ecc51e65786fe0a67915e6d4c01a15c0c7a45a16baf06a762 WHIRLPOOL 70de6a6fb922429af6cda42a3e4e2ad10c49834f37e82de15f88a9f3e4ea02e3668c5e1432c1e5fa21fd62acebb7c1f15256170a26ae47d5e2ef88738410a369
 DIST policycoreutils-extra-1.24.tar.bz2 12884 SHA256 d11cd8eae33c1237685ae8cafc26fe25cc3b97d743678985d8963f0676b1a7c7 SHA512 043e3cbf0bed256b5322a7553b82d190c5f9cc4fdf3d31a3144143cabbb738861ea89faf81af008318c0af0fe2abe09528891f93c45ca186757928134501180b WHIRLPOOL 372262a4ff8c0295d689ef6786a8a94b2b11a9bf45e41f4f5682b16304f025c93c8407d1c72754da05669f62a01b45821d62d9aa2c2a05350d392742b1476c28
@@ -25,12 +27,13 @@ EBUILD policycoreutils-2.1.13-r6.ebuild 4251 SHA256 32aa76856d93e38817ef13901dd8
 EBUILD policycoreutils-2.1.13-r7.ebuild 4251 SHA256 6f10ab09b54b2dcc2a9f13a4f0f20a6e4e252aead58800be11763449eeda5e3d SHA512 438fca9fcfbadbbf40864a3f3a158d7f6047d6eac4551bf0076ddee779b0bf2324c1b77893b71ef62421c6ade36bd48005e4a36ae592c63f942a355c78fb0b55 WHIRLPOOL 9d6db5fa3ac4d9f813acdc4d977cf0b5bf0cd31d7949f6381b3d8412128532df5b51ea103d2e409d62df4feb1e0f26c0f1a82e7b49cf66ef033bf6609818aa4d
 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
-MISC ChangeLog 19154 SHA256 ffcb9e2dc4d2efe955b7472c7c92639e357f5c9809327aa642d08bbff855713e SHA512 2be97d23f176703d72af6c29a6572b26d83ce81caa02d5e9c32504d489c0027b03c414a0d11e73b937aacd52e421e049c0fd5872281db42e4946a552ad1822c4 WHIRLPOOL 215959df1883293844f6e35806049e5dbc0d3ec98ff780257ef169427e5d78f2c80ba4d112922cf36f88c1c4695c24b0abe7e52ed5fbc772e71c87769a866b0c
+EBUILD policycoreutils-2.1.14-r1.ebuild 4255 SHA256 077b2ed1463c504972b66a42375ceb954c778be3462ce614be90d3faff42826b SHA512 b709c1f22b29510905eecd193ea11a2f82d1ca3d99abe32c94eda85e8291780f1e49cb2e557e3dc08be0ffb466748d46298c9fd8e7f6cfdc2a12f01308c81693 WHIRLPOOL e6f02dad2cdd5b3762a6f1d5cd4ef98fef08e186003e46449ec3caf85ee98f24e4b2d87a8b2b03be2a861c6508b99ced38e884adb0da0b00f1b560b065dcff2a
+MISC ChangeLog 19306 SHA256 bd937bfc0788f7c1167079385b59c616e7b007076282bccf236284b18c252b8f SHA512 8e0704296ca77c1a386f5ea5b9eb702e70b6e311f4e9a6d192eed772c0019c22de27b8a01dae9ade35437f8b092ed816e47c84691a1ecb215bae65022496c27b WHIRLPOOL dfa26ef53d39e6aecffac7526f997dda603ff7752453832e0876b07038bf3ceaa01d712342d51ea93bea559c8033bf4e6dea42617f17b89cc140fabc408df2bb
 MISC metadata.xml 959 SHA256 6683014987dd67dfbeb80ad329550fc20a0b09f5eaa7828054be62fff6aee391 SHA512 d44168511571036289259b0709fcb12f934bd789d872e256bf00b7b88247f08b5c5f6bbcf60e0ed654f391606f6c41baca92aa7208a80526ef01c2c34f06b962 WHIRLPOOL 59c9757a028d1731dac9abd05ee768fd153c303257a14acf4d53290e4108eecc45abbb879ef2143141b9d03cf3dc94e0ba1bdc8ed7b01f0d2ad84db5fb9f347e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFxHA4ACgkQXfqz7M26L9sa/wCfRYTPRL2SoOJ/GK4947i6Mk1P
-5EkAn2LJMSVKxzkioiQrisqbBpYTqwZj
-=+epk
+iEYEAREIAAYFAlF5fA4ACgkQXfqz7M26L9tfawCdGP9BIStiNcCovA3zOGXwS7gS
+guEAmwWpwwE2rOUwmFK/dtjFEP5SwTdQ
+=6iIz
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.14-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.14-r1.ebuild
new file mode 100644
index 000000000000..7d6bb6713208
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.14-r1.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-r1.ebuild,v 1.1 2013/04/25 18:55:43 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-r1.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
+}