From 2ef7a872bc97c576922b1ee1e0a9ad8885860d43 Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 19 Jan 2024 18:35:04 +0300 Subject: [PATCH] polkit ver. bump --- system/base/polkit/actions.py | 3 +- .../gentoo/polkit-124-systemd-fixup.patch | 28 +++++++++++ .../files/gentoo/polkit-124-systemd.patch | 50 +++++++++++++++++++ system/base/polkit/pspec.xml | 13 +++-- 4 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 system/base/polkit/files/gentoo/polkit-124-systemd-fixup.patch create mode 100644 system/base/polkit/files/gentoo/polkit-124-systemd.patch diff --git a/system/base/polkit/actions.py b/system/base/polkit/actions.py index 76ac6bd5..f94033d9 100644 --- a/system/base/polkit/actions.py +++ b/system/base/polkit/actions.py @@ -16,7 +16,6 @@ def setup(): #pisitools.dosed("configure", "pardus-release", "pisilinux-release") #autotools.autoreconf("-fiv") mesontools.configure("-Dos_type='pisilinux' \ - -Dsystemdsystemunitdir=/tmp \ -Dpam_module_dir=/lib/security \ -Dexamples=true \ -Dauthfw='pam' \ @@ -37,6 +36,6 @@ def install(): shelltools.chown("%s/var/lib/polkit-1" % get.installDIR(),"polkitd","polkitd") shelltools.chown("%s/usr/share/polkit-1" % get.installDIR(),"polkitd","root") #yada? "polkitd","root" - pisitools.removeDir("/tmp") + # pisitools.removeDir("/tmp") pisitools.dodoc("AUTHORS", "NEWS*", "README*", "HACKING*", "COPYING*") diff --git a/system/base/polkit/files/gentoo/polkit-124-systemd-fixup.patch b/system/base/polkit/files/gentoo/polkit-124-systemd-fixup.patch new file mode 100644 index 00000000..a4dd7eaf --- /dev/null +++ b/system/base/polkit/files/gentoo/polkit-124-systemd-fixup.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/922458 +https://github.com/polkit-org/polkit/pull/417/files#r1458416421 +--- a/meson.build ++++ b/meson.build +@@ -212,14 +212,17 @@ 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' +- # 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 ++ if 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') + +- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') ++ if systemd_systemdsystemunitdir == '' ++ # 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 ++ ++ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') ++ endif + endif + config_h.set('HAVE_LIBSYSTEMD', enable_logind) + diff --git a/system/base/polkit/files/gentoo/polkit-124-systemd.patch b/system/base/polkit/files/gentoo/polkit-124-systemd.patch new file mode 100644 index 00000000..e9b10e99 --- /dev/null +++ b/system/base/polkit/files/gentoo/polkit-124-systemd.patch @@ -0,0 +1,50 @@ +https://github.com/polkit-org/polkit/pull/417 + +From 69d6b94d590b4dd1fbbac22b4f4d449f46ef61aa Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +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 + diff --git a/system/base/polkit/pspec.xml b/system/base/polkit/pspec.xml index e216cdb0..db0a154b 100644 --- a/system/base/polkit/pspec.xml +++ b/system/base/polkit/pspec.xml @@ -14,7 +14,7 @@ app:console PolicyKit Authorization Framework polkit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to speak to privileged processes. - https://gitlab.freedesktop.org/polkit/polkit/-/archive/121/polkit-121.tar.bz2 + https://gitlab.freedesktop.org/polkit/polkit/-/archive/124/polkit-124.tar.bz2 meson python3 @@ -34,8 +34,8 @@ use-system-locale-in-gobject-api.diff - - + gentoo/polkit-124-systemd.patch + gentoo/polkit-124-systemd-fixup.patch @@ -95,6 +95,13 @@ + + 2024-01-19 + 124 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-09-01 0.121