Update for testing fixes.

(Portage version: 2.1.2_pre2-r8)
 (Signed Manifest commit)

3 files changed, 22 insertions, 114 deletions

diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index ffb271f5abdc..0f03ebec1ffe 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX config 447 RMD160 e7c65cdee66dd93597f6608c48ab672327dfaf99 SHA1 32ec28fff992016971ddec982c203a44275552fc SHA256 8192a534941ef95ca93bfff3a0a078407480e52047048daccb5cb7acac1eaddf
 MD5 0e845ce007e469b90bf7528beb3fec26 files/config 447
 RMD160 e7c65cdee66dd93597f6608c48ab672327dfaf99 files/config 447
@@ -10,20 +13,20 @@ AUX modules.conf.targeted 670 RMD160 8b36b672f70e932eeaa3288d6251d6ad79be10f3 SH
 MD5 3de3bf4aae74324df77dc14a55556b59 files/modules.conf.targeted 670
 RMD160 8b36b672f70e932eeaa3288d6251d6ad79be10f3 files/modules.conf.targeted 670
 SHA256 b774c2d7175f2d4f73ac7068b3c62bbaa1b6e5f92294dfdee2afdf0d2ccff8b3 files/modules.conf.targeted 670
-DIST refpolicy-20061008.tar.bz2 301484 RMD160 b079c1bad4f7122915e50390131c2091aad1dd9a SHA1 6d5d042724df988740e669f2779a84806b46aa87 SHA256 4aa8add76221e4e578eeb9bca2184e1a68c7007e46358f4b77f50a5f4af8a68f
+DIST refpolicy-20061015.tar.bz2 301438 RMD160 45c6c120976c0f569ffae02b286d44ccf4c1d783 SHA1 ced80a684283dec3d391575c9b58e7cd8dc41efd SHA256 c2e34c9aad12a21e15eec9630d28a72f3cc5129ef55f1007d35f998d8b52314b
 DIST selinux-base-policy-20051022.tar.bz2 78419
 EBUILD selinux-base-policy-20051022-r1.ebuild 2701 RMD160 888e6df97c9cbd6f4d84db8667b527fa2416cbcf SHA1 8ca64e47834bf3f9115e26647cc886778bc180d8 SHA256 02235c69aae16cac9228bba9adb7004a1f491fbf69d5e293081deb6c23d6ebec
 MD5 3ae66c409521d346c33ee7fcc78d1cb8 selinux-base-policy-20051022-r1.ebuild 2701
 RMD160 888e6df97c9cbd6f4d84db8667b527fa2416cbcf selinux-base-policy-20051022-r1.ebuild 2701
 SHA256 02235c69aae16cac9228bba9adb7004a1f491fbf69d5e293081deb6c23d6ebec selinux-base-policy-20051022-r1.ebuild 2701
-EBUILD selinux-base-policy-20061008.ebuild 2484 RMD160 562ae302c85ce9eb0870de93d8e1bb7655bb0894 SHA1 2726c64db5b8b6c2b25c4c9ea15276ef4cabc6b4 SHA256 2df11d2505400d64a64fc650ebe6ae26182c076b1898425eafc5658da2915817
-MD5 5a4711646c1afd3dee5f23b7baf0cae6 selinux-base-policy-20061008.ebuild 2484
-RMD160 562ae302c85ce9eb0870de93d8e1bb7655bb0894 selinux-base-policy-20061008.ebuild 2484
-SHA256 2df11d2505400d64a64fc650ebe6ae26182c076b1898425eafc5658da2915817 selinux-base-policy-20061008.ebuild 2484
-MISC ChangeLog 12350 RMD160 fded28b33c5ea0c4a2e4096c928baa658563cd3c SHA1 9381608cf8dac4f66f2f7ddcf5a1c902993d0dc6 SHA256 dcde9e3b3927a8394de27ff8482fe02c32d8ecb98ef6b5794297d3eee41994e9
-MD5 9154c676788334412d4afb541980aca0 ChangeLog 12350
-RMD160 fded28b33c5ea0c4a2e4096c928baa658563cd3c ChangeLog 12350
-SHA256 dcde9e3b3927a8394de27ff8482fe02c32d8ecb98ef6b5794297d3eee41994e9 ChangeLog 12350
+EBUILD selinux-base-policy-20061015.ebuild 2484 RMD160 90424de9ef7fb3dae5c70e0d47b9eab3c44a3845 SHA1 5a10ad3e780a079983ae79a6665d2725006ed194 SHA256 c0bc84c91f6d05adc07085189d1d78699e3ff13bacf910797babbef81ba91906
+MD5 7d0698f908aa39c4ed31cf7cc51fd9a2 selinux-base-policy-20061015.ebuild 2484
+RMD160 90424de9ef7fb3dae5c70e0d47b9eab3c44a3845 selinux-base-policy-20061015.ebuild 2484
+SHA256 c0bc84c91f6d05adc07085189d1d78699e3ff13bacf910797babbef81ba91906 selinux-base-policy-20061015.ebuild 2484
+MISC ChangeLog 12556 RMD160 7fbf508885b22a2c7fef9371b9f0535f5442236d SHA1 ec1eca5fb1fb3dad9724d117e367d722359d035b SHA256 d5b32234427c7bebadbaeda82e0dfa3e5580d5109f70c7aabd4724a001ec08f1
+MD5 6c5736befdcda5511bcf90b6cf9d7f05 ChangeLog 12556
+RMD160 7fbf508885b22a2c7fef9371b9f0535f5442236d ChangeLog 12556
+SHA256 d5b32234427c7bebadbaeda82e0dfa3e5580d5109f70c7aabd4724a001ec08f1 ChangeLog 12556
 MISC metadata.xml 473 RMD160 2bc7b92e3958e9371896025467bd896501fe19bf SHA1 e5a10b5fddb435fa3d58ef67a1952ae5a0262f72 SHA256 c45743d603ee47355e9d7b1b14d850678825e9c1252d96ec44ce21ac0b2a55b9
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
 RMD160 2bc7b92e3958e9371896025467bd896501fe19bf metadata.xml 473
@@ -31,6 +34,13 @@ SHA256 c45743d603ee47355e9d7b1b14d850678825e9c1252d96ec44ce21ac0b2a55b9 metadata
 MD5 e98762e20bb0670885487f9d1998489e files/digest-selinux-base-policy-20051022-r1 80
 RMD160 fd8b1e3edbafd7c82e3b3229b8f8ede6a049e178 files/digest-selinux-base-policy-20051022-r1 80
 SHA256 ea385a52842f99c4014977b5369d3fb01d26ffacde34148bbedddd562c1f97de files/digest-selinux-base-policy-20051022-r1 80
-MD5 ee5c4091cfebe8deda3555a372d34b84 files/digest-selinux-base-policy-20061008 259
-RMD160 da6753a43cb7513f7a7d989a08936a6fc6249ef2 files/digest-selinux-base-policy-20061008 259
-SHA256 9ef2f56df74624eedd2ba705b9215c1a1a0d4f36025070476db62c4091e9fbe5 files/digest-selinux-base-policy-20061008 259
+MD5 b7d3ab686d3b1fc1762ec6dbcb95e2b9 files/digest-selinux-base-policy-20061015 259
+RMD160 d1442b3f8948846c241b77ca6a83ea65f2dbaf3c files/digest-selinux-base-policy-20061015 259
+SHA256 538dd2b0ca51b9d2563fe7f7566d3572b76769159ba11482dc33785786a6607f files/digest-selinux-base-policy-20061015 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFMpjw3gmyzsILbxIRAknFAKC9ZXUynjHIm/gbuMvSpMvC5CCS3gCfRV6h
+KIvmA3WSB96Ul886RzZmTQE=
+=kT8v
+-----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20061008 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20061008
deleted file mode 100644
index 5c96d2ab9190..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20061008
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a567e011ad98efe578afa0a359f46b55 refpolicy-20061008.tar.bz2 301484
-RMD160 b079c1bad4f7122915e50390131c2091aad1dd9a refpolicy-20061008.tar.bz2 301484
-SHA256 4aa8add76221e4e578eeb9bca2184e1a68c7007e46358f4b77f50a5f4af8a68f refpolicy-20061008.tar.bz2 301484
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20061008.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20061008.ebuild
deleted file mode 100644
index 1656cd6691b3..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20061008.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2006 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-20061008.ebuild,v 1.1 2006/10/09 23:44:44 pebenito Exp $
-
-IUSE=""
-
-inherit eutils
-
-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="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
-KEYWORDS="x86 ppc sparc amd64 mips alpha"
-
-RDEPEND=">=sys-apps/policycoreutils-1.30.30"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-1.30.12"
-
-S=${WORKDIR}/
-
-src_unpack() {
-	unpack ${A}
-
-	for i in ${POLICY_TYPES}; do
-		mkdir -p ${S}/${i}/policy
-		cp ${FILESDIR}/modules.conf.${i} ${S}/${i}/policy/modules.conf
-	done
-}
-
-src_compile() {
-	local OPTS="MONOLITHIC=n DISTRO=gentoo QUIET=y"
-
-	cd ${S}/refpolicy
-
-	make ${OPTS} generate || die "Failed to create generated module files"
-
-	make ${OPTS} xml || "XML generation failed."
-
-	for i in ${POLICY_TYPES}; do
-#		make ${OPTS} TYPE=${i} NAME=${i} LOCAL_ROOT=${S}/${i} conf \
-#			|| die "${i} modules.conf update failed"
-
-		make ${OPTS} TYPE=${i} NAME=${i} LOCAL_ROOT=${S}/${i} base \
-			|| die "${i} compile failed"
-	done
-}
-
-src_install() {
-	local OPTS="MONOLITHIC=n DISTRO=gentoo QUIET=y DESTDIR=${D}"
-
-	cd ${S}/refpolicy
-
-	for i in ${POLICY_TYPES}; do
-		make ${OPTS} TYPE=${i} NAME=${i} LOCAL_ROOT=${S}/${i} install \
-			|| die "${i} install failed."
-
-		make ${OPTS} TYPE=${i} NAME=${i} 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() {
-	if has "loadpolicy" $FEATURES ; then
-		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
-	else
-		echo
-		echo
-		eerror "Policy has not been loaded.  It is strongly suggested"
-		eerror "that the policy be loaded before continuing!!"
-		echo
-		einfo "Automatic policy loading can be enabled by adding"
-		einfo "\"loadpolicy\" to the FEATURES in make.conf."
-		echo
-		echo
-		ebeep 4
-		epause 4
-	fi
-}