remove old api policy, mark new api policy stable

5 files changed, 9 insertions, 72 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 984e4cba0736..a21566751ce9 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.7 2003/10/10 20:31:41 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.8 2003/10/29 03:44:15 pebenito Exp $
+
+  28 Oct 2003; Chris PeBenito <pebenito@gentoo.org>
+  selinux-base-policy-20031010.ebuild:
+  Mark stable
 
 *selinux-base-policy-20031010 (10 Oct 2003)
 
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 9463f9d94ae1..e83a26e834c5 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,6 +1,4 @@
-MD5 a9151deb985c6907e3b5e6c016b840b9 ChangeLog 3751
+MD5 c519322c7db7894c8e65375dfdb2e7e6 selinux-base-policy-20031010.ebuild 1708
+MD5 cee1f20c21efad06374bd8e492097be7 ChangeLog 3857
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
-MD5 c656ecb47e08edc4c5bfb0331e1f4919 selinux-base-policy-20030729-r1.ebuild 2101
-MD5 6721b0c93075e3fdb510aa27cb2b1168 selinux-base-policy-20031010.ebuild 1710
 MD5 58ed8d91932fc65a3cf102265e86ef3a files/digest-selinux-base-policy-20031010 80
-MD5 4d266a57f64936ce65e5018775edefd8 files/digest-selinux-base-policy-20030729-r1 80
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20030729-r1 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20030729-r1
deleted file mode 100644
index a6882eb096cc..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20030729-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f160d929ee0171a885d2cd39717cdb3 selinux-base-policy-20030729.tar.bz2 47040
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20030729-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20030729-r1.ebuild
deleted file mode 100644
index 177bbbf8d4e0..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20030729-r1.ebuild
+++ /dev/null
@@ -1,64 +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-20030729-r1.ebuild,v 1.2 2003/08/11 01:44:26 pebenito Exp $
-
-IUSE="selinux"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-RDEPEND="|| (
-		>=sys-kernel/selinux-sources-2.4.20-r1
-		>=sys-kernel/hardened-sources-2.4.20-r1
-	    )
-	 sys-devel/m4
-	 sys-devel/make"
-DEPEND=""
-S=${WORKDIR}/base-policy
-
-[ -z ${POLICYDIR} ] && POLICYDIR="/etc/security/selinux/src/policy"
-
-pkg_setup() {
-	if [ -z "`use selinux`" ]; then
-		eerror "selinux is missing from your USE.  You seem to be using the"
-		eerror "incorrect profile.  SELinux has a different profile than"
-		eerror "mainline Gentoo.  Make sure the /etc/make.profile symbolic"
-		eend 1 "link is pointing to /usr/portage/profiles/selinux-x86-1.4/"
-	fi
-}
-
-src_install() {
-	dodir /etc/security/selinux/src
-
-	insinto /etc/security
-	doins ${S}/appconfig/*
-	rm -fR ${S}/appconfig
-
-	mv ${S} ${D}/${POLICYDIR}
-}
-
-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
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20031010.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20031010.ebuild
index 31c9ec05c369..ce55148fcb8c 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20031010.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20031010.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2003/10/16 14:25:25 pebenito Exp $
+# $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=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 DEPEND=""
 RDEPEND="sys-devel/m4
 	 sys-devel/make"