From 27706290095a84a88f5553e2b37ed785eae9e2fe Mon Sep 17 00:00:00 2001 From: robertxw Date: Mon, 26 Jul 2021 09:39:39 +0800 Subject: [PATCH] sync from upstream, fix wrongly considering ipv6.may-fail for ipv4 --- NetworkManager.spec | 9 +++++- ...y-considering-ipv6-may-fail-for-ipv4.patch | 29 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 backport-device-fix-wrongly-considering-ipv6-may-fail-for-ipv4.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 6f33bec..1a3c226 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -48,7 +48,7 @@ Name: NetworkManager Version: 1.26.2 Epoch: 1 -Release: 6 +Release: 7 Summary: Network Link Manager and User Applications License: GPLv2+ URL: https://www.gnome.org/projects/NetworkManager/ @@ -59,6 +59,7 @@ Source2: 00-server.conf Patch1: fix-wants-and-add-requires.patch Patch2: bugfix-NetworkManager-restarting-service-on-dependency-failure.patch Patch3: bugfix-nmcli-field-active-show-error.patch +Patch4: backport-device-fix-wrongly-considering-ipv6-may-fail-for-ipv4.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 @@ -429,6 +430,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Sat Jul 24 2021 gaoxingwang - 1.26.2-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:sync from upstream, fix wrongly considering ipv6.may-fail for ipv4 + * Wed Jul 07 2021 zhangqiang - 1.26.2-6 - Type:bugfix - ID:NA diff --git a/backport-device-fix-wrongly-considering-ipv6-may-fail-for-ipv4.patch b/backport-device-fix-wrongly-considering-ipv6-may-fail-for-ipv4.patch new file mode 100644 index 0000000..d47d80c --- /dev/null +++ b/backport-device-fix-wrongly-considering-ipv6-may-fail-for-ipv4.patch @@ -0,0 +1,29 @@ +From 0adfcadc9d6055e8717e043996a2ca5730462831 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Wed, 9 Sep 2020 10:59:12 +0200 +Subject: [PATCH] device: fix wrongly considering ipv6.may-fail for ipv4 + +Conflict:NA +Reference:https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/0adfcadc9d6055e8717e043996a2ca5730462831.patch +Fixes: 5e71f016057a ('device: merge stage3 and stage4 ip-config function for IPv4 and IPv6') +(cherry picked from 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 33c59a0151..000d0cad23 100644 +--- a/src/devices/nm-device.c ++++ b/src/devices/nm-device.c +@@ -11347,7 +11347,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 + -- Gitee