New upstream release. Mark 1.18 stable.

4 files changed, 63 insertions, 5 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/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