From e56835cbd0452a33b2258de9a0cca292d03cfaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E4=BB=B2=E4=BC=9F?= Date: Tue, 26 Nov 2024 17:14:19 +0800 Subject: [PATCH] fix test failure in /config/set-values aaa --- NetworkManager.spec | 9 ++++- fix-test-failure-in-config-set-values.patch | 42 +++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 fix-test-failure-in-config-set-values.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index a2e6923..0d470e4 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -51,7 +51,7 @@ Name: NetworkManager Version: 1.44.2 Epoch: 1 -Release: 3 +Release: 4 Summary: 4 License: GPLv2+ URL: https://networkmanager.dev/ @@ -67,6 +67,7 @@ Patch6: 0001-add-NM-to-support-wifi6.patch Patch6000: backport-lldp-fix-crash-dereferencing-NULL-pointer-during-deb.patch Patch6001: backport-lldp-fix-multiple-access-to-argument-in-logging-macr.patch +Patch6002: fix-test-failure-in-config-set-values.patch BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel BuildRequires: dbus-devel glib2-devel gobject-introspection-devel jansson-devel @@ -551,6 +552,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Tue Nov 26 2024 shenzhongwei - 1:1.44.2-4 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix test failure in "/config/set-values" + * Wed Oct 16 2024 zhongxuan - 1:1.44.2-3 - Type:CVE - CVE:CVE-2024-6501 diff --git a/fix-test-failure-in-config-set-values.patch b/fix-test-failure-in-config-set-values.patch new file mode 100644 index 0000000..18bc7e5 --- /dev/null +++ b/fix-test-failure-in-config-set-values.patch @@ -0,0 +1,42 @@ +From 0c9c387ebed1deff32d7e446b7e185a35ef354a2 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Wed, 7 Feb 2024 15:54:08 +0100 +Subject: [PATCH] config/tests: fix test failure in "/config/set-values" + +GKeyfile changed something about how to handle invalid escape sequences. +As we don't want to test GKeyfile (per-se), just adjust to test to not +hit the problem. + +This would fail with glib2-2.79.1-1.fc40: + + # ./tools/run-nm-test.sh -m src/core/tests/config/test-config -p /config/set-values + TAP version 13 + # random seed: R02Sb8afff1ec38ca5a1b7713e8c40eb4f56 + # Start of config tests + # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation local (GLocalVfs) for ?gio-vfs? + # (src/core/tests/config/test-config.c:1107) invalid value in config-data .intern.with-whitespace.key2 = (null) (instead of " b c\, d ") + ./tools/run-nm-test.sh: line 307: 245847 Trace/breakpoint trap (core dumped) "${NMTST_DBUS_RUN_SESSION[@]}" "$TEST" "${TEST_ARGV[@]}" + exec "src/core/tests/config/test-config" failed with exit code 133 + +(cherry picked from commit 7f2a32fa11d580ee65a0458f438018de12b6ae84) +(cherry picked from commit 1803520a7ab3c9be568d02894a0468060e3f5bfb) +--- + src/core/tests/config/test-config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/tests/config/test-config.c b/src/core/tests/config/test-config.c +index 054b9003f49..2b27d535492 100644 +--- a/src/core/tests/config/test-config.c ++++ b/src/core/tests/config/test-config.c +@@ -1076,7 +1076,7 @@ _set_values_intern_atomic_section_2_set(NMConfig *config, + g_key_file_set_value(keyfile, + NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN "with-whitespace", + "key2", +- " b c\\, d "); ++ " b c\\\\, d "); + *out_expected_changes = NM_CONFIG_CHANGE_CAUSE_SET_VALUES | NM_CONFIG_CHANGE_VALUES + | NM_CONFIG_CHANGE_VALUES_INTERN; + } +-- +GitLab + -- Gitee