new upstream release

Package-Manager: portage-2.0.51.19

11 files changed, 45 insertions, 225 deletions

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index bb05bface67b..b6cf1d77d061 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/checkpolicy
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.25 2005/02/14 00:29:22 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.26 2005/03/13 13:36:54 pebenito Exp $
+
+*checkpolicy-1.22 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@gentoo.org>
+  +checkpolicy-1.22.ebuild:
+  New upstream release.
 
   13 Feb 2005; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.20.ebuild:
   Mark stable.
diff --git a/sys-apps/checkpolicy/checkpolicy-1.18.ebuild b/sys-apps/checkpolicy/checkpolicy-1.22.ebuild
index cb4207eecd38..d427456e001b 100644
--- a/sys-apps/checkpolicy/checkpolicy-1.18.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-1.22.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.18.ebuild,v 1.2 2005/01/08 03:10:33 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.22.ebuild,v 1.1 2005/03/13 13:36:54 pebenito Exp $
 
-IUSE="mls"
+IUSE=""
 
 inherit eutils
 
+SEPOL_VER="1.4"
+
 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 sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
-DEPEND=">=sys-libs/libsepol-1.2
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
 	sys-devel/flex
 	sys-devel/bison"
 
@@ -23,18 +25,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" -e 's/$(LIBS)/$(LIBS) $(LDFLAGS)/' ${S}/Makefile
-	sed -i -e '/^lex\.yy\.c/s/\.l/\.l y\.tab\.c/' ${S}/Makefile
-
 	epatch ${FILESDIR}/checkpolicy-1.16-no-netlink-warn.diff
 
-	# MLS support is experimental!
-	if use mls; then
-		sed -i -e '/^MLS/s/n/y/' ${S}/Makefile \
-			|| die "MLS config failed."
-		sed -i -e 's/-mls (/ (mls /' ${S}/checkpolicy.c \
-			|| die "MLS output failed."
-	fi
+	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" -e 's/$(LIBS)/$(LIBS) $(LDFLAGS)/' ${S}/Makefile
+	sed -i -e '/^lex\.yy\.c/s/\.l/\.l y\.tab\.c/' ${S}/Makefile
 }
 
 src_compile() {
diff --git a/sys-apps/checkpolicy/files/digest-checkpolicy-1.18 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.18
deleted file mode 100644
index 14beba4019e0..000000000000
--- a/sys-apps/checkpolicy/files/digest-checkpolicy-1.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06c554f6b3c9132346d5076fd3212df8 checkpolicy-1.18.tgz 44850
diff --git a/sys-apps/checkpolicy/files/digest-checkpolicy-1.22 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.22
new file mode 100644
index 000000000000..4f6ed925e740
--- /dev/null
+++ b/sys-apps/checkpolicy/files/digest-checkpolicy-1.22
@@ -0,0 +1 @@
+MD5 3b4d690a206d05ac7619ee61b99b6da9 checkpolicy-1.22.tgz 42449
diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index b13ed97dcaa0..d587733cf7da 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.40 2005/02/14 00:38:20 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.41 2005/03/13 13:41:29 pebenito Exp $
+
+*policycoreutils-1.22 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@gentoo.org>
+  +files/policycoreutils-1.22-genhomedircon-quiet.diff,
+  +policycoreutils-1.22.ebuild:
+  New upstream release.
 
 *policycoreutils-1.20-r1 (13 Feb 2005)
 
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.18-r1 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.18-r1
deleted file mode 100644
index e87fd70f02f1..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.18-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5bba6fb1c02f9d3aba37cb55f3aebd64 policycoreutils-1.18.tgz 46806
-MD5 776c1f9780d8ab846ff45a843a588915 policycoreutils-extra-1.10.tar.bz2 9804
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.22 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.22
new file mode 100644
index 000000000000..411370118bda
--- /dev/null
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.22
@@ -0,0 +1,2 @@
+MD5 478ab461726e06dcce2a47cab1f79d22 policycoreutils-1.22.tgz 53498
+MD5 c9a55e52f3c2eb822bee464972ab305a policycoreutils-extra-1.12.tar.bz2 10171
diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.16-genhomedircon-compat.diff b/sys-apps/policycoreutils/files/policycoreutils-1.16-genhomedircon-compat.diff
deleted file mode 100644
index ea94820b1687..000000000000
--- a/sys-apps/policycoreutils/files/policycoreutils-1.16-genhomedircon-compat.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-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/files/policycoreutils-1.22-genhomedircon-quiet.diff b/sys-apps/policycoreutils/files/policycoreutils-1.22-genhomedircon-quiet.diff
new file mode 100644
index 000000000000..ced1b943b10b
--- /dev/null
+++ b/sys-apps/policycoreutils/files/policycoreutils-1.22-genhomedircon-quiet.diff
@@ -0,0 +1,14 @@
+diff -urN policycoreutils-1.22.orig/scripts/genhomedircon policycoreutils-1.22/scripts/genhomedircon
+--- policycoreutils-1.22.orig/scripts/genhomedircon	2005-03-07 10:46:17.000000000 -0500
++++ policycoreutils-1.22/scripts/genhomedircon	2005-03-12 18:59:45.873548040 -0500
+@@ -104,10 +104,6 @@
+ 	return rc
+ 
+ def oldgenhomedircon(filecontextdir, filecontext):
+-    sys.stderr.write("Using genhomedircon in this fashion is supported for backwards compatability\n")
+-    sys.stderr.write("Please update to the latest policy\n")
+-    sys.stderr.flush()
+-
+     if os.path.isdir(filecontextdir) == 0:
+         sys.stderr.write("New usage is the following\n")
+         usage()
diff --git a/sys-apps/policycoreutils/files/policycoreutils-nonls.diff b/sys-apps/policycoreutils/files/policycoreutils-nonls.diff
deleted file mode 100644
index 3bab250c06cb..000000000000
--- a/sys-apps/policycoreutils/files/policycoreutils-nonls.diff
+++ /dev/null
@@ -1,150 +0,0 @@
-Index: load_policy/Makefile
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/load_policy/Makefile,v
-retrieving revision 1.6
-diff -u -r1.6 Makefile
---- load_policy/Makefile	13 Aug 2004 17:19:09 -0000	1.6
-+++ load_policy/Makefile	20 Dec 2004 03:19:51 -0000
-@@ -5,7 +5,7 @@
- LOCALEDIR ?= /usr/share/locale
- 
- CFLAGS = -Wall
--override CFLAGS += -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
-+override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
- LDLIBS += -lsepol -lselinux
- 
- TARGETS=$(patsubst %.c,%,$(wildcard *.c))
-Index: load_policy/load_policy.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/load_policy/load_policy.c,v
-retrieving revision 1.8
-diff -u -r1.8 load_policy.c
---- load_policy/load_policy.c	26 Aug 2004 17:15:39 -0000	1.8
-+++ load_policy/load_policy.c	20 Dec 2004 03:19:52 -0000
-@@ -10,9 +10,13 @@
- #include <getopt.h>
- #include <selinux/selinux.h>
- #include <sepol/sepol.h>
-+#ifdef USE_NLS
- #include <locale.h>			    /* for setlocale() */
- #include <libintl.h>			    /* for gettext() */
- #define _(msgid) gettext (msgid)
-+#else
-+#define _(msgid) (msgid)
-+#endif
- #ifndef PACKAGE
- #define PACKAGE "policycoreutils"   /* the name of this package lang translation */
- #endif
-@@ -30,9 +34,11 @@
- 	void *map;
- 	char *polpath, *boolpath = NULL, **names;
- 
-+#ifdef USE_NLS
- 	setlocale (LC_ALL, "");
- 	bindtextdomain (PACKAGE, LOCALEDIR);
- 	textdomain (PACKAGE);
-+#endif
- 
- 	while ((opt = getopt(argc, argv, "qb")) > 0) {
- 		switch (opt) {
-Index: newrole/Makefile
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/newrole/Makefile,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile
---- newrole/Makefile	26 Nov 2003 18:01:24 -0000	1.4
-+++ newrole/Makefile	20 Dec 2004 03:19:52 -0000
-@@ -6,7 +6,7 @@
- LOCALEDIR = /usr/share/locale
- 
- CFLAGS = -Wall
--override CFLAGS += -DUSE_PAM -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
-+override CFLAGS += -DUSE_NLS -DUSE_PAM -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
- LDLIBS += -lselinux -ldl -lpam -lpam_misc
- 
- TARGETS=$(patsubst %.c,%,$(wildcard *.c))
-Index: newrole/newrole.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/newrole/newrole.c,v
-retrieving revision 1.4
-diff -u -r1.4 newrole.c
---- newrole/newrole.c	12 Aug 2004 13:58:10 -0000	1.4
-+++ newrole/newrole.c	20 Dec 2004 03:19:52 -0000
-@@ -64,9 +64,13 @@
- #include <selinux/get_default_type.h>
- #include <selinux/get_context_list.h> /* for SELINUX_DEFAULTUSER */
- #include <signal.h>
-+#ifdef USE_NLS
- #include <locale.h>			    /* for setlocale() */
- #include <libintl.h>			    /* for gettext() */
- #define _(msgid) gettext (msgid)
-+#else
-+#define _(msgid) (msgid)
-+#endif
- #ifndef PACKAGE
- #define PACKAGE "policycoreutils"   /* the name of this package lang translation */
- #endif
-@@ -265,9 +269,11 @@
-   /* Terminate on SIGHUP. */
-   signal(SIGHUP, SIG_DFL);
- 
-+#ifdef USE_NLS
-   setlocale (LC_ALL, "");
-   bindtextdomain (PACKAGE, LOCALEDIR);
-   textdomain (PACKAGE);
-+#endif
- 
-   /*
-    *
-Index: run_init/Makefile
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/run_init/Makefile,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile
---- run_init/Makefile	26 Nov 2003 18:01:25 -0000	1.4
-+++ run_init/Makefile	20 Dec 2004 03:19:52 -0000
-@@ -7,7 +7,7 @@
- LOCALEDIR ?= /usr/share/locale
- 
- CFLAGS = -Wall
--override CFLAGS += -DUSE_PAM -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
-+override CFLAGS += -DUSE_NLS -DUSE_PAM -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
- LDLIBS += -lselinux -ldl -lpam -lpam_misc
- 
- TARGETS=$(patsubst %.c,%,$(wildcard *.c))
-Index: run_init/run_init.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/run_init/run_init.c,v
-retrieving revision 1.4
-diff -u -r1.4 run_init.c
---- run_init/run_init.c	17 Jun 2004 16:43:42 -0000	1.4
-+++ run_init/run_init.c	20 Dec 2004 03:19:53 -0000
-@@ -49,10 +49,14 @@
- #include <selinux/context.h>              /* for context-mangling functions */
- #include <fcntl.h>
- #include <ctype.h>
-+#include <limits.h>
-+#ifdef USE_NLS
- #include <libintl.h>
- #include <locale.h>
--#include <limits.h>
- #define _(msgid) gettext (msgid)
-+#else
-+#define _(msgid) (msgid)
-+#endif
- #ifndef PACKAGE
- #define PACKAGE "policycoreutils"   /* the name of this package lang translation */
- #endif
-@@ -314,9 +318,12 @@
-   extern char *optarg;               /* used by getopt() for arg strings */
-   extern int opterr;                 /* controls getopt() error messages */
-   security_context_t new_context;	     /* context for the init script context  */
-+  
-+#ifdef USE_NLS
-   setlocale(LC_ALL, "");
-   bindtextdomain(PACKAGE, LOCALEDIR);
-   textdomain(PACKAGE);
-+#endif
- 
-   /* Verify that we are running on a flask-enabled kernel. */
-   if( !is_selinux_enabled() ) {
diff --git a/sys-apps/policycoreutils/policycoreutils-1.18-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.22.ebuild
index 69895ebc5aa3..28d87f139c51 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.18-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.22.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.18-r1.ebuild,v 1.2 2005/01/08 03:13:06 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.22.ebuild,v 1.1 2005/03/13 13:41:29 pebenito Exp $
 
 IUSE="build nls pam"
 
 inherit eutils
 
-EXTRAS_VER="1.10"
-SEPOL_VER="1.2"
+EXTRAS_VER="1.12"
+SEPOL_VER="1.4"
 
 DESCRIPTION="SELinux core utilities"
 HOMEPAGE="http://www.nsa.gov/selinux"
@@ -15,7 +15,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 amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 RDEPEND=">=sys-libs/libselinux-${PV}
 	!build? ( pam? ( sys-libs/pam ) >=sys-libs/libsepol-${SEPOL_VER} )
@@ -48,8 +48,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# patch in code for nls option
-	epatch ${FILESDIR}/policycoreutils-nonls.diff
+	epatch ${FILESDIR}/policycoreutils-1.22-genhomedircon-quiet.diff
 
 	# fixfiles is extremely dangerous
 	sed -i -e '/^all/s/fixfiles//' ${S}/scripts/Makefile \