From 4fabf63d9f28f048bdbf351a8a577b456032f554 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 10 2020 18:08:06 +0000 Subject: import NetworkManager-1.30.0-0.2.el8 --- diff --git a/SOURCES/1000-device-fix-crash-in-nm_device_reactivate_ip_config.patch b/SOURCES/1000-device-fix-crash-in-nm_device_reactivate_ip_config.patch new file mode 100644 index 0000000..85e4289 --- /dev/null +++ b/SOURCES/1000-device-fix-crash-in-nm_device_reactivate_ip_config.patch @@ -0,0 +1,31 @@ +From 067bdfe721420cd5b2b7fba0f24fe200d8731a48 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Tue, 3 Nov 2020 12:32:08 +0100 +Subject: [PATCH] device: fix crash in nm_device_reactivate_ip_config() + +Fixes: 87f69f00506f ('device: merge nm_device_reactivate_ip_config() implementations for IPv4/IPv6') +(cherry picked from commit 11068cf93693fdb7931c63d4d3095ab0e8c49fb3) +--- + src/devices/nm-device.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c +index 63178a63c5..6e53048bb4 100644 +--- a/src/devices/nm-device.c ++++ b/src/devices/nm-device.c +@@ -12263,10 +12263,10 @@ nm_device_reactivate_ip_config(NMDevice * self, + nm_device_get_route_metric(self, AF_INET6)); + } + +- method_old = nm_setting_ip_config_get_method(s_ip_old) ++ method_old = (s_ip_old ? nm_setting_ip_config_get_method(s_ip_old) : NULL) + ?: (IS_IPv4 ? NM_SETTING_IP4_CONFIG_METHOD_DISABLED + : NM_SETTING_IP6_CONFIG_METHOD_IGNORE); +- method_new = nm_setting_ip_config_get_method(s_ip_new) ++ method_new = (s_ip_new ? nm_setting_ip_config_get_method(s_ip_new) : NULL) + ?: (IS_IPv4 ? NM_SETTING_IP4_CONFIG_METHOD_DISABLED + : NM_SETTING_IP6_CONFIG_METHOD_IGNORE); + +-- +2.26.2 + diff --git a/SOURCES/1001-dns-sd-resolved-fix-hash-table-initialization-rh1894839.patch b/SOURCES/1001-dns-sd-resolved-fix-hash-table-initialization-rh1894839.patch new file mode 100644 index 0000000..207b377 --- /dev/null +++ b/SOURCES/1001-dns-sd-resolved-fix-hash-table-initialization-rh1894839.patch @@ -0,0 +1,40 @@ +From 0cb0558e368898471a5169b8f9002a661792b2cb Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Fri, 6 Nov 2020 23:37:16 +0100 +Subject: [PATCH] dns: sd-resolved: fix hash table initialization + +The hash table was not initialized if there was no D-Bus connection at +the time of object creation. + +Fixes: f70ee67058c9 ('dns: sd-resolved: reset interface configuration on deactivation') + +https://bugzilla.redhat.com/show_bug.cgi?id=1894839 +(cherry picked from commit d6457902d127f2a29be4d12fe5b9ae94e3106b57) +--- + src/dns/nm-dns-systemd-resolved.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/dns/nm-dns-systemd-resolved.c +index 8bbfd6a4cd..f1d08f67be 100644 +--- a/src/dns/nm-dns-systemd-resolved.c ++++ b/src/dns/nm-dns-systemd-resolved.c +@@ -504,6 +504,7 @@ nm_dns_systemd_resolved_init(NMDnsSystemdResolved *self) + NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE(self); + + c_list_init(&priv->request_queue_lst_head); ++ priv->dirty_interfaces = g_hash_table_new(nm_direct_hash, NULL); + + priv->dbus_connection = nm_g_object_ref(NM_MAIN_DBUS_CONNECTION_GET); + if (!priv->dbus_connection) { +@@ -524,8 +525,6 @@ nm_dns_systemd_resolved_init(NMDnsSystemdResolved *self) + priv->cancellable, + get_name_owner_cb, + self); +- +- priv->dirty_interfaces = g_hash_table_new(nm_direct_hash, NULL); + } + + NMDnsPlugin * +-- +2.26.2 + diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index 27197fd..97ec2f9 100644 --- a/SPECS/NetworkManager.spec +++ b/SPECS/NetworkManager.spec @@ -7,7 +7,7 @@ %global epoch_version 1 %global rpm_version 1.30.0 %global real_version 1.29.1 -%global release_version 0.1 +%global release_version 0.2 %global snapshot %{nil} %global git_sha %{nil} @@ -166,7 +166,8 @@ Source6: 70-nm-connectivity.conf Patch1: 0001-cloud-setup-systemd-unit-rh1791758.patch # Bugfixes that are only relevant until next rebase of the package. -# Patch1000: my.patch +Patch1000: 1000-device-fix-crash-in-nm_device_reactivate_ip_config.patch +Patch1001: 1001-dns-sd-resolved-fix-hash-table-initialization-rh1894839.patch # The pregenerated docs contain default values and paths that depend # on the configure options when creating the source tarball. @@ -1118,7 +1119,11 @@ fi %changelog -* Mon Nov 2 2020 Antonio Cardace - 1:1.30.0-0.1 +* Mon Nov 9 2020 Beniamino Galvani - 1:1.30.0-0.2 +- device: fix crash in nm_device_reactivate_ip_config() +- dns: fix crash in systemd-resolved DNS plugin (rh #1894839) + +* Mon Nov 2 2020 Antonio Cardace - 1:1.30.0-0.1 - Update to 1.29.1 (development) - add library for handling profiles in keyfile format (rh #1813334) - initrd: allow disabling NICs during boot (rh #1883958)