user/networkmanager: bump to 1.20.0

6 files changed, 109 insertions, 37 deletions

diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD
index daf79c413..0b1935ebe 100644
--- a/user/networkmanager/APKBUILD
+++ b/user/networkmanager/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=networkmanager
-pkgver=1.18.1
+pkgver=1.20.0
 pkgrel=0
 pkgdesc="Network management daemon"
 url="https://wiki.gnome.org/Projects/NetworkManager"
@@ -14,10 +14,12 @@ makedepends="bluez-dev consolekit2-dev curl-dev dbus-dev dbus-glib-dev
 	libndp-dev libxslt modemmanager-dev ncurses-dev newt-dev nss-dev
 	perl polkit-dev ppp-dev py3-pygobject util-linux-dev vala-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc"
-source="https://download.gnome.org/sources/NetworkManager/1.18/NetworkManager-$pkgver.tar.xz
+source="https://download.gnome.org/sources/NetworkManager/1.20/NetworkManager-$pkgver.tar.xz
 	editline.patch
 	errno.patch
 	musl.patch
+	qsort_r.patch
+	random.patch
 	tests.patch
 
 	01-org.freedesktop.NetworkManager.rules
@@ -51,7 +53,6 @@ build() {
 		--with-dhcpcd \
 		--with-ebpf=yes \
 		--with-iptables=/sbin/iptables \
-		--with-libnm-glib \
 		--with-nmcli=yes \
 		--with-nmtui \
 		--with-pppd-plugin-dir=/usr/lib/pppd/$(ls -1 /usr/lib/pppd | head) \
@@ -89,11 +90,13 @@ openrc() {
 		"$subpkgdir"/etc/NetworkManager/dispatcher.d/
 }
 
-sha512sums="24ffd5b5802692ce392a5ce65623679014d4e476cddedf76222829118f3ab4c92e180c1814db80438f66e2ab7a4e93eb1bac1e0b77575ff7620b0bf0e27d2992  NetworkManager-1.18.1.tar.xz
-559dc42d3017508bfc35ea91da3d0169d601cd6b1764210fd8a27733e9c6671ec2d2d4d6a88af6749df450ea0c16dbc5269258cf2a0b608b9223688a40ca3ec0  editline.patch
+sha512sums="825c56a7530d813ba7ea2ec57034def560f4b0fb65a09dc70cd94dc897e2aabde11f18c6c4843da9c520531683e963037ce42270a6ffa5c7c5e9502bb80bdf1b  NetworkManager-1.20.0.tar.xz
+a849f8172b88370f48217e04f2fafb4431db32415df52af7d4a388f604f7d03c4c21b6ad37afb57e52700a38a7e78365025da99991bc8d179c73dabb31e05256  editline.patch
 0006d9c538a72673746b6aede8c61e0b7a23b055f8276fa2dde6e70f8c00d60854cf49678c996764f83b40cf06c5c2cd24c8c382d900aaf97fc840342e29500f  errno.patch
-2d77b08d737653999631b8d51b884d12a2f6ba62ef99f0115e0fe2513fcdabec44ea67083684a6762dbc0423d9b41706d6223e4751bbabb70e8ef0691af57256  musl.patch
-2c987c464c31e6ad5a34abd8401bb625e9438e656a55adca21e07ca6ee974d39b6d7e942805b17a72ef38154612e2475fd7951f185b775945c8bd740226668af  tests.patch
+313e57823ffa49bd7b76355f8cea6932737ae4b38cb00eb183b12093a8109e079dc7439b2b35fa6bf9b83f2937729cca847a2bf31857382e9c3ae0b945c2dd6b  musl.patch
+5142bf14ac5574a3ae4bc8753055c534702892871ca45a1bc4d48d4d5c07d11bd54e52861458a673c328d129cdd6f1f749a9546eba1c16fea5173f92840506de  qsort_r.patch
+f149b9bb7b16c6e79685ff6a8c0f6f20a692bb675f66f8dd5dffe2158850b15d7a4591be8e906adec5e16047b681d0501b3228c4af5d218152ec8f82068fd414  random.patch
+942986f22b1b522420afb885ca5c1d5dcaae10c193e001cb0604a78125b5efcc7f3e2b318f2b1f44b867369a243f7467bb00948617ac1d44271da7fd6e6b2ce6  tests.patch
 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214  01-org.freedesktop.NetworkManager.rules
 26f962cea0b6a75549d16c19a71e3559239b08b001927882702f5d9355a2cc95f7b13c581439f758a950d9a5bfb73b86ba61a5ffb22c9abe19f5b05fe5f5834a  10-openrc-status
 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a  nm.confd
diff --git a/user/networkmanager/editline.patch b/user/networkmanager/editline.patch
index e97461d3a..e727f374a 100644
--- a/user/networkmanager/editline.patch
+++ b/user/networkmanager/editline.patch
@@ -22,7 +22,7 @@
  
  #include "nm-vpn-helpers.h"
  #include "nm-client-utils.h"
-@@ -984,7 +983,7 @@
+@@ -1008,7 +1007,7 @@
   * nmc_readline_echo:
   *
   * The same as nmc_readline() except it can disable echoing of input characters if @echo_on is %FALSE.
@@ -31,7 +31,7 @@
   */
  char *
  nmc_readline_echo (const NmcConfig *nmc_config,
-@@ -995,8 +994,7 @@
+@@ -1019,8 +1018,7 @@
  	va_list args;
  	gs_free char *prompt = NULL;
  	char *str;
@@ -41,7 +41,7 @@
  
  	va_start (args, prompt_fmt);
  	prompt = g_strdup_vprintf (prompt_fmt, args);
-@@ -1006,8 +1004,7 @@
+@@ -1030,8 +1028,7 @@
  
  	/* Hide the actual password */
  	if (!echo_on) {
@@ -51,7 +51,7 @@
  		rl_redisplay_function = nmc_secret_redisplay;
  	}
  
-@@ -1016,7 +1013,10 @@
+@@ -1040,7 +1037,10 @@
  	/* Restore the non-hiding behavior */
  	if (!echo_on) {
  		rl_redisplay_function = rl_redisplay;
@@ -75,7 +75,7 @@
  #include <fcntl.h>
  
  #include "nm-client-utils.h"
-@@ -6007,9 +6006,6 @@
+@@ -6050,9 +6049,6 @@
  	return nmc_rl_gen_func_basic (text, state, avals);
  }
  
@@ -85,7 +85,7 @@
  /*
   * Attempt to complete on the contents of TEXT.  START and END show the
   * region of TEXT that contains the word to complete.  We can use the
-@@ -6036,9 +6032,6 @@
+@@ -6079,9 +6075,6 @@
  	/* Disable default filename completion */
  	rl_attempted_completion_over = 1;
  
@@ -95,7 +95,7 @@
  	/* Filter out possible ANSI color escape sequences */
  	prompt_tmp = nmc_filter_out_colors ((const char *) rl_prompt);
  
-@@ -9142,7 +9135,6 @@
+@@ -9150,7 +9143,6 @@
  		generator_func = _meta_abstract_generator;
  	} else if (g_strcmp0 (rl_prompt, PROMPT_IMPORT_FILE) == 0) {
  		rl_attempted_completion_over = 0;
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"
diff --git a/user/networkmanager/qsort_r.patch b/user/networkmanager/qsort_r.patch
new file mode 100644
index 000000000..39235787f
--- /dev/null
+++ b/user/networkmanager/qsort_r.patch
@@ -0,0 +1,18 @@
+From: Gottox @ Void
+
+diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
+index e029f8646..168735087 100644
+--- a/shared/systemd/src/basic/sort-util.h
++++ b/shared/systemd/src/basic/sort-util.h
+@@ -67,7 +67,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
+                 return;
+ 
+         assert(base);
++#ifdef __GLIBC__
+         qsort_r(base, nmemb, size, compar, userdata);
++#else
++        g_qsort_with_data(base, nmemb, size, compar, userdata);
++#endif
+ }
+ 
+ #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/user/networkmanager/random.patch b/user/networkmanager/random.patch
new file mode 100644
index 000000000..30acd9c3b
--- /dev/null
+++ b/user/networkmanager/random.patch
@@ -0,0 +1,50 @@
+From: Gottox @ Void
+
+diff --git shared/n-dhcp4/src/n-dhcp4-c-probe.c shared/n-dhcp4/src/n-dhcp4-c-probe.c
+index 308cff830..9463528b1 100644
+--- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c
++++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
+@@ -362,8 +362,12 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe
+         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
+         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
+ 
++#ifdef __GLIBC__
+         r = seed48_r(seed16v, &config->entropy);
+         c_assert(!r);
++#else
++        memcpy(config->entropy, seed16v, sizeof seed16v);
++#endif
+ }
+ 
+ /**
+@@ -377,10 +381,14 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe
+  */
+ uint32_t n_dhcp4_client_probe_config_get_random(NDhcp4ClientProbeConfig *config) {
+         long int result;
++#ifdef __GLIBC__
+         int r;
+ 
+         r = mrand48_r(&config->entropy, &result);
+         c_assert(!r);
++#else
++        result = jrand48(config->entropy);
++#endif
+ 
+         return result;
+ };
+diff --git shared/n-dhcp4/src/n-dhcp4-private.h shared/n-dhcp4/src/n-dhcp4-private.h
+index c38ddbfc8..fb4880771 100644
+--- a/shared/n-dhcp4/src/n-dhcp4-private.h
++++ b/shared/n-dhcp4/src/n-dhcp4-private.h
+@@ -259,7 +259,11 @@ struct NDhcp4ClientProbeConfig {
+         bool inform_only;
+         bool init_reboot;
+         struct in_addr requested_ip;
++#ifdef __GLIBC__
+         struct drand48_data entropy;    /* entropy pool */
++#else
++        unsigned short entropy[3];      /* entropy pool */
++#endif
+         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
+         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
+         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/user/networkmanager/tests.patch b/user/networkmanager/tests.patch
index 8fb5cda60..ec9719a89 100644
--- a/user/networkmanager/tests.patch
+++ b/user/networkmanager/tests.patch
@@ -1,6 +1,6 @@
 --- NetworkManager-1.18.1/src/devices/tests/test-lldp.c.old	2019-04-18 09:19:11.000000000 +0000
 +++ NetworkManager-1.18.1/src/devices/tests/test-lldp.c	2019-05-10 07:23:58.979198831 +0000
-@@ -21,7 +21,6 @@
+@@ -20,7 +20,6 @@
  #include "nm-default.h"
  
  #include <fcntl.h>
@@ -8,7 +8,7 @@
  #include <sys/ioctl.h>
  #include <sys/stat.h>
  #include <sys/types.h>
-@@ -32,6 +31,7 @@
+@@ -31,6 +30,7 @@
  #include "platform/tests/test-common.h"
  
  #include "nm-test-utils-core.h"