pulling 20030603, 20030604 coming up

4 files changed, 6 insertions, 67 deletions

diff --git a/sys-apps/selinux-base-policy/ChangeLog b/sys-apps/selinux-base-policy/ChangeLog
index 5a4ae2639242..159f60da301e 100644
--- a/sys-apps/selinux-base-policy/ChangeLog
+++ b/sys-apps/selinux-base-policy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/selinux-base-policy
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-base-policy/ChangeLog,v 1.6 2003/06/03 21:14:52 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-base-policy/ChangeLog,v 1.7 2003/06/04 14:34:33 pebenito Exp $
+
+  04 Jun 2003; Chris PeBenito <pebenito@gentoo.org>
+  selinux-base-policy-20030603.ebuild:
+  Pulling 20030603, as there are problems, 20030604 later today
 
 *selinux-base-policy-20030603 (03 Jun 2003)
 
diff --git a/sys-apps/selinux-base-policy/Manifest b/sys-apps/selinux-base-policy/Manifest
index a0d6fc98715a..290da9226979 100644
--- a/sys-apps/selinux-base-policy/Manifest
+++ b/sys-apps/selinux-base-policy/Manifest
@@ -1,9 +1,7 @@
-MD5 c0d58f11f7a25765b0e094e88408e23d ChangeLog 1670
+MD5 8b1b353b3833d35061bca8fa48f1637c ChangeLog 1826
 MD5 fe962f6955776ec7ffae78658024afda selinux-base-policy-20030419.ebuild 759
 MD5 8983973be211a720ac086db1bc01424f selinux-base-policy-20030514.ebuild 1700
 MD5 74cd811461ea258a01bed996b3c440cd selinux-base-policy-20030522.ebuild 1765
-MD5 f1fb02fa07a854b035dfe1cc484ad32c selinux-base-policy-20030603.ebuild 2047
 MD5 768ab13f831e9da95f4341f783160bef files/digest-selinux-base-policy-20030419 80
 MD5 c4eb008b1e2774fa2f44385f4b84511d files/digest-selinux-base-policy-20030514 80
 MD5 089d5e5a8919ecaf9e9b3b4bf696dc78 files/digest-selinux-base-policy-20030522 80
-MD5 6b736a294ff3eadf115ff3f2f336920c files/digest-selinux-base-policy-20030603 80
diff --git a/sys-apps/selinux-base-policy/files/digest-selinux-base-policy-20030603 b/sys-apps/selinux-base-policy/files/digest-selinux-base-policy-20030603
deleted file mode 100644
index 7814bd07f844..000000000000
--- a/sys-apps/selinux-base-policy/files/digest-selinux-base-policy-20030603
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e630fcc012cb5a370a3f5864818ab29 selinux-base-policy-20030603.tar.bz2 46008
diff --git a/sys-apps/selinux-base-policy/selinux-base-policy-20030603.ebuild b/sys-apps/selinux-base-policy/selinux-base-policy-20030603.ebuild
deleted file mode 100644
index 013dae6e9544..000000000000
--- a/sys-apps/selinux-base-policy/selinux-base-policy-20030603.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-base-policy/selinux-base-policy-20030603.ebuild,v 1.1 2003/06/03 21:14:52 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
-
-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}/etc/security/selinux/src/policy
-}
-
-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
-}