Updated patchbundle for base policy 2.20101213

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

5 files changed, 147 insertions, 6 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index ce50bf0cbd4a..a58a98cbe0c5 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.72 2011/04/16 13:02:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.73 2011/05/20 19:02:56 blueness Exp $
+
+*selinux-base-policy-2.20101213-r16 (20 May 2011)
+
+  20 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  +selinux-base-policy-2.20101213-r16.ebuild,
+  +files/patchbundle-selinux-base-policy-2.20101213-r16.tar.bz2, metadata.xml:
+  Drop obsoleted policy builds, add openrc support (rc-update, rc-status),
+  correct file contexts for /lib64, make UBAC optional (#257111 and #306393),
+  use portage_srcrepo_t for live ebuilds and match mdadm policy with upstream
 
 *selinux-base-policy-2.20101213-r12 (16 Apr 2011)
 *selinux-base-policy-2.20101213-r11 (16 Apr 2011)
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 780ac274d8b5..d7b98c47ddd9 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -13,6 +13,7 @@ AUX modules.conf.targeted.20090730 746 RMD160 51929329cb860f5412ea4fda11e1d4bc8e
 AUX patchbundle-selinux-base-policy-2.20101213-r10.tar.bz2 9480 RMD160 e61d2ea5c6eb559bba64feeaffac378dea94210f SHA1 c83f498a4160abf74280cfdc7ff665029cbec0de SHA256 b158dead632059dd1cc8b3e35fca5562924eadcd458fe64101de3fa109ad3792
 AUX patchbundle-selinux-base-policy-2.20101213-r11.tar.bz2 12037 RMD160 0c49eddeed9853f667cc40a90b8d6cf776e7f717 SHA1 d72de3ec9fb86a726b65e6bd71aad7c9e67993bf SHA256 443266b9c90cfb4657485d59d1787130ca2df6d5f93595427b8418036578864f
 AUX patchbundle-selinux-base-policy-2.20101213-r12.tar.bz2 12665 RMD160 c73daac90cf220278d1111466344b7fad4389a1f SHA1 c1164674566218e6cecfbb5b85ee183a0d1ec8b8 SHA256 dafde17a431e5b93e7ac72e3eafcbe5e8e92e0e6629ceb543afe764abe7cdd4e
+AUX patchbundle-selinux-base-policy-2.20101213-r16.tar.bz2 13853 RMD160 7cfa1a2af1677bb4609fccc6225e963657892e96 SHA1 2fb4f1ba11e95c5a8bf3f6887fd7eb54e9d7439d SHA256 800004fc009e3e7894c21554119c26ef460ed497cebf792412fbbadab41f96c4
 AUX patchbundle-selinux-base-policy-2.20101213-r5.tar.bz2 8175 RMD160 6d78f0c245671f6713ed40e95e757a207dc24d4c SHA1 6e8308f3bde75322718110a40efb22e76c02771a SHA256 5fd9403c8d8a311c1def0eced87d7c3f29377b03842c16a935573668115e176e
 AUX patchbundle-selinux-base-policy-2.20101213-r6.tar.bz2 8175 RMD160 6d78f0c245671f6713ed40e95e757a207dc24d4c SHA1 6e8308f3bde75322718110a40efb22e76c02771a SHA256 5fd9403c8d8a311c1def0eced87d7c3f29377b03842c16a935573668115e176e
 AUX patchbundle-selinux-base-policy-2.20101213-r7.tar.bz2 8620 RMD160 03260916c42b1aab6925aa228adbccc384200fca SHA1 1bb6cf090d44cb6a7d57a4892253a4cc2ad138f7 SHA256 216ee1b33411dde947faa8954c12c81fb9abd344a244fb1b9643918dc4a83986
@@ -29,18 +30,19 @@ EBUILD selinux-base-policy-2.20091215.ebuild 3065 RMD160 8477cbb7a0cf627421110ab
 EBUILD selinux-base-policy-2.20101213-r10.ebuild 2989 RMD160 205a71c62d5f42d4f750013c5937ac1190640cb7 SHA1 930e047831a455505f657ceb7a884500429ee50f SHA256 3b34d7d623bdcea35d95f295d0bad4542013216931455092b8bf963d02f5d4c5
 EBUILD selinux-base-policy-2.20101213-r11.ebuild 2989 RMD160 0f2f2e5fdfb1780d2a8eaaaf4c58ea6489a7c230 SHA1 15da66015404ad14bb0e9d939e487ee0cc7358fb SHA256 b38f7a4697ac0f990ee4c01de8053baa93fd251b8aa785f5018cbc80db88a732
 EBUILD selinux-base-policy-2.20101213-r12.ebuild 2989 RMD160 8a87d939a0466944d28b4e413221c3e4cbce1821 SHA1 ae276bddb77adc025f853686305fa577b8e2ce81 SHA256 785d7ed83c089cb9eebcff9480fe573eb194fd10fdcce8ce866af2062b35a0e2
+EBUILD selinux-base-policy-2.20101213-r16.ebuild 3452 RMD160 6978e9286b3671dab3943a404760ea074abbc507 SHA1 bb53f9d30f941e254f4b1b147e47f5ab7a2620aa SHA256 37a250dc37aebf917d1887ba10941140046de4f80087f5006934668138aea37f
 EBUILD selinux-base-policy-2.20101213-r5.ebuild 2969 RMD160 437ed39daead1277cd6cbe75210031d120953f4d SHA1 7ed1cfcc8af35b2cec0f3f06aa8ab649e720b65e SHA256 1d8e49ba5beaca19e376bd182ee1e5018c5b182c0f982496d45cefe270ad4d64
 EBUILD selinux-base-policy-2.20101213-r6.ebuild 2988 RMD160 dc1a45371e6ab25b8421931a98db1dd58b39c75d SHA1 bf6e8ef46d4378e6cacf671ec6f2868a65ddb628 SHA256 b55715183bfc18edd803226432584f13dac4098e266ca99e90b97925a40cbdf0
 EBUILD selinux-base-policy-2.20101213-r7.ebuild 2988 RMD160 5a109391653981a920fccda1add40bee82df3d1c SHA1 9ceae24314aa56e61384cf9fb36bfccf20de39fc SHA256 da397bed568c9cd04f5e66cd8a7fd243b7f3155b1b96a4c43415109f4457b93f
 EBUILD selinux-base-policy-2.20101213-r9.ebuild 2988 RMD160 8074f1c57219dd0219a7e3fc73260bb5961b7ece SHA1 50c59ddbbaadab3a5386526e08158b7c40806204 SHA256 ff13d3c17e11eec98111382e2deb4eb709c773095ca5de8d04127c112f87c78c
 EBUILD selinux-base-policy-20080525-r1.ebuild 3068 RMD160 f667dc4a3825a8f6b4c269e8012a9c8a6f764704 SHA1 232dd533252299a75f137258d2d7b3e239f8ea3f SHA256 14a6d7008cf023642fdd1478b746383abc8a0581e285d72804b4fbc60b5d7623
 EBUILD selinux-base-policy-20080525.ebuild 2985 RMD160 42dc3b88d0f93c777f3e2485bd2c095e2a05a6e9 SHA1 36ec26261df5aef2804b4b79f74a2ff39691d550 SHA256 a0d78a4530639c47314b824e494b9b246a979995337703e1cc31946f82e34cce
-MISC ChangeLog 16773 RMD160 d8501e884959109731aec9fbe249098a7bdd82c2 SHA1 74e8808c839e0439cd202046d079d5110c4cb41a SHA256 13b702129c7c23953445fb8f1ad7ad00f59b2d93401db962046e8a31106a3efb
-MISC metadata.xml 582 RMD160 ca02d1eebc8ac4238e48f0900a773ad592e7a284 SHA1 866304bb54664b45a5defc32dd6a96e9283ddbde SHA256 7dba85fe3652f3bc9aed33885cbebaa3dc12303dfb3dd1b085dde48371602cf0
+MISC ChangeLog 17236 RMD160 8bc1ae4815f7c86537a78ec5a484970bfebeadc8 SHA1 203b1f955515af2a49d585ba609b3b80ac8fc430 SHA256 5b79817b637a5c0f3d00293843262ed53b3e91d6612fd043f192836e0b3b34e7
+MISC metadata.xml 671 RMD160 49dd94bb827c4ab2bb8043739ef7564df4cf1c07 SHA1 a92b8a5ef129707a44fe2ae1913060d02badd566 SHA256 c32ccc54ca7df400974a19ad14c093ea7b777f7a40467bdb672f441314122e55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk2pk30ACgkQl5yvQNBFVTVRWQCeIKshFcKrOiXLAgtObCtsHjUK
-sTEAoImC8hT3tKoliEGMkXezK6LZ6XLF
-=zZ4Y
+iEYEAREIAAYFAk3WuuoACgkQl5yvQNBFVTUOywCgnwO76R2NjzXk5vnGQTkhPe0F
+q8QAniTp+en9GqvBCj8QcPjyF3TR73jC
+=3tvo
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r16.tar.bz2 b/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r16.tar.bz2
new file mode 100644
index 000000000000..d2969cbd1da5
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r16.tar.bz2
diff --git a/sec-policy/selinux-base-policy/metadata.xml b/sec-policy/selinux-base-policy/metadata.xml
index 4e26a8603f4d..393f3bb02965 100644
--- a/sec-policy/selinux-base-policy/metadata.xml
+++ b/sec-policy/selinux-base-policy/metadata.xml
@@ -9,5 +9,6 @@
 	<use>
 		<flag name='peer_perms'>Enable the labeled networking peer permissions (SELinux policy capability).</flag>
 		<flag name='open_perms'>Enable the open permissions for file object classes (SELinux policy capability).</flag>
+		<flag name='ubac'>Enable User Based Access Control (UBAC) in the SELinux policy</flag>
 	</use>
 </pkgmetadata>
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r16.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r16.ebuild
new file mode 100644
index 000000000000..551fb9610ba1
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r16.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r16.ebuild,v 1.1 2011/05/20 19:02:56 blueness Exp $
+
+EAPI="1"
+IUSE="+peer_perms +open_perms +ubac"
+
+inherit eutils
+
+PATCHBUNDLE="${FILESDIR}/patchbundle-${PF}.tar.bz2"
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-apps/policycoreutils-1.30.30
+	>=sys-fs/udev-151"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-1.30.12"
+
+S=${WORKDIR}/
+
+src_unpack() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
+	MOD_CONF_VER="20090730"
+
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${PATCHBUNDLE}"
+	cd "${S}/refpolicy"
+	# Fix bug 257111
+	sed -i -e 's:system_crond_t:system_cronjob_t:g' \
+		"${S}/refpolicy/config/appconfig-standard/default_contexts"
+
+	if ! use peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}"
+
+		cd "${S}/${i}";
+		make conf || die "${i} reconfiguration failed"
+
+		cp "${FILESDIR}/modules.conf.${i}.${MOD_CONF_VER}" \
+			"${S}/${i}/policy/modules.conf" \
+			|| die "failed to set up modules.conf"
+		sed -i -e '/^QUIET/s/n/y/' -e '/^MONOLITHIC/s/y/n/' \
+			-e "/^NAME/s/refpolicy/$i/" "${S}/${i}/build.conf" \
+			|| die "build.conf setup failed."
+
+		if ! use ubac; then
+			sed -i -e 's:^UBAC = y:UBAC = n:g' "${S}/${i}/build.conf"
+		fi
+
+		echo "DISTRO = gentoo" >> "${S}/${i}/build.conf"
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+		make base || die "${i} compile failed"
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+
+		make DESTDIR="${D}" install \
+			|| die "${i} install failed."
+
+		make DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+	done
+
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-2.20101213-r13"
+	previous_less_than_r13=$?
+}
+
+pkg_postinst() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting base module into ${i} module store."
+
+		cd "/usr/share/selinux/${i}"
+		semodule -s "${i}" -b base.pp || die "Could not load in new base policy"
+	done
+	elog "Updates on policies might require you to relabel files. If you, after"
+	elog "installing new SELinux policies, get 'permission denied' errors,"
+	elog "relabelling your system using 'rlpkg -a -r' might resolve the issues."
+}