Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] NetworkManager-1.22
@ 2020-01-07  8:13 voidlinux-github
  2020-01-08 14:50 ` [PR PATCH] [Updated] NetworkManager-1.22 voidlinux-github
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-07  8:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

There is a new pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages NetworkManager-1.22
https://github.com/void-linux/void-packages/pull/18085

NetworkManager-1.22
This PR updates the Network Manager to 1.22.8. It also removes dependencies that rely on the deprecated and removed gobject interface.
This PR was on glibc, builds on musl, but is not yet tested there.

* glibc
  * [x] builds
  * [x] tested
* musl
  * [x] builds
  * [ ] tested

A patch file from https://github.com/void-linux/void-packages/pull/18085.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-NetworkManager-1.22-18085.patch --]
[-- Type: text/x-diff, Size: 26615 bytes --]

From 629dde5d7480e5cd2b519f67ff28ba864f88d7b7 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 7 Aug 2019 10:55:02 +0200
Subject: [PATCH 01/12] NetworkManager: update to 1.22.2.

---
 srcpkgs/NetworkManager/patches/fix-musl.patch | 48 +++++++++++++++++++
 .../patches/musl-fix-includes.patch           | 32 ++++++-------
 .../patches/musl-has-not-secure-getenv.patch  | 10 ----
 .../patches/musl-use-srand48.patch            | 40 ++++++++++++++++
 srcpkgs/NetworkManager/template               | 10 ++--
 5 files changed, 109 insertions(+), 31 deletions(-)
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
 create mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-musl.patch b/srcpkgs/NetworkManager/patches/fix-musl.patch
new file mode 100644
index 00000000000..35630c6182b
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl.patch
@@ -0,0 +1,48 @@
+diff --git shared/n-dhcp4/src/n-dhcp4-c-probe.c shared/n-dhcp4/src/n-dhcp4-c-probe.c
+index 308cff830..9463528b1 100644
+--- shared/n-dhcp4/src/n-dhcp4-c-probe.c
++++ 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
+--- shared/n-dhcp4/src/n-dhcp4-private.h
++++ 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/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
index 03bdb67780e..95ffb2d354e 100644
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
@@ -1,6 +1,6 @@
---- src/devices/nm-device.c
-+++ src/devices/nm-device.c
-@@ -32,7 +32,11 @@
+--- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
++++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
+@@ -17,7 +17,11 @@
  #include <arpa/inet.h>
  #include <fcntl.h>
  #include <linux/if_addr.h>
@@ -11,20 +11,20 @@
 +#endif
  #include <linux/rtnetlink.h>
  #include <linux/pkt_sched.h>
-
---- src/nm-manager.c
-+++ src/nm-manager.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <unistd.h>
+ 
+--- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
++++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
+@@ -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"
  
---- src/platform/nm-linux-platform.c	2019-04-19 11:31:51.000000000 +0200
-+++ src/platform/nm-linux-platform.c	2019-06-09 16:45:15.082158443 +0200
-@@ -20,6 +20,7 @@
+--- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
++++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
+@@ -6,6 +6,7 @@
  #include "nm-default.h"
  
  #include "nm-linux-platform.h"
@@ -32,7 +32,7 @@
  
  #include <arpa/inet.h>
  #include <dlfcn.h>
-@@ -28,7 +29,11 @@
+@@ -14,7 +15,11 @@
  #include <libudev.h>
  #include <linux/fib_rules.h>
  #include <linux/ip.h>
@@ -44,7 +44,7 @@
  #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"
diff --git a/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch b/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
deleted file mode 100644
index ece41ca9c96..00000000000
--- a/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/systemd/sd-adapt-core/nm-sd-adapt-core.h.orig	2019-03-17 16:56:13.649901535 +0100
-+++ src/systemd/sd-adapt-core/nm-sd-adapt-core.h	2019-03-17 16:56:35.278786119 +0100
-@@ -65,7 +65,7 @@
- #  ifdef HAVE___SECURE_GETENV
- #    define secure_getenv __secure_getenv
- #  else
--#    error neither secure_getenv nor __secure_getenv is available
-+#    define secure_getenv getenv
- #  endif
- #endif
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
new file mode 100644
index 00000000000..43b689f3bad
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
@@ -0,0 +1,40 @@
+--- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
++++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
+@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
+         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
+         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
+ 
++#ifdef __GLIBC__
+         r = seed48_r(seed16v, &config->entropy);
++#else
++        r = 0;
++        seed48(seed16v);
++#endif
+         c_assert(!r);
+ }
+ 
+@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
+         long int result;
+         int r;
+ 
++#ifdef __GLIBC__
+         r = mrand48_r(&config->entropy, &result);
++#else
++        r = 0;
++        result = mrand48();
++#endif
+         c_assert(!r);
+ 
+         return result;
+--- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
++++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
+@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
+         bool inform_only;
+         bool init_reboot;
+         struct in_addr requested_ip;
++#ifdef __GLIBC__
+         struct drand48_data entropy;    /* 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/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e9a615193c9..d1b703da6b2 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.18.2
-revision=4
+version=1.22.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -24,15 +24,15 @@ hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
 makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
- libpsl-devel eudev-libudev-devel
+ libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
  $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
-depends="dbus iproute2 openresolv wpa_supplicant"
+depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3
+checksum=9104117354c16565df8d4a283d009244c05567738940554251cedc091c78e987
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 make_dirs="

From 816c1367aa0309cb5898164fa17aae5062f3d55f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 15:04:21 +0200
Subject: [PATCH 02/12] NetworkManager: add musl patches

---
 .../patches/fix-musl-linux-header.diff        | 15 ++++++
 .../patches/fix-musl-qsort_r.patch            | 16 +++++++
 srcpkgs/NetworkManager/patches/fix-musl.patch | 48 -------------------
 3 files changed, 31 insertions(+), 48 deletions(-)
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
new file mode 100644
index 00000000000..511759214a9
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
@@ -0,0 +1,15 @@
+diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+index f67a45bd2..ec11fa605 100644
+--- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
++++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+@@ -8,8 +8,10 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
++#ifdef __GLIBC__
+ #include <linux/if_arp.h>
+ #include <linux/if_infiniband.h>
++#endif
+ 
+ #include "sd-dhcp6-client.h"
+ 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
new file mode 100644
index 00000000000..f89eac77850
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
@@ -0,0 +1,16 @@
+diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
+index e029f8646..168735087 100644
+--- shared/systemd/src/basic/sort-util.h
++++ shared/systemd/src/basic/sort-util.h
+@@ -60,7 +60,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/srcpkgs/NetworkManager/patches/fix-musl.patch b/srcpkgs/NetworkManager/patches/fix-musl.patch
deleted file mode 100644
index 35630c6182b..00000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git shared/n-dhcp4/src/n-dhcp4-c-probe.c shared/n-dhcp4/src/n-dhcp4-c-probe.c
-index 308cff830..9463528b1 100644
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c
-+++ 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
---- shared/n-dhcp4/src/n-dhcp4-private.h
-+++ 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];

From f3c54c9290eb81e6e10b09e1948f4a7b93d22f1a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:07:13 +0200
Subject: [PATCH 03/12] network-manager-applet: update to 1.8.24.

also remove libnm-gtk legacy support
---
 srcpkgs/network-manager-applet/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index f27836fad50..b6b12bcbd22 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,11 +1,10 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=1.8.22
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)
- --with-libnm-gtk"
+configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
  libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
@@ -17,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed
+checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
 lib32disabled=yes
 
 # Package build options

From 5ece189b6499c5918a01edec8236b1df8fe785a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:07:33 +0200
Subject: [PATCH 04/12] NetworkManager-openconnect: update to 1.2.6.

---
 srcpkgs/NetworkManager-openconnect/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index fe6a02c2de5..6f8d4a67d86 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -7,7 +7,8 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel gcr-devel"
+ libxml2-devel openconnect-devel libressl-devel liblz4-devel
+ gcr-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"

From 7d45e12da0cc53d4b68f948eefe6ad36921b99fe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:17:54 +0200
Subject: [PATCH 05/12] NetworkManager-openvpn: rebuild without legacy
 libnm-glib support

---
 ...isable-libnm-glib-support-by-default.patch | 52 +++++++++++++++++++
 srcpkgs/NetworkManager-openvpn/template       |  8 ++-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
new file mode 100644
index 00000000000..7eb72e1dbb6
--- /dev/null
+++ b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
@@ -0,0 +1,52 @@
+source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
+
+From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
+Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Wed, 17 Oct 2018 15:21:30 +0200
+Subject: [PATCH] build: disable libnm-glib support by default
+
+By now nobody should be using this. Keep the code around for a little
+longer just in case anybody still uses this.
+
+The libnm-glib support also serves as an example how do we build two
+different versions of the properties plugin. We'll soon be in a similar
+situation with Gtk 4.0. (sigh.) Just don't drop it yet.
+
+Conflicts:
+	NEWS
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 11ff5d0..eaf015b 100644
+--- configure.ac
++++ configure.ac
+@@ -75,20 +75,20 @@ dnl
+ dnl GNOME support
+ dnl
+ AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
+-AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
++AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
+ if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
+ 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
+ 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
+ 	fi
+ fi
+ if test "$with_gnome" != no; then
+ 	with_gnome=yes
+ fi
+ if test "$with_libnm_glib_specified" == no; then
+-	with_libnm_glib="$with_gnome"
++	with_libnm_glib=no
+ fi
+-if test "$with_libnm_glib" != no; then
+-	with_libnm_glib=yes
++if test "$with_libnm_glib" != yes; then
++	with_libnm_glib=no
+ fi
+ AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
+ AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
+-- 
+2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 835460c1a3f..58bc614b9d2 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
 version=1.8.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake autoconf libtool intltool glib-devel gettext-devel"
 makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
@@ -21,3 +21,7 @@ post_extract() {
 	sed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
 		shared/nm-service-defines.h
 }
+
+pre_configure() {
+	autoreconf -fi
+}

From d6d9d5d6d8321c6a8df19f75de1ada237c62bf8c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Aug 2019 08:08:38 +0200
Subject: [PATCH 06/12] NetworkManager-openconnect: rebuild without legacy
 libnm-glib support

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 6f8d4a67d86..327f2bd84cb 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,7 +1,7 @@
 # Template build file for 'NetworkManager-openconnect'.
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-static"

From 34d9a61a10d6f54e39973a972a051916616e5db2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Aug 2019 08:09:12 +0200
Subject: [PATCH 07/12] NetworkManager-vpnc: rebuild without legacy libnm-glib
 support

---
 srcpkgs/NetworkManager-vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index 22a42be203e..b327ad81c8e 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--localstatedir=/var --disable-static"
 hostmakedepends="pkg-config intltool"

From 61a46ee89e05b98f647c05e100a9d5324e83c778 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Aug 2019 01:49:21 +0200
Subject: [PATCH 08/12] NetworkManager-pptp: rebuild without legacy libnm-glib
 support

---
 srcpkgs/NetworkManager-pptp/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index e6de3e2a50a..c4abd419298 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
@@ -13,3 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f8e35e4a9a76312975c317cd315e5e9bd23bba2b5c31c3259c8c150583dc1953
+configure_args="--without-libnm-glib"

From 11df96e3d0179139af2130336d4d7e7f98297a18 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Aug 2019 01:53:57 +0200
Subject: [PATCH 09/12] NetworkManager-strongswan: rebuild without legacy
 libnm-glib support

---
 srcpkgs/NetworkManager-strongswan/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 9ea95f6db31..287f4a644fe 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
 version=1.4.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
@@ -13,3 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
 checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+configure_args="--without-libnm-glib --disable-more-warnings"

From 2de33aad3d0210db043c1412d407610debd15efd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 02:38:59 +0100
Subject: [PATCH 10/12] networkmanager-dmenu: remove, does only support legacy
 API

---
 srcpkgs/networkmanager-dmenu/template | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 srcpkgs/networkmanager-dmenu/template

diff --git a/srcpkgs/networkmanager-dmenu/template b/srcpkgs/networkmanager-dmenu/template
deleted file mode 100644
index dab3febf077..00000000000
--- a/srcpkgs/networkmanager-dmenu/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'networkmanager-dmenu'
-pkgname=networkmanager-dmenu
-version=1.1
-revision=2
-archs=noarch
-conf_files="/etc/networkmanager_dmenu-config.ini"
-depends="NetworkManager python3-gobject"
-short_desc="Control NetworkManager via dmenu"
-maintainer="teldra <teldra@rotce.de>"
-license="MIT"
-homepage="https://github.com/firecat53/${pkgname}"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=279695b8833ec790cf0c00ec2eb36be09ca33a39aa9595578e2e3d2f644dd998
-python_version=3
-
-do_install() {
-	vmkdir usr/share/applications
-	vinstall networkmanager_dmenu.desktop 644 usr/share/applications
-	vbin networkmanager_dmenu
-	vconf config.ini.example networkmanager_dmenu-config.ini
-	vsconf config.ini.example
-	vdoc README.rst
-	vlicense LICENSE.txt LICENSE
-}
-

From bd5ed8d20a35c0f6cd4a6a25a3cc79c2a9bffd0e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 02:40:12 +0100
Subject: [PATCH 11/12] network-manager-applet: update to 1.8.24.

---
 srcpkgs/network-manager-applet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index b6b12bcbd22..0656107b1af 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.22
-revision=2
+version=1.8.24
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"

From ab5925fa0dfc2733d64296e410f30074f7080dbd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 03:00:03 +0100
Subject: [PATCH 12/12] common/shlib: remove legacy shlibs of NetworkManager

---
 common/shlibs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 611abc88b12..a904fd98ee8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -646,9 +646,6 @@ libip6tc.so.2 iptables-1.8.3_1
 libxtables.so.12 iptables-1.6.1_1
 libip4tc.so.2 iptables-1.8.3_1
 libipq.so.0 iptables-1.4.7_1
-libnm-util.so.2 libnm-0.9.1.90_1
-libnm-glib.so.4 libnm-0.9.1.90_1
-libnm-glib-vpn.so.1 libnm-0.9.1.90_1
 libnm.so.0 libnm-1.0.0_1
 libKF5ItemModels.so.5 kitemmodels-5.26.0_1
 libboost_context.so.1.69.0 libboost_context1.69-1.69.0_1<1.70.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager-1.22
  2020-01-07  8:13 [PR PATCH] NetworkManager-1.22 voidlinux-github
@ 2020-01-08 14:50 ` voidlinux-github
  2020-01-08 14:51 ` voidlinux-github
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-08 14:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 604 bytes --]

There is an updated pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages NetworkManager-1.22
https://github.com/void-linux/void-packages/pull/18085

NetworkManager-1.22
This PR updates the Network Manager to 1.22.8. It also removes dependencies that rely on the deprecated and removed gobject interface.
This PR was on glibc, builds on musl, but is not yet tested there.

* glibc
  * [x] builds
  * [x] tested
* musl
  * [x] builds
  * [ ] tested

A patch file from https://github.com/void-linux/void-packages/pull/18085.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-NetworkManager-1.22-18085.patch --]
[-- Type: text/x-diff, Size: 26500 bytes --]

From 511a5044ca91d5ca734cd26ab2c1283eca2da7e9 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 7 Aug 2019 10:55:02 +0200
Subject: [PATCH 01/12] NetworkManager: update to 1.22.2.

---
 srcpkgs/NetworkManager/patches/fix-musl.patch | 48 +++++++++++++++++++
 .../patches/musl-fix-includes.patch           | 32 ++++++-------
 .../patches/musl-has-not-secure-getenv.patch  | 10 ----
 .../patches/musl-use-srand48.patch            | 40 ++++++++++++++++
 srcpkgs/NetworkManager/template               | 10 ++--
 5 files changed, 109 insertions(+), 31 deletions(-)
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
 create mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-musl.patch b/srcpkgs/NetworkManager/patches/fix-musl.patch
new file mode 100644
index 00000000000..35630c6182b
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl.patch
@@ -0,0 +1,48 @@
+diff --git shared/n-dhcp4/src/n-dhcp4-c-probe.c shared/n-dhcp4/src/n-dhcp4-c-probe.c
+index 308cff830..9463528b1 100644
+--- shared/n-dhcp4/src/n-dhcp4-c-probe.c
++++ 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
+--- shared/n-dhcp4/src/n-dhcp4-private.h
++++ 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/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
index 03bdb67780e..95ffb2d354e 100644
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
@@ -1,6 +1,6 @@
---- src/devices/nm-device.c
-+++ src/devices/nm-device.c
-@@ -32,7 +32,11 @@
+--- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
++++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
+@@ -17,7 +17,11 @@
  #include <arpa/inet.h>
  #include <fcntl.h>
  #include <linux/if_addr.h>
@@ -11,20 +11,20 @@
 +#endif
  #include <linux/rtnetlink.h>
  #include <linux/pkt_sched.h>
-
---- src/nm-manager.c
-+++ src/nm-manager.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <unistd.h>
+ 
+--- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
++++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
+@@ -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"
  
---- src/platform/nm-linux-platform.c	2019-04-19 11:31:51.000000000 +0200
-+++ src/platform/nm-linux-platform.c	2019-06-09 16:45:15.082158443 +0200
-@@ -20,6 +20,7 @@
+--- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
++++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
+@@ -6,6 +6,7 @@
  #include "nm-default.h"
  
  #include "nm-linux-platform.h"
@@ -32,7 +32,7 @@
  
  #include <arpa/inet.h>
  #include <dlfcn.h>
-@@ -28,7 +29,11 @@
+@@ -14,7 +15,11 @@
  #include <libudev.h>
  #include <linux/fib_rules.h>
  #include <linux/ip.h>
@@ -44,7 +44,7 @@
  #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"
diff --git a/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch b/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
deleted file mode 100644
index ece41ca9c96..00000000000
--- a/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/systemd/sd-adapt-core/nm-sd-adapt-core.h.orig	2019-03-17 16:56:13.649901535 +0100
-+++ src/systemd/sd-adapt-core/nm-sd-adapt-core.h	2019-03-17 16:56:35.278786119 +0100
-@@ -65,7 +65,7 @@
- #  ifdef HAVE___SECURE_GETENV
- #    define secure_getenv __secure_getenv
- #  else
--#    error neither secure_getenv nor __secure_getenv is available
-+#    define secure_getenv getenv
- #  endif
- #endif
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
new file mode 100644
index 00000000000..43b689f3bad
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
@@ -0,0 +1,40 @@
+--- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
++++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
+@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
+         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
+         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
+ 
++#ifdef __GLIBC__
+         r = seed48_r(seed16v, &config->entropy);
++#else
++        r = 0;
++        seed48(seed16v);
++#endif
+         c_assert(!r);
+ }
+ 
+@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
+         long int result;
+         int r;
+ 
++#ifdef __GLIBC__
+         r = mrand48_r(&config->entropy, &result);
++#else
++        r = 0;
++        result = mrand48();
++#endif
+         c_assert(!r);
+ 
+         return result;
+--- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
++++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
+@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
+         bool inform_only;
+         bool init_reboot;
+         struct in_addr requested_ip;
++#ifdef __GLIBC__
+         struct drand48_data entropy;    /* 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/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e9a615193c9..d1b703da6b2 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.18.2
-revision=4
+version=1.22.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -24,15 +24,15 @@ hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
 makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
- libpsl-devel eudev-libudev-devel
+ libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
  $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
-depends="dbus iproute2 openresolv wpa_supplicant"
+depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3
+checksum=9104117354c16565df8d4a283d009244c05567738940554251cedc091c78e987
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 make_dirs="

From e903ee1e1189c77ee0b1b3fac6be924a0163a494 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 15:04:21 +0200
Subject: [PATCH 02/12] NetworkManager: add musl patches

---
 .../patches/fix-musl-linux-header.diff        | 15 ++++++
 .../patches/fix-musl-qsort_r.patch            | 16 +++++++
 srcpkgs/NetworkManager/patches/fix-musl.patch | 48 -------------------
 3 files changed, 31 insertions(+), 48 deletions(-)
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
new file mode 100644
index 00000000000..511759214a9
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
@@ -0,0 +1,15 @@
+diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+index f67a45bd2..ec11fa605 100644
+--- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
++++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+@@ -8,8 +8,10 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
++#ifdef __GLIBC__
+ #include <linux/if_arp.h>
+ #include <linux/if_infiniband.h>
++#endif
+ 
+ #include "sd-dhcp6-client.h"
+ 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
new file mode 100644
index 00000000000..f89eac77850
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
@@ -0,0 +1,16 @@
+diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
+index e029f8646..168735087 100644
+--- shared/systemd/src/basic/sort-util.h
++++ shared/systemd/src/basic/sort-util.h
+@@ -60,7 +60,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/srcpkgs/NetworkManager/patches/fix-musl.patch b/srcpkgs/NetworkManager/patches/fix-musl.patch
deleted file mode 100644
index 35630c6182b..00000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git shared/n-dhcp4/src/n-dhcp4-c-probe.c shared/n-dhcp4/src/n-dhcp4-c-probe.c
-index 308cff830..9463528b1 100644
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c
-+++ 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
---- shared/n-dhcp4/src/n-dhcp4-private.h
-+++ 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];

From 43612027b499d5db04464044890acf77ed9dd1d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:07:13 +0200
Subject: [PATCH 03/12] network-manager-applet: update to 1.8.24.

also remove libnm-gtk legacy support
---
 srcpkgs/network-manager-applet/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index f27836fad50..b6b12bcbd22 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,11 +1,10 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=1.8.22
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)
- --with-libnm-gtk"
+configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
  libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
@@ -17,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed
+checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
 lib32disabled=yes
 
 # Package build options

From b725e71bc58d7f24caff8918c9a52a4a7786afdd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:07:33 +0200
Subject: [PATCH 04/12] NetworkManager-openconnect: update to 1.2.6.

---
 srcpkgs/NetworkManager-openconnect/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index fe6a02c2de5..6f8d4a67d86 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -7,7 +7,8 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel gcr-devel"
+ libxml2-devel openconnect-devel libressl-devel liblz4-devel
+ gcr-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"

From 54392cf15f7758b35067c95ef03d2c44f90aee12 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:17:54 +0200
Subject: [PATCH 05/12] NetworkManager-openvpn: rebuild without legacy
 libnm-glib support

---
 ...isable-libnm-glib-support-by-default.patch | 52 +++++++++++++++++++
 srcpkgs/NetworkManager-openvpn/template       |  8 ++-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
new file mode 100644
index 00000000000..7eb72e1dbb6
--- /dev/null
+++ b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
@@ -0,0 +1,52 @@
+source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
+
+From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
+Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Wed, 17 Oct 2018 15:21:30 +0200
+Subject: [PATCH] build: disable libnm-glib support by default
+
+By now nobody should be using this. Keep the code around for a little
+longer just in case anybody still uses this.
+
+The libnm-glib support also serves as an example how do we build two
+different versions of the properties plugin. We'll soon be in a similar
+situation with Gtk 4.0. (sigh.) Just don't drop it yet.
+
+Conflicts:
+	NEWS
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 11ff5d0..eaf015b 100644
+--- configure.ac
++++ configure.ac
+@@ -75,20 +75,20 @@ dnl
+ dnl GNOME support
+ dnl
+ AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
+-AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
++AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
+ if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
+ 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
+ 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
+ 	fi
+ fi
+ if test "$with_gnome" != no; then
+ 	with_gnome=yes
+ fi
+ if test "$with_libnm_glib_specified" == no; then
+-	with_libnm_glib="$with_gnome"
++	with_libnm_glib=no
+ fi
+-if test "$with_libnm_glib" != no; then
+-	with_libnm_glib=yes
++if test "$with_libnm_glib" != yes; then
++	with_libnm_glib=no
+ fi
+ AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
+ AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
+-- 
+2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 835460c1a3f..58bc614b9d2 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
 version=1.8.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake autoconf libtool intltool glib-devel gettext-devel"
 makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
@@ -21,3 +21,7 @@ post_extract() {
 	sed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
 		shared/nm-service-defines.h
 }
+
+pre_configure() {
+	autoreconf -fi
+}

From 4ce71469a81b69ce2118d364f6f45b89aafa7540 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Aug 2019 08:08:38 +0200
Subject: [PATCH 06/12] NetworkManager-openconnect: rebuild without legacy
 libnm-glib support

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 6f8d4a67d86..327f2bd84cb 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,7 +1,7 @@
 # Template build file for 'NetworkManager-openconnect'.
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-static"

From af4a3ebd8bef6c752a6e53fe890eeaa42cc85605 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Aug 2019 08:09:12 +0200
Subject: [PATCH 07/12] NetworkManager-vpnc: rebuild without legacy libnm-glib
 support

---
 srcpkgs/NetworkManager-vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index 22a42be203e..b327ad81c8e 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--localstatedir=/var --disable-static"
 hostmakedepends="pkg-config intltool"

From 6515e4afe55778f595d5dcc0e85cc0c10c5dbd04 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Aug 2019 01:49:21 +0200
Subject: [PATCH 08/12] NetworkManager-pptp: rebuild without legacy libnm-glib
 support

---
 srcpkgs/NetworkManager-pptp/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index e6de3e2a50a..c4abd419298 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
@@ -13,3 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f8e35e4a9a76312975c317cd315e5e9bd23bba2b5c31c3259c8c150583dc1953
+configure_args="--without-libnm-glib"

From 56b875434cc736c808c48dc6fb04e02f24661622 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Aug 2019 01:53:57 +0200
Subject: [PATCH 09/12] NetworkManager-strongswan: rebuild without legacy
 libnm-glib support

---
 srcpkgs/NetworkManager-strongswan/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 9ea95f6db31..4d8d2b14306 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,9 +1,10 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
 version=1.4.5
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-more-warnings"
+configure_args="--disable-static --disable-more-warnings --without-libnm-glib
+ --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
 makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
 depends="strongswan"

From 706d28873ce3e7825523e3dd32ee791efcca9c6d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 02:38:59 +0100
Subject: [PATCH 10/12] networkmanager-dmenu: remove, does only support legacy
 API

---
 srcpkgs/networkmanager-dmenu/template | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 srcpkgs/networkmanager-dmenu/template

diff --git a/srcpkgs/networkmanager-dmenu/template b/srcpkgs/networkmanager-dmenu/template
deleted file mode 100644
index dab3febf077..00000000000
--- a/srcpkgs/networkmanager-dmenu/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'networkmanager-dmenu'
-pkgname=networkmanager-dmenu
-version=1.1
-revision=2
-archs=noarch
-conf_files="/etc/networkmanager_dmenu-config.ini"
-depends="NetworkManager python3-gobject"
-short_desc="Control NetworkManager via dmenu"
-maintainer="teldra <teldra@rotce.de>"
-license="MIT"
-homepage="https://github.com/firecat53/${pkgname}"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=279695b8833ec790cf0c00ec2eb36be09ca33a39aa9595578e2e3d2f644dd998
-python_version=3
-
-do_install() {
-	vmkdir usr/share/applications
-	vinstall networkmanager_dmenu.desktop 644 usr/share/applications
-	vbin networkmanager_dmenu
-	vconf config.ini.example networkmanager_dmenu-config.ini
-	vsconf config.ini.example
-	vdoc README.rst
-	vlicense LICENSE.txt LICENSE
-}
-

From c32522733358a62596934089587714070bf3d154 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 02:40:12 +0100
Subject: [PATCH 11/12] network-manager-applet: update to 1.8.24.

---
 srcpkgs/network-manager-applet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index b6b12bcbd22..0656107b1af 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.22
-revision=2
+version=1.8.24
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"

From c384ad1e999fa3a5b2d79efbd146af3ce7e248cb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 03:00:03 +0100
Subject: [PATCH 12/12] common/shlib: remove legacy shlibs of NetworkManager

---
 common/shlibs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a4c337fb67d..02bc77f21f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -646,9 +646,6 @@ libip6tc.so.2 iptables-1.8.3_1
 libxtables.so.12 iptables-1.6.1_1
 libip4tc.so.2 iptables-1.8.3_1
 libipq.so.0 iptables-1.4.7_1
-libnm-util.so.2 libnm-0.9.1.90_1
-libnm-glib.so.4 libnm-0.9.1.90_1
-libnm-glib-vpn.so.1 libnm-0.9.1.90_1
 libnm.so.0 libnm-1.0.0_1
 libKF5ItemModels.so.5 kitemmodels-5.26.0_1
 libboost_context.so.1.69.0 libboost_context1.69-1.69.0_1<1.70.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager-1.22
  2020-01-07  8:13 [PR PATCH] NetworkManager-1.22 voidlinux-github
  2020-01-08 14:50 ` [PR PATCH] [Updated] NetworkManager-1.22 voidlinux-github
@ 2020-01-08 14:51 ` voidlinux-github
  2020-01-12 19:38 ` voidlinux-github
  2020-01-12 19:52 ` [PR PATCH] [Merged]: NetworkManager-1.22 voidlinux-github
  3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-08 14:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 604 bytes --]

There is an updated pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages NetworkManager-1.22
https://github.com/void-linux/void-packages/pull/18085

NetworkManager-1.22
This PR updates the Network Manager to 1.22.8. It also removes dependencies that rely on the deprecated and removed gobject interface.
This PR was on glibc, builds on musl, but is not yet tested there.

* glibc
  * [x] builds
  * [x] tested
* musl
  * [x] builds
  * [ ] tested

A patch file from https://github.com/void-linux/void-packages/pull/18085.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-NetworkManager-1.22-18085.patch --]
[-- Type: text/x-diff, Size: 26293 bytes --]

From 511a5044ca91d5ca734cd26ab2c1283eca2da7e9 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 7 Aug 2019 10:55:02 +0200
Subject: [PATCH 01/12] NetworkManager: update to 1.22.2.

---
 srcpkgs/NetworkManager/patches/fix-musl.patch | 48 +++++++++++++++++++
 .../patches/musl-fix-includes.patch           | 32 ++++++-------
 .../patches/musl-has-not-secure-getenv.patch  | 10 ----
 .../patches/musl-use-srand48.patch            | 40 ++++++++++++++++
 srcpkgs/NetworkManager/template               | 10 ++--
 5 files changed, 109 insertions(+), 31 deletions(-)
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
 create mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-musl.patch b/srcpkgs/NetworkManager/patches/fix-musl.patch
new file mode 100644
index 00000000000..35630c6182b
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl.patch
@@ -0,0 +1,48 @@
+diff --git shared/n-dhcp4/src/n-dhcp4-c-probe.c shared/n-dhcp4/src/n-dhcp4-c-probe.c
+index 308cff830..9463528b1 100644
+--- shared/n-dhcp4/src/n-dhcp4-c-probe.c
++++ 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
+--- shared/n-dhcp4/src/n-dhcp4-private.h
++++ 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/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
index 03bdb67780e..95ffb2d354e 100644
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
@@ -1,6 +1,6 @@
---- src/devices/nm-device.c
-+++ src/devices/nm-device.c
-@@ -32,7 +32,11 @@
+--- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
++++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
+@@ -17,7 +17,11 @@
  #include <arpa/inet.h>
  #include <fcntl.h>
  #include <linux/if_addr.h>
@@ -11,20 +11,20 @@
 +#endif
  #include <linux/rtnetlink.h>
  #include <linux/pkt_sched.h>
-
---- src/nm-manager.c
-+++ src/nm-manager.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <unistd.h>
+ 
+--- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
++++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
+@@ -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"
  
---- src/platform/nm-linux-platform.c	2019-04-19 11:31:51.000000000 +0200
-+++ src/platform/nm-linux-platform.c	2019-06-09 16:45:15.082158443 +0200
-@@ -20,6 +20,7 @@
+--- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
++++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
+@@ -6,6 +6,7 @@
  #include "nm-default.h"
  
  #include "nm-linux-platform.h"
@@ -32,7 +32,7 @@
  
  #include <arpa/inet.h>
  #include <dlfcn.h>
-@@ -28,7 +29,11 @@
+@@ -14,7 +15,11 @@
  #include <libudev.h>
  #include <linux/fib_rules.h>
  #include <linux/ip.h>
@@ -44,7 +44,7 @@
  #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"
diff --git a/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch b/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
deleted file mode 100644
index ece41ca9c96..00000000000
--- a/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/systemd/sd-adapt-core/nm-sd-adapt-core.h.orig	2019-03-17 16:56:13.649901535 +0100
-+++ src/systemd/sd-adapt-core/nm-sd-adapt-core.h	2019-03-17 16:56:35.278786119 +0100
-@@ -65,7 +65,7 @@
- #  ifdef HAVE___SECURE_GETENV
- #    define secure_getenv __secure_getenv
- #  else
--#    error neither secure_getenv nor __secure_getenv is available
-+#    define secure_getenv getenv
- #  endif
- #endif
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
new file mode 100644
index 00000000000..43b689f3bad
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
@@ -0,0 +1,40 @@
+--- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
++++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
+@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
+         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
+         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
+ 
++#ifdef __GLIBC__
+         r = seed48_r(seed16v, &config->entropy);
++#else
++        r = 0;
++        seed48(seed16v);
++#endif
+         c_assert(!r);
+ }
+ 
+@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
+         long int result;
+         int r;
+ 
++#ifdef __GLIBC__
+         r = mrand48_r(&config->entropy, &result);
++#else
++        r = 0;
++        result = mrand48();
++#endif
+         c_assert(!r);
+ 
+         return result;
+--- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
++++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
+@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
+         bool inform_only;
+         bool init_reboot;
+         struct in_addr requested_ip;
++#ifdef __GLIBC__
+         struct drand48_data entropy;    /* 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/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e9a615193c9..d1b703da6b2 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.18.2
-revision=4
+version=1.22.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -24,15 +24,15 @@ hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
 makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
- libpsl-devel eudev-libudev-devel
+ libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
  $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
-depends="dbus iproute2 openresolv wpa_supplicant"
+depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3
+checksum=9104117354c16565df8d4a283d009244c05567738940554251cedc091c78e987
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 make_dirs="

From e903ee1e1189c77ee0b1b3fac6be924a0163a494 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 15:04:21 +0200
Subject: [PATCH 02/12] NetworkManager: add musl patches

---
 .../patches/fix-musl-linux-header.diff        | 15 ++++++
 .../patches/fix-musl-qsort_r.patch            | 16 +++++++
 srcpkgs/NetworkManager/patches/fix-musl.patch | 48 -------------------
 3 files changed, 31 insertions(+), 48 deletions(-)
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
new file mode 100644
index 00000000000..511759214a9
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
@@ -0,0 +1,15 @@
+diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+index f67a45bd2..ec11fa605 100644
+--- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
++++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+@@ -8,8 +8,10 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
++#ifdef __GLIBC__
+ #include <linux/if_arp.h>
+ #include <linux/if_infiniband.h>
++#endif
+ 
+ #include "sd-dhcp6-client.h"
+ 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
new file mode 100644
index 00000000000..f89eac77850
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
@@ -0,0 +1,16 @@
+diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
+index e029f8646..168735087 100644
+--- shared/systemd/src/basic/sort-util.h
++++ shared/systemd/src/basic/sort-util.h
+@@ -60,7 +60,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/srcpkgs/NetworkManager/patches/fix-musl.patch b/srcpkgs/NetworkManager/patches/fix-musl.patch
deleted file mode 100644
index 35630c6182b..00000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git shared/n-dhcp4/src/n-dhcp4-c-probe.c shared/n-dhcp4/src/n-dhcp4-c-probe.c
-index 308cff830..9463528b1 100644
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c
-+++ 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
---- shared/n-dhcp4/src/n-dhcp4-private.h
-+++ 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];

From 43612027b499d5db04464044890acf77ed9dd1d7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:07:13 +0200
Subject: [PATCH 03/12] network-manager-applet: update to 1.8.24.

also remove libnm-gtk legacy support
---
 srcpkgs/network-manager-applet/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index f27836fad50..b6b12bcbd22 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,11 +1,10 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=1.8.22
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)
- --with-libnm-gtk"
+configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
  libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
@@ -17,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed
+checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
 lib32disabled=yes
 
 # Package build options

From b725e71bc58d7f24caff8918c9a52a4a7786afdd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:07:33 +0200
Subject: [PATCH 04/12] NetworkManager-openconnect: update to 1.2.6.

---
 srcpkgs/NetworkManager-openconnect/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index fe6a02c2de5..6f8d4a67d86 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -7,7 +7,8 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel gcr-devel"
+ libxml2-devel openconnect-devel libressl-devel liblz4-devel
+ gcr-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"

From 54392cf15f7758b35067c95ef03d2c44f90aee12 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:17:54 +0200
Subject: [PATCH 05/12] NetworkManager-openvpn: rebuild without legacy
 libnm-glib support

---
 ...isable-libnm-glib-support-by-default.patch | 52 +++++++++++++++++++
 srcpkgs/NetworkManager-openvpn/template       |  8 ++-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
new file mode 100644
index 00000000000..7eb72e1dbb6
--- /dev/null
+++ b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
@@ -0,0 +1,52 @@
+source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
+
+From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
+Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Wed, 17 Oct 2018 15:21:30 +0200
+Subject: [PATCH] build: disable libnm-glib support by default
+
+By now nobody should be using this. Keep the code around for a little
+longer just in case anybody still uses this.
+
+The libnm-glib support also serves as an example how do we build two
+different versions of the properties plugin. We'll soon be in a similar
+situation with Gtk 4.0. (sigh.) Just don't drop it yet.
+
+Conflicts:
+	NEWS
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 11ff5d0..eaf015b 100644
+--- configure.ac
++++ configure.ac
+@@ -75,20 +75,20 @@ dnl
+ dnl GNOME support
+ dnl
+ AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
+-AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
++AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
+ if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
+ 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
+ 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
+ 	fi
+ fi
+ if test "$with_gnome" != no; then
+ 	with_gnome=yes
+ fi
+ if test "$with_libnm_glib_specified" == no; then
+-	with_libnm_glib="$with_gnome"
++	with_libnm_glib=no
+ fi
+-if test "$with_libnm_glib" != no; then
+-	with_libnm_glib=yes
++if test "$with_libnm_glib" != yes; then
++	with_libnm_glib=no
+ fi
+ AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
+ AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
+-- 
+2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 835460c1a3f..58bc614b9d2 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
 version=1.8.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake autoconf libtool intltool glib-devel gettext-devel"
 makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
@@ -21,3 +21,7 @@ post_extract() {
 	sed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
 		shared/nm-service-defines.h
 }
+
+pre_configure() {
+	autoreconf -fi
+}

From 4ce71469a81b69ce2118d364f6f45b89aafa7540 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Aug 2019 08:08:38 +0200
Subject: [PATCH 06/12] NetworkManager-openconnect: rebuild without legacy
 libnm-glib support

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 6f8d4a67d86..327f2bd84cb 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,7 +1,7 @@
 # Template build file for 'NetworkManager-openconnect'.
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-static"

From af4a3ebd8bef6c752a6e53fe890eeaa42cc85605 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Aug 2019 08:09:12 +0200
Subject: [PATCH 07/12] NetworkManager-vpnc: rebuild without legacy libnm-glib
 support

---
 srcpkgs/NetworkManager-vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index 22a42be203e..b327ad81c8e 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--localstatedir=/var --disable-static"
 hostmakedepends="pkg-config intltool"

From 84b87f128d9226a46a8d58316edd96ed1936f74c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Aug 2019 01:49:21 +0200
Subject: [PATCH 08/12] NetworkManager-pptp: rebuild without legacy libnm-glib
 support

---
 srcpkgs/NetworkManager-pptp/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index e6de3e2a50a..f850a876e25 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,8 +1,9 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
  network-manager-applet-devel NetworkManager-devel"

From 8cbb3ea78f3ecc531e4b2bef11eeb7868ad9b458 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Aug 2019 01:53:57 +0200
Subject: [PATCH 09/12] NetworkManager-strongswan: rebuild without legacy
 libnm-glib support

---
 srcpkgs/NetworkManager-strongswan/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 9ea95f6db31..4d8d2b14306 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,9 +1,10 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
 version=1.4.5
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-more-warnings"
+configure_args="--disable-static --disable-more-warnings --without-libnm-glib
+ --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
 makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
 depends="strongswan"

From 544719db5e0490a35697dcf193dc4df9b1ea8c0e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 02:38:59 +0100
Subject: [PATCH 10/12] networkmanager-dmenu: remove, does only support legacy
 API

---
 srcpkgs/networkmanager-dmenu/template | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 srcpkgs/networkmanager-dmenu/template

diff --git a/srcpkgs/networkmanager-dmenu/template b/srcpkgs/networkmanager-dmenu/template
deleted file mode 100644
index dab3febf077..00000000000
--- a/srcpkgs/networkmanager-dmenu/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'networkmanager-dmenu'
-pkgname=networkmanager-dmenu
-version=1.1
-revision=2
-archs=noarch
-conf_files="/etc/networkmanager_dmenu-config.ini"
-depends="NetworkManager python3-gobject"
-short_desc="Control NetworkManager via dmenu"
-maintainer="teldra <teldra@rotce.de>"
-license="MIT"
-homepage="https://github.com/firecat53/${pkgname}"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=279695b8833ec790cf0c00ec2eb36be09ca33a39aa9595578e2e3d2f644dd998
-python_version=3
-
-do_install() {
-	vmkdir usr/share/applications
-	vinstall networkmanager_dmenu.desktop 644 usr/share/applications
-	vbin networkmanager_dmenu
-	vconf config.ini.example networkmanager_dmenu-config.ini
-	vsconf config.ini.example
-	vdoc README.rst
-	vlicense LICENSE.txt LICENSE
-}
-

From a3d5dea1e00b0172133eb836f50cd21b73a669dc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 02:40:12 +0100
Subject: [PATCH 11/12] network-manager-applet: update to 1.8.24.

---
 srcpkgs/network-manager-applet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index b6b12bcbd22..0656107b1af 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.22
-revision=2
+version=1.8.24
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"

From 0edd42ac5b3cf7bba849abbbb120f6ccbba78dee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 03:00:03 +0100
Subject: [PATCH 12/12] common/shlib: remove legacy shlibs of NetworkManager

---
 common/shlibs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a4c337fb67d..02bc77f21f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -646,9 +646,6 @@ libip6tc.so.2 iptables-1.8.3_1
 libxtables.so.12 iptables-1.6.1_1
 libip4tc.so.2 iptables-1.8.3_1
 libipq.so.0 iptables-1.4.7_1
-libnm-util.so.2 libnm-0.9.1.90_1
-libnm-glib.so.4 libnm-0.9.1.90_1
-libnm-glib-vpn.so.1 libnm-0.9.1.90_1
 libnm.so.0 libnm-1.0.0_1
 libKF5ItemModels.so.5 kitemmodels-5.26.0_1
 libboost_context.so.1.69.0 libboost_context1.69-1.69.0_1<1.70.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager-1.22
  2020-01-07  8:13 [PR PATCH] NetworkManager-1.22 voidlinux-github
  2020-01-08 14:50 ` [PR PATCH] [Updated] NetworkManager-1.22 voidlinux-github
  2020-01-08 14:51 ` voidlinux-github
@ 2020-01-12 19:38 ` voidlinux-github
  2020-01-12 19:52 ` [PR PATCH] [Merged]: NetworkManager-1.22 voidlinux-github
  3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-12 19:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 606 bytes --]

There is an updated pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages NetworkManager-1.22
https://github.com/void-linux/void-packages/pull/18085

NetworkManager-1.22
This PR updates the Network Manager to 1.22.8. It also removes dependencies that rely on the deprecated and removed gobject interface.
This PR works on glibc, builds on musl, but is not yet tested there.

* glibc
  * [x] builds
  * [x] tested
* musl
  * [x] builds
  * [ ] tested

A patch file from https://github.com/void-linux/void-packages/pull/18085.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-NetworkManager-1.22-18085.patch --]
[-- Type: text/x-diff, Size: 26275 bytes --]

From 3b438f9724625f56ac7ef0abf0a05889646d09ce Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 7 Aug 2019 10:55:02 +0200
Subject: [PATCH 01/12] NetworkManager: update to 1.22.2.

---
 srcpkgs/NetworkManager/patches/fix-musl.patch | 48 +++++++++++++++++++
 .../patches/musl-fix-includes.patch           | 32 ++++++-------
 .../patches/musl-has-not-secure-getenv.patch  | 10 ----
 .../patches/musl-use-srand48.patch            | 40 ++++++++++++++++
 srcpkgs/NetworkManager/template               | 10 ++--
 5 files changed, 109 insertions(+), 31 deletions(-)
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
 create mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-musl.patch b/srcpkgs/NetworkManager/patches/fix-musl.patch
new file mode 100644
index 00000000000..35630c6182b
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl.patch
@@ -0,0 +1,48 @@
+diff --git shared/n-dhcp4/src/n-dhcp4-c-probe.c shared/n-dhcp4/src/n-dhcp4-c-probe.c
+index 308cff830..9463528b1 100644
+--- shared/n-dhcp4/src/n-dhcp4-c-probe.c
++++ 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
+--- shared/n-dhcp4/src/n-dhcp4-private.h
++++ 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/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
index 03bdb67780e..95ffb2d354e 100644
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
@@ -1,6 +1,6 @@
---- src/devices/nm-device.c
-+++ src/devices/nm-device.c
-@@ -32,7 +32,11 @@
+--- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
++++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
+@@ -17,7 +17,11 @@
  #include <arpa/inet.h>
  #include <fcntl.h>
  #include <linux/if_addr.h>
@@ -11,20 +11,20 @@
 +#endif
  #include <linux/rtnetlink.h>
  #include <linux/pkt_sched.h>
-
---- src/nm-manager.c
-+++ src/nm-manager.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <unistd.h>
+ 
+--- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
++++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
+@@ -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"
  
---- src/platform/nm-linux-platform.c	2019-04-19 11:31:51.000000000 +0200
-+++ src/platform/nm-linux-platform.c	2019-06-09 16:45:15.082158443 +0200
-@@ -20,6 +20,7 @@
+--- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
++++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
+@@ -6,6 +6,7 @@
  #include "nm-default.h"
  
  #include "nm-linux-platform.h"
@@ -32,7 +32,7 @@
  
  #include <arpa/inet.h>
  #include <dlfcn.h>
-@@ -28,7 +29,11 @@
+@@ -14,7 +15,11 @@
  #include <libudev.h>
  #include <linux/fib_rules.h>
  #include <linux/ip.h>
@@ -44,7 +44,7 @@
  #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"
diff --git a/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch b/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
deleted file mode 100644
index ece41ca9c96..00000000000
--- a/srcpkgs/NetworkManager/patches/musl-has-not-secure-getenv.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/systemd/sd-adapt-core/nm-sd-adapt-core.h.orig	2019-03-17 16:56:13.649901535 +0100
-+++ src/systemd/sd-adapt-core/nm-sd-adapt-core.h	2019-03-17 16:56:35.278786119 +0100
-@@ -65,7 +65,7 @@
- #  ifdef HAVE___SECURE_GETENV
- #    define secure_getenv __secure_getenv
- #  else
--#    error neither secure_getenv nor __secure_getenv is available
-+#    define secure_getenv getenv
- #  endif
- #endif
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
new file mode 100644
index 00000000000..43b689f3bad
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
@@ -0,0 +1,40 @@
+--- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
++++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
+@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
+         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
+         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
+ 
++#ifdef __GLIBC__
+         r = seed48_r(seed16v, &config->entropy);
++#else
++        r = 0;
++        seed48(seed16v);
++#endif
+         c_assert(!r);
+ }
+ 
+@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
+         long int result;
+         int r;
+ 
++#ifdef __GLIBC__
+         r = mrand48_r(&config->entropy, &result);
++#else
++        r = 0;
++        result = mrand48();
++#endif
+         c_assert(!r);
+ 
+         return result;
+--- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
++++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
+@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
+         bool inform_only;
+         bool init_reboot;
+         struct in_addr requested_ip;
++#ifdef __GLIBC__
+         struct drand48_data entropy;    /* 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/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e9a615193c9..d1b703da6b2 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.18.2
-revision=4
+version=1.22.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -24,15 +24,15 @@ hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
 makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
- libpsl-devel eudev-libudev-devel
+ libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
  $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
-depends="dbus iproute2 openresolv wpa_supplicant"
+depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3
+checksum=9104117354c16565df8d4a283d009244c05567738940554251cedc091c78e987
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 make_dirs="

From 17406b6f81e712bb1b0ab9cb10062e7d0971fcc6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 15:04:21 +0200
Subject: [PATCH 02/12] NetworkManager: add musl patches

---
 .../patches/fix-musl-linux-header.diff        | 15 ++++++
 .../patches/fix-musl-qsort_r.patch            | 16 +++++++
 srcpkgs/NetworkManager/patches/fix-musl.patch | 48 -------------------
 3 files changed, 31 insertions(+), 48 deletions(-)
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
new file mode 100644
index 00000000000..511759214a9
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
@@ -0,0 +1,15 @@
+diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+index f67a45bd2..ec11fa605 100644
+--- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
++++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+@@ -8,8 +8,10 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
++#ifdef __GLIBC__
+ #include <linux/if_arp.h>
+ #include <linux/if_infiniband.h>
++#endif
+ 
+ #include "sd-dhcp6-client.h"
+ 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
new file mode 100644
index 00000000000..f89eac77850
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
@@ -0,0 +1,16 @@
+diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
+index e029f8646..168735087 100644
+--- shared/systemd/src/basic/sort-util.h
++++ shared/systemd/src/basic/sort-util.h
+@@ -60,7 +60,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/srcpkgs/NetworkManager/patches/fix-musl.patch b/srcpkgs/NetworkManager/patches/fix-musl.patch
deleted file mode 100644
index 35630c6182b..00000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git shared/n-dhcp4/src/n-dhcp4-c-probe.c shared/n-dhcp4/src/n-dhcp4-c-probe.c
-index 308cff830..9463528b1 100644
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c
-+++ 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
---- shared/n-dhcp4/src/n-dhcp4-private.h
-+++ 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];

From 7ad1881596cb35a3d29a55c7ce2df36e2ea26476 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:07:13 +0200
Subject: [PATCH 03/12] network-manager-applet: update to 1.8.24.

also remove libnm-gtk legacy support
---
 srcpkgs/network-manager-applet/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index f27836fad50..b6b12bcbd22 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,11 +1,10 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=1.8.22
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)
- --with-libnm-gtk"
+configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
  libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
@@ -17,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed
+checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
 lib32disabled=yes
 
 # Package build options

From 4c1b14a3de6e65abd5fa78693385d5bebe8d724b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:07:33 +0200
Subject: [PATCH 04/12] NetworkManager-openconnect: update to 1.2.6.

---
 srcpkgs/NetworkManager-openconnect/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index fe6a02c2de5..6f8d4a67d86 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -7,7 +7,8 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel gcr-devel"
+ libxml2-devel openconnect-devel libressl-devel liblz4-devel
+ gcr-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"

From dd07a52484acaede76a7a43d35cac8c1046828de Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Aug 2019 16:17:54 +0200
Subject: [PATCH 05/12] NetworkManager-openvpn: rebuild without legacy
 libnm-glib support

---
 ...isable-libnm-glib-support-by-default.patch | 52 +++++++++++++++++++
 srcpkgs/NetworkManager-openvpn/template       |  8 ++-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
new file mode 100644
index 00000000000..7eb72e1dbb6
--- /dev/null
+++ b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
@@ -0,0 +1,52 @@
+source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
+
+From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
+Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Wed, 17 Oct 2018 15:21:30 +0200
+Subject: [PATCH] build: disable libnm-glib support by default
+
+By now nobody should be using this. Keep the code around for a little
+longer just in case anybody still uses this.
+
+The libnm-glib support also serves as an example how do we build two
+different versions of the properties plugin. We'll soon be in a similar
+situation with Gtk 4.0. (sigh.) Just don't drop it yet.
+
+Conflicts:
+	NEWS
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 11ff5d0..eaf015b 100644
+--- configure.ac
++++ configure.ac
+@@ -75,20 +75,20 @@ dnl
+ dnl GNOME support
+ dnl
+ AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
+-AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
++AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
+ if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
+ 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
+ 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
+ 	fi
+ fi
+ if test "$with_gnome" != no; then
+ 	with_gnome=yes
+ fi
+ if test "$with_libnm_glib_specified" == no; then
+-	with_libnm_glib="$with_gnome"
++	with_libnm_glib=no
+ fi
+-if test "$with_libnm_glib" != no; then
+-	with_libnm_glib=yes
++if test "$with_libnm_glib" != yes; then
++	with_libnm_glib=no
+ fi
+ AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
+ AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
+-- 
+2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 835460c1a3f..170d992326e 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
 version=1.8.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
 makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
@@ -21,3 +21,7 @@ post_extract() {
 	sed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
 		shared/nm-service-defines.h
 }
+
+pre_configure() {
+	autoreconf -fi
+}

From c4b7b5dab621814f6aaf650777b87d1c949bad66 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Aug 2019 08:08:38 +0200
Subject: [PATCH 06/12] NetworkManager-openconnect: rebuild without legacy
 libnm-glib support

---
 srcpkgs/NetworkManager-openconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 6f8d4a67d86..327f2bd84cb 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,7 +1,7 @@
 # Template build file for 'NetworkManager-openconnect'.
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-static"

From cba66cccfa87583cf1850ae8be864abb7db43dad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Aug 2019 08:09:12 +0200
Subject: [PATCH 07/12] NetworkManager-vpnc: rebuild without legacy libnm-glib
 support

---
 srcpkgs/NetworkManager-vpnc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index 22a42be203e..b327ad81c8e 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--localstatedir=/var --disable-static"
 hostmakedepends="pkg-config intltool"

From b697607e0c7c8b31f4b3229ff595ec1ba6976aaf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Aug 2019 01:49:21 +0200
Subject: [PATCH 08/12] NetworkManager-pptp: rebuild without legacy libnm-glib
 support

---
 srcpkgs/NetworkManager-pptp/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index e6de3e2a50a..f850a876e25 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,8 +1,9 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
  network-manager-applet-devel NetworkManager-devel"

From 677d7044e761fd1addd6e94dec0010490209cdd4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Aug 2019 01:53:57 +0200
Subject: [PATCH 09/12] NetworkManager-strongswan: rebuild without legacy
 libnm-glib support

---
 srcpkgs/NetworkManager-strongswan/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 9ea95f6db31..4d8d2b14306 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,9 +1,10 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
 version=1.4.5
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-more-warnings"
+configure_args="--disable-static --disable-more-warnings --without-libnm-glib
+ --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
 makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
 depends="strongswan"

From 4ab7c12191984aae00352dee89ef8c63eb8fe021 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 02:38:59 +0100
Subject: [PATCH 10/12] networkmanager-dmenu: remove, does only support legacy
 API

---
 srcpkgs/networkmanager-dmenu/template | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 srcpkgs/networkmanager-dmenu/template

diff --git a/srcpkgs/networkmanager-dmenu/template b/srcpkgs/networkmanager-dmenu/template
deleted file mode 100644
index dab3febf077..00000000000
--- a/srcpkgs/networkmanager-dmenu/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'networkmanager-dmenu'
-pkgname=networkmanager-dmenu
-version=1.1
-revision=2
-archs=noarch
-conf_files="/etc/networkmanager_dmenu-config.ini"
-depends="NetworkManager python3-gobject"
-short_desc="Control NetworkManager via dmenu"
-maintainer="teldra <teldra@rotce.de>"
-license="MIT"
-homepage="https://github.com/firecat53/${pkgname}"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=279695b8833ec790cf0c00ec2eb36be09ca33a39aa9595578e2e3d2f644dd998
-python_version=3
-
-do_install() {
-	vmkdir usr/share/applications
-	vinstall networkmanager_dmenu.desktop 644 usr/share/applications
-	vbin networkmanager_dmenu
-	vconf config.ini.example networkmanager_dmenu-config.ini
-	vsconf config.ini.example
-	vdoc README.rst
-	vlicense LICENSE.txt LICENSE
-}
-

From 523357916e2ecfb81a376b68544aa81e58765ccd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 02:40:12 +0100
Subject: [PATCH 11/12] network-manager-applet: update to 1.8.24.

---
 srcpkgs/network-manager-applet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index b6b12bcbd22..0656107b1af 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.22
-revision=2
+version=1.8.24
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"

From 81ce1c324fcfd2edb8dfcfbb2e688c47242fc298 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 10 Dec 2019 03:00:03 +0100
Subject: [PATCH 12/12] common/shlib: remove legacy shlibs of NetworkManager

---
 common/shlibs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b12c799a479..51692ea249d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -646,9 +646,6 @@ libip6tc.so.2 iptables-1.8.3_1
 libxtables.so.12 iptables-1.6.1_1
 libip4tc.so.2 iptables-1.8.3_1
 libipq.so.0 iptables-1.4.7_1
-libnm-util.so.2 libnm-0.9.1.90_1
-libnm-glib.so.4 libnm-0.9.1.90_1
-libnm-glib-vpn.so.1 libnm-0.9.1.90_1
 libnm.so.0 libnm-1.0.0_1
 libKF5ItemModels.so.5 kitemmodels-5.26.0_1
 libboost_context.so.1.69.0 libboost_context1.69-1.69.0_1<1.70.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: NetworkManager-1.22
  2020-01-07  8:13 [PR PATCH] NetworkManager-1.22 voidlinux-github
                   ` (2 preceding siblings ...)
  2020-01-12 19:38 ` voidlinux-github
@ 2020-01-12 19:52 ` voidlinux-github
  3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-12 19:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

There's a merged pull request on the void-packages repository

NetworkManager-1.22
https://github.com/void-linux/void-packages/pull/18085

Description:
This PR updates the Network Manager to 1.22.8. It also removes dependencies that rely on the deprecated and removed gobject interface.
This PR works on glibc, builds on musl, but is not yet tested there.

* glibc
  * [x] builds
  * [x] tested
* musl
  * [x] builds
  * [ ] tested

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-07  8:13 [PR PATCH] NetworkManager-1.22 voidlinux-github
2020-01-08 14:50 ` [PR PATCH] [Updated] NetworkManager-1.22 voidlinux-github
2020-01-08 14:51 ` voidlinux-github
2020-01-12 19:38 ` voidlinux-github
2020-01-12 19:52 ` [PR PATCH] [Merged]: NetworkManager-1.22 voidlinux-github

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git