Added new patchbundles for rev bumps to base policy 2.20101213

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

6 files changed, 260 insertions, 2 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 822dd5d148ce..ce50bf0cbd4a 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,16 @@
 # 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.71 2011/03/07 02:13:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.72 2011/04/16 13:02:44 blueness Exp $
+
+*selinux-base-policy-2.20101213-r12 (16 Apr 2011)
+*selinux-base-policy-2.20101213-r11 (16 Apr 2011)
+
+  16 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  +selinux-base-policy-2.20101213-r11.ebuild,
+  +selinux-base-policy-2.20101213-r12.ebuild,
+  +files/patchbundle-selinux-base-policy-2.20101213-r11.tar.bz2,
+  +files/patchbundle-selinux-base-policy-2.20101213-r12.tar.bz2:
+  Added new patchbundles for rev bumps to base policy 2.20101213
 
 *selinux-base-policy-2.20101213-r10 (07 Mar 2011)
 *selinux-base-policy-2.20101213-r9 (07 Mar 2011)
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index bcbe06fff813..780ac274d8b5 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX config 447 RMD160 e7c65cdee66dd93597f6608c48ab672327dfaf99 SHA1 32ec28fff992016971ddec982c203a44275552fc SHA256 8192a534941ef95ca93bfff3a0a078407480e52047048daccb5cb7acac1eaddf
 AUX modules.conf.strict 652 RMD160 78fc162f0b04e0d13767ae2c96391ad779f006da SHA1 5389ceffa40602679ef48d8bcab6e7227cafae7c SHA256 18f52a3463de7b2f5a7cc80a0b43270f15522c89a8e833b19d842a13655afe8f
 AUX modules.conf.strict.20070928 671 RMD160 ca125b4a8846c891a7b58df5cf36d215a6391c6a SHA1 124e3794dcb82b4738a7ee24a5e2107ba56b21d0 SHA256 09173a661f0a9eaab9fca98703fb672b572f203ff987b0917c105e80107a23bf
@@ -8,6 +11,8 @@ AUX modules.conf.targeted.20070928 689 RMD160 9f7710a9dd553f92dbc9e294849b74ce91
 AUX modules.conf.targeted.20080525 734 RMD160 3e467e75a25463b139d26a503c5e54e5a8980084 SHA1 efd642c0a69283ab4174d0d88df27ac015850fd6 SHA256 d24b185ed427f1fd46faf05e597c50e8671b4285600d05074cf10924154a35b9
 AUX modules.conf.targeted.20090730 746 RMD160 51929329cb860f5412ea4fda11e1d4bc8eafadae SHA1 80c8ac75f2102968f22f7469142b820a33a0a2c0 SHA256 435cb66eee3c702bd217a66d138d740ceb7f750380fb4681d6eae4b5acacf2c0
 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-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
@@ -22,11 +27,20 @@ EBUILD selinux-base-policy-2.20090730.ebuild 2940 RMD160 a4a6c14cda440566a2582c2
 EBUILD selinux-base-policy-2.20090814.ebuild 2940 RMD160 07e7a3c2fc462a44d02a2090311a116ec76e47ac SHA1 96662ce3d4751a4d4204e6dfe82e4441de231772 SHA256 aa324229c3858a542fe4826ffb3907ff438d37ff1da23dfc801d663f94dfa865
 EBUILD selinux-base-policy-2.20091215.ebuild 3065 RMD160 8477cbb7a0cf627421110ab3204ff16334ff6324 SHA1 16175073dfc79810795bbe3b72f9c096d8a081da SHA256 012ae2d09bab8059244c475ee58c6b59d14a9f78be61ac50079bea9cb3f93f77
 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-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 16329 RMD160 8b2237c23d46775d18de44094d80a93f5eb147b2 SHA1 c50da9f77a1da706b1aa06e975facbbdc5067f16 SHA256 a80563702bfa8e4ef3094135c4fc5e9bec6b4bd188b176a8777130f772230a62
+MISC ChangeLog 16773 RMD160 d8501e884959109731aec9fbe249098a7bdd82c2 SHA1 74e8808c839e0439cd202046d079d5110c4cb41a SHA256 13b702129c7c23953445fb8f1ad7ad00f59b2d93401db962046e8a31106a3efb
 MISC metadata.xml 582 RMD160 ca02d1eebc8ac4238e48f0900a773ad592e7a284 SHA1 866304bb54664b45a5defc32dd6a96e9283ddbde SHA256 7dba85fe3652f3bc9aed33885cbebaa3dc12303dfb3dd1b085dde48371602cf0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk2pk30ACgkQl5yvQNBFVTVRWQCeIKshFcKrOiXLAgtObCtsHjUK
+sTEAoImC8hT3tKoliEGMkXezK6LZ6XLF
+=zZ4Y
+-----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r11.tar.bz2 b/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r11.tar.bz2
new file mode 100644
index 000000000000..986142dc8387
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r11.tar.bz2
diff --git a/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r12.tar.bz2 b/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r12.tar.bz2
new file mode 100644
index 000000000000..81074f5a3ddd
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r12.tar.bz2
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r11.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r11.ebuild
new file mode 100644
index 000000000000..5d270a3462b5
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r11.ebuild
@@ -0,0 +1,117 @@
+# 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-r11.ebuild,v 1.1 2011/04/16 13:02:44 blueness Exp $
+
+EAPI="1"
+IUSE="+peer_perms open_perms"
+
+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."
+
+		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_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
+	done
+}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r12.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r12.ebuild
new file mode 100644
index 000000000000..9ad4d0e0396b
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r12.ebuild
@@ -0,0 +1,117 @@
+# 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-r12.ebuild,v 1.1 2011/04/16 13:02:44 blueness Exp $
+
+EAPI="1"
+IUSE="+peer_perms open_perms"
+
+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."
+
+		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_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
+	done
+}