From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/files/, sys-auth/elogind/
Date: Tue, 16 May 2023 06:46:12 +0000 (UTC) [thread overview]
Message-ID: <1684219558.93f87ff3f4ae7df427ce82b3c95ac89b3f418142.sam@gentoo> (raw)
commit: 93f87ff3f4ae7df427ce82b3c95ac89b3f418142
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 06:45:23 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 16 06:45:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93f87ff3
sys-auth/elogind: fix musl+selinux build
Closes: https://bugs.gentoo.org/888912
Thanks-to: Kenton Groombridge <concord <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-auth/elogind/elogind-246.10-r3.ebuild | 1 +
.../files/elogind-246.10-musl-selinux.patch | 57 ++++++++++++++++++++++
2 files changed, 58 insertions(+)
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;
next reply other threads:[~2023-05-16 6:46 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-16 6:46 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-19 15:41 [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/files/, sys-auth/elogind/ Andreas Sturmlechner
2024-11-24 10:28 Andreas Sturmlechner
2024-11-14 19:51 Andreas Sturmlechner
2024-08-28 7:40 Andreas Sturmlechner
2024-04-30 16:05 Andreas K. Hüttel
2023-06-12 3:49 Sam James
2023-06-10 14:54 Piotr Karbowski
2023-05-31 0:43 Sam James
2023-05-31 0:43 Sam James
2022-12-06 6:18 WANG Xuerui
2021-11-22 5:56 Sam James
2021-01-10 13:14 Piotr Karbowski
2020-04-04 9:30 Andreas Sturmlechner
2020-03-12 22:15 Andreas Sturmlechner
2020-02-02 16:19 Andreas Sturmlechner
2019-11-30 12:08 Andreas Sturmlechner
2019-11-15 17:37 Andreas Sturmlechner
2019-05-15 10:38 Andreas Sturmlechner
2019-04-18 19:14 Jory Pratt
2019-03-16 5:26 Michael Palimaka
2018-11-17 7:24 Michael Palimaka
2018-06-30 20:47 Andreas Sturmlechner
2018-03-05 22:14 Andreas Sturmlechner
2018-03-04 10:06 Andreas Sturmlechner
2018-01-31 10:22 Andreas Sturmlechner
2018-01-10 10:00 Andreas Sturmlechner
2017-03-21 19:11 Andreas Sturmlechner
2017-03-21 10:15 Andreas Sturmlechner
2017-03-21 10:15 Andreas Sturmlechner
2017-01-15 12:17 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1684219558.93f87ff3f4ae7df427ce82b3c95ac89b3f418142.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox