6 files changed, 64 insertions, 48 deletions
diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index 4e6a512e0f87..ec716e1dc372 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.22 2004/09/16 00:19:54 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.23 2004/11/14 19:02:15 pebenito Exp $
+
+*checkpolicy-1.18 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@gentoo.org>
+  +checkpolicy-1.18.ebuild:
+  New upstream release.
 
   15 Sep 2004; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.16.ebuild:
   Fix Makefile for multiple compile jobs.
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index f2bb3f28dd78..314d99a2b2f9 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bf50dfba3b58741b49120cb82b622fff ChangeLog 2975
-MD5 a4de996f98ab33815fb92f6741717e95 checkpolicy-1.14.ebuild 734
-MD5 927093fd813bc45afc77ef11c9258e91 metadata.xml 360
+MD5 33cf2cec640e03946326716c453db2d8 ChangeLog 3113
 MD5 93edd052ed925c7f2710227c6a28f2ed checkpolicy-1.16.ebuild 1081
-MD5 fa01f34ec563792d4ff66110b4f733a3 files/digest-checkpolicy-1.14 64
-MD5 f2b40ebba90e0bef0a570012d5a16965 files/digest-checkpolicy-1.16 64
+MD5 927093fd813bc45afc77ef11c9258e91 metadata.xml 360
+MD5 e687b1f33393a2259f9be36813f3f163 checkpolicy-1.18.ebuild 1232
 MD5 d607f647a52bbb00a5bf754fe4f1dc90 files/checkpolicy-1.16-no-netlink-warn.diff 1022
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBZc9PGFJQsIJWJy4RAkqSAJ9Ex0w3lYdVv9sjnPbea90mVrVrwwCfRRTT
-2OiicfqXEG118QZ6POnAQQw=
-=ZFRW
------END PGP SIGNATURE-----
+MD5 f2b40ebba90e0bef0a570012d5a16965 files/digest-checkpolicy-1.16 64
+MD5 c9bca9508ff124ef4bc19252bdef032b files/digest-checkpolicy-1.18 64
diff --git a/sys-apps/checkpolicy/checkpolicy-1.14.ebuild b/sys-apps/checkpolicy/checkpolicy-1.14.ebuild
deleted file mode 100644
index aa323d800361..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-1.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.14.ebuild,v 1.3 2004/09/20 02:08:14 pebenito Exp $
-
-IUSE=""
-
-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-devel/flex
-	sys-devel/bison"
-
-RDEPEND="sec-policy/selinux-base-policy"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" -e 's/$(LIBS)/$(LIBS) $(LDFLAGS)/' ${S}/Makefile
-}
-
-src_compile() {
-	cd ${S}
-	emake YACC="bison -y" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-1.18.ebuild b/sys-apps/checkpolicy/checkpolicy-1.18.ebuild
new file mode 100644
index 000000000000..e1c8ab32dbaf
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-1.18.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 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 $
+
+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.14 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.14
deleted file mode 100644
index cf95083c352f..000000000000
--- a/sys-apps/checkpolicy/files/digest-checkpolicy-1.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f2e3af4cc816738496fab3f7c6ba656d checkpolicy-1.14.tgz 89334
diff --git a/sys-apps/checkpolicy/files/digest-checkpolicy-1.18 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.18
new file mode 100644
index 000000000000..14beba4019e0
--- /dev/null
+++ b/sys-apps/checkpolicy/files/digest-checkpolicy-1.18
@@ -0,0 +1 @@
+MD5 06c554f6b3c9132346d5076fd3212df8 checkpolicy-1.18.tgz 44850