new upstream release

5 files changed, 29 insertions, 4 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 66e1d4bb2878..919f02cc2e09 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2004/09/08 00:37:39 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.24 2004/11/14 18:45:50 pebenito Exp $
+
+*libselinux-1.18 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@gentoo.org>
+  +files/selinuxconfig.c.diff, +libselinux-1.18.ebuild:
+  New upstream release.
 
 *libselinux-1.16 (07 Sep 2004)
 
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.14 b/sys-libs/libselinux/files/digest-libselinux-1.14
deleted file mode 100644
index a686fe1cbc81..000000000000
--- a/sys-libs/libselinux/files/digest-libselinux-1.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5d80e5f19e906232fd866b6997ac7af libselinux-1.14.tgz 60228
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.18 b/sys-libs/libselinux/files/digest-libselinux-1.18
new file mode 100644
index 000000000000..f467fcc5581b
--- /dev/null
+++ b/sys-libs/libselinux/files/digest-libselinux-1.18
@@ -0,0 +1 @@
+MD5 2de56f8b585dd1db0d4d5c64d56161d4 libselinux-1.18.tgz 69288
diff --git a/sys-libs/libselinux/files/selinuxconfig.c.diff b/sys-libs/libselinux/files/selinuxconfig.c.diff
new file mode 100644
index 000000000000..eb29cae0497e
--- /dev/null
+++ b/sys-libs/libselinux/files/selinuxconfig.c.diff
@@ -0,0 +1,15 @@
+Index: utils/selinuxconfig.c
+===================================================================
+RCS file: /cvsroot/selinux/nsa/selinux-usr/libselinux/utils/selinuxconfig.c,v
+retrieving revision 1.2
+diff -u -r1.2 selinuxconfig.c
+--- utils/selinuxconfig.c	15 Jun 2004 13:16:30 -0000	1.2
++++ utils/selinuxconfig.c	10 Nov 2004 01:04:41 -0000
+@@ -28,6 +28,7 @@
+ 	printf("binary_policy_path=\"%s\"\n", selinux_binary_policy_path());
+ 	printf("user_contexts_path=\"%s\"\n", selinux_user_contexts_path());
+ 	printf("contexts_path=\"%s\"\n", selinux_contexts_path());
++	printf("file_contexts_path=\"%s\"\n", selinux_file_context_path());
+ 	exit(0);
+ 
+ }
diff --git a/sys-libs/libselinux/libselinux-1.14.ebuild b/sys-libs/libselinux/libselinux-1.18.ebuild
index 6e0e58d95163..8c865a36cd67 100644
--- a/sys-libs/libselinux/libselinux-1.14.ebuild
+++ b/sys-libs/libselinux/libselinux-1.18.ebuild
@@ -1,6 +1,8 @@
 # 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.3 2004/09/20 02:06:35 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.18.ebuild,v 1.1 2004/11/14 18:45:50 pebenito Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -9,7 +11,7 @@ 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 amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 DEPEND="sys-libs/glibc"
 
@@ -29,6 +31,8 @@ src_unpack() {
 		|| die "src Makefile CFLAGS fix failed."
 	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" utils/Makefile \
 		|| die "utils Makefile CFLAGS fix failed."
+
+	epatch ${FILESDIR}/selinuxconfig.c.diff
 }
 
 src_compile() {