Fix bug #461868 - link runscript_selinux with crypt

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

3 files changed, 153 insertions, 5 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 717dc4acb82f..67d6a48f8acd 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.112 2013/03/10 15:52:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.113 2013/03/20 08:29:09 swift Exp $
+
+*policycoreutils-2.1.13-r9 (19 Mar 2013)
+
+  19 Mar 2013; Sven Vermeulen <swift@gentoo.org>
+  +policycoreutils-2.1.13-r9.ebuild:
+  Fix bug #457786 - Link runscript_selinux with crypt
 
 *policycoreutils-2.1.13-r8 (10 Mar 2013)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 27c50bcaf109..38ef20a43e80 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -19,6 +19,7 @@ DIST policycoreutils-extra-1.22.tar.bz2 12858 SHA256 7013f77fbbc0eceeffdae6ad7eb
 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
 DIST policycoreutils-extra-1.25.tar.bz2 13264 SHA256 d02f267586428cb83b8159a8b4826d36041ee10ca48402aeb9fe13a8be962890 SHA512 0bd5c0f9d0d5be263748cfc9830250159342cecc5ad98c0e4479607c87d574fd71ab01c4dcf03f7396ba48f5b9536ffcf30f615d42d013a46434b9a1ef95a61f WHIRLPOOL c8c4b94bb5c5238d0cecff26b3399dd01c8c7cbeff837e9c5381b622164c85ec0d4e1ef0af899305122b1ec455b3ceb508ddfe0101e84bf60b7bec0bdf5a6c4a
+DIST policycoreutils-extra-1.26.tar.bz2 13245 SHA256 9ba087e43447adbc896ebfe2f9d7668702170686b96d9fcd245c7b1914bea6de SHA512 02ff66e210aec0452fa28c6cfc85059d3f1f80fbca0d6a05a4a0c7e5afbd8ed2d750962c24c3cde6bfd96a98fae95e7df01bccf098cfdc2abd6297f93313ab9c WHIRLPOOL fad441ab2beb301c9fec3bbe3cbbb1ce397ccfa9fd302b31755b170ee557c26c10f3b911b8c0250eb1763dcd676474cfa086ad95acd4491afa993b3fcf4711b5
 EBUILD policycoreutils-2.1.10-r1.ebuild 5582 SHA256 e5890c79a891afcaeb8573e343f3886b258a148c2c4ff9005a07436617756674 SHA512 df26769020ced4ce671b0ecd8e7d416e24261b1c7c57609d59e7755ad23fd08ab8aa71454b985c859dbd8512758399d4fef8b3f42c0fb11074ba34e7bde5efef WHIRLPOOL 445f57cc60a824a7573eda19e49a40cc8ba3c04680cdb0ba07759a1254ee3952e5224fc8e6576a919bbdca36b5df817e8dcec082fca035b78055b7be8cff7f9c
 EBUILD policycoreutils-2.1.10-r3.ebuild 4269 SHA256 a19dafdb3286f311c8c5dd5e8337f3c6393bd38c3dbed86eb3063643f11d40c5 SHA512 c1a3382a9718ee957247af0ac556d0841944f4be6229e16c6e3d2639705fce03495fd0008274978b0f8c6a20560ac08aa5d2caf30d3d6fa51919d19bd92b2871 WHIRLPOOL 88b91b2ba7a4742b8abf55f524c125f64b48d0843307fc245efbb1ed7572c442cbd7d70e5ae9c4e68465f573b46fb2204990ff4dc0c2cb42393356ed134983ec
 EBUILD policycoreutils-2.1.10-r4.ebuild 4353 SHA256 b46e61343c552f092abd5fec8ca7dbcf15cd7bc4d79e0f116f35e3e2fd9cae12 SHA512 60b86f353378c9507710914944e451d92d715da194edd594a840939be916e5c2469d454342eee3703b411cb7a5065f9bb4cea80da129aeb6f73ff9e99e7de810 WHIRLPOOL 35d2e1fd75ad7e59a5b2e6b389db2c1557205730085726225899c622ac9e714eb7e2cee7869faf5a24d3732433e741bc81ce54bde02904180d83ef93e1a7d1f0
@@ -30,12 +31,13 @@ EBUILD policycoreutils-2.1.13-r5.ebuild 4130 SHA256 3ac83a8ab5b39702ae19d6162286
 EBUILD policycoreutils-2.1.13-r6.ebuild 4251 SHA256 32aa76856d93e38817ef13901dd81eae55bb0d98fecebeb06d9ed95ab84cccf0 SHA512 3e80fc32f934d4010b061ccdc6046c363724dc5ac7f9c5bca9b738364da03d2335d226b1fd84113b1028f0a036db0f0b4d1140acdff08ac8d0fe23cb047e66d0 WHIRLPOOL e29dee6b2a16a02432a7f836b1ef2515c971215a60bc93205aedc9c1c1f9fe8d7adad093cea7cd2cd5e8c2911cde38e494731613721375b5559c52f1067606f4
 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
-MISC ChangeLog 18233 SHA256 66f000126bbcd035ed29114d2ec3a03d2b65f5bb2bdd1d2df999a47df92381ba SHA512 23789ac082d5ea011cd005522c9e2134020e3613878d88e6b2bce63762fbd11e07fe2beb73863bcad9c1e6b330da5078d7e72fad59ff3cf04c3c96899b67ffc4 WHIRLPOOL 0ad4ce5fc742ad98c68de5e4db5ed0ef052355f8debd06980e429032dbf04db11d2db670560ad275a0ea45e8d2645ec0c9844108dcdbf3f65ab6fef0d1db454f
+EBUILD policycoreutils-2.1.13-r9.ebuild 4251 SHA256 4aecae461f4d582155a708ba6b2c4679dbb1b1fcf251390ecf839ee79c9d2110 SHA512 ac18e5e3ee0f06c8779d64d4fef23f706e0cf28ed34bf5460f0c92596bb994492bb9c22040ebfb81640f45ee18e87f413f3b9bb8fb524113d25668300d986879 WHIRLPOOL 21b14fc9ef0b34f7b04aad5e882df367527b22fdab2bfeedebf08a7f0def31ee12c89951d228633accda51bbb311f21713a7c34d614311cc9f3dde9cebd7c79c
+MISC ChangeLog 18416 SHA256 585c4cd8c600244d46b92177657466872c309925c94558b72f421068cee1018f SHA512 772322bfbc1aaf98c6ac36932f40b865cf9e11900acbd3a3682a5d2d034e19aeecec551ef325e05c441dddef8ac80401e1e0049308dd93c50f1bd7b0808cf3d1 WHIRLPOOL 3fcab2c347a932fb966fcba8780d03a2eff4e821087ce7492aa639479613c120beb485c5d5bfeb677a01369f2bcad7518ec7a864995ca5f1a42840eda0c93a05
 MISC metadata.xml 959 SHA256 6683014987dd67dfbeb80ad329550fc20a0b09f5eaa7828054be62fff6aee391 SHA512 d44168511571036289259b0709fcb12f934bd789d872e256bf00b7b88247f08b5c5f6bbcf60e0ed654f391606f6c41baca92aa7208a80526ef01c2c34f06b962 WHIRLPOOL 59c9757a028d1731dac9abd05ee768fd153c303257a14acf4d53290e4108eecc45abbb879ef2143141b9d03cf3dc94e0ba1bdc8ed7b01f0d2ad84db5fb9f347e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE8rB4ACgkQXfqz7M26L9tp6wCfbMhOBCbdcOy9FMinquGjFKmb
-oL0AniOC8wGe933Ascx9Ithf2Pfr8TvP
-=u930
+iEYEAREIAAYFAlFJcw0ACgkQXfqz7M26L9tWYQCePLQ/9YF2yUNfaQwda6+VRmu/
+PRIAn1kB37FeSlcOeeS75Ql4OIq7I+Mr
+=8bfA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.13-r9.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.13-r9.ebuild
new file mode 100644
index 000000000000..59df2f5680a4
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.13-r9.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.13-r9.ebuild,v 1.1 2013/03/20 08:29:09 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.26"
+SEMNG_VER="2.1.9"
+SELNX_VER="2.1.12"
+SEPOL_VER="2.1.8"
+
+IUSE="audit pam dbus sesandbox"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz
+http://dev.gentoo.org/~swift/patches/policycoreutils/patchbundle-${P}-gentoo-r4.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
+}