Fix to have default POLICY_TYPES if it is empty.

Package-Manager: portage-2.1.2_pre3-r7

3 files changed, 23 insertions, 13 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 466ef71c3565..3474d862b43a 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.52 2006/10/21 14:21:37 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.53 2006/10/25 11:29:41 pebenito Exp $
+
+  25 Oct 2006; Chris PeBenito <pebenito@gentoo.org>
+  selinux-base-policy-20061015.ebuild:
+  Fix to have default POLICY_TYPES if it is empty.
 
   21 Oct 2006; Chris PeBenito <pebenito@gentoo.org>
   selinux-base-policy-20061015.ebuild:
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 04f4f73d0831..1d99a4966249 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -19,14 +19,14 @@ EBUILD selinux-base-policy-20051022-r1.ebuild 2701 RMD160 888e6df97c9cbd6f4d84db
 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-20061015.ebuild 2488 RMD160 0d1a49fdd58e44b71425fb84c85e1305c6076095 SHA1 dc753e5f87ca91100e16c623e38621f33ce3df74 SHA256 83c24f3e865cd4683bb71de502be75f8752cd2c3dda97b382a58f1688d0359a1
-MD5 16a660b71ebbbdfbbd37ca5fa9ec67e5 selinux-base-policy-20061015.ebuild 2488
-RMD160 0d1a49fdd58e44b71425fb84c85e1305c6076095 selinux-base-policy-20061015.ebuild 2488
-SHA256 83c24f3e865cd4683bb71de502be75f8752cd2c3dda97b382a58f1688d0359a1 selinux-base-policy-20061015.ebuild 2488
-MISC ChangeLog 12685 RMD160 4cb9352df65e5d57cbbc719411716b47ee7dcbe5 SHA1 4774f3a77b7d28fa93a17c08bbc4235d93e1b293 SHA256 091d9d020fc58d1ad2ec5e54c0f0f6812eea9441fc3fbaf8d550163fa5a826de
-MD5 b88bd720e6be3053ff08f6e5045330e7 ChangeLog 12685
-RMD160 4cb9352df65e5d57cbbc719411716b47ee7dcbe5 ChangeLog 12685
-SHA256 091d9d020fc58d1ad2ec5e54c0f0f6812eea9441fc3fbaf8d550163fa5a826de ChangeLog 12685
+EBUILD selinux-base-policy-20061015.ebuild 2754 RMD160 23148ffebe68f42afbb31c0c1646c38032816340 SHA1 feed00737f7edd9c487b54b75d0ad4ff9bf22cb1 SHA256 eff93b03933e248b889a2a3b8b238ee29cef44c32ca675e1906476e657090a2f
+MD5 1d718654fa1936d9261ebf790584018f selinux-base-policy-20061015.ebuild 2754
+RMD160 23148ffebe68f42afbb31c0c1646c38032816340 selinux-base-policy-20061015.ebuild 2754
+SHA256 eff93b03933e248b889a2a3b8b238ee29cef44c32ca675e1906476e657090a2f selinux-base-policy-20061015.ebuild 2754
+MISC ChangeLog 12828 RMD160 d2d680d35d3e98c132b37b23cac105c23673ded4 SHA1 8c94416c492a9f8e219eae03c9ef53ec272d562f SHA256 a9e0f454ecd5edf95f2eadfc8c75398915c735d1c52e9ebe5301a3357ce88288
+MD5 fa4603e3a62cb14f8b72de5772414f6c ChangeLog 12828
+RMD160 d2d680d35d3e98c132b37b23cac105c23673ded4 ChangeLog 12828
+SHA256 a9e0f454ecd5edf95f2eadfc8c75398915c735d1c52e9ebe5301a3357ce88288 ChangeLog 12828
 MISC metadata.xml 473 RMD160 2bc7b92e3958e9371896025467bd896501fe19bf SHA1 e5a10b5fddb435fa3d58ef67a1952ae5a0262f72 SHA256 c45743d603ee47355e9d7b1b14d850678825e9c1252d96ec44ce21ac0b2a55b9
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
 RMD160 2bc7b92e3958e9371896025467bd896501fe19bf metadata.xml 473
@@ -40,7 +40,7 @@ SHA256 538dd2b0ca51b9d2563fe7f7566d3572b76769159ba11482dc33785786a6607f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFOiz73gmyzsILbxIRAgLwAJ4obNc0EVgRMzlnAZ95JNsUhTKWgQCgwDwJ
-er41zBjQ9rUkv5iB+YkEvTg=
-=qT8f
+iD8DBQFFP0p93gmyzsILbxIRAuCvAKCmi11AiZ4N5Vv6hYVOcYC2CGxT/ACg1Gri
+bBwBme3llj2urvKbqsbI3NA=
+=+NXl
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20061015.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20061015.ebuild
index 34da4269f196..1a562927072b 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20061015.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20061015.ebuild
@@ -1,6 +1,6 @@
 # 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-20061015.ebuild,v 1.2 2006/10/21 14:21:37 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20061015.ebuild,v 1.3 2006/10/25 11:29:41 pebenito Exp $
 
 IUSE=""
 
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/
 
 src_unpack() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
+
 	unpack ${A}
 
 	for i in ${POLICY_TYPES}; do
@@ -33,6 +35,7 @@ src_unpack() {
 
 src_compile() {
 	local OPTS="MONOLITHIC=n DISTRO=gentoo QUIET=y"
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
 
 	cd ${S}/refpolicy
 
@@ -51,6 +54,7 @@ src_compile() {
 
 src_install() {
 	local OPTS="MONOLITHIC=n DISTRO=gentoo QUIET=y DESTDIR=${D}"
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
 
 	cd ${S}/refpolicy
 
@@ -76,6 +80,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
+
 	if has "loadpolicy" $FEATURES ; then
 		for i in ${POLICY_TYPES}; do
 			einfo "Inserting base module into ${i} module store."