accountsservice: update 22.08.8 -> 23.13.9

- backport a patch to add meson options for wtmp and tests (needed for musl build)
- refresh musl patch
- add PACKAGECONFIGS for admin_group and elogind
- update dependencies
- inherit pkgconfig
- add backport patch to fix:

| ../accountsservice-23.13.9/subprojects/mocklibc-1.0/src/netgroup-debug.c:25:3: error: implicit declaration of function 'print_indent' [-Wimplicit-function-declaration]
|    25 |   print_indent(stream, indent);

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

5 files changed, 197 insertions, 53 deletions

diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch
deleted file mode 100644
index 944d2f9165..0000000000
--- a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ff0718174faf1167fb4765ebe4bd280bbe8d2ac6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 8 Dec 2019 23:42:00 +0100
-Subject: [PATCH] musl: Hack to fix configure
-
-Upstream-Status: Inappropriate [Musl Specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- meson.build | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 075776f..dfd7421 100644
---- a/meson.build
-+++ b/meson.build
-@@ -101,9 +101,14 @@ 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).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
--  config_h.set_quoted('PATH_WTMP', path_wtmp)
-+  # musl: This is just a build fix hack.
-+  # As usual they know better, consider all other projects crap and offer zero
-+  # alternatives: So wtmp is a dead stub only [1] (= /dev/null/wtmp - taken
-+  # from musl sources).
-+  # Maybe a hero comes along and adds utmps [2] to make accountsservice useful for musl
-+  # [1] https://wiki.musl-libc.org/faq.html#Q:-Why-is-the-utmp/wtmp-functionality-only-implemented-as-stubs?
-+  # [2] https://github.com/skarnet/utmps
-+  config_h.set_quoted('PATH_WTMP', '/dev/null/wtmp')
- endif
- 
- # compiler flags
--- 
-2.34.1
-
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch
index 2b0924b2e4..dfc27b7302 100644
--- a/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch
@@ -1,27 +1,29 @@
-From 7401e682400df87f3258f795bb1d143f64a35a9f Mon Sep 17 00:00:00 2001
+From 87c5c711f6f828053abd754628a0067696cfd54d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 9 Dec 2019 00:12:08 +0100
+Date: Mon, 9 Dec 2019 09:36:12 +0100
 Subject: [PATCH] musl: add missing fgetspent_r
 
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+
 Stolen from void-linux
 
 Upstream-Status: Inappropriate [musl-specific]
-
 ---
- src/daemon.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
+ src/daemon.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
 
 diff --git a/src/daemon.c b/src/daemon.c
-index c52bda3..a7676fe 100644
+index aa9d050..cc53eae 100644
 --- a/src/daemon.c
 +++ b/src/daemon.c
-@@ -164,6 +164,26 @@ remove_cache_files (const gchar *user_name)
+@@ -215,6 +215,28 @@ remove_cache_files (const gchar *user_name)
          g_remove (icon_filename);
  }
  
-+/* Musl libc does not support fgetspent_r(), write own
-+ * wrapper
-+ */
++#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)
@@ -38,6 +40,7 @@ index c52bda3..a7676fe 100644
 +
 +       return 0;
 +}
++#endif
 +
  static struct passwd *
  entry_generator_fgetpwent (Daemon       *daemon,
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/00b6e12ad4044d33cc54c71c75773c5a653dad09.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/00b6e12ad4044d33cc54c71c75773c5a653dad09.patch
new file mode 100644
index 0000000000..f016057562
--- /dev/null
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice/00b6e12ad4044d33cc54c71c75773c5a653dad09.patch
@@ -0,0 +1,115 @@
+From 747d781c1ccf3b8112ec6a098f23f26ccadc5880 Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Sun, 9 Feb 2025 23:24:08 -0800
+Subject: [PATCH] build: Disable tests when cross compiling and allow
+
+ specifying path_wtmp
+ 
+ Upstream-Status: Backport [https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/00b6e12ad4044d33cc54c71c75773c5a653dad09]
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ meson.build       | 64 ++++++++++++++++++++++++++---------------------
+ meson_options.txt |  2 ++
+ 2 files changed, 38 insertions(+), 28 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 4a509e7..2a56627 100644
+--- a/meson.build
++++ b/meson.build
+@@ -77,34 +77,40 @@ foreach func: check_functions
+   config_h.set('HAVE_' + func.underscorify().to_upper(), cc.has_function(func))
+ endforeach
+ 
+-if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE')
+-  code = '''#define _GNU_SOURCE
+-  #include <stdio.h>
+-  #include <utmpx.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", WTMPX_FILENAME);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of WTMPX_FILENAME')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
+-elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+-  code = '''#include <paths.h>
+-  #include <stdio.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", _PATH_WTMPX);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of _PATH_WTMPX')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', '_PATH_WTMPX')
++path_wtmp = get_option('wtmpfile')
++if path_wtmp == ''
++  if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE') and meson.can_run_host_binaries()
++    code = '''#define _GNU_SOURCE
++    #include <stdio.h>
++    #include <utmpx.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", WTMPX_FILENAME);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of WTMPX_FILENAME')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
++  elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') and meson.can_run_host_binaries()
++    code = '''#include <paths.h>
++    #include <stdio.h>
++    int main (int argc, char **argv) {
++      printf ("%s\n", _PATH_WTMPX);
++      return 0;
++    }
++    '''
++    result = cc.run(code, name : 'value of _PATH_WTMPX')
++    path_wtmp = result.stdout().strip()
++
++    config_h.set('PATH_WTMP', '_PATH_WTMPX')
++  else
++    assert(not meson.is_cross_build(), 'Cannot determine wtmp for this cross compile, please specify -Dwtmpfile=')
++    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')
++    config_h.set_quoted('PATH_WTMP', path_wtmp)
++  endif
+ 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')
+   config_h.set_quoted('PATH_WTMP', path_wtmp)
+ endif
+ 
+@@ -232,7 +238,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
++if get_option('tests') and meson.can_run_host_binaries()
++  subdir('tests')
++endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index b34a0fa..e25c61e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,6 +1,7 @@
+ option('systemdsystemunitdir', type: 'string', value: '', description: 'custom directory for systemd system units')
+ option('gdmconffile', type: 'string', value: '/etc/gdm/custom.conf', description: 'GDM configuration file')
+ option('lightdmconffile', type: 'string', value: '/etc/lightdm/lightdm.conf', description: 'LightDM configuration file')
++option('wtmpfile', type: 'string', value: '', description: 'override filepath of wtmp file')
+ 
+ option('admin_group', type: 'string', value: '', description: 'Set group for administrative accounts')
+ option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of')
+@@ -13,3 +14,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: 'run accountservice tests if possible')
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/accountsservice-23.13.9-c99-fixes.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/accountsservice-23.13.9-c99-fixes.patch
new file mode 100644
index 0000000000..ffb6ffca18
--- /dev/null
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice/accountsservice-23.13.9-c99-fixes.patch
@@ -0,0 +1,51 @@
+From 97ff4512ea17600d390d67b59e6d0058d1b0b7d5 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 11 Apr 2023 10:09:07 -0400
+Subject: [PATCH] mocklibc: Fix compiler warning
+
+https://bugs.gentoo.org/930715
+https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/da65bee12d9118fe1a49c8718d428fe61d232339
+
+print_indent is defined in one file and used in another without a
+forward declaration. That leads to a compiler warning/error.
+
+This commit fixes that.
+
+Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/accountsservice/files/accountsservice-23.13.9-c99-fixes.patch]
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ subprojects/mocklibc.wrap                           |  2 ++
+ subprojects/packagefiles/mocklibc-print-indent.diff | 13 +++++++++++++
+ 2 files changed, 15 insertions(+)
+ create mode 100644 subprojects/packagefiles/mocklibc-print-indent.diff
+
+diff --git a/subprojects/mocklibc.wrap b/subprojects/mocklibc.wrap
+index af82298..539ee83 100644
+--- a/subprojects/mocklibc.wrap
++++ b/subprojects/mocklibc.wrap
+@@ -8,3 +8,5 @@ source_hash = b2236a6af1028414783e9734a46ea051916ec226479d6a55a3bb823bff68f120
+ patch_url = https://wrapdb.mesonbuild.com/v1/projects/mocklibc/1.0/2/get_zip
+ patch_filename = mocklibc-1.0-2-wrap.zip
+ patch_hash = 0280f96a2eeb3c023e5acf4e00cef03d362868218d4a85347ea45137c0ef6c56
++
++diff_files = mocklibc-print-indent.diff
+diff --git a/subprojects/packagefiles/mocklibc-print-indent.diff b/subprojects/packagefiles/mocklibc-print-indent.diff
+new file mode 100644
+index 0000000..4aaed40
+--- /dev/null
++++ b/subprojects/packagefiles/mocklibc-print-indent.diff
+@@ -0,0 +1,13 @@
++diff -up mocklibc-1.0/src/netgroup-debug.c.print-indent mocklibc-1.0/src/netgroup-debug.c
++--- mocklibc-1.0/src/netgroup-debug.c.print-indent     2023-04-11 10:20:53.717381559 -0400
+++++ mocklibc-1.0/src/netgroup-debug.c  2023-04-11 10:21:02.296270333 -0400
++@@ -21,6 +21,9 @@
++ #include <stdio.h>
++ #include <stdlib.h>
++ 
+++void print_indent (FILE        *stream,
+++                   unsigned int indent);
+++
++ void netgroup_debug_print_entry(struct entry *entry, FILE *stream, unsigned int indent) {
++   print_indent(stream, indent);
++ 
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb b/meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb
index 439958c7d2..e3dfcfffff 100644
--- a/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb
@@ -5,24 +5,35 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = " \
     dbus \
+    glib-2.0 \
+    json-c \
     polkit \
+    virtual/crypt \
 "
 
-inherit meson gobject-introspection gtk-doc features_check systemd vala
+inherit meson gobject-introspection gtk-doc features_check systemd vala pkgconfig
 
 REQUIRED_DISTRO_FEATURES = "polkit"
 
-SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI = " \
+        https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
+        file://accountsservice-23.13.9-c99-fixes.patch \
+        file://00b6e12ad4044d33cc54c71c75773c5a653dad09.patch \
+"
 SRC_URI:append:libc-musl = " \
-    file://0001-musl-Hack-to-fix-build.patch \
-    file://0002-musl-add-missing-fgetspent_r.patch \
+        file://0002-musl-add-missing-fgetspent_r.patch \
 "
-SRC_URI[sha256sum] = "909997a76919fe7dc138a9a01cea70bd622d5a932dbc9fb13010113023a7a391"
+
+EXTRA_OEMESON:libc-musl += "-Dwtmpfile=/var/log/wtmp -Dtests=false"
+
+SRC_URI[sha256sum] = "adda4cdeae24fa0992e7df3ffff9effa7090be3ac233a3edfdf69d5a9c9b924f"
 
 GTKDOC_MESON_OPTION = "gtk_doc"
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-PACKAGECONFIG[systemd] = ", -Dsystemdsystemunitdir='no', systemd"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} admin_group"
+PACKAGECONFIG[systemd] = ",,systemd"
+PACKAGECONFIG[elogind] = "-Delogind=true,-Delogind=false,elogind"
+PACKAGECONFIG[admin_group] = "-Dadmin_group=wheel"
 
 SYSTEMD_SERVICE:${PN} = "accounts-daemon.service"