From 8932641c49e6fd15550391841aa384a9f1eff929 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 18 Nov 2022 08:04:52 +0100 Subject: [PATCH] Upgrade to 1.41.5 development snapshot --- .gitignore | 1 + ...-all-fix-generating-UUIDs-for-string.patch | 37 ------------------- NetworkManager.spec | 9 +++-- sources | 2 +- 4 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 0001-all-fix-generating-UUIDs-for-string.patch diff --git a/.gitignore b/.gitignore index 9feb5a6..6ae6921 100644 --- a/.gitignore +++ b/.gitignore @@ -420,3 +420,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.40.0.tar.xz /NetworkManager-1.41.3.tar.xz /NetworkManager-1.41.4.tar.xz +/NetworkManager-1.41.5.tar.xz diff --git a/0001-all-fix-generating-UUIDs-for-string.patch b/0001-all-fix-generating-UUIDs-for-string.patch deleted file mode 100644 index 9584b61..0000000 --- a/0001-all-fix-generating-UUIDs-for-string.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 fc8e14e..d64b1c0 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -5,9 +5,9 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global real_version 1.41.4 +%global real_version 1.41.5 %global rpm_version %{real_version} -%global release_version 2 +%global release_version 1 %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-all-fix-generating-UUIDs-for-string.patch +#Patch1: 0001-some.patch Requires(post): systemd %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -1224,6 +1224,9 @@ fi %changelog +* Fri Nov 18 2022 Thomas Haller - 1:1.41.5-1 +- Update to 1.41.5 release (development) + * Thu Nov 3 2022 Thomas Haller - 1:1.41.4-2 - fix generating stable UUIDs for keyfile (gitlab#1130) diff --git a/sources b/sources index a9a5008..a54858b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.41.4.tar.xz) = 494851d3de4b5ad6a82dcc4a4f1f4d342f371495a6d104a848235f764d7652946121e0526ef5c77922862a30a0d9c29baed92ed09140f3277ae6e250b5367954 +SHA512 (NetworkManager-1.41.5.tar.xz) = da20cd0b4da39c267590e47a46d3233ef0e185f33413ef4b30bd12843e1349bc61dddd3af3e49a8ccb1f58301718aa6b82617d515d0e26a05a117428063fd824