new upstream release

6 files changed, 73 insertions, 12 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 0f88a30351ef..72a5b7330181 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.25 2005/01/04 00:55:39 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.26 2005/01/08 03:04:43 pebenito Exp $
+
+*libselinux-1.20 (07 Jan 2005)
+
+  07 Jan 2005; Chris PeBenito <pebenito@gentoo.org> libselinux-1.18.ebuild,
+  +libselinux-1.20.ebuild:
+  New upstream release.  Mark 1.18 stable.
 
   03 Jan 2005; Chris PeBenito <pebenito@gentoo.org> libselinux-1.16.ebuild,
   libselinux-1.18.ebuild:
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 119a98ffb961..514a71faef44 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1b6f6c5bf59c105a29f7fc6a574c3c94 ChangeLog 3850
+MD5 c577c8745e0220a8fcaa71fc419d95cc ChangeLog 4029
 MD5 652c5e8a0a081bf4317359f04f65a603 metadata.xml 537
 MD5 e0aed8c433fe3c6f3fec67306c598cc3 libselinux-1.16.ebuild 1228
-MD5 44223f8af4145b1e0270e8fd3b32beaf libselinux-1.18.ebuild 1290
+MD5 411a0c5474c21dfa44cd2b82ba3d3665 libselinux-1.18.ebuild 1286
+MD5 a62ae15f8f1358838a3da13da59c6ce1 libselinux-1.20.ebuild 1253
 MD5 df040452d72f2635e048a0c69d739e02 files/digest-libselinux-1.16 63
 MD5 ba65b8fb0c686c30d5ec81292bedda02 files/digest-libselinux-1.18 63
 MD5 629c294226ad0d96a81c6d9d44fb1669 files/selinuxconfig.c.diff 646
+MD5 fe6a7f18cac0b37104c6f767ee7a5c87 files/digest-libselinux-1.20 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB2elHMTuwkQ6eEKsRAqNcAJ9jhe8mxr/JNxqjqKyDpywCNGz/KwCfUxeC
-5gIf1HflWKB0MfchV5A3opU=
-=RwZx
+iD8DBQFB301yMTuwkQ6eEKsRAgRZAKCNKSolbowYnIvje7pag/Ig2cf5YgCfVyGu
+JaiIftalypu4A8F2YhqQyb0=
+=1mK8
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.20 b/sys-libs/libselinux/files/digest-libselinux-1.20
new file mode 100644
index 000000000000..52222a7ea0b6
--- /dev/null
+++ b/sys-libs/libselinux/files/digest-libselinux-1.20
@@ -0,0 +1 @@
+MD5 a33e6010f8e1a22c5d1c013dc6bf893a libselinux-1.20.tgz 76853
diff --git a/sys-libs/libselinux/libselinux-1.18.ebuild b/sys-libs/libselinux/libselinux-1.18.ebuild
index e56cd17de1eb..d9e79f72828e 100644
--- a/sys-libs/libselinux/libselinux-1.18.ebuild
+++ b/sys-libs/libselinux/libselinux-1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.18.ebuild,v 1.2 2005/01/04 00:55:39 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.18.ebuild,v 1.3 2005/01/08 03:04:43 pebenito Exp $
 
 inherit eutils
 
@@ -11,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="virtual/libc"
 
diff --git a/sys-libs/libselinux/libselinux-1.20.ebuild b/sys-libs/libselinux/libselinux-1.20.ebuild
new file mode 100644
index 000000000000..1066e14f681d
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-1.20.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.20.ebuild,v 1.1 2005/01/08 03:04:43 pebenito Exp $
+
+inherit eutils
+
+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 ~amd64"
+
+DEPEND="virtual/libc"
+
+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
+}
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 4ec79d053782..dcad1104ddf4 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,6 +1,16 @@
-MD5 0ca6b8e80a5527273cf07d34a1174088 ChangeLog 573
-MD5 4f741d60b255498c774e77389ca7e5ef libsepol-1.0.ebuild 780
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9b682cebc3706ab1ea469b32a1896b25 libsepol-1.0.ebuild 778
 MD5 77bbd07b4b596ae67c79079d2b13f3af metadata.xml 300
-MD5 54134da24c43d9004d6fdc70ccbe5f35 libsepol-1.2.ebuild 884
+MD5 2fa17674554ba9a6efa9c786ce4141cd ChangeLog 724
+MD5 9991bf94953e736e35200ad370117875 libsepol-1.2.ebuild 878
 MD5 2eb262533f23f8db93423978584e3033 files/digest-libsepol-1.0 60
 MD5 6b456bc1959f94d58f1612ecba0f26a8 files/digest-libsepol-1.2 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB305XMTuwkQ6eEKsRAiLgAJ9cgyI0p45F5mT60q2B0daiu0lQBACdEDJl
+7Mwzsox3A9sGF2H+3OF90JE=
+=iBvD
+-----END PGP SIGNATURE-----