swift 14/08/01 21:04:44 Modified: selinux-base-policy-2.20140311-r3.ebuild ChangeLog Added: selinux-base-policy-2.20140311-r4.ebuild Log: Stabilization of r3, and make r4 available for testing (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
Revision Changes Path 1.2 sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild?r1=1.1&r2=1.2 Index: selinux-base-policy-2.20140311-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- selinux-base-policy-2.20140311-r3.ebuild 29 May 2014 18:57:41 -0000 1.1 +++ selinux-base-policy-2.20140311-r3.ebuild 1 Aug 2014 21:04:44 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:41 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:44 swift Exp $ EAPI="5" inherit eutils @@ -16,7 +16,7 @@ DEPEND="" SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2 http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${BASEPOL}.tar.bz2"; -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork udev userdomain usermanage unprivuser xdg" LICENSE="GPL-2" 1.145 sec-policy/selinux-base-policy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog?rev=1.145&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog?rev=1.145&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog?r1=1.144&r2=1.145 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- ChangeLog 29 May 2014 20:23:26 -0000 1.144 +++ ChangeLog 1 Aug 2014 21:04:44 -0000 1.145 @@ -1,6 +1,13 @@ # ChangeLog for sec-policy/selinux-base-policy # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.144 2014/05/29 20:23:26 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.145 2014/08/01 21:04:44 swift Exp $ + +*selinux-base-policy-2.20140311-r4 (01 Aug 2014) + + 01 Aug 2014; Sven Vermeulen <[email protected]> + +selinux-base-policy-2.20140311-r4.ebuild, + selinux-base-policy-2.20140311-r3.ebuild: + Stabilization of r3, and make r4 available for testing 29 May 2014; Sven Vermeulen <[email protected]> selinux-base-policy-2.20140311-r2.ebuild: 1.1 sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r4.ebuild?rev=1.1&content-type=text/plain Index: selinux-base-policy-2.20140311-r4.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:44 swift Exp $ EAPI="5" inherit eutils HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"; DESCRIPTION="SELinux policy for core modules" IUSE="+unconfined" BASEPOL="2.20140311-r4" RDEPEND=">=sec-policy/selinux-base-${PVR}" PDEPEND="unconfined? ( sec-policy/selinux-unconfined )" DEPEND="" SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2 http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${BASEPOL}.tar.bz2"; KEYWORDS="~amd64 ~x86" MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork udev userdomain usermanage unprivuser xdg" LICENSE="GPL-2" SLOT="0" S="${WORKDIR}/" PATCHBUNDLE="${DISTDIR}/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2" # Code entirely copied from selinux-eclass (cannot inherit due to dependency on # itself), when reworked reinclude it. Only postinstall (where -b base.pp is # added) needs to remain then. pkg_pretend() { for i in ${POLICY_TYPES}; do if [[ "${i}" == "targeted" ]] && ! use unconfined; then die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory." fi done } src_prepare() { local modfiles # Patch the sources with the base patchbundle if [[ -n ${BASEPOL} ]]; then cd "${S}" EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \ EPATCH_SUFFIX="patch" \ EPATCH_SOURCE="${WORKDIR}" \ EPATCH_FORCE="yes" \ epatch fi # Apply the additional patches refered to by the module ebuild. # But first some magic to differentiate between bash arrays and strings if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]]; then cd "${S}/refpolicy/policy/modules" for POLPATCH in "${POLICY_PATCH[@]}"; do epatch "${POLPATCH}" done else if [[ -n ${POLICY_PATCH} ]]; then cd "${S}/refpolicy/policy/modules" for POLPATCH in ${POLICY_PATCH}; do epatch "${POLPATCH}" done fi fi # Calling user patches epatch_user # Collect only those files needed for this particular module for i in ${MODS}; do modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles" modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles" done for i in ${POLICY_TYPES}; do mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}" cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \ || die "Failed to copy Makefile.example to ${S}/${i}/Makefile" cp ${modfiles} "${S}"/${i} \ || die "Failed to copy the module files to ${S}/${i}" done } src_compile() { for i in ${POLICY_TYPES}; do # Parallel builds are broken, so we need to force -j1 here emake -j1 NAME=$i -C "${S}"/${i} || die "${i} compile failed" done } src_install() { local BASEDIR="/usr/share/selinux" for i in ${POLICY_TYPES}; do for j in ${MODS}; do einfo "Installing ${i} ${j} policy package" insinto ${BASEDIR}/${i} doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}" done done } pkg_postinst() { # Override the command from the eclass, we need to load in base as well here local COMMAND for i in ${MODS}; do COMMAND="-i ${i}.pp ${COMMAND}" done for i in ${POLICY_TYPES}; do einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" semodule -s ${i} -b base.pp ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" done }
