Release of 2.20140311-r6

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

3 files changed, 157 insertions, 15 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index a4c80bab4c37..f99091ce0e10 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.149 2014/08/09 19:34:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.150 2014/08/21 19:31:14 swift Exp $
+
+*selinux-base-policy-2.20140311-r6 (21 Aug 2014)
+
+  21 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-base-policy-2.20140311-r6.ebuild:
+  Release of 2.20140311-r6
 
 *selinux-base-policy-2.20140311-r5 (09 Aug 2014)
 
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 681c98f0551b..68115444194e 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -8,29 +8,31 @@ DIST patchbundle-selinux-base-policy-2.20140311-r2.tar.bz2 265878 SHA256 344e9c6
 DIST patchbundle-selinux-base-policy-2.20140311-r3.tar.bz2 268783 SHA256 1d2f1d090a61e96ee26c63ebc0d37d1aa7f7c826b2885fd28bde2d0c81a500b0 SHA512 ef3eb5143f4343675c6e5219c6bad1b5cbc3c885088c0389974d7106e8da949843e1504edcea39888d14a20a8d6cf4032e24fa5891e7fa678abf7d9c7cef3762 WHIRLPOOL 5c875dfb043c0076bde48a2f7f1051e3475316578c46688e2e94bd79e0130bdc9cc5719e9fb2e5c3bca52e97e5d4773546cec1ae21bd0a0d37b5a57ac4adf483
 DIST patchbundle-selinux-base-policy-2.20140311-r4.tar.bz2 272598 SHA256 86c4e0aae81adf76054bbb74dd19a19022dbc2139a6adfcb3710dd679e5aecd1 SHA512 81b4ee890baf01f1b55a70f46454b3f77a7dbbcd3e860e309162389a34be056bfe82d3fb9f7b843a8476b2b1fb5919d534402c2f06eeb9390b33b3e6745ca444 WHIRLPOOL 8a4503d201d465b049757764ca0c209b03b66ba2af8cb7e979354c2d35e1c5b428d9a1876a606a765702c50bb725fe4f53a9384bbb205f9f51ca28d59aaa9416
 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 refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 EBUILD selinux-base-policy-2.20140311-r1.ebuild 3842 SHA256 7ade39bc56c0f5709444348a4de0e8fa376c00bc073e3e6827171df88147c63d SHA512 432bf7d88c2dfcc3f52eaa2c49cf00f3a5b336a639536390745d69300830d0708f2707e962eeb62e2bd82065bce008f9f625b49a08a16e2c4168073c855cbbc5 WHIRLPOOL 17a2b8a8759adeb7e11024540e22261c33c2d0e5a39db89482379d4a18c3b5c9c7346b572393bacd615fa62389083bbae4a4a8ef5ab95f250b62262dcc168735
 EBUILD selinux-base-policy-2.20140311-r2.ebuild 3842 SHA256 4e8fd70bdccf6ebe7dfac5653f04daca037f6260a731b7843bea78d474a02774 SHA512 8b6c3ef63ddfeb2961a3cb485a472775056903698140b456788766eef410f89dadedea5331b0831f22e75390c14a3cda3be9f20cc57211c16f1551c5cc7aa1f4 WHIRLPOOL 434bb884e4818324c8fdc0a3e32b0472db759e357774fb3891248a2057d5f6f3c870068c6725641d706d812b6e84263950935ba97e0ca373dfe7816a30c5d9cf
 EBUILD selinux-base-policy-2.20140311-r3.ebuild 3842 SHA256 2d3062fef28e7d4c196d1fc58f67dd375ed50559f49f04a4813602ec5c62f9e8 SHA512 1c70c28174b19f5cbe133bf1ca2417054836f5135af4afebdcf2c286f5fec8cc235568bc95fc576f08fae00338f04ed09b6b86df4e64e9e2bf5d27e8b7a9ff52 WHIRLPOOL 2566012f7972999b05c570aa1faaee97b27c7f60c9c69488e5ed40fb19620bc4ccbad6bc59ebd8faeaf51d49c9224de6e6bec3c900eeb98674cd894b0489d839
 EBUILD selinux-base-policy-2.20140311-r4.ebuild 3844 SHA256 15b1a60872c468e5e323987b1d56a08f8839757a50e77d90822bebe3a8e4e794 SHA512 c3080b9cdfeeb59272d51aed107f3fb9823a875dc10336e0a65e13470c154c02a6905246108ffb85cff7324e745440dd80135c3129a0908421a9be9862da2868 WHIRLPOOL 8f4f17e533c628d9783c60049397aad29ecb6e74871842870e220fbc18360b5353fb311fb927e8540ff4f9d0c57748c5eb2d15eba4ef6561a488a34d262c7edf
 EBUILD selinux-base-policy-2.20140311-r5.ebuild 4091 SHA256 6182d6e36be342d3e2ed70b3b039c1e22ef2bcffd92d0322ea525e044c0bbcfd SHA512 0d9317e7378dca6cd854ac41ae962bebc7fb205a791601cd6583b6e69614218125e46610949515a7bb38c7e5f11741999fce1a39209d3c4ff1883ba8b0f044cb WHIRLPOOL d9afe18c9c152ae5ce14f8e46eb6d6aa0dca061ef4ae48efd940150530a470086509cc46ef595f885804266a671b8ae5e399e92e50d277de2e784c23f62a9ba3
+EBUILD selinux-base-policy-2.20140311-r6.ebuild 4091 SHA256 cf5dbbc365954b977482aa9644baec2ad2b1f789a1c6be42bc3c847711ac25da SHA512 c5070dfe6a37023677e016105015c56175d3cf1e3b7568ba76d8de55a560fcc065c7d43b59d77cc6d4a9a856ef8eed26ea77930af32dccb5de34e7a15f874da9 WHIRLPOOL af94520fa1dbe77eef3341fc02164df925757a3a68f4c29d2f55aecee39444d7831d5d8d4aa03900c7c36a7b4d8b95ef5b832dcfbff610cb5da018089ac0bc3a
 EBUILD selinux-base-policy-9999.ebuild 4072 SHA256 08de36a14cdc2ed72a4889969db61e839a0b35d49fc3ef654e50afd8b2d2c4d5 SHA512 5f3df63cb7900c4e707d201ae9ddaf7630bfd3ad10ec4933a7c023b39912fee20d22324ab7dac8fdebb680e0c0a419e5ce57acfc4370493618d3f1a418f68340 WHIRLPOOL aa9bcc7b90c8606c91d8d236500cc0bcee4675e785dd101b3437e5dd999e04b83358f98d96112f1ca133450fc163ab4cbb3f70c859eeb0ab3a968175b23a45e7
-MISC ChangeLog 32988 SHA256 a656cc0bd580db38d3800817b020d3969dcd4ec03189ec9c3059b9c5c89439e9 SHA512 eeda3667a65bb290c11de1c2c0feadc3d865331d6c914c69d5e219dee12ca69dc72875c8712a981082aa1ad5010f0b6ddab3733e3c0f923299e3aa65388c1aca WHIRLPOOL f8c1b6b3d8c497a32cf72fccc251bfdb7bb97e8fa5f39b8f3afd38eda82bce90d312d9d0a6a2c8d63e8521a7eb8cf72996bb2ce99fe29b95925bd34c9388cda5
+MISC ChangeLog 33160 SHA256 2427752b5386748e827d278c27a1e77970eaeadce1c10954563249cbc42d7a09 SHA512 7a5bb50ee901e2382c057a8a44753f7e80497d5a079da671b0b9997d9716f9c31986b7b2dc1ac90fc8daa751197749e16bb0507bfb2c554e283b6bc8040386dc WHIRLPOOL bd59977acdde9a7baa22395ad8468da5c138275ca600068dc58c6d768ca12f3208e4a7b1654bf1e544952b4c729e1470d10775472870ff76df7a607f36045fb1
 MISC metadata.xml 448 SHA256 4babd5e53785136aa79ee0737a89af1fc49c4fc144aba0f6163d6f85215f57e2 SHA512 7e747c9dbae3eaee62a284824a68039961264540e0633e617aaabaeef2e83f4623863d29ee26c2e4738ac706d3824914f530f8e2b990ac7f06aa8f6e4cae9964 WHIRLPOOL 733957f76ca89c6fdd08060a368048276247994db56cf8325e69b896a07dc5e576ca124f3190079b169ec078a2e69156d4b12e6c6cc94328248705779f357bc4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5nguAAoJEC7dUkA7aK9HnoUP/3CkDgcSse37S6BqQ3+giYDw
-fxy5pk9fm8YNigQ8Fxbsz6kRHgZ20rEOczB5gK2+7xSob9O1Q3xB+Omz6uFRCaab
-0Dvu8a4Wp0e+fc4OnXcSI95HSsjRqT6u9xPfkJKagrdLPqnH82SoJNbBXj3Mwx98
-rx2J3qyzKSOpnWQLWrXamMKcubFwMsUtQ17i4slzunLM2TYqlx3PFoHfuVGY/wq3
-2FKAHet5sAPuJlgr0jhBog1DZ2vTQjuWa46RVNeazB//oLxIR7KLpqUOkeFJaibq
-/OWx11jbxN7AxsRsxbvM2ilXMN4zaPk6KDYHSzU18anyoe5ZDMOdtHda0SXAVUhN
-cjWLEL2WayJSAxe0IjF72eQX+n9t5gSHjzBOuy0mMUCIsVU0OVcqz1Iqe7XzvQ08
-71h1lYSX1rnPJCWKStEwtPuq5OCWxhdzJSE/ro3E25MrcweVbBxD0b0DL22innzy
-H2BnNzdVDrcW8CYF3LP6OKGD9DcuUfyybzH6iRJizq7SPW+9eO5DRo2MbjmGsqIu
-z2QVhtNQoBx+ht6hl5YgzPvLB/u6llGQUVdjmaoZTkzRyw3EMYYFie2YHqTsUVzN
-2x7+atn5ICQz6K5VlSiVuU2qb2ZOIqEq6MXojwaJL5ER3r86F7khzKJEeVPRHvGi
-QOiVXntkzXNPRURjkr6P
-=syIY
+iQIcBAEBCAAGBQJT9kksAAoJEC7dUkA7aK9HBCQQAIwWbxMrZr/F3v9JI0s5qOVT
+ulx+l7vp6lcirj9iy4+NR3NNP1y1fucUF6cdpjDblX5SVn+AFffueekkU3dMGttw
+bG3XsZ4lL5D+VbMs080Ro0GnT6YuxIndbq1MKpeQm+fUzDgRUDIYoCrTiqEH28F1
+DRTIFQr3GZzvRUZ5Xnx94l9p+HdegY3xj+juCogn4uW4Sl0AI7Dr7aJfqb2oWlXR
+lrSfSdalo7ky813sx+dL2I0jVBqo7oRSVp2SPnrj4IgbiFGsmyID/MfAOBwaVI4+
+C1MGQllSS88UhVhBRXLI25GPojAZ4Wt2303SGhOhenyAc8YcLedqohpo4rGwLaTx
+hb4MnzPuwWpo4LHtufJSTNKpMe3/pq9yVLXMtI+v1vJuTpuLvVD14LxBoepu8xx+
+9Uk/WFLHTm3jdF2O/iAN15XFU5qd3XadinbcaLO6TDLI7IOA6OnQyUSDFwd2Vs9O
+iXjHAzwdAiRIFJsIYu+ZFKufDTNGxcD2NcBKuwlDGLYBQNdhfZ4LpGq47nvdaJZk
+HOtQIzLdNUmbDzXiX3Nj0HMZrv1yhxpPWc5WpeYCGI88fLgcAb4QvtwgETgjzmRO
+FJcsMk3oNCYJwKH6Lb/blSIely6Goa5kDgdNgkR64957fWTRzgU4UZtyBu4Q6iHV
+xD2TB5+i8L5LmmeqKh6z
+=Yssv
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r6.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r6.ebuild
new file mode 100644
index 000000000000..a119b1051a21
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r6.ebuild
@@ -0,0 +1,134 @@
+# 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-policy/selinux-base-policy-2.20140311-r6.ebuild,v 1.1 2014/08/21 19:31:14 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="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
+			http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="+unconfined"
+
+RDEPEND="=sec-policy/selinux-base-${PVR}"
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND=""
+KEYWORDS="~amd64 ~x86"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+pkg_pretend() {
+	for i in ${POLICY_TYPES}; do
+		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
+			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
+		fi
+	done
+}
+
+src_prepare() {
+	local modfiles
+
+	if [[ ${PV} != 9999* ]]; then
+		# Patch the source with the base patchbundle
+		cd "${S}"
+		EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+		EPATCH_SUFFIX="patch" \
+		EPATCH_SOURCE="${WORKDIR}" \
+		EPATCH_FORCE="yes" \
+		epatch
+	fi
+
+	# Apply the additional patches refered to by the module ebuild.
+	# But first some magic to differentiate between bash arrays and strings
+	if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]];
+	then
+		cd "${S}/refpolicy/policy/modules"
+		for POLPATCH in "${POLICY_PATCH[@]}";
+		do
+			epatch "${POLPATCH}"
+		done
+	else
+		if [[ -n ${POLICY_PATCH} ]];
+		then
+			cd "${S}/refpolicy/policy/modules"
+			for POLPATCH in ${POLICY_PATCH};
+			do
+				epatch "${POLPATCH}"
+			done
+		fi
+	fi
+
+	# Calling user patches
+	epatch_user
+
+	# Collect only those files needed for this particular module
+	for i in ${MODS}; do
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+		cp ${modfiles} "${S}"/${i} \
+			|| die "Failed to copy the module files to ${S}/${i}"
+	done
+}
+
+src_compile() {
+	for i in ${POLICY_TYPES}; do
+		# Parallel builds are broken, so we need to force -j1 here
+		emake -j1 NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+	done
+}
+
+src_install() {
+	local BASEDIR="/usr/share/selinux"
+
+	for i in ${POLICY_TYPES}; do
+		for j in ${MODS}; do
+			einfo "Installing ${i} ${j} policy package"
+			insinto ${BASEDIR}/${i}
+			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# Override the command from the eclass, we need to load in base as well here
+	local COMMAND
+	for i in ${MODS}; do
+		COMMAND="-i ${i}.pp ${COMMAND}"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
+
+		cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+
+		semodule -s ${i} -b base.pp ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+	done
+}