packages/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync from upstream, fix wrongly considering ipv6.may-fail for ipv4

Browse Source
This commit is contained in:
robertxw 2021-08-03 10:33:01 +08:00
parent 53f79ee7b6
commit 8e82f34f57
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NetworkManager.spec
View File

@ -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/
@ -58,6 +58,7 @@ 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
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
@ -423,6 +424,12 @@ fi
%{_datadir}/gtk-doc/html/NetworkManager/*
%changelog
* Tue Aug 3 2021 gaoxingwang <gaoxingwang@huawei.com> - 1.26.2-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:sync from upstream, fix wrongly considering ipv6.may-fail for ipv4
* Fri Jul 30 2021 jiazhenyuan <jiazhenyuan@uniontech.com> - 1.26.2-6
- Type:bugfix
- ID:NA

29
backport-device-fix-wrongly-considering-ipv6-may-fail-for-ipv4.patch Normal file
View File

@ -0,0 +1,29 @@
From 0adfcadc9d6055e8717e043996a2ca5730462831 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
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