new upstream version

7 files changed, 125 insertions, 9 deletions

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index dab20cc50bcb..cb13fd3eef32 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/checkpolicy
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.9 2003/10/29 16:08:39 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.10 2003/12/06 20:16:49 pebenito Exp $
+
+*checkpolicy-1.4 (06 Dec 2003)
+
+  06 Dec 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.4.ebuild:
+  New upstream version.
 
   29 Oct 2003; Joshua Brindle <method@gentoo.org> checkpolicy-1.2.ebuild:
   added sparc
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 2bb1c652cae2..6fbced9bf195 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,5 +1,7 @@
+MD5 c6d92b48bfe1c918a4a5affb2bf78362 checkpolicy-1.4.ebuild 739
+MD5 e6543624c262cae90cc830cde90ad3ae metadata.xml 165
+MD5 5ad7c16ba0ef898c39584ba07fb1f1b9 ChangeLog 1559
 MD5 eae13956b283cafd955846ab78450c00 checkpolicy-1.2.ebuild 737
+MD5 344c1bdea2908053273f77fb584a7074 files/digest-checkpolicy-1.4 63
 MD5 34336f141d0ccf89f3d58a10ca156287 files/digest-checkpolicy-1.2 63
 MD5 3353293995a661930e43915541e9a99c files/checkpolicy-1.2-gentoo.diff 573
-MD5 f70f97b319fbee492444930a5c2ffe6c ChangeLog 1423
-MD5 e6543624c262cae90cc830cde90ad3ae metadata.xml 165
diff --git a/sys-apps/checkpolicy/checkpolicy-1.4.ebuild b/sys-apps/checkpolicy/checkpolicy-1.4.ebuild
new file mode 100644
index 000000000000..e8f997c3f15d
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-1.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.4.ebuild,v 1.1 2003/12/06 20:16:49 pebenito Exp $
+
+IUSE=""
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://www.nsa.gov/selinux"
+SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND="${DEPEND}
+	sec-policy/selinux-base-policy"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" Makefile
+}
+
+src_compile() {
+	cd ${S}
+	emake YACC="bison -y" || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+}
diff --git a/sys-apps/checkpolicy/files/digest-checkpolicy-1.4 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.4
new file mode 100644
index 000000000000..e7d618ba2532
--- /dev/null
+++ b/sys-apps/checkpolicy/files/digest-checkpolicy-1.4
@@ -0,0 +1 @@
+MD5 126851036aba68c53a115f32758d6e38 checkpolicy-1.4.tgz 68703
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index ed16a9a9372e..f4cf8f0833bb 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,11 +1,13 @@
+MD5 4e3c1d3b36e287e66a15985e2929ce74 policycoreutils-1.4.ebuild 1581
+MD5 e6543624c262cae90cc830cde90ad3ae metadata.xml 165
+MD5 2e7ba9acdb4ea7bea59c58f85ee855d4 ChangeLog 2372
 MD5 0cbdf93b9f7f7649427e0b7e8c696370 policycoreutils-1.2-r2.ebuild 1442
-MD5 1f231a1da642997577ac4567ee9867ac files/rlpkg 2317
-MD5 812e996be7529c080b410ba5e3bb1ede files/policycoreutils-1.2-gentoo.diff 2201
 MD5 b3e5bece06545088b90e09a70b01aa42 files/selinux-init 916
-MD5 7821fa9efa9de78861110c8bd21bf714 files/run_init 326
+MD5 ccb12f13bb6145ad3a95ae9264067926 files/digest-policycoreutils-1.4 67
+MD5 1f231a1da642997577ac4567ee9867ac files/rlpkg 2317
 MD5 7821fa9efa9de78861110c8bd21bf714 files/newrole 326
-MD5 74b72f384af4ff8868c145ae98e6adaf files/avc_toggle 195
+MD5 7821fa9efa9de78861110c8bd21bf714 files/run_init 326
 MD5 f4ce73b8cca30b1e5b2dab69475730a2 files/digest-policycoreutils-1.2-r2 67
 MD5 7d5ff0bb4eb573840072c4a8a420cd2a files/avc_enforcing 141
-MD5 2e7ba9acdb4ea7bea59c58f85ee855d4 ChangeLog 2372
-MD5 e6543624c262cae90cc830cde90ad3ae metadata.xml 165
+MD5 74b72f384af4ff8868c145ae98e6adaf files/avc_toggle 195
+MD5 812e996be7529c080b410ba5e3bb1ede files/policycoreutils-1.2-gentoo.diff 2201
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.4 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.4
new file mode 100644
index 000000000000..a3281f465dc4
--- /dev/null
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.4
@@ -0,0 +1 @@
+MD5 c047074b07068e979274ab13a7dfbc7d policycoreutils-1.4.tgz 32204
diff --git a/sys-apps/policycoreutils/policycoreutils-1.4.ebuild b/sys-apps/policycoreutils/policycoreutils-1.4.ebuild
new file mode 100644
index 000000000000..9c3a97f585aa
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-1.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.4.ebuild,v 1.1 2003/12/06 20:19:38 pebenito Exp $
+
+IUSE="build"
+
+DESCRIPTION="SELinux core utilites"
+HOMEPAGE="http://www.nsa.gov/selinux"
+SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="sys-libs/libselinux
+	sys-devel/gettext
+	!build? ( sys-libs/pam )"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# trivial fix to audit2allow
+	sed -i -e 's:newrules:$0:' audit2allow/audit2allow
+
+	# fix up to accept Gentoo CFLAGS
+	SUBDIRS="load_policy newrole run_init setfiles audit2allow"
+	for i in ${SUBDIRS}; do
+		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${i}/Makefile \
+			|| die "${i} Makefile CFLAGS fix failed."
+	done
+
+	# overwrite the /etc/pam.d files with ones
+	# that work with our pam setup
+	cp -f ${FILESDIR}/newrole ${S}/newrole/newrole.pamd
+	cp -f ${FILESDIR}/run_init ${S}/run_init/run_init.pamd
+}
+
+src_compile() {
+
+	use build && SUBDIRS="setfiles" \
+		|| SUBDIRS="load_policy newrole run_init setfiles audit2allow"
+
+	for i in ${SUBDIRS}; do
+		einfo "Compiling ${i}"
+		cd ${S}/${i}
+		emake || die
+	done
+}
+
+src_install() {
+	if use build; then
+		dosbin ${S}/setfiles/setfiles
+	else
+		make DESTDIR="${D}" install
+
+		dosbin ${FILESDIR}/rlpkg
+		dobin ${FILESDIR}/avc_toggle
+
+		dosym /usr/bin/getenforce /usr/bin/avc_enforcing
+
+		exeinto /sbin
+		newexe ${FILESDIR}/selinux-init seinit
+	fi
+}