Release of 2.20141203-r1

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

3 files changed, 199 insertions, 16 deletions

diff --git a/sec-policy/selinux-base/ChangeLog b/sec-policy/selinux-base/ChangeLog
index 319a96f9a4a5..ea776b8f5b90 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.59 2014/12/07 11:07:57 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.60 2014/12/07 11:49:44 perfinion Exp $
+
+*selinux-base-2.20141203-r1 (07 Dec 2014)
+
+  07 Dec 2014; Jason Zaman <perfinion@gentoo.org>
+  +selinux-base-2.20141203-r1.ebuild:
+  Release of 2.20141203-r1
 
   07 Dec 2014; Jason Zaman <perfinion@gentoo.org> selinux-base-9999.ebuild:
   update SRC_URI
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 8eb0e4eb861c..c038409290df 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -9,7 +9,9 @@ DIST patchbundle-selinux-base-policy-2.20140311-r4.tar.bz2 272598 SHA256 86c4e0a
 DIST patchbundle-selinux-base-policy-2.20140311-r5.tar.bz2 274187 SHA256 5ce76d59d12a7dfc02352eb2a77971d76c5ff0fa3c66cced6318919571f04839 SHA512 7a9da3ab23ce6217739f4548cc5365f64def11fe19b6f3b2a304685bb54246d12856388043870e0f061f71fb2c8c45da72bf3db28ad6e70f397f5dfffe2206c6 WHIRLPOOL a4729aaeed88f7485fbf112de91161bf4e75fb996f5123133c22fcb008966acc7db98c7849dc4b076cb633d00c81deae85cf6b5f8c48f8c3c72c90bcaff26d71
 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 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
 EBUILD selinux-base-2.20140311-r2.ebuild 4500 SHA256 706f0ed52ae8617bf6d349daeba3dab3660dab5fc361c11f33779c0ab6562518 SHA512 97f8ea114ca4974c3f8ba0ae53cf12aa2e68a270e7e424caff49179024e27aa0344d1c9b9bf005709c1f79c53f384ab9ba9bd1d49960980ec885593916b221fc WHIRLPOOL c7b6bfff7047f22951693881d4117ec33f3bffa4ed2255cf669b9890f16a3b05b56d412747afe2b12ac7f65b11e65f1d0b4fa07d8141e0263a8d52e48c3658ae
 EBUILD selinux-base-2.20140311-r3.ebuild 4500 SHA256 b80c252890a682a023fc212e3fecb631f51d0315a52b1931732562fb1a9e687c SHA512 167a1488e191791e9f12bb3e585608625cb6ac812d5a3d6379f907657d1832cc472a626ea308be0c0f2d94c31ed0fa13749b881b79eaeb2dbb3ab146c0b2d2f3 WHIRLPOOL 00a345a9a7bf273326d5a84d659aa13a61d56bbd57fa12f07873315e06e5f7f29921cf673dbc4a8172374f54ae0bf875dfc3164cb275c791b4040833aef7413c
@@ -17,25 +19,26 @@ EBUILD selinux-base-2.20140311-r4.ebuild 4502 SHA256 cf21cd4dd2f3edf00ec863a24ba
 EBUILD selinux-base-2.20140311-r5.ebuild 4897 SHA256 199a98bd44178ea2daa2a451e319d1e6c6241a974e95e187c8108f3bdf6865cb SHA512 c81601784505e2654f0b6d32ca7ed5d539b1d5f7d1e0d2f0bc70bcccff9c07bac2d5fa6d3924233c314f36381645241783aba156293f497bac7ecc730eebdcd8 WHIRLPOOL c8a16b88a7b57cf5b8070c160ccfc32736c4aef39b338a66664383d63595951e1023c55bc745a1203d8f39bf9fcaade2f12ece6c38f84613e5cec3d83908f567
 EBUILD selinux-base-2.20140311-r6.ebuild 4897 SHA256 d3a5a1fef86d7a8758edb48583eda79f828fbdbd08f2e99802d1b8d1b8389868 SHA512 dc32a1c025ba37b4ea602242e6ae85d1db75cb4e88366ff5421b3c2a87b3844894eb075e2b728c16c6a803104543d1a2c69460da7915c2a38188c78c408f1da9 WHIRLPOOL 98467c2959889fa264bd707c4c3e38a0e3375d26350d617bc3f65634983328c395d9bc2709b50b83a6448b066ad90eb135db5cc923c6184790fc1a9059e767d0
 EBUILD selinux-base-2.20140311-r7.ebuild 4961 SHA256 c48b1b3243d9684e3d23afdac85cff045dd08c79f21b1d7d5293f60f9fcc4072 SHA512 02a9dc1d8de0b6694b9669e95b17660acb1dc4e190624610bf243ad25e598eca24a578e39009d71a654608083d72308bcfb8594ae0625f8f76ef8f5ad9926b00 WHIRLPOOL ce5efb630f0fb23a404a0ac0bf7b6591ce389afb8d28f9bef0fd0815950e820b70d586a62cd34a49cd5d88bac04ee5483a9709801be3a064a1c9eecb530abca3
+EBUILD selinux-base-2.20141203-r1.ebuild 4555 SHA256 2d6ada6ba4cbd6464c9203a277cf11a230b72a4359f4dc19b04199ed6fcee76f SHA512 b91227bc53790355d6aa4c53cf51bf5af9784207a9616db2fda53e1fa61acc521bba2ce4d36b644603cf479ade058976bba9019f0912c0df27b616817c64bff7 WHIRLPOOL 3b971b4886abd049b321d46b29fd05a54355f36c65963fa575d9eaee6ba33d796baf055f3ce6f542cc7909bd9081fec2ea00af71e21c1faec58afe665e80a119
 EBUILD selinux-base-9999.ebuild 4547 SHA256 1b7119ecd5227128397ed0f5230472a5fb3f436d9d0f7a371e12b1f2815bf584 SHA512 7fdd6baa0a79a765f9b4f5a2a6d9f1034bef70bade1f9bab295e3bb6b98acb16b10b77fa6fb0807b8cd27a87fb7051003800efdab73e12193ef1a69879bc775d WHIRLPOOL cdb00c7c2c3cfffbaefd1dcefed0b07596d832d24e97a556a1e4fa609a29d2674c901e9cea9103d03723cdab0552c109b89f5b7f4533dfa89706fccc106811b0
-MISC ChangeLog 9762 SHA256 5b2c5a29b51681c00a555edcabf8480a9d4476a1480a05d8c700bbcf93433482 SHA512 df021e347747d8a53cf2fdbe3114c7c6a364f2ec98bca118ea0be047e4fe8b75bdd73abf01ce2881e67447330e1b1be6bbfdbf0e38825cbd028d7a651276c335 WHIRLPOOL aa6c7f9ff199cef14e194947e96231ea4860626aff12309e47128f715d2e6db48454d9b7d5ff12101bd367643293fa0267904aed249b2946d712422034931783
+MISC ChangeLog 9921 SHA256 3b1b0d1eaf0f31b6a50155b9e9117f636e570e238460d3c3ef78663cf1eb3c07 SHA512 fd5c636338a588c9d34a70dcac4b88d6325463bf38df63dd5c437f297414061daed69593dd066004d54844796b0865c64768ee2145b7cffc59fcaa0130d5b014 WHIRLPOOL 3e16ea8d8438934a0a225fc2662da9017f079337bed9afa576d07e8437a27f79aa7c0d152c9d2f39f1ceac944dd1723769960b2bd54f8075e7a2c455d843ec12
 MISC metadata.xml 753 SHA256 2542c8e9c994b3b2699d601ba980a8daef2288b5ad199867764f607978ddee67 SHA512 d5e803494fe0831fdddada0f1f464c941d93896afa19d9d1005daa8a4ebea7b20f905e6d0d89dd10ff1aceaee0c7c41c190f16b68bf4466c0f75d3a6110b8df0 WHIRLPOOL cd2535802ffacbdae1ff1787aa203311330202cb08df488dae59b178b102b818766d2320fe62de3cf7710047e8cafa6a41963381655d9fd5fb4c75a232decd52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUhDUSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUhD8UXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VOCMQAKgX6RCq72djWgyRQ3ZJ61qv
-XbKgaS8dcyq0EOY2XGh+F5pf9eB9msnvlQ3UNz0+ynzXYFP59m+RzTvU/BCvH3FH
-0QJEgV+UnT1MTj8KeSYdbiDXqfrgS7x8mfoPqV/dOVHDMgqPo36MuVcY6A/pb0K6
-PvMRzl8C/4mMDOpWAiWu4+dNsbXqZbbMtA5qzGw6fG8oqmAm7MjI8KhVmhwY4vEB
-N+4aFag94g5ZsmosWMWFHarHAK4YJPkJd2AmKNuspsWhtZ/bvtpJ8jl8wfYJNDMo
-5ChigPfdY4aS4TnKM4Ovggi6fWt536lQgGTtARKtZ7gsRfnLxul/CZTClfo0f/uu
-ChmhkQCKYyLaHf0/2AzQd7CuK87SFaTeJv8ukki8HZEmXxGUyMWZd1LPl3M7M+UZ
-EotYPYR8JD59bE8spa/euNG5gCRsEYppT02enxcVzHdPdwHocYuOFFFZ1anP1C6i
-H8ZlM+dCsn8EUwudpyNQXoNzMRbY1WDVSQu+Vr6ECNLiXoJ8na9A5KzoCQz4AG7g
-2L6Kx/PYVWubJ45kj4eUGMQMBfzElOj9NTMV1JS56yDS3hJFK4vZDNhBQbaZ948E
-T5+U9K8Hk9KedA26NV1/MjnHYOp6rFxTb/ngopOI7yfRRbRxHurR2NUbQ6STpvN+
-XVjf6Lh1nSi+axPFoL9T
-=Ex/l
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VaLYP/i6zuRXNZRxsyWBE+74j7Hxv
+zJRjZ01RgLqCPq25M3RnUrQ+aKVQTCWkRBawaH4II/i3SiJtL/1l1yM3Fy6IjfBm
+UOgAFvQO/23UQCzOjCJQoN2hTe1Kf6jhJhPQsfxQW4o05kQ+03PWHe191ORMP9nu
+HzAeDLB2WhjH3nQBMp6Cdd8D//n6EQCFSfie+/mko9VpbIneCsdlxXCp/FXXL6Zq
+Zhbyng++RsnY36tzuggpAC4/p2+P4teL0bO+NAFoW1Y0WrP63g+ZJbZr/L4Sy1/s
+NwkSnekGxVrxXfIPzhN+0RmQ87sI3PT21RVIBA+yZbDsawW9xGi3cJxOKcPJxOLk
+3bMyJS0L5odDoMjTdEtkX7sExX6J61LhSspEzz+BqbDV4GUZK8C/sFXwthnTtVVn
+apRsZ/5kQMQKXXNKyZHY/jAATZvn/1s+J7cqqet+pQNEfQ5UtOI4IPBjqoaTgo88
+B6/NnwZCHLwmUyuRB9oQq2yjfOMN9zFBy3zyB2/MIxuDDH/o7GdwakbTarxNz6mV
+035l961HwItC8+42LmPp75drtm1UmEqexLR/FwriAUJSBhUwPmCmkHxBEoiA0wvy
+YZsYvD2Dtni6fm2YKMcOBalihonoK11hrxqHT8oNQeNT4SIioQKkZyzHy8MB/wPY
+Eubt3sD0cHb4I4GX29L3
+=xlax
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r1.ebuild
new file mode 100644
index 000000000000..c2e8a2e7793a
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r1.ebuild
@@ -0,0 +1,174 @@
+# 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-r1.ebuild,v 1.1 2014/12/07 11:49:44 perfinion 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
+
+	if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+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=$?
+}