diff options
Diffstat (limited to 'sys-apps/policycoreutils')
-rw-r--r-- | sys-apps/policycoreutils/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch | 13 | ||||
-rw-r--r-- | sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch | 11 | ||||
-rw-r--r-- | sys-apps/policycoreutils/metadata.xml | 2 | ||||
-rw-r--r-- | sys-apps/policycoreutils/policycoreutils-3.5.ebuild (renamed from sys-apps/policycoreutils/policycoreutils-2.9.ebuild) | 70 | ||||
-rw-r--r-- | sys-apps/policycoreutils/policycoreutils-3.6.ebuild (renamed from sys-apps/policycoreutils/policycoreutils-2.8-r1.ebuild) | 72 | ||||
-rw-r--r-- | sys-apps/policycoreutils/policycoreutils-9999.ebuild | 72 |
7 files changed, 107 insertions, 139 deletions
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest index 13349b63e593..6983b77d03e7 100644 --- a/sys-apps/policycoreutils/Manifest +++ b/sys-apps/policycoreutils/Manifest @@ -1,3 +1,3 @@ -DIST policycoreutils-2.8.tar.gz 2796775 BLAKE2B 36115cc2faf72a4b647312f8faaf4762d7f2fb56bf0531ccadeb46b100c9e577f3148fe6890925d3fed94ac22803dc61729781e54bd0ddeb1539ccce2ec2a29b SHA512 2b4a70836fd8727a16b8f8d4afcc39c9461ab6f5bc1ba5ce5833d41150da921ebb3c9bdbd1cfa7dd31fd382ba18b5433ca9b63bce58bd290db81fa9bedfe29f3 -DIST policycoreutils-2.9.tar.gz 2819360 BLAKE2B b0af912e3b4fb2c9598b10ce413c8ffb3f5972a4d5d59270cff40abe8d4e385e0664e24a4f533a95ad2d1657644f3368213f955ac63d9f8c46a661417b07c8b3 SHA512 d8356115671ba66de05f1c13193ab47fab69cc4d09603a92171ed40afafc084dd191591bf336b7d722de637378ad09622ebb6eca85c06063ca9ddd6db10e02a2 -DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3 +DIST policycoreutils-3.5.tar.gz 775639 BLAKE2B 777b8564484e89385db7a184c4cad9a99aabf1fd1ac41abd5826c7e6ad29118ae9d6f0d0fd968b6ced87f2f04bc6d7cd207b67428151522915367f656fb8d3f8 SHA512 7978ef6b7a278c6384c9b397734d03c4932c8aefecceaa1e6a1345be27b253dbe276fdcd219ce83ad732c6ed55d53bbc3254e39bccadd67d2cd1152a14749444 +DIST policycoreutils-3.6.tar.gz 755682 BLAKE2B a8b180c8006989192d152651dcfa51856956780bfe1139cc1dc0162eb66ba1eef4f7d64f68a48479572b02e2e97a68c7082722a745d22a9453e8378373319e3c SHA512 e1f32e6e0310b879a5aadab157b103314a61bf3b8fd59c1212d701fbf39900e3b9a0b727338988103d784a7e505355a871ba519dd91520b135a3b9dae40bf1b0 +DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f diff --git a/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch b/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch deleted file mode 100644 index 6049bbe282af..000000000000 --- a/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/policycoreutils/newrole/Makefile b/policycoreutils/newrole/Makefile -index bdefbb8..9cff135 100644 ---- policycoreutils/newrole/Makefile -+++ policycoreutils/newrole/Makefile -@@ -49,7 +49,7 @@ ifeq ($(NAMESPACE_PRIV),y) - IS_SUID=y - endif - ifeq ($(IS_SUID),y) -- MODE := 4555 -+ MODE := 0555 - override LDLIBS += -lcap-ng - else - MODE := 0555 diff --git a/sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch b/sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch new file mode 100644 index 000000000000..360a49049780 --- /dev/null +++ b/sys-apps/policycoreutils/files/policycoreutils-3.1-0001-newrole-not-suid.patch @@ -0,0 +1,11 @@ +--- a/newrole/Makefile ++++ b/newrole/Makefile +@@ -50,7 +50,7 @@ ifeq ($(NAMESPACE_PRIV),y) + IS_SUID=y + endif + ifeq ($(IS_SUID),y) +- MODE := 4555 ++ MODE := 0555 + override LDLIBS += -lcap-ng + else + MODE := 0555 diff --git a/sys-apps/policycoreutils/metadata.xml b/sys-apps/policycoreutils/metadata.xml index 16effc34b8ee..4d3c72d81d48 100644 --- a/sys-apps/policycoreutils/metadata.xml +++ b/sys-apps/policycoreutils/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>selinux@gentoo.org</email> diff --git a/sys-apps/policycoreutils/policycoreutils-2.9.ebuild b/sys-apps/policycoreutils/policycoreutils-3.5.ebuild index 6b80ee68ca73..5d45077b38c6 100644 --- a/sys-apps/policycoreutils/policycoreutils-2.9.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-3.5.ebuild @@ -1,22 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python{3_5,3_6} ) -PYTHON_REQ_USE="xml" +EAPI="7" +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" inherit multilib python-r1 toolchain-funcs bash-completion-r1 -MY_P="${P//_/-}" - -MY_RELEASEDATE="20190315" -EXTRAS_VER="1.36" -SEMNG_VER="${PV}" -SELNX_VER="${PV}" -SEPOL_VER="${PV}" - -IUSE="audit pam dbus" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" +EXTRAS_VER="1.37" DESCRIPTION="SELinux core utilities" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -25,13 +18,13 @@ 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}" + S1="${WORKDIR}/${P}/${PN}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" - KEYWORDS="amd64 ~arm64 ~mips x86" + KEYWORDS="amd64 arm arm64 ~mips x86" S1="${WORKDIR}/${MY_P}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" @@ -39,32 +32,25 @@ fi LICENSE="GPL-2" SLOT="0" +IUSE="audit pam split-usr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] - >=sys-libs/libcap-1.10-r10:= - >=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}] +DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}] + >=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}] + >=sys-libs/libsepol-${PV}:= sys-libs/libcap-ng:= - >=sys-libs/libsepol-${SEPOL_VER}:= >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] - sys-devel/gettext - 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} - !<sec-policy/selinux-base-policy-2.20151208-r6" -# 2.20151208-r6 and higher has support for new setfiles + ${PYTHON_DEPS}" -### libcgroup -> seunshare -### dbus -> restorecond +# 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 - !<sys-apps/openrc-0.14" + app-misc/pax-utils" PDEPEND="sys-apps/semodule-utils sys-apps/selinux-python" @@ -82,7 +68,7 @@ src_prepare() { 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-2.7-0001-newrole-not-suid.patch" + eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch" fi # rlpkg is more useful than fixfiles @@ -110,7 +96,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 +114,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)" \ @@ -155,7 +139,13 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - dosym /sbin/setfiles /usr/sbin/setfiles + if use split-usr; then + dosym ../../sbin/setfiles /usr/sbin/setfiles + else + # remove sestatus symlink + rm -f "${D}"/usr/sbin/sestatus || die + fi + bashcomp_alias setsebool getsebool # location for policy definitions @@ -172,7 +162,7 @@ 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}" + einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)." + semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" done } diff --git a/sys-apps/policycoreutils/policycoreutils-2.8-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-3.6.ebuild index e34dd69e7451..b8f8898a9128 100644 --- a/sys-apps/policycoreutils/policycoreutils-2.8-r1.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-3.6.ebuild @@ -1,22 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python{3_5,3_6} ) -PYTHON_REQ_USE="xml" +EAPI="7" +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" -inherit multilib python-r1 toolchain-funcs bash-completion-r1 +inherit python-r1 toolchain-funcs bash-completion-r1 -MY_P="${P//_/-}" - -MY_RELEASEDATE="20180524" -EXTRAS_VER="1.36" -SEMNG_VER="${PV}" -SELNX_VER="${PV}" -SEPOL_VER="${PV}" - -IUSE="audit pam dbus" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" +EXTRAS_VER="1.37" DESCRIPTION="SELinux core utilities" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -25,13 +18,13 @@ 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}" + S1="${WORKDIR}/${P}/${PN}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" else - SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" - KEYWORDS="amd64 ~arm64 ~mips x86" + KEYWORDS="amd64 arm arm64 ~mips x86" S1="${WORKDIR}/${MY_P}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" @@ -39,32 +32,25 @@ fi LICENSE="GPL-2" SLOT="0" +IUSE="audit pam split-usr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] - >=sys-libs/libcap-1.10-r10:= - >=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}] +DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}] + >=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}] + >=sys-libs/libsepol-${PV}:= sys-libs/libcap-ng:= - >=sys-libs/libsepol-${SEPOL_VER}:= >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] - sys-devel/gettext - 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} - !<sec-policy/selinux-base-policy-2.20151208-r6" -# 2.20151208-r6 and higher has support for new setfiles + ${PYTHON_DEPS}" -### libcgroup -> seunshare -### dbus -> restorecond +# 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 - !<sys-apps/openrc-0.14" + app-misc/pax-utils" PDEPEND="sys-apps/semodule-utils sys-apps/selinux-python" @@ -82,7 +68,7 @@ src_prepare() { 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-2.7-0001-newrole-not-suid.patch" + eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch" fi # rlpkg is more useful than fixfiles @@ -110,7 +96,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 +114,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)" \ @@ -155,7 +139,13 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - dosym /sbin/setfiles /usr/sbin/setfiles + if use split-usr; then + dosym ../../sbin/setfiles /usr/sbin/setfiles + else + # remove sestatus symlink + rm -f "${D}"/usr/sbin/sestatus || die + fi + bashcomp_alias setsebool getsebool # location for policy definitions @@ -172,7 +162,7 @@ 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}" + einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)." + semodule -p "${ROOT:-/}" -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 463a7f498dc8..7ac02d3d3f39 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild @@ -1,22 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python{3_5,3_6} ) -PYTHON_REQ_USE="xml" +EAPI="7" +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" -inherit multilib python-r1 toolchain-funcs bash-completion-r1 +inherit python-r1 toolchain-funcs bash-completion-r1 -MY_P="${P//_/-}" - -MY_RELEASEDATE="20190315" -EXTRAS_VER="1.36" -SEMNG_VER="${PV}" -SELNX_VER="${PV}" -SEPOL_VER="${PV}" - -IUSE="audit pam dbus" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" +EXTRAS_VER="1.37" DESCRIPTION="SELinux core utilities" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -25,13 +18,13 @@ 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}" + S1="${WORKDIR}/${P}/${PN}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" - KEYWORDS="~amd64 ~arm64 ~mips ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" S1="${WORKDIR}/${MY_P}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" @@ -39,32 +32,25 @@ fi LICENSE="GPL-2" SLOT="0" +IUSE="audit pam split-usr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] - >=sys-libs/libcap-1.10-r10:= - >=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}] +DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}] + >=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}] + >=sys-libs/libsepol-${PV}:= sys-libs/libcap-ng:= - >=sys-libs/libsepol-${SEPOL_VER}:= >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] - sys-devel/gettext - 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} - !<sec-policy/selinux-base-policy-2.20151208-r6" -# 2.20151208-r6 and higher has support for new setfiles + ${PYTHON_DEPS}" -### libcgroup -> seunshare -### dbus -> restorecond +# 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 - !<sys-apps/openrc-0.14" + app-misc/pax-utils" PDEPEND="sys-apps/semodule-utils sys-apps/selinux-python" @@ -82,7 +68,7 @@ src_prepare() { 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-2.7-0001-newrole-not-suid.patch" + eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch" fi # rlpkg is more useful than fixfiles @@ -110,7 +96,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 +114,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)" \ @@ -155,7 +139,13 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - dosym /sbin/setfiles /usr/sbin/setfiles + if use split-usr; then + dosym ../../sbin/setfiles /usr/sbin/setfiles + else + # remove sestatus symlink + rm -f "${D}"/usr/sbin/sestatus || die + fi + bashcomp_alias setsebool getsebool # location for policy definitions @@ -172,7 +162,7 @@ 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}" + einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)." + semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" done } |