diff --git a/NetworkManager.spec b/NetworkManager.spec index 6f33beccc24e136477d82099d5b73f5c332ea24b..6cfe4661e893a93fae24559c30dcc300b1890f8a 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 0000000000000000000000000000000000000000..b4510dd7403862c4b813e093e302803a3c48e6d1 --- /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) {