diff options
author | Rasmus Thomsen <oss@cogitri.dev> | 2019-08-07 14:58:37 +0200 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2019-08-29 13:55:24 -0300 |
commit | ac91c7abeaea0f216ea2b0b88033015bd0505f55 (patch) | |
tree | 925981c4889329114ff1ca9b9eb01ad359172250 /community/networkmanager | |
parent | b07c27f6484536cc30fc8bdc9a17b9b903e5770d (diff) | |
download | aports-ac91c7abeaea0f216ea2b0b88033015bd0505f55.tar.bz2 aports-ac91c7abeaea0f216ea2b0b88033015bd0505f55.tar.xz |
community/networkmanager: upgrade to 1.20.0
Diffstat (limited to 'community/networkmanager')
-rw-r--r-- | community/networkmanager/APKBUILD | 14 | ||||
-rw-r--r-- | community/networkmanager/musl-fix-includes.patch | 15 | ||||
-rw-r--r-- | community/networkmanager/musl-no-drand.patch | 58 |
3 files changed, 81 insertions, 6 deletions
diff --git a/community/networkmanager/APKBUILD b/community/networkmanager/APKBUILD index e385003ad4..dbc5bcd48c 100644 --- a/community/networkmanager/APKBUILD +++ b/community/networkmanager/APKBUILD @@ -1,8 +1,9 @@ +# Contributor: Rasmus Thomsen <oss@cogitri.dev> # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=networkmanager -pkgver=1.18.2 -pkgrel=3 +pkgver=1.20.0 +pkgrel=0 pkgdesc="Network Management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" arch="all !s390x" # Limited by iwd @@ -47,6 +48,7 @@ source="https://download.gnome.org/sources/NetworkManager/${pkgver:0:4}/NetworkM musl-has-not-secure-getenv.patch musl-compar.patch fix-ppc64le-build.patch + musl-no-drand.patch " options="!check" # fail to compile on musl @@ -73,7 +75,6 @@ build() { -Dconfig_dhcp_default=dhcpcd \ -Dvapi=true \ -Dtests=no \ - -Dlibnm_glib=true \ -Dpolkit_agent=true \ -Dsession_tracking=no \ -Dqt=false \ @@ -107,14 +108,15 @@ wifi.backend=iwd EOF } -sha512sums="a220d856632693298af0bd23ae4393ee597684fcae400c8ed35bae5e543bcdbd0b0e879f4a7587b674ae86c5fdfbee955acd0fb6226cb95ed31372cb7c222814 NetworkManager-1.18.2.tar.xz +sha512sums="825c56a7530d813ba7ea2ec57034def560f4b0fb65a09dc70cd94dc897e2aabde11f18c6c4843da9c520531683e963037ce42270a6ffa5c7c5e9502bb80bdf1b NetworkManager-1.20.0.tar.xz a6e507260e2ceffad4cacb2b49a1d4f6b933e5ae8bc50c1bd56f828298c5dc8d9d17aa4be766faeacefbe3c6c0c748e4ef499a55bb5ee40f0f04bbf766fbbc82 networkmanager.conf 5ac6d11b588c479de9c7e1fef79ed0a2c04dc159a2173636a6a77a2867c839cc1609860756109e9e794f23a02238a6d94834d8fb6fcb81a6be3ef1dbf4a34e6f networkmanager.initd 9820ed2ead0af689644842de57657bb10330a1eaff0e85b21ae9913f55e399e47d8b41b0a12956f30de80272b4424c6e55f33acbc88e156879003a260bf576f6 networkmanager.rules 9d1a9185b0b50f677a4173a8b67e808ba36971111165ae446e9a15b5c7adcc8cc6d44fa7bddac05762c50d80b04818a483756eaf2aaefe0162e1f37cd070fca4 musl-basic.patch 095c1d944f3274ba31435cd1af8e2affb4187bdd921a0cc0c185b59810b73cfab7919b5f551bab3d9e4644fbee8f9ac017b4c5d69a771fb68319cbefa37c71a3 musl-network-support.patch -a3fe34eb93cb918650390ea01696a8e8489455a89721e479d6b83ab730f6608e9cf78cd0d993e7c8051708b695eea420490e36d85d400fa39ec0ff5d3882d26b musl-fix-includes.patch +c4d10e6f7484267d2f1471b7c072bcadc332bff66c0387f7f4cca6604d3ca558e01c63850aff128507d48ea1e8ead1fe415013ca962b7bf4b5b5605f79ff97bf musl-fix-includes.patch b5cd94928ca3ba1fb71aec28d9ff66f319f6d23131e02c90f1dfbfaf16c537935228a9981c95f29ffb74e91752a17801c94d09ca57b7ba98028262b9e8e5d322 musl-process-util.patch 76b6728389686c91df6acafbbe17af7f0e01971e5f7185e164dcb39f93982ac6b73fc2cdf0ba2018e3fa80321178621fe2a5d910546de98bfc52484aa5d90d34 musl-has-not-secure-getenv.patch 634377674691b52da80ca4c445a727d39cd40269f7deef0d3ccc1e1041cc262e8bc1423200e9a2b0cf1804e9950059ebbbc827f1200c6a97c58bc76080a6d6d2 musl-compar.patch -c2dbdf31adb472dc6b14aad6d7a0981b2618880df7c9081ebb9bc6da8af4c5e791c36c4e997878d5e1e7f96bd65814f718e7ae23dcfea5ac5aa91acdab3775ae fix-ppc64le-build.patch" +c2dbdf31adb472dc6b14aad6d7a0981b2618880df7c9081ebb9bc6da8af4c5e791c36c4e997878d5e1e7f96bd65814f718e7ae23dcfea5ac5aa91acdab3775ae fix-ppc64le-build.patch +342fb3eef0e7057b6d8f1a00687af17dc633387d8a25d475e3e9c8de5712221eec8ada634a189e3458dcbb12b20625b99b552acda3927b5baa61b960ce5740eb musl-no-drand.patch" diff --git a/community/networkmanager/musl-fix-includes.patch b/community/networkmanager/musl-fix-includes.patch index e68925372d..f05c074abf 100644 --- a/community/networkmanager/musl-fix-includes.patch +++ b/community/networkmanager/musl-fix-includes.patch @@ -50,3 +50,18 @@ index d4b0115..c934f10 100644 #include <linux/if_bridge.h> #include <linux/if_link.h> #include <linux/if_tun.h> +--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c +@@ -8,7 +8,11 @@ + #include <errno.h> + #include <string.h> + #include <sys/ioctl.h> ++#if defined(__GLIBC__) + #include <linux/if_arp.h> ++#else ++#include <linux/if.h> ++#endif + #include <linux/if_infiniband.h> + + #include "sd-dhcp6-client.h" + diff --git a/community/networkmanager/musl-no-drand.patch b/community/networkmanager/musl-no-drand.patch new file mode 100644 index 0000000000..46e3a7950c --- /dev/null +++ b/community/networkmanager/musl-no-drand.patch @@ -0,0 +1,58 @@ +From ec471e66ee14d7da06d4d0a22bc3cdb5f615fd6f Mon Sep 17 00:00:00 2001 +From: Enno Boland <g@s01.de> +Date: Wed, 7 Aug 2019 16:51:16 +0200 +Subject: [PATCH] use jrand48 instead of mrand48_r on non glibc platforms + +--- + shared/n-dhcp4/src/n-dhcp4-c-probe.c | 8 ++++++++ + shared/n-dhcp4/src/n-dhcp4-private.h | 4 ++++ + 2 files changed, 12 insertions(+) + +diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c +index 308cff8307..9463528b1f 100644 +--- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c ++++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c +@@ -362,8 +362,12 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe + seed16v[1] = (u64 >> 16) ^ (u64 >> 0); + seed16v[2] = (u64 >> 32) ^ (u64 >> 16); + ++#ifdef __GLIBC__ + r = seed48_r(seed16v, &config->entropy); + c_assert(!r); ++#else ++ memcpy(config->entropy, seed16v, sizeof seed16v); ++#endif + } + + /** +@@ -377,10 +381,14 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe + */ + uint32_t n_dhcp4_client_probe_config_get_random(NDhcp4ClientProbeConfig *config) { + long int result; ++#ifdef __GLIBC__ + int r; + + r = mrand48_r(&config->entropy, &result); + c_assert(!r); ++#else ++ result = jrand48(config->entropy); ++#endif + + return result; + }; +diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h +index c38ddbfc80..fb48807712 100644 +--- a/shared/n-dhcp4/src/n-dhcp4-private.h ++++ b/shared/n-dhcp4/src/n-dhcp4-private.h +@@ -259,7 +259,11 @@ struct NDhcp4ClientProbeConfig { + bool inform_only; + bool init_reboot; + struct in_addr requested_ip; ++#ifdef __GLIBC__ + struct drand48_data entropy; /* entropy pool */ ++#else ++ unsigned short entropy[3]; /* entropy pool */ ++#endif + uint64_t ms_start_delay; /* max ms to wait before starting probe */ + NDhcp4ClientProbeOption *options[UINT8_MAX + 1]; + int8_t request_parameters[UINT8_MAX + 1]; |