From fe89fe48df3b98ab13c372f662323d0712eeb169 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 3 Nov 2022 09:30:01 +0100 Subject: [PATCH] fix generating stable UUIDs for keyfile (gitlab#1130) --- ...-all-fix-generating-UUIDs-for-string.patch | 37 +++++++++++++++++++ NetworkManager.spec | 7 +++- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 0001-all-fix-generating-UUIDs-for-string.patch diff --git a/0001-all-fix-generating-UUIDs-for-string.patch b/0001-all-fix-generating-UUIDs-for-string.patch new file mode 100644 index 0000000..9584b61 --- /dev/null +++ b/0001-all-fix-generating-UUIDs-for-string.patch @@ -0,0 +1,37 @@ +From 9e27790e0cfbd6c24913cfe5c5e720da2aa13d17 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +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 + diff --git a/NetworkManager.spec b/NetworkManager.spec index aae70c1..fc8e14e 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -7,7 +7,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 @@ -188,7 +188,7 @@ Source5: 20-connectivity-redhat.conf Source6: 70-nm-connectivity.conf Source7: readme-ifcfg-rh.txt -#Patch1: 0001-some.patch +Patch1: 0001-all-fix-generating-UUIDs-for-string.patch Requires(post): systemd %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -1224,6 +1224,9 @@ fi %changelog +* Thu Nov 3 2022 Thomas Haller - 1:1.41.4-2 +- fix generating stable UUIDs for keyfile (gitlab#1130) + * Wed Nov 2 2022 Wen Liang - 1:1.41.4-1 - Upgrade to 1.41.4 release