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 AA8D5138A2F for ; Thu, 21 Aug 2014 19:31:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A307E08A4; Thu, 21 Aug 2014 19:31:16 +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 B8F94E08A0 for ; Thu, 21 Aug 2014 19:31:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63C18340299 for ; Thu, 21 Aug 2014 19:31:10 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 617) id 92B603ABD; Thu, 21 Aug 2014 19:31:05 +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: selinux-base-2.20140311-r6.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: selinux-base-2.20140311-r6.ebuild ChangeLog X-VCS-Directories: sec-policy/selinux-base X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140821193105.92B603ABD@oystercatcher.gentoo.org> Date: Thu, 21 Aug 2014 19:31:05 +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: 7f0e0a2c-6ba3-4e77-b85e-e90950a9fa09 X-Archives-Hash: 30cb5425075cdc7534c9da38951bcc2b swift 14/08/21 19:31:05 Modified: ChangeLog Added: selinux-base-2.20140311-r6.ebuild Log: Release of 2.20140311-r6 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47) Revision Changes Path 1.50 sec-policy/selinux-base/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?rev=1.50&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?rev=1.50&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?r1=1.49&r2=1.50 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ChangeLog 9 Aug 2014 19:34:44 -0000 1.49 +++ ChangeLog 21 Aug 2014 19:31:05 -0000 1.50 @@ -1,6 +1,12 @@ # ChangeLog for sec-policy/selinux-base # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.49 2014/08/09 19:34:44 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.50 2014/08/21 19:31:05 swift Exp $ + +*selinux-base-2.20140311-r6 (21 Aug 2014) + + 21 Aug 2014; Sven Vermeulen + +selinux-base-2.20140311-r6.ebuild: + Release of 2.20140311-r6 *selinux-base-2.20140311-r5 (09 Aug 2014) 1.1 sec-policy/selinux-base/selinux-base-2.20140311-r6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r6.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r6.ebuild?rev=1.1&content-type=text/plain Index: selinux-base-2.20140311-r6.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/selinux-base-2.20140311-r6.ebuild,v 1.1 2014/08/21 19:31:05 swift Exp $ EAPI="5" inherit eutils if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://git.overlays.gentoo.org/proj/hardened-refpolicy.git https://git.overlays.gentoo.org/gitroot/proj/hardened-refpolicy.git}" EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}" EGIT_SOURCEDIR="${WORKDIR}/refpolicy" inherit git-2 KEYWORDS="" else SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2" KEYWORDS="~amd64 ~x86" fi IUSE="+peer_perms +open_perms +ubac +unconfined doc" DESCRIPTION="Gentoo base policy for SELinux" HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/" LICENSE="GPL-2" SLOT="0" RDEPEND=">=sys-apps/policycoreutils-2.3 virtual/udev !<=sec-policy/selinux-base-policy-2.20120725" DEPEND="${RDEPEND} sys-devel/m4 >=sys-apps/checkpolicy-2.3" S=${WORKDIR}/ #src_unpack() { # git-2_src_unpack #} src_prepare() { if [[ ${PV} != 9999* ]]; then # Apply the gentoo patches to the policy. These patches are only necessary # for base policies, or for interface changes on modules. EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \ EPATCH_SUFFIX="patch" \ EPATCH_SOURCE="${WORKDIR}" \ EPATCH_FORCE="yes" \ epatch fi cd "${S}/refpolicy" make bare # Fix bug 257111 - Correct the initial sid for cron-started jobs in the # system_r role sed -i -e 's:system_crond_t:system_cronjob_t:g' \ "${S}/refpolicy/config/appconfig-standard/default_contexts" sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \ "${S}/refpolicy/config/appconfig-mls/default_contexts" sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \ "${S}/refpolicy/config/appconfig-mcs/default_contexts" epatch_user } src_configure() { [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs" # Update the SELinux refpolicy capabilities based on the users' USE flags. if ! use peer_perms; then sed -i -e '/network_peer_controls/d' \ "${S}/refpolicy/policy/policy_capabilities" fi if ! use open_perms; then sed -i -e '/open_perms/d' \ "${S}/refpolicy/policy/policy_capabilities" fi if ! use ubac; then sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \ || die "Failed to disable User Based Access Control" fi echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" # Prepare initial configuration cd "${S}/refpolicy"; make conf || die "Make conf failed" # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". for i in ${POLICY_TYPES}; do cp -a "${S}/refpolicy" "${S}/${i}" cd "${S}/${i}"; #cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf" sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \ "${S}/${i}/build.conf" || die "build.conf setup failed." if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]]; then # MCS/MLS require additional settings sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \ || die "failed to set type to mls" fi if [ "${i}" == "targeted" ]; then sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \ "${S}/${i}/config/appconfig-standard/seusers" \ || die "targeted seusers setup failed." fi if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \ "${S}/${i}/config/appconfig-${i}/seusers" \ || die "policy seusers setup failed." fi done } src_compile() { [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs" for i in ${POLICY_TYPES}; do cd "${S}/${i}" make base || die "${i} compile failed" if use doc; then make html || die fi done } src_install() { [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs" for i in ${POLICY_TYPES}; do cd "${S}/${i}" make DESTDIR="${D}" install \ || die "${i} install failed." make DESTDIR="${D}" install-headers \ || die "${i} headers install failed." echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" # libsemanage won't make this on its own keepdir "/etc/selinux/${i}/policy" if use doc; then dohtml doc/html/*; fi insinto /usr/share/selinux/devel; doins doc/policy.xml; done dodoc doc/Makefile.example doc/example.{te,fc,if} doman man/man8/*.8; insinto /etc/selinux doins "${FILESDIR}/config" } pkg_preinst() { has_version "<${CATEGORY}/${PN}-2.20101213-r13" previous_less_than_r13=$? }