From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- sys-apps/policycoreutils/Manifest | 3 +- .../policycoreutils/policycoreutils-3.1-r2.ebuild | 168 +++++++++++++++++++++ .../policycoreutils/policycoreutils-9999.ebuild | 21 +-- 3 files changed, 175 insertions(+), 17 deletions(-) create mode 100644 sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild (limited to 'sys-apps/policycoreutils') diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest index d998a4691223..c8e7627d56cb 100644 --- a/sys-apps/policycoreutils/Manifest +++ b/sys-apps/policycoreutils/Manifest @@ -3,5 +3,6 @@ AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b12 DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd6401c9e923d2c775c7c8c47f0e803749feaec4247fec5cc1cb766314954402fd2506370bb397f746437ecfcf65b384f3 SHA512 0592f218563a99ba95d2cfd07fdc3761b61c1cc3c01a17ab89ad840169e1a7d4083521d5cacc72d1b76911d516bf592db7a3f90d9ef0cc11ceed007e4580e140 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f EBUILD policycoreutils-3.1-r1.ebuild 4857 BLAKE2B bd3811ab4897547498d1677b5c0071ed6a9f1f2cdae234e4ef697151bad616ff828319d067621601f310ede0f787bcccb831c7220888bfa32fba13bd7221f00d SHA512 1584f7f965ad31095697843ee3a289681cb8175c3c74a582ace11a61431d8972b44677587c5974c1b3caa951dbd952420cb121e9ac45f6ce4807c49b4929cf45 -EBUILD policycoreutils-9999.ebuild 4859 BLAKE2B ca6828493673752d5a0f733839ebbc270f0f5e35a383039802fa4b987de3807cabadf182c97f1056ced86967cd7bcd14ba765dde5d8ade37bdd81dca72eae955 SHA512 71cab653be4b00dd20b48795a7b8148bf2880746b2b0f306f9cbaf79a479b662d091c7ee6db319432600e0742878f37f2fa231e7e2d96aca78d4f9d5600b01e8 +EBUILD policycoreutils-3.1-r2.ebuild 4625 BLAKE2B 21e9658912e3996caa16b11833909d337c68cb6e78cccd9d154985a1e2a915493ba604023c538e9fc022f911471318f16165983870e2c4e184629e2123ec6bb1 SHA512 de4528068c83761659312ad6ac5830c21c0443f8b2f74c8fcd7fb30730599bd6f465f33ce4f2dd7312993929da589927728c8edc7957fdeb2d9b1583e9e7f8ec +EBUILD policycoreutils-9999.ebuild 4614 BLAKE2B ea3709d27dfc3201d8176677ec5acf04802400fcdff1d98d733da1aead14ec872e5bbc753e9eab29c7b0ba7cce6521a3f57680b0a31570ed513c512e0ae26651 SHA512 f67e386d1adc6ac69739285b0c99012a80e74fb374d3d0ee078760e24bf76b9d6f27b0c7fb4d64edeb5c433795619850b744304e00a977343f0e5440a597652c MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5 diff --git a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild new file mode 100644 index 000000000000..d93a1a536362 --- /dev/null +++ b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) +PYTHON_REQ_USE="xml" + +inherit multilib python-r1 toolchain-funcs bash-completion-r1 + +MY_P="${P//_/-}" + +MY_RELEASEDATE="20200710" +EXTRAS_VER="1.37" +SEMNG_VER="${PV}" +SELNX_VER="${PV}" +SEPOL_VER="${PV}" + +IUSE="audit pam split-usr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DESCRIPTION="SELinux core utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" + S1="${WORKDIR}/${MY_P}/${PN}" + S2="${WORKDIR}/policycoreutils-extra" + S="${S1}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz + https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" + KEYWORDS="~amd64 ~arm64 ~mips ~x86" + S1="${WORKDIR}/${MY_P}" + S2="${WORKDIR}/policycoreutils-extra" + S="${S1}" +fi + +LICENSE="GPL-2" +SLOT="0" + +DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] + >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}] + >=sys-libs/libsepol-${SEPOL_VER}:= + sys-libs/libcap-ng:= + >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] + audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] ) + pam? ( sys-libs/pam:= ) + ${PYTHON_DEPS}" + +# Avoid dependency loop in the cross-compile case, bug #755173 +# (Still exists in native) +BDEPEND="sys-devel/gettext" + +# pax-utils for scanelf used by rlpkg +RDEPEND="${DEPEND} + app-misc/pax-utils" + +PDEPEND="sys-apps/semodule-utils + sys-apps/selinux-python" + +src_unpack() { + # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds + default + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + fi +} + +src_prepare() { + S="${S1}" + cd "${S}" || die "Failed to switch to ${S}" + if [[ ${PV} != 9999 ]] ; then + # If needed for live ebuilds please use /etc/portage/patches + eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch" + fi + + # 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" + + eapply_user + + sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror" + + 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 y n)" \ + PAMH="$(usex pam y n)" \ + SESANDBOX="n" \ + CC="$(tc-getCC)" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" + } + 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}" \ + AUDIT_LOG_PRIVS="y" \ + AUDITH="$(usex audit y n)" \ + PAMH="$(usex pam y n)" \ + SESANDBOX="n" \ + CC="$(tc-getCC)" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + install + python_optimize + } + + installation-extras() { + einfo "Installing policycoreutils-extra" + emake -C "${BUILD_DIR}" \ + DESTDIR="${D}" \ + 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" || die + + # compatibility symlinks + use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + + bashcomp_alias setsebool getsebool + + # location for policy definitions + dodir /var/lib/selinux + keepdir /var/lib/selinux + + # Set version-specific scripts + for pyscript in rlpkg; do + python_replicate_script "${ED}/usr/sbin/${pyscript}" + done +} + +pkg_postinst() { + for POLICY_TYPE in ${POLICY_TYPES} ; do + # There have been some changes to the policy store, rebuilding now. + # https://marc.info/?l=selinux&m=143757277819717&w=2 + einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)." + semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" + done +} diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild index 8f15a3bee236..aed7968c418f 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) PYTHON_REQ_USE="xml" inherit multilib python-r1 toolchain-funcs bash-completion-r1 @@ -15,7 +15,7 @@ SEMNG_VER="${PV}" SELNX_VER="${PV}" SEPOL_VER="${PV}" -IUSE="audit dbus pam split-usr" +IUSE="audit pam split-usr" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DESCRIPTION="SELinux core utilities" @@ -41,16 +41,10 @@ LICENSE="GPL-2" SLOT="0" DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] - >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}] - sys-libs/libcap-ng:= >=sys-libs/libsepol-${SEPOL_VER}:= + sys-libs/libcap-ng:= >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] - dev-python/ipy[${PYTHON_USEDEP}] - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib:= - ) audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] ) pam? ( sys-libs/pam:= ) ${PYTHON_DEPS}" @@ -59,9 +53,6 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] # (Still exists in native) BDEPEND="sys-devel/gettext" -### libcgroup -> seunshare -### dbus -> restorecond - # pax-utils for scanelf used by rlpkg RDEPEND="${DEPEND} app-misc/pax-utils" @@ -110,7 +101,6 @@ src_compile() { AUDIT_LOG_PRIVS="y" \ AUDITH="$(usex audit y n)" \ PAMH="$(usex pam y n)" \ - INOTIFYH="$(usex dbus y n)" \ SESANDBOX="n" \ CC="$(tc-getCC)" \ LIBDIR="\$(PREFIX)/$(get_libdir)" @@ -129,7 +119,6 @@ src_install() { AUDIT_LOG_PRIVS="y" \ AUDITH="$(usex audit y n)" \ PAMH="$(usex pam y n)" \ - INOTIFYH="$(usex dbus y n)" \ SESANDBOX="n" \ CC="$(tc-getCC)" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ -- cgit v1.2.3