From 9c3239345ddbead7742797674d14334ecc2c844d Mon Sep 17 00:00:00 2001 From: zhangqiang Date: Wed, 7 Jul 2021 17:39:59 +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,=E4=BF=AE=E5=A4=8Dnmcli=20-f=20ACTIVE=E5=88=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=20=20=20=20=20gitlab=20NM?= =?UTF-8?q?=208bd6d2a63e1acc6205ead7eb70cdf8beb95c0cb1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NetworkManager.spec | 9 ++++++++- bugfix-nmcli-field-active-show-error.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 bugfix-nmcli-field-active-show-error.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index a8855d9..6f33bec 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -48,7 +48,7 @@ Name: NetworkManager Version: 1.26.2 Epoch: 1 -Release: 5 +Release: 6 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: bugfix-nmcli-field-active-show-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 @@ -428,6 +429,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Wed Jul 07 2021 zhangqiang - 1.26.2-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix 'nmcli -f NAME,ACTIVE',active column display error + * Fri Mar 12 2021 yanan - 1.26.2-5 - Type:bugfix - ID:NA diff --git a/bugfix-nmcli-field-active-show-error.patch b/bugfix-nmcli-field-active-show-error.patch new file mode 100644 index 0000000..e3011d0 --- /dev/null +++ b/bugfix-nmcli-field-active-show-error.patch @@ -0,0 +1,11 @@ +diff -urN NetworkManager-1.26.2/clients/cli/connections.c NetworkManager-1.26.2-bugfix/clients/cli/connections.c +--- NetworkManager-1.26.2/clients/cli/connections.c 2020-08-19 15:39:11.000000000 +0800 ++++ NetworkManager-1.26.2-bugfix/clients/cli/connections.c 2021-07-07 17:14:11.293096678 +0800 +@@ -2107,6 +2107,7 @@ + + if (NM_IN_SET (info->info_type, NMC_GENERIC_INFO_TYPE_CON_SHOW_DEVICE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_STATE, ++ NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE_PATH)) { + show_active_fields = TRUE; + break; -- Gitee