Release of 2.20141203-r2

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

3 files changed, 193 insertions, 17 deletions

diff --git a/sec-policy/selinux-base/ChangeLog b/sec-policy/selinux-base/ChangeLog
index 6f1817d376b2..b92c129fc794 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.61 2014/12/07 13:21:04 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.62 2014/12/21 13:55:58 swift Exp $
+
+*selinux-base-2.20141203-r2 (21 Dec 2014)
+
+  21 Dec 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-base-2.20141203-r2.ebuild:
+  Release of 2.20141203-r2
 
   07 Dec 2014; Jason Zaman <perfinion@gentoo.org>
   selinux-base-2.20140311-r7.ebuild, selinux-base-9999.ebuild:
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 3c79f0e00950..1b4e179cf689 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -10,6 +10,7 @@ DIST patchbundle-selinux-base-policy-2.20140311-r5.tar.bz2 274187 SHA256 5ce76d5
 DIST patchbundle-selinux-base-policy-2.20140311-r6.tar.bz2 281043 SHA256 7fbfb518731c6bce8a3937e7dbabeaf0d39059423f5930731034363862bf9a25 SHA512 6b8bfbb3ee9e9d229ac0fa7e80905300c24f4934fb2f150ba52f45e76a3f1e8b51c788136ea32a2b044a00c614a96538aad9d3ff7300735dae228861ab5aed6f WHIRLPOOL 9da1fb97b7a1c8f5990748695c1393d0d0c7c6bcd6acbb974653ee83df00d911b70b4f9544a9e4b3014b9f78f69745a17a5c7fa02859985b611ec4636b473981
 DIST patchbundle-selinux-base-policy-2.20140311-r7.tar.bz2 285346 SHA256 8e216867cc5ec2c513ae81d04e637021b4eda9bbd0fafab0c7f61f087776c33c SHA512 01d30c38dba876136d61452a890adbbe0301fb990b65b0a15086f1c8f14df4f96faf57bee8fd1328147458e5a7e96f972792c26ef971924c0fc74cf644d4b644 WHIRLPOOL ec03df417b73d52a19809a2e7417b05b11880517e4bc5093725a8172177943f3fa526eb32222f41c3aed5ec5ba3d57fb5af2ed19a32af1c37529864d30afd68b
 DIST patchbundle-selinux-base-policy-2.20141203-r1.tar.bz2 264038 SHA256 0fb0ff62bf3abc2294db83d35d22220c5d86384e38332e4458fb38f88ce1538c SHA512 a9ac284c999b15f9f825761a5d59968337cac5990250d9ce46fc79a870ed14534f61b0d454866ea9296d134adb3e38634b02c0e9d70f69a657da4c11b6aeee38 WHIRLPOOL 389d5fd4feecc74c9a231c98a9bf497491e3e5c19a54f5b8ef68d050d95aeca7e6dd0853655212989b7239271be51cf2c4c3e19ac3db54cec229d802df95cbb5
+DIST patchbundle-selinux-base-policy-2.20141203-r2.tar.bz2 268395 SHA256 60f5fbb2402f12b4c4aca89b134ee0dd4c88a1812208d765b601b23e025f7cfe SHA512 0a6d7a61ae259f6b4b9210c0b509a2b25581674b0d07e0fa8f2eff151f1e8bf084cae7a8928ede6e4358da661290940b8390a2cb6f5c6ababc021de4f6b445b9 WHIRLPOOL 6341b3c04aa547256f3128826fffe777c4ac2d7f6f916d6e7a7f2e976b18a903786116743a26f43602c707310662c445564ffdaa173b2c2cd9e48f4173c367a1
 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-r1.ebuild 4500 SHA256 f79b925d17d5ab4d68301ead1ca4f2372bd355fc3204b12c4eb24f67d4beaa12 SHA512 dfd695f5fc8085361e73e026606b35ed60d6714801a390375a6df7f82ef9333b3686aa6a288831ca0e91ba68880a9383e801ea9374bc0a3d032e2579974b6ba7 WHIRLPOOL afb40d421963cebe974336d29abb4bfa6397027736d735645b6d738ead142b37c0a056400b782f5900537c4b03ade39aa5664fb4c047dd2895156f5d1c4aec17
@@ -20,25 +21,24 @@ EBUILD selinux-base-2.20140311-r5.ebuild 4897 SHA256 199a98bd44178ea2daa2a451e31
 EBUILD selinux-base-2.20140311-r6.ebuild 4897 SHA256 d3a5a1fef86d7a8758edb48583eda79f828fbdbd08f2e99802d1b8d1b8389868 SHA512 dc32a1c025ba37b4ea602242e6ae85d1db75cb4e88366ff5421b3c2a87b3844894eb075e2b728c16c6a803104543d1a2c69460da7915c2a38188c78c408f1da9 WHIRLPOOL 98467c2959889fa264bd707c4c3e38a0e3375d26350d617bc3f65634983328c395d9bc2709b50b83a6448b066ad90eb135db5cc923c6184790fc1a9059e767d0
 EBUILD selinux-base-2.20140311-r7.ebuild 4900 SHA256 f92f68954e631e03d3f2ff767c37ca6f77223db0daafd9591d35023cbfd2a71d SHA512 43355646177445d147b482cd2dac95c7c69e26d76827ec39d1be21bc65d70b239c313a8fede74d9e70ac11d7794fc953fbab4a0eec8b980ae5e1997a2f85b6f6 WHIRLPOOL 64eda2f5478878decc2ca4b8bf6a91182c352dd258aa4c99233ea3b23646b8f0572b98bf905641917d86c873a9a516573364233538c27ba6acdd6b9d85af5fd2
 EBUILD selinux-base-2.20141203-r1.ebuild 4555 SHA256 2d6ada6ba4cbd6464c9203a277cf11a230b72a4359f4dc19b04199ed6fcee76f SHA512 b91227bc53790355d6aa4c53cf51bf5af9784207a9616db2fda53e1fa61acc521bba2ce4d36b644603cf479ade058976bba9019f0912c0df27b616817c64bff7 WHIRLPOOL 3b971b4886abd049b321d46b29fd05a54355f36c65963fa575d9eaee6ba33d796baf055f3ce6f542cc7909bd9081fec2ea00af71e21c1faec58afe665e80a119
+EBUILD selinux-base-2.20141203-r2.ebuild 4489 SHA256 06924cac522eba1af4383fa8240661f4fa31fc68f84d75ab4bf635f2c5fb7db5 SHA512 d97825d1603d2df2ba15c5681388c74673b349e04c83b1c0e3f0fbfb9dc9f6366ad85e834fa85df9a99c73409a6ea33580393cdc087b30346514ad94b480424f WHIRLPOOL c2dda74e3daf39b38a30978a8baf306be8580a91bca69d63ed7643edeccbbc9eede89df0c4f28a47bc171d54c97924338f72f0b279eb23810dcb177e354ed367
 EBUILD selinux-base-9999.ebuild 4485 SHA256 afab6154fbfae34364241dc0f52f61e4d3436b40b5c7eff04d11e55b5a9b4ca6 SHA512 d2f92fbde448d4575435e2865e4eb870d71175abf8770c011b2c9928db6d3c4197284f3ec0b480fd1860f0053e7deee44311fe40029bb1554b1edce352999ca7 WHIRLPOOL 8cde78f81cee58045e87397ac2d749826ef11c9e0e8e51d7e9827b916aabb87aa3aabe47f346c616fa925a9febe8046aae5eb269091d4d5d8b255062e052727c
-MISC ChangeLog 10061 SHA256 1d1879cfa757091252cd5038315537c1307c8d187a0a3fa7b778936310ac21cb SHA512 f9879b19be7dc0f916f0bf09c3fa97d291d881e2e93ca463f37ad429cbd6b142b19cab567f0dc3ea72005d21cc80f7a499c4b46514a26a13a19d3a5097ea2760 WHIRLPOOL 64ef2ebcda79dfab02344a0b9061d61de3637d02953c61f1a6e6f92d553e8d7fee15964667274fc650e52aee241fe43b813e7b1cb2ed0328523492ecd1929fa4
+MISC ChangeLog 10215 SHA256 625a9fa7923089dd42ba7fba9b8ca080e4b9b3656ee7a6d71aef48fad024dd72 SHA512 70aa50f979c2999c1e0fdba9c4da70e9886ff676ff426f7260dcf933b5bf3372f24dba5ab041607937bdfbcf4fd76b9e1c8fed44d03772b783b95b28e2070c0c WHIRLPOOL b4f6206b6798f199cb0e4b24a8a5c05fe9e19e233d89b529ab09aa7d8fa20190004cb65891412354b0e25204ca27830478dce0c92123c139ef5f3cf888d08917
 MISC metadata.xml 753 SHA256 2542c8e9c994b3b2699d601ba980a8daef2288b5ad199867764f607978ddee67 SHA512 d5e803494fe0831fdddada0f1f464c941d93896afa19d9d1005daa8a4ebea7b20f905e6d0d89dd10ff1aceaee0c7c41c190f16b68bf4466c0f75d3a6110b8df0 WHIRLPOOL cd2535802ffacbdae1ff1787aa203311330202cb08df488dae59b178b102b818766d2320fe62de3cf7710047e8cafa6a41963381655d9fd5fb4c75a232decd52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUhFR+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VCqAQAK8wVXviOJjAIY+XgdszGbx3
-g9PtJX71Ehvt9oFl05jCmJFSXh2GXZc5cN6LLhwmSrmgCtaNmasBd26DXDZ4FANO
-MfkCckwymmP253xa2Sdt09UUE/EV9tqbGM0o9bbA+XxH3jxFjzXDctENU92FM+5S
-wC7BG32sQpIoud0d/m3bmYA4hfhoSuoFwskTvXycvhB2WuxRsJvRitFyHm4FQ7t2
-mNGdf1ABo5etBbmtlPYrhoQW7kpE/ha+dmBoXx0XQgLCf7tcnQyLoEpqJFqWZNt/
-J4KyQP4tTdv1OKE2/HWy5LE75IZ7hbtvJ7degYB2Ue7ix5IU08puVhKYMnDW6lRo
-E29cyspi+jg+RMLzvoF6aa3Nx/Sz7oSGoIMwzPvYE3K8IP5W8WB0h+9iyEUe1Yj5
-egeOzLX7Za3lAoO/XfhLu71OykDbHtaipIJs7VDmHVFAH//BFt8gPh4aQ5BmThab
-3h5rkpg8jBwH12wnzvStpfPE/H5CRNHJ5CqwLdYoIp/1TqV9y3ij6UQlot2U4pRI
-g8V+FtJUFURhQSeR2qXUKIpq38dZ3f6VI+cr80nSodjMQFTljKdyfzQwXrdIclfn
-Fv6MRZr9zk5dmjy3O/TIYQB19IN6jWCzBEsSLQnWJFp8ewablfAOllxHVXqbXkka
-7dqbMwpAVZNFfoEM4mjL
-=UrBB
+iQIcBAEBCAAGBQJUltGRAAoJEC7dUkA7aK9H2vIP/2UJDFXky7oupBMvvaXBj/KK
+WKoBmaxRgSDNSsZpsXOCHMIf1SC78M+PgjYR131P6XyOwKKJO/kpLf2ml+OZX9HF
+cc0r/osWXK+XQ4RdmoMLdPZUfVa3SehJtYqpXKJ4nggEhcemzCxAQ4IvXgobEDy7
+B4stKnKHVIGoAaVsKIRVNmaYs81ln5LAZ7JSEyOM9YTvV6YC2IFIAsK2TEOiE1gW
+gD6xvgV+ClrmwSPf2uK4UrJLO/QpBqWMBFh6cuQx3S3KKkeBuP1v9YJL35Hqt09R
+QKcaAab2EjNHmKDApjU/iWXDB0562XBkPr57rJZE+pl7GIXUfFfYKecUi2vkNmtv
+i9svvcwx+TSHuwvkrMikfRiguqJYUTKh3EkWPt3sQaw8tLo8Ag+dtHfJBszpW4HL
+QnJ0AZ/aLgnuBeVJwGuqMwPPyf65DQTNg5t6dTtLCln5sJdk65sIdV5+5rpGkccN
+jmLUQKLd4QWWcu3Eb+bu5P6Yn3zudt4EriTyn3zNoms+X6DuZFZ0hEEnF3qKrAiz
+0REHI2yMkEjSepEIKtiZuqxur1kGn5bzWY/bSBLW5Amxow9b+rMPfb4lx1BkWm/3
+0+5FLBhg9CwF4J6C/vPG1rESy/YP4tN2SUPh9zlWpXQICsL15hzC80y4YGJlGscA
+KqltsYyQ3k+Z8zV/eMLS
+=0PYX
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r2.ebuild
new file mode 100644
index 000000000000..973945471010
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r2.ebuild
@@ -0,0 +1,170 @@
+# 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.20141203-r2.ebuild,v 1.1 2014/12/21 13:55:58 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="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=$?
+}