mark stable

6 files changed, 9 insertions, 121 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index c96f6ec68c36..6337510287b2 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.14 2003/12/08 01:12:21 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.15 2003/12/16 20:44:51 pebenito Exp $
+
+  16 Dec 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.4.ebuild:
+  Mark stable.
 
 *policycoreutils-1.4 (06 Dec 2003)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index eeddd90001aa..6c9b80a6b04b 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,13 +1,10 @@
-MD5 4e3c1d3b36e287e66a15985e2929ce74 policycoreutils-1.4.ebuild 1581
+MD5 351795b1a1bb0b91fd2cebeb92a27308 policycoreutils-1.4.ebuild 1578
 MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836
-MD5 2a9492784cc7976b14dd81792741e7c2 ChangeLog 2515
-MD5 0cbdf93b9f7f7649427e0b7e8c696370 policycoreutils-1.2-r2.ebuild 1442
+MD5 69a4e6379674507c48190bb4163ec6e3 ChangeLog 2613
 MD5 b3e5bece06545088b90e09a70b01aa42 files/selinux-init 916
 MD5 ccb12f13bb6145ad3a95ae9264067926 files/digest-policycoreutils-1.4 67
 MD5 1f231a1da642997577ac4567ee9867ac files/rlpkg 2317
 MD5 7821fa9efa9de78861110c8bd21bf714 files/newrole 326
 MD5 7821fa9efa9de78861110c8bd21bf714 files/run_init 326
-MD5 f4ce73b8cca30b1e5b2dab69475730a2 files/digest-policycoreutils-1.2-r2 67
 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-r2 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.2-r2
deleted file mode 100644
index a37a7192219c..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 8fe90835b9a7..000000000000
--- a/sys-apps/policycoreutils/files/policycoreutils-1.2-gentoo.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-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-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-1.2-r2.ebuild
deleted file mode 100644
index c5e190164f96..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.2-r2.ebuild
+++ /dev/null
@@ -1,64 +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.2-r2.ebuild,v 1.1 2003/11/24 05:06:15 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}
-	epatch ${FILESDIR}/${PN}-1.2-gentoo.diff
-
-	# remove -lattr from Makefiles
-	SUBDIRS="load_policy newrole run_init setfiles"
-	for i in ${SUBDIRS}; do
-		sed -i -e 's:-lattr::g' ${i}/Makefile
-	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"
-
-	for i in ${SUBDIRS}; do
-		einfo "Compiling ${i}"
-		cd ${S}/${i}
-		emake EXTRA_CFLAGS="${CFLAGS}" || die
-	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}
-
-		exeinto /sbin
-		newexe ${FILESDIR}/selinux-init seinit
-	fi
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.4.ebuild b/sys-apps/policycoreutils/policycoreutils-1.4.ebuild
index 9c3a97f585aa..5086a1114316 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.4.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.4.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.4.ebuild,v 1.1 2003/12/06 20:19:38 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.4.ebuild,v 1.2 2003/12/16 20:44:51 pebenito Exp $
 
 IUSE="build"
 
@@ -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 ~sparc"
+KEYWORDS="x86 ppc sparc"
 
 DEPEND="sys-libs/libselinux
 	sys-devel/gettext