new release to support 2.6.12 features

(Portage version: 2.0.51.22-r1)

6 files changed, 13 insertions, 93 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 3ac88ab41abe..9ebb8b562813 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.38 2005/05/10 18:31:19 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.39 2005/06/18 14:18:31 pebenito Exp $
+
+*selinux-base-policy-20050618 (18 Jun 2005)
+
+  18 Jun 2005; Chris PeBenito <pebenito@gentoo.org>
+  -selinux-base-policy-20041123.ebuild,
+  -selinux-base-policy-20050306.ebuild,
+  +selinux-base-policy-20050618.ebuild:
+  New release to support 2.6.12 features.
 
   10 May 2005; Stephen Bennett <spb@gentoo.org>
   selinux-base-policy-20050322.ebuild:
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20041123 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20041123
deleted file mode 100644
index d0498fa3a4d4..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20041123
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9b1e8059056a5f554739344a1a30ec5 selinux-base-policy-20041123.tar.bz2 71871
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050306 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050306
deleted file mode 100644
index 8f5f1d0b9932..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050306
+++ /dev/null
@@ -1 +0,0 @@
-MD5 05245eaaa01868d9749c408bd887de0b selinux-base-policy-20050306.tar.bz2 77696
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050618 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050618
new file mode 100644
index 000000000000..f15e92b8e8f5
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050618
@@ -0,0 +1 @@
+MD5 b50d941478923c0c54b943b4e35b3e54 selinux-base-policy-20050618.tar.bz2 78345
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20041123.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20041123.ebuild
deleted file mode 100644
index a9642947593d..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20041123.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2005 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-20041123.ebuild,v 1.2 2005/01/20 01:00:48 pebenito Exp $
-
-IUSE="build"
-
-inherit eutils
-
-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 ~amd64"
-KEYWORDS="x86 ppc sparc amd64"
-DEPEND="build? ( sys-devel/make
-		 sys-devel/m4 )"
-RDEPEND="sys-devel/m4
-	 sys-devel/make"
-
-S=${WORKDIR}/base-policy
-
-[ -z ${POLICYDIR} ] && POLICYDIR="/etc/security/selinux/src/policy"
-
-# deprecated policies:
-DEPRECATED="domains/program/devfsd.te domains/program/opt.te
-	file_contexts/program/devfsd.fc file_contexts/program/opt.fc
-	file_contexts/users.fc domains/program/inetd.te
-	domains/program/tcpd.te file_contexts/program/inetd.fc
-	file_contexts/program/tcpd.fc"
-
-src_compile() {
-	return
-}
-
-src_install() {
-	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
-
-		[ ! -f ${D}/${POLICYDIR}/file_contexts/file_contexts ] && \
-			die "file_contexts was not generated."
-	else
-		# install full policy
-		dodir /etc/security/selinux/src
-
-		insinto /etc/security
-		doins ${S}/appconfig/*
-
-		cp -a ${S} ${D}/${POLICYDIR}
-		rm -fR ${D}/${POLICYDIR}/appconfig
-	fi
-}
-
-pkg_postinst() {
-	local isdeprecated
-	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
-
-	einfo "Checking for deprecated policy..."
-	for i in $DEPRECATED; do
-		if [ -f "${POLICYDIR}/${i}" ]; then
-			eerror "${POLICYDIR}/${i}"
-			isdeprecated="y"
-		fi
-	done
-	[ "${isdeprecated}" ] && \
-		eerror "The above policy file(s) should be removed if possible." || \
-		einfo "None found."
-
-	ebeep 4
-	epause 4
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20050306.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20050618.ebuild
index 69aaf4400531..a323bc3a2ec8 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20050306.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20050618.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-20050306.ebuild,v 1.1 2005/03/06 21:02:40 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20050618.ebuild,v 1.1 2005/06/18 14:18:31 pebenito Exp $
 
 IUSE="build"
 
@@ -11,8 +11,8 @@ 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 ~amd64"
-#KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+#KEYWORDS="x86 ppc sparc amd64 mips"
 DEPEND="build? ( sys-devel/make
 		 sys-devel/m4 )"
 RDEPEND="sys-devel/m4