new upstream release

6 files changed, 77 insertions, 73 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 693a1f6354ce..203165bd463d 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.17 2004/02/10 03:55:05 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.18 2004/02/24 22:16:25 pebenito Exp $
+
+*policycoreutils-1.6 (24 Feb 2004)
+
+  24 Feb 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.4-r1.ebuild, policycoreutils-1.6.ebuild:
+  New upstream release.  Mark 1.4-r1 stable.
 
 *policycoreutils-1.4-r1 (09 Feb 2004)
 
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.4 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.4
deleted file mode 100644
index a3281f465dc4..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c047074b07068e979274ab13a7dfbc7d policycoreutils-1.4.tgz 32204
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.6 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.6
new file mode 100644
index 000000000000..6e6325678936
--- /dev/null
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.6
@@ -0,0 +1,2 @@
+MD5 be5a8cb948137e86ea02b6d72dd0a405 policycoreutils-1.6.tgz 33274
+MD5 7745af898c624e8d9c5080da4c671957 policycoreutils-extra-1.0.tar.bz2 5949
diff --git a/sys-apps/policycoreutils/policycoreutils-1.4-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.4-r1.ebuild
index fb40bfef35df..627100360853 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.4-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/02/10 03:55:05 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.4-r1.ebuild,v 1.2 2004/02/24 22:16:25 pebenito Exp $
 
 IUSE="build"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
 	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 
 DEPEND="sys-libs/libselinux
 	sys-devel/gettext
diff --git a/sys-apps/policycoreutils/policycoreutils-1.4.ebuild b/sys-apps/policycoreutils/policycoreutils-1.4.ebuild
deleted file mode 100644
index 5086a1114316..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.4.ebuild
+++ /dev/null
@@ -1,69 +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.4.ebuild,v 1.2 2003/12/16 20:44:51 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
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.6.ebuild b/sys-apps/policycoreutils/policycoreutils-1.6.ebuild
new file mode 100644
index 000000000000..081196b84aa6
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-1.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.6.ebuild,v 1.1 2004/02/24 22:16:25 pebenito Exp $
+
+IUSE="build"
+
+EXTRAS_VER="1.0"
+
+DESCRIPTION="SELinux core utilites"
+HOMEPAGE="http://www.nsa.gov/selinux"
+SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
+	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+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}
+S2=${WORKDIR}/policycoreutils-extra
+
+src_unpack() {
+	unpack ${A}
+
+	# Change script paths POLICYDIR
+	sed -i -e "s:/etc/security/selinux/src/policy/:${POLICYDIR}:g" ${S}/scripts/restorecon
+	sed -i -e "s:/etc/security/selinux/src/policy/:${POLICYDIR}:g" ${S}/scripts/checkcon
+	sed -i -e "s:/etc/security/selinux/src/policy/:${POLICYDIR}:g" ${S}/scripts/genhomedircon
+
+	# fix up to accept Gentoo CFLAGS
+	local SUBDIRS="load_policy newrole run_init setfiles audit2allow"
+	for i in ${SUBDIRS}; do
+		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/${i}/Makefile \
+			|| die "${i} Makefile CFLAGS fix failed."
+	done
+}
+
+src_compile() {
+	if use build; then
+		einfo "Compiling setfiles"
+		emake -C ${S}/setfiles || die
+	else
+		einfo "Compiling policycoreutils"
+		emake -C ${S} || die
+		einfo "Compiling policycoreutils-extra"
+		emake -C ${S2} || die
+	fi
+}
+
+src_install() {
+	if use build; then
+		dosbin ${S}/setfiles/setfiles
+	else
+		einfo "Installing policycoreutils"
+		make DESTDIR="${D}" -C ${S} install || die
+		einfo "Installing policycoreutils-extra"
+		make DESTDIR="${D}" -C ${S2} install || die
+
+		exeinto /sbin
+		newexe ${FILESDIR}/selinux-init seinit
+	fi
+}