From 5714181c4487efebcc475cade65c5fde7c08395f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 09 2021 18:18:24 +0000 Subject: import NetworkManager-1.32.6-1.el8 --- diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata index 0ac296c..298b5c5 100644 --- a/.NetworkManager.metadata +++ b/.NetworkManager.metadata @@ -1 +1 @@ -6e5098384bde026ad52b501248457ba348290178 SOURCES/NetworkManager-1.32.4.tar.xz +724f2be4e16cb42e7116cae21244b46c6115eed6 SOURCES/NetworkManager-1.32.6.tar.xz diff --git a/.gitignore b/.gitignore index ae8c029..51ec57a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-1.32.4.tar.xz +SOURCES/NetworkManager-1.32.6.tar.xz diff --git a/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch b/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch index bf8dc6d..83c2455 100644 --- a/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch +++ b/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch @@ -1,4 +1,4 @@ -From 2eaf8be60d91a49bee3bf658071bb4a302affa7f Mon Sep 17 00:00:00 2001 +From 45f33b5379c41f34fb1a27452e5f62e2d571e85e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 16 Jan 2020 13:40:26 +0100 Subject: [PATCH] cloud-setup: avoid unsupported systemd settings in @@ -10,10 +10,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1791758 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nm-cloud-setup/nm-cloud-setup.service.in b/src/nm-cloud-setup/nm-cloud-setup.service.in -index 809f707da1..78441c74be 100644 +index f4b0e2638f14..c59bd47574ba 100644 --- a/src/nm-cloud-setup/nm-cloud-setup.service.in +++ b/src/nm-cloud-setup/nm-cloud-setup.service.in -@@ -27,15 +27,15 @@ PrivateDevices=yes +@@ -28,15 +28,15 @@ PrivateDevices=yes PrivateTmp=yes ProtectControlGroups=yes ProtectHome=yes @@ -33,5 +33,5 @@ index 809f707da1..78441c74be 100644 [Install] -- -2.29.2 +2.31.1 diff --git a/SOURCES/0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch b/SOURCES/0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch index 7f3badc..8d4e50b 100644 --- a/SOURCES/0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch +++ b/SOURCES/0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch @@ -1,7 +1,7 @@ -From 35fa1c22b6b6f89fd74f31186ec92ec70ed34af2 Mon Sep 17 00:00:00 2001 +From af25d85a43eb2aa59a80c13aa214cbc5509b6815 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Wed, 16 Jun 2021 22:43:32 +0200 -Subject: [PATCH 1/1] firewall: Default to iptables backend to preserve behavior +Subject: [PATCH] firewall: Default to iptables backend to preserve behavior For upsteam, the default is "nftables" (if nft is installed). On RHEL8, we will always default to "iptables" to preserve behavior. @@ -10,7 +10,7 @@ always default to "iptables" to preserve behavior. 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/core/nm-firewall-utils.c b/src/core/nm-firewall-utils.c -index 3f2251569fa0..f2712f3d72ab 100644 +index a2446553b76f..5525a677cb1d 100644 --- a/src/core/nm-firewall-utils.c +++ b/src/core/nm-firewall-utils.c @@ -744,12 +744,9 @@ nm_firewall_config_apply(NMFirewallConfig *self, gboolean shared) diff --git a/SOURCES/9999-fix-pregen-doc.patch b/SOURCES/9999-fix-pregen-doc.patch index 572f351..6e6485f 100644 --- a/SOURCES/9999-fix-pregen-doc.patch +++ b/SOURCES/9999-fix-pregen-doc.patch @@ -1,4 +1,4 @@ -From b0bd54da20c0757c81f9086d187547cb0532a8a0 Mon Sep 17 00:00:00 2001 +From f7019f666002878544e2d9de23321bd19a60a808 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 27 Aug 2019 15:47:32 +0200 Subject: [PATCH] patch documentation with the proper default values @@ -14,10 +14,10 @@ Patch the man pages with the proper values. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html -index 035fd4811f..00432090db 100644 +index e348806a1eb1..377d4f7d56cc 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html -@@ -628,7 +628,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth +@@ -658,7 +658,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth are "syslog" and "journal". When NetworkManager is started with "--debug" in addition all messages will be printed to stderr. @@ -27,10 +27,10 @@ index 035fd4811f..00432090db 100644 diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 -index cf94846780..ac3df6082e 100644 +index efb79accfd2a..07d8dda62147 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 -@@ -640,7 +640,7 @@ INFO\&. +@@ -664,7 +664,7 @@ INFO\&. .PP \fIbackend\fR .RS 4 @@ -40,5 +40,5 @@ index cf94846780..ac3df6082e 100644 .PP \fIaudit\fR -- -2.29.2 +2.31.1 diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index d266c9c..7fda7e8 100644 --- a/SPECS/NetworkManager.spec +++ b/SPECS/NetworkManager.spec @@ -5,8 +5,8 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global rpm_version 1.32.4 -%global real_version 1.32.4 +%global rpm_version 1.32.6 +%global real_version 1.32.6 %global release_version 1 %global snapshot %{nil} %global git_sha %{nil} @@ -1163,6 +1163,15 @@ fi %changelog +* Thu Jul 29 2021 Gris Ge - 1:1.32.6-1 +- Upgrade to 1.32.6 release +- core: fix adding stale local routes when address changes (rh #1979192) +- dhcp: handle filename/bootfile_name DHCP option and write it to device state + file for initrd/kickstart (rh #1979387) +- initrd: add "ib.pkey=" command line option (rh #1805708) +- core: introduce "keep-configuration" device option to forcefully activate a + profile on start (rh #1934122) + * Wed Jul 21 2021 Gris Ge - 1:1.32.4-1 - Upgrade to 1.32.4 with fixes of: - nmcli: show DNS SEARCH field in device information. (rh #1852317)