rpms
/
NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix generating stable UUIDs for keyfile (gitlab#1130) 

Related: #2134897
This commit is contained in:
Wen Liang 2022-11-03 09:43:48 +01:00 committed by Thomas Haller
parent e6266be25b
commit 7d0ca70087
No known key found for this signature in database
GPG Key ID: 29C2366E4DFC5728
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
1001-all-fix-generating-UUIDs-for-string.patch Normal file
View File

@ -0,0 +1,37 @@
From 39126d1ed0a8219df5ebdab2850c11a606089802 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 2 Nov 2022 21:41:22 +0100
Subject: [PATCH 1/1] all: fix generating UUIDs for string
https://github.com/coreos/fedora-coreos-tracker/issues/1325
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1130
Fixes: b5e7e48bc185 ('glib-aux: add and use nm_uuid_generate_from_strings_old()')
(cherry picked from commit 545edb7093412e7ea936fc788d63d5ddc9f4e51e)
---
src/libnm-glib-aux/nm-uuid.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/libnm-glib-aux/nm-uuid.h b/src/libnm-glib-aux/nm-uuid.h
index d26616cf4f7d..b89554520598 100644
--- a/src/libnm-glib-aux/nm-uuid.h
+++ b/src/libnm-glib-aux/nm-uuid.h
@@ -135,10 +135,10 @@ char *nm_uuid_generate_from_strings_strv(NMUuidType uuid_type,
NM_NARG(__VA_ARGS__))
/* Legacy function. Don't use for new code. */
-#define nm_uuid_generate_from_strings_old(uuid_type, type_args, ...) \
- nm_uuid_generate_from_strings_strv(NM_UUID_TYPE_VERSION3, \
- &nm_uuid_ns_1, \
- NM_MAKE_STRV(__VA_ARGS__), \
+#define nm_uuid_generate_from_strings_old(...) \
+ nm_uuid_generate_from_strings_strv(NM_UUID_TYPE_VERSION3, \
+ &nm_uuid_ns_1, \
+ NM_MAKE_STRV(__VA_ARGS__), \
-1)
/*****************************************************************************/
--
2.38.1

8
NetworkManager.spec
View File

@ -6,7 +6,7 @@
%global epoch_version 1
%global real_version 1.41.4
%global rpm_version %{real_version}
%global release_version 1
%global release_version 2
%global snapshot %{nil}
%global git_sha %{nil}
%global bcond_default_debug 0
@ -194,6 +194,7 @@ Source7: readme-ifcfg-rh.txt
# Bugfixes that are only relevant until next rebase of the package.
# Patch1001: 1001-some.patch
Patch1001: 1001-all-fix-generating-UUIDs-for-string.patch
Requires(post): systemd
%if 0%{?fedora} || 0%{?rhel} >= 8
@ -1229,7 +1230,10 @@ fi
%changelog
* Fri Nov 2 2022 Wen Liang <wenliang@redhat.com> - 1:1.41.4-1
* Thu Nov 3 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.4-2
- fix generating stable UUIDs for keyfile (gitlab#1130)
* Wed Nov 2 2022 Wen Liang <wenliang@redhat.com> - 1:1.41.4-1
- Update to 1.41.4 release (development)
- device: don't emit recheck-assume if there is a queued activation request (rh #2092215)
- device: allow configuration of VLAN on an unmanaged interface (rh #2110307)