new uptream release

7 files changed, 23 insertions, 160 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index b5d6e1fd20a7..ef69d0b6e13f 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.34 2004/09/08 00:47:45 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.35 2004/11/14 19:09:35 pebenito Exp $
+
+*policycoreutils-1.18 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@gentoo.org>
+  +policycoreutils-1.18.ebuild:
+  New upstream release.
 
 *policycoreutils-1.16 (07 Sep 2004)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 271a266ea10d..c0509c971a53 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2b43361a2a2c302fca77460dc5eb9722 ChangeLog 5409
+MD5 5dbfcb83a09115b20a1c41b6b991c776 ChangeLog 5555
 MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836
-MD5 fe7693f76bf332522faa4bae5fbd31af policycoreutils-1.14.ebuild 1645
 MD5 6ace8ffd9877d971422974d8a7a64252 policycoreutils-1.16.ebuild 1772
-MD5 4f60b120c053af5e96772b15f2019cc5 files/digest-policycoreutils-1.14 144
-MD5 440f1bd6fdf23f39dde7bd50aefc5731 files/policycoreutils-1.10-genhomedircon-reverse.diff 3459
-MD5 98c9b5772013d9f3a4e1fec905eed9c9 files/policycoreutils-1.14-genhomedircon-compat.diff 1520
+MD5 8fcf91c843f8e365b3abf91133842b36 policycoreutils-1.18.ebuild 1777
 MD5 b3fb897ca820d6d94105ecf7103cab70 files/digest-policycoreutils-1.16 144
 MD5 308dfedc40a02c48b8cc5118feb8f9ef files/policycoreutils-1.16-genhomedircon-compat.diff 1744
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBZdAQGFJQsIJWJy4RAq8FAJ9zwvbKJhNGNAdp+JtJuY+VNvg8VQCePBPS
-OjLRQjxIShq8C6kFKef+B8M=
-=fgda
------END PGP SIGNATURE-----
+MD5 2dbe913419502995a710560072ca8517 files/digest-policycoreutils-1.18 145
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.14 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.14
deleted file mode 100644
index bdc872a1f874..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.14
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0ae038ab98c053e6dd54d97edbd38049 policycoreutils-1.14.tgz 42284
-MD5 b388ca2c6ac30774cac019d2bd971bbc policycoreutils-extra-1.7.tar.bz2 8722
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.18 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.18
new file mode 100644
index 000000000000..97731175c5f6
--- /dev/null
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.18
@@ -0,0 +1,2 @@
+MD5 5bba6fb1c02f9d3aba37cb55f3aebd64 policycoreutils-1.18.tgz 46806
+MD5 391576de7edab55e72f8234f245e214f policycoreutils-extra-1.9.tar.bz2 10700
diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.10-genhomedircon-reverse.diff b/sys-apps/policycoreutils/files/policycoreutils-1.10-genhomedircon-reverse.diff
deleted file mode 100644
index 9ffc8e53749b..000000000000
--- a/sys-apps/policycoreutils/files/policycoreutils-1.10-genhomedircon-reverse.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -urN policycoreutils-1.10/scripts/genhomedircon policycoreutils-1.8/scripts/genhomedircon
---- policycoreutils-1.10/scripts/genhomedircon	2004-03-24 11:48:00.000000000 -0600
-+++ policycoreutils-1.8/scripts/genhomedircon	2004-03-09 09:19:51.000000000 -0600
-@@ -6,8 +6,6 @@
- # genhomedircon - Replace HOME_ROOT, HOME_DIR, and ROLE macros in .fc files
- #  with generic and user-specific values.
- #
--# Based off original script by Dan Walsh, <dwalsh@redhat.com>
--#
- # ASSUMPTIONS:
- #
- # If a user has more than one role in FILECONTEXTDIR/users, genhomedircon uses
-@@ -24,6 +22,7 @@
- 
- import commands, sys, os, pwd, string
- 
-+FILECONTEXTDIR="/etc/security/selinux/src/policy/"
- EXCLUDE_LOGINS=["/sbin/nologin", "/bin/false"]
- STARTING_UID=100
- 
-@@ -39,7 +38,7 @@
- 			if not prefixes.has_key(prefix):
- 				prefixes[prefix] = ""
- 	return prefixes
-- 
-+
- def getUsers():
- 	rc = commands.getstatusoutput("grep ^user %s/users" % FILECONTEXTDIR)
- 	udict = {}
-@@ -66,12 +65,12 @@
- def usage(error = ""):
- 	if error != "":
- 		sys.stderr.write("%s\n" % (error,))
--	sys.stderr.write("Usage: %s POLICYSOURCEDIR FILE_CONTEXTS\n" % sys.argv[0])
-+	sys.stderr.write("Usage: %s FILE_CONTEXTS\n" % sys.argv[0])
- 	sys.stderr.flush()
- 	sys.exit(1)
--	
-+
- def update(filecontext, user, prefs):
--	rc=commands.getstatusoutput("grep -h '^HOME_DIR' %s | grep -v vmware | sed -e 's|HOME_DIR|%s|' -e 's/ROLE/%s/' -e 's/system_u/%s/'" % (filecontext, prefs["home"], prefs["role"], user))
-+	rc=commands.getstatusoutput("grep -h '^HOME_DIR' %s | grep -v vmware | sed -e 's|HOME_DIR|%s|g' -e 's/ROLE/%s/' -e 's/system_u/%s/'" % (filecontext, prefs["home"], prefs["role"], user))
- 	if rc[0] == 0:
- 		print rc[1]
- 	else:
-@@ -79,11 +78,6 @@
- 	return rc
- 
- try:
--	if len(sys.argv) != 3:
--		print len(sys.argv)
--		usage()
--
--	FILECONTEXTDIR=sys.argv[1]
- 	prefixes = getPrefixes()
- 
- 	rc=commands.getstatusoutput("grep -h '^HOME' /etc/default/useradd")
-@@ -91,20 +85,21 @@
- 		homedir = rc[1].split("=")[1]
- 	else:
- 		sys.stderr.write("%s\n" % (rc[1],))
--		sys.stderr.write("You do not have access to /etc/default/useradd, default /home\n")
-+		sys.stderr.write("Do you have access to /etc/default/useradd?\n")
- 		sys.stderr.flush()
--		homedir = "/home"
--		
-+		sys.exit(1)
- 
- 	if not prefixes.has_key(homedir):
- 		prefixes[homedir] = ""
- 
--	# There may be a more elegant sed script to expand a macro to multiple lines, but this works
--	sed_root = "h; s|^HOME_ROOT|%s|" % (string.join(prefixes.keys(), "|; p; g; s|^HOME_ROOT|"),)
--	sed_dir = "h; s|^HOME_DIR|%s/[^/]+|; s|ROLE_|user_|" % (string.join(prefixes.keys(), "/[^/]+|; s|ROLE_|user_|; p; g; s|^HOME_DIR|"),)
-+	if len(prefixes) == 1:
-+		regex_root = prefixes.keys()[0]
-+	else:
-+		regex_root = "(%s)" % (string.join(prefixes, "\|"),)
-+	regex_dir = "%s/[^/]+" % (regex_root,)
- 
- 	# 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 's|^HOME_ROOT|%s|g' -e 's|^HOME_DIR|%s|g' -e 's/ROLE_/user_/' %s" % (regex_root, regex_dir, sys.argv[1]))
- 	if rc[0] == 0:
- 		print rc[1]
- 	else:
-@@ -115,7 +110,8 @@
- 
- 	# Fill in HOME and ROLE for users that are defined
- 	for u in users.keys():
--		update(sys.argv[2], u, users[u]) 
-+		update(sys.argv[1], u, users[u])
-+
- except ValueError, error:
- 	usage(error)
- except IndexError, error:
diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.14-genhomedircon-compat.diff b/sys-apps/policycoreutils/files/policycoreutils-1.14-genhomedircon-compat.diff
deleted file mode 100644
index cdcf92ff2d58..000000000000
--- a/sys-apps/policycoreutils/files/policycoreutils-1.14-genhomedircon-compat.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urN policycoreutils-1.14.orig/scripts/genhomedircon policycoreutils-1.14/scripts/genhomedircon
---- policycoreutils-1.14.orig/scripts/genhomedircon	2004-06-17 08:20:25.000000000 -0500
-+++ policycoreutils-1.14/scripts/genhomedircon	2004-07-01 00:26:56.611222252 -0500
-@@ -88,11 +88,16 @@
- 	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")
- 
--	FILECONTEXTDIR=sys.argv[1]
- 	prefixes = getPrefixes()
- 
- 	rc=commands.getstatusoutput("grep -h '^HOME' /etc/default/useradd")
-@@ -113,7 +118,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:
-@@ -124,7 +129,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(join("ValueError ", error))
- except IndexError, error:
diff --git a/sys-apps/policycoreutils/policycoreutils-1.14.ebuild b/sys-apps/policycoreutils/policycoreutils-1.18.ebuild
index 3507f622ed6a..104a2b3b65fd 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.14.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.18.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.14.ebuild,v 1.6 2004/09/20 02:09:45 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.18.ebuild,v 1.1 2004/11/14 19:09:35 pebenito Exp $
 
 IUSE="build"
 
 inherit eutils
 
-EXTRAS_VER="1.7"
+EXTRAS_VER="1.9"
 
 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 amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 DEPEND=">=sys-libs/libselinux-${PV}
+	sys-libs/libsepol
 	sys-devel/gettext
 	!build? ( sys-libs/pam )"
 
@@ -26,11 +27,15 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	# fix genhomedircon starting uid
-	sed -i -e '/^STARTING_UID/s/100/1000/' ${S}/scripts/genhomedircon
 
 	# add compatibility for number of genhomedircon command line args
-	epatch ${FILESDIR}/policycoreutils-1.14-genhomedircon-compat.diff
+#	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`"