Support refpolicy style audit2allow (#417199)

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 163 insertions, 25 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index cc78f13ff29c..b532e14a7226 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.101 2012/06/26 05:02:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.102 2012/07/10 20:01:25 swift Exp $
+
+*policycoreutils-2.1.10-r4 (10 Jul 2012)
+
+  10 Jul 2012; <swift@gentoo.org> +policycoreutils-2.1.10-r4.ebuild:
+  Support refpolicy style audit2allow (#417199)
 
   26 Jun 2012; Mike Gilbert <floppym@gentoo.org>
   policycoreutils-2.1.10-r1.ebuild, policycoreutils-2.1.10-r3.ebuild,
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 1ae22b1ea6c3..31b9057ddbfb 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX policycoreutils-extra-1.21-fix-python3.patch 3839 RMD160 23914ec14751350a3435d5202f3bae4d00f40ea6 SHA1 ca30ab174cc7de954292b04c22b63fceeae52002 SHA256 9ecd1fa99b9e5b28ba3b91c18d6cc783e00e489fe22424e4c8a6f9fd8fcfc703
-DIST patchbundle-policycoreutils-2.1.10-gentoo-r1.tar.gz 25209 RMD160 5112afe558bfbfe799bd9421c4c7fe63875508df SHA1 15d40685bfd483e88f592ce3efa70cd8c36220c9 SHA256 c9b18667ba525bb2df566debced62482b61fc8e728631402b507db9a4de5ebda
-DIST policycoreutils-2.0.85-python3.tar.gz 19750 RMD160 ae5daef8bf9083964e37b101a6168dc6ce5b8bb2 SHA1 61c058cb39ef9f13dd54af844a033ac724de743c SHA256 4bc78bfd39ce43a010c4e1de3d7f4ff45fcfc7bac4bc70e28c9bdb681053fe4e
-DIST policycoreutils-2.1.10-fix-makefile-pam-audit.patch.gz 1088 RMD160 36bc994b418270c2b3e8fedb49df70497e16e6f6 SHA1 4df7ad9a76823e12a891939f919702664d69d0a9 SHA256 9e3de8820a7f34133413c0a1b0987d20e69daf6ceb1e95da5ec70f759d85092d
-DIST policycoreutils-2.1.10-fix-nodbus_or_libcg.patch.gz 766 RMD160 bfb40ff7332331a2c3cc4a892aaad82f28d655f2 SHA1 96e9f1f1354b02c7019e11c3b4416157a85c2395 SHA256 2b98e73f02f5b0116b70b8ffd04925ede0c7939284c7453d9089cecce5094343
-DIST policycoreutils-2.1.10-fix-seunshare.patch.gz 329 RMD160 93ffdd0090d4f58c17191daad9bb83c032a33b2b SHA1 9801286a7f8433504f145603d1ae5f7e7af4c190 SHA256 06d2c9f6b885444203aeff467ae948473ec3e87a5ad4c6ce2112e6aa24bcea92
-DIST policycoreutils-2.1.10-sesandbox.patch.gz 5002 RMD160 ee14d38a6edd497fc1ba95a414d9b2e7535a0ca7 SHA1 d9d938b89288b24f7a74d8537340bdb337a90a13 SHA256 cb4d2082f0eba4a0e4e394fde9acc00d652c7af6f0445151ee4cc7543c6fe069
-DIST policycoreutils-2.1.10.tar.gz 907554 RMD160 ba7d2902f5c44ac1d2c3efbe18ae46fed4e285e9 SHA1 72aa099ee9e84ae30e868e45c76de8a25379dd3b SHA256 8bbbc36b7d375edff891503932da93e37553f0dd7bdceded7ce9a45c80bec3d1
-DIST policycoreutils-extra-1.21.tar.bz2 12864 RMD160 28e5d0f52a69e0cb9c0d2e8088e828cbac951732 SHA1 7866b24ddab5a48c95fd51b88ad1eb4af0d9572e SHA256 c2d3627e2a10f83f5de997e9db75c40830e7f3520b558807346c9bd9c49769bb
-EBUILD policycoreutils-2.1.10-r1.ebuild 5582 RMD160 22567b9e9fe27f0c5cb8aef565cd21ec9e8f53f7 SHA1 d01ae0947ffdec4bfa810f8958147cb16048583c SHA256 e5890c79a891afcaeb8573e343f3886b258a148c2c4ff9005a07436617756674
-EBUILD policycoreutils-2.1.10-r3.ebuild 4355 RMD160 71ab111bdb255a0409003ace6600a28dd69e1373 SHA1 943cfb7329c83489dde5e2eb9507e524e59c8693 SHA256 ba771c2c1769fd0f9eec3a5e855b958d4155ac85944b221340682513a50ccb70
-EBUILD policycoreutils-2.1.10.ebuild 5458 RMD160 301db13a1713507c7c63f5f6ed3c357a3ce2c24f SHA1 0978632638f1f6afbbb15871654a6487d70bf1c8 SHA256 a24b6bde380abe3674cf0a36dce8f2d98f2926808ade1941ffa117286003743b
-MISC ChangeLog 16407 RMD160 8fb6350ba6ef7479f9ade7138a549913be0a5bd1 SHA1 1c79257b92b73c469e8119bdb2127fb2f8db6656 SHA256 846aec8fa437cccb0527cd13438954158ea58ec612d997d17228ca75114e5d5f
-MISC metadata.xml 959 RMD160 b7d949dec19e45f8b1b1c74cbef0d65ddd152825 SHA1 0e96fcb229f9e63a34a5a555a6672640fe72e99a SHA256 6683014987dd67dfbeb80ad329550fc20a0b09f5eaa7828054be62fff6aee391
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAk/pQngACgkQC77qH+pIQ6QTSQEAn6jitLQ2JQq9rvat1JiT3IAw
-6JzF3f/qTH43p4F2/N4BAMTKhejKa0TckFFD4URpNmefZbZIqGG2Qo0QBm9G0fpD
-=Os3f
------END PGP SIGNATURE-----
+AUX policycoreutils-extra-1.21-fix-python3.patch 3839 SHA256 9ecd1fa99b9e5b28ba3b91c18d6cc783e00e489fe22424e4c8a6f9fd8fcfc703 SHA512 670c8d5901661ee5ec5817b94bc8b2fc58491a5f33116465e6d949332f18a53c3218b02504a993925c600f27496f94ad82ae608dd4389a1ef83c5e2106713245 WHIRLPOOL 86c85d06db235b41885cb659b6b1f5c9dcfe8e4f02db5bdc5dc162f6df7342cc570283b2d4067d9da37b06d9d0654f3483f3ed096cd2532674fcc03696801558
+DIST patchbundle-policycoreutils-2.1.10-gentoo-r1.tar.gz 25209 SHA256 c9b18667ba525bb2df566debced62482b61fc8e728631402b507db9a4de5ebda SHA512 3277f596b2536deabb5c3bd531f2d60ee0286dd97077bbd203b09ec883aa077588139246d98fc31861c0f215372fa3b64ef2827bd5a7ae6cea8708546c0d1595 WHIRLPOOL 8998aa5b857064a350d35a34862893dae1fa8b46b3695ae05b197b67a2b87ccb59f181b48a8109dce6dc0da5778e22667b1d652a940dd28b07ea6101070400fb
+DIST patchbundle-policycoreutils-2.1.10-gentoo-r2.tar.gz 25736 SHA256 d45a515d74b1869e28afeff773c7edc00ef5de657df79b239a988c64d2894a44 SHA512 1fd6a815c84b5fcfeb94fc1a44b3e88e5aaedeaf0595c4a1a98c18d42f6cad5b309da1fa6fb9eb3f5bd90492e7a63010b91a584174635df36660c2a203e14a0a WHIRLPOOL 599e65c94505cf519997693ce51630567e8f53c218e2779397ca81223a897763c3ed19e76dc63be9fabdafce5074de7578a2c09fd83fd54df432dae21f5cec36
+DIST policycoreutils-2.0.85-python3.tar.gz 19750 SHA256 4bc78bfd39ce43a010c4e1de3d7f4ff45fcfc7bac4bc70e28c9bdb681053fe4e SHA512 94d0352af2b25eb8ea240f21dd702a1d10a6558464785e1800291dc69308467768ad382e5d45b51c04a20e11eef60e2cbce038833baf61e09576b8095b755643 WHIRLPOOL b1123a2d116f2e47b11d1722eff0c4f65ed01ff27d588aedacdcd7e50a124c9833e501d534285ac76e7fa59b2fe63cd043c195c06ce50be7bc584c5e2083389c
+DIST policycoreutils-2.1.10-fix-makefile-pam-audit.patch.gz 1088 SHA256 9e3de8820a7f34133413c0a1b0987d20e69daf6ceb1e95da5ec70f759d85092d SHA512 7f08587c66251a18489fac62d6f21e379aa0d668aa9127ec07bfe8a71e53c7d80c275b269c7e6b70cbf69ddd9f7718f9122f3857f86a7dd9caf9a021abe19b51 WHIRLPOOL 74486a0230dc962b2f18c3aef45633c0d16e4702075fa70573fb52ae0dbca643649c5461b412039688a8e49ca28f164da8d06caf028835ca849eabbfa74bd4a5
+DIST policycoreutils-2.1.10-fix-nodbus_or_libcg.patch.gz 766 SHA256 2b98e73f02f5b0116b70b8ffd04925ede0c7939284c7453d9089cecce5094343 SHA512 377b7e25870501a306df011f26a809a9da1b92e72d1557e05a98c4fb9afdb5341fbd0f3e29c782a80dfd86fe881ebc51ad5db4ad3a65f855d1a40ef62d4a9b50 WHIRLPOOL 6ce6ed6317808e969cb4b61e1ec79ca7b35427c418a79e84d1f53ef8e1a82c9f942fc253d345eee69f25554ca3251670e455d40d5f60d1ef2db98ab1ede71ba7
+DIST policycoreutils-2.1.10-fix-seunshare.patch.gz 329 SHA256 06d2c9f6b885444203aeff467ae948473ec3e87a5ad4c6ce2112e6aa24bcea92 SHA512 b019769ef2ad5cc12fb5ba78ef4a71470986c47c340ec7a75c7503ee8890442a97fada519538c4a0629c951601fbe1785d3d61a85881ee6e93c693776f1a1249 WHIRLPOOL bebd536bb87ef9b66d3895af63e3fd32ef56d7a98e71e49a1200a7e6ea32cd69a186c020b53cc15eade7c74e042201c1448853e9ad6a0c95def02968f368e064
+DIST policycoreutils-2.1.10-sesandbox.patch.gz 5002 SHA256 cb4d2082f0eba4a0e4e394fde9acc00d652c7af6f0445151ee4cc7543c6fe069 SHA512 792b6d54941721cbb3ddaea973fc860faae0790e071d46a5e9ba60c0e625f3b05136706cd1882af79b5ec6b300d6f5ebbe29d309e66c9c51450cdf1a0b1d5ce2 WHIRLPOOL ef34c25fe12bd0f9bb40b9b8cb581543baf86f1215304fc173ab3632b81f621b33d09c5febd920ada66ba7e8bd2246ea5eff64470c6c4dd12ddcd86891689a1b
+DIST policycoreutils-2.1.10.tar.gz 907554 SHA256 8bbbc36b7d375edff891503932da93e37553f0dd7bdceded7ce9a45c80bec3d1 SHA512 7dd06daf2094f21703c9e84b7f591a4f31a4ea8813aac7c26e2264a0c972f5b566e981b5fdcc38ae2924ec45f0d3f2c0ac08accaaa647f9e5b4e99072dc49534 WHIRLPOOL a3208af4effb2c949fce25937872b9d849cfa57e043a5b41993cfe07b5b0763571354904147e005d8e8cefbf979e228dd2310b966399d13deb2b858ba6e9930f
+DIST policycoreutils-extra-1.21.tar.bz2 12864 SHA256 c2d3627e2a10f83f5de997e9db75c40830e7f3520b558807346c9bd9c49769bb SHA512 b0911711d6d509f70ad44f6f910a17f52ae72a94d37c9254f5009a3a740ac0cf8fa8ecb4506a9bd185db2defd872c3ecbcfebdf93b216a6950052a16008cc54e WHIRLPOOL a25af7e918beb9ba43ee4109647bad1892d5ffb0c0d9b7d20c606b85f9589e2cffbbd07d1187ae0082dcf2aff7b708c433393176f29557b0aa65b9e767813298
+EBUILD policycoreutils-2.1.10-r1.ebuild 5582 SHA256 e5890c79a891afcaeb8573e343f3886b258a148c2c4ff9005a07436617756674 SHA512 df26769020ced4ce671b0ecd8e7d416e24261b1c7c57609d59e7755ad23fd08ab8aa71454b985c859dbd8512758399d4fef8b3f42c0fb11074ba34e7bde5efef WHIRLPOOL 445f57cc60a824a7573eda19e49a40cc8ba3c04680cdb0ba07759a1254ee3952e5224fc8e6576a919bbdca36b5df817e8dcec082fca035b78055b7be8cff7f9c
+EBUILD policycoreutils-2.1.10-r3.ebuild 4355 SHA256 ba771c2c1769fd0f9eec3a5e855b958d4155ac85944b221340682513a50ccb70 SHA512 5b9f8c1454836486fca77f079e1c460f924fa1f47fb06b7eb9071c09fdeea1f6b6136b6674b9e7f7c9ccbdd0a39a5a1e1d8c4a482d5b504ae3c031eba60721e6 WHIRLPOOL aa26e26776196e51dd9b53a596697efe28172b11359414dca7bc67c695fb7e024c5a8349cffa82604e7cbf64cace0a5f928171df111a6699874f33666f9b1b68
+EBUILD policycoreutils-2.1.10-r4.ebuild 4353 SHA256 b46e61343c552f092abd5fec8ca7dbcf15cd7bc4d79e0f116f35e3e2fd9cae12 SHA512 60b86f353378c9507710914944e451d92d715da194edd594a840939be916e5c2469d454342eee3703b411cb7a5065f9bb4cea80da129aeb6f73ff9e99e7de810 WHIRLPOOL 35d2e1fd75ad7e59a5b2e6b389db2c1557205730085726225899c622ac9e714eb7e2cee7869faf5a24d3732433e741bc81ce54bde02904180d83ef93e1a7d1f0
+EBUILD policycoreutils-2.1.10.ebuild 5458 SHA256 a24b6bde380abe3674cf0a36dce8f2d98f2926808ade1941ffa117286003743b SHA512 2d67a7c0d60a89c8d6bdb1aea89d9b2bdbf09ea2c510ca52d6858861c56dea58ddca634dba8a2b9a17d570ad355f6da443896e50f280e23a678cd31e2ac7eb14 WHIRLPOOL dc89233f6c3d6b72e3d71e2288b52761452395ae2e6d5f0b327eb1fef24b480c5afb18e161e82ade401d84301d7d2c822d14db2ee3884808fc452bc8d50ff736
+MISC ChangeLog 16565 SHA256 f355c299930b08b8e84ff8ca01a0e1065547dedf318143fa1402e9409c87dce3 SHA512 01911ed072da2460509fe0d6616ac21a386774cc762dd1293c8c0752b629f56ac861128a74bc29fc448eb23ce352c20169b26f5faecc6b4e9656b7e1731cd9d7 WHIRLPOOL e63a24347a4df76af8f33e8165ff4eaf2b7b3e677d5216065d442c94f61b221d6b2670613a6cb06a1673d3d2e305104dd8b0ec81add24b73fa9c713ca591cf06
+MISC metadata.xml 959 SHA256 6683014987dd67dfbeb80ad329550fc20a0b09f5eaa7828054be62fff6aee391 SHA512 d44168511571036289259b0709fcb12f934bd789d872e256bf00b7b88247f08b5c5f6bbcf60e0ed654f391606f6c41baca92aa7208a80526ef01c2c34f06b962 WHIRLPOOL 59c9757a028d1731dac9abd05ee768fd153c303257a14acf4d53290e4108eecc45abbb879ef2143141b9d03cf3dc94e0ba1bdc8ed7b01f0d2ad84db5fb9f347e
diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.10-r4.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.10-r4.ebuild
new file mode 100644
index 000000000000..041bcbfcc9b8
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.10-r4.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.1.10-r4.ebuild,v 1.1 2012/07/10 20:01:25 swift Exp $
+
+EAPI="4"
+PYTHON_DEPEND="*"
+PYTHON_USE_WITH="xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+
+inherit multilib python toolchain-funcs eutils
+
+EXTRAS_VER="1.21"
+SEMNG_VER="2.1.6"
+SELNX_VER="2.1.9"
+SEPOL_VER="2.1.4"
+
+IUSE="audit pam dbus sesandbox"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${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"
+	# Fixes for Python 3 support in the extras
+	cd "${S2}";
+	epatch "${FILESDIR}/policycoreutils-extra-1.21-fix-python3.patch"
+}
+
+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
+}