New upstream release. Mark 1.18 stable.

6 files changed, 87 insertions, 15 deletions

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index ec716e1dc372..a9243a36b920 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/checkpolicy
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.23 2004/11/14 19:02:15 pebenito Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.24 2005/01/08 03:10:33 pebenito Exp $
+
+*checkpolicy-1.20 (07 Jan 2005)
+
+  07 Jan 2005; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.18.ebuild,
+  +checkpolicy-1.20.ebuild:
+  New upstream release.  Mark 1.18 stable.
 
 *checkpolicy-1.18 (14 Nov 2004)
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 314d99a2b2f9..60503e5e8bbd 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,7 +1,19 @@
-MD5 33cf2cec640e03946326716c453db2d8 ChangeLog 3113
-MD5 93edd052ed925c7f2710227c6a28f2ed checkpolicy-1.16.ebuild 1081
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d15e969d6cd7c39b5f24132ddf6422d5 ChangeLog 3295
 MD5 927093fd813bc45afc77ef11c9258e91 metadata.xml 360
-MD5 e687b1f33393a2259f9be36813f3f163 checkpolicy-1.18.ebuild 1232
-MD5 d607f647a52bbb00a5bf754fe4f1dc90 files/checkpolicy-1.16-no-netlink-warn.diff 1022
+MD5 93edd052ed925c7f2710227c6a28f2ed checkpolicy-1.16.ebuild 1081
+MD5 0abcb1bcd2747df5bed7e7f9cf3c07f6 checkpolicy-1.18.ebuild 1228
+MD5 4d9ecc6e34bbec4e0245bedb63e1c1df checkpolicy-1.20.ebuild 1232
 MD5 f2b40ebba90e0bef0a570012d5a16965 files/digest-checkpolicy-1.16 64
+MD5 d607f647a52bbb00a5bf754fe4f1dc90 files/checkpolicy-1.16-no-netlink-warn.diff 1022
 MD5 c9bca9508ff124ef4bc19252bdef032b files/digest-checkpolicy-1.18 64
+MD5 8a83e26d25b110d854b64fbacaaf912f files/digest-checkpolicy-1.20 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB307RMTuwkQ6eEKsRAopaAJ4p96b89Z0FP3V4llvUfvMp3S7begCfXqEX
+gwAUC3KDAaZFNtW7FWnh1EA=
+=KN8s
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/checkpolicy/checkpolicy-1.18.ebuild b/sys-apps/checkpolicy/checkpolicy-1.18.ebuild
index e1c8ab32dbaf..cb4207eecd38 100644
--- a/sys-apps/checkpolicy/checkpolicy-1.18.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.1 2004/11/14 19:02:15 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.18.ebuild,v 1.2 2005/01/08 03:10:33 pebenito Exp $
 
 IUSE="mls"
 
@@ -11,7 +11,7 @@ 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
 	sys-devel/flex
diff --git a/sys-apps/checkpolicy/checkpolicy-1.20.ebuild b/sys-apps/checkpolicy/checkpolicy-1.20.ebuild
new file mode 100644
index 000000000000..609ad975c7aa
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-1.20.ebuild
@@ -0,0 +1,51 @@
+# 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.1 2005/01/08 03:10:33 pebenito Exp $
+
+IUSE="mls"
+
+inherit eutils
+
+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"
+
+DEPEND=">=sys-libs/libsepol-1.2
+	sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND="sec-policy/selinux-base-policy"
+
+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
+}
+
+src_compile() {
+	cd ${S}
+	emake YACC="bison -y" || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	einfo "This checkpolicy can compile version `checkpolicy -V |cut -f 1 -d ' '` policy."
+}
diff --git a/sys-apps/checkpolicy/files/digest-checkpolicy-1.20 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.20
new file mode 100644
index 000000000000..69c45f3be62c
--- /dev/null
+++ b/sys-apps/checkpolicy/files/digest-checkpolicy-1.20
@@ -0,0 +1 @@
+MD5 076c4234591935f361363d7226540f47 checkpolicy-1.20.tgz 45114
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index f45ea6390236..efd420d35b67 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 64ec0a59aff25cac6557c7ed20439c82 ChangeLog 6011
+MD5 03ebba0574781d11858a603a7d0f0b0a ChangeLog 6210
 MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836
-MD5 b4e7ffca2885906d5ba0643ea4a9f1b7 policycoreutils-1.18-r1.ebuild 3388
+MD5 e4e0c9f001b78a6fa04f9d76ce4256b4 policycoreutils-1.18-r1.ebuild 3384
 MD5 6ace8ffd9877d971422974d8a7a64252 policycoreutils-1.16.ebuild 1772
+MD5 22efda3724f27438260631c1467bac7b policycoreutils-1.20.ebuild 3305
 MD5 b3fb897ca820d6d94105ecf7103cab70 files/digest-policycoreutils-1.16 144
 MD5 308dfedc40a02c48b8cc5118feb8f9ef files/policycoreutils-1.16-genhomedircon-compat.diff 1744
 MD5 b6b925cfe77dec139f161917b9837e63 files/policycoreutils-nonls.diff 5207
 MD5 62eac355bd774e69b2ced7cdaf4d9c4d files/digest-policycoreutils-1.18-r1 145
+MD5 d64a2a9fed7f0dcba3c7a519d2b85963 files/digest-policycoreutils-1.20 146
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB2e0DMTuwkQ6eEKsRAqZqAJ4xOXm9mHoSwZWzzVUhbKi5MPzUNQCfW1ez
-JeRST6K6h30rIIV/mp6c9Ic=
-=sKlK
+iD8DBQFB309mMTuwkQ6eEKsRAqtdAJ4pvWElzVyzB959eTd/HuXTEPCYJwCeNvHJ
+UeWU539Y2VHMR0Uchaocu8Y=
+=j0iv
 -----END PGP SIGNATURE-----