gentoo auto-resync : 12:06:2023 - 08:19:18

3 files changed, 54 insertions, 1 deletions

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index e8ee143f3f1a..fd6c19285f51 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -6,6 +6,7 @@ AUX elogind-246.10-musl-selinux.patch 3857 BLAKE2B 831b48c0b7eff35099325ca586ac3
 AUX elogind-246.10-revert-polkit-automagic.patch 1345 BLAKE2B 115c8f38f23b140b5f232cb80fa2486ad90895a0fad3717d79302ac2205fa260d35aab9fdbc98bf490790749b109d32f59cfee166da26a9457676943cf6a57b7 SHA512 84e7b8e09ffd41bd0ea466e4f7fbc333c42544d9ed6877b881dc68c55607e81406ca977c3c0c045db8e151f76df1c7c813395ccb73b6e38583ddd40c642244f1
 AUX elogind-252.9-musl-getdents.patch 1806 BLAKE2B 5d79695d51a06785bd2d83e57d0379c38f812890e567e96b6ccc00aa61feedb987c5a34b754b4682fe50d6bda8870290f026f800d91f4a9b445d784884db191d SHA512 d684b546762ca6a133e7b4395be514dfb1516c9e8e28c97ea216f4fa1bb66caa64db90cff19f68ac2cc2c5eb347ef813b9e030245c9fe1159f7d40ad8d63e666
 AUX elogind-252.9-musl-gshadow.patch 357 BLAKE2B ed804dee44af417163b7a286f83393457720712bbb2feabc202221925f2fa44149530a9b0adb30063e7d6f9846abb7a350644b4edc5c3f77da3d21b0eda62a6a SHA512 b69598c6ff56155b8f73bb4684bca6fd66011a9088e0007499617621d2f2b8b5683efabb414d1376a27f931d5372cfda845ad50e4e2efa498391529a22909108
+AUX elogind-252.9-musl-lfs.patch 2152 BLAKE2B cad592f4cec32add7acc62ba1de3d9706fe4f872709704bf1ee43c8ff1ec1ec067d50d5db66932fc2fc3049cf9ca165679939bfea063dec392639bface036245 SHA512 64865ab3c84bc59b1b9df993014ee68cb41c03140c28a3c58875de7cb54cc5a94a33c355a4ae068b275686850f540ca92e2cec792297fc6a440cc9df2440d444
 AUX elogind-252.9-musl-more-strerror_r.patch 1707 BLAKE2B e04bd210bb1d8b9e9a2c10e0f23ddb75fe24dbc4f233c59a32693947a5a6cc77d891299819dae125de869a9b261462f68ff78aaebf97d12a0648187856761404 SHA512 d79d8fb6149299b24d6935d1e8feff194daf67318d45dd8e93087e715f08863a6152261ee2c0b5eff89b01c7189117605309be43184104ba571fbb8425e2f364
 AUX elogind-252.9-musl-rlim-max.patch 768 BLAKE2B e1ac4fb26cc6fc27c2e817ee909314cc3cf8c01043a6eb634ca0f37a230c0af2bb427e0e9f5a13eaa5f4b4b85ead3f88293ef65c81ce75a8a77b402d0e016e23 SHA512 aca575a32e3bb209a5ddd20055b667c92fb4c1e70954a589243db4b145764b35c0067d0a9569b67ff707f85c0a8bea7c86da4b3813fec48e5267bd653b642e81
 AUX elogind-252.9-musl-sigfillset.patch 230 BLAKE2B ed25a1d56c1461cd99124c9fa85a9fa02ada74df62be1e401ebaa2f3346496556416567adf2a1aca22e30f2e5095a92fde72ba0ec3e99072284db678056ac9c8 SHA512 28884612bee898c775f51a27ad26a5478ade3a1608cb528d7797a01ad3606a71379e7486a39246032d736810ad7c8e2925ba25d5f72d39473a14e6e23fcffe3e
@@ -18,5 +19,5 @@ AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a
 DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
 DIST elogind-252.9.tar.gz 1922777 BLAKE2B dd566125e407b3479a44b007890f97c9c87a325b3fed2d3505499d2163f113affd998e14b1c1fc50b9b86b0d155b51dae344dcc1cddafb6a48c631d0a0f00c9a SHA512 eed620cbc2f03bfeae6a80c9a421c21d3293fa40adffb96c7e4d86508c06712041f6623fb2bac15ecbb85faca4b5674ea6423b3067840809fb27d023fd9e5ffd
 EBUILD elogind-246.10-r3.ebuild 4203 BLAKE2B 654babe35a2da1cfa838dd707173d06cdc4a6e68cf1ce545816d73e33e2c1b537696bff8396e7045a8e411bb10b7afcc6189afb43e34099b25339a653aebb6fd SHA512 2c9a2a223e086af696b421ef43508fc897d86c1fb11de6d2eb48f0f098127e9d4e2105801f75f7a92038c389c194b919c4e37122c441d152f88cff672c9d8617
-EBUILD elogind-252.9.ebuild 5040 BLAKE2B 1490d731ae04e2b5590371f538a798c6a3747cd041795461e59a39d168c150411a72634a6828115714928c5264b3a6545bad9c64ae969964443e66ab8c1f3779 SHA512 de0b9243e747c97b0da22521256241e59f11c3c4753d200bfd8d768eed932a461563c99fef58195437b98e4b6c159fb420747805f473576e11cad15103833da8
+EBUILD elogind-252.9.ebuild 5082 BLAKE2B 1c611f91cb659f89fba371e7a83067fa8d77bccc499adb4834eed3fd2fea84153411c598057f73933d97a6d99998e51cf40d1869e50ec2331c2373154068171d SHA512 d3a2c3b25bd74673fcd2f4c22b2a83cfe98a9028130ee32a7f535e25dd6dcf7c9a175cb75dd0a069f363731e4dbb230fdacc55a3114cf6932f880b481248d116
 MISC metadata.xml 643 BLAKE2B 8304073654ac908cfb0e65493afc49a3f4925ba1c4adb8d571b57ddf3d7cf22a8e79dfbc6e3e3eb4fd8fe7f23f2edf2e1f0df908342add9c39e488bc1676ba39 SHA512 8c745c007f86f8c6a867a8c6e747111c4cc3e8f0faf4ad50b2dc4bf92b756b5d3f7b15af9a51e1c7353a45afeced6ad56b420f2af76706fe7d8e542db50ac952
diff --git a/sys-auth/elogind/elogind-252.9.ebuild b/sys-auth/elogind/elogind-252.9.ebuild
index 6303be6caa2b..087f4b7f584b 100644
--- a/sys-auth/elogind/elogind-252.9.ebuild
+++ b/sys-auth/elogind/elogind-252.9.ebuild
@@ -54,6 +54,7 @@ DOCS=( README.md)
 
 PATCHES=(
 	"${FILESDIR}/${P}-nodocs.patch"
+	"${FILESDIR}/${PN}-252.9-musl-lfs.patch"
 )
 
 python_check_deps() {
diff --git a/sys-auth/elogind/files/elogind-252.9-musl-lfs.patch b/sys-auth/elogind/files/elogind-252.9-musl-lfs.patch
new file mode 100644
index 000000000000..4faa929c447a
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-252.9-musl-lfs.patch
@@ -0,0 +1,51 @@
+https://github.com/systemd/systemd/pull/27599
+
+From d096e05c625ea825eb4d781216ded717b7f71cca Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 10 May 2023 01:47:13 +0100
+Subject: [PATCH] dirent: conditionalize dirent assert based on dirent64
+ existence
+
+>=musl-1.2.4 doesn't define dirent64 and its LFS friends as its "native"
+functions are already LFS-aware.
+
+Check for dirent64 in meson.build and only assert if it exists.
+
+Bug: https://bugs.gentoo.org/905900
+Closes: https://github.com/systemd/systemd/pull/25809
+--- a/meson.build
++++ b/meson.build
+@@ -599,6 +599,7 @@ decl_headers = '''
+ #   define _GNU_SOURCE 1
+ # endif // _GNU_SOURCE
+ #endif // 1
++#include <dirent.h>
+ #include <uchar.h>
+ #include <sys/mount.h>
+ #include <sys/stat.h>
+@@ -608,6 +609,7 @@ foreach decl : ['char16_t',
+                 'char32_t',
+                 'struct mount_attr',
+                 'struct statx',
++                'struct dirent64',
+                ]
+ 
+         # We get -1 if the size cannot be determined
+--- a/src/basic/dirent-util.h
++++ b/src/basic/dirent-util.h
+@@ -39,6 +39,7 @@ struct dirent *readdir_no_dot(DIR *dirp);
+ /* Only if 64bit off_t is enabled struct dirent + struct dirent64 are actually the same. We require this, and
+  * we want them to be interchangeable to make getdents64() work, hence verify that. */
+ assert_cc(_FILE_OFFSET_BITS == 64);
++#if HAVE_STRUCT_DIRENT64
+ assert_cc(sizeof(struct dirent) == sizeof(struct dirent64));
+ assert_cc(offsetof(struct dirent, d_ino) == offsetof(struct dirent64, d_ino));
+ assert_cc(sizeof_field(struct dirent, d_ino) == sizeof_field(struct dirent64, d_ino));
+@@ -50,6 +51,7 @@ assert_cc(offsetof(struct dirent, d_type) == offsetof(struct dirent64, d_type));
+ assert_cc(sizeof_field(struct dirent, d_type) == sizeof_field(struct dirent64, d_type));
+ assert_cc(offsetof(struct dirent, d_name) == offsetof(struct dirent64, d_name));
+ assert_cc(sizeof_field(struct dirent, d_name) == sizeof_field(struct dirent64, d_name));
++#endif
+ 
+ #define FOREACH_DIRENT_IN_BUFFER(de, buf, sz)                           \
+         for (void *_end = (uint8_t*) ({ (de) = (buf); }) + (sz);        \