aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2021-03-25 11:48:04 +0100
committerRasmus Thomsen <oss@cogitri.dev>2021-03-25 13:12:14 +0000
commit3c005685bfdfceca36a0b3723cbc8f081941f8cf (patch)
treeb24ecc64db29f9ddab3aa8c70d6a63916983d3d6
parent4d35c076ce77bfac7655f60c4c3e4c86933ab7dd (diff)
downloadaports-3c005685bfdfceca36a0b3723cbc8f081941f8cf.tar.gz
aports-3c005685bfdfceca36a0b3723cbc8f081941f8cf.tar.bz2
aports-3c005685bfdfceca36a0b3723cbc8f081941f8cf.tar.xz
community/networkmanager: upgrade to 1.30.2
-rw-r--r--community/networkmanager/APKBUILD22
-rw-r--r--community/networkmanager/musl-basic.patch46
-rw-r--r--community/networkmanager/musl-compar.patch18
-rw-r--r--community/networkmanager/musl-fix-includes.patch90
-rw-r--r--community/networkmanager/musl-network-support.patch42
-rw-r--r--community/networkmanager/musl-no-drand.patch58
-rw-r--r--community/networkmanager/musl-process-util.patch40
-rw-r--r--community/networkmanager/py3.patch174
-rw-r--r--community/networkmanager/reallocarray.patch22
9 files changed, 111 insertions, 401 deletions
diff --git a/community/networkmanager/APKBUILD b/community/networkmanager/APKBUILD
index 8b059f7dbe..6b6e9712dd 100644
--- a/community/networkmanager/APKBUILD
+++ b/community/networkmanager/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=networkmanager
-pkgver=1.26.4
-pkgrel=1
+pkgver=1.30.2
+pkgrel=0
pkgdesc="Network Management daemon"
url="https://wiki.gnome.org/Projects/NetworkManager"
arch="all !mips !mips64 !s390x" # polkit
@@ -47,14 +47,7 @@ source="https://download.gnome.org/sources/NetworkManager/${pkgver:0:4}/NetworkM
$pkgname.conf
$pkgname.initd
$pkgname.rules
- musl-basic.patch
- musl-network-support.patch
- musl-fix-includes.patch
- musl-process-util.patch
- musl-compar.patch
- musl-no-drand.patch
py3.patch
- reallocarray.patch
"
options="!check" # fail to compile on musl
@@ -121,15 +114,8 @@ bashcomp() {
amove usr/share/bash-completion
}
-sha512sums="91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328 NetworkManager-1.26.4.tar.xz
+sha512sums="08482ac18814fd94bc99f0aa32de7d38c39d29c914a3080fb6df7ec2437b30f1aea1b5207edeae74ff63b9a181a4823cfa11e8884bc22ae80cb0b95f8cc3514e NetworkManager-1.30.2.tar.xz
0f79016bf717dea43830962f524deae8d1cedc274376e40bd912ebe63208c5b1c3b7a5aa14379da19020c587dbd5588df2f0066ca1540070a226983a43e4159b networkmanager.conf
5ac6d11b588c479de9c7e1fef79ed0a2c04dc159a2173636a6a77a2867c839cc1609860756109e9e794f23a02238a6d94834d8fb6fcb81a6be3ef1dbf4a34e6f networkmanager.initd
9820ed2ead0af689644842de57657bb10330a1eaff0e85b21ae9913f55e399e47d8b41b0a12956f30de80272b4424c6e55f33acbc88e156879003a260bf576f6 networkmanager.rules
-9d1a9185b0b50f677a4173a8b67e808ba36971111165ae446e9a15b5c7adcc8cc6d44fa7bddac05762c50d80b04818a483756eaf2aaefe0162e1f37cd070fca4 musl-basic.patch
-095c1d944f3274ba31435cd1af8e2affb4187bdd921a0cc0c185b59810b73cfab7919b5f551bab3d9e4644fbee8f9ac017b4c5d69a771fb68319cbefa37c71a3 musl-network-support.patch
-6bbd69084c8ad6171a7d230cbb814cef17c9b85764e94485defa5c223eda10189fa3c9ebbfabc7fc719a5ee8d687d6ebd5a130b4208040cb3b6ea8605101c0bf musl-fix-includes.patch
-b5cd94928ca3ba1fb71aec28d9ff66f319f6d23131e02c90f1dfbfaf16c537935228a9981c95f29ffb74e91752a17801c94d09ca57b7ba98028262b9e8e5d322 musl-process-util.patch
-634377674691b52da80ca4c445a727d39cd40269f7deef0d3ccc1e1041cc262e8bc1423200e9a2b0cf1804e9950059ebbbc827f1200c6a97c58bc76080a6d6d2 musl-compar.patch
-342fb3eef0e7057b6d8f1a00687af17dc633387d8a25d475e3e9c8de5712221eec8ada634a189e3458dcbb12b20625b99b552acda3927b5baa61b960ce5740eb musl-no-drand.patch
-8f7bb0128881cd281f4f9b2335d9788cde715d9fc29c295bad234b97a2df9e5ed99061da4806702d9ab8aa163711ffa283e82216ea8d714bb54d2b37aa2607cb py3.patch
-423c97e0c08c53959f94c6e4de6388a0295b57f2d6404dca748bde82985e3eb25d1061ecb29ef7b568aa292b0169478c85f3c350206c34aafaa2ee99c4a6dc5f reallocarray.patch"
+17721385196dd18718bd44a15f8b74febb28dd29b5acd901100fee5d4fd23341b0d07dea375a08f5feffda73aef51b01cc68d18e68c92d12e197a335789afb30 py3.patch"
diff --git a/community/networkmanager/musl-basic.patch b/community/networkmanager/musl-basic.patch
deleted file mode 100644
index 2e0d562d5a..0000000000
--- a/community/networkmanager/musl-basic.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/libnm-core/nm-json.c b/libnm-core/nm-json.c
-index aa181a4..98c39fc 100644
---- a/libnm-core/nm-json.c
-+++ b/libnm-core/nm-json.c
-@@ -23,6 +23,10 @@
-
- #include <dlfcn.h>
-
-+#ifndef RTLD_DEEPBIND
-+#define RTLD_DEEPBIND 0
-+#endif
-+
- void *_nm_jansson_json_object_iter_value;
- void *_nm_jansson_json_object_key_to_iter;
- void *_nm_jansson_json_integer;
-diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h
-index c3b9448..e80a938 100644
---- a/shared/systemd/src/basic/stdio-util.h
-+++ b/shared/systemd/src/basic/stdio-util.h
-@@ -1,7 +1,9 @@
- /* SPDX-License-Identifier: LGPL-2.1+ */
- #pragma once
-
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
-diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h
-index 25e6ab8..7967e8a 100644
---- a/shared/systemd/src/basic/util.h
-+++ b/shared/systemd/src/basic/util.h
-@@ -46,6 +46,12 @@ static inline unsigned u64log2(uint64_t n) {
- #endif
- }
-
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- static inline unsigned u32ctz(uint32_t n) {
- #if __SIZEOF_INT__ == 4
- return n != 0 ? __builtin_ctz(n) : 32;
diff --git a/community/networkmanager/musl-compar.patch b/community/networkmanager/musl-compar.patch
deleted file mode 100644
index 1b1de2f283..0000000000
--- a/community/networkmanager/musl-compar.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h
-index e029f86..935f136 100644
---- a/shared/systemd/src/basic/sort-util.h
-+++ b/shared/systemd/src/basic/sort-util.h
-@@ -5,6 +5,13 @@
-
- #include "macro.h"
-
-+#ifndef __COMPAR_FN_T
-+# define __COMPAR_FN_T
-+typedef int (*__compar_fn_t) (const void *, const void *);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
- __compar_d_fn_t compar, void *arg);
-
diff --git a/community/networkmanager/musl-fix-includes.patch b/community/networkmanager/musl-fix-includes.patch
deleted file mode 100644
index 98f8bc286e..0000000000
--- a/community/networkmanager/musl-fix-includes.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/src/NetworkManagerUtils.c 2020-07-17 20:05:45.382005791 +0200
-+++ b/src/NetworkManagerUtils.c 2020-07-17 20:05:39.721463542 +0200
-@@ -4,6 +4,7 @@
- * Copyright (C) 2005 - 2008 Novell, Inc.
- */
-
-+#include <netinet/if_ether.h>
- #include "nm-default.h"
-
- #include "NetworkManagerUtils.h"
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index e7a4a05..7578abf 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
-
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 132cf5a..0dd71dd 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
-
- #include "nm-glib-aux/nm-c-list.h"
-
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index 305ae52..10cfec6 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
-
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
-
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index e1150f9..3cb8390 100644
---- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -7,7 +7,11 @@
-
- #include <errno.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/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
-index c93c6a5..66d2532 100644
---- a/src/devices/nm-device-bridge.c
-+++ b/src/devices/nm-device-bridge.c
-@@ -15,6 +15,8 @@
- #include "nm-device-factory.h"
- #include "nm-core-internal.h"
-
-+#include <linux/if_ether.h>
-+
- #include "nm-device-logging.h"
- _LOG_DECLARE_SELF(NMDeviceBridge);
diff --git a/community/networkmanager/musl-network-support.patch b/community/networkmanager/musl-network-support.patch
deleted file mode 100644
index 36536df67c..0000000000
--- a/community/networkmanager/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/libnm-core/nm-utils.h
-+++ b/libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
-
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN 6 /* Octets in one ethernet addr */
-+#endif
- #include <linux/if_infiniband.h>
-
- #include "nm-core-enum-types.h"
---- a/src/platform/wifi/nm-wifi-utils.h
-+++ b/src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
-
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN 6 /* Octets in one ethernet addr */
-+#endif
-
- #include "nm-dbus-interface.h"
-
---- a/shared/systemd/src/basic/socket-util.h 2019-03-16 15:41:33.287235649 +0100
-+++ b/shared/systemd/src/basic/socket-util.h 2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
-
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/community/networkmanager/musl-no-drand.patch b/community/networkmanager/musl-no-drand.patch
deleted file mode 100644
index 46e3a7950c..0000000000
--- a/community/networkmanager/musl-no-drand.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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];
diff --git a/community/networkmanager/musl-process-util.patch b/community/networkmanager/musl-process-util.patch
deleted file mode 100644
index 0eb0057fd6..0000000000
--- a/community/networkmanager/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/shared/systemd/src/basic/process-util.c
-+++ b/shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
- cached_pid = CACHED_PID_UNSET;
- }
-
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
- * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
- * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
-
- pid_t getpid_cached(void) {
- static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
- * only half-documented (glibc doesn't document it but LSB does — though only superficially)
- * we'll check for errors only in the most generic fashion possible. */
-
-- if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+ #ifdef __GLIBC__
-+ if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+ #else
-+ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+ #endif
-+
- /* OOM? Let's try again later */
- cached_pid = CACHED_PID_UNSET;
- return new_pid;
diff --git a/community/networkmanager/py3.patch b/community/networkmanager/py3.patch
index d0fb1ca229..3fde5a324e 100644
--- a/community/networkmanager/py3.patch
+++ b/community/networkmanager/py3.patch
@@ -1,5 +1,5 @@
diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
-index 2742824..8225818 100755
+index 99d9067..d93efad 100755
--- a/clients/tests/test-client.py
+++ b/clients/tests/test-client.py
@@ -1,4 +1,4 @@
@@ -9,317 +9,357 @@ index 2742824..8225818 100755
from __future__ import print_function
diff --git a/examples/python/dbus/add-connection-compat.py b/examples/python/dbus/add-connection-compat.py
-index 6c389f1..936586f 100755
+index d521851..26d77dd 100755
--- a/examples/python/dbus/add-connection-compat.py
+++ b/examples/python/dbus/add-connection-compat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2010 - 2012 Red Hat, Inc.
diff --git a/examples/python/dbus/add-connection.py b/examples/python/dbus/add-connection.py
-index fec9343..dbaf3a2 100755
+index cfb46de..d27f718 100755
--- a/examples/python/dbus/add-connection.py
+++ b/examples/python/dbus/add-connection.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2010 - 2012 Red Hat, Inc.
diff --git a/examples/python/dbus/add-wifi-eap-connection.py b/examples/python/dbus/add-wifi-eap-connection.py
-index 2611113..f9231bc 100755
+index 8ed80f7..bb57b62 100755
--- a/examples/python/dbus/add-wifi-eap-connection.py
+++ b/examples/python/dbus/add-wifi-eap-connection.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2011 Red Hat, Inc.
diff --git a/examples/python/dbus/add-wifi-psk-connection.py b/examples/python/dbus/add-wifi-psk-connection.py
-index 8f2294f..4615085 100755
+index c9a4cee..4649151 100755
--- a/examples/python/dbus/add-wifi-psk-connection.py
+++ b/examples/python/dbus/add-wifi-psk-connection.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2015 Red Hat, Inc.
diff --git a/examples/python/dbus/create-bond.py b/examples/python/dbus/create-bond.py
-index 1ce988c..4e6f39c 100755
+index 4ebec24..2696415 100755
--- a/examples/python/dbus/create-bond.py
+++ b/examples/python/dbus/create-bond.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2015 Red Hat, Inc.
diff --git a/examples/python/dbus/disconnect-device.py b/examples/python/dbus/disconnect-device.py
-index 2387daf..13ee6c1 100755
+index d44eb1b..f461a60 100755
--- a/examples/python/dbus/disconnect-device.py
+++ b/examples/python/dbus/disconnect-device.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2010 Red Hat, Inc.
diff --git a/examples/python/dbus/get-active-connection-uuids.py b/examples/python/dbus/get-active-connection-uuids.py
-index 8d0e5c1..15c1358 100755
+index 1ba156b..15c4508 100755
--- a/examples/python/dbus/get-active-connection-uuids.py
+++ b/examples/python/dbus/get-active-connection-uuids.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2010 Red Hat, Inc.
diff --git a/examples/python/dbus/is-wwan-default.py b/examples/python/dbus/is-wwan-default.py
-index d6e2b12..c4ebb73 100755
+index 749b71b..00f7c71 100755
--- a/examples/python/dbus/is-wwan-default.py
+++ b/examples/python/dbus/is-wwan-default.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2011 - 2012 Red Hat, Inc.
diff --git a/examples/python/dbus/list-connections.py b/examples/python/dbus/list-connections.py
-index 43a9c4e..cab312b 100755
+index c5381b6..9eda6e7 100755
--- a/examples/python/dbus/list-connections.py
+++ b/examples/python/dbus/list-connections.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2010 - 2011 Red Hat, Inc.
diff --git a/examples/python/dbus/list-devices.py b/examples/python/dbus/list-devices.py
-index 4a9ebe4..b27d739 100755
+index 17654f3..90bf1b6 100755
--- a/examples/python/dbus/list-devices.py
+++ b/examples/python/dbus/list-devices.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2011 - 2012 Red Hat, Inc.
diff --git a/examples/python/dbus/nm-state.py b/examples/python/dbus/nm-state.py
-index 38d10ae..a26bef0 100755
+index 27e99e2..b7cd902 100755
--- a/examples/python/dbus/nm-state.py
+++ b/examples/python/dbus/nm-state.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2010 - 2012 Red Hat, Inc.
diff --git a/examples/python/dbus/show-bssids.py b/examples/python/dbus/show-bssids.py
-index b4217a5..fa9533f 100755
+index 17364e4..93510f9 100755
--- a/examples/python/dbus/show-bssids.py
+++ b/examples/python/dbus/show-bssids.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2010 Red Hat, Inc.
diff --git a/examples/python/dbus/update-ip4-method.py b/examples/python/dbus/update-ip4-method.py
-index 2c12c2b..fdf4011 100755
+index d84e01b..41d297b 100755
--- a/examples/python/dbus/update-ip4-method.py
+++ b/examples/python/dbus/update-ip4-method.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2014 Red Hat, Inc.
diff --git a/examples/python/dbus/update-secrets.py b/examples/python/dbus/update-secrets.py
-index a0b53b7..6805d32 100755
+index ce69cb9..70ef165 100755
--- a/examples/python/dbus/update-secrets.py
+++ b/examples/python/dbus/update-secrets.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2011 - 2012 Red Hat, Inc.
diff --git a/examples/python/dbus/vpn.py b/examples/python/dbus/vpn.py
-index 8939d26..d85f288 100755
+index f86bf1a..920f786 100755
--- a/examples/python/dbus/vpn.py
+++ b/examples/python/dbus/vpn.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2009 Novell, Inc.
diff --git a/examples/python/dbus/wifi-active-ap.py b/examples/python/dbus/wifi-active-ap.py
-index 78673e7..db01626 100755
+index bc8f1ea..26aee12 100755
--- a/examples/python/dbus/wifi-active-ap.py
+++ b/examples/python/dbus/wifi-active-ap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2015 Red Hat, Inc.
diff --git a/examples/python/dbus/wifi-hotspot.py b/examples/python/dbus/wifi-hotspot.py
-index d4f17d0..09dcfea 100755
+index a441e7e..71fb00a 100755
--- a/examples/python/dbus/wifi-hotspot.py
+++ b/examples/python/dbus/wifi-hotspot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2010 - 2012 Red Hat, Inc.
diff --git a/examples/python/gi/add_connection.py b/examples/python/gi/add_connection.py
-index 9cf9e34..648a2e8 100755
+index e6e1d5a..dca74b8 100755
--- a/examples/python/gi/add_connection.py
+++ b/examples/python/gi/add_connection.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2014 Red Hat, Inc.
diff --git a/examples/python/gi/deactivate-all.py b/examples/python/gi/deactivate-all.py
-index 3af350e..dce04bb 100755
+index bb590b2..481b96b 100755
--- a/examples/python/gi/deactivate-all.py
+++ b/examples/python/gi/deactivate-all.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2015 Red Hat, Inc.
diff --git a/examples/python/gi/device-state-ip4config.py b/examples/python/gi/device-state-ip4config.py
-index 18848d0..e974e46 100755
+index 6ad882c..6ccc329 100755
--- a/examples/python/gi/device-state-ip4config.py
+++ b/examples/python/gi/device-state-ip4config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2012 Red Hat, Inc.
diff --git a/examples/python/gi/firewall-zone.py b/examples/python/gi/firewall-zone.py
-index 6cbd8c2..00bbe27 100755
+index e3ee251..4cd4d61 100755
--- a/examples/python/gi/firewall-zone.py
+++ b/examples/python/gi/firewall-zone.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2013 - 2014 Red Hat, Inc.
diff --git a/examples/python/gi/get-active-connections.py b/examples/python/gi/get-active-connections.py
-index 072f245..8f0da1c 100755
+index aedfad6..2dd8283 100755
--- a/examples/python/gi/get-active-connections.py
+++ b/examples/python/gi/get-active-connections.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2014 Red Hat, Inc.
diff --git a/examples/python/gi/get_ips.py b/examples/python/gi/get_ips.py
-index 13b0a8b..54e7859 100755
+index e4276ab..0cd533d 100755
--- a/examples/python/gi/get_ips.py
+++ b/examples/python/gi/get_ips.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2014 Red Hat, Inc.
diff --git a/examples/python/gi/list-connections.py b/examples/python/gi/list-connections.py
-index 7278faf..0bb4bcd 100755
+index d3a74d5..edcb3ce 100755
--- a/examples/python/gi/list-connections.py
+++ b/examples/python/gi/list-connections.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2012 - 2014 Red Hat, Inc.
diff --git a/examples/python/gi/nm-add-connection2.py b/examples/python/gi/nm-add-connection2.py
-index 01c1ae7..7c77480 100755
+index 2cd760a..8162564 100755
--- a/examples/python/gi/nm-add-connection2.py
+++ b/examples/python/gi/nm-add-connection2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2019 Red Hat, Inc.
diff --git a/examples/python/gi/nm-connection-update-stable-id.py b/examples/python/gi/nm-connection-update-stable-id.py
-index 3629d07..7269687 100755
+index 05926f4..f704db8 100755
--- a/examples/python/gi/nm-connection-update-stable-id.py
+++ b/examples/python/gi/nm-connection-update-stable-id.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2017 Red Hat, Inc.
+diff --git a/examples/python/gi/nm-keyfile.py b/examples/python/gi/nm-keyfile.py
+index 3a467d4..37b9051 100755
+--- a/examples/python/gi/nm-keyfile.py
++++ b/examples/python/gi/nm-keyfile.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # SPDX-License-Identifier: LGPL-2.1-or-later
+
+ import sys
diff --git a/examples/python/gi/nm-update2.py b/examples/python/gi/nm-update2.py
-index 5a65879..68189d8 100755
+index 9d272ea..21ff03a 100755
--- a/examples/python/gi/nm-update2.py
+++ b/examples/python/gi/nm-update2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2019 Red Hat, Inc.
+diff --git a/examples/python/gi/ovs-external-ids.py b/examples/python/gi/ovs-external-ids.py
+index 63f9695..cec8aaf 100755
+--- a/examples/python/gi/ovs-external-ids.py
++++ b/examples/python/gi/ovs-external-ids.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # SPDX-License-Identifier: GPL-2.0-or-later
+ #
+ # Copyright (C) 2017, 2020 Red Hat, Inc.
diff --git a/examples/python/gi/setting-user-data.py b/examples/python/gi/setting-user-data.py
-index fd86445..ca051d9 100755
+index 20c6a2e..4c0dbaf 100755
--- a/examples/python/gi/setting-user-data.py
+++ b/examples/python/gi/setting-user-data.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2017 Red Hat, Inc.
diff --git a/examples/python/gi/show-wifi-networks.py b/examples/python/gi/show-wifi-networks.py
-index e1ee4c3..4117a36 100755
+index eb71c4c..931f71d 100755
--- a/examples/python/gi/show-wifi-networks.py
+++ b/examples/python/gi/show-wifi-networks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # coding=utf-8
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
+ # Copyright (C) 2013 Red Hat, Inc.
diff --git a/examples/python/gi/update-ip4-method.py b/examples/python/gi/update-ip4-method.py
-index 9bba619..8893f10 100755
+index 811d10b..dd8bf89 100755
--- a/examples/python/gi/update-ip4-method.py
+++ b/examples/python/gi/update-ip4-method.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # SPDX-License-Identifier: GPL-2.0+
+ # SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2014 Red Hat, Inc.
-diff --git a/src/tests/test-secret-agent.py b/src/tests/test-secret-agent.py
-index d8cabc6..5f0ed5e 100755
---- a/src/tests/test-secret-agent.py
-+++ b/src/tests/test-secret-agent.py
+diff --git a/src/core/tests/test-secret-agent.py b/src/core/tests/test-secret-agent.py
+index 46f82b3..522b259 100755
+--- a/src/core/tests/test-secret-agent.py
++++ b/src/core/tests/test-secret-agent.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
from gi.repository import GLib
import sys
+diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
+index 6df8519..2b6f01c 100755
+--- a/tools/generate-docs-nm-settings-docs-gir.py
++++ b/tools/generate-docs-nm-settings-docs-gir.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # SPDX-License-Identifier: LGPL-2.1-or-later
+ #
+ # Copyright (C) 2009 - 2017 Red Hat, Inc.
+diff --git a/tools/generate-docs-nm-settings-docs-merge.py b/tools/generate-docs-nm-settings-docs-merge.py
+index 5fe6199..47ad473 100755
+--- a/tools/generate-docs-nm-settings-docs-merge.py
++++ b/tools/generate-docs-nm-settings-docs-merge.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # SPDX-License-Identifier: LGPL-2.1-or-later
+
+ from __future__ import print_function
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py
-index 56a53a4..9d712fe 100755
+index fe5e4d4..67b0f15 100755
--- a/tools/test-networkmanager-service.py
+++ b/tools/test-networkmanager-service.py
@@ -1,4 +1,4 @@
diff --git a/community/networkmanager/reallocarray.patch b/community/networkmanager/reallocarray.patch
deleted file mode 100644
index 98722f02ee..0000000000
--- a/community/networkmanager/reallocarray.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-musl [added support for reallocarray](0), but the function prototype is
-declared in `stdlib.h` instead of `malloc.h`.
-
-Update the check for reallocarray to check both in `malloc.h` and
-`stdlib.h`.
-
-[0]:https://git.musl-libc.org/cgit/musl/commit/?id=821083ac7b54eaa040d5a8ddc67c6206a175e0ca
-
-diff --git a/meson.build b/meson.build
-index 22a3c4c..12a10c5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -126,7 +126,8 @@ config_h.set10('HAVE_RT_SIGQUEUEINFO', cc.has_function('rt_sigqueueinfo', prefix
- #include <sys/wait.h>'''))
- config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv'))
- config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv'))
--config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include <malloc.h>'))
-+config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '''#include <malloc.h>
-+ #include <stdlib.h>'''))
- config_h.set10('HAVE_DECL_EXPLICIT_BZERO', cc.has_function('explicit_bzero', prefix: '#include <string.h>'))
- config_h.set10('HAVE_DECL_MEMFD_CREATE', cc.has_function('memfd_create', prefix: '#include <sys/mman.h>'))
-