From 8f989f249c98af56cf32808681c46b11d1a6f89d Mon Sep 17 00:00:00 2001 From: Jason Zaman Date: Wed, 4 Feb 2015 17:48:42 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x7EF137EC935B0EAF --- sys-apps/policycoreutils/ChangeLog | 9 +- sys-apps/policycoreutils/Manifest | 32 ++-- .../policycoreutils-2.4.ebuild | 151 ++++++++++++++++++ 3 files changed, 175 insertions(+), 17 deletions(-) create mode 100644 sys-apps/policycoreutils/policycoreutils-2.4.ebuild diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog index 76db39aec345..053857b2187f 100644 --- a/sys-apps/policycoreutils/ChangeLog +++ b/sys-apps/policycoreutils/ChangeLog @@ -1,6 +1,11 @@ # 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.147 2014/12/06 23:28:23 perfinion Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.148 2015/02/04 17:48:40 perfinion Exp $ + +*policycoreutils-2.4 (04 Feb 2015) + + 04 Feb 2015; Jason Zaman +policycoreutils-2.4.ebuild: + Version bump *policycoreutils-2.4_rc7 (06 Dec 2014) *policycoreutils-2.3-r3 (06 Dec 2014) diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest index 1d4253ae0565..15e7895040ea 100644 --- a/sys-apps/policycoreutils/Manifest +++ b/sys-apps/policycoreutils/Manifest @@ -15,31 +15,33 @@ DIST policycoreutils-2.2.5.tar.gz 4948944 SHA256 bbf850a8c3c2f371f439d6525663eec DIST policycoreutils-2.3.tar.gz 4984980 SHA256 864cfaee58b5d2f15b140c354e59666e57143293c89f2b2e85bc0d0e4beefcd2 SHA512 3256849d13856ec47ac85470632a57e26952c5dafffb51df4eb8e32467196ff3ef725cc582798727fe45fd6284c1893d12eae2c89088ae1758ad39faec385659 WHIRLPOOL 1dd9bfd67ebb744b8c47144966f09d8361e9018e8d941355080c274b9ac891c18eb95771f3dc8b136683224bc5f12f3fb58fa00666b5815d65e7141c31d9293d DIST policycoreutils-2.4-rc6.tar.gz 5004643 SHA256 192efeee0e4f83c2aca59b53e7b4b40bb4b5980d9dcf95b17b544e244a038316 SHA512 4530f5b138ea30c2d3f033bad70fb31be54957b83742cea587c76756010669011c862c9c4090d52ea8ba9f3ed9a3e31cf6ac306355cfb12dccb4aea576a758d1 WHIRLPOOL efef6bf91d04a0c07091e4a538c23d1e11cb60e593592519b9cd880d6df4a98b7eb1ae13ba671a879cc7a1cc6460829f8b99665663cb04f9c62d6def0cb51716 DIST policycoreutils-2.4-rc7.tar.gz 5004811 SHA256 2842f089b0c407e7e691a8bc2105563c4f32d68b74be07fd6451c825ab09b086 SHA512 b16240fd256ac1e89640c80f448feddfd327772d985ecb3daeee93e250b2925dda9f40b7136d392b43a9a5aed712c757d48fd646cc81a35c7a5f53b2f084a498 WHIRLPOOL 58f3ea5cfc93bf1cb7e17344042ea6d5bc48e421e0e1ddb0fe59c52405f08fb75692423104234068471ee4d98427d07e3a298ff9e40bb596067823f4fa718604 +DIST policycoreutils-2.4.tar.gz 5004280 SHA256 b819f876f12473783ccce9f63b9a79cd77177477cd6d46818441f808cc4c3479 SHA512 0eb0ea569c1699ed78e5e9798d9f182b3a8bfa6dcd387bcc78923755b3a1cad982673db88857745154d3769d44402b87e52d5fe3024874001f61f783aa25cce6 WHIRLPOOL d101080973ef6248617b5bca9d8b76e59008061b3411aec4ed95343af09b941a34acb3bb0001da5468595c4c37684ab6f34204e18ccb3cbbd5b3d31df0cb5e7f DIST policycoreutils-extra-1.31.tar.bz2 16080 SHA256 ad0a78d96fd01aa51fe774e1701bd23934cd72182b2bad68112006f0ea17cc7b SHA512 520f93f1a2ce3c60a1d192b09cb9a968d207fbc6ab1f01861be95a50b65264f706335620ccbca48ce38f81581a4cf5128e5db9e5b0564460c9f05f04038abfba WHIRLPOOL 56e713b9bd8f1af1496f383f45f1ef8d373b3f45148237bfd28c016f4becaa87d932b363d165b46c657ea3a08503e7bc60b1c5a5a2a814a659770bedf33d4202 DIST policycoreutils-extra-1.33.tar.bz2 16191 SHA256 743c3930277102f5545907314b21e98955e88be7972e30264c6cb5dca370b788 SHA512 3f6f19ae33d5b1043f2979fb3e79bc061767f7051cbd0981e5c5663b4391fa29544b2184b384c9fce7b4100623bc776748d77a01865dcee78b0756d73ee10886 WHIRLPOOL e74b9c3a6dff563b81bf3ce85119fbdfc658191ac063763f2916a7dcd90584f98cbccd1d6cd5ef3aecb00366a82c949c62ab9b907cb98800cb53d3e9ab63b492 EBUILD policycoreutils-2.2.5-r4.ebuild 4708 SHA256 2287c153ef9ce72a15e1fb0d681942c79c26393dfa00436b414389334606b5e4 SHA512 d69a0cd51e9e995f59535e6e72a3e62d4a5e3f75aeb8a98f9e6dd6ce7f02b4ca19d479395bcfccdeba7b932c484bc90308a3f563d621c0f3f626c4aa5b927c5a WHIRLPOOL c34a44c55bc221274f3f19e8f72fbf1d649b16978d6d080ff66ba47185b0bc7e069431a818ebce1fd23ef590f656fa23e86ebef42bca870050ff2a792bf20072 EBUILD policycoreutils-2.3-r2.ebuild 4348 SHA256 46b1814453fef44d27a90c818d4948e5a448967b5b3305f71017da9788ff18ea SHA512 8ac7acafb331a746ef03bfb016b098425cd0c6f25fb02b20c79f22d4f82a97cdd4c272f27a289a0172b375002a6a3bc3f1f4e4b2f27d6fba52a7bc26819ff8fd WHIRLPOOL 41bd78021c5ac52e4778d5b0648c8af6f5e40298d71446486e2b1ed5da9183c4b8b337850b59f1a275823c536b4eb22800dacfaf656911a5288d61ae65d35d29 EBUILD policycoreutils-2.3-r3.ebuild 4390 SHA256 25dabdf0479eabeb1a3533596a7f6543e1429a98ff6076794a9c063de9364338 SHA512 7f81c1f4cd7de9dfd034b5050d6a6caa49703e7116297a68cf2ed5fd730b0bde235e8c4240eb762e190c3ab5fe6ce47dc68615979b12a465e56a415ac467ac0d WHIRLPOOL 122e8073ba02deb3edf0aa7c78ce9f87463114ed6efc40b5585facbd8a0de086a6d190b0953a09c6b1c4903ef3d3bb4b03f8b25b6903505c890a072a3c6a7ef6 +EBUILD policycoreutils-2.4.ebuild 5129 SHA256 21ff11675b8398a3a6612f71eb9ded2a134583e0d6a008a4e7d61407a2695589 SHA512 a0acb6911ce1f69bf421dd621e683aa28f6be82cd928367d11fb060e4f7fc1c57a8897b08c7bb760f66654af1e83cddf10f1fd04864dc9ca1f70c7e293d4d74c WHIRLPOOL 1a4cb5a000e0227cdd1f23b26e97ba548024ae6ebdf2526432fdf8c7bf5c354fe2cb7fafbb6fdb9d6e60fdbe2cd64f1e6d7646a060e2e8b5fc4c322f7e6279e9 EBUILD policycoreutils-2.4_rc6-r1.ebuild 5658 SHA256 d1e1140248b4b7946b55ab3fc5155d92fc7b02212dca63a98bf25616a59a98d0 SHA512 8a2bc4e2a7ac90b6a5874d54c70e354e324f868984b46e38858da75a32b98b8602b62455f0d23b188ae3130be258052606989dfaf25c7a18c8ec2396ee2fa276 WHIRLPOOL 94554fef9e727d9c6b2485d2681212199dd374f4a64371c604f096988874c862c98b9ea461c0e87c5d6dd5db52f70d8a0610240b564549b756381765199fea73 EBUILD policycoreutils-2.4_rc7.ebuild 5126 SHA256 9e21cd374e5580060128f7aa9ad7419759c43c253789e2ac051d86758c0ab94d SHA512 0734b373f7b52eb7ec27a940203c9dff21b3aa95a2c13f4686b638a42c67925dcc92a63e655480359bd53ea85e5f956d64568d686d87bc9e1999a324279af828 WHIRLPOOL f053ec1d1a5a7e48afc127d207227c1dfdb8c839067b2c4bad8fd188b9156600cf954b8a5b42a6c359f8c035624d4c6863fd8b1653261fca60ea2fe882a2c6c4 -MISC ChangeLog 25640 SHA256 53458156f91df7dad3ea43f8a9615ae5946ae0a30a2650b440a27264950cf3a9 SHA512 b86042ae46c2359c73e5f792582a81545f22589d54ffc184bca09b5238ca4d2fe860f56d96b14b02b40aeab63f501d79983fdd337cace8cbb01ab36577ed3791 WHIRLPOOL 7dde275705460c9364959d200f7a055438ce97391ea297472ce717a4685c335703bd4fe3997fe2515bd4fcb6116d873ee67fa997b69aab746d0a874e68c73ce5 +MISC ChangeLog 25771 SHA256 27f2dd6daae36385080a33b51e7caed9cece42b571531b7fa72801cf2ad65dfa SHA512 1e9b748809e1b05c0e4b92aa0828af36efcb90770273e931b689ea246ad72455bc98c294e7c0985505cb01f051c2f695420e6d98f693df806490d172ffa559a0 WHIRLPOOL 4419609ed6adf0e5d2c821ab7a93d4573215675307af4ce1215e91b1146f23a1fd54cc73d9aeb4df814976499df694610cfb46f3d7f74d698478392823226a58 MISC metadata.xml 971 SHA256 9d2157deddd1a457ff3d7b1232ec23e71367852b743ef6b4b8290349c3c9c698 SHA512 79fbbb6285a75f84fdd103ed704d62ede2695e7b8fe03f989ac4a065261a5e870675c1186173c1d4a65b88ac98f8bc2153146010513926e1a1b53efa52564a03 WHIRLPOOL eadde5fe3a3a2a71031d46f7e7c602f8069138914e62c44dff4be09afb8e23391a36d7c358a011722151437ee51be9f404ee1360a2d918078de3f783ff7e062f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUg5EZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJU0lt5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky -QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VvIoP/RasBdeuDZTlha3MGDh1jjf9 -s3a9LOEakWf/8+mYfQTJfzq23490PUiL7/C0n/iOmo+JWFI5DveeVC7PGc7Ih+Yt -pmxPsFiy2w8gL8RJIo3CgIa7YpBLONJBvcNLzrDkPCeB8xYK4iYef5lvPdKDNXqe -dqwnawOp6W4okWNEOIJmN5jOgGZqJDOwjoBhD/0roaxV2mU9cQNPUzbzdoT1klvg -inscylutmpGq/y+cbJJyD1el07q4Rsfskho8FTOIfSGEVGMeA5xgVI8VaWovPvZR -eI5baMon5pkHGx2T4wjW2+KVg5cFWgbljOuw30y6+l34NqrLiR8w1Q9x8J82WKAZ -apHqOf64FlXso9oAdU3Kd3sdPsoKbAoYoNSUzYsxKfQ8o4oRAwphwx5DL8wvltUq -6bZpyQ2ogSMRm7gHKDBdDLHgH+MplD6WEOtTo/7eywp9B9jENyvyq1DhxBtg8pkR -728LnEiVaI5NUNbVTlYWqoFHU3XEri5TiiJyoq0jozpCWuxiHzwXQBZu1Dw9LBXx -pDFI/fcKrHZ0rBR7WNupNhOvz0SZjdSJ6tp17nyTMAbwBHFPYhlIFXhjbbPuEOun -YRf8Yxgv123+KNsII5WgXogBYYxmZInu2/Zcr7UDlR/VcgnYp0lIl+oFJvZyq0Qk -Dn+wILBW+mEX+/RPUXjt -=zEyI +QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VeggQAJEt5AmZDRSp/W1JpwpAQCIN +9WRdaUGCjAHZIijEcij/r952pI6KLCIXqIfAvisVETWjs9fInQljUp9zfcYF2Vpf +7MIgPS8RlIyzcK5IbdA72Mb2Spr82zMAKf6XhU7ybLV82tjY7YXiEJdpOPIL3psh +A8HjbxVdNhUzyemWuhAZfvcocfPgySPn3+5bXaaQlhDLAZTwD5Gk+Q6wS8t9qgOI +37Jmb9Rqre2sSVBg5Z6T36BpbTqyts5uY9R0FL0XiOUhnOMnaPu9Uqyd03WQ/rXO +nXUCkM3J1FCSkwik5aUzUyNHhSu5/WGKroLfMl6in0KBIVScTQnFzNGu3MrWBKKb +c7DpS1NrLO5GIr94nzfRW58IXHMwSyesF0tcTox3Qi2FeHy0DkehQhFLrBDCUUaA +DhKZWedjLPiESLIx+Ddyf2h7J23Nfl47aowoidD/qTHg1+iFjIGuFrOZrzj6hmyf +JAUQrUGj9pwp2RGg8z6RqGLTMK7Q0tNhV8TY8xPJX3FfGA5BpWXFBTjQ68pmHw24 +kMccC/Jd6fX5/SHYrefF4MTdL+op99vUGmirdOF9/31sGbwkd4JwlzrJ6ZlL1/w2 +eF59GyyZbq/t6XOfVR3qLqse+m0J7UGDKGoO2lyVxu0z7Lgc7nSv7md6tsbmZQ0w +Oz1EyQ+hPzeqy1h1g/UT +=5LSh -----END PGP SIGNATURE----- diff --git a/sys-apps/policycoreutils/policycoreutils-2.4.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4.ebuild new file mode 100644 index 000000000000..fe24e86078ee --- /dev/null +++ b/sys-apps/policycoreutils/policycoreutils-2.4.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4.ebuild,v 1.1 2015/02/04 17:48:40 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="${PV}" +SELNX_VER="${PV}" +SEPOL_VER="${PV}" + +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/20150202/${MY_P}.tar.gz + mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=">=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="${DEPEND} + dev-python/sepolgen + app-misc/pax-utils" + +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" + + # 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() { + building() { + emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="$(usex audit)" PAMH="$(usex pam)" INOTIFYH="$(usex dbus)" SESANDBOX="n" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" + } + S="${S1}" # Regular policycoreutils + python_foreach_impl building + S="${S2}" # Extra set + python_foreach_impl building +} + +src_install() { + # Python scripts are present in many places. There are no extension modules. + installation-policycoreutils() { + einfo "Installing policycoreutils" + emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="$(usex audit)" PAMH="$(usex pam)" INOTIFYH="$(usex dbus)" SESANDBOX="n" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install + python_optimize + } + + installation-extras() { + einfo "Installing policycoreutils-extra" + emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="$(usex dbus)" SHLIBDIR="${D}$(get_libdir)/rc" install + python_optimize + } + + 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 policy 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 since it is not needed with OpenRC 0.13." + + # 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 +} -- 2.26.2