gentoo auto-resync : 17:05:2023 - 10:09:17

2 files changed, 44 insertions, 3 deletions

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index c08844b34d87..d5d353b41060 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -2,7 +2,7 @@ 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-musl-selinux.patch 3849 BLAKE2B a197f3e3926678151e2b49213389fb00bd9ce5426e4571629ae10563a4968e3eb307cacb87a6c3dfc8cbbf20335f2ef8cb4ea9403b593f5181d47d050b5d0636 SHA512 d105a47297c0f4767389ecf6573df38ccb9079c4d12d960b93f3ac31ed6abc1b226a4cfc32519354d7e01c0edfd8c04dc219a9b9a0380c673a653bccd3c6afc7
 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
diff --git a/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch b/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch
index 508bf037ccf1..433184edd102 100644
--- a/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch
+++ b/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch
@@ -37,7 +37,7 @@ not otherwise.
          _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) {
+@@ -72,12 +72,21 @@ void mac_selinux_retest(void) {
  #endif
  }
  
@@ -49,9 +49,50 @@ not otherwise.
 +REENABLE_WARNING
 +}
 +#else
-+#	warning "mallinfo() is missing, add mallinfo2() supported instead."
++#	warning "mallinfo() is missing, add mallinfo2() support instead."
 +#endif
 +
  int mac_selinux_init(void) {
  #if HAVE_SELINUX
          usec_t before_timestamp, after_timestamp;
+-        struct mallinfo before_mallinfo, after_mallinfo;
+         char timespan[FORMAT_TIMESPAN_MAX];
+-        int l;
+ 
+         selinux_set_callback(SELINUX_CB_POLICYLOAD, (union selinux_callback) mac_selinux_reload);
+ 
+@@ -87,7 +96,9 @@ int mac_selinux_init(void) {
+         if (!mac_selinux_use())
+                 return 0;
+ 
+-        before_mallinfo = mallinfo();
++#if HAVE_MALLINFO
++        struct mallinfo before_mallinfo = mallinfo_nowarn();
++#endif
+         before_timestamp = now(CLOCK_MONOTONIC);
+ 
+         label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
+@@ -95,14 +106,16 @@ int mac_selinux_init(void) {
+                 return log_enforcing_errno(errno, "Failed to initialize SELinux labeling handle: %m");
+ 
+         after_timestamp = now(CLOCK_MONOTONIC);
+-        after_mallinfo = mallinfo();
+-
+-        l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
++#if HAVE_MALLINFO
++        struct mallinfo after_mallinfo = mallinfo_nowarn();
++        int l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
+ 
+         log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.",
+                   format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0),
+-                  (l+1023)/1024);
+-
++                  DIV_ROUND_UP(l, 1024));
++#else
++        log_debug("Successfully loaded SELinux database in %s.",
++                  format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0));
+ #endif
+         return 0;
+ }
+-- 
+2.40.1