new upstream version

8 files changed, 105 insertions, 18 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 35d7b70029c2..98b73df41fea 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.28 2004/06/28 14:40:37 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.29 2004/07/02 16:42:25 pebenito Exp $
+
+*policycoreutils-1.14 (02 Jul 2004)
+
+  02 Jul 2004; Chris PeBenito <pebenito@gentoo.org>
+  +files/policycoreutils-1.14-genhomedircon-compat.diff,
+  +policycoreutils-1.14.ebuild:
+  New upstream version.
 
 *policycoreutils-1.12-r1 (28 Jun 2004)
 
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.12 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.12
deleted file mode 100644
index 257aa77d5ef0..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 db69756ca36d460ebe2fc0fd7cdbf2b9 policycoreutils-1.12.tgz 40518
-MD5 43b110a81cd266e2724aa11bcdbab9b0 policycoreutils-extra-1.4.tar.bz2 8501
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.14 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.14
new file mode 100644
index 000000000000..dae252e13039
--- /dev/null
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.14
@@ -0,0 +1,2 @@
+MD5 0ae038ab98c053e6dd54d97edbd38049 policycoreutils-1.14.tgz 42284
+MD5 9a0de2580023c53d04aab04e96b420a8 policycoreutils-extra-1.5.tar.bz2 8704
diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.14-genhomedircon-compat.diff b/sys-apps/policycoreutils/files/policycoreutils-1.14-genhomedircon-compat.diff
new file mode 100644
index 000000000000..cdcf92ff2d58
--- /dev/null
+++ b/sys-apps/policycoreutils/files/policycoreutils-1.14-genhomedircon-compat.diff
@@ -0,0 +1,40 @@
+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.12.ebuild b/sys-apps/policycoreutils/policycoreutils-1.14.ebuild
index 9c2d0146d619..b1817cd8981f 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.12.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.14.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.12.ebuild,v 1.3 2004/06/25 03:09:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.14.ebuild,v 1.1 2004/07/02 16:42:25 pebenito Exp $
 
 IUSE="build"
 
 inherit eutils
 
-EXTRAS_VER="1.4"
+EXTRAS_VER="1.5"
 
 DESCRIPTION="SELinux core utilites"
 HOMEPAGE="http://www.nsa.gov/selinux"
@@ -14,7 +14,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-${PV}
 	sys-devel/gettext
@@ -26,10 +26,11 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/policycoreutils-1.10-genhomedircon-reverse.diff
+	# fix genhomedircon starting uid
+	sed -i -e '/^STARTING_UID/s/100/1000/' ${S}/scripts/genhomedircon
 
-	# 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.14-genhomedircon-compat.diff
 
 	# fix up to accept Gentoo CFLAGS
 	local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`"
@@ -61,10 +62,3 @@ src_install() {
 		make DESTDIR="${D}" -C ${S2} install || die
 	fi
 }
-
-pkg_postinst() {
-	ewarn "WARNING: seinit is deprecated, and is no"
-	ewarn "longer installed.  Please remove seinit from"
-	ewarn "your bootloader.  The policy is now loaded"
-	ewarn "by init itself."
-}
diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 0e5c822e59d1..ba77ef5cb94f 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.21 2004/06/25 03:09:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.22 2004/07/02 16:37:35 pebenito Exp $
+
+*libselinux-1.14 (02 Jul 2004)
+
+  02 Jul 2004; Chris PeBenito <pebenito@gentoo.org> +libselinux-1.14.ebuild:
+  New upstream version.
 
   11 Jun 2004; Chris PeBenito <pebenito@gentoo.org> -libselinux-1.10.ebuild,
   libselinux-1.12.ebuild:
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.14 b/sys-libs/libselinux/files/digest-libselinux-1.14
new file mode 100644
index 000000000000..a686fe1cbc81
--- /dev/null
+++ b/sys-libs/libselinux/files/digest-libselinux-1.14
@@ -0,0 +1 @@
+MD5 f5d80e5f19e906232fd866b6997ac7af libselinux-1.14.tgz 60228
diff --git a/sys-libs/libselinux/libselinux-1.14.ebuild b/sys-libs/libselinux/libselinux-1.14.ebuild
new file mode 100644
index 000000000000..a49a2356cf7d
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-1.14.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.14.ebuild,v 1.1 2004/07/02 16:37:35 pebenito Exp $
+
+IUSE=""
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="http://www.nsa.gov/selinux"
+SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="sys-libs/glibc"
+
+src_unpack() {
+	unpack ${A}
+
+	# add for compatibility, for now.  Otherwise the current sysvinit
+	# patch fails to compile.
+	sed -i -e 's/^\#endif//' ${S}/include/selinux/selinux.h
+	echo '/* so older sysvinit patch can compile */' >> ${S}/include/selinux/selinux.h
+	echo '#define SELINUXMNT "/selinux/"' >> ${S}/include/selinux/selinux.h
+	echo '#define SELINUXPOLICY "/etc/security/selinux/policy"' >> ${S}/include/selinux/selinux.h
+	echo '#endif' >> ${S}/include/selinux/selinux.h
+
+	cd ${S}
+	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" src/Makefile \
+		|| die "src Makefile CFLAGS fix failed."
+	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" utils/Makefile \
+		|| die "utils Makefile CFLAGS fix failed."
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+}