!52 修复nmcli -f ACTIVE列显示错误

From: @robertxw
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng

NetworkManager.spec

@@ -48,7 +48,7 @@
 Name:             NetworkManager
 Version:          1.26.2
 Epoch:            1
-Release:          7
+Release:          8
 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:        backport-device-fix-wrongly-considering-ipv6-may-fail-for-ipv4.patch
+Patch4:        backport-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
@@ -424,6 +425,12 @@ fi
 %{_datadir}/gtk-doc/html/NetworkManager/*
 
 %changelog
+* Wed Aug 4 2021 gaoxingwang <gaoxingwang@huawei.com> - 1.26.2-8
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix 'nmcli -f NAME,ACTIVE',active column display error
+
 * Tue Aug 3 2021 gaoxingwang <gaoxingwang@huawei.com> - 1.26.2-7
 - Type:bugfix
 - ID:NA

backport-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;