10 files changed, 184 insertions, 4 deletions
diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index 5d1f754304c4..cc046547020d 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.6 2003/09/23 04:22:09 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.7 2003/10/03 16:43:33 pebenito Exp $
+
+*checkpolicy-1.2 (03 Oct 2003)
+
+  03 Oct 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.2.ebuild,
+  files/checkpolicy-1.2-gentoo.diff:
+  New upstream version.
 
   22 Sep 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.1.ebuild:
   Add selinux-base-policy dependancy.
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index b15a428a5f15..37ffd564c803 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,5 +1,8 @@
 MD5 0b74645590983be7a41d32b71dc662d6 checkpolicy-1.1.ebuild 726
 MD5 927093fd813bc45afc77ef11c9258e91 metadata.xml 360
-MD5 2365146f8fd3b118ca0087026277819c ChangeLog 1074
+MD5 be888bd5b1d75eb47018266438b852c6 ChangeLog 1244
+MD5 cfb7b7977d7d2d25852c6576df71958b checkpolicy-1.2.ebuild 728
 MD5 ddd219db4d3ce78053d66ce9d8ab8fcd files/digest-checkpolicy-1.1 63
 MD5 afa3bf2d650b8102690fb12eaff327b0 files/checkpolicy-1.0-gentoo.diff 584
+MD5 34336f141d0ccf89f3d58a10ca156287 files/digest-checkpolicy-1.2 63
+MD5 3353293995a661930e43915541e9a99c files/checkpolicy-1.2-gentoo.diff 573
diff --git a/sys-apps/checkpolicy/checkpolicy-1.2.ebuild b/sys-apps/checkpolicy/checkpolicy-1.2.ebuild
new file mode 100644
index 000000000000..488f9f53b959
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-1.2.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.2.ebuild,v 1.1 2003/10/03 16:43:33 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"
+
+DEPEND="sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND="${DEPEND}
+	sec-policy/selinux-base-policy"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.2-gentoo.diff
+}
+
+src_compile() {
+	cd ${S}
+	emake EXTRA_CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+}
diff --git a/sys-apps/checkpolicy/files/checkpolicy-1.2-gentoo.diff b/sys-apps/checkpolicy/files/checkpolicy-1.2-gentoo.diff
new file mode 100644
index 000000000000..392b738f923a
--- /dev/null
+++ b/sys-apps/checkpolicy/files/checkpolicy-1.2-gentoo.diff
@@ -0,0 +1,20 @@
+diff -urN checkpolicy-1.2.orig/Makefile checkpolicy-1.2/Makefile
+--- checkpolicy-1.2.orig/Makefile	2003-09-11 15:57:56.000000000 -0500
++++ checkpolicy-1.2/Makefile	2003-10-02 14:06:42.000000000 -0500
+@@ -16,13 +16,15 @@
+ OBJS =
+ endif
+ 
+-CFLAGS = -g $(OPTIONS) -Wall -O2 -pipe
++CFLAGS = $(OPTIONS) -Wall $(EXTRA_CFLAGS)
+ override CFLAGS += -include global.h -I. -Iinclude
+ 
+ OBJS += ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o y.tab.o lex.yy.o queue.o write.o checkpolicy.o
+ 
+ LIBS=-lfl
+ 
++YACC=bison -y
++
+ all:  checkpolicy
+ 
+ checkpolicy: $(OBJS)
diff --git a/sys-apps/checkpolicy/files/digest-checkpolicy-1.2 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.2
new file mode 100644
index 000000000000..825b3ccc30d7
--- /dev/null
+++ b/sys-apps/checkpolicy/files/digest-checkpolicy-1.2
@@ -0,0 +1 @@
+MD5 fd6f05ce08bd5388cf1abed63b1ae970 checkpolicy-1.2.tgz 68297
diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index f646a868dadf..ced081e5a493 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.8 2003/09/29 19:28:54 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.9 2003/10/03 16:46:48 pebenito Exp $
+
+*policycoreutils-1.2 (03 Oct 2003)
+
+  03 Oct 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.2.ebuild, files/policycoreutils-1.2-gentoo.diff:
+  New upstream version.
 
   29 Sep 2003; Chris PeBenito <pebenito@gentoo.org>
   policycoreutils-1.1-r1.ebuild:
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 338958be2fb0..c8b1b87c63bf 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,6 +1,8 @@
+MD5 0e9056b46ceba2a2702743c63c455887 policycoreutils-1.2.ebuild 1248
 MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836
-MD5 8ae1c7bf59bd28546bd90f2e782f4be2 ChangeLog 1666
+MD5 adfa08a5c62f91a156a641173e6db52f ChangeLog 1848
 MD5 01f9e7ab1617f11ec268f35079753b4a policycoreutils-1.1-r1.ebuild 1269
+MD5 f4ce73b8cca30b1e5b2dab69475730a2 files/digest-policycoreutils-1.2 67
 MD5 6d4df7058894970c15d4066f7ad88c29 files/policycoreutils-1.0-gentoo.diff 1818
 MD5 1f231a1da642997577ac4567ee9867ac files/rlpkg 2317
 MD5 7821fa9efa9de78861110c8bd21bf714 files/newrole 326
@@ -9,3 +11,4 @@ MD5 2d09b4cfc5e5b399863a1ecd381ba33e files/digest-policycoreutils-1.1-r1 67
 MD5 4de7e167223dcedfb7978ffc3fb3c087 files/policycoreutils-1.1-setfiles.diff 2796
 MD5 7d5ff0bb4eb573840072c4a8a420cd2a files/avc_enforcing 141
 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.2 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.2
new file mode 100644
index 000000000000..a37a7192219c
--- /dev/null
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.2
@@ -0,0 +1 @@
+MD5 eca60ac3947353128e226f64cb9adc55 policycoreutils-1.2.tgz 30179
diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.2-gentoo.diff b/sys-apps/policycoreutils/files/policycoreutils-1.2-gentoo.diff
new file mode 100644
index 000000000000..8fe90835b9a7
--- /dev/null
+++ b/sys-apps/policycoreutils/files/policycoreutils-1.2-gentoo.diff
@@ -0,0 +1,48 @@
+diff -urN policycoreutils-1.2.orig/load_policy/Makefile policycoreutils-1.2/load_policy/Makefile
+--- policycoreutils-1.2.orig/load_policy/Makefile	2003-08-27 11:07:11.000000000 -0500
++++ policycoreutils-1.2/load_policy/Makefile	2003-10-02 14:20:37.000000000 -0500
+@@ -3,7 +3,7 @@
+ SBINDIR ?= $(PREFIX)/sbin
+ LOCALEDIR ?= /usr/share/locale
+ 
+-CFLAGS = -Wall -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
++CFLAGS = -Wall $(EXTRA_CFLAGS) -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
+ LDLIBS += -lselinux
+ 
+ # Build static so that we can put it on an initrd.
+diff -urN policycoreutils-1.2.orig/newrole/Makefile policycoreutils-1.2/newrole/Makefile
+--- policycoreutils-1.2.orig/newrole/Makefile	2003-08-27 11:07:12.000000000 -0500
++++ policycoreutils-1.2/newrole/Makefile	2003-10-02 14:21:03.000000000 -0500
+@@ -5,7 +5,7 @@
+ ETCDIR ?= $(DESTDIR)/etc
+ LOCALEDIR = /usr/share/locale
+ 
+-CFLAGS = -Wall -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
++CFLAGS = -Wall $(EXTRA_CFLAGS) -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
+ override CFLAGS += -DUSE_PAM
+ LDLIBS += -lselinux -lattr -ldl -lpam -lpam_misc
+ 
+diff -urN policycoreutils-1.2.orig/run_init/Makefile policycoreutils-1.2/run_init/Makefile
+--- policycoreutils-1.2.orig/run_init/Makefile	2003-08-27 11:07:16.000000000 -0500
++++ policycoreutils-1.2/run_init/Makefile	2003-10-02 14:21:20.000000000 -0500
+@@ -6,7 +6,7 @@
+ ETCDIR ?= $(DESTDIR)/etc
+ LOCALEDIR ?= /usr/share/locale
+ 
+-CFLAGS = -Wall -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
++CFLAGS = -Wall $(EXTRA_CFLAGS) -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
+ override CFLAGS += -DUSE_PAM
+ LDLIBS += -lselinux -lattr -ldl -lpam -lpam_misc
+ 
+diff -urN policycoreutils-1.2.orig/setfiles/Makefile policycoreutils-1.2/setfiles/Makefile
+--- policycoreutils-1.2.orig/setfiles/Makefile	2003-08-27 10:36:27.000000000 -0500
++++ policycoreutils-1.2/setfiles/Makefile	2003-10-02 14:21:37.000000000 -0500
+@@ -3,7 +3,7 @@
+ SBINDIR ?= $(PREFIX)/sbin
+ MANDIR = $(PREFIX)/share/man
+ 
+-CFLAGS = -Wall
++CFLAGS = -Wall $(EXTRA_CFLAGS)
+ override CFLAGS += -D_FILE_OFFSET_BITS=64
+ LDLIBS += -lselinux -lattr
+ 
diff --git a/sys-apps/policycoreutils/policycoreutils-1.2.ebuild b/sys-apps/policycoreutils/policycoreutils-1.2.ebuild
new file mode 100644
index 000000000000..6badca7e92a9
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-1.2.ebuild
@@ -0,0 +1,56 @@
+# 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.2.ebuild,v 1.1 2003/10/03 16:46:48 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"
+
+DEPEND="sys-libs/libselinux
+	sys-devel/gettext
+	!build? ( sys-libs/pam )"
+
+RDEPEND="${DEPEND}
+	!build? ( sys-apps/mkinitrd )"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.2-gentoo.diff
+
+	# 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"
+
+	for i in ${SUBDIRS}; do
+		einfo "Compiling ${i}"
+		cd ${S}/${i}
+		emake EXTRA_CFLAGS="${CFLAGS}"
+	done
+}
+
+src_install() {
+	if use build; then
+		dosbin ${S}/setfiles/setfiles
+	else
+		make DESTDIR="${D}" install
+
+		dosbin ${FILESDIR}/rlpkg
+		dobin ${FILESDIR}/{avc_enforcing,avc_toggle}
+	fi
+}