# ChangeLog for sys-apps/policycoreutils
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.145 2014/11/14 19:20:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.146 2014/11/22 12:59:49 perfinion Exp $
+
+*policycoreutils-2.4_rc6-r1 (22 Nov 2014)
+
+ 22 Nov 2014; Jason Zaman <perfinon@gentoo.org>
+ +files/0001-policycoreutils-pp-add-roletype-statements-for-both-.patch,
+ +policycoreutils-2.4_rc6-r1.ebuild:
+ add patch from upstream to fix missing roletypes
*policycoreutils-2.4_rc6 (14 Nov 2014)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX 0001-policycoreutils-pp-add-roletype-statements-for-both-.patch 2157 SHA256 799b93fde622a168e0c7b1a0a1ec1a0a65873379e1245ec42859c00a06ca1372 SHA512 fb96bcf8bf045092be98dfce3c2d010984428f2a302e53c72af236eb1466465a27c6fba00e0912cafb28159e3d233fd82220c2456a2b8df36ba2d1286b9752fa WHIRLPOOL e1a829e0710e045c7a7ba622f4c79e8ff9d59c370b838e45ccca95416845d92a6d690cd65be2c99aa020ec7a6db2692988db7b5d72823d42f977124b35abcb17
AUX 0010-remove-sesandbox-support.patch 747 SHA256 af6969721dede49f4de4e1db8e98e8400a8f0e3ec0b55aee9295aea0d6ba3b9a SHA512 b7b54191d2b8703393dd23a7fcccbdc3e2b7234acd962e994c8549eebae6cae3b6f62055b47a2d5db94510739abfb2fa365090c452422b6fbc02ad625ebe4859 WHIRLPOOL 1ed396c3346123af9fc8a5e911a6c241e2b64d7424b2d5194b0cc7c6b44a960c70afde3d04a508ecf525af038a52c739bc424230db34fcb52096304b2cda2771
AUX 0020-disable-autodetection-of-pam-and-audit.patch 3905 SHA256 0ac878dabc3022cf1e910259d3f8d29c272df93cab71a9f70c06753eeb77d477 SHA512 0a7bd13a2329767e554bbaf2bd86c26bb2d7f13efb646b899eeb97425f3d28f590f91ce766dffd2111d7868b3bd811ec24bbfae4d5f565443302f1570a0a27fd WHIRLPOOL ed89a6e47b8dc8c9faab2ed31a18f39930f159b032dff4822bce5ad7c61a3fa68ea06d76849b51b086e2afdb4fdc21992982b901aa40a1f7c7a364348fe8e060
AUX 0030-make-inotify-check-use-flag-triggered.patch 647 SHA256 acaa078e9f4b789ca573cac13613f10067d46fa0b0b30fa0aeda34777f71bff7 SHA512 e2568e802e5e4ee237c3a6484528474e77b538d739f304de1efff34b52efb7219d7db52d6e23e5c6eb0b731b31ac08357a0c40f8669e06118ace3a30d516596e WHIRLPOOL 27e73f689d46f7a69458c42a39360a641605fb0905187705c8868a466772b17ff65660985d3f54b6883e28a96bdee687e14f381243aeb41cb4030dfddc0daec7
EBUILD policycoreutils-2.3-r2.ebuild 4348 SHA256 46b1814453fef44d27a90c818d4948e5a448967b5b3305f71017da9788ff18ea SHA512 8ac7acafb331a746ef03bfb016b098425cd0c6f25fb02b20c79f22d4f82a97cdd4c272f27a289a0172b375002a6a3bc3f1f4e4b2f27d6fba52a7bc26819ff8fd WHIRLPOOL 41bd78021c5ac52e4778d5b0648c8af6f5e40298d71446486e2b1ed5da9183c4b8b337850b59f1a275823c536b4eb22800dacfaf656911a5288d61ae65d35d29
EBUILD policycoreutils-2.4_rc2.ebuild 4638 SHA256 c0f8968dab68ec2416d57d2f9c108c4b1d3022aa4a86b898b66464cfb40d4dd1 SHA512 f3752c8dd9d17dd4c63167017874bca10c89aaf212d25a4ca6e1af40c16040e07911fb9424e3ace8c36f97771fe900270b7fdb6c1770b470d5d59d1ed043b7ec WHIRLPOOL 950f86835caac5dea85057b262976fa7009d51be9bf6ae8ecfa2b32cd38c4a2cbb0db34c05dd565df399598fa76399608fc7301e32e60f62e3a0885b6d367621
EBUILD policycoreutils-2.4_rc5.ebuild 5545 SHA256 58d31584e99055cb2d8b79bdb79478b02113f965ea775c160fe6590917d29e49 SHA512 9ca53f582efeda5ee5c4a3a126cb662c1b1b382601cfc98b1de4116f26a7622438d988007a9474c847ab90205779ec7aa628848b89123e73e5a9d39b4631237b WHIRLPOOL 4e1942ad4fc80b33309173645901a75fc7e66fd4b5343f550583f596e631fdca5343155d40a9b483350935b4c9634fdea7c991e0447498768bb665c0456dd85c
+EBUILD policycoreutils-2.4_rc6-r1.ebuild 5638 SHA256 f3c8208165b991d2da5bf33636a7e974e549050564625ccc105c1ac7e8c7ea49 SHA512 d2c37e061f7420f0d36e2270d21b7976b3b38f5728d37faa561923bd03897045c2b10f3553e234a770800d766d8929e5f6c3cf695bebb1cc0ab03b9dba872e29 WHIRLPOOL 836d39966304c55d203b34bd72786566704658316ddd6a19a72c4fa3bb360f68eaaf91cb889c75682381ff598b84c04a18c696dd7b3c007bacabd6cb0d76f05a
EBUILD policycoreutils-2.4_rc6.ebuild 5545 SHA256 7e017aba8197f3c8e7774ff8f137c3b3bf64d8d85d417ee03a444929ffa27bd6 SHA512 9120dabad8c12a6af3862a5ee2fa564b3ec232a12d5449fe854e620f38abeb769c1db25c3a05dea3cf55ce2a305f58399bdb68d4947982e770b75adbc0cb7fe3 WHIRLPOOL e209082d76393122611b633e9b27f35825dd1cf07993cf7fd9684139831600cb3ab3884738981549d7920ea5ef3a88ed95b709c105a973a4887a644aa2a3d9d6
-MISC ChangeLog 24879 SHA256 f6d0f39a7ac066d5b933fadfdce6a4bf1710daec8b5649fc0c164f6eab341f32 SHA512 d6fd2434ff7c0c1c6f47b8cb3221d1298c86f30ced1efe8638bf192686ec0703cd550a13c59debccffa64d29f38a4c17899767967af25b64d808159a4d1d0f79 WHIRLPOOL 48cf85b0387a5edba258f02c72431c523dbfe416637b9dbad425d50f1fa1f12fd8932a9637f41dc7122b9dbab09c054eae6df999ccb3aa0fbce51e2d894660ac
+MISC ChangeLog 25139 SHA256 83fa21720537a120ddd3932103bcc2c4240e87a4c81f765eab115c24095f5b92 SHA512 266aa7bfa8478926b05fd4683bec0729dcf24b1ec1657060565208687ce348664a4abb515a49bd16eb1886351b529a3345863cae5c056840414bcfbdc6d491af WHIRLPOOL e883b44769f19b7312be97d09f292cb473a585ecdb3446ac0cb1d9a911e1fd3e08abc1a7d7a30a8623e427df93380cc773021c2bb0b4068af27576517a190ff6
MISC metadata.xml 971 SHA256 9d2157deddd1a457ff3d7b1232ec23e71367852b743ef6b4b8290349c3c9c698 SHA512 79fbbb6285a75f84fdd103ed704d62ede2695e7b8fe03f989ac4a065261a5e870675c1186173c1d4a65b88ac98f8bc2153146010513926e1a1b53efa52564a03 WHIRLPOOL eadde5fe3a3a2a71031d46f7e7c602f8069138914e62c44dff4be09afb8e23391a36d7c358a011722151437ee51be9f404ee1360a2d918078de3f783ff7e062f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQIcBAEBCAAGBQJUZlXvAAoJEC7dUkA7aK9Hy7UP/jLKbN4wTbXAMMJq8Mr+w9qT
-qlviij3d+E97DaoFZBWgGjyEI1FgDPrHGSCJssr6NEy+VTfpM4+TWb60mUKy4kN8
-b4WgmiX8kuC6zBPlNO6YPKQ18VC25IKNQVdpiUeEl7wexmFhWQumPSB7iMFtxHIv
-ZKdalXXyAWl+3BCms2TYOV7BhGVP8nZTPpCre3Dzk4/Q0+K8tOH8uU3/gBDk3HRO
-GLIMa8aGAbMtmQ5dqYDoPMLSPqU6crgkLeRnYMHlvW7aWVoWf8s4t3SR1ekThHqC
-PTQH3GyF5MVLVLkd7+sUqJwnBX4FrkJZBhOMiPOmM14N9+A75bQKcjND4UixvBt6
-bDtGv1b2nqPj+lVGArpBHh6aGJhSJi1iqH2ZpaBsiYO5QY7B3PU3fVCFmk/vduj9
-g5OOPi4dqXaYYVjPeRwSLq9mMvLREj33ZT7L+Ilkd2rF81nvrqJfXYYZeWZTVnkA
-cB+D2UuCVsiwElWgtdikS58JZDdCk1fBaLh60pgpSJtjsORCbHt5HAiq8cD3TNnR
-Af4O3CbxqQsajqBrv0FBcAeKfqeCoc6kaDZMTvMPv58qiy5Xh6sdQLpTUT5M4FjL
-FXGfNH7AFWE1+TTmwjhvTxa84+FmMffecwa9TerAtyk2lcnZQxy3j/76Pu1sNgMX
-r240IqidMMfxOXvVWJKA
-=JiMI
+iQJ8BAEBCABmBQJUcIjMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VuRkP/3m+zfc6TTX96ugc2Qzlf/pG
+jDvg+0wmd16RFJxle4TTySdBltp6eA78o5YNC0zARAiXtdqm5Beiakj9RmySIwTT
+f4FGg7DJoGP8SlMKgiw2i1GHMQVqNzzii2G4/d6s3kRh4Xnl3K71AOS2v6xar9c5
+byIQPvSDIxkbDYjPRnPcipYn/uGGas4HpGqQaNvC6hy51A4pnsQSSM2/TDrDHrSL
+LYzhBS24mrzK+s5zn3+2QkEHC7JuaOkbJ9F1AL68hgxNam95YaazasOoaQnnmIza
+1+VVU+GtPdHFKBT80V2WCy/qPOEA0SAaYdi6/+GWPyzUvyLZCsBnrkgxgdYhUQHG
+hRuaG8FIYbN7EfCmNcTAeUSTRHCkhq+7f1h34DM/ckSkLYlSJsjRjhl6m8h39Ke/
+VZaamJREed596/PEbvyfy3zdLul16+OnfjsFnvlhIV+6sYRHxuZs8wh+ANH7Ctml
+L0vmdhueWAMTBZvm3DMl0aX/81hyTcJU2XomsCtlM1ddaO3PhCSv91VBIAuCidXd
+LkSv06lR9/dZbw9SdfaWR5Vc2O2v6zzjRBE3Ymy/fQUBFXzF8deF2CxEfqocg+3m
+SHN/cHscJfN4OSTkIYNclq2dXO99V24uTYKO48S9zH+3DTMXTkpKXxKeP0fRmZ8B
+a7NxQXeR+zxG0MpDLDSU
+=cGXs
-----END PGP SIGNATURE-----
--- /dev/null
+From 7a09af2123bc0d86787ef82fc2ff43810f1712c0 Mon Sep 17 00:00:00 2001
+From: Steve Lawrence <slawrence@tresys.com>
+Date: Wed, 19 Nov 2014 11:21:42 -0500
+Subject: [PATCH 1/2] policycoreutils: pp: add roletype statements for both
+ declared and required type/typeattributes
+
+Currently, roletype statements are only added for types when they are
+declared (not required). This means that in policy like:
+
+ require {
+ type foo_t;
+ }
+ type bar_t;
+ role staff_r types foo_t, bar_t;
+
+only bar_t is associated with staff_r. This patch moves the code that
+generates roletype statements for types to outside the SCOPE_DECL check
+so that roletype statements are generated for all types, regardless of
+the required/declared scope. It further moves the code outside of the
+type/typeattribute flavor check so that roletype statements are also
+generated for typeattributes.
+
+Reported-by: Sven Vermeulen <sven.vermeulen@siphos.be>
+Signed-off-by: Steve Lawrence <slawrence@tresys.com>
+Reviewed-by: Yuli Khodorkovskiy <ykhodorkovskiy@tresys.com>
+Tested-by: Jason Zaman <jason@perfinion.com>
+---
+ policycoreutils/hll/pp/pp.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/policycoreutils/hll/pp/pp.c b/policycoreutils/hll/pp/pp.c
+index b1ef27f..4b9f310 100644
+--- a/policycoreutils/hll/pp/pp.c
++++ b/policycoreutils/hll/pp/pp.c
+@@ -2083,6 +2083,11 @@ static int type_to_cil(int indent, struct policydb *pdb, struct avrule_block *UN
+ cil_println(indent, "(typeattributeset " GEN_REQUIRE_ATTR " %s)", key);
+ }
+
++ rc = roletype_role_in_ancestor_to_cil(pdb, decl_stack, key, indent);
++ if (rc != 0) {
++ goto exit;
++ }
++
+ switch(type->flavor) {
+ case TYPE_TYPE:
+ if (scope == SCOPE_DECL) {
+@@ -2090,11 +2095,6 @@ static int type_to_cil(int indent, struct policydb *pdb, struct avrule_block *UN
+ // object_r is implicit in checkmodule, but not with CIL,
+ // create it as part of base
+ cil_println(indent, "(roletype " DEFAULT_OBJECT " %s)", key);
+-
+- rc = roletype_role_in_ancestor_to_cil(pdb, decl_stack, key, indent);
+- if (rc != 0) {
+- goto exit;
+- }
+ }
+
+ if (type->flags & TYPE_FLAGS_PERMISSIVE) {
+--
+2.0.4
+
--- /dev/null
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild,v 1.1 2014/11/22 12:59:49 perfinion Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit multilib python-r1 toolchain-funcs eutils
+
+MY_P="${P//_/-}"
+
+EXTRAS_VER="1.33"
+SEMNG_VER="2.4_rc6"
+SELNX_VER="2.4_rc6"
+SEPOL_VER="2.4_rc6"
+PATCHBUNDLE="4"
+
+IUSE="audit pam dbus"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz
+ mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
+ >=sys-libs/glibc-2.4
+ >=sys-libs/libcap-1.10-r10
+ >=sys-libs/libsemanage-${SEMNG_VER}[python]
+ sys-libs/libcap-ng
+ >=sys-libs/libsepol-${SEPOL_VER}
+ sys-devel/gettext
+ dev-python/ipy[${PYTHON_USEDEP}]
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ audit? ( >=sys-process/audit-1.5.1 )
+ pam? ( sys-libs/pam )
+ ${PYTHON_DEPS}"
+
+### libcgroup -> seunshare
+### dbus -> restorecond
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${COMMON_DEPS}
+ dev-python/sepolgen
+ app-misc/pax-utils"
+
+DEPEND="${COMMON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+S1="${WORKDIR}/${MY_P}"
+S2="${WORKDIR}/policycoreutils-extra"
+
+src_prepare() {
+ epatch "${FILESDIR}/0010-remove-sesandbox-support.patch"
+ epatch "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch"
+ epatch "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch"
+ epatch "${FILESDIR}/0040-reverse-access-check-in-run_init.patch"
+ epatch "${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch"
+ epatch "${FILESDIR}/0110-build-mcstrans-bug-472912.patch"
+ epatch "${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch"
+ epatch "${FILESDIR}/0001-policycoreutils-pp-add-roletype-statements-for-both-.patch"
+
+ # rlpkg is more useful than fixfiles
+ sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+ || die "fixfiles sed 1 failed"
+ sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+ || die "fixfiles sed 2 failed"
+
+ epatch_user
+
+ python_copy_sources
+ # Our extra code is outside the regular directory, so set it to the extra
+ # directory. We really should optimize this as it is ugly, but the extra
+ # code is needed for Gentoo at the same time that policycoreutils is present
+ # (so we cannot use an additional package for now).
+ S="${S2}"
+ python_copy_sources
+}
+
+src_compile() {
+ local use_audit="n";
+ local use_pam="n";
+ local use_dbus="n";
+ local use_sesandbox="n";
+
+ use audit && use_audit="y";
+ use pam && use_pam="y";
+ use dbus && use_dbus="y";
+
+ building() {
+ emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
+ }
+ S="${S1}" # Regular policycoreutils
+ python_foreach_impl building
+ S="${S2}" # Extra set
+ python_foreach_impl building
+}
+
+src_install() {
+ local use_audit="n";
+ local use_pam="n";
+ local use_dbus="n";
+ local use_sesandbox="n";
+
+ use audit && use_audit="y";
+ use pam && use_pam="y";
+ use dbus && use_dbus="y";
+
+ # Python scripts are present in many places. There are no extension modules.
+ installation-policycoreutils() {
+ einfo "Installing policycoreutils"
+ emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
+ }
+
+ installation-extras() {
+ einfo "Installing policycoreutils-extra"
+ emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+ }
+
+ S="${S1}" # policycoreutils
+ python_foreach_impl installation-policycoreutils
+ S="${S2}" # extras
+ python_foreach_impl installation-extras
+ S="${S1}" # back for later
+
+ # remove redhat-style init script
+ rm -fR "${D}/etc/rc.d"
+
+ # compatibility symlinks
+ dosym /sbin/setfiles /usr/sbin/setfiles
+ dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
+
+ # location for permissive definitions
+ dodir /var/lib/selinux
+ keepdir /var/lib/selinux
+
+ # Set version-specific scripts
+ for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+ python_replicate_script "${ED}/usr/bin/${pyscript}"
+ done
+ for pyscript in semanage rlpkg; do
+ python_replicate_script "${ED}/usr/sbin/${pyscript}"
+ done
+
+ dodir /usr/share/doc/${PF}/mcstrans/examples
+ cp -dR "${S1}"/mcstrans/share/examples/* "${D}/usr/share/doc/${PF}/mcstrans/examples"
+}
+
+pkg_postinst() {
+ # The selinux_gentoo init script is no longer needed with recent OpenRC
+ elog "The selinux_gentoo init script will be removed in future versions when OpenRC 0.13.x is stabilized."
+
+ # Migrate the SELinux semanage configuration store if not done already
+ local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' /etc/selinux/config);
+ if [ -n "${selinuxtype}" ] && [ ! -d /var/lib/selinux/${mcs}/active ] ; then
+ ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
+ ewarn "from /etc/selinux to /var/lib/selinux. In order to continue with"
+ ewarn "the 2.4 userspace, please migrate the necessary files by executing"
+ ewarn "/usr/libexec/selinux/semanage_migrate_store. Warnings about 'else'"
+ ewarn "blocks can be safely ignored."
+ ewarn "For more information, please see"
+ ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
+ fi
+}