diff options
Diffstat (limited to 'user/networkmanager/musl.patch')
| -rw-r--r-- | user/networkmanager/musl.patch | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/user/networkmanager/musl.patch b/user/networkmanager/musl.patch index 2e4370969..d8e9fdab2 100644 --- a/user/networkmanager/musl.patch +++ b/user/networkmanager/musl.patch @@ -53,7 +53,7 @@ diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h index 2b5baba..976850c 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h -@@ -30,7 +30,11 @@ +@@ -29,7 +29,11 @@ #include <netinet/in.h> /* For ETH_ALEN and INFINIBAND_ALEN */ @@ -69,7 +69,7 @@ diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/s index d2246a8..4cb0807 100644 --- a/shared/systemd/src/basic/socket-util.h +++ b/shared/systemd/src/basic/socket-util.h -@@ -12,6 +12,11 @@ +@@ -13,6 +13,11 @@ #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> @@ -85,7 +85,7 @@ diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils index 36148b5..d282eb2 100644 --- a/src/platform/wifi/nm-wifi-utils.h +++ b/src/platform/wifi/nm-wifi-utils.h -@@ -22,7 +22,11 @@ +@@ -21,7 +21,11 @@ #ifndef __WIFI_UTILS_H__ #define __WIFI_UTILS_H__ @@ -101,7 +101,7 @@ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 7514fa7..f041382 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -32,7 +32,11 @@ +@@ -31,7 +31,11 @@ #include <arpa/inet.h> #include <fcntl.h> #include <linux/if_addr.h> @@ -117,7 +117,7 @@ diff --git a/src/nm-manager.c b/src/nm-manager.c index 0bf6a75..e392507 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -26,6 +26,7 @@ +@@ -25,6 +25,7 @@ #include <stdlib.h> #include <fcntl.h> #include <unistd.h> @@ -125,21 +125,11 @@ index 0bf6a75..e392507 100644 #include "nm-utils/nm-c-list.h" ---- NetworkManager-1.18.1/shared/systemd/src/basic/fs-util.h.old 2019-04-18 09:19:11.000000000 +0000 -+++ NetworkManager-1.18.1/shared/systemd/src/basic/fs-util.h 2019-05-10 06:02:21.493921788 +0000 -@@ -7,6 +7,7 @@ - #include <stdbool.h> - #include <stdint.h> - #include <sys/inotify.h> -+#include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> - diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h index 8c07c53..d043afc 100644 --- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h +++ b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h -@@ -65,7 +65,7 @@ +@@ -63,7 +63,7 @@ # ifdef HAVE___SECURE_GETENV # define secure_getenv __secure_getenv # else @@ -150,7 +140,7 @@ index 8c07c53..d043afc 100644 --- NetworkManager-1.18.1/src/platform/nm-linux-platform.c.old 2019-04-19 09:31:51.000000000 +0000 +++ NetworkManager-1.18.1/src/platform/nm-linux-platform.c 2019-05-10 07:21:32.665163629 +0000 -@@ -20,6 +20,7 @@ +@@ -19,6 +19,7 @@ #include "nm-default.h" #include "nm-linux-platform.h" @@ -158,7 +148,7 @@ index 8c07c53..d043afc 100644 #include <arpa/inet.h> #include <dlfcn.h> -@@ -28,7 +29,11 @@ +@@ -27,7 +28,11 @@ #include <libudev.h> #include <linux/fib_rules.h> #include <linux/ip.h> @@ -182,7 +172,7 @@ diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/ index b0afb5c..f72e346 100644 --- a/shared/systemd/src/basic/process-util.c +++ b/shared/systemd/src/basic/process-util.c -@@ -21,6 +21,9 @@ +@@ -19,6 +19,9 @@ #include <sys/wait.h> #include <syslog.h> #include <unistd.h> @@ -192,7 +182,7 @@ index b0afb5c..f72e346 100644 #if 0 /* NM_IGNORED */ #if HAVE_VALGRIND_VALGRIND_H #include <valgrind/valgrind.h> -@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) { +@@ -1105,11 +1108,13 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -206,7 +196,7 @@ index b0afb5c..f72e346 100644 pid_t getpid_cached(void) { static bool installed = false; -@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) { +@@ -1138,7 +1143,12 @@ pid_t getpid_cached(void) { * only half-documented (glibc doesn't document it but LSB does — though only superficially) * we'll check for errors only in the most generic fashion possible. */ @@ -221,3 +211,14 @@ index b0afb5c..f72e346 100644 cached_pid = CACHED_PID_UNSET; return new_pid; +--- NetworkManager-1.20.0/src/systemd/src/libsystemd-network/sd-dhcp6-client.c.old 2019-08-06 10:22:09.000000000 +0000 ++++ NetworkManager-1.20.0/src/systemd/src/libsystemd-network/sd-dhcp6-client.c 2019-08-09 05:17:18.249955730 +0000 +@@ -8,7 +8,7 @@ + #include <errno.h> + #include <string.h> + #include <sys/ioctl.h> +-#include <linux/if_arp.h> ++#include <net/if_arp.h> + #include <linux/if_infiniband.h> + + #include "sd-dhcp6-client.h" |