Add selocal command to policycoreutils

Package-Manager: portage-2.1.11.60/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 a3f048178062..18b6c829d9da 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.116 2013/04/16 10:14:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.117 2013/04/19 10:27:45 swift Exp $
+
+*policycoreutils-2.1.13-r11 (19 Apr 2013)
+
+  19 Apr 2013; Sven Vermeulen <swift@gentoo.org>
+  +policycoreutils-2.1.13-r11.ebuild:
+  Add selocal command to policycoreutils
 
 *policycoreutils-2.1.13-r10 (16 Apr 2013)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index ea2e35b4c0b7..d3d8363fca74 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -14,8 +14,10 @@ DIST policycoreutils-extra-1.24.tar.bz2 12884 SHA256 d11cd8eae33c1237685ae8cafc2
 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
 DIST policycoreutils-extra-1.27.tar.bz2 13250 SHA256 eee73e497e159a49e2eaecd17d7653f4f25425f2add2c0dec61f8b9caf9e59f3 SHA512 57b4012ab2a141293f52e2fb636b7072b05e7d48f823d5664cb13d60a5ae9c9112e27501f81e017219335ca8a77fceb1aed60ea3f1adc76d88facd85c6a31897 WHIRLPOOL 53f375e72a4291d99b0961a857ac6b8ca90ec23034f90385489998bdd3cd474831bbcf374d073616a1097f8907de81b4d79f0c236d31bf4fd1ed69dfe6809a9d
+DIST policycoreutils-extra-1.28.tar.bz2 15294 SHA256 cf577aa932e564de7df20dcd1a3e4353d7ecea03dfb987bb0134e09c4f76bc66 SHA512 e660f2a21b417b3f0ca7d68fd9708fda81565bb3c83f627a9b8950b208e1462fac63bc1aa458968e1c16583657e426ce699c89065fec65507685898388c30768 WHIRLPOOL da9d9a95afaf44b0f0fb717a4273c7f9faa1095f3827b39e5b60e49e493e65bc0a15f4b4505fe0c448fd7b03945f439a437e22ba0fa0165f6883d41f18dfdb19
 EBUILD policycoreutils-2.1.10-r5.ebuild 4108 SHA256 c732158eb03593bd5ecd724481ba731531094b2212ab231c54cc5f1584bfce85 SHA512 2473c08430c66ec16b357dfcc5ff8b662cb156c49951109ac63130905d4172bb34cea8982e1d1b55ea99cfdf5733607c041475603628f0e2be5ceb3b2141056a WHIRLPOOL 00af6f6c70ef57d3a120ee69ba3197153485951a139a7e15a6250d0685e60c5eae3eb977922310d13fb99aaca158a529249fe90698094bfd8b488dd5f0c9903b
 EBUILD policycoreutils-2.1.13-r10.ebuild 4252 SHA256 d146a7a6acf9c46d1f57625de9cec02fd7d42dd22ea8d1ad3645b43a837f42e5 SHA512 c52aa31cc1e02a6eaee54b0760b40badb941af33c3e0bcf1267299f9c6594d4654fd1d71c49c50fd32ce995f81eb08a161175960373a97a4bfe2a345c47237b4 WHIRLPOOL d82f12d4cb708db4fbcf72b14563e414fe602782b92d4561f312b3ebb62107a74557e249e121f7565756de6db7bc5ef187ca738d312564dd4f0af8d4bbc27451
+EBUILD policycoreutils-2.1.13-r11.ebuild 4252 SHA256 dc6b4fca9ed31ffdc83f590ec9f2454975e94633caf9e4ad978febc5f85e3501 SHA512 c764e3b7c13712f963800e185a2d2f1ebc52e2a5f4b6e8bfe9dd80378b370006cff5d62a82883cb1cac9c37cd24355709857c411e2ee020a23d64a3612b44fe3 WHIRLPOOL d884e5008f390fee115331eef31eb31957e9a1a2c3537508854d5e4ac7af22472b3104c6938781130dbd91632f26ed94605d658482d57a4f1485e889c64f20fa
 EBUILD policycoreutils-2.1.13-r3.ebuild 4244 SHA256 c5d6b0fd58a7648b980ee39ad590deafcefc18f102a52232e8f685dd1447da70 SHA512 fa76d2002c503d0286bed86992f827b56db1bfb410c667580b5fe4d3385c3500334c86058e4e25de7538c270b8b3cccc51768a8d0e4aa341d58e9f39e4d564f6 WHIRLPOOL 61800aa8b33638417c6b4fdd4f9782d157dbaa15e02f95e7edbd27ca172961cd1ad7cf5d4aabddcf0a926ac7af5036685ccdfccc2f1990aac65ecda772c8cfea
 EBUILD policycoreutils-2.1.13-r4.ebuild 4130 SHA256 d0c1573eab80bf34b84d828d5ca27881f79b0b4283668bd19ed9de01e6646dc7 SHA512 45f3c5b93732b9ade28389dae780b7080d3744ed064d7a2735df9d9eec45593a02c3877f48d18d2a7f76171a2ed1422998f8362ae9cfe5995bf30834442e0116 WHIRLPOOL 8b36280ce3df5eae886cba5dbb160dcc77028cd0f142415d2c0495d628b677860bdf16da846fddd56be372a2191eae229b063a6a28bc037f320edc556b5713b8
 EBUILD policycoreutils-2.1.13-r5.ebuild 4130 SHA256 3ac83a8ab5b39702ae19d6162286404f99fef710e046fffb07cc5672060f2141 SHA512 4533a2ebe763f2af58e5d7e0d9c1235fc77aa267355f78d3a390816fa1b5c020a7e7744a134bb0cb343836ee3b84dc93a6b2c1d99109e5e09eb0ad9bff23275e WHIRLPOOL 0759d07d2b4f8943f1ae7ce8689ce33fa01f15cbac7ef75dc00620a45d66e569074ce203875ed93dba8077af2792f4e30004499c2be454c38e2a5eb246ff8d64
@@ -23,12 +25,12 @@ 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 18982 SHA256 7e5616907d564fa0b24879513143192a3d0263ab88f4fe6549cc3336ade3c5a7 SHA512 80b7d048bd04a534102075775809b3818edf6659818d7d527c0e3a6dd5bfd54d8c499b2b205c9bdbe57d854ff00d26475d620572cf47b7f82bfb175c561f032d WHIRLPOOL f11c6de38684abfed1bfc094e503a2312a4d22e0bcfc089a81930c31d74798a1a66c9186ac369bbf4913972a82703e6b5e1e8dbbb71d9c379dd09dabcb2f8af1
+MISC ChangeLog 19154 SHA256 ffcb9e2dc4d2efe955b7472c7c92639e357f5c9809327aa642d08bbff855713e SHA512 2be97d23f176703d72af6c29a6572b26d83ce81caa02d5e9c32504d489c0027b03c414a0d11e73b937aacd52e421e049c0fd5872281db42e4946a552ad1822c4 WHIRLPOOL 215959df1883293844f6e35806049e5dbc0d3ec98ff780257ef169427e5d78f2c80ba4d112922cf36f88c1c4695c24b0abe7e52ed5fbc772e71c87769a866b0c
 MISC metadata.xml 959 SHA256 6683014987dd67dfbeb80ad329550fc20a0b09f5eaa7828054be62fff6aee391 SHA512 d44168511571036289259b0709fcb12f934bd789d872e256bf00b7b88247f08b5c5f6bbcf60e0ed654f391606f6c41baca92aa7208a80526ef01c2c34f06b962 WHIRLPOOL 59c9757a028d1731dac9abd05ee768fd153c303257a14acf4d53290e4108eecc45abbb879ef2143141b9d03cf3dc94e0ba1bdc8ed7b01f0d2ad84db5fb9f347e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFtJFcACgkQXfqz7M26L9uaLQCfds0a1FYlaHN8gC4KPWM5noc8
-bnYAn0HYYAUQGeuW4grMcXk14n+JQJlw
-=eZMc
+iEYEAREIAAYFAlFxHA4ACgkQXfqz7M26L9sa/wCfRYTPRL2SoOJ/GK4947i6Mk1P
+5EkAn2LJMSVKxzkioiQrisqbBpYTqwZj
+=+epk
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.13-r11.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.13-r11.ebuild
new file mode 100644
index 000000000000..97eee616215d
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.13-r11.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-r11.ebuild,v 1.1 2013/04/19 10:27:45 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.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-r5.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
+}