From: "Anthony G. Basile (blueness)" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sec-policy/selinux-base-policy: ChangeLog selinux-base-policy-2.20101213-r22.ebuild
Date: Sun, 7 Aug 2011 10:53:56 +0000 (UTC) [thread overview]
Message-ID: <20110807105356.AD5C32004C@flycatcher.gentoo.org> (raw)
blueness 11/08/07 10:53:56
Modified: ChangeLog
Added: selinux-base-policy-2.20101213-r22.ebuild
Log:
Fix patchbundle issue with portage patch
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Revision Changes Path
1.82 sec-policy/selinux-base-policy/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog?r1=1.81&r2=1.82
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ChangeLog 25 Jul 2011 22:13:22 -0000 1.81
+++ ChangeLog 7 Aug 2011 10:53:56 -0000 1.82
@@ -1,6 +1,12 @@
# ChangeLog for sec-policy/selinux-base-policy
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.81 2011/07/25 22:13:22 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.82 2011/08/07 10:53:56 blueness Exp $
+
+*selinux-base-policy-2.20101213-r22 (07 Aug 2011)
+
+ 07 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+ +selinux-base-policy-2.20101213-r22.ebuild:
+ Fix patchbundle issue with portage patch
*selinux-base-policy-2.20101213-r21 (25 Jul 2011)
*selinux-base-policy-2.20101213-r20 (25 Jul 2011)
1.1 sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r22.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r22.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20101213-r22.ebuild?rev=1.1&content-type=text/plain
Index: selinux-base-policy-2.20101213-r22.ebuild
===================================================================
# Copyright 1999-2011 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.20101213-r22.ebuild,v 1.1 2011/08/07 10:53:56 blueness Exp $
EAPI="1"
IUSE="+peer_perms +open_perms +ubac"
inherit eutils
#PATCHBUNDLE="${FILESDIR}/patchbundle-${PF}.tar.bz2"
PATCHBUNDLE="${DISTDIR}/patchbundle-${PF}.tar.bz2"
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"
SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
http://dev.gentoo.org/~blueness/patchbundle-selinux-base-policy/patchbundle-${PF}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND=">=sys-apps/policycoreutils-1.30.30
>=sys-fs/udev-151"
DEPEND="${RDEPEND}
sys-devel/m4
>=sys-apps/checkpolicy-1.30.12"
S=${WORKDIR}/
src_unpack() {
[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
unpack ${A}
cd "${S}"
epatch "${PATCHBUNDLE}"
cd "${S}/refpolicy"
# Fix bug 257111
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"
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
for i in ${POLICY_TYPES}; do
cp -a "${S}/refpolicy" "${S}/${i}"
cd "${S}/${i}";
make conf || die "Make conf in ${i} failed"
# Define what we see as "base" and what we want to remain modular
cp "${FILESDIR}/modules.conf" \
"${S}/${i}/policy/modules.conf" \
|| die "failed to set up modules.conf"
if [[ "${i}" == "targeted" ]];
then
echo "unconfined = base" >> "${S}/${i}/policy/modules.conf"
fi
sed -i -e '/^QUIET/s/n/y/' -e '/^MONOLITHIC/s/y/n/' \
-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 ! use ubac; then
sed -i -e 's:^UBAC = y:UBAC = n:g' "${S}/${i}/build.conf"
fi
echo "DISTRO = gentoo" >> "${S}/${i}/build.conf"
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
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"
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"
done
dodoc doc/Makefile.example doc/example.{te,fc,if}
insinto /etc/selinux
doins "${FILESDIR}/config"
}
pkg_preinst() {
has_version "<${CATEGORY}/${PN}-2.20101213-r13"
previous_less_than_r13=$?
}
pkg_postinst() {
[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
for i in ${POLICY_TYPES}; do
einfo "Inserting base module into ${i} module store."
cd "/usr/share/selinux/${i}"
semodule -s "${i}" -b base.pp || die "Could not load in new base policy"
done
elog "Updates on policies might require you to relabel files. If you, after"
elog "installing new SELinux policies, get 'permission denied' errors,"
elog "relabelling your system using 'rlpkg -a -r' might resolve the issues."
}
reply other threads:[~2011-08-07 10:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110807105356.AD5C32004C@flycatcher.gentoo.org \
--to=blueness@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox