From 0cc1aab3fb151c030c4bc00000a8252b93e504f1 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Fri, 2 Jul 2004 16:42:25 +0000 Subject: new upstream version --- sys-apps/policycoreutils/ChangeLog | 9 ++- sys-apps/policycoreutils/Manifest | 13 ++-- .../files/digest-policycoreutils-1.12 | 2 - .../files/digest-policycoreutils-1.14 | 2 + .../policycoreutils-1.14-genhomedircon-compat.diff | 40 +++++++++++++ .../policycoreutils/policycoreutils-1.12.ebuild | 70 ---------------------- .../policycoreutils/policycoreutils-1.14.ebuild | 64 ++++++++++++++++++++ 7 files changed, 121 insertions(+), 79 deletions(-) delete mode 100644 sys-apps/policycoreutils/files/digest-policycoreutils-1.12 create mode 100644 sys-apps/policycoreutils/files/digest-policycoreutils-1.14 create mode 100644 sys-apps/policycoreutils/files/policycoreutils-1.14-genhomedircon-compat.diff delete mode 100644 sys-apps/policycoreutils/policycoreutils-1.12.ebuild create mode 100644 sys-apps/policycoreutils/policycoreutils-1.14.ebuild (limited to 'sys-apps') diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog index 35d7b70029c2..98b73df41fea 100644 --- a/sys-apps/policycoreutils/ChangeLog +++ b/sys-apps/policycoreutils/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/policycoreutils # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.28 2004/06/28 14:40:37 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.29 2004/07/02 16:42:25 pebenito Exp $ + +*policycoreutils-1.14 (02 Jul 2004) + + 02 Jul 2004; Chris PeBenito + +files/policycoreutils-1.14-genhomedircon-compat.diff, + +policycoreutils-1.14.ebuild: + New upstream version. *policycoreutils-1.12-r1 (28 Jun 2004) diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest index 72c95bb9b8ea..05bdd8174685 100644 --- a/sys-apps/policycoreutils/Manifest +++ b/sys-apps/policycoreutils/Manifest @@ -3,18 +3,19 @@ Hash: SHA1 MD5 317388ccae91e4122159d3496a499383 policycoreutils-1.12-r1.ebuild 1598 MD5 69ae1b2448d0e2cf99893a5e9ac1a5e0 policycoreutils-1.4-r1.ebuild 1555 -MD5 6aff9c330fe723329868e1704b751973 policycoreutils-1.12.ebuild 1796 -MD5 41246749be0b76e269ac4e01ac60f5fc ChangeLog 4326 +MD5 38d600ec0669ff0005e3183e260c2ce9 ChangeLog 4529 MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836 +MD5 d9a855516da7b08a6dd70d4a1bdfffd0 policycoreutils-1.14.ebuild 1649 MD5 b9c41decc251443bb9535f415b9b1896 files/digest-policycoreutils-1.4-r1 143 MD5 440f1bd6fdf23f39dde7bd50aefc5731 files/policycoreutils-1.10-genhomedircon-reverse.diff 3459 MD5 50fd778919f191e7676e8c5da5ce0ec7 files/selinux-init 915 -MD5 d61ea0fcb17b4ca9c5f95e51382e4485 files/digest-policycoreutils-1.12 144 +MD5 be558e9ff08825a265b85c2a0bb8cc9b files/digest-policycoreutils-1.14 144 +MD5 98c9b5772013d9f3a4e1fec905eed9c9 files/policycoreutils-1.14-genhomedircon-compat.diff 1520 MD5 2873e1b7a7e78c17527934e8daa919e3 files/digest-policycoreutils-1.12-r1 144 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) -iD8DBQFA4C3yGFJQsIJWJy4RAmZyAJ9Fzeyl49KpcoHBwglebQwEHVylTgCfTVAk -zg/BPduAhId6J8SPVkLrbhE= -=J52U +iD8DBQFA5ZCDGFJQsIJWJy4RAoE2AJ9ATm5wx1Bqs97hYWn4uJ3YjNY19wCdGzNT +O/5zX5N44p9Zc4MD+CZC0HU= +=HYjb -----END PGP SIGNATURE----- diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.12 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.12 deleted file mode 100644 index 257aa77d5ef0..000000000000 --- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.12 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 db69756ca36d460ebe2fc0fd7cdbf2b9 policycoreutils-1.12.tgz 40518 -MD5 43b110a81cd266e2724aa11bcdbab9b0 policycoreutils-extra-1.4.tar.bz2 8501 diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.14 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.14 new file mode 100644 index 000000000000..dae252e13039 --- /dev/null +++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.14 @@ -0,0 +1,2 @@ +MD5 0ae038ab98c053e6dd54d97edbd38049 policycoreutils-1.14.tgz 42284 +MD5 9a0de2580023c53d04aab04e96b420a8 policycoreutils-extra-1.5.tar.bz2 8704 diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.14-genhomedircon-compat.diff b/sys-apps/policycoreutils/files/policycoreutils-1.14-genhomedircon-compat.diff new file mode 100644 index 000000000000..cdcf92ff2d58 --- /dev/null +++ b/sys-apps/policycoreutils/files/policycoreutils-1.14-genhomedircon-compat.diff @@ -0,0 +1,40 @@ +diff -urN policycoreutils-1.14.orig/scripts/genhomedircon policycoreutils-1.14/scripts/genhomedircon +--- policycoreutils-1.14.orig/scripts/genhomedircon 2004-06-17 08:20:25.000000000 -0500 ++++ policycoreutils-1.14/scripts/genhomedircon 2004-07-01 00:26:56.611222252 -0500 +@@ -88,11 +88,16 @@ + return rc + + try: +- if len(sys.argv) != 3: ++ if len(sys.argv) == 2: ++ FILECONTEXTDIR="." ++ FILECONTEXTS=sys.argv[1] ++ elif len(sys.argv) == 3: ++ FILECONTEXTDIR=sys.argv[1] ++ FILECONTEXTS=sys.argv[2] ++ else: + print len(sys.argv) + usage("Incorrect parameters") + +- FILECONTEXTDIR=sys.argv[1] + prefixes = getPrefixes() + + rc=commands.getstatusoutput("grep -h '^HOME' /etc/default/useradd") +@@ -113,7 +118,7 @@ + sed_dir = "h; s|^HOME_DIR|%s/[^/]+|; s|ROLE_|user_|" % (string.join(prefixes.keys(), "/[^/]+|; s|ROLE_|user_|; p; g; s|^HOME_DIR|"),) + + # Fill in HOME_ROOT, HOME_DIR, and ROLE for users not explicitly defined in /etc/security/selinux/src/policy/users +- rc=commands.getstatusoutput("sed -e \"/^HOME_ROOT/{%s}\" -e \"/^HOME_DIR/{%s}\" %s" % (sed_root, sed_dir, sys.argv[2])) ++ rc=commands.getstatusoutput("sed -e \"/^HOME_ROOT/{%s}\" -e \"/^HOME_DIR/{%s}\" %s" % (sed_root, sed_dir, FILECONTEXTS)) + if rc[0] == 0: + print rc[1] + else: +@@ -124,7 +129,7 @@ + + # Fill in HOME and ROLE for users that are defined + for u in users.keys(): +- update(sys.argv[2], u, users[u]) ++ update(FILECONTEXTS, u, users[u]) + except ValueError, error: + errorExit(join("ValueError ", error)) + except IndexError, error: diff --git a/sys-apps/policycoreutils/policycoreutils-1.12.ebuild b/sys-apps/policycoreutils/policycoreutils-1.12.ebuild deleted file mode 100644 index 9c2d0146d619..000000000000 --- a/sys-apps/policycoreutils/policycoreutils-1.12.ebuild +++ /dev/null @@ -1,70 +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.ebuild,v 1.3 2004/06/25 03:09:06 agriffis Exp $ - -IUSE="build" - -inherit eutils - -EXTRAS_VER="1.4" - -DESCRIPTION="SELinux core utilites" -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 ${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 -} - -pkg_postinst() { - ewarn "WARNING: seinit is deprecated, and is no" - ewarn "longer installed. Please remove seinit from" - ewarn "your bootloader. The policy is now loaded" - ewarn "by init itself." -} diff --git a/sys-apps/policycoreutils/policycoreutils-1.14.ebuild b/sys-apps/policycoreutils/policycoreutils-1.14.ebuild new file mode 100644 index 000000000000..b1817cd8981f --- /dev/null +++ b/sys-apps/policycoreutils/policycoreutils-1.14.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.14.ebuild,v 1.1 2004/07/02 16:42:25 pebenito Exp $ + +IUSE="build" + +inherit eutils + +EXTRAS_VER="1.5" + +DESCRIPTION="SELinux core utilites" +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 ${S} + # fix genhomedircon starting uid + sed -i -e '/^STARTING_UID/s/100/1000/' ${S}/scripts/genhomedircon + + # add compatibility for number of genhomedircon command line args + epatch ${FILESDIR}/policycoreutils-1.14-genhomedircon-compat.diff + + # 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 +} -- cgit v1.2.3-65-gdbad