swift       14/08/01 21:04:23

  Modified:             selinux-base-2.20140311-r3.ebuild ChangeLog
  Added:                selinux-base-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/selinux-base-2.20140311-r3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild?r1=1.1&r2=1.2

Index: selinux-base-2.20140311-r3.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- selinux-base-2.20140311-r3.ebuild   29 May 2014 18:57:50 -0000      1.1
+++ selinux-base-2.20140311-r3.ebuild   1 Aug 2014 21:04:23 -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/selinux-base-2.20140311-r3.ebuild,v
 1.1 2014/05/29 18:57:50 swift Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild,v
 1.2 2014/08/01 21:04:23 swift Exp $
 EAPI="5"
 
 inherit eutils
@@ -14,7 +14,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-apps/policycoreutils-2.1.10
        virtual/udev



1.45                 sec-policy/selinux-base/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?rev=1.45&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?rev=1.45&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?r1=1.44&r2=1.45

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog   29 May 2014 20:23:20 -0000      1.44
+++ ChangeLog   1 Aug 2014 21:04:23 -0000       1.45
@@ -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.44 
2014/05/29 20:23:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.45 
2014/08/01 21:04:23 swift Exp $
+
+*selinux-base-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <[email protected]>
+  +selinux-base-2.20140311-r4.ebuild, selinux-base-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <[email protected]>
   selinux-base-2.20140311-r2.ebuild:



1.1                  sec-policy/selinux-base/selinux-base-2.20140311-r4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r4.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r4.ebuild?rev=1.1&content-type=text/plain

Index: selinux-base-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/selinux-base-2.20140311-r4.ebuild,v
 1.1 2014/08/01 21:04:23 swift Exp $
EAPI="5"

inherit eutils

IUSE="+peer_perms +open_perms +ubac +unconfined doc"

DESCRIPTION="Gentoo base policy for SELinux"
HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/";
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";
LICENSE="GPL-2"
SLOT="0"

KEYWORDS="~amd64 ~x86"

RDEPEND=">=sys-apps/policycoreutils-2.1.10
        virtual/udev
        !<=sec-policy/selinux-base-policy-2.20130424"
DEPEND="${RDEPEND}
        sys-devel/m4
        >=sys-apps/checkpolicy-2.1.8"

S=${WORKDIR}/

src_prepare() {
        # 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

        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=$?
}




Reply via email to