fixed lots of stuff

4 files changed, 18 insertions, 58 deletions

diff --git a/sys-apps/selinux-small/ChangeLog b/sys-apps/selinux-small/ChangeLog
index 788cec06609b..af628a34fa1c 100644
--- a/sys-apps/selinux-small/ChangeLog
+++ b/sys-apps/selinux-small/ChangeLog
@@ -1,9 +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.4 2003/03/25 17:16:11 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/ChangeLog,v 1.5 2003/03/30 22:25:42 method Exp $
 
 *selinux-small-2003011510-r2 (19 Mar 2003)
 
+  30 Mar 2003; Joshua Brindle <method@gentoo.org> selinux-small-2003011510-r1.ebuild,
+  selinux-small-2003011510-r1.ebuild, selinux-small-2003011510-r2.ebuild:
+  fixed default_type default_context, devfsd, run_init, expect dep
+
   25 Mar 2003; Joshua Brindle <method@gentoo.org> selinux-small-2003011510-r2.ebuild:
   changed to stable
 
diff --git a/sys-apps/selinux-small/files/digest-selinux-small-2003011510-r1 b/sys-apps/selinux-small/files/digest-selinux-small-2003011510-r1
deleted file mode 100644
index a242d49b9400..000000000000
--- a/sys-apps/selinux-small/files/digest-selinux-small-2003011510-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ee9e814c96aba9efdc9552652c041fa4 selinux-small-2003011510.tgz 551852
-MD5 e182510f46cf7e41ccb38a311b3c11e2 selinux-small_2003011510-6.diff.gz 40014
diff --git a/sys-apps/selinux-small/selinux-small-2003011510-r1.ebuild b/sys-apps/selinux-small/selinux-small-2003011510-r1.ebuild
deleted file mode 100644
index 8f1151dd0f9f..000000000000
--- a/sys-apps/selinux-small/selinux-small-2003011510-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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-r1.ebuild,v 1.2 2003/03/17 07:17:24 method Exp $
-
-inherit flag-o-matic
-
-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-6.diff.gz"
-LICENSE="GPL-1"
-SLOT="0"
-S="${WORKDIR}/${P}-gentoo"
-
-KEYWORDS="~x86 -*"
-IUSE="selinux"
-DEPEND=">=selinux-sources-2.4.20-r1
-	>=yacc-1.9.1"
-
-
-pkg_setup() {
-	use selinux || error "You must have selinux USE var"
-}
-
-src_compile() {
-	ln -s /usr/src/linux ${WORKDIR}/lsm-2.4
-
-	cd ${WORKDIR}/selinux/
-	epatch ${WORKDIR}/selinux-small_2003011510-6.diff
-
-	cd ${WORKDIR}/selinux/libsecure
-		make SE_INC=/usr/include/linux/flask
-	cd ${WORKDIR}/selinux/utils/newrole
-		make
-	cd ${WORKDIR}/selinux/utils/run_init
-		make
-	cd ${WORKDIR}/selinux/utils/spasswd
-		make
-}
-
-src_install() {
-	
-	insinto /usr/include
-	doins ${WORKDIR}/selinux/libsecure/include/*.h
-
-	dolib.a ${WORKDIR}/selinux/libsecure/src/libsecure.a
-
-	UTILS="avc_enforcing avc_toggle load_policy context_to_sid sid_to_context list_sids chsid lchsid chsidfs get_user_sids"
-	dobin  ${WORKDIR}/selinux/libsecure/test/{avc_enforcing,avc_toggle,load_policy,context_to_sid,sid_to_context,list_sids,chsid,lchsid,chsidfs,get_user_sids}
-	
-	dobin ${WORKDIR}/selinux/utils/spasswd/spasswd
-	dobin ${WORKDIR}/selinux/utils/run_init/run_init
-	dobin ${WORKDIR}/selinux/utils/newrole/newrole
-}
diff --git a/sys-apps/selinux-small/selinux-small-2003011510-r2.ebuild b/sys-apps/selinux-small/selinux-small-2003011510-r2.ebuild
index c4affcf60ce1..3771b447a16d 100644
--- a/sys-apps/selinux-small/selinux-small-2003011510-r2.ebuild
+++ b/sys-apps/selinux-small/selinux-small-2003011510-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.4 2003/03/25 17:16:11 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/selinux-small-2003011510-r2.ebuild,v 1.5 2003/03/30 22:25:42 method Exp $
 
 DESCRIPTION="SELinux policy compiler and example policies"
 HOMEPAGE="http://www.nsa.gov/selinux"
@@ -20,6 +20,9 @@ IUSE="selinux"
 DEPEND="<sys-libs/glibc-2.3.2
 	>=sys-kernel/selinux-sources-2.4.20-r1"
 
+RDEPEND="<sys-libs/glibc-2.3.2
+	dev-tcltk/expect"
+
 pkg_setup() {
 	use selinux || eend 1 "You must have selinux USE var"
 }
@@ -46,6 +49,10 @@ src_compile() {
 		make SE_INC=/usr/include/linux/flask \
 			EXTRA_CFLAGS="${CFLAGS}" \
 			|| die "libsecure compile failed."
+	cd ${S}/devfsd
+		make CFLAGS="${CFLAGS} ${LIBSECURE}" \
+			LDFLAGS="-L${S}/libsecure/src" \
+			|| die "devfsd compile failed."
 
 	einfo "Compiling utilities"
 	cd ${S}/setfiles
@@ -71,15 +78,19 @@ src_install() {
 	mkdir -p ${D}/etc/security/selinux/src
 	mv ${WORKDIR}/policy ${D}/etc/security/selinux/src
 
+	insinto /etc/security
+	doins ${S}/selinux/utils/appconfig/*
+
 	insinto /usr/include
 	doins ${S}/libsecure/include/*.h
 
 	dolib.a ${S}/libsecure/src/libsecure.a
-
+	dolib.so ${S}/devfsd/devfsd-se.so
 	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