mark stable. add build USE

5 files changed, 29 insertions, 67 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index fea845b3c04c..346a737284a4 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.9 2003/11/13 05:57:48 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.10 2003/11/27 17:51:43 pebenito Exp $
+
+  27 Nov 2003; Chris PeBenito <pebenito@gentoo.org>
+  selinux-base-policy-20031010-r1.ebuild:
+  Mark stable.  Add build USE flag for stage building.
 
 *selinux-base-policy-20031010-r1 (12 Nov 2003)
 
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index d83678630079..df53a7e9e10c 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,7 +1,5 @@
-MD5 311afe4aad267ff527fc23ab2c2be4ee ChangeLog 4223
+MD5 2b5532ca200eefb37dd9c17fd2308839 ChangeLog 4374
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
-MD5 3f602ae1030080dc1c73bbb6e0deb7c9 selinux-base-policy-20031010-r1.ebuild 1794
-MD5 c519322c7db7894c8e65375dfdb2e7e6 selinux-base-policy-20031010.ebuild 1708
+MD5 cf680c66e6bb71484cd79a66b893a8db selinux-base-policy-20031010-r1.ebuild 2226
 MD5 58ed8d91932fc65a3cf102265e86ef3a files/digest-selinux-base-policy-20031010-r1 80
-MD5 58ed8d91932fc65a3cf102265e86ef3a files/digest-selinux-base-policy-20031010 80
 MD5 73ed970a243dc34033a2f2c29f5b63e1 files/selinux-base-policy-20031010-cvs.diff 4268
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20031010 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20031010
deleted file mode 100644
index a5a9e2f5961f..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20031010
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50cff5131904b9d20bae580edad5cd37 selinux-base-policy-20031010.tar.bz2 58084
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20031010-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20031010-r1.ebuild
index 0e62d465dbad..e14c3294c9e0 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20031010-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20031010-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20031010-r1.ebuild,v 1.1 2003/11/13 05:57:48 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20031010-r1.ebuild,v 1.2 2003/11/27 17:51:43 pebenito Exp $
 
-IUSE=""
+IUSE="build"
 
 DESCRIPTION="Gentoo base policy for SELinux"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-DEPEND=""
+KEYWORDS="x86 ppc sparc"
+DEPEND="build? ( sys-devel/make )"
 RDEPEND="sys-devel/m4
 	 sys-devel/make"
 
@@ -25,13 +25,26 @@ src_unpack() {
 }
 
 src_install() {
-	dodir /etc/security/selinux/src
+	if use build; then
+		# generate a file_contexts
+		dodir ${POLICYDIR}/file_contexts
+		einfo "Ignore the checkpolicy error on the next line."
+		make -C ${S} \
+			FC=${D}/${POLICYDIR}/file_contexts/file_contexts \
+			${D}/${POLICYDIR}/file_contexts/file_contexts
 
-	insinto /etc/security
-	doins ${S}/appconfig/*
+		[ ! -f ${D}/${POLICYDIR}/file_contexts/file_contexts ] && \
+			die "file_contexts was not generated."
+	else
+		# install full policy
+		dodir /etc/security/selinux/src
 
-	cp -a ${S} ${D}/${POLICYDIR}
-	rm -fR ${D}/${POLICYDIR}/appconfig
+		insinto /etc/security
+		doins ${S}/appconfig/*
+
+		cp -a ${S} ${D}/${POLICYDIR}
+		rm -fR ${D}/${POLICYDIR}/appconfig
+	fi
 }
 
 pkg_postinst() {
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20031010.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20031010.ebuild
deleted file mode 100644
index ce55148fcb8c..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20031010.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20031010.ebuild,v 1.4 2003/10/29 03:44:15 pebenito Exp $
-
-IUSE=""
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-DEPEND=""
-RDEPEND="sys-devel/m4
-	 sys-devel/make"
-
-S=${WORKDIR}/base-policy
-
-[ -z ${POLICYDIR} ] && POLICYDIR="/etc/security/selinux/src/policy"
-
-src_install() {
-	dodir /etc/security/selinux/src
-
-	insinto /etc/security
-	doins ${S}/appconfig/*
-
-	cp -a ${S} ${D}/${POLICYDIR}
-	rm -fR ${D}/${POLICYDIR}/appconfig
-}
-
-pkg_postinst() {
-	echo
-	einfo "This is the base policy for SELinux on Gentoo.  This policy"
-	einfo "package only covers the applications in the system profile."
-	einfo "More policy may need to be added according to your requirements."
-	echo
-	eerror "It is STRONGLY suggested that you evaluate and merge the"
-	eerror "policy changes.  If any of the file contexts (*.fc) have"
-	eerror "changed, you should also relabel."
-	echo
-	ewarn "Please check the Changelog, there may be important information."
-	echo
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	sleep 8
-}