From f63aa53f5107bc8d109c691aebd70623d0611410 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 28 Apr 2025 07:18:53 +0000 Subject: [PATCH] sys-auth/polkit: Sync with Gentoo It's from Gentoo commit 4808eb898a254ced245acb0d85c65ddc15225ea0. --- .../sys-auth/polkit/polkit-123-r1.ebuild | 18 +- .../sys-auth/polkit/polkit-125.ebuild | 157 ------------------ .../sys-auth/polkit/polkit-126-r1.ebuild | 28 ++-- .../sys-auth/polkit/polkit-126.ebuild | 157 ------------------ .../sys-auth/polkit/polkit-9999.ebuild | 26 ++- 5 files changed, 29 insertions(+), 357 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-125.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-126.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-123-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-123-r1.ebuild index c80be20754..15a547c852 100644 --- a/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-123-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-123-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ fi LICENSE="LGPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+daemon examples gtk +introspection kde pam selinux systemd test" +IUSE="examples gtk +introspection kde pam selinux systemd test" # https://gitlab.freedesktop.org/polkit/polkit/-/issues/181 for test restriction RESTRICT="!test? ( test ) test" @@ -57,7 +57,7 @@ BDEPEND=" DEPEND=" >=dev-libs/glib-2.32:2 dev-libs/expat - daemon? ( dev-lang/duktape:= ) + dev-lang/duktape:= pam? ( sys-auth/pambase sys-libs/pam @@ -120,7 +120,7 @@ src_configure() { -Dsession_tracking="$(usex systemd libsystemd-login libelogind)" -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" -Djs_engine=duktape - $(meson_use !daemon libs-only) + -Dlibs-only=false $(meson_use introspection) $(meson_use test tests) $(usex pam "-Dpam_module_dir=$(getpam_mod_dir)" '') @@ -143,16 +143,14 @@ src_install() { dodoc src/examples/{*.c,*.policy*} fi - if use daemon; then - if [[ ${EUID} == 0 ]]; then - diropts -m 0700 -o polkitd - fi - keepdir /etc/polkit-1/rules.d + if [[ ${EUID} == 0 ]]; then + diropts -m 0700 -o polkitd fi + keepdir /etc/polkit-1/rules.d } pkg_postinst() { - if use daemon && [[ ${EUID} == 0 ]]; then + if [[ ${EUID} == 0 ]]; then chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d fi diff --git a/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-125.ebuild b/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-125.ebuild deleted file mode 100644 index d262fc5114..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-125.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit meson pam pax-utils python-any-r1 systemd tmpfiles xdg-utils - -DESCRIPTION="Policy framework for controlling privileges for system-wide services" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://github.com/polkit-org/polkit" -if [[ ${PV} == *_p* ]] ; then - # Upstream don't make releases very often. Test snapshots throughly - # and review commits, but don't shy away if there's useful stuff there - # we want. - MY_COMMIT="" - SRC_URI="https://github.com/polkit-org/polkit/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - - S="${WORKDIR}"/${PN}-${MY_COMMIT} -else - SRC_URI="https://github.com/polkit-org/polkit/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="+daemon +duktape examples gtk +introspection kde pam selinux systemd test" -# Tests restricted b/c of permissions -RESTRICT="!test? ( test ) test" - -BDEPEND=" - acct-user/polkitd - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xsl-stylesheets - dev-libs/glib - dev-libs/gobject-introspection-common - dev-libs/libxslt - dev-util/glib-utils - sys-devel/gettext - virtual/pkgconfig - introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - ) -" -DEPEND=" - >=dev-libs/glib-2.32:2 - dev-libs/expat - daemon? ( - duktape? ( dev-lang/duktape:= ) - !duktape? ( dev-lang/spidermonkey:115[-debug] ) - ) - pam? ( - sys-auth/pambase - sys-libs/pam - ) - !pam? ( virtual/libcrypt:= ) - systemd? ( sys-apps/systemd:0=[policykit] ) - !systemd? ( sys-auth/elogind ) -" -RDEPEND=" - ${DEPEND} - acct-user/polkitd - selinux? ( sec-policy/selinux-policykit ) -" -PDEPEND=" - gtk? ( || ( - >=gnome-extra/polkit-gnome-0.105 - >=lxde-base/lxsession-0.5.2 - ) ) - kde? ( kde-plasma/polkit-kde-agent ) -" - -DOCS=( docs/TODO HACKING.md NEWS.md README.md ) - -QA_MULTILIB_PATHS=" - usr/lib/polkit-1/polkit-agent-helper-1 - usr/lib/polkit-1/polkitd -" - -PATCHES=( - "${FILESDIR}"/${P}-musl.patch -) - -python_check_deps() { - python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # bug #401513 - sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die -} - -src_configure() { - xdg_environment_reset - - local emesonargs=( - --localstatedir="${EPREFIX}"/var - -Dauthfw="$(usex pam pam shadow)" - -Dexamples=false - -Dgtk_doc=false - -Dman=true - -Dos_type=gentoo - -Djs_engine=$(usex duktape duktape mozjs) - -Dpam_module_dir=$(getpam_mod_dir) - -Dsession_tracking="$(usex systemd logind elogind)" - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - $(meson_use !daemon libs-only) - $(meson_use introspection) - $(meson_use test tests) - ) - meson_src_configure -} - -src_compile() { - meson_src_compile - - # Required for polkitd on hardened/PaX due to spidermonkey's JIT - pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest -} - -src_install() { - meson_src_install - - # acct-user/polkitd installs its own (albeit with a different filename) - rm -rf "${ED}"/usr/lib/sysusers.d || die - - if use examples ; then - docinto examples - dodoc src/examples/{*.c,*.policy*} - fi - - if use daemon; then - if [[ ${EUID} == 0 ]]; then - diropts -m 0700 -o polkitd - fi - keepdir /etc/polkit-1/rules.d - fi -} - -pkg_postinst() { - tmpfiles_process polkit-tmpfiles.conf - - if use daemon && [[ ${EUID} == 0 ]]; then - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-126-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-126-r1.ebuild index d3d5ee6aac..47853e1f40 100644 --- a/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-126-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-126-r1.ebuild @@ -26,9 +26,9 @@ fi LICENSE="LGPL-2" SLOT="0" if [[ ${PV} != 9999 ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" fi -IUSE="+daemon examples gtk +introspection kde pam nls selinux systemd test" +IUSE="examples gtk +introspection kde pam nls selinux systemd test" RESTRICT="!test? ( test )" BDEPEND=" @@ -52,9 +52,7 @@ BDEPEND=" DEPEND=" >=dev-libs/glib-2.32:2 dev-libs/expat - daemon? ( - dev-lang/duktape:= - ) + dev-lang/duktape:= pam? ( sys-auth/pambase sys-libs/pam @@ -119,7 +117,7 @@ src_configure() { -Dprivileged_group=0 -Dsession_tracking="$(usex systemd logind elogind)" -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - $(meson_use !daemon libs-only) + -Dlibs-only=false $(meson_use introspection) $(meson_use nls gettext) $(meson_use test tests) @@ -145,21 +143,17 @@ src_install() { dodoc src/examples/{*.c,*.policy*} fi - if use daemon; then - if [[ ${EUID} == 0 ]]; then - diropts -m 0700 -o polkitd - fi - keepdir /etc/polkit-1/rules.d + if [[ ${EUID} == 0 ]]; then + diropts -m 0700 -o polkitd fi + keepdir /etc/polkit-1/rules.d } pkg_postinst() { - if use daemon ; then - tmpfiles_process polkit-tmpfiles.conf + tmpfiles_process polkit-tmpfiles.conf - if [[ ${EUID} == 0 ]]; then - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - fi + if [[ ${EUID} == 0 ]]; then + chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d + chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-126.ebuild b/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-126.ebuild deleted file mode 100644 index 6d0de65b25..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-126.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit meson pam pax-utils python-any-r1 systemd tmpfiles xdg-utils - -DESCRIPTION="Policy framework for controlling privileges for system-wide services" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://github.com/polkit-org/polkit" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/polkit-org/polkit" - inherit git-r3 -elif [[ ${PV} == *_p* ]] ; then - # Upstream don't make releases very often. Test snapshots throughly - # and review commits, but don't shy away if there's useful stuff there - # we want. - MY_COMMIT="" - SRC_URI="https://github.com/polkit-org/polkit/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - - S="${WORKDIR}"/${PN}-${MY_COMMIT} -else - SRC_URI="https://github.com/polkit-org/polkit/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="LGPL-2" -SLOT="0" -if [[ ${PV} != 9999 ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi -IUSE="+daemon examples gtk +introspection kde pam nls selinux systemd test" -RESTRICT="!test? ( test )" - -BDEPEND=" - acct-user/polkitd - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/glib-2.32 - dev-libs/gobject-introspection-common - dev-libs/libxslt - dev-util/glib-utils - virtual/pkgconfig - introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) - nls? ( sys-devel/gettext ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - ) -" -DEPEND=" - >=dev-libs/glib-2.32:2 - dev-libs/expat - daemon? ( - dev-lang/duktape:= - ) - pam? ( - sys-auth/pambase - sys-libs/pam - ) - !pam? ( virtual/libcrypt:= ) - systemd? ( sys-apps/systemd:0=[policykit] ) - !systemd? ( sys-auth/elogind ) -" -RDEPEND=" - ${DEPEND} - acct-user/polkitd - selinux? ( sec-policy/selinux-policykit ) -" -PDEPEND=" - gtk? ( || ( - >=gnome-extra/polkit-gnome-0.105 - >=lxde-base/lxsession-0.5.2 - ) ) - kde? ( kde-plasma/polkit-kde-agent ) -" - -DOCS=( docs/TODO HACKING.md NEWS.md README.md ) - -QA_MULTILIB_PATHS=" - usr/lib/polkit-1/polkit-agent-helper-1 - usr/lib/polkit-1/polkitd -" - -python_check_deps() { - python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # bug #401513 - sed -i -e 's|unix-group:@PRIVILEGED_GROUP@|unix-user:@PRIVILEGED_GROUP@|' src/polkitbackend/*-default.rules.in || die -} - -src_configure() { - xdg_environment_reset - - local emesonargs=( - --localstatedir="${EPREFIX}"/var - -Dauthfw="$(usex pam pam shadow)" - -Dexamples=false - -Dgtk_doc=false - -Dman=true - -Dos_type=gentoo - -Dpam_module_dir=$(getpam_mod_dir) - -Dprivileged_group=0 - -Dsession_tracking="$(usex systemd logind elogind)" - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - $(meson_use !daemon libs-only) - $(meson_use introspection) - $(meson_use nls gettext) - $(meson_use test tests) - ) - meson_src_configure -} - -src_compile() { - meson_src_compile - - # Required for polkitd on hardened/PaX due to spidermonkey's JIT - pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest -} - -src_install() { - meson_src_install - - # acct-user/polkitd installs its own (albeit with a different filename) - rm -rf "${ED}"/usr/lib/sysusers.d || die - - if use examples ; then - docinto examples - dodoc src/examples/{*.c,*.policy*} - fi - - if use daemon; then - if [[ ${EUID} == 0 ]]; then - diropts -m 0700 -o polkitd - fi - keepdir /etc/polkit-1/rules.d - fi -} - -pkg_postinst() { - tmpfiles_process polkit-tmpfiles.conf - - if use daemon && [[ ${EUID} == 0 ]]; then - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-9999.ebuild index d3d5ee6aac..ba5493bd0c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-auth/polkit/polkit-9999.ebuild @@ -28,7 +28,7 @@ SLOT="0" if [[ ${PV} != 9999 ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -IUSE="+daemon examples gtk +introspection kde pam nls selinux systemd test" +IUSE="examples gtk +introspection kde pam nls selinux systemd test" RESTRICT="!test? ( test )" BDEPEND=" @@ -52,9 +52,7 @@ BDEPEND=" DEPEND=" >=dev-libs/glib-2.32:2 dev-libs/expat - daemon? ( - dev-lang/duktape:= - ) + dev-lang/duktape:= pam? ( sys-auth/pambase sys-libs/pam @@ -119,7 +117,7 @@ src_configure() { -Dprivileged_group=0 -Dsession_tracking="$(usex systemd logind elogind)" -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - $(meson_use !daemon libs-only) + -Dlibs-only=false $(meson_use introspection) $(meson_use nls gettext) $(meson_use test tests) @@ -145,21 +143,17 @@ src_install() { dodoc src/examples/{*.c,*.policy*} fi - if use daemon; then - if [[ ${EUID} == 0 ]]; then - diropts -m 0700 -o polkitd - fi - keepdir /etc/polkit-1/rules.d + if [[ ${EUID} == 0 ]]; then + diropts -m 0700 -o polkitd fi + keepdir /etc/polkit-1/rules.d } pkg_postinst() { - if use daemon ; then - tmpfiles_process polkit-tmpfiles.conf + tmpfiles_process polkit-tmpfiles.conf - if [[ ${EUID} == 0 ]]; then - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - fi + if [[ ${EUID} == 0 ]]; then + chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d + chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d fi }