Fix for bug #20325

4 files changed, 149 insertions, 2 deletions

diff --git a/sys-apps/selinux-small/ChangeLog b/sys-apps/selinux-small/ChangeLog
index 9f2e56dcf9e7..032ab91b6506 100644
--- a/sys-apps/selinux-small/ChangeLog
+++ b/sys-apps/selinux-small/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/selinux-small
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/ChangeLog,v 1.9 2003/04/23 21:42:47 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/ChangeLog,v 1.10 2003/05/06 14:03:33 pebenito Exp $
+
+*selinux-small-2003011510-r4 (06 May 2003)
+
+  06 May 2003; Chris PeBenito <pebenito@gentoo.org>
+  selinux-small-2003011510-r4.ebuild:
+  New rev to close #20325. Moved devfsd-se.so to /lib/devfsd. Adjusted devfs.d
+  conf file appropriately.
 
 *selinux-small-2003011510-r3 (11 Apr 2003)
 
diff --git a/sys-apps/selinux-small/Manifest b/sys-apps/selinux-small/Manifest
index 6d0c9acc01f0..5ddfd24972af 100644
--- a/sys-apps/selinux-small/Manifest
+++ b/sys-apps/selinux-small/Manifest
@@ -1,4 +1,6 @@
-MD5 47da81b9fbaddf2e80d2fd9586a2df8e ChangeLog 2011
+MD5 24a38b414489a0a08e130f91464c147e ChangeLog 2253
+MD5 734975c94d03393c8e041305ded57baf selinux-small-2003011510-r4.ebuild 3965
 MD5 a72c63e1fb9dfae6192d836123273767 selinux-small-2003011510-r3.ebuild 3993
+MD5 e5ffaa323b22754b51eaa94f04bcf5dd files/digest-selinux-small-2003011510-r4 151
 MD5 e5ffaa323b22754b51eaa94f04bcf5dd files/digest-selinux-small-2003011510-r3 151
 MD5 5b8ae6c77d50a559c31fb144faf6843e files/selinux-small-2003011510-bison.diff 553
diff --git a/sys-apps/selinux-small/files/digest-selinux-small-2003011510-r4 b/sys-apps/selinux-small/files/digest-selinux-small-2003011510-r4
new file mode 100644
index 000000000000..83a659a89245
--- /dev/null
+++ b/sys-apps/selinux-small/files/digest-selinux-small-2003011510-r4
@@ -0,0 +1,2 @@
+MD5 ee9e814c96aba9efdc9552652c041fa4 selinux-small-2003011510.tgz 551852
+MD5 808a93b812fa16f789551c212c02ba95 selinux-small_2003011510-7.diff.gz 48492
diff --git a/sys-apps/selinux-small/selinux-small-2003011510-r4.ebuild b/sys-apps/selinux-small/selinux-small-2003011510-r4.ebuild
new file mode 100644
index 000000000000..7837b65bee2f
--- /dev/null
+++ b/sys-apps/selinux-small/selinux-small-2003011510-r4.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/selinux-small-2003011510-r4.ebuild,v 1.1 2003/05/06 14:03:33 pebenito Exp $
+
+DESCRIPTION="SELinux policy compiler and example policies"
+HOMEPAGE="http://www.nsa.gov/selinux"
+SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
+	 http://www.coker.com.au/selinux/selinux-small/selinux-small_2003011510-7.diff.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+S="${WORKDIR}/selinux"
+
+# to easily specify that libsecure is in the workdir
+LIBSECURE="-I${S}/libsecure/include -L${S}/libsecure/src"
+
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+IUSE="selinux"
+DEPEND="<sys-libs/glibc-2.3.2
+	sys-devel/flex
+	sys-libs/pam
+        || (
+                >=sys-kernel/selinux-sources-2.4.20-r1
+                >=sys-kernel/hardened-sources-2.4.20-r1
+           )"
+
+RDEPEND="<sys-libs/glibc-2.3.2
+	|| (
+                >=sys-kernel/selinux-sources-2.4.20-r1
+                >=sys-kernel/hardened-sources-2.4.20-r1
+           )
+	 dev-tcltk/expect
+	 sys-apps/selinux-base-policy"
+
+pkg_setup() {
+	use selinux || eend 1 "You must have selinux USE var"
+}
+
+src_compile() {
+	ln -s /usr/src/linux ${WORKDIR}/lsm-2.4
+
+	# fix up policy makefile
+	cd ${WORKDIR}/policy
+	sed -e 's:/usr/lib/selinux:/usr/flask:' < Makefile > Makefile.new
+	mv -f Makefile.new Makefile
+
+	cd ${S}
+
+	epatch ${WORKDIR}/selinux-small_2003011510-7.diff
+	epatch ${FILESDIR}/${P}-bison.diff
+
+	einfo "Compiling checkpolicy"
+	cd ${S}/module
+		make all LSMVER=-2.4 || die "Checkpolicy compilation failed"
+
+	einfo "Compiling libsecure"
+	cd ${S}/libsecure
+		make SE_INC=/usr/include/linux/flask \
+			EXTRA_CFLAGS="${CFLAGS}" \
+			|| die "libsecure compile failed."
+	cd ${S}/devfsd
+		mv devfsd-conflet selinux-small
+		make CFLAGS="${CFLAGS} ${LIBSECURE}" \
+			LDFLAGS="-L${S}/libsecure/src" \
+			|| die "devfsd compile failed."
+
+	einfo "Compiling utilities"
+	cd ${S}/setfiles
+		make CFLAGS="${CFLAGS} ${LIBSECURE}" \
+			LDFLAGS="-L${S}/libsecure/src" setfiles \
+			|| die "setfiles compile failed."
+	cd ${S}/utils/newrole
+		make CFLAGS="${CFLAGS} ${LIBSECURE} -lcrypt" \
+			|| die "newrole compile failed."
+	cd ${S}/utils/run_init
+		make CFLAGS="${CFLAGS} ${LIBSECURE} -lcrypt" \
+			|| die "run_init compile failed."
+	cd ${S}/utils/spasswd
+		make CFLAGS="${CFLAGS} ${LIBSECURE}" \
+			LDFLAGS="-L${S}/libsecure/src -lcrypt" \
+			|| die "spasswd compile failed."
+}
+
+src_install() {
+	# install policy stuff
+	dosbin ${S}/module/checkpolicy/checkpolicy
+	dosbin ${S}/setfiles/setfiles
+
+	insinto /etc/security
+	doins ${S}/utils/appconfig/*
+
+	insinto /usr/include
+	doins ${S}/libsecure/include/*.h
+
+	insinto /etc/devfs.d
+	doins ${S}/devfsd/selinux-small
+
+	dolib.a ${S}/libsecure/src/libsecure.a
+	dobin ${S}/libsecure/test/{avc_enforcing,avc_toggle,context_to_sid,sid_to_context,list_sids,chsid,lchsid,chsidfs,get_user_sids}
+	dosbin ${S}/libsecure/test/load_policy
+	dobin ${S}/utils/spasswd/{sadminpasswd,schfn,schsh,spasswd,suseradd,suserdel,svipw}
+	dobin ${S}/utils/run_init/run_init
+	dosbin ${S}/utils/run_init/open_init_pty
+	dobin ${S}/utils/newrole/newrole
+
+	doman ${S}/setfiles/setfiles.8
+	doman ${S}/libsecure/man/man[12]/*
+	doman ${S}/utils/newrole/newrole.1
+	doman ${S}/utils/run_init/run_init.8
+
+	exeinto /lib/devfsd
+	doexe ${S}/devfsd/devfsd-se.so
+}
+
+pkg_postinst() {
+        einfo
+	einfo "To recompile the policy and relabel the filesystem simply run:"
+        einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+        einfo
+}
+
+pkg_config() {
+	cd /etc/security/selinux/src/policy
+
+	einfo "Compiling policy"
+	make policy || die "Policy compile failed (see above error messages)"
+
+	einfo "Installing policy"
+	make install || die "Policy installation failed"
+
+	einfo "Loading policy"
+	make load || die "Policy loading failed"
+
+	einfo "Relabeling filesystems -- This will take a very long time!"
+	make relabel || die "Relabeling failed (see above error messages)"
+}