From b7e08f685d9a2a986e4e1ffa76becd373f8e233c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 5 Oct 2020 22:06:01 +0200
Subject: [PATCH] systemd: workaround compilation failures against old glibc

Building against older libc/kernel headers can fail, because our glue
code for systemd has issues. Fix them by forward declaring "struct
statx" and by disabling parts of "socket-util.c".
---
 shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 4 ++++
 shared/systemd/src/basic/socket-util.c              | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
index a937a8893..0160284d9 100644
--- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
+++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
@@ -140,6 +140,10 @@ NM_PRAGMA_WARNING_DISABLE("-Wdeclaration-after-statement")
 
 /*****************************************************************************/
 
+struct statx;
+
+/*****************************************************************************/
+
 static inline pid_t
 raw_getpid(void)
 {
diff --git a/shared/systemd/src/basic/socket-util.c b/shared/systemd/src/basic/socket-util.c
index 01dce3ab5..4d889e565 100644
--- a/shared/systemd/src/basic/socket-util.c
+++ b/shared/systemd/src/basic/socket-util.c
@@ -1217,6 +1217,7 @@ ssize_t recvmsg_safe(int sockfd, struct msghdr *msg, int flags) {
         return n;
 }
 
+#if 0 /* NM_IGNORED */
 int socket_get_family(int fd, int *ret) {
         int af;
         socklen_t sl = sizeof(af);
@@ -1393,3 +1394,4 @@ int socket_set_transparent(int fd, int af, bool b) {
                 return -EAFNOSUPPORT;
         }
 }
+#endif /* NM_IGNORED */