7 files changed, 21 insertions, 99 deletions
diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index acf8ae228838..9921ca0e2ad1 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.33 2005/01/20 01:00:48 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.34 2005/02/25 02:38:25 pebenito Exp $
+
+*selinux-base-policy-20050224 (24 Feb 2005)
+
+  24 Feb 2005; Chris PeBenito <pebenito@gentoo.org>
+  +selinux-base-policy-20050224.ebuild:
+  New release.
 
   19 Jan 2005; Chris PeBenito <pebenito@gentoo.org>
   selinux-base-policy-20041123.ebuild:
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 22881afcb03e..36b5cbf4b77d 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 68165a8ba365b374b3f8c9dfcba83a3f ChangeLog 9383
+MD5 96a24b40d5e85e7c599386c782f60749 ChangeLog 9536
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
 MD5 a3f3a3caf05f8f127d503128a0c4b36c selinux-base-policy-20041123.ebuild 2429
-MD5 002d3acea2205ffa0d5a3351fb19c671 selinux-base-policy-20040702.ebuild 2281
-MD5 221bc2c181c7873f506794fa60463d1d selinux-base-policy-20040906.ebuild 2281
+MD5 f7776d1ab6f9f2451f58e3f31eb72cfb selinux-base-policy-20050224.ebuild 2461
 MD5 4188897e85b859da5b7096e0f8f4b7e1 selinux-base-policy-20041023.ebuild 2429
-MD5 aa75977434391487a1fe3dfe2394157d files/digest-selinux-base-policy-20040702 80
-MD5 9ca92516b64d82899ea8fd92f15af3da files/digest-selinux-base-policy-20040906 80
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB7wK+MTuwkQ6eEKsRAj2+AJ92NfyTO3AIYrcDlTny8hy7khPxsgCgjx5X
-9fGkVBxB1fWkAQ3gLYI+oD4=
-=q+/9
+iD8DBQFCHo+qMTuwkQ6eEKsRAlj9AKCsWMp64RhBzeVd3ecSVxWcjJwjUgCgs9XH
+5zT5SLFwhiiFJU6HcbUVGCM=
+=GNX9
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040702 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040702
deleted file mode 100644
index 073fc386947a..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040702
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d7d602491eda3f344b9b948f28e0f39 selinux-base-policy-20040702.tar.bz2 69967
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040906 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040906
deleted file mode 100644
index 52b9b64d8623..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040906
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51494724a78860531984403a4bc047aa selinux-base-policy-20040906.tar.bz2 70966
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
new file mode 100644
index 000000000000..52dcc2a73762
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050224
@@ -0,0 +1 @@
+MD5 3ba606995c3447e9202ae1e2373cdda2 selinux-base-policy-20050224.tar.bz2 75791
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20040906.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20040906.ebuild
deleted file mode 100644
index e12dafa7fc54..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20040906.ebuild
+++ /dev/null
@@ -1,84 +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-20040906.ebuild,v 1.3 2004/10/10 22:25:58 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"
-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"
-
-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-20040702.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20050224.ebuild
index 35e034b2ea07..162b052fac70 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20040702.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20050224.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-20040702.ebuild,v 1.4 2004/09/20 01:55:46 pebenito Exp $
+# $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 $
 
 IUSE="build"
 
@@ -11,7 +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"
 DEPEND="build? ( sys-devel/make
 		 sys-devel/m4 )"
 RDEPEND="sys-devel/m4
@@ -24,7 +25,9 @@ S=${WORKDIR}/base-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"
+	file_contexts/users.fc domains/program/inetd.te
+	domains/program/tcpd.te file_contexts/program/inetd.fc
+	file_contexts/program/tcpd.fc macros/program/ypbind_macros.te"
 
 src_compile() {
 	return