Release of 2.20141203-r7

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x7EF137EC935B0EAF

3 files changed, 194 insertions, 16 deletions

diff --git a/sec-policy/selinux-base/ChangeLog b/sec-policy/selinux-base/ChangeLog
index 227af8757c8f..31af11347d20 100644
--- a/sec-policy/selinux-base/ChangeLog
+++ b/sec-policy/selinux-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-base
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.73 2015/06/05 16:10:26 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.74 2015/07/02 17:59:32 perfinion Exp $
+
+*selinux-base-2.20141203-r7 (02 Jul 2015)
+
+  02 Jul 2015; Jason Zaman <perfinion@gentoo.org>
+  +selinux-base-2.20141203-r7.ebuild:
+  Release of 2.20141203-r7
 
   05 Jun 2015; Jason Zaman <perfinion@gentoo.org>
   selinux-base-2.20141203-r5.ebuild:
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 36339622d845..eee1b99092fc 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -11,6 +11,7 @@ DIST patchbundle-selinux-base-policy-2.20141203-r3.tar.bz2 269940 SHA256 c1d507c
 DIST patchbundle-selinux-base-policy-2.20141203-r4.tar.bz2 271374 SHA256 7229f0f5a299fc31b693f603cb265697ecf02afb843aba74f96d8afb208dd9c9 SHA512 41379568855b820a72a1d8e7fb8114464573974d98b98ae9107649ed625d6fc8c045dc6714ee51d6db72473a76c99511ee23e6d0a9bd56a19ebbaa1fa13e55a8 WHIRLPOOL 563020e4d38817d875d7a8b98f670cff68d86fdfe89945b87943c8b48d106a58d269822a60640fcc76f51bad207b8b61839b2cdbb1405ab5f49332516c9faa1d
 DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c47ce75620ffa9f3ef66393ae56693d7e431f9c7f0a4468a9646767a5f SHA512 e50d128ff9e6554f7d49bc1e43b40c8b062b8f7bb727acda9772b45381c61bc6c968265245e39f8ca044c2b0f4dadf3cdacfb38cd32306fa27f1acfb49921e06 WHIRLPOOL a0591298d54a4ba080112716fc35509e6c82281d362a11b208caa2a96ddc20c4cc8f942206db49d86b831c6ed13a239b7db9009f17ede77fce7f0c01cd6b20cc
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
+DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
 EBUILD selinux-base-2.20140311-r5.ebuild 4885 SHA256 652cedf320a59ed6ef2956f70482c1b75892fa6e16c48de21acd983f82ba3a81 SHA512 d15bbce436b5eb4c521d530e17c1db7f10d2e39582835d6d35630d93a1ca810b83207eeb78a6ba670f73dcac3a01f86c88cd73d39c54c87549e4bd055282e7c8 WHIRLPOOL 950b43e3dfb86c48e29dd93ae72cf80169db935fd63afcf66aff3f71de446ba44ea4030f236035aff4cb6bf6281d020120cfaaa18bf7f0a03edb64d5355841ee
@@ -22,25 +23,26 @@ EBUILD selinux-base-2.20141203-r3.ebuild 4475 SHA256 4fb0a3f7795d94d2000c2f9da05
 EBUILD selinux-base-2.20141203-r4.ebuild 4475 SHA256 1dea83fbf87be6180b472db82bbe340a882a10e3da820fbc2b6deea48afcf40f SHA512 f25d57ff19a45b7d3f1d88fbb74731fd60c433a4be15bb4eee1d5088a64b303d5830dd32552535fd72ec1b1f6ca197714214ba294bd4c89793139ade17e29538 WHIRLPOOL 8890203c5423c0656a3474fe793857ef1828422261abe2881fbb8b7b75e463733177fbb4643b3bc4820e8d39ff82f115bae7991f73845a5f35f34579f14eb11b
 EBUILD selinux-base-2.20141203-r5.ebuild 4477 SHA256 c0cd8379fd12ebf84a2bbf4e08c2b1f83bf72c552bdbf4408f03851a36f1fa69 SHA512 4a11925663967b2c44221d10ca243d3426e011b1d1108e6662eb76beac3a9e8ad83bfcd476f24ec719e0bad5b462f9dfed81aaa91c86eca270a3dd15ba2a0246 WHIRLPOOL 83d8e674946099f9e09f8b2ca8f1165fd38924cdad147ec2e6902bbfb4a7e4c6c144b74d0dd9063b35b10f0ddb26f53e9c28fd780abe544142346a91d6772834
 EBUILD selinux-base-2.20141203-r6.ebuild 4483 SHA256 55aa34d8613ef3feb0ac61fd09b58e842556900c6cf2407836c5249d098e010e SHA512 acc6c7c8ad4c805f6ddcfa7d5337c63caf0619027d71203c7d459258a9a75df7b405c93cab626dd44680c19ed155d38d96de9fb230a1464f6ec3a990ce0e7a39 WHIRLPOOL 9715ee27a8d2496f5a9c92e268706f4189366f1a85f92a33c75fb73c50f6b223ed2517ae3d4c753236e312a601fa7c1e4c37809b243e33c304d6b467e1228e7f
+EBUILD selinux-base-2.20141203-r7.ebuild 4483 SHA256 4223030b643170f8a4588d9b8b81d846a3e57b7746a331f4e1630b524d028f33 SHA512 d0fa547db04ca6574cf19aa0cbaafc73fd6decc6970aadd8915b28c86ba2afbf7991f219a1b8c07d6e3e27259405bad0a6f75102004973769f3739ff74ab4cef WHIRLPOOL 027fd5f0fcea72e56d729973f51672036d99858e188de8079bc5591b6162aca2d74637d8a88b2961af341c6e97a7073bcd7ef726e631750f7138f3d1b1ccc43c
 EBUILD selinux-base-9999.ebuild 4475 SHA256 adcf64231f60120651679e66e53e2535ac4e05b8ce2984b7da7c158bfa88b515 SHA512 f5e39ea1ccf6381312849004b3760ac354b1a37445fe3af83ccf1949ba22603065a3c18ccc6a2040ae8f3afe6965cfc1e9f16f90e61b3735338a8fc10fd1aabb WHIRLPOOL 9f97500b425fa0c16f8bd546ef78d3e6ba738779903a1d6ba1c6a94404462e17be307f0e67c842c38031d119e062943b22bf32ea868d8c6b4c0a32a8a03de3b5
-MISC ChangeLog 12147 SHA256 80e83030d458e9d9709827e17af7c3421ba8dc66acc5360a1336d36877ee5b80 SHA512 7955d4dedb161600b69f7eb03593af640b1c5ba060d5a5843c35f3c144f7f6bcd405d54c848ee6a603dc9d465970f43077a95b5b719cd768923c59981df9e2aa WHIRLPOOL 2205312384b51807cc63524bd0401188475f212da1fd02d1f124dcb412b93a86d211cddcb7ac4c8f1712392138f4c10d2b8142d25f88a4f24d7d8c4aa29e269a
+MISC ChangeLog 12306 SHA256 151ba8b5e923c191271abcb7bb2e78a397cc7d45c68e9360139f13210eb50b6e SHA512 77bbb424293e87350faf1fd04cd396d1da6449a682e934f050c304eb19157fc73eea2d346d7ae837ba086735e69defa9bc57ee820daef3dd12347342eabaf37e WHIRLPOOL 64fd37fd08352e8f9cce4d62699c8cfa7d4957ab3202273d69f6b862316839c2d2dbc6386a4d88785f2d9b7f00d8350b65885ae37f223a8ae5bd88b978f5f34a
 MISC metadata.xml 753 SHA256 2542c8e9c994b3b2699d601ba980a8daef2288b5ad199867764f607978ddee67 SHA512 d5e803494fe0831fdddada0f1f464c941d93896afa19d9d1005daa8a4ebea7b20f905e6d0d89dd10ff1aceaee0c7c41c190f16b68bf4466c0f75d3a6110b8df0 WHIRLPOOL cd2535802ffacbdae1ff1787aa203311330202cb08df488dae59b178b102b818766d2320fe62de3cf7710047e8cafa6a41963381655d9fd5fb4c75a232decd52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVccodXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVlXw3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VwAYQAIU+luGYi/5zucdKr847nnIH
-Unr5/SK+zzI5LcUEZmUag7hzqeemRpkk2lMCYGIrkp3/QiBSjVLxL3+/mIRiRdbu
-li3vVAp5qn71EjKCMa3/0NNtiuB292kMZb2KTqPZT4fXOHqecWutO7KBA9e6Wlku
-rtlBm5F6/0VLwkVyZ/FgWV9wC5xAK6B/ljKCZu8YKoyJX8Aaz1BrOgtU9QKP1CIF
-VJ+J+LuvtKaiQ4UAnznfBTwDMq3ktxPCrpx+rCMHubs0LLnTYB1yRmIvP3uF4v23
-DWHFsrDNXqQmar46AQJLpDxQgFBLbd6yRgKiYMYhAcyPf+n2bQW8ulrTh0Himz0m
-G8j+6DrOMAYo17wHpkcJIgll1EIN4bNeyOsXdqGlMcUCNkoDY4PrHzabwd9y6ANR
-oE0ZQW23BnrQgylISDA5r0t4M22Nx3+sdPrdTddFjlc3TNcyQIvyCCwnqpUhPuAR
-d3wYAzY/Z1LDsqoGADztB0MYusIBdIxZe5MT11sionX6fQVGgo5rPaJ7XYaXRpYT
-PTE3OPlVZIpXEUvIHlMfrdq5nSL2uIsVqM5zF2CZ9CiMFaNGYsxEaSU/CT17XYtb
-fET4qu/TmR6k3L8tJk2z3NV5jmB+T5Oj+POBufsBSRbBIro+Wz+Im7co22BPmar5
-z3ZtxPviUI+14uQhaiXw
-=4gd3
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vr+QQALOY5xns0OOuOH3gBxtOSADs
+aqh4RjiE52V+Ivj0rzMjaDFP31kHIW82IoziZtnnd70/RrExV/AGTHwFQwYEeO/J
+70e9P7pxIl8QxnhfVx0DiFvzsPKmy8fl/GT2L5OjJoFElwrEPXX+5XmR5opskTjJ
+3nh7TkAIpZuJovcmNpKCJjaNRVqCpSD0MjyLFatWhGlgCTBoQ6rbRProKnFYbU6e
+intuL4OYmnBTnlUotyBSaRC7suga5AThA3FqYvk5rRvqq3tqD44u3+fIZ+kL5103
+F/ULgkqfkYTJgM5zbINKczdJdlbW/jJQeja4wZpo5Apjm8FzGIAOBIeD9DXRm32M
+EMQtEihRGsi0YAVjtc+l/x6vF+UzpXjoIavqFMKa0U7njYq/XroPZGWgRjO7lc2w
+aiimeX5rkFLeSwQ1nx4O87XkIJtA0nRxd1eb5HNuDT0FKwI5kH3gCYLyy1WBC+s8
+D/DMhXd0Of5iFE7poEOwrAb2BuJLpgL15Yf3v5zJAIp9n96EXykdhR7hg/Y9v99S
+kyrNj/XzJNHIAA/PFBCqmDmDjiYxPHhIyxVvfKymn21qBHyAzL3VQUvZY1+1XYmr
+K6Ue3XpEhOhl0ZsE1vFNMe29c64JiAYis6XtByS7qpMsV6FYWVK0Tp4Ba3OyUzBv
+Fp0PEy2uaUsYJEaSyhdp
+=lfx7
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r7.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r7.ebuild
new file mode 100644
index 000000000000..4768153a2b22
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r7.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2015 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.20141203-r7.ebuild,v 1.1 2015/07/02 17:59:32 perfinion Exp $
+EAPI="5"
+
+inherit eutils
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+	inherit git-r3
+
+	KEYWORDS=""
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/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
+
+	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}"
+		emake 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=$?
+}