From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 03609138A1F for ; Sat, 19 Apr 2014 14:16:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD895E0AD2; Sat, 19 Apr 2014 14:13:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F35BCE0B9E for ; Sat, 19 Apr 2014 14:13:03 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05DDD3403ED for ; Sat, 19 Apr 2014 14:13:03 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 617) id BD10420034; Sat, 19 Apr 2014 14:13:01 +0000 (UTC) From: "Sven Vermeulen (swift)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, swift@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sec-policy/selinux-base-policy: selinux-base-policy-2.20140311-r2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: selinux-base-policy-2.20140311-r2.ebuild ChangeLog X-VCS-Directories: sec-policy/selinux-base-policy X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140419141301.BD10420034@flycatcher.gentoo.org> Date: Sat, 19 Apr 2014 14:13:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d2884968-09f7-4959-9c6c-50282331159e X-Archives-Hash: d6bb4bdb0f6205e994ea1c1ff9618fbc swift 14/04/19 14:13:01 Modified: ChangeLog Added: selinux-base-policy-2.20140311-r2.ebuild Log: Release of 2.20140311-r2 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47) Revision Changes Path 1.141 sec-policy/selinux-base-policy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog?rev=1.141&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog?rev=1.141&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog?r1=1.140&r2=1.141 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- ChangeLog 24 Mar 2014 19:44:11 -0000 1.140 +++ ChangeLog 19 Apr 2014 14:13:01 -0000 1.141 @@ -1,6 +1,12 @@ # 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.140 2014/03/24 19:44:11 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.141 2014/04/19 14:13:01 swift Exp $ + +*selinux-base-policy-2.20140311-r2 (19 Apr 2014) + + 19 Apr 2014; Sven Vermeulen + +selinux-base-policy-2.20140311-r2.ebuild: + Release of 2.20140311-r2 24 Mar 2014; Sven Vermeulen -selinux-base-policy-2.20120725-r5.ebuild, 1.1 sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r2.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-r2.ebuild?rev=1.1&content-type=text/plain Index: selinux-base-policy-2.20140311-r2.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-r2.ebuild,v 1.1 2014/04/19 14:13:01 swift Exp $ EAPI="4" inherit eutils HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/" DESCRIPTION="SELinux policy for core modules" IUSE="+unconfined" BASEPOL="2.20140311-r2" 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 }