misc fixes

4 files changed, 84 insertions, 2 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 6962e981d2f1..67777872faab 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 Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.12 2004/01/08 04:37:06 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.13 2004/02/03 03:07:28 pebenito Exp $
+
+*selinux-base-policy-20040202 (02 Feb 2004)
+
+  02 Feb 2004; Chris PeBenito <pebenito@gentoo.org>
+  selinux-base-policy-20040202.ebuild:
+  A few misc fixes. Allow portage to update bootloader code, such as in lilo or
+  grub postinst. This requires checkpolicy 1.4-r1.
 
 *selinux-base-policy-20031225 (25 Dec 2003)
 
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 09cbfbc81bab..7b0767d0dc62 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,7 +1,9 @@
-MD5 2a4c0b4c8a450d671953c62a7d6c41a2 ChangeLog 5005
+MD5 0d9fdb5cf7ba65c1efa1f448d2dfdb57 ChangeLog 5273
 MD5 6bdbcf497a0768287d05253ed9993855 selinux-base-policy-20031225.ebuild 2265
+MD5 e40ab0a39122e98c04231f518c5c7818 selinux-base-policy-20040202.ebuild 2264
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
 MD5 cf680c66e6bb71484cd79a66b893a8db selinux-base-policy-20031010-r1.ebuild 2226
+MD5 3aaac443a8a784e9b57152783ec6a783 files/digest-selinux-base-policy-20040202 80
 MD5 09e663114ddafd06e4686e4bafefebf1 files/digest-selinux-base-policy-20031225 80
 MD5 58ed8d91932fc65a3cf102265e86ef3a files/digest-selinux-base-policy-20031010-r1 80
 MD5 73ed970a243dc34033a2f2c29f5b63e1 files/selinux-base-policy-20031010-cvs.diff 4268
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040202 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040202
new file mode 100644
index 000000000000..413c0b49d783
--- /dev/null
+++ b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040202
@@ -0,0 +1 @@
+MD5 5b208058ff2889761ff69c0ea6a8830e selinux-base-policy-20040202.tar.bz2 61252
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20040202.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20040202.ebuild
new file mode 100644
index 000000000000..51068005f160
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20040202.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20040202.ebuild,v 1.1 2004/02/03 03:07:28 pebenito Exp $
+
+IUSE="build"
+
+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"
+DEPEND="build? ( sys-devel/make )"
+RDEPEND="sys-devel/m4
+	 sys-devel/make
+	 !build? ( >=sys-libs/pam-0.77 )"
+
+S=${WORKDIR}/base-policy
+
+[ -z ${POLICYDIR} ] && POLICYDIR="/etc/security/selinux/src/policy"
+
+#src_unpack() {
+#	unpack ${A}
+#	cd ${S}
+#	epatch ${FILESDIR}/${P}-cvs.diff
+#}
+
+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() {
+	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 -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
+	sleep 8
+}