!82 update NetworkManager to 1.32.12

Merge pull request !82 from robertxw/master

NetworkManager.spec

@@ -3,7 +3,7 @@
 %global wpa_supplicant_version 1:1.1
 %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
-%global real_version 1.26.0
+%global real_version 1.32.12
 %global snapshot %{nil}
 %global git_sha %{nil}
 %global obsoletes_device_plugins 1:0.9.9.95-1
@@ -48,22 +48,16 @@
 %global dhcp_default dhclient
 
 Name:             NetworkManager
-Version:          1.26.0
+Version:          1.32.12
 Epoch:            1
-Release:          12
+Release:          1
 Summary:          Network Link Manager and User Applications
 License:          GPLv2+
 URL:              https://www.gnome.org/projects/NetworkManager/
 Source:           https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{version}.tar.xz
 Source1:          NetworkManager.conf
 Source2:          00-server.conf
-# PATCH-FEATURE-FIX fix-wants-and-add-requires.patch --fix wants and add requires in the file of NetworkManager.service.in
 Patch1:           fix-wants-and-add-requires.patch
-Patch2:           bugfix-NetworkManager-restarting-service-on-dependency-failure.patch
-Patch3:           backport-device-fix-wrongly-considering-ipv6.may-fail-for-ipv4.patch
-Patch4:           backport-iwd-Disconnect-signals-in-NMDeviceIwd-s-dispose.patch
-Patch5:           backport-wwan-fix-leaking-bearer-in-connect-ready.patch
-Patch6:           backport-iwd-Fix-a-use-after-free.patch
 
 BuildRequires:    gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel
 BuildRequires:    dbus-devel dbus-glib-devel  glib2-devel gobject-introspection-devel jansson-devel
@@ -390,6 +384,7 @@ fi
 %{_libdir}/%{name}/%{version}-%{release}/*.so
 %{_libexecdir}/nm-if*
 %{_libexecdir}/nm-dhcp-helper
+%{_libexecdir}/nm-daemon-helper
 %{_libexecdir}/nm-dispatcher
 %{_datadir}/bash-completion/completions/nmcli
 %{dbus_sys_dir}/*.conf
@@ -468,7 +463,7 @@ fi
 
 %files help
 %defattr(-,root,root)
-%doc CONTRIBUTING NEWS README TODO
+%doc CONTRIBUTING.md NEWS README TODO
 %{_mandir}/man1/nmcli.1.gz
 %{_mandir}/man1/nm-online.1.gz
 %{_mandir}/man5/*.5.gz
@@ -480,6 +475,12 @@ fi
 %{_datadir}/gtk-doc/html/NetworkManager/*
 
 %changelog
+* Sat Dec 18 2021 gaoxingwang <gaoxingwang@huawei.com> - 1.32.12-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:update NetworkManager to 1.32.12
+
 * Wed Nov 17 2021 gaoxingwang <gaoxingwang@huawei.com> - 1.26.0-12
 - Type:bugfix
 - ID:NA

backport-device-fix-wrongly-considering-ipv6.may-fail-for-ipv4.patch

@@ -1,31 +0,0 @@
-From a0179362231e2c1c4ebba7d5616da2a4677b1c4b Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 9 Sep 2020 10:59:12 +0200
-Subject: [PATCH] device: fix wrongly considering ipv6.may-fail for ipv4
-
-Fixes: 5e71f016057a ('device: merge stage3 and stage4 ip-config function for IPv4 and IPv6')
-
-reason:fix wrongly considering ipv6.may-fail for ipv4
-
-Conflict:NA
-Reference:https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/a0179362231e2c1c4ebba7d5616da2a4677b1c4b
----
- src/devices/nm-device.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index c325b40bc3..832116bd05 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -11748,7 +11748,7 @@ activate_stage4_ip_config_timeout_4 (NMDevice *self)
- 	NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
- 	NMDeviceStateReason failure_reason = NM_DEVICE_STATE_REASON_NONE;
- 
--	ret = NM_DEVICE_GET_CLASS (self)->act_stage4_ip_config_timeout (self, AF_INET6, &failure_reason);
-+	ret = NM_DEVICE_GET_CLASS (self)->act_stage4_ip_config_timeout (self, AF_INET, &failure_reason);
- 	if (ret == NM_ACT_STAGE_RETURN_POSTPONE)
- 		return;
- 	else if (ret == NM_ACT_STAGE_RETURN_FAILURE) {
--- 
-GitLab
-

backport-iwd-Disconnect-signals-in-NMDeviceIwd-s-dispose.patch

@@ -1,40 +0,0 @@
-From d2b0c5af6378adbb0fb3c47fea41d2ddd17a6a50 Mon Sep 17 00:00:00 2001
-From: Andrew Zaborowski <andrew.zaborowski@intel.com>
-Date: Tue, 6 Oct 2020 01:30:26 +0200
-Subject: [PATCH] iwd: Disconnect signals in NMDeviceIwd's dispose
-
-Fix a crash on device unplugging caused by keeping our signal handlers
-for GDBusProxies connected after a call to dispose().  Do this by
-replacing most cleanup steps by a nm_device_iwd_set_dbus_object(self, NULL)
-call which is more meticulous.
-
-reason:Disconnect signals in NMDeviceIwd's dispose
-
-Conflict:NA
-Reference:https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/d2b0c5af6378adbb0fb3c47fea41d2ddd17a6a50
----
- src/devices/wifi/nm-device-iwd.c | 12 +-----------
- 1 file changed, 1 insertion(+), 11 deletions(-)
-
-diff -Naur a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
---- a/src/devices/wifi/nm-device-iwd.c	2021-02-22 11:15:41.034000000 +0800
-+++ b/src/devices/wifi/nm-device-iwd.c	2021-02-22 16:31:18.817000000 +0800
-@@ -2573,17 +2573,7 @@
- 
- 	nm_clear_g_cancellable (&priv->cancellable);
- 
--	nm_clear_g_source (&priv->periodic_scan_id);
--
--	cleanup_association_attempt (self, TRUE);
--
--	g_clear_object (&priv->dbus_device_proxy);
--	g_clear_object (&priv->dbus_station_proxy);
--	g_clear_object (&priv->dbus_ap_proxy);
--	g_clear_object (&priv->dbus_adhoc_proxy);
--	g_clear_object (&priv->dbus_obj);
--
--	remove_all_aps (self);
-+        nm_device_iwd_set_dbus_object(self, NULL);
- 
- 	G_OBJECT_CLASS (nm_device_iwd_parent_class)->dispose (object);
- 

backport-iwd-Fix-a-use-after-free.patch

@@ -1,43 +0,0 @@
-From 09c4fa5a6cae5bef38cc6d2d0a7888e22fe85802 Mon Sep 17 00:00:00 2001
-From: Andrew Zaborowski <andrew.zaborowski@intel.com>
-Date: Fri, 23 Oct 2020 03:47:29 +0200
-Subject: [PATCH] iwd: Fix a use after free
-
-In connection_removed we use the id.name that was being g_freed a few
-lines further down.
-
-Fixes: bea6c403677f ('wifi/iwd: handle forgetting connection profiles')
-(cherry picked from commit c1ff06e11945d635c39ddaf8ec00939054fc4308)
-(cherry picked from commit 03b63a893f19f6a88385f927a7386abe534c4d04)
----
- src/devices/wifi/nm-iwd-manager.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Conflict:NA
-Reference:https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/09c4fa5a6cae5bef38cc6d2d0a7888e22fe85802
-diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c
-index 39c863a31e..28cae87b8c 100644
---- a/src/devices/wifi/nm-iwd-manager.c
-+++ b/src/devices/wifi/nm-iwd-manager.c
-@@ -634,15 +634,16 @@ connection_removed (NMSettings *settings,
- 	gboolean mapped;
- 	KnownNetworkData *data;
- 	KnownNetworkId id;
-+	gs_free char *ssid_str = NULL;
- 
- 	id.security = nm_wifi_connection_get_iwd_security (conn, &mapped);
- 	if (!mapped)
- 		return;
- 
- 	s_wireless = nm_connection_get_setting_wireless (conn);
--	id.name = _nm_utils_ssid_to_utf8 (nm_setting_wireless_get_ssid (s_wireless));
-+	ssid_str = _nm_utils_ssid_to_utf8 (nm_setting_wireless_get_ssid (s_wireless));
-+	id.name = ssid_str;
- 	data = g_hash_table_lookup (priv->known_networks, &id);
--	g_free ((char *) id.name);
- 	if (!data)
- 		return;
- 
--- 
-2.23.0
-

backport-wwan-fix-leaking-bearer-in-connect-ready.patch

@@ -1,38 +0,0 @@
-From 5747bdb8b851a5c27868d4175b865a915d12549a Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 23 Feb 2021 07:15:40 +0100
-Subject: [PATCH] wwan: fix leaking "bearer" in connect_ready()
-
-Fixes: 105ee6e5a9aa ('device: fix crash by handling connection cancellation')
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/669
-
-reason:fix leaking "bearer" in connect_ready()
-
-Conflict:NA
-Reference:https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5747bdb8b851a5c27868d4175b865a915d12549a
----
- src/devices/wwan/nm-modem-broadband.c | 4 +++++-----
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff -Naur a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
---- a/src/devices/wwan/nm-modem-broadband.c	2021-02-23 15:43:39.748000000 +0800
-+++ b/src/devices/wwan/nm-modem-broadband.c	2021-02-23 15:46:28.946000000 +0800
-@@ -359,7 +359,7 @@
- 	GError *error = NULL;
- 	NMModemIPMethod ip4_method = NM_MODEM_IP_METHOD_UNKNOWN;
- 	NMModemIPMethod ip6_method = NM_MODEM_IP_METHOD_UNKNOWN;
--	MMBearer *bearer;
-+	gs_unref_object MMBearer *bearer = NULL;
- 
- 	bearer = mm_modem_simple_connect_finish (simple_iface, res, &error);
- 
-@@ -373,7 +373,7 @@
- 	if (!ctx)
- 		return;
- 
--	self->_priv.bearer = bearer;
-+	self->_priv.bearer = g_steal_pointer(&bearer);
- 
- 	if (!self->_priv.bearer) {
- 		if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_PIN) ||

bugfix-NetworkManager-restarting-service-on-dependency-failure.patch

@@ -1,11 +0,0 @@
---- NetworkManager-1.26.0/data/NetworkManager.service.in	
-+++ NetworkManager-1.26.0/data/NetworkManager.service.in	
-@@ -12,6 +12,8 @@
- #ExecReload=/bin/kill -HUP $MAINPID
- ExecStart=@sbindir@/NetworkManager --no-daemon
- Restart=on-failure
-+RestartSec=10s
-+
- # NM doesn't want systemd to kill its children for it
- KillMode=process
- CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE CAP_KILL CAP_SYS_CHROOT

fix-wants-and-add-requires.patch

@@ -1,18 +1,16 @@
-From e6167c45784b8ff741f69b39b2d7438762d25772 Mon Sep 17 00:00:00 2001
+From 3e79e5f2889bbdec4629e2ea3e3860cfcf9488c4 Mon Sep 17 00:00:00 2001
-From:  <sunyun9@huawei.com>
+From: gaoxingwang <gaoxingwang@huawei.com>
-Date: Sat, 21 Sep 2019 15:09:55 +0800
+Date: Wed, 15 Dec 2021 09:54:34 +0800
-Subject: [PATCH] NetworkManager: openEuler Debranding
+Subject: [PATCH] fix wants and add requires
 
-Change-Id: Ice3d6ce0f781719e57f8a8bde8ed958e933e53f5
-Signed-off-by:  <sunyun9@huawei.com>
 ---
- NetworkManager-1.16.0/data/NetworkManager.service.in | 5 +++--
+ data/NetworkManager.service.in | 7 +++++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
-diff --git NetworkManager-1.16.0/data/NetworkManager.service.in NetworkManager-1.16.0/data/NetworkManager.service.in
+diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
-index ff90456..9d9b755 100644
+index e23b3a5..b29b634 100644
---- NetworkManager-1.16.0/data/NetworkManager.service.in
+--- a/data/NetworkManager.service.in
-+++ NetworkManager-1.16.0/data/NetworkManager.service.in
++++ b/data/NetworkManager.service.in
 @@ -1,9 +1,10 @@
  [Unit]
  Description=Network Manager
@@ -26,6 +24,15 @@ index ff90456..9d9b755 100644
  
  [Service]
  Type=dbus
--- 
+@@ -12,6 +13,8 @@ ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/
-2.19.1
+ #ExecReload=/bin/kill -HUP $MAINPID
+ ExecStart=@sbindir@/NetworkManager --no-daemon
+ Restart=on-failure
++RestartSec=10s
++
+ # NM doesn't want systemd to kill its children for it
+ KillMode=process
+ 
+-- 
+2.27.0