new release

4 files changed, 101 insertions, 5 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 3d0e2eff3c52..4d05150905c4 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.30 2004/09/06 21:26:41 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.31 2004/10/23 13:16:50 pebenito Exp $
+
+*selinux-base-policy-20041023 (23 Oct 2004)
+
+  23 Oct 2004; Chris PeBenito <pebenito@gentoo.org>
+  +selinux-base-policy-20041023.ebuild:
+  New release with 1.16 merge. Tcpd and inetd have been deprecated since they
+  are not in the base system anymore, and probably no one uses them anyway.
 
 *selinux-base-policy-20040906 (06 Sep 2004)
 
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 7735fa89b316..fe1ac4392d13 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 45160e9a01a18ce2fdc072f0c8e1405e ChangeLog 8815
+MD5 991d102fc757ac07b6fbddb384cf8a0a ChangeLog 9107
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
 MD5 002d3acea2205ffa0d5a3351fb19c671 selinux-base-policy-20040702.ebuild 2281
 MD5 221bc2c181c7873f506794fa60463d1d selinux-base-policy-20040906.ebuild 2281
+MD5 6f44065db8f12156b580ca56dbef34a0 selinux-base-policy-20041023.ebuild 2397
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBabfqGFJQsIJWJy4RAoO2AJ4ur1unFyYllvG6DQtx67G72rqbxwCfQf7Y
-F97QIEHhqwIqEojj7P6CDag=
-=Zosm
+iD8DBQFBelmDGFJQsIJWJy4RAi5iAJ0TsLXrgdkRau2gOywwP0y1fbeENwCeJ7fm
+QZPOZY45fVsOcQiDl8ATS1I=
+=4oJe
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..642cd0ee6458
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20041023
@@ -0,0 +1 @@
+MD5 287240a8a3f77180dac0acbd64f158e7 selinux-base-policy-20041023.tar.bz2 71327
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20041023.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20041023.ebuild
new file mode 100644
index 000000000000..5f4dfd5e11b0
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20041023.ebuild
@@ -0,0 +1,86 @@
+# 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.1 2004/10/23 13:16:50 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 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
+}