selinux.patch

file_888912.txt (text/plain), 1.75 KB, created by dsreyes1014 on 2022-12-29 23:23:09 UTC

diff --git a/meson.build b/meson.build
index 72825a288..79177de0a 100644
--- 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')
diff --git a/src/basic/macro.h b/src/basic/macro.h
index 6fdf7fc3d..6a31f86e2 100644
--- 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\"")
diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 6fee7206f..f9087b728 100644
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -72,12 +72,21 @@ 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