gentoo auto-resync : 16:05:2023 - 10:06:32

3 files changed, 60 insertions, 1 deletions

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index fc5abe47c85c..c08844b34d87 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -2,10 +2,11 @@ AUX elogind-241.4-broken-test.patch 436 BLAKE2B 204591800f415b00535bcd520435ea91
 AUX elogind-243.7-nodocs.patch 999 BLAKE2B f4fc95f14ce0412e88bb8b2a001975fae3b42bdf82c1f23b28e4b2cc635d92722c6317ac919bedd1dfbcc47faf4a177d6662b3b04569ce993e1b8fd5ce8bde15 SHA512 87c6072f95b9fe752324ae8dce576a70f795c31115f4b7478cd66c0ab22e50d0035620b5a278f042bc95635423056b1a7984ed81b32e9011dee84b9a5dec7566
 AUX elogind-246.10-clang-undefined-symbol.patch 1090 BLAKE2B aaad5048696084e0a010c9a6716a91af686d76199e4e7e83d7857c02f782e18e2c7c8a716677372dda115d19b54290db55c62a5c32deb3553d0341495aa73937 SHA512 6766eb5d34135cd581d50f8a9eabda4826731368234522d1c5a94775d54f4d90b1195348ad7a0f6f2af0e2460a9d359859072c57c41085b92707f7044ab46956
 AUX elogind-246.10-loong.patch 1493 BLAKE2B 40fbeae11f4f8387e0880e0ad91dc42577e0e8b160a0d916471ae852b5e40ff425b85668c04cb1e54c7f7087d05f3fcf0216938616b07bb413dfcc7be2220f34 SHA512 befb95281c83ec0421a16e26402c58a49d8a3c9e3100c8c164c1537073be5af2416ac2561271d7e4965d88c2693e8e2face3ca0b486bbef2f00216fa0c20396f
+AUX elogind-246.10-musl-selinux.patch 2214 BLAKE2B 68153700c8f6ef6e2594f0e3acae216ef6472277796650e1e92a542248b1a548251ff36b37736317d91cddee1fcdafd453bc341b0c05acc3b7875e46f148ea7a SHA512 cecf103fd4290bf7deb13382453855edc6a70c96b77b39488beb3aa3601f1b7293083889d051462a35fd29683272c37c46f20b3f7a260893fd3d3092381b2652
 AUX elogind-246.10-revert-polkit-automagic.patch 1345 BLAKE2B 115c8f38f23b140b5f232cb80fa2486ad90895a0fad3717d79302ac2205fa260d35aab9fdbc98bf490790749b109d32f59cfee166da26a9457676943cf6a57b7 SHA512 84e7b8e09ffd41bd0ea466e4f7fbc333c42544d9ed6877b881dc68c55607e81406ca977c3c0c045db8e151f76df1c7c813395ccb73b6e38583ddd40c642244f1
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a4f0f2c166b4062ebc6b01f201f1b7d1f22f6781c51ac22f924136c83c0b0cdb29d6aadf640a6c0e8 SHA512 97d78afe1c0833f3f632272904bd8338869639facb79cd2fae6a4bf58fc5b2dd960484e1f9945152ff13d075216cf4b48b6b234eb7738fbbf445eee2c20e88f2
 DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
-EBUILD elogind-246.10-r3.ebuild 4164 BLAKE2B 70bdeb2c23f081bb94236ff523532ffede3e220ac83f62c2c71502340f49f9ba6fb04d32190abf5d405a37765ad59ac5318568db5575eb244351ebbad7488b0c SHA512 9f4de26d870a8ec688918e0e6296e56dec2ed8f2cdb3917c8ed83ae0580b4355170067ed8998408ea81f4c09b1c8411fba082d96e40f255decc62686b2f50b34
+EBUILD elogind-246.10-r3.ebuild 4203 BLAKE2B 654babe35a2da1cfa838dd707173d06cdc4a6e68cf1ce545816d73e33e2c1b537696bff8396e7045a8e411bb10b7afcc6189afb43e34099b25339a653aebb6fd SHA512 2c9a2a223e086af696b421ef43508fc897d86c1fb11de6d2eb48f0f098127e9d4e2105801f75f7a92038c389c194b919c4e37122c441d152f88cff672c9d8617
 MISC metadata.xml 643 BLAKE2B 8304073654ac908cfb0e65493afc49a3f4925ba1c4adb8d571b57ddf3d7cf22a8e79dfbc6e3e3eb4fd8fe7f23f2edf2e1f0df908342add9c39e488bc1676ba39 SHA512 8c745c007f86f8c6a867a8c6e747111c4cc3e8f0faf4ad50b2dc4bf92b756b5d3f7b15af9a51e1c7353a45afeced6ad56b420f2af76706fe7d8e542db50ac952
diff --git a/sys-auth/elogind/elogind-246.10-r3.ebuild b/sys-auth/elogind/elogind-246.10-r3.ebuild
index d796cea56f11..532c0142c6d7 100644
--- a/sys-auth/elogind/elogind-246.10-r3.ebuild
+++ b/sys-auth/elogind/elogind-246.10-r3.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-revert-polkit-automagic.patch"
 	"${FILESDIR}/${P}-clang-undefined-symbol.patch"
 	"${FILESDIR}/${P}-loong.patch"
+	"${FILESDIR}/${P}-musl-selinux.patch"
 )
 
 pkg_setup() {
diff --git a/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch b/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch
new file mode 100644
index 000000000000..508bf037ccf1
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/888912
+https://github.com/elogind/elogind/commit/ab72a46f3104f44a32ef7bec7439aa9d3b5f0fdc
+
+Rebased version to apply to 246.10 by concord@.
+
+From ab72a46f3104f44a32ef7bec7439aa9d3b5f0fdc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Fri, 9 Oct 2020 16:48:03 +0200
+Subject: [PATCH] basic/selinux: work around mallinfo deprecation
+
+Latest glibc has deprecated mallinfo(), so it might become unavailable at some point
+in the future. There is malloc_info(), but it returns XML, ffs. I think the information
+that we get from mallinfo() is quite useful, so let's use mallinfo() if available, and
+not otherwise.
+--- a/meson.build
++++ b/meson.build
+@@ -617,6 +617,7 @@ foreach ident : [
+                                  #include <unistd.h>
+                                  #include <signal.h>
+                                  #include <sys/wait.h>'''],
++        ['mallinfo',          '''#include <malloc.h>'''],
+ ]
+ 
+         have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE')
+--- a/src/basic/macro.h
++++ b/src/basic/macro.h
+@@ -93,6 +93,10 @@
+ #endif
+ 
+ /* Temporarily disable some warnings */
++#define DISABLE_WARNING_DEPRECATED_DECLARATIONS                         \
++        _Pragma("GCC diagnostic push");                                 \
++        _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
++
+ #define DISABLE_WARNING_FORMAT_NONLITERAL                               \
+         _Pragma("GCC diagnostic push");                                 \
+         _Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
+--- a/src/basic/selinux-util.c
++++ b/src/basic/selinux-util.c
+@@ -72,6 +72,17 @@ void mac_selinux_retest(void) {
+ #endif
+ }
+ 
++#if HAVE_MALLINFO
++static struct mallinfo mallinfo_nowarn(void) {
++        /* glibc has deprecated mallinfo(), but the replacement malloc_info() returns an XML blob ;=[ */
++DISABLE_WARNING_DEPRECATED_DECLARATIONS
++        return mallinfo();
++REENABLE_WARNING
++}
++#else
++#	warning "mallinfo() is missing, add mallinfo2() supported instead."
++#endif
++
+ int mac_selinux_init(void) {
+ #if HAVE_SELINUX
+         usec_t before_timestamp, after_timestamp;