merge branch 'th/gitlab-ci-alpine' (part 2)

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/704

clients/cli/connections.c

@@ -11,7 +11,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
-#include <netinet/ether.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <fcntl.h>

libnm-core/nm-utils.c

@@ -8,8 +8,9 @@
 #include "nm-utils.h"
 
 #include <stdlib.h>
-#include <netinet/ether.h>
+#include <net/ethernet.h>
 #include <arpa/inet.h>
+#include <net/if_arp.h>
 #include <uuid/uuid.h>
 #include <libintl.h>
 #include <gmodule.h>

shared/n-dhcp4/src/test-run-client.c

@@ -11,7 +11,6 @@
 #include <errno.h>
 #include <getopt.h>
 #include <net/if.h>
-#include <netinet/ether.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <stdbool.h>

shared/nm-glib-aux/nm-errno.c

@@ -106,7 +106,7 @@ nm_strerror_native_r(int errsv, char *buf, gsize buf_size)
     nm_assert(buf);
     nm_assert(buf_size > 0);
 
-#if (_POSIX_C_SOURCE >= 200112L) && !_GNU_SOURCE
+#if (!defined(__GLIBC__) && !defined(__UCLIBC__)) || ((_POSIX_C_SOURCE >= 200112L) && !_GNU_SOURCE)
     /* XSI-compliant */
     {
         int errno_saved = errno;

shared/nm-glib-aux/nm-json-aux.c

@@ -11,6 +11,16 @@
 
 /*****************************************************************************/
 
+/* If RTLD_DEEPBIND isn't available just ignore it. This can cause problems
+ * with jansson, json-glib, and cjson symbols clashing (and as such crashing the
+ * program). But that needs to be fixed by the json libraries, and it is by adding
+ * symbol versioning in recent versions. */
+#ifndef RTLD_DEEPBIND
+    #define RTLD_DEEPBIND 0
+#endif
+
+/*****************************************************************************/
+
 static void
 _gstr_append_string_len(GString *gstr, const char *str, gsize len)
 {

shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h

@@ -195,6 +195,13 @@ _nm_gettid(void)
         #define HAVE_RT_SIGQUEUEINFO 0
     #endif
 
+    #ifndef __COMPAR_FN_T
+        #define __COMPAR_FN_T
+typedef int (*__compar_fn_t)(const void *, const void *);
+typedef __compar_fn_t comparison_fn_t;
+typedef int (*__compar_d_fn_t)(const void *, const void *, void *);
+    #endif
+
 #endif /* (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD */
 
 /*****************************************************************************/

shared/systemd/src/basic/fileio.h

@@ -6,7 +6,11 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <sys/stat.h>
+#if 0 /* NM_IGNORED */
 #include <sys/fcntl.h>
+#else /* NM_IGNORED */
+#include <fcntl.h>
+#endif /* NM_IGNORED */
 #include <sys/types.h>
 
 #include "macro.h"

shared/systemd/src/basic/sort-util.h

@@ -55,6 +55,7 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, __compar_f
                 _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \
         })
 
+#if 0 /* NM_IGNORED */
 static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) {
         if (nmemb <= 1)
                 return;
@@ -68,3 +69,4 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
                 int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \
                 qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \
         })
+#endif /* NM_IGNORED */

shared/systemd/src/basic/stdio-util.h

@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
+#if 0 /* NM_IGNORED */
 #include <printf.h>
+#endif /* NM_IGNORED */
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/types.h>

src/initrd/tests/test-cmdline-reader.c

@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
-#include <netinet/ether.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>

src/initrd/tests/test-dt-reader.c

@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
-#include <netinet/ether.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>

src/initrd/tests/test-ibft-reader.c

@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
-#include <netinet/ether.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>

src/systemd/src/libsystemd-network/network-internal.c

@@ -4,7 +4,6 @@
 
 #include <arpa/inet.h>
 #include <linux/if.h>
-#include <netinet/ether.h>
 
 #include "sd-id128.h"
 #include "sd-ndisc.h"

src/tests/test-core-with-expect.c

@@ -6,7 +6,6 @@
 #include "nm-default.h"
 
 #include <time.h>
-#include <netinet/ether.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <fcntl.h>