From 40b4844073805efa09377f4bb0664f75aff14416 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Thu, 7 Oct 2004 23:24:59 +0000 Subject: [PATCH] mark stable --- sys-apps/checkpolicy/checkpolicy-1.10.ebuild | 31 --------- sys-apps/checkpolicy/checkpolicy-1.16.ebuild | 11 +++- .../checkpolicy/files/digest-checkpolicy-1.10 | 1 - .../files/digest-policycoreutils-1.12-r2 | 2 - .../files/runscript-selinux.diff | 20 ------ .../policycoreutils-1.12-r2.ebuild | 66 ------------------- .../policycoreutils-1.16.ebuild | 4 +- 7 files changed, 11 insertions(+), 124 deletions(-) delete mode 100644 sys-apps/checkpolicy/checkpolicy-1.10.ebuild delete mode 100644 sys-apps/checkpolicy/files/digest-checkpolicy-1.10 delete mode 100644 sys-apps/policycoreutils/files/digest-policycoreutils-1.12-r2 delete mode 100644 sys-apps/policycoreutils/files/runscript-selinux.diff delete mode 100644 sys-apps/policycoreutils/policycoreutils-1.12-r2.ebuild diff --git a/sys-apps/checkpolicy/checkpolicy-1.10.ebuild b/sys-apps/checkpolicy/checkpolicy-1.10.ebuild deleted file mode 100644 index d13a56666fdd..000000000000 --- a/sys-apps/checkpolicy/checkpolicy-1.10.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.10.ebuild,v 1.4 2004/06/24 22:00:09 agriffis 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" - -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.16.ebuild b/sys-apps/checkpolicy/checkpolicy-1.16.ebuild index da32c49ea2f5..21a7711721de 100644 --- a/sys-apps/checkpolicy/checkpolicy-1.16.ebuild +++ b/sys-apps/checkpolicy/checkpolicy-1.16.ebuild @@ -1,6 +1,6 @@ # 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.16.ebuild,v 1.4 2004/09/20 02:08:14 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.16.ebuild,v 1.5 2004/10/07 23:21:42 pebenito Exp $ IUSE="" @@ -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 sys-devel/flex @@ -24,6 +24,9 @@ src_unpack() { 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! +# use mls && sed -i -e '/^MLS/s/n/y/' ${S}/Makefile } src_compile() { @@ -34,3 +37,7 @@ src_compile() { 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.10 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.10 deleted file mode 100644 index 31debadb13e6..000000000000 --- a/sys-apps/checkpolicy/files/digest-checkpolicy-1.10 +++ /dev/null @@ -1 +0,0 @@ -MD5 3800a40b485b0641343a98d013a9a79e checkpolicy-1.10.tgz 87574 diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.12-r2 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.12-r2 deleted file mode 100644 index 7dac90c32def..000000000000 --- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.12-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 db69756ca36d460ebe2fc0fd7cdbf2b9 policycoreutils-1.12.tgz 40518 -MD5 9a0de2580023c53d04aab04e96b420a8 policycoreutils-extra-1.5.tar.bz2 8704 diff --git a/sys-apps/policycoreutils/files/runscript-selinux.diff b/sys-apps/policycoreutils/files/runscript-selinux.diff deleted file mode 100644 index a8f696ba1076..000000000000 --- a/sys-apps/policycoreutils/files/runscript-selinux.diff +++ /dev/null @@ -1,20 +0,0 @@ -Index: src/runscript_selinux.c -=================================================================== -RCS file: /var/cvsroot/gentoo-projects/hardened/policycoreutils-extra/src/runscript_selinux.c,v -retrieving revision 1.6 -diff -u -r1.6 runscript_selinux.c ---- src/runscript_selinux.c 4 Jul 2004 02:15:35 -0000 1.6 -+++ src/runscript_selinux.c 6 Jul 2004 21:28:18 -0000 -@@ -378,10 +378,11 @@ - fprintf(stderr, "Could not set exec context to %s.\n", new_context); - exit(1); - } -+ -+ freecon(new_context); - } - - context_free(curr_con); -- freecon(new_context); - freecon(curr_context); - - } /* selinux_runscript() */ diff --git a/sys-apps/policycoreutils/policycoreutils-1.12-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-1.12-r2.ebuild deleted file mode 100644 index a9d82f653d1a..000000000000 --- a/sys-apps/policycoreutils/policycoreutils-1.12-r2.ebuild +++ /dev/null @@ -1,66 +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/policycoreutils/policycoreutils-1.12-r2.ebuild,v 1.2 2004/08/08 00:38:07 slarti Exp $ - -IUSE="build" - -inherit eutils - -EXTRAS_VER="1.5" - -DESCRIPTION="SELinux core utilities" -HOMEPAGE="http://www.nsa.gov/selinux" -SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz - mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc" - -DEPEND=">=sys-libs/libselinux-${PV} - sys-devel/gettext - !build? ( sys-libs/pam )" - -S2=${WORKDIR}/policycoreutils-extra - -src_unpack() { - unpack ${A} - - cd ${S2} - epatch ${FILESDIR}/runscript-selinux.diff - - cd ${S} - epatch ${FILESDIR}/policycoreutils-1.10-genhomedircon-reverse.diff - - # Change script paths POLICYDIR - sed -i -e "s:/etc/security/selinux/src/policy/:${POLICYDIR}:g" ${S}/scripts/genhomedircon - - # fix up to accept Gentoo CFLAGS - local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`" - for i in ${SUBDIRS}; do - sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/${i}/Makefile \ - || die "${i} Makefile CFLAGS fix failed." - done -} - -src_compile() { - if use build; then - einfo "Compiling setfiles" - emake -C ${S}/setfiles || die - else - einfo "Compiling policycoreutils" - emake -C ${S} || die - einfo "Compiling policycoreutils-extra" - emake -C ${S2} || die - fi -} - -src_install() { - if use build; then - dosbin ${S}/setfiles/setfiles - else - einfo "Installing policycoreutils" - make DESTDIR="${D}" -C ${S} install || die - einfo "Installing policycoreutils-extra" - make DESTDIR="${D}" -C ${S2} install || die - fi -} diff --git a/sys-apps/policycoreutils/policycoreutils-1.16.ebuild b/sys-apps/policycoreutils/policycoreutils-1.16.ebuild index f258bade0f9d..4ef30889f211 100644 --- a/sys-apps/policycoreutils/policycoreutils-1.16.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-1.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.16.ebuild,v 1.2 2004/09/20 02:09:45 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.16.ebuild,v 1.3 2004/10/07 23:24:59 pebenito Exp $ IUSE="build" @@ -14,7 +14,7 @@ SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~amd64" +KEYWORDS="x86 ppc sparc amd64" DEPEND=">=sys-libs/libselinux-${PV} sys-libs/libsepol -- 2.26.2