gentoo auto-resync : 24:11:2023 - 16:33:11

4 files changed, 57 insertions, 1 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a1f41c79227d..858b84d3368b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index b6881e39b0f9..4ad1b7a2593d 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,5 +1,6 @@
 AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09
 AUX accountsservice-23.13.9-generate-version.patch 1156 BLAKE2B e5b464ac3a15f089dbaa2b687a91126af002370b8be30e5b5f77a2528620c100569bb96bc75be86b69753a161d09c4d6ba803352047343cf454f79798d302fa1 SHA512 b288368df675bb82a083c9ea94df53e3789ca824d174b10dccd50a3996983f7284b059ea646e42a00b03723ea13c54a67ef032112ac4f61d0b6740698fbed790
+AUX accountsservice-23.13.9-musl-fixes.patch 1939 BLAKE2B f8384ced0320f11778cb3403dfae2952bee34970565f740b5a93d7a720336f42f891d5628c719a04276890c0f5ec0679211eb5cf1332c328e2a2be349de7800e SHA512 60c818dfbfd3869a65e6d309bb2db71af65e3241b23aedf93ae6334e2dbc764cc03d244d2a73f11082f9521cdb2306ad3d8f6e7d8cab1b509a55fedfa1198ed8
 DIST accountsservice-23.13.9.tar.xz 636064 BLAKE2B 74dbbe816937e626ba0f6524b4293466ac2905f474396f5d23633e966d46e013de110671abcbfe2911fffa1e98872e2525b61594a967f917975ebf18d39b8547 SHA512 c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89
-EBUILD accountsservice-23.13.9.ebuild 2233 BLAKE2B a68da0bb837cf69763281a7c55b977ab44a9202dd8b15ae74e2b6320f3b260c9efba70fed9939c857143dd2d385ce25c348b1078976fbedaf13a1bfd2eeae862 SHA512 852b6e3df2afcf89bf01dc7da75c2c2d0e0d8081f4df8940d0aa32d77dce21160211732883bf1e30f55f2f1d0bf7c598e7cc0ff92517c5bdfe6c9220c35ef8e6
+EBUILD accountsservice-23.13.9.ebuild 2386 BLAKE2B 0c2f0400fc40810ae6d2e97dfe069e722930b7ee5fa545229c17b52786322f85ed6077c8599dfb44efb1e8c8642502b725ee07197c3ffb32be3be746aa3ca016 SHA512 aa2c83691a376329762fb97e18d89953b800dbbc127b0d7d128ded6eba7179062b1d3ff7e6956aadd72900b53900f9f6111610b070fee97eecbd871af9da520e
 MISC metadata.xml 559 BLAKE2B c43012a95ec8ddd3ce687f69b4dc1889c82f31828f8e1f53bded7723b82c2a8faff594674fbd819370078dc13f48f51df45a3a280563c6a00080e5332128498c SHA512 6c1e1e291bcd11a06fe4e7b73031accdf0fe839cb7372f96d1cc52e5c1a1a1b032adcf0da7dde016331fefcb1ae1402386ba3ab2713b4256e9e60dd2b73f76f5
diff --git a/sys-apps/accountsservice/accountsservice-23.13.9.ebuild b/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
index dad99e616477..61e932e21ed9 100644
--- a/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
+++ b/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
@@ -55,6 +55,9 @@ RDEPEND="${CDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch
 	"${FILESDIR}"/${PN}-23.13.9-generate-version.patch #905770
+	# From Alpine Linux
+	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/97
+	"${FILESDIR}"/${PN}-23.13.9-musl-fixes.patch
 )
 
 python_check_deps() {
diff --git a/sys-apps/accountsservice/files/accountsservice-23.13.9-musl-fixes.patch b/sys-apps/accountsservice/files/accountsservice-23.13.9-musl-fixes.patch
new file mode 100644
index 000000000000..abb59a137bfd
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-23.13.9-musl-fixes.patch
@@ -0,0 +1,52 @@
+From 962a66aa12932c7899cda78c4cbda0f581947285 Mon Sep 17 00:00:00 2001
+From: germ <germtoo@outlook.com>
+Date: Mon, 30 Oct 2023 06:16:16 -0400
+Subject: [PATCH 1/1] This applies two apatches to sys-apps/accountsserice
+ https://gitlab.alpinelinux.org/alpine/aports/-/raw/75528d8dc4206a74501799f6a6042be20b80801d/community/accountsservice/musl-fgetspent_r.patch
+ https://gitlab.alpinelinux.org/alpine/aports/-/raw/75528d8dc4206a74501799f6a6042be20b80801d/community/accountsservice/musl-wtmp.patch
+
+--- 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
+ 
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -215,6 +215,27 @@ remove_cache_files (const gchar *user_name)
+         g_remove (icon_filename);
+ }
+ 
++#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,
+-- 
+2.42.0
+