moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

polkit: update to 126.

Browse source
This commit is contained in:
classabbyamp 2025-03-05 23:19:53 -05:00 • committed by classabbyamp
parent 379c3bfe58
commit f3f4517692
2 changed files with 3 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
srcpkgs/polkit/patches/fix-configuration-with-elogind.patch
View file

@ -1,58 +0,0 @@
From 042897ed0efd5d622367c2ff4ac224d0b05cccee Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 8 May 2024 11:20:42 +0200
Subject: [PATCH] Fix configuration with elogind
Previously, it would try to get sysusers_dir from systemd even though
systemd_dep was undefined. Determining systemd_systemdsystemunitdir
from systemd was already checking for systemd logind specifically, and
systemd_sysusers_dir is only used in the systemd logind case, so move
both of those into the systemd-logind-specific branch above.
---
diff --git a/meson.build b/meson.build
index 2f81c90..8e392a1 100644
--- a/meson.build
+++ b/meson.build
@@ -202,6 +202,15 @@ if enable_logind
if not logind_dep.found()
logind_dep = dependency('libsystemd-login', not_found_message: 'libsystemd support requested but libsystemd or libsystemd-login library not found')
endif
+ # systemd unit / service files
+ 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
+
+ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d')
else
logind_dep = dependency('libelogind', not_found_message: 'libelogind support requested but libelogind library not found')
endif
@@ -210,16 +219,6 @@ if enable_logind
config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
func = 'sd_pidfd_get_session'
config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
-
- # systemd unit / service files
- 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
-
- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d')
endif
config_h.set('HAVE_LIBSYSTEMD', enable_logind)
@@ -404,7 +403,7 @@ output += ' introspection: ' + enable_introspection.to_string(
output += ' Distribution/OS: ' + os_type + '\n'
output += ' Authentication framework: ' + auth_fw + '\n'
output += ' Session tracking: ' + session_tracking + '\n'
-if enable_logind
+if session_tracking == 'libsystemd-login'
output += ' systemdsystemunitdir: ' + systemd_systemdsystemunitdir + '\n'
endif
output += ' polkitd user: ' + polkitd_user + ' \n'

8
srcpkgs/polkit/template
View file

@ -1,11 +1,11 @@
# Template file for 'polkit'
pkgname=polkit
version=124
version=126
revision=1
build_style=meson
build_helper=gir
configure_args="$(vopt_bool gir introspection) -Dman=true
-Dsession_tracking=libelogind -Dsystemdsystemunitdir=/usr/lib/systemd/system
-Dsession_tracking=elogind -Dsystemdsystemunitdir=/usr/lib/systemd/system
-Dpam_prefix=/usr/lib/pam.d"
make_dirs="
/etc/polkit-1/rules.d 0700 polkitd polkitd
@ -20,10 +20,8 @@ license="GPL-2.0-or-later"
homepage="https://github.com/polkit-org/polkit"
changelog="https://raw.githubusercontent.com/polkit-org/polkit/main/NEWS.md"
distfiles="https://github.com/polkit-org/polkit/archive/${version}.tar.gz"
checksum=72457d96a0538fd03a3ca96a6bf9b7faf82184d4d67c793eb759168e4fd49e20
checksum=2814a7281989f6baa9e57bd33bbc5e148827e2721ccef22aaf28ab2b376068e8
system_accounts="polkitd"
#replaces="polkit-elogind>=0"
#provides="polkit-elogind-${version}_${revision}"
# Package build options
build_options="gir"