mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 18:47:16 -08:00
Sam James
@@ -1,2 +1,3 @@
|
||||
DIST polkit-122.tar.bz2 704972 BLAKE2B 601ed969de816d061a974b07490d64c144940898a75d4e1761462ee1ff0f00686b068298fa6fdc901879d8cd4bea4334c0187aa5bde50acf90728c37e73e21f4 SHA512 a7c0a951bbcdb09899adbc128296c74fc062441e996f4d6a782b214178f0936137e2fdc489eaa86a00599b988711735a5bd9b5c3b93bdb42fb915db9f9b04e26
|
||||
DIST polkit-123.tar.bz2 707480 BLAKE2B 27d8764606d8156118269fb4cd5eda1cfd0d56df219e4157cd78fd4c2a2d001c474271b7bb31e7e82ca376eacd26411418695058cc888700690606348b4d014a SHA512 4306363d3ed7311243de462832199bd10ddda35e36449104daff0895725d8189b07a4c88340f28607846fdf761c23470da2d43288199c46aa816426384124bb6
|
||||
DIST polkit-124.tar.bz2 715490 BLAKE2B ecfc1ec73a7e1bbdf7374642ad4e1dbe534149a27e75bb1235eaa446ff912466ee0cdd978c34b7f110bc62a49b25ffddc9011e280686e3f304a234454be85a40 SHA512 db520882b0bedf1c96052570bf4c55d7e966d8172f6d26acf0791d98c4b911fce5ee39e6d830f06122ac8df33c6b43c252cdb7ba3a54523804824ebf355405dc
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
https://github.com/polkit-org/polkit/pull/417
|
||||
|
||||
From 69d6b94d590b4dd1fbbac22b4f4d449f46ef61aa Mon Sep 17 00:00:00 2001
|
||||
From: Luca Boccassi <bluca@debian.org>
|
||||
Date: Thu, 18 Jan 2024 15:07:32 +0000
|
||||
Subject: [PATCH] meson: fix build failure when -Dsystemdsystemunitdir is
|
||||
specified
|
||||
|
||||
When 'systemdsystemunitdir' is specified as an option the systemd_dep
|
||||
variable is not defined, but the sysusers.d directory lookup uses it,
|
||||
causing a build failure:
|
||||
|
||||
dh_auto_configure -- \
|
||||
-Dexamples=false \
|
||||
-Dintrospection=true \
|
||||
-Dman=true \
|
||||
-Dsystemdsystemunitdir=/usr/lib/systemd/system \
|
||||
-Dtests=true \
|
||||
-Dgtk_doc=true -Dsession_tracking=libsystemd-login
|
||||
cd obj-x86_64-linux-gnu && DEB_PYTHON_INSTALL_LAYOUT=deb LC_ALL=C.UTF-8 meson setup .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu -Dpython.bytecompile=-1 -Dexamples=false -Dintrospection=true -Dman=true -Dsystemdsystemunitdir=/usr/lib/systemd/system -Dtests=true -Dgtk_doc=true -Dsession_tracking=libsystemd-login
|
||||
The Meson build system
|
||||
Version: 1.3.1
|
||||
Source dir: /builds/bluca/polkit/debian/output/source_dir
|
||||
Build dir: /builds/bluca/polkit/debian/output/source_dir/obj-x86_64-linux-gnu
|
||||
Build type: native build
|
||||
Project name: polkit
|
||||
Project version: 124
|
||||
|
||||
<...>
|
||||
|
||||
Run-time dependency libsystemd found: YES 255
|
||||
Checking for function "sd_uid_get_display" with dependency libsystemd: YES
|
||||
Checking for function "sd_pidfd_get_session" with dependency libsystemd: YES
|
||||
../meson.build:222:37: ERROR: Unknown variable "systemd_dep".
|
||||
|
||||
Follow-up for 24f1e0af3f7bd17e220cb96201f3c654e737ad34
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -212,9 +212,9 @@ if enable_logind
|
||||
config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
|
||||
|
||||
# systemd unit / service files
|
||||
+ systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
|
||||
systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
|
||||
if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login'
|
||||
- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
|
||||
# FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
|
||||
systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,161 @@
|
||||
# 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 xdg-utils
|
||||
|
||||
DESCRIPTION="Policy framework for controlling privileges for system-wide services"
|
||||
HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/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://gitlab.freedesktop.org/polkit/polkit/-/archive/${MY_COMMIT}/polkit-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
|
||||
|
||||
S="${WORKDIR}"/${PN}-${MY_COMMIT}
|
||||
else
|
||||
SRC_URI="https://gitlab.freedesktop.org/polkit/polkit/-/archive/${PV}/${P}.tar.bz2"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="+daemon +duktape examples gtk +introspection kde pam selinux systemd test"
|
||||
# https://gitlab.freedesktop.org/polkit/polkit/-/issues/181 for test restriction
|
||||
RESTRICT="!test? ( test ) test"
|
||||
|
||||
# This seems to be fixed with 121?
|
||||
#if [[ ${PV} == *_p* ]] ; then
|
||||
# RESTRICT="!test? ( test )"
|
||||
#else
|
||||
# # Tests currently don't work with meson in the dist tarballs. See
|
||||
# # https://gitlab.freedesktop.org/polkit/polkit/-/issues/144
|
||||
# RESTRICT="test"
|
||||
#fi
|
||||
|
||||
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}"/${PN}-124-systemd.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
|
||||
-Dsession_tracking="$(usex systemd libsystemd-login libelogind)"
|
||||
-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
-Djs_engine=$(usex duktape duktape mozjs)
|
||||
$(meson_use !daemon libs-only)
|
||||
$(meson_use introspection)
|
||||
$(meson_use test tests)
|
||||
$(usex pam "-Dpam_module_dir=$(getpam_mod_dir)" '')
|
||||
)
|
||||
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
|
||||
|
||||
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() {
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user