Compare commits
8 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 695bcbfb53 | |||
| 4b0239a3a5 | |||
| 23573c2865 | |||
| 77efdffa07 | |||
| 776b8739eb | |||
| 213adcb91d | |||
| 5fad718318 | |||
| 450a8422ab |
@@ -12,11 +12,11 @@ Fixes #138
|
||||
src/devices/nm-device.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: NetworkManager-1.50.0/src/core/devices/nm-device.c
|
||||
Index: NetworkManager-1.54.0/src/core/devices/nm-device.c
|
||||
===================================================================
|
||||
--- NetworkManager-1.50.0.orig/src/core/devices/nm-device.c
|
||||
+++ NetworkManager-1.50.0/src/core/devices/nm-device.c
|
||||
@@ -6338,7 +6338,8 @@ concheck_update_state(NMDevice
|
||||
--- NetworkManager-1.54.0.orig/src/core/devices/nm-device.c
|
||||
+++ NetworkManager-1.54.0/src/core/devices/nm-device.c
|
||||
@@ -6604,7 +6604,8 @@ concheck_update_state(NMDevice
|
||||
state = NM_CONNECTIVITY_LIMITED;
|
||||
} else
|
||||
state = NM_CONNECTIVITY_NONE;
|
||||
|
||||
67
2069.patch
67
2069.patch
@@ -1,67 +0,0 @@
|
||||
From 5bc38c6c9363e12890cbcad5abe1c557d01030c0 Mon Sep 17 00:00:00 2001
|
||||
From: Jordan Petridis <jpetridis@gnome.org>
|
||||
Date: Wed, 13 Nov 2024 00:41:43 +0200
|
||||
Subject: [PATCH] generate-docs-nm-settings-docs-gir: Support
|
||||
libgirepository-2.0
|
||||
|
||||
pygobject 3.52 has switched [1] to using libgirepository-2.0 which
|
||||
comes from glib itself now, rather than the 1.0 which came from
|
||||
gobject-introspection.
|
||||
|
||||
This means that it fails to load the incompatible "GIRepository 2.0"
|
||||
and thus must be ported to 3.0 (which is provided by
|
||||
libgirepository-2.0).
|
||||
|
||||
Migration guide is here [2]
|
||||
|
||||
[1]: https://gitlab.gnome.org/GNOME/pygobject/-/merge_requests/320
|
||||
[2]: https://docs.gtk.org/girepository/migrating-gi.html
|
||||
|
||||
This commit adds suppport for importing with
|
||||
"gi.require_version("GIRepository", "3.0") and falling
|
||||
back to the existing "GIRepository 2.0" if not found.
|
||||
---
|
||||
tools/generate-docs-nm-settings-docs-gir.py | 16 ++++++++++++----
|
||||
1 file changed, 12 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
|
||||
index e438d87ad40..dea80625b98 100755
|
||||
--- a/tools/generate-docs-nm-settings-docs-gir.py
|
||||
+++ b/tools/generate-docs-nm-settings-docs-gir.py
|
||||
@@ -10,14 +10,22 @@ import os
|
||||
import gi
|
||||
import re
|
||||
|
||||
-gi.require_version("GIRepository", "2.0")
|
||||
-from gi.repository import GIRepository
|
||||
+try:
|
||||
+ gi.require_version("GIRepository", "3.0")
|
||||
+ from gi.repository import GIRepository
|
||||
+
|
||||
+ repo = GIRepository.Repository()
|
||||
+except ValueError:
|
||||
+ gi.require_version("GIRepository", "2.0")
|
||||
+ from gi.repository import GIRepository
|
||||
+
|
||||
+ repo = GIRepository.Repository
|
||||
|
||||
try:
|
||||
libs = os.environ["LD_LIBRARY_PATH"].split(":")
|
||||
libs.reverse()
|
||||
for lib in libs:
|
||||
- GIRepository.Repository.prepend_library_path(lib)
|
||||
+ repo.prepend_library_path(lib)
|
||||
except AttributeError:
|
||||
# An old GI version, that has no prepend_library_path
|
||||
# It's alright, it probably interprets LD_LIBRARY_PATH
|
||||
@@ -386,6 +394,6 @@ if __name__ == "__main__":
|
||||
|
||||
if args.lib_path:
|
||||
for lib in args.lib_path:
|
||||
- GIRepository.Repository.prepend_library_path(lib)
|
||||
+ repo.prepend_library_path(lib)
|
||||
|
||||
main(args.gir, args.output, args.target)
|
||||
--
|
||||
GitLab
|
||||
|
||||
256
2298.patch
Normal file
256
2298.patch
Normal file
@@ -0,0 +1,256 @@
|
||||
From c312390932d1f1198baacca0de3c6a01811728a8 Mon Sep 17 00:00:00 2001
|
||||
From: Beniamino Galvani <bgalvani@redhat.com>
|
||||
Date: Tue, 14 Oct 2025 10:41:26 +0200
|
||||
Subject: [PATCH 1/2] libnm-glib-aux: add temp name argument to
|
||||
nm_utils_file_set_contents()
|
||||
|
||||
In some cases it's useful to specify the name of the temporary file to
|
||||
be used.
|
||||
---
|
||||
src/core/devices/wifi/nm-iwd-manager.c | 2 +-
|
||||
src/core/main-utils.c | 2 +-
|
||||
src/core/nm-core-utils.c | 1 +
|
||||
src/core/platform/tests/monitor.c | 1 +
|
||||
.../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 1 +
|
||||
.../plugins/keyfile/nms-keyfile-utils.c | 1 +
|
||||
.../plugins/keyfile/nms-keyfile-writer.c | 10 +++++++++-
|
||||
src/libnm-glib-aux/nm-io-utils.c | 18 +++++++++++++-----
|
||||
src/libnm-glib-aux/nm-io-utils.h | 1 +
|
||||
src/nm-initrd-generator/nm-initrd-generator.c | 2 +-
|
||||
10 files changed, 30 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/core/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c
|
||||
index 76a342e206c..bb2e056d39c 100644
|
||||
--- a/src/core/devices/wifi/nm-iwd-manager.c
|
||||
+++ b/src/core/devices/wifi/nm-iwd-manager.c
|
||||
@@ -684,7 +684,7 @@ iwd_config_write(GKeyFile *config,
|
||||
* in the last few filename characters -- it cannot end in .open, .psk
|
||||
* or .8021x.
|
||||
*/
|
||||
- return nm_utils_file_set_contents(filepath, data, length, 0600, times, NULL, error);
|
||||
+ return nm_utils_file_set_contents(filepath, data, length, 0600, times, NULL, NULL, error);
|
||||
}
|
||||
|
||||
static const char *
|
||||
diff --git a/src/core/main-utils.c b/src/core/main-utils.c
|
||||
index 0f62da29024..d1be6814875 100644
|
||||
--- a/src/core/main-utils.c
|
||||
+++ b/src/core/main-utils.c
|
||||
@@ -81,7 +81,7 @@ nm_main_utils_write_pidfile(const char *pidfile)
|
||||
char pid[16];
|
||||
|
||||
nm_sprintf_buf(pid, "%lld", (long long) getpid());
|
||||
- if (!nm_utils_file_set_contents(pidfile, pid, -1, 00644, NULL, NULL, &error)) {
|
||||
+ if (!nm_utils_file_set_contents(pidfile, pid, -1, 00644, NULL, NULL, NULL, &error)) {
|
||||
fprintf(stderr, _("Writing to %s failed: %s\n"), pidfile, error->message);
|
||||
return FALSE;
|
||||
}
|
||||
diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c
|
||||
index 8b7ee1ddf67..33f53a06358 100644
|
||||
--- a/src/core/nm-core-utils.c
|
||||
+++ b/src/core/nm-core-utils.c
|
||||
@@ -2865,6 +2865,7 @@ _host_id_read(guint8 **out_host_id, gsize *out_host_id_len)
|
||||
0600,
|
||||
NULL,
|
||||
NULL,
|
||||
+ NULL,
|
||||
&error)) {
|
||||
nm_log_warn(
|
||||
LOGD_CORE,
|
||||
diff --git a/src/core/platform/tests/monitor.c b/src/core/platform/tests/monitor.c
|
||||
index c83192bbc92..f413facfcdc 100644
|
||||
--- a/src/core/platform/tests/monitor.c
|
||||
+++ b/src/core/platform/tests/monitor.c
|
||||
@@ -186,6 +186,7 @@ ip_again:
|
||||
00644,
|
||||
NULL,
|
||||
NULL,
|
||||
+ NULL,
|
||||
NULL);
|
||||
|
||||
nm_log_dbg(LOGD_PLATFORM, "dump to file complete");
|
||||
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
|
||||
index 42675cf222e..21908090f73 100644
|
||||
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
|
||||
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
|
||||
@@ -320,6 +320,7 @@ write_blobs(GHashTable *blobs, GError **error)
|
||||
0600,
|
||||
NULL,
|
||||
NULL,
|
||||
+ NULL,
|
||||
&write_error)) {
|
||||
g_set_error(error,
|
||||
NM_SETTINGS_ERROR,
|
||||
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
|
||||
index 7c0e329e2d6..26fb34418d5 100644
|
||||
--- a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
|
||||
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
|
||||
@@ -280,6 +280,7 @@ nms_keyfile_nmmeta_write(const char *dirname,
|
||||
length,
|
||||
0600,
|
||||
NULL,
|
||||
+ NULL,
|
||||
&errsv,
|
||||
NULL)) {
|
||||
NM_SET_OUT(out_full_filename, g_steal_pointer(&full_filename_tmp));
|
||||
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
|
||||
index b1dd2e446fd..c7c88260790 100644
|
||||
--- a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
|
||||
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
|
||||
@@ -133,6 +133,7 @@ cert_writer(NMConnection *connection,
|
||||
0600,
|
||||
NULL,
|
||||
NULL,
|
||||
+ NULL,
|
||||
&local);
|
||||
if (success) {
|
||||
/* Write the path value to the keyfile.
|
||||
@@ -384,7 +385,14 @@ _internal_write_connection(NMConnection *connection,
|
||||
}
|
||||
}
|
||||
|
||||
- nm_utils_file_set_contents(path, kf_content_buf, kf_content_len, 0600, NULL, NULL, &local_err);
|
||||
+ nm_utils_file_set_contents(path,
|
||||
+ kf_content_buf,
|
||||
+ kf_content_len,
|
||||
+ 0600,
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ &local_err);
|
||||
if (local_err) {
|
||||
g_set_error(error,
|
||||
NM_SETTINGS_ERROR,
|
||||
diff --git a/src/libnm-glib-aux/nm-io-utils.c b/src/libnm-glib-aux/nm-io-utils.c
|
||||
index 9443172b46b..d26ecee4f05 100644
|
||||
--- a/src/libnm-glib-aux/nm-io-utils.c
|
||||
+++ b/src/libnm-glib-aux/nm-io-utils.c
|
||||
@@ -415,8 +415,10 @@ nm_utils_file_get_contents(int dirfd,
|
||||
|
||||
/*
|
||||
* Copied from GLib's g_file_set_contents() et al., but allows
|
||||
- * specifying a mode for the new file and optionally the last access
|
||||
- * and last modification times.
|
||||
+ * specifying:
|
||||
+ * - the file mode (@mode)
|
||||
+ * - optionally, the last access and modification times (@times)
|
||||
+ * - optionally, a fixed name for the temporary file (@tmp_name)
|
||||
*/
|
||||
gboolean
|
||||
nm_utils_file_set_contents(const char *filename,
|
||||
@@ -424,10 +426,11 @@ nm_utils_file_set_contents(const char *filename,
|
||||
gssize length,
|
||||
mode_t mode,
|
||||
const struct timespec *times,
|
||||
+ const char *tmp_name,
|
||||
int *out_errsv,
|
||||
GError **error)
|
||||
{
|
||||
- gs_free char *tmp_name = NULL;
|
||||
+ gs_free char *tmp_name_free = NULL;
|
||||
struct stat statbuf;
|
||||
int errsv;
|
||||
gssize s;
|
||||
@@ -442,8 +445,13 @@ nm_utils_file_set_contents(const char *filename,
|
||||
if (length == -1)
|
||||
length = strlen(contents);
|
||||
|
||||
- tmp_name = g_strdup_printf("%s.XXXXXX", filename);
|
||||
- fd = g_mkstemp_full(tmp_name, O_RDWR | O_CLOEXEC, mode);
|
||||
+ if (tmp_name) {
|
||||
+ fd = open(tmp_name, O_CREAT | O_RDWR | O_TRUNC | O_CLOEXEC, mode);
|
||||
+ } else {
|
||||
+ tmp_name_free = g_strdup_printf("%s.XXXXXX", filename);
|
||||
+ tmp_name = tmp_name_free;
|
||||
+ fd = g_mkstemp_full(tmp_name_free, O_RDWR | O_CLOEXEC, mode);
|
||||
+ }
|
||||
if (fd < 0) {
|
||||
return _get_contents_error_errno(error, out_errsv, "failed to create file %s", tmp_name);
|
||||
}
|
||||
diff --git a/src/libnm-glib-aux/nm-io-utils.h b/src/libnm-glib-aux/nm-io-utils.h
|
||||
index 0021138f464..ff02ecb108a 100644
|
||||
--- a/src/libnm-glib-aux/nm-io-utils.h
|
||||
+++ b/src/libnm-glib-aux/nm-io-utils.h
|
||||
@@ -55,6 +55,7 @@ gboolean nm_utils_file_set_contents(const char *filename,
|
||||
gssize length,
|
||||
mode_t mode,
|
||||
const struct timespec *times,
|
||||
+ const char *tmp_name,
|
||||
int *out_errsv,
|
||||
GError **error);
|
||||
|
||||
diff --git a/src/nm-initrd-generator/nm-initrd-generator.c b/src/nm-initrd-generator/nm-initrd-generator.c
|
||||
index b89b4e413f5..68993c002f3 100644
|
||||
--- a/src/nm-initrd-generator/nm-initrd-generator.c
|
||||
+++ b/src/nm-initrd-generator/nm-initrd-generator.c
|
||||
@@ -78,7 +78,7 @@ output_conn(gpointer key, gpointer value, gpointer user_data)
|
||||
filename = nm_keyfile_utils_create_filename(basename, TRUE);
|
||||
full_filename = g_build_filename(connections_dir, filename, NULL);
|
||||
|
||||
- if (!nm_utils_file_set_contents(full_filename, data, len, 0600, NULL, NULL, &error))
|
||||
+ if (!nm_utils_file_set_contents(full_filename, data, len, 0600, NULL, NULL, NULL, &error))
|
||||
goto err_out;
|
||||
} else
|
||||
g_print("\n*** Connection '%s' ***\n\n%s", basename, data);
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 2d438ebef840cc003e423d3d0ad10e5832b5b49a Mon Sep 17 00:00:00 2001
|
||||
From: Beniamino Galvani <bgalvani@redhat.com>
|
||||
Date: Tue, 14 Oct 2025 10:42:53 +0200
|
||||
Subject: [PATCH 2/2] dns: specify a temporary file name when writing
|
||||
no-stub-resolv.conf
|
||||
|
||||
Using g_file_set_contents() makes it impossible to write a proper
|
||||
SELinux policy because the function creates a file with a random
|
||||
suffix, and SELinux file transitions can't match on wildcards.
|
||||
|
||||
Use a fixed temporary file name. In this case it's fine because
|
||||
/run/NetworkManager is only writable by root and NetworkManager is the
|
||||
only process writing into it.
|
||||
---
|
||||
src/core/dns/nm-dns-manager.c | 13 +++++++++++--
|
||||
1 file changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c
|
||||
index 57e732264cf..c746e714972 100644
|
||||
--- a/src/core/dns/nm-dns-manager.c
|
||||
+++ b/src/core/dns/nm-dns-manager.c
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "libnm-glib-aux/nm-str-buf.h"
|
||||
+#include "libnm-glib-aux/nm-io-utils.h"
|
||||
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "devices/nm-device.h"
|
||||
@@ -1006,7 +1007,8 @@ _read_link_cached(const char *path, gboolean *is_cached, char **cached)
|
||||
#define MY_RESOLV_CONF_TMP MY_RESOLV_CONF ".tmp"
|
||||
#define RESOLV_CONF_TMP "/etc/.resolv.conf.NetworkManager"
|
||||
|
||||
-#define NO_STUB_RESOLV_CONF NMRUNDIR "/no-stub-resolv.conf"
|
||||
+#define NO_STUB_RESOLV_CONF NMRUNDIR "/no-stub-resolv.conf"
|
||||
+#define NO_STUB_RESOLV_CONF_TMP NMRUNDIR "/no-stub-resolv.conf.tmp"
|
||||
|
||||
static void
|
||||
update_resolv_conf_no_stub(NMDnsManager *self,
|
||||
@@ -1019,7 +1021,14 @@ update_resolv_conf_no_stub(NMDnsManager *self,
|
||||
|
||||
content = create_resolv_conf(searches, nameservers, options);
|
||||
|
||||
- if (!g_file_set_contents(NO_STUB_RESOLV_CONF, content, -1, &local)) {
|
||||
+ if (!nm_utils_file_set_contents(NO_STUB_RESOLV_CONF,
|
||||
+ content,
|
||||
+ -1,
|
||||
+ 0644,
|
||||
+ NULL,
|
||||
+ NO_STUB_RESOLV_CONF_TMP,
|
||||
+ NULL,
|
||||
+ &local)) {
|
||||
_LOGD("update-resolv-no-stub: failure to write file: %s", local->message);
|
||||
g_error_free(local);
|
||||
return;
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: NetworkManager-1.44.0/src/core/dns/nm-dns-manager.c
|
||||
Index: NetworkManager-1.54.0/src/core/dns/nm-dns-manager.c
|
||||
===================================================================
|
||||
--- NetworkManager-1.44.0.orig/src/core/dns/nm-dns-manager.c
|
||||
+++ NetworkManager-1.44.0/src/core/dns/nm-dns-manager.c
|
||||
@@ -733,6 +733,14 @@ dispatch_netconfig(NMDnsManager *se
|
||||
--- NetworkManager-1.54.0.orig/src/core/dns/nm-dns-manager.c
|
||||
+++ NetworkManager-1.54.0/src/core/dns/nm-dns-manager.c
|
||||
@@ -734,6 +734,14 @@ dispatch_netconfig(NMDnsManager *se
|
||||
gssize l;
|
||||
nm_auto_free_gstring GString *str = NULL;
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9caf947ce9353ab0733dd4a67d7523b495d9704f2144ee7f3de53cac9b84c359
|
||||
size 65311246
|
||||
3
NetworkManager-1.54.1.obscpio
Normal file
3
NetworkManager-1.54.1.obscpio
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cf13fb6894ec4e99870e9ef55e31771c1252d3379e1a1d94b3b145e79c6d7146
|
||||
size 65561614
|
||||
@@ -1,3 +1,59 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 31 10:05:44 UTC 2025 - Johannes Segitz <jsegitz@suse.com>
|
||||
|
||||
- Add patch 2298.patch to fix issue with SELinux labeling. Is already
|
||||
upstream via
|
||||
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2298
|
||||
and can be removed next release (bsc#1248136)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 27 11:18:43 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 1.54.1:
|
||||
+ Make that global-dns configuration overwrites DNS searches and
|
||||
options from connections, instead of merging all together.
|
||||
+ Add support for a new rd.net.dhcp.client-id option in
|
||||
nm-initrd-generator.
|
||||
+ Minor bug fixes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 22 01:25:54 UTC 2025 - Jonathan Kang <songchuan.kang@suse.com>
|
||||
|
||||
- Move dispatcher.d/pre-up.d/90-nm-cloud-setup.sh to cloud-setup
|
||||
subpackage(bsc#1250086).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 7 19:29:33 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 1.54.0:
|
||||
+ Add support for configuring per-device IPv4 forwarding via the
|
||||
"ipv4.forwarding" connection property.
|
||||
+ Add a new "prefix-delegation" setting containing a "subnet-id"
|
||||
property that specifies the subnet to choose on the downstream
|
||||
interface when using IPv6 prefix delegation.
|
||||
+ Support OCI baremetal in nm-cloud-setup
|
||||
+ When activating a WireGuard connection to an IPv6 endpoint, now
|
||||
NetworkManager creates firewall rules to ensure that the
|
||||
incoming packets are not dropped by kernel reverse path
|
||||
filtering.
|
||||
+ Add support for configuring the loopback interface in nmtui.
|
||||
+ Most of the properties of ovs-bridge and ovs-port connections
|
||||
can now be reapplied at runtime without bringing the connection
|
||||
down.
|
||||
+ Add a new "sriov.preserve-on-down" property that controls
|
||||
whether NetworkManager preserves the SR-IOV parameters set on
|
||||
the device when the connection is deactivated, or whether it
|
||||
resets them to their default value.
|
||||
+ Introduce a new "ovs-dpdk.lsc-interrupt" property to configure
|
||||
the Link State Change (LSC) detection mode for OVS DPDK
|
||||
interfaces.
|
||||
+ The initrd-generator now can parse the NVMe Boot Firmware Table
|
||||
(NBFT) to configure networking during early boot.
|
||||
+ Add systemd services to provide networking in the initrd.
|
||||
- Drop 2069.patch: Fixed in an alternative way upstream.
|
||||
- Rebase patches with quilt.
|
||||
- Add pkgconfig(libnvme) BuildRequires: New dependency.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 7 19:17:10 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
name: NetworkManager
|
||||
version: 1.52.1
|
||||
mtime: 1751970112
|
||||
commit: 826e37b175368a9ce761a575adec520b83958742
|
||||
version: 1.54.1
|
||||
mtime: 1757681816
|
||||
commit: 2450d860c67a6a124a3a56d94bd54bfc7de295f7
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
%endif
|
||||
|
||||
Name: NetworkManager
|
||||
Version: 1.52.1
|
||||
Version: 1.54.1
|
||||
Release: 0
|
||||
Summary: Standard Linux network configuration tool suite
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
@@ -95,10 +95,10 @@ Patch7: nm-add-CAP_SYS_ADMIN-permission.patch
|
||||
Patch8: python3.6-in-sle.patch
|
||||
# PATCH-FIX-SLE NetworkManager-dont-renew-bridge-dhcp-if-no-mac-on-wakeup.patch bsc#1225498, glfd#NetworkManager/NetworkManager#1587 -- manager: don't renew dhcp lease when software devices' MAC is empty
|
||||
Patch9: NetworkManager-dont-renew-bridge-dhcp-if-no-mac-on-wakeup.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch10: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2069.patch
|
||||
# PATCH-FIX-OPENSUSE nm-initrd-generator document static ip setup bsc#1244072
|
||||
Patch11: 0001-man-document-static-ip-setup-differences-to-dracut-n.patch
|
||||
# PATCH-FIX-UPSTREAM https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2298.patch
|
||||
Patch12: 2298.patch
|
||||
|
||||
BuildRequires: c++_compiler
|
||||
BuildRequires: dnsmasq
|
||||
@@ -124,6 +124,7 @@ BuildRequires: pkgconfig(libnewt) >= 0.52.15
|
||||
BuildRequires: pkgconfig(libnl-3.0) >= 3.2.8
|
||||
BuildRequires: pkgconfig(libnl-genl-3.0)
|
||||
BuildRequires: pkgconfig(libnl-route-3.0)
|
||||
BuildRequires: pkgconfig(libnvme)
|
||||
BuildRequires: pkgconfig(libpsl) >= 0.1
|
||||
BuildRequires: pkgconfig(libselinux)
|
||||
BuildRequires: pkgconfig(libsystemd) >= 209
|
||||
@@ -322,8 +323,8 @@ This package is intended to be installed by default for server deployments.
|
||||
%patch -P 8 -p1
|
||||
%patch -P 9 -p1
|
||||
%endif
|
||||
%patch -P 10 -p1
|
||||
%patch -P 11 -p1
|
||||
%patch -P 12 -p1
|
||||
|
||||
# Fix server.conf's location, to end up in %%{_defaultdocdir}/%%{name},
|
||||
# rather then %%{_datadir}/doc/%%{name}/examples:
|
||||
@@ -476,7 +477,6 @@ rm -f %{buildroot}%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkMana
|
||||
%dir %{_prefix}/lib/NetworkManager/dispatcher.d
|
||||
%dir %{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d
|
||||
%dir %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d
|
||||
%{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d/90-nm-cloud-setup.sh
|
||||
%dir %{_prefix}/lib/NetworkManager/dispatcher.d/pre-down.d
|
||||
%dir %{_prefix}/lib/NetworkManager/VPN
|
||||
%dir %{_prefix}/lib/firewalld
|
||||
@@ -487,6 +487,9 @@ rm -f %{buildroot}%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkMana
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service
|
||||
%{_dbusconfdir}/nm-priv-helper.conf
|
||||
%{_defaultdocdir}/NetworkManager/server.conf
|
||||
%{_unitdir}/NetworkManager-config-initrd.service
|
||||
%{_unitdir}/NetworkManager-initrd.service
|
||||
%{_unitdir}/NetworkManager-wait-online-initrd.service
|
||||
|
||||
%files devel
|
||||
%{_includedir}/libnm/
|
||||
@@ -542,6 +545,7 @@ rm -f %{buildroot}%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkMana
|
||||
%{_unitdir}/nm-cloud-setup.timer
|
||||
%{_prefix}/lib/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh
|
||||
%{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
|
||||
%{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d/90-nm-cloud-setup.sh
|
||||
%{_mandir}/man8/nm-cloud-setup.8%{?ext_man}
|
||||
|
||||
%files config-server
|
||||
|
||||
2
_service
2
_service
@@ -3,7 +3,7 @@
|
||||
<service name="obs_scm" mode="manual">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git</param>
|
||||
<param name="revision">1.52.1</param>
|
||||
<param name="revision">1.54.1</param>
|
||||
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
|
||||
<param name="versionrewrite-pattern">(.*)\+0</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: NetworkManager-1.44.0/src/core/dns/nm-dns-manager.c
|
||||
Index: NetworkManager-1.54.0/src/core/dns/nm-dns-manager.c
|
||||
===================================================================
|
||||
--- NetworkManager-1.44.0.orig/src/core/dns/nm-dns-manager.c
|
||||
+++ NetworkManager-1.44.0/src/core/dns/nm-dns-manager.c
|
||||
@@ -760,7 +760,7 @@ again:
|
||||
--- NetworkManager-1.54.0.orig/src/core/dns/nm-dns-manager.c
|
||||
+++ NetworkManager-1.54.0/src/core/dns/nm-dns-manager.c
|
||||
@@ -761,7 +761,7 @@ again:
|
||||
/* FIXME: don't write to netconfig synchronously. */
|
||||
|
||||
/* Wait until the process exits */
|
||||
|
||||
Reference in New Issue
Block a user