Merge branch 'master' into zfs

6 files changed, 46 insertions, 46 deletions

diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD
index 6fb844bf9..19ba6c868 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.20.4
+pkgver=1.22.8
 pkgrel=0
 pkgdesc="Network management daemon"
 url="https://wiki.gnome.org/Projects/NetworkManager"
@@ -9,12 +9,12 @@ arch="all"
 options="!check"  # Requires dbus-python and running DBus server.
 license="GPL-2.0+ AND LGPL-2.1+"
 depends="dhcpcd iputils ppp wpa_supplicant-dbus"
-makedepends="bluez-dev consolekit2-dev curl-dev dbus-dev dbus-glib-dev
+makedepends="bash bluez-dev consolekit2-dev curl-dev dbus-dev dbus-glib-dev
 	eudev-dev glib-dev gobject-introspection-dev intltool libedit-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.20/NetworkManager-$pkgver.tar.xz
+source="https://download.gnome.org/sources/NetworkManager/${pkgver%.*}/NetworkManager-$pkgver.tar.xz
 	editline.patch
 	errno.patch
 	musl.patch
@@ -31,7 +31,7 @@ builddir="$srcdir/NetworkManager-$pkgver"
 
 build() {
 	# pppd plugin dir is a huge hack.
-	./configure \
+	bash ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -90,13 +90,13 @@ openrc() {
 		"$subpkgdir"/etc/NetworkManager/dispatcher.d/
 }
 
-sha512sums="d08f7e8f5ea8f8567834a53a68ff7aeff09839658b73dc17b31dbdd7dd5c36b09f4e563c2ebc52d1e1574a84163e66e0bfee01c3762a222aa7154d18c09660cb  NetworkManager-1.20.4.tar.xz
-a849f8172b88370f48217e04f2fafb4431db32415df52af7d4a388f604f7d03c4c21b6ad37afb57e52700a38a7e78365025da99991bc8d179c73dabb31e05256  editline.patch
-0006d9c538a72673746b6aede8c61e0b7a23b055f8276fa2dde6e70f8c00d60854cf49678c996764f83b40cf06c5c2cd24c8c382d900aaf97fc840342e29500f  errno.patch
-313e57823ffa49bd7b76355f8cea6932737ae4b38cb00eb183b12093a8109e079dc7439b2b35fa6bf9b83f2937729cca847a2bf31857382e9c3ae0b945c2dd6b  musl.patch
+sha512sums="3533f6d0cfb2723078aece287101feda0d4f65a1f0160ae17dd77142ca5e126a0f27f5904c2e2c4dcdf9433dacc3990e1bf366f14e67b94fa1cd3006dd6b3a4c  NetworkManager-1.22.8.tar.xz
+ecd9cb920a125e0e3c4b8c96048ca3ac24490fdd453f0525ecaccf688687692e7a5feaf87eeaf97a2dfb405b2e0db8743114510e30f00f7ae119dc9b9551e7d7  editline.patch
+b0b85294c19510893ba30cf3d0e1984430c451273d4eb545760de52c69866a5ed0385f9c14a9bc180da01daad7d1c0da221101e7a826bc5be53c2724c9990d95  errno.patch
+7b3cfbea8b80f832862d79fce9f89f604b457744324a8ae6b428cf3cb42ec2536d3c5784303d140d50c5a2cd8caf91d04f5096ef420a57a761e412bf2256bd5a  musl.patch
 5142bf14ac5574a3ae4bc8753055c534702892871ca45a1bc4d48d4d5c07d11bd54e52861458a673c328d129cdd6f1f749a9546eba1c16fea5173f92840506de  qsort_r.patch
-f149b9bb7b16c6e79685ff6a8c0f6f20a692bb675f66f8dd5dffe2158850b15d7a4591be8e906adec5e16047b681d0501b3228c4af5d218152ec8f82068fd414  random.patch
-942986f22b1b522420afb885ca5c1d5dcaae10c193e001cb0604a78125b5efcc7f3e2b318f2b1f44b867369a243f7467bb00948617ac1d44271da7fd6e6b2ce6  tests.patch
+d81a962e32e696ca713dfcf1f8dbd9a146f94473c391f1977198ca67e11a6d427a265bacbe43197e42b442cfaa882e9fd2bba7548872586d53d3caca76263e79  random.patch
+602859c1c7b63984b3b9d9597772e4bff496b3838eb0131ad1d707ae9226c5bdd703080683e48bc93b9c1a6572505dad0332d63c57e6320e63c011931877233a  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 e727f374a..7508e9b9a 100644
--- a/user/networkmanager/editline.patch
+++ b/user/networkmanager/editline.patch
@@ -1,6 +1,6 @@
 --- NetworkManager-1.18.1/clients/cli/agent.c.old	2019-04-18 09:19:11.000000000 +0000
 +++ NetworkManager-1.18.1/clients/cli/agent.c	2019-05-10 06:15:55.614930112 +0000
-@@ -25,8 +25,7 @@
+@@ -9,8 +9,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
@@ -12,7 +12,7 @@
  #include "utils.h"
 --- NetworkManager-1.18.1/clients/cli/common.c.old	2019-04-20 19:01:59.000000000 +0000
 +++ NetworkManager-1.18.1/clients/cli/common.c	2019-05-10 07:07:34.506620687 +0000
-@@ -26,8 +26,7 @@
+@@ -10,8 +10,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <sys/ioctl.h>
@@ -22,7 +22,7 @@
  
  #include "nm-vpn-helpers.h"
  #include "nm-client-utils.h"
-@@ -1008,7 +1007,7 @@
+@@ -992,7 +991,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,
-@@ -1019,8 +1018,7 @@
+@@ -1003,8 +1002,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);
-@@ -1030,8 +1028,7 @@
+@@ -1014,8 +1012,7 @@
  
  	/* Hide the actual password */
  	if (!echo_on) {
@@ -51,7 +51,7 @@
  		rl_redisplay_function = nmc_secret_redisplay;
  	}
  
-@@ -1040,7 +1037,10 @@
+@@ -1024,7 +1021,10 @@
  	/* Restore the non-hiding behavior */
  	if (!echo_on) {
  		rl_redisplay_function = rl_redisplay;
@@ -65,7 +65,7 @@
  	return str;
 --- NetworkManager-1.18.1/clients/cli/connections.c.old	2019-04-20 19:01:59.000000000 +0000
 +++ NetworkManager-1.18.1/clients/cli/connections.c	2019-05-10 07:05:43.058781503 +0000
-@@ -26,8 +26,7 @@
+@@ -12,8 +12,7 @@
  #include <unistd.h>
  #include <signal.h>
  #include <netinet/ether.h>
@@ -75,7 +75,7 @@
  #include <fcntl.h>
  
  #include "nm-client-utils.h"
-@@ -6050,9 +6049,6 @@
+@@ -6110,9 +6109,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
-@@ -6079,9 +6075,6 @@
+@@ -6139,9 +6135,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);
  
-@@ -9150,7 +9143,6 @@
+@@ -9243,7 +9236,6 @@
  		generator_func = _meta_abstract_generator;
  	} else if (g_strcmp0 (rl_prompt, PROMPT_IMPORT_FILE) == 0) {
  		rl_attempted_completion_over = 0;
@@ -105,7 +105,7 @@
  	}
 --- NetworkManager-1.18.1/clients/cli/devices.c.old	2019-04-20 19:01:59.000000000 +0000
 +++ NetworkManager-1.18.1/clients/cli/devices.c	2019-05-10 06:16:21.432108032 +0000
-@@ -23,7 +23,7 @@
+@@ -9,7 +9,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
@@ -116,7 +116,7 @@
  #include "nm-client-utils.h"
 --- NetworkManager-1.18.1/clients/cli/nmcli.c.old	2019-04-20 19:01:59.000000000 +0000
 +++ NetworkManager-1.18.1/clients/cli/nmcli.c	2019-05-10 06:16:29.211257692 +0000
-@@ -30,8 +30,7 @@
+@@ -15,8 +15,7 @@
  #include <unistd.h>
  #include <locale.h>
  #include <glib-unix.h>
diff --git a/user/networkmanager/errno.patch b/user/networkmanager/errno.patch
index 825cc97a7..00c932586 100644
--- a/user/networkmanager/errno.patch
+++ b/user/networkmanager/errno.patch
@@ -1,6 +1,6 @@
 --- NetworkManager-1.18.1/shared/nm-glib-aux/nm-errno.c.old	2019-04-19 09:31:51.000000000 +0000
 +++ NetworkManager-1.18.1/shared/nm-glib-aux/nm-errno.c	2019-05-10 06:01:00.812741059 +0000
-@@ -121,7 +121,6 @@
+@@ -106,7 +106,6 @@
  	nm_assert (buf);
  	nm_assert (buf_size > 0);
  
@@ -8,7 +8,7 @@
  	/* XSI-compliant */
  	{
  		int errno_saved = errno;
-@@ -132,10 +131,6 @@
+@@ -117,10 +116,6 @@
  		}
  		buf2 = buf;
  	}
diff --git a/user/networkmanager/musl.patch b/user/networkmanager/musl.patch
index d8e9fdab2..ddf86390f 100644
--- a/user/networkmanager/musl.patch
+++ b/user/networkmanager/musl.patch
@@ -36,7 +36,7 @@ diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h
 index 25e6ab8..7967e8a 100644
 --- a/shared/systemd/src/basic/util.h
 +++ b/shared/systemd/src/basic/util.h
-@@ -46,6 +46,12 @@ static inline unsigned u64log2(uint64_t n) {
+@@ -30,6 +30,12 @@ static inline unsigned u64log2(uint64_t n) {
  #endif
  }
  
@@ -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
-@@ -29,7 +29,11 @@
+@@ -15,7 +15,11 @@
  #include <netinet/in.h>
  
  /* For ETH_ALEN and INFINIBAND_ALEN */
@@ -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
-@@ -21,7 +21,11 @@
+@@ -7,7 +7,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
-@@ -31,7 +31,11 @@
+@@ -17,7 +17,11 @@
  #include <arpa/inet.h>
  #include <fcntl.h>
  #include <linux/if_addr.h>
@@ -117,19 +117,19 @@ 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
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <unistd.h>
+@@ -15,6 +15,7 @@
+ #include <sys/stat.h>
+ #include <sys/sendfile.h>
+ #include <limits.h>
 +#include <asm/types.h>
- 
- #include "nm-utils/nm-c-list.h"
- 
+
+ #include "nm-glib-aux/nm-c-list.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
-@@ -63,7 +63,7 @@
+@@ -50,7 +50,7 @@
  #  ifdef HAVE___SECURE_GETENV
  #    define secure_getenv __secure_getenv
  #  else
@@ -140,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
-@@ -19,6 +19,7 @@
+@@ -6,6 +6,7 @@
  #include "nm-default.h"
  
  #include "nm-linux-platform.h"
@@ -148,7 +148,7 @@ index 8c07c53..d043afc 100644
  
  #include <arpa/inet.h>
  #include <dlfcn.h>
-@@ -27,7 +28,11 @@
+@@ -14,7 +15,11 @@
  #include <libudev.h>
  #include <linux/fib_rules.h>
  #include <linux/ip.h>
@@ -160,7 +160,7 @@ index 8c07c53..d043afc 100644
  #include <linux/if_bridge.h>
  #include <linux/if_link.h>
  #include <linux/if_tun.h>
-@@ -57,7 +62,6 @@
+@@ -44,7 +49,6 @@
  #include "nm-platform-private.h"
  #include "wifi/nm-wifi-utils.h"
  #include "wifi/nm-wifi-utils-wext.h"
@@ -172,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
-@@ -19,6 +19,9 @@
+@@ -17,6 +17,9 @@
  #include <sys/wait.h>
  #include <syslog.h>
  #include <unistd.h>
@@ -182,7 +182,7 @@ index b0afb5c..f72e346 100644
  #if 0 /* NM_IGNORED */
  #if HAVE_VALGRIND_VALGRIND_H
  #include <valgrind/valgrind.h>
-@@ -1105,11 +1108,13 @@ void reset_cached_pid(void) {
+@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) {
          cached_pid = CACHED_PID_UNSET;
  }
  
@@ -196,7 +196,7 @@ index b0afb5c..f72e346 100644
  
  pid_t getpid_cached(void) {
          static bool installed = false;
-@@ -1138,7 +1143,12 @@ pid_t getpid_cached(void) {
+@@ -1156,7 +1161,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. */
  
@@ -213,7 +213,7 @@ index b0afb5c..f72e346 100644
  
 --- 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 @@
+@@ -7,7 +7,7 @@
  #include <errno.h>
  #include <string.h>
  #include <sys/ioctl.h>
diff --git a/user/networkmanager/random.patch b/user/networkmanager/random.patch
index 30acd9c3b..1d3c21588 100644
--- a/user/networkmanager/random.patch
+++ b/user/networkmanager/random.patch
@@ -36,7 +36,7 @@ diff --git shared/n-dhcp4/src/n-dhcp4-private.h shared/n-dhcp4/src/n-dhcp4-priva
 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 {
+@@ -267,7 +267,11 @@ struct NDhcp4ClientProbeConfig {
          bool inform_only;
          bool init_reboot;
          struct in_addr requested_ip;
diff --git a/user/networkmanager/tests.patch b/user/networkmanager/tests.patch
index ec9719a89..d2691db3b 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
-@@ -20,7 +20,6 @@
+@@ -6,7 +6,6 @@
  #include "nm-default.h"
  
  #include <fcntl.h>
@@ -8,7 +8,7 @@
  #include <sys/ioctl.h>
  #include <sys/stat.h>
  #include <sys/types.h>
-@@ -31,6 +30,7 @@
+@@ -17,6 +16,7 @@
  #include "platform/tests/test-common.h"
  
  #include "nm-test-utils-core.h"