new upstream release

5 files changed, 72 insertions, 9 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index ce13aa37383d..b5d6e1fd20a7 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.33 2004/08/08 00:38:07 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.34 2004/09/08 00:47:45 pebenito Exp $
+
+*policycoreutils-1.16 (07 Sep 2004)
+
+  07 Sep 2004; Chris PeBenito <pebenito@gentoo.org>
+  +files/policycoreutils-1.16-genhomedircon-compat.diff,
+  +policycoreutils-1.16.ebuild:
+  New upstream release.
 
   08 Aug 2004; Tom Martin <slarti@gentoo.org> policycoreutils-1.12-r1.ebuild,
   policycoreutils-1.12-r2.ebuild, policycoreutils-1.14.ebuild,
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.12-r1 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.12-r1
deleted file mode 100644
index 7dac90c32def..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.12-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 db69756ca36d460ebe2fc0fd7cdbf2b9 policycoreutils-1.12.tgz 40518
-MD5 9a0de2580023c53d04aab04e96b420a8 policycoreutils-extra-1.5.tar.bz2 8704
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.16 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.16
new file mode 100644
index 000000000000..93bc71fc58e3
--- /dev/null
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.16
@@ -0,0 +1,2 @@
+MD5 37441e21fefa413b67cd13118022ea3e policycoreutils-1.16.tgz 44139
+MD5 f8838030033c7c223f9451ec800b1be5 policycoreutils-extra-1.8.tar.bz2 9938
diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.16-genhomedircon-compat.diff b/sys-apps/policycoreutils/files/policycoreutils-1.16-genhomedircon-compat.diff
new file mode 100644
index 000000000000..ea94820b1687
--- /dev/null
+++ b/sys-apps/policycoreutils/files/policycoreutils-1.16-genhomedircon-compat.diff
@@ -0,0 +1,50 @@
+diff -urN policycoreutils-1.16.orig/scripts/genhomedircon policycoreutils-1.16/scripts/genhomedircon
+--- policycoreutils-1.16.orig/scripts/genhomedircon	2004-09-06 02:19:00.927379664 -0400
++++ policycoreutils-1.16/scripts/genhomedircon	2004-09-06 02:28:25.143605760 -0400
+@@ -87,7 +87,13 @@
+ 	return rc
+ 
+ try:
+-	if len(sys.argv) != 3:
++	if len(sys.argv) == 2:
++		FILECONTEXTDIR="."
++		FILECONTEXTS=sys.argv[1]
++	elif len(sys.argv) == 3:
++		FILECONTEXTDIR=sys.argv[1]
++		FILECONTEXTS=sys.argv[2]
++	else:
+ 		print len(sys.argv)
+ 		usage("Incorrect parameters")
+ 
+@@ -97,13 +103,6 @@
+ 	else:
+ 		STARTING_UID=500
+ 
+-	rc=commands.getstatusoutput("grep -h '^UID_MIN' /etc/login.defs | sed -e 's/^UID_MIN[^0-9]*//'")
+-	if rc[0] == 0:
+-		STARTING_UID=rc[1]
+-	else:
+-		STARTING_UID=500
+-
+-	FILECONTEXTDIR=sys.argv[1]
+ 	prefixes = getPrefixes()
+ 
+ 	rc=commands.getstatusoutput("grep -h '^HOME' /etc/default/useradd")
+@@ -124,7 +123,7 @@
+ 	sed_dir = "h; s|^HOME_DIR|%s/[^/]+|; s|ROLE_|user_|" % (string.join(prefixes.keys(), "/[^/]+|; s|ROLE_|user_|; p; g; s|^HOME_DIR|"),)
+ 
+ 	# Fill in HOME_ROOT, HOME_DIR, and ROLE for users not explicitly defined in /etc/security/selinux/src/policy/users
+-	rc=commands.getstatusoutput("sed -e \"/^HOME_ROOT/{%s}\" -e \"/^HOME_DIR/{%s}\" %s" % (sed_root, sed_dir, sys.argv[2]))
++	rc=commands.getstatusoutput("sed -e \"/^HOME_ROOT/{%s}\" -e \"/^HOME_DIR/{%s}\" %s" % (sed_root, sed_dir, FILECONTEXTS))
+ 	if rc[0] == 0:
+ 		print rc[1]
+ 	else:
+@@ -135,7 +134,7 @@
+ 
+ 	# Fill in HOME and ROLE for users that are defined
+ 	for u in users.keys():
+-		update(sys.argv[2], u, users[u]) 
++		update(FILECONTEXTS, u, users[u]) 
+ except ValueError, error:
+ 	errorExit(string.join("ValueError ", error))
+ except IndexError, error:
diff --git a/sys-apps/policycoreutils/policycoreutils-1.12-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.16.ebuild
index 89af62ebc386..555e8e67f8a8 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.12-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.16.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.12-r1.ebuild,v 1.2 2004/08/08 00:38:07 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.16.ebuild,v 1.1 2004/09/08 00:47:45 pebenito Exp $
 
 IUSE="build"
 
 inherit eutils
 
-EXTRAS_VER="1.5"
+EXTRAS_VER="1.8"
 
 DESCRIPTION="SELinux core utilities"
 HOMEPAGE="http://www.nsa.gov/selinux"
@@ -14,9 +14,10 @@ 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-${PV}
+	sys-libs/libsepol
 	sys-devel/gettext
 	!build? ( sys-libs/pam )"
 
@@ -26,10 +27,15 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/policycoreutils-1.10-genhomedircon-reverse.diff
 
-	# Change script paths POLICYDIR
-	sed -i -e "s:/etc/security/selinux/src/policy/:${POLICYDIR}:g" ${S}/scripts/genhomedircon
+	# add compatibility for number of genhomedircon command line args
+	epatch ${FILESDIR}/policycoreutils-1.16-genhomedircon-compat.diff
+
+	# dont install fixfiles cron script
+	sed -i -e '/^all/s/fixfiles//' ${S}/scripts/Makefile \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' ${S}/scripts/Makefile \
+		|| die "fixfiles sed 2 failed"
 
 	# fix up to accept Gentoo CFLAGS
 	local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`"