Minor updates for 2.6.12.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 105 insertions, 2 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 69017e5259e2..518928398185 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.40 2005/06/22 00:00:49 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.41 2005/08/21 19:26:43 pebenito Exp $
+
+*selinux-base-policy-20050821 (21 Aug 2005)
+
+  21 Aug 2005; Chris PeBenito <pebenito@gentoo.org>
+  +selinux-base-policy-20050821.ebuild:
+  Minor updates for 2.6.12.
 
   21 Jun 2005; Chris PeBenito <pebenito@gentoo.org>
   selinux-base-policy-20050618.ebuild:
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index aca9d5648433..279992438be8 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,6 +1,8 @@
-MD5 8676dcfcfc709754509912173f409375 ChangeLog 10474
+MD5 d0d3bfed9c52b8461b708e98d98cea38 ChangeLog 10640
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
 MD5 67260c4c2cbc9b44df8cff56e08a7da9 selinux-base-policy-20050322.ebuild 2624
 MD5 ae5d2348fdc5509b7d4f912a7f1736d6 selinux-base-policy-20050618.ebuild 2635
+MD5 3b0270ac1fcf494ed10ed5259d3b6b5b selinux-base-policy-20050821.ebuild 2635
 MD5 5b8c65e44cb570ebee4e17345bb4f262 files/digest-selinux-base-policy-20050322 80
 MD5 7630716cefae6d19aa69756e59ecf136 files/digest-selinux-base-policy-20050618 80
+MD5 ed7cdf2d44decbfb09c2a534fc12af17 files/digest-selinux-base-policy-20050821 80
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050821 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050821
new file mode 100644
index 000000000000..7d32a62824f4
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20050821
@@ -0,0 +1 @@
+MD5 a1930fda21f3e8e2b016a7d5334479cb selinux-base-policy-20050821.tar.bz2 78407
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20050821.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20050821.ebuild
new file mode 100644
index 000000000000..61e2463eebbf
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20050821.ebuild
@@ -0,0 +1,94 @@
+# 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-20050821.ebuild,v 1.1 2005/08/21 19:26:43 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 ~mips"
+#KEYWORDS="x86 ppc sparc amd64 mips"
+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 macros/program/ypbind_macros.te"
+
+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
+
+	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."
+	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
+}