new upstream release

(Portage version: 2.0.51.22-r1)

8 files changed, 59 insertions, 21 deletions

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index 4afe70870861..f37e150e79e9 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.29 2005/05/10 18:32:18 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.30 2005/06/25 23:38:30 pebenito Exp $
+
+*checkpolicy-1.24 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@gentoo.org>
+  -checkpolicy-1.20.ebuild, +checkpolicy-1.24.ebuild:
+  New upstream release.
 
   10 May 2005; Stephen Bennett <spb@gentoo.org> checkpolicy-1.22.ebuild:
   mips stable
diff --git a/sys-apps/checkpolicy/checkpolicy-1.20.ebuild b/sys-apps/checkpolicy/checkpolicy-1.24.ebuild
index cf76a4cbc47b..95d512ac2121 100644
--- a/sys-apps/checkpolicy/checkpolicy-1.20.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-1.24.ebuild
@@ -1,19 +1,22 @@
 # 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.20.ebuild,v 1.2 2005/02/14 00:29:22 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.24.ebuild,v 1.1 2005/06/25 23:38:30 pebenito Exp $
 
-IUSE="mls"
+IUSE=""
 
 inherit eutils
 
+SEPOL_VER="1.6"
+
 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 mips"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
 
-DEPEND=">=sys-libs/libsepol-1.2
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
 	sys-devel/flex
 	sys-devel/bison"
 
@@ -23,18 +26,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.20 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.20
deleted file mode 100644
index 69c45f3be62c..000000000000
--- a/sys-apps/checkpolicy/files/digest-checkpolicy-1.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 076c4234591935f361363d7226540f47 checkpolicy-1.20.tgz 45114
diff --git a/sys-apps/checkpolicy/files/digest-checkpolicy-1.24 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.24
new file mode 100644
index 000000000000..5c5f519a1f1f
--- /dev/null
+++ b/sys-apps/checkpolicy/files/digest-checkpolicy-1.24
@@ -0,0 +1 @@
+MD5 ac4c6e92411325917393d708443b3022 checkpolicy-1.24.tgz 42667
diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index e8fbad866ca3..b4d8ed098622 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.44 2005/05/10 18:28:18 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.45 2005/06/25 23:43:25 pebenito Exp $
+
+*policycoreutils-1.24 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@gentoo.org>
+  +files/policycoreutils-1.24-genhomedircon-quiet.diff,
+  -policycoreutils-1.20-r1.ebuild, +policycoreutils-1.24.ebuild:
+  New upstream release.
 
   10 May 2005; Stephen Bennett <spb@gentoo.org> policycoreutils-1.22.ebuild:
   mips stable
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.20-r1 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.24
index 0c4531f5d7b7..578ef24da514 100644
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.20-r1
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.24
@@ -1,2 +1,2 @@
-MD5 21c7265641ef35278aa935afe255447a policycoreutils-1.20.tgz 47062
+MD5 9ee11eb7ba48a5f491710126d40c7295 policycoreutils-1.24.tgz 58651
 MD5 c9a55e52f3c2eb822bee464972ab305a policycoreutils-extra-1.12.tar.bz2 10171
diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.24-genhomedircon-quiet.diff b/sys-apps/policycoreutils/files/policycoreutils-1.24-genhomedircon-quiet.diff
new file mode 100644
index 000000000000..0335b7080ed8
--- /dev/null
+++ b/sys-apps/policycoreutils/files/policycoreutils-1.24-genhomedircon-quiet.diff
@@ -0,0 +1,24 @@
+diff -urN policycoreutils-1.24.orig/scripts/genhomedircon policycoreutils-1.24/scripts/genhomedircon
+--- policycoreutils-1.24.orig/scripts/genhomedircon	2005-04-13 10:44:58.000000000 -0400
++++ policycoreutils-1.24/scripts/genhomedircon	2005-06-23 23:48:10.432082157 -0400
+@@ -121,8 +121,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:
+@@ -153,11 +151,6 @@
+                 homedir = re.sub(r"[^/a-zA-Z0-9].*$", "", homedir)
+                 if not prefixes.has_key(homedir):
+                         prefixes[homedir] = ""
+-        else:
+-                if rc[0] != 256:
+-                        sys.stderr.write("%s\n" % rc[1])
+-                        sys.stderr.write("You do not have access to /etc/libuser.conf LU_HOMEDIRECTORY=\n")
+-                        sys.stderr.flush()
+ 
+         #the idea is that we need to find all of the home_root_t directories we do this by just accepting
+         #any default home directory defined by either /etc/libuser.conf or /etc/default/useradd
diff --git a/sys-apps/policycoreutils/policycoreutils-1.20-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.24.ebuild
index 4a3c48421ee6..7ef58a30006a 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.20-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.24.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.20-r1.ebuild,v 1.1 2005/02/14 00:38:20 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.24.ebuild,v 1.1 2005/06/25 23:43:25 pebenito Exp $
 
 IUSE="build nls pam"
 
 inherit eutils
 
 EXTRAS_VER="1.12"
-SEPOL_VER="1.2"
+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,6 +48,12 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	epatch ${FILESDIR}/policycoreutils-1.24-genhomedircon-quiet.diff
+
+	# This warning makes no sense, in this context
+	sed -i -e '/FILE/ s/;/=NULL;/' ${S}/audit2why/audit2why.c \
+		|| die "audit2why sed failed"
+
 	# fixfiles is extremely dangerous
 	sed -i -e '/^all/s/fixfiles//' ${S}/scripts/Makefile \
 		|| die "fixfiles sed 1 failed"