From 164affebad8e807d8d38e839f8f37e885ecfe666 Mon Sep 17 00:00:00 2001 From: zhangqiang Date: Mon, 12 Jul 2021 16:46:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=85=A5=E4=B8=8A=E6=B8=B8=E7=A4=BE?= =?UTF-8?q?=E5=8C=BApatch=EF=BC=8C=E8=A7=A3=E5=86=B3ipv4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=AF=BB=E5=8F=96ipv6=20may-fail=E5=B1=9E=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=97=A0=E6=B3=95=E6=BF=80=E6=B4=BB=20gitlab?= =?UTF-8?q?=20NM=200adfcadc9d6055e8717e043996a2ca5730462831=20=E5=85=B7?= =?UTF-8?q?=E4=BD=93=E9=97=AE=E9=A2=98=E5=A4=8D=E7=8E=B0=EF=BC=9A=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=BF=9E=E6=8E=A5=EF=BC=8Cipv4=E7=94=A8auto?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E8=8E=B7=E5=8F=96ip=EF=BC=8Cipv6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=89=8B=E5=8A=A8=EF=BC=8Cmay-fail=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BAfalse=EF=BC=8C=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=A2=AB=E6=BF=80=E6=B4=BB=EF=BC=88=E7=A1=AE?= =?UTF-8?q?=E4=BF=9D=E5=B1=80=E5=9F=9F=E7=BD=91=E5=86=85=E6=B2=A1=E6=9C=89?= =?UTF-8?q?ipv4=20DHCP=E6=9C=8D=E5=8A=A1=E5=99=A8=EF=BC=89=20=E5=85=B7?= =?UTF-8?q?=E4=BD=93=E9=85=8D=E7=BD=AE=E5=91=BD=E4=BB=A4=E4=B8=BA=20nmcli?= =?UTF-8?q?=20conn=20add=20type=20ethernet=20ifname=20enp125s0f0=20ipv6.ma?= =?UTF-8?q?y-fail=20false=20ipv6.method=20manual=20ipv6.address=20abcd::13?= =?UTF-8?q?14/64=20ipv4.method=20auto=20connection.id=20test-may-fail=20co?= =?UTF-8?q?nnection.autoconnect=20no?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NetworkManager.spec | 11 +++++++++-- bugfix-NM-ipv4-may-fail-error.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 bugfix-NM-ipv4-may-fail-error.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 6f33bec..6cfe466 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/ @@ -58,7 +58,8 @@ 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: bugfix-nmcli-field-active-show-error.patch +Patch3: bugfix-nmcli-field-active-show-error.patch +Patch4: bugfix-NM-ipv4-may-fail-error.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 +* Mon Jul 12 2021 zhangqiang - 1.26.2-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix NM ipv4 may-fail property read ipv6 config + * Wed Jul 07 2021 zhangqiang - 1.26.2-6 - Type:bugfix - ID:NA diff --git a/bugfix-NM-ipv4-may-fail-error.patch b/bugfix-NM-ipv4-may-fail-error.patch new file mode 100644 index 0000000..b4510dd --- /dev/null +++ b/bugfix-NM-ipv4-may-fail-error.patch @@ -0,0 +1,12 @@ +diff -urN NetworkManager-1.26.2/src/devices/nm-device.c NetworkManager-1.26.2-bugfix/src/devices/nm-device.c +--- NetworkManager-1.26.2/src/devices/nm-device.c 2020-08-19 15:39:11.000000000 +0800 ++++ NetworkManager-1.26.2-bugfix/src/devices/nm-device.c 2021-07-12 16:35:40.582424033 +0800 +@@ -11302,7 +11302,7 @@ + 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) { -- Gitee