diff --git a/.gitignore b/.gitignore index c627db3..64f41b5 100644 --- a/.gitignore +++ b/.gitignore @@ -439,3 +439,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.43.11.tar.xz /NetworkManager-1.43.90.tar.xz /NetworkManager-1.44.0.tar.xz +/NetworkManager-1.45.2.tar.xz diff --git a/1001-nm-manager-ensure-device-is-exported-on-D-Bus-in-aut-rhbz2210271.patch b/1001-nm-manager-ensure-device-is-exported-on-D-Bus-in-aut-rhbz2210271.patch deleted file mode 100644 index 1867761..0000000 --- a/1001-nm-manager-ensure-device-is-exported-on-D-Bus-in-aut-rhbz2210271.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6302c2ea52c6c28d36b6006b29823c469e171e2a Mon Sep 17 00:00:00 2001 -From: Wen Liang -Date: Thu, 3 Aug 2023 10:16:42 -0400 -Subject: [PATCH] nm-manager: ensure device is exported on D-Bus in - authentication request - -The device authentication request is an async process, it can not know -the answer right away, it is not guarantee that device is still -exported on D-Bus when authentication finishes. Thus, do not return -SUCCESS and abort the authentication request when device is not alive. - -https://bugzilla.redhat.com/show_bug.cgi?id=2210271 -(cherry picked from commit b341161e2a4988403ae4a6ef7653e01567da36a0) -(cherry picked from commit 0e27e84247ed824b27d105292d7bf42dc0341cbb) ---- - src/core/nm-manager.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c -index 9c7212202b..937acbba1e 100644 ---- a/src/core/nm-manager.c -+++ b/src/core/nm-manager.c -@@ -3222,6 +3222,13 @@ device_auth_done_cb(NMAuthChain *chain, GDBusMethodInvocation *context, gpointer - nm_assert(error || (result == NM_AUTH_CALL_RESULT_YES)); - } - -+ if (!error && !nm_dbus_object_is_exported(NM_DBUS_OBJECT(device))) { -+ g_set_error(&error, -+ NM_MANAGER_ERROR, -+ NM_MANAGER_ERROR_UNKNOWN_DEVICE, -+ "device no longer exists"); -+ } -+ - callback(device, context, subject, error, nm_auth_chain_get_data(chain, "user-data")); - } - -@@ -3287,6 +3294,14 @@ nm_manager_device_auth_request(NMManager *self, - &error)) - goto fail_on_idle; - -+ if (!nm_dbus_object_is_exported(NM_DBUS_OBJECT(device))) { -+ g_set_error(&error, -+ NM_MANAGER_ERROR, -+ NM_MANAGER_ERROR_UNKNOWN_DEVICE, -+ "device no longer exists"); -+ goto fail_on_idle; -+ } -+ - chain = nm_auth_chain_new_subject(subject, context, device_auth_done_cb, self); - if (cancellable) - nm_auth_chain_set_cancellable(chain, cancellable); --- -2.41.0 - diff --git a/1002-checkpoint-Fix-segfault-crash-when-rollback-rhel-1526.patch b/1002-checkpoint-Fix-segfault-crash-when-rollback-rhel-1526.patch deleted file mode 100644 index 63671a3..0000000 --- a/1002-checkpoint-Fix-segfault-crash-when-rollback-rhel-1526.patch +++ /dev/null @@ -1,67 +0,0 @@ -From d9b3114b6ef8e0f4d50a8d56d750a698d85fa984 Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Tue, 29 Aug 2023 08:25:23 +0800 -Subject: [PATCH] checkpoint: Fix segfault crash when rollback - -When rolling back a checkpoint, NM will crash due to dereference a NULL -pointer of `priv->removed_devices->len`. - -To fix it, we just place a NULL check before that code block. - -Fixes: 1f1b71ad9f8a ('checkpoint: preserve devices that were removed and - readded') - -Reference: https://issues.redhat.com/browse/RHEL-1526 - -Signed-off-by: Gris Ge -(cherry picked from commit 3162507d6ca381cfbe02ceba2d80ba0f3ba3e5f7) -(cherry picked from commit e5600d4c5a33749939b984184f27fbe4159a2b65) ---- - src/core/nm-checkpoint.c | 23 +++++++++++++---------- - 1 file changed, 13 insertions(+), 10 deletions(-) - -diff --git a/src/core/nm-checkpoint.c b/src/core/nm-checkpoint.c -index 5c4d4e53d6..74adf48477 100644 ---- a/src/core/nm-checkpoint.c -+++ b/src/core/nm-checkpoint.c -@@ -460,24 +460,27 @@ next_dev: - NMDeviceState state; - - nm_manager_for_each_device (priv->manager, device, tmp_lst) { -- gboolean found = FALSE; -- - if (g_hash_table_contains(priv->devices, device)) - continue; - - /* Also ignore devices that were in the checkpoint initially and - * were moved to 'removed_devices' because they got removed from - * the system. */ -- for (i = 0; i < priv->removed_devices->len; i++) { -- dev_checkpoint = priv->removed_devices->pdata[i]; -- if (dev_checkpoint->dev_type == nm_device_get_device_type(device) -- && nm_streq0(dev_checkpoint->original_dev_name, nm_device_get_iface(device))) { -- found = TRUE; -- break; -+ if (priv->removed_devices) { -+ gboolean found = FALSE; -+ -+ for (i = 0; i < priv->removed_devices->len; i++) { -+ dev_checkpoint = priv->removed_devices->pdata[i]; -+ if (dev_checkpoint->dev_type == nm_device_get_device_type(device) -+ && nm_streq0(dev_checkpoint->original_dev_name, -+ nm_device_get_iface(device))) { -+ found = TRUE; -+ break; -+ } - } -+ if (found) -+ continue; - } -- if (found) -- continue; - - state = nm_device_get_state(device); - if (state > NM_DEVICE_STATE_DISCONNECTED && state < NM_DEVICE_STATE_DEACTIVATING) { --- -2.41.0 - diff --git a/NetworkManager.spec b/NetworkManager.spec index 487fab4..3667a23 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -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.44.0 +%global real_version 1.45.2 %global rpm_version %{real_version} -%global release_version 4 +%global release_version 1 %global snapshot %{nil} %global git_sha %{nil} %global bcond_default_debug 0 @@ -202,8 +202,7 @@ Source7: readme-ifcfg-rh.txt # Patch0001: 0001-some.patch # Bugfixes that are only relevant until next rebase of the package. -Patch1001: 1001-nm-manager-ensure-device-is-exported-on-D-Bus-in-aut-rhbz2210271.patch -Patch1002: 1002-checkpoint-Fix-segfault-crash-when-rollback-rhel-1526.patch +# Patch1001: 1001-some.patch Requires(post): systemd %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -1253,6 +1252,9 @@ fi %changelog +* Wed Sep 6 2023 Beniamino Galvani - 1.45.2-1 +- update to 1.45.2 release (development) + * Mon Sep 04 2023 Gris Ge - 1.44.0-4 - Rebuild for RHEL 9.4 diff --git a/sources b/sources index 9b84f9d..4a71c6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.44.0.tar.xz) = 7ebece465dfd108d66adb1c941ab22bdca8bb0ce7869baa421e4aef65e89a23bf63f3713e809e1e7b6c5226813ad9d56d8af339c711507a33aa6728afd334405 +SHA512 (NetworkManager-1.45.2.tar.xz) = 8324939611058ec0dd75da197c4751c8b12d323169a2580b52da3a44e6b0b4fe68b988db3752e45efc4e8dea75240dca9c2f23acc0710d9954523ca3ad3ca2c1