Fixing various bugs, cfr http://archives.gentoo.org/gentoo-hardened/msg_c1f66d29674bbf73dd0b4f04060afaf1.xml

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

6 files changed, 185 insertions, 5 deletions

diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index 49cddf0c6fee..60b19eaec862 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -1,4 +1,6 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r6.tar.bz2 23875 RMD160 f39dfcde7ab79bc8c5b5fc9d5744922c1d1fdf94 SHA1 2aa434dc720f70ef7f4b64acc5da6028f853cef5 SHA256 f74b8385520846597532d56d4952fd001fc6cd044a6b876508a398e1cc865619
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
+EBUILD selinux-amavis-2.20110726-r1.ebuild 389 RMD160 91d63123f6ebc2d89f57a433aa51b83edc120ea6 SHA1 78df8ccdf76b45c3d9ea924cef57daf9a6e5cfdf SHA256 f4468560d0434de803d05da487fb95c2188b728166caa02de64687729116075b
 EBUILD selinux-amavis-2.20110726.ebuild 360 RMD160 7f53c69f04bbd93a0ba8277fa2596925cb221164 SHA1 bbc747158ef67c685c3f14d2033c873edc9d8b87 SHA256 94a08e63de376d420ce253881b42ec52df837ccb492359da0342a1853f271e5a
-MISC ChangeLog 1085 RMD160 08d4cf6ae3a5551537a02597858d35b7090a33b7 SHA1 5a2c31007caa628a8dc99cc253742ea63280612a SHA256 0152808c985aaa7d78d98cfb5a5afa54520ebeba44aa42911649d372f92e2b3c
+MISC ChangeLog 1252 RMD160 2eff18fb7d8724009acc0bbbac8f4963d758959b SHA1 2ffd63112d0a5df97e62ce469917cd621e5b3483 SHA256 244938bbbe0a4c93cba420167eeb5c8c1fa3a82c8fff77db2bdb20c681c33399
 MISC metadata.xml 230 RMD160 b590e854f462f8ac9d9c5cbfad26b34b251df26a SHA1 51e51f7824528fc420ad1a65bff985cf9cb9d47a SHA256 4c1a15dca371d48ec48019edecd6644c75ed5fe35667f679be5d303b9dc46143
diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index a62d89a0725c..4a8bc8c99449 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -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.87 2011/11/12 20:53:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.88 2011/11/15 10:42:24 swift Exp $
+
+*selinux-base-policy-2.20110726-r6 (15 Nov 2011)
+
+  15 Nov 2011; <swift@gentoo.org> +selinux-base-policy-2.20110726-r6.ebuild:
+  Fixing #389579, #389917, #388875 and #389569. Also improves support for
+  gcc-config and updates VDE patch with upstream feedback
 
   12 Nov 2011; <swift@gentoo.org> -selinux-base-policy-2.20090730.ebuild,
   -selinux-base-policy-2.20090814.ebuild,
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 2c56d0c0e565..ed3bab4fa606 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -2,8 +2,10 @@ AUX config 631 RMD160 076ae6441a3a29ead502c8bc4b646546095ad95a SHA1 022e0457876c
 AUX modules.conf 728 RMD160 20c291e9a1ab63c7ffeda41f1b28a1a3d1058a5b SHA1 79f164d12565c3f9cc633fbbfc3469f1337cabc9 SHA256 7deba8527d6002e25d5b307fa085341473add1bc6489902a920096012ba56456
 DIST patchbundle-selinux-base-policy-2.20110726-r4.tar.bz2 22344 RMD160 b4ecb26fb48b21f21e4836dd560cc39b463f76b7 SHA1 7505a0eb3863f3949224512d7329c185c37883f9 SHA256 62d9a41b087a47a09d1e1e5cee4451b8427b53d63babd7e61c7620aea4cbb009
 DIST patchbundle-selinux-base-policy-2.20110726-r5.tar.bz2 23064 RMD160 289c82cd3d5207321afd826bc6b496943f4e0076 SHA1 d5202ce8fb89242c66b9af276a1aef342372e01d SHA256 696090195a0eaf768fa63230c8b2c22ae9d434698302bfd27490d486760e3f81
+DIST patchbundle-selinux-base-policy-2.20110726-r6.tar.bz2 23875 RMD160 f39dfcde7ab79bc8c5b5fc9d5744922c1d1fdf94 SHA1 2aa434dc720f70ef7f4b64acc5da6028f853cef5 SHA256 f74b8385520846597532d56d4952fd001fc6cd044a6b876508a398e1cc865619
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
 EBUILD selinux-base-policy-2.20110726-r4.ebuild 4878 RMD160 10e6e0d78d6ce8aec297cd5d8a284213d3187037 SHA1 ed625b060e59d0eac06b3d4658c9b3ab2908174f SHA256 5b37b866053e29e438ffeef170c092f79822653f9d1c1ec7baac34dee82183fe
 EBUILD selinux-base-policy-2.20110726-r5.ebuild 4880 RMD160 e9eec672d2c0e62b555f8dd57f45f52f765bae8c SHA1 da5c8088e63902c0cfa783a2918578a93e7d4e4b SHA256 64bcf42fc4e740e9257630680dfc717515a3f8495fd0ffa0f754c42f0fd7b6d8
-MISC ChangeLog 21753 RMD160 80b956358fd28cb50235c0198be76bb7e95f0535 SHA1 b4f999a7c7d07a9c8656023eff10364fe148be6f SHA256 090221823e63654893e833a498f5b8c7b78e0919e6c78aa1a31b073f20f2c106
+EBUILD selinux-base-policy-2.20110726-r6.ebuild 4880 RMD160 68da62ecfc7ab734b06bf83f48520d4e8cc6b6af SHA1 447dc885f144a7f5031827c2b9ded22c8be1f50b SHA256 2f406a2e1e5de1b86c88372de4655167ea82417df796a52ddfc18ca639f43fd7
+MISC ChangeLog 22013 RMD160 821a160a365196d46299b8aee641867ee4ca5915 SHA1 728fca1b88f7d9eac036ea3f6269b0144a2c278c SHA256 f8a0494dac0892bd4a2016089a32d7f497aa57cea65b712ed90f30631ac10986
 MISC metadata.xml 671 RMD160 49dd94bb827c4ab2bb8043739ef7564df4cf1c07 SHA1 a92b8a5ef129707a44fe2ae1913060d02badd566 SHA256 c32ccc54ca7df400974a19ad14c093ea7b777f7a40467bdb672f441314122e55
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r6.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r6.ebuild
new file mode 100644
index 000000000000..542c10e36206
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r6.ebuild
@@ -0,0 +1,166 @@
+# 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.20110726-r6.ebuild,v 1.1 2011/11/15 10:42:24 swift Exp $
+
+EAPI="4"
+IUSE="+peer_perms +open_perms +ubac doc"
+
+inherit eutils
+
+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/${PN}/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_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"
+	# 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"
+}
+
+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"
+
+	# 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}";
+		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"
+		# In case of "targeted", we add the "unconfined" to the base policy
+		if [[ "${i}" == "targeted" ]];
+		then
+			echo "unconfined = base" >> "${S}/${i}/policy/modules.conf"
+		fi
+		# Add xdg support
+		echo "xdg = base" >> "${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
+	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
+	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 "${ROOT}/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."
+}
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index 02632553ee1f..5a953ab003c8 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -1,4 +1,6 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r6.tar.bz2 23875 RMD160 f39dfcde7ab79bc8c5b5fc9d5744922c1d1fdf94 SHA1 2aa434dc720f70ef7f4b64acc5da6028f853cef5 SHA256 f74b8385520846597532d56d4952fd001fc6cd044a6b876508a398e1cc865619
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
+EBUILD selinux-inetd-2.20110726-r1.ebuild 385 RMD160 cea80a6dc81ff8a3fdc40938699737f6bd3fafb1 SHA1 871c7447e76f59751ae73a219950161f709c272f SHA256 4aef174de73c3e06f257f365d28d57da6600325c8fb47f8a28a288b4013c7524
 EBUILD selinux-inetd-2.20110726.ebuild 356 RMD160 12c58a7ca64bf51ddc0aab0cd065377bbf432f6c SHA1 3694162f7311fff86de2f6ded7ca87592a2342a2 SHA256 4775b1041f41a04806358c73bfdff46da109cb415b7c02ad49a4a414d5e9f54d
-MISC ChangeLog 2277 RMD160 48a9ea0f83de99927fd0bd23a14ad07ca63d7418 SHA1 43b4af5a2c3901f9f9ab98ceb74e91940e395db2 SHA256 073ee706c93ccb569394d25f77f33e8f2a5389ed1279001688b4c4bbb3a170e4
+MISC ChangeLog 2453 RMD160 c4f867a6ab9eae3c21d1c5bf836c967a7b4019d9 SHA1 3de4b877e4b10a0f5704f260b6bc624c86f439de SHA256 0f0e0524a488d4e76fe0ae550e6d2703933c8ee78681fa14e862e09bd63171f1
 MISC metadata.xml 229 RMD160 d3af6aca96539d291dddaf0890fa7042f6d47e51 SHA1 ca78d150603c95adb2bfde8acfe6ed7c6c7e3edc SHA256 a09cd06fd0bd9a5c2c4b8e907cd55838dadae7d7a12c41731a4e362eeb83d33d
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index 5c9ebed1f53c..0567bfd29c5a 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -1,5 +1,7 @@
 DIST patchbundle-selinux-base-policy-2.20110726-r1.tar.bz2 18052 RMD160 cff13706b370498cf7193d968b3bff47a718ed84 SHA1 68dbdf8366068f80b85333ecc8bbc578567218c5 SHA256 ebfb12f861447c8865e28ff5ee06ff0d89f870db3b9745c2b18558772a783023
+DIST patchbundle-selinux-base-policy-2.20110726-r6.tar.bz2 23875 RMD160 f39dfcde7ab79bc8c5b5fc9d5744922c1d1fdf94 SHA1 2aa434dc720f70ef7f4b64acc5da6028f853cef5 SHA256 f74b8385520846597532d56d4952fd001fc6cd044a6b876508a398e1cc865619
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
 EBUILD selinux-nagios-2.20110726-r1.ebuild 387 RMD160 7430f04e92f49b3a33650281c0358cd1c17ce3f8 SHA1 bae873a542b3755ca507d06bf0d37cf5b7bbda86 SHA256 02cd208575f2bca4e2dcd4782c234a0356a2547b33c167ac5c199dbef6dd94ea
-MISC ChangeLog 794 RMD160 3d3a207ce061d0611bf22c07b3ca5e7ba8a6d942 SHA1 7e234e727cbbff74a0fda099af777f57ee4a91f5 SHA256 558864da2f21e59ee18bcaf29dc9d796b930afa1c1791ab410eef8ad6c0eb78f
+EBUILD selinux-nagios-2.20110726-r2.ebuild 389 RMD160 a703bf747d9e9f8006712621e4d4cb62bc248336 SHA1 2b4a3d3a261e95f86cc47d72bb2883fb3a21608b SHA256 affcabaed17d1808e268bf01f846acf12dd4e05127e2a84f4d7cb8df680f84f2
+MISC ChangeLog 926 RMD160 bc035051f439338877f7ba5e1c3052326c378c77 SHA1 682833d1e0ed4edc3624a2622c16a4a98a70d959 SHA256 8b8f59cc8228d277ae94ef0a3ef5f3db928e088f186c492a3466219d7c4bd8b5
 MISC metadata.xml 230 RMD160 58efea4721fd8a4a6ea1e79e4c3b626ed3af5ded SHA1 1b6651dff1ca7b54f2b6756b8c126f2cc68827d1 SHA256 4b2780b5258cf4a9bf47d433f6e923644c503d89d1cc15ea6bea154a9bcd7723