new release

(Portage version: 2.0.51.19)

7 files changed, 20 insertions, 103 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 67632e02eac1..c038c8505030 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.35 2005/03/06 21:02:40 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.36 2005/03/23 00:31:01 pebenito Exp $
+
+*selinux-base-policy-20050322 (23 Mar 2005)
+
+  23 Mar 2005; Chris PeBenito <pebenito@gentoo.org>
+  +selinux-base-policy-20050322.ebuild:
+  New release.
 
 *selinux-base-policy-20050306 (06 Mar 2005)
 
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 903bb1f7fd79..92239bd84770 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 403e8c0a1d6eb4bf7d31da1db7bdadb4 ChangeLog 9749
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
 MD5 a3f3a3caf05f8f127d503128a0c4b36c selinux-base-policy-20041123.ebuild 2429
 MD5 f7776d1ab6f9f2451f58e3f31eb72cfb selinux-base-policy-20050224.ebuild 2461
 MD5 4188897e85b859da5b7096e0f8f4b7e1 selinux-base-policy-20041023.ebuild 2429
 MD5 8529ce87d85d3d455787c5e97e373f62 selinux-base-policy-20050306.ebuild 2624
+MD5 5ddbb460253e5c2cd5d161753c0daf7f selinux-base-policy-20050322.ebuild 2624
 MD5 932d38a62aa8b2109a8df55d9dd6327a files/digest-selinux-base-policy-20041023 80
 MD5 dfc9d0a09e281b3f658ef0f6bc29a2bc files/digest-selinux-base-policy-20041123 80
 MD5 8697f881bc2285a0a0c5e6f3f29e359e files/digest-selinux-base-policy-20050224 80
 MD5 3cae0e65db91e3f2df2af13211fefd29 files/digest-selinux-base-policy-20050306 80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCK2/UMTuwkQ6eEKsRAmYWAKCwX/KZjUxBP7C4w7pVW8TbNu9p7QCgkoRM
-uladGLgq20oY0DFflzrWLpU=
-=FNFd
------END PGP SIGNATURE-----
+MD5 5b8c65e44cb570ebee4e17345bb4f262 files/digest-selinux-base-policy-20050322 80
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20041023 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20041023
deleted file mode 100644
index 642cd0ee6458..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20041023
+++ /dev/null
@@ -1 +0,0 @@
-MD5 287240a8a3f77180dac0acbd64f158e7 selinux-base-policy-20041023.tar.bz2 71327
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050224 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050224
deleted file mode 100644
index 52dcc2a73762..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050224
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ba606995c3447e9202ae1e2373cdda2 selinux-base-policy-20050224.tar.bz2 75791
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050322 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050322
new file mode 100644
index 000000000000..3a25703b82c8
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050322
@@ -0,0 +1 @@
+MD5 148710530c5bbdc5386066cdd8d49a6c selinux-base-policy-20050322.tar.bz2 77828
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20041023.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20041023.ebuild
deleted file mode 100644
index 9ac89d10139e..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20041023.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 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-20041023.ebuild,v 1.2 2004/11/23 16:56:42 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-20050224.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20050322.ebuild
index 162b052fac70..9cdd88eb0903 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20050224.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20050322.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-20050224.ebuild,v 1.1 2005/02/25 02:38:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20050322.ebuild,v 1.1 2005/03/23 00:31:01 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"
+KEYWORDS="x86 ppc sparc amd64"
 DEPEND="build? ( sys-devel/make
 		 sys-devel/m4 )"
 RDEPEND="sys-devel/m4
@@ -58,6 +58,13 @@ src_install() {
 
 pkg_postinst() {
 	local isdeprecated
+
+	if ! ( use build || use bootstrap )
+	then
+		ewarn "Removing invalid backup copies of critical config files..."
+		rm -f ${ROOT}/${POLICYDIR}/._cfg????_users
+	fi
+
 	echo
 	einfo "This is the base policy for SELinux on Gentoo.  This policy"
 	einfo "package only covers the applications in the system profile."