diff --git a/srcpkgs/NetworkManager/patches/fix-musl.patch b/srcpkgs/NetworkManager/patches/fix-musl.patch new file mode 100644 index 0000000000..35630c6182 --- /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 03bdb67780..95ffb2d354 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 #include #include @@ -11,20 +11,20 @@ +#endif #include #include - ---- src/nm-manager.c -+++ src/nm-manager.c -@@ -26,6 +26,7 @@ - #include - #include - #include + +--- 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 + #include + #include +#include - #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 #include -@@ -28,7 +29,11 @@ +@@ -14,7 +15,11 @@ #include #include #include @@ -44,7 +44,7 @@ #include #include #include -@@ -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 ece41ca9c9..0000000000 --- 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 0000000000..43b689f3ba --- /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 e9a615193c..d1b703da6b 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 " 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="