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

Update to 1.41.5 release (development)

Browse Source 
Related: #2134897
This commit is contained in:
Thomas Haller 2022-11-18 08:11:53 +01:00
parent 7d0ca70087
commit 65afd32eaf
No known key found for this signature in database
GPG Key ID: 29C2366E4DFC5728
4 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

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

@ -1,37 +0,0 @@
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

@ -4,9 +4,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
@ -194,7 +194,6 @@ 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
@ -1230,6 +1229,9 @@ fi
%changelog
* Fri Nov 18 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.5-1
- Update to 1.41.5 release (development)
* Thu Nov 3 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.4-2
- fix generating stable UUIDs for keyfile (gitlab#1130)

2
sources
View File

@ -1 +1 @@
SHA512 (NetworkManager-1.41.4.tar.xz) = 494851d3de4b5ad6a82dcc4a4f1f4d342f371495a6d104a848235f764d7652946121e0526ef5c77922862a30a0d9c29baed92ed09140f3277ae6e250b5367954
SHA512 (NetworkManager-1.41.5.tar.xz) = da20cd0b4da39c267590e47a46d3233ef0e185f33413ef4b30bd12843e1349bc61dddd3af3e49a8ccb1f58301718aa6b82617d515d0e26a05a117428063fd824