Added new patchbundles for rev bumps to base policy 2.20101213

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

6 files changed, 250 insertions, 2 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 4b98e2e2edcc..822dd5d148ce 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.70 2011/02/05 12:20:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.71 2011/03/07 02:13:36 blueness Exp $
+
+*selinux-base-policy-2.20101213-r10 (07 Mar 2011)
+*selinux-base-policy-2.20101213-r9 (07 Mar 2011)
+
+  07 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+  +selinux-base-policy-2.20101213-r9.ebuild,
+  +selinux-base-policy-2.20101213-r10.ebuild,
+  +files/patchbundle-selinux-base-policy-2.20101213-r10.tar.bz2,
+  +files/patchbundle-selinux-base-policy-2.20101213-r9.tar.bz2:
+  Added new patchbundles for rev bumps to base policy 2.20101213
 
   05 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
   +files/patchbundle-selinux-base-policy-2.20101213-r5.tar.bz2,
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index dad25470e520..bcbe06fff813 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -7,9 +7,11 @@ AUX modules.conf.targeted 670 RMD160 8b36b672f70e932eeaa3288d6251d6ad79be10f3 SH
 AUX modules.conf.targeted.20070928 689 RMD160 9f7710a9dd553f92dbc9e294849b74ce91cd31a0 SHA1 aaba67cd4118251516b348dcdd0e281743ec0f5a SHA256 9d19d10ddf79eb641b12668b5633911a2a8d3421a6dcfb19a85bb5b36a53771c
 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-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
+AUX patchbundle-selinux-base-policy-2.20101213-r9.tar.bz2 9335 RMD160 c0634ec1832b8162e2911ed741ad1e7002c7fb3c SHA1 c4a15177c8f8948aecfb4a1aded64a0fc36eba2b SHA256 8a2d1e8cd09fd52ab31ac12ae6fe21a050926723edc365847d6d617cbea9dcb8
 AUX selinux-base-policy-20070329.diff 2822 RMD160 164c86d9eb814ada83499f529445d7360b634988 SHA1 22d4240dd4e8d4018e61e2d0d25c810bc0eeaa2b SHA256 6e45238d3baf2771dddb6d0323d3e012c657458d686564577b043199b0336d59
 DIST refpolicy-2.20090730.tar.bz2 489840 RMD160 d1d157a5ad243edd5d216504ed697f128420e8c1 SHA1 af479258b4e78b8bd7aa2a23dead49f4d61a552f SHA256 745077f6db86646458fe65df82eaa6ffc8491752e511d2a7397f4b46bd478f03
 DIST refpolicy-2.20090814.tar.bz2 490191 RMD160 a62b13cac598dcb83e9730d8fc3771f5130a4776 SHA1 b80315c3ea09f1cfac637f09ca3fad1e19674790 SHA256 d7c500e76089240b00a1a53238ccca581ef02cce7812bc68f8d0299b9c261c22
@@ -19,10 +21,12 @@ DIST refpolicy-20080525.tar.bz2 336603 RMD160 c4e846a5506164f8c89994df4bbd05b396
 EBUILD selinux-base-policy-2.20090730.ebuild 2940 RMD160 a4a6c14cda440566a2582c28ccf0e1b5474dbdb1 SHA1 1589347cce96ec35140db6eb6fb25604be63c846 SHA256 d5859b49ffa2e94a453facd23063b099e677418bbdeb7f7663198b261b34d592
 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-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 15888 RMD160 aeb5b90977a9de1d28e3d774f941fa1b7269a7db SHA1 348457af85736f27f4c21143adfcfbe1bdd69d8d SHA256 cb2c075529ef03437df4e0b3ded1b431268b778c1e149228be95fe1f41cf7df6
+MISC ChangeLog 16329 RMD160 8b2237c23d46775d18de44094d80a93f5eb147b2 SHA1 c50da9f77a1da706b1aa06e975facbbdc5067f16 SHA256 a80563702bfa8e4ef3094135c4fc5e9bec6b4bd188b176a8777130f772230a62
 MISC metadata.xml 582 RMD160 ca02d1eebc8ac4238e48f0900a773ad592e7a284 SHA1 866304bb54664b45a5defc32dd6a96e9283ddbde SHA256 7dba85fe3652f3bc9aed33885cbebaa3dc12303dfb3dd1b085dde48371602cf0
diff --git a/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r10.tar.bz2 b/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r10.tar.bz2
new file mode 100644
index 000000000000..65f8255ca764
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r10.tar.bz2
diff --git a/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r9.tar.bz2 b/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r9.tar.bz2
new file mode 100644
index 000000000000..dc7641167bc9
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/patchbundle-selinux-base-policy-2.20101213-r9.tar.bz2
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r10.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r10.ebuild
new file mode 100644
index 000000000000..75a354882848
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r10.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-r10.ebuild,v 1.1 2011/03/07 02:13:36 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-r9.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r9.ebuild
new file mode 100644
index 000000000000..a11078493570
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r9.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-r9.ebuild,v 1.1 2011/03/07 02:13:36 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
+}