mark stable

11 files changed, 18 insertions, 120 deletions

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index ab0990350d77..7f855c8e0222 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,10 @@
 # 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.3 2003/08/14 15:15:32 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.4 2003/08/25 03:40:30 pebenito Exp $
+
+  24 Aug 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.0-r1.ebuild,
+  checkpolicy-1.1.ebuild, files/checkpolicy-little_endian.diff:
+  Mark stable
 
 *checkpolicy-1.1 (14 Aug 2003)
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 901075d6c928..5b1fcde7d4e5 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,8 +1,5 @@
-MD5 abe03bf17881f4828293abef9457ff3e checkpolicy-1.1.ebuild 696
+MD5 fe2c60a8146f2fbdad7eb27e9a167dd7 checkpolicy-1.1.ebuild 694
 MD5 925ec5e4ac9c54ff2672fbbc79154b00 metadata.xml 250
-MD5 ce1c48101523e7b184ad404590ea4325 ChangeLog 734
-MD5 048868b4bff9a1e895b9a8c05115baab checkpolicy-1.0-r1.ebuild 743
+MD5 2316d2a5b856ce665d80f8ec7512ca15 ChangeLog 892
 MD5 ddd219db4d3ce78053d66ce9d8ab8fcd files/digest-checkpolicy-1.1 63
 MD5 afa3bf2d650b8102690fb12eaff327b0 files/checkpolicy-1.0-gentoo.diff 584
-MD5 03ec88db0308653fc60180eb9213795a files/checkpolicy-little_endian.diff 559
-MD5 caef3839291cd8719631c4c52de9e614 files/digest-checkpolicy-1.0-r1 63
diff --git a/sys-apps/checkpolicy/checkpolicy-1.0-r1.ebuild b/sys-apps/checkpolicy/checkpolicy-1.0-r1.ebuild
deleted file mode 100644
index 85a68b7d689e..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.0-r1.ebuild,v 1.1 2003/08/13 20:49:54 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}"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/checkpolicy-little_endian.diff
-}
-
-src_compile() {
-	cd ${S}
-	emake EXTRA_CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-1.1.ebuild b/sys-apps/checkpolicy/checkpolicy-1.1.ebuild
index d2fcb9b35a9c..c189fda75fa5 100644
--- a/sys-apps/checkpolicy/checkpolicy-1.1.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2003/08/14 15:15:32 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.1.ebuild,v 1.2 2003/08/25 03:40:30 pebenito Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="sys-devel/flex
 	sys-devel/bison"
diff --git a/sys-apps/checkpolicy/files/checkpolicy-little_endian.diff b/sys-apps/checkpolicy/files/checkpolicy-little_endian.diff
deleted file mode 100644
index 63fca4b7e75f..000000000000
--- a/sys-apps/checkpolicy/files/checkpolicy-little_endian.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: checkpolicy/write.c
-===================================================================
-RCS file: /nfshome/pal/CVS/selinux-2.5/checkpolicy/write.c,v
-retrieving revision 1.4
-diff -u -r1.4 write.c
---- checkpolicy/write.c	26 Jun 2003 17:23:12 -0000	1.4
-+++ checkpolicy/write.c	12 Aug 2003 14:10:55 -0000
-@@ -693,7 +693,7 @@
- 					return -1;
- 				break;
- 			case OCON_FSUSE:
--				buf[0] = c->v.behavior;
-+				buf[0] = cpu_to_le32(c->v.behavior);
- 				len = strlen(c->u.name);
- 				buf[1] = cpu_to_le32(len);
- 				items = fwrite(buf, sizeof(__u32), 2, fp);
diff --git a/sys-apps/checkpolicy/files/digest-checkpolicy-1.0-r1 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.0-r1
deleted file mode 100644
index bec25d060696..000000000000
--- a/sys-apps/checkpolicy/files/digest-checkpolicy-1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b231f7e63f1d05f173f4d5e17116b18 checkpolicy-1.0.tgz 61330
diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 36a1e32bac00..d537c1836224 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.4 2003/08/19 00:59:51 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.5 2003/08/25 03:42:51 pebenito Exp $
+
+  24 Aug 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.1-r1.ebuild, policycoreutils-1.1.ebuild:
+  Mark stable
 
 *policycoreutils-1.1-r1 (18 Aug 2003)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 307915fd6b14..08ebfd86676c 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,10 +1,8 @@
 MD5 58a0d53c74b291dcf411f17e60f32b5a metadata.xml 726
-MD5 a54427237593c125cff686466c766ea4 ChangeLog 1140
-MD5 502cf1d82408dc282b0ebd0ea8d58f50 policycoreutils-1.1.ebuild 1065
-MD5 9ae7590768554ce73f2e0838add2cc9d policycoreutils-1.1-r1.ebuild 1206
+MD5 4f2c31ca41fa2e7583ca6f4bd0e20881 ChangeLog 1268
+MD5 2fc7978c9e3ab0b3027ff653bba4c59f policycoreutils-1.1-r1.ebuild 1204
 MD5 6d4df7058894970c15d4066f7ad88c29 files/policycoreutils-1.0-gentoo.diff 1818
 MD5 1f231a1da642997577ac4567ee9867ac files/rlpkg 2317
-MD5 2d09b4cfc5e5b399863a1ecd381ba33e files/digest-policycoreutils-1.1 67
 MD5 8daee4f4fd3e4a74c4d5f2ddb6b086a5 files/newrole 1197
 MD5 8daee4f4fd3e4a74c4d5f2ddb6b086a5 files/run_init 1197
 MD5 2d09b4cfc5e5b399863a1ecd381ba33e files/digest-policycoreutils-1.1-r1 67
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.1 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.1
deleted file mode 100644
index 1d1d16f0ec17..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7b6ef63f76ef16ad9548f55d58dc148 policycoreutils-1.1.tgz 22695
diff --git a/sys-apps/policycoreutils/policycoreutils-1.1-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.1-r1.ebuild
index 82a7d9c9e683..a28c3501644a 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.1-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r1.ebuild,v 1.1 2003/08/19 00:59:52 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.1-r1.ebuild,v 1.2 2003/08/25 03:42:51 pebenito Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="sys-libs/libselinux
 	sys-apps/attr
diff --git a/sys-apps/policycoreutils/policycoreutils-1.1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.1.ebuild
deleted file mode 100644
index 50d068aff7e8..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.1.ebuild,v 1.2 2003/08/16 01:09:59 pebenito Exp $
-
-IUSE=""
-
-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-apps/attr
-	sys-libs/pam"
-
-RDEPEND="${DEPEND}
-	sys-apps/mkinitrd
-	sys-apps/checkpolicy
-	sec-policy/selinux-base-policy"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.0-gentoo.diff
-}
-
-src_compile() {
-	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() {
-	make DESTDIR="${D}" install
-
-	dosbin ${FILESDIR}/rlpkg
-
-	# overwrite pam.d stuff with ours
-	rm -f ${D}/etc/pam.d/{newrole,run_init}
-	insinto /etc/pam.d
-	doins ${FILESDIR}/{newrole,run_init}
-}