From 1056cb6017d8c4bfa2acf30c620fd12a7203238f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20G=C3=B6llnitz?= Date: Thu, 20 Aug 2026 15:55:27 +0200 Subject: [PATCH] systemd/accountsservice: upgrade to 26.27.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the same version as in Aline. Link: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/107007 Closes: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/work_items/4845 Signed-off-by: Markus Göllnitz Part-of: --- extra-repos/systemd/accountsservice/APKBUILD | 15 +++----- .../accountsservice/musl-fgetspent_r.patch | 34 ------------------- .../systemd/accountsservice/musl-wtmp.patch | 15 -------- .../systemd/accountsservice/opt-tests.patch | 24 ------------- 4 files changed, 5 insertions(+), 83 deletions(-) delete mode 100644 extra-repos/systemd/accountsservice/musl-fgetspent_r.patch delete mode 100644 extra-repos/systemd/accountsservice/musl-wtmp.patch delete mode 100644 extra-repos/systemd/accountsservice/opt-tests.patch diff --git a/extra-repos/systemd/accountsservice/APKBUILD b/extra-repos/systemd/accountsservice/APKBUILD index c705ca093..cf007a20c 100644 --- a/extra-repos/systemd/accountsservice/APKBUILD +++ b/extra-repos/systemd/accountsservice/APKBUILD @@ -3,7 +3,7 @@ # from dbus by invoking logind maintainer="" pkgname=accountsservice -_pkgver=23.13.9 +_pkgver=26.27.3 pkgver=9999$_pkgver pkgrel=0 pkgdesc="D-Bus interface for user account query and manipulation" @@ -17,16 +17,13 @@ makedepends=" dbus-dev systemd-dev glib-dev + json-c-dev meson polkit-dev vala " subpackages="$pkgname-dev $pkgname-lang lib$pkgname:libs" -source="https://www.freedesktop.org/software/accountsservice/accountsservice-$_pkgver.tar.xz - musl-fgetspent_r.patch - musl-wtmp.patch - opt-tests.patch - " +source="https://gitlab.freedesktop.org/accountsservice/accountsservice/-/archive/$_pkgver/accountsservice-$_pkgver.tar.gz" # mocklibc fails to build with implicits options="!check" builddir="$srcdir/accountsservice-$_pkgver" @@ -40,6 +37,7 @@ build() { -Dgtk_doc=false \ -Dadmin_group=wheel \ -Dtests="$(want_check && echo true || echo false)" \ + -Dwtmpfile=/var/log/wtmp \ . output meson compile -C output } @@ -53,8 +51,5 @@ package() { } sha512sums=" -c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89 accountsservice-23.13.9.tar.xz -469392beca8f5941eafaa193c4fcb0472770ee4183ce520416a1b5d6abafe0e201990eb74d06bfbd9e20af08e55aff5f0031f267083f6c6879f0fe4e5028103c musl-fgetspent_r.patch -6d81caed730473d5c94d575c580a236b4267b374bf50588860922a7ecbeef0b2a1d50124fa3ae195c4f26abe8c3bd6df2aea6d27a0ce23e99acef9fff3eb9652 musl-wtmp.patch -cc5ea18d885ccc5a85f5f4191d3157f3953878af289a9cabc373afea67726042144d66fd9f8d08dac7090fc23037ab98adb4101e8378a16ab2eb04043c88378f opt-tests.patch +7d498bd50f249eaefd811a9c8c528aa66fdfa14722a73b845873bf8325f9109ccad11c24d96ad721c3544508db34d56dfc29e36c173797c19ad5571dd202a522 accountsservice-26.27.3.tar.gz " diff --git a/extra-repos/systemd/accountsservice/musl-fgetspent_r.patch b/extra-repos/systemd/accountsservice/musl-fgetspent_r.patch deleted file mode 100644 index f5046d47c..000000000 --- a/extra-repos/systemd/accountsservice/musl-fgetspent_r.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/daemon.c b/src/daemon.c -index 312394a..e7b3c58 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -140,6 +140,28 @@ error_get_type (void) - #define MAX_LOCAL_USERS 50 - #endif - -+#ifndef __GLIBC__ -+ /* Musl libc does not support fgetspent_r(), write own -+ * wrapper -+ */ -+static int fgetspent_r(FILE *fp, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **spbufp) { -+ struct spwd *shadow_entry = fgetspent(fp); -+ if(!shadow_entry) -+ return -1; -+ size_t namplen = strlen(shadow_entry->sp_namp); -+ size_t pwdplen = strlen(shadow_entry->sp_pwdp); -+ -+ if(namplen + pwdplen + 2 > buflen) -+ return -1; -+ -+ *spbufp = memcpy(spbuf, shadow_entry, sizeof(struct spwd)); -+ spbuf->sp_namp = strncpy(buf, shadow_entry->sp_namp, namplen + 1); -+ spbuf->sp_pwdp = strncpy(buf + namplen + 1, shadow_entry->sp_pwdp, pwdplen + 1); -+ -+ return 0; -+} -+#endif -+ - static struct passwd * - entry_generator_fgetpwent (Daemon *daemon, - GHashTable *users, - diff --git a/extra-repos/systemd/accountsservice/musl-wtmp.patch b/extra-repos/systemd/accountsservice/musl-wtmp.patch deleted file mode 100644 index f9dd26480..000000000 --- a/extra-repos/systemd/accountsservice/musl-wtmp.patch +++ /dev/null @@ -1,15 +0,0 @@ -the assert expects a working /var/log/wtmp at build time -diff --git a/meson.build b/meson.build -index 4a509e7..f995d28 100644 ---- a/meson.build -+++ b/meson.build -@@ -103,8 +103,7 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') - - config_h.set('PATH_WTMP', '_PATH_WTMPX') - else -- path_wtmp = '/var/log/utx.log' -- assert(run_command('test', '-e', path_wtmp, check: false).returncode() == 0, 'Do not know which filename to watch for wtmp changes') -+ path_wtmp = '/var/log/wtmp' - config_h.set_quoted('PATH_WTMP', path_wtmp) - endif - diff --git a/extra-repos/systemd/accountsservice/opt-tests.patch b/extra-repos/systemd/accountsservice/opt-tests.patch deleted file mode 100644 index 3fc49545b..000000000 --- a/extra-repos/systemd/accountsservice/opt-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/meson.build b/meson.build -index 4a509e7..5119fab 100644 ---- a/meson.build -+++ b/meson.build -@@ -232,7 +232,9 @@ if get_option('gtk_doc') - subdir('doc/libaccountsservice') - endif - --subdir('tests') -+if get_option('tests') -+ subdir('tests') -+endif - - configure_file( - output: 'config.h', -diff --git a/meson_options.txt b/meson_options.txt -index b34a0fa..56872c7 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: true, description : 'Enable Vala bindings - - option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)') - option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') -+option('tests', type: 'boolean', value: true, description: 'tests')