From 29b2d9cdf53b6099fba8e885d87453427cf44b05 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 22 2021 04:19:38 +0000
Subject: import NetworkManager-1.32.0-1.el8


---

diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata
index 327fdba..c1d9af2 100644
--- a/.NetworkManager.metadata
+++ b/.NetworkManager.metadata
@@ -1 +1 @@
-210d880fae2e6905885b529a56512b970aa37aba SOURCES/NetworkManager-1.31.90.tar.xz
+1390bec433ba5d53d954a57321ddd453a621c3b7 SOURCES/NetworkManager-1.32.0.tar.xz
diff --git a/.gitignore b/.gitignore
index 2379f4b..401cc7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/NetworkManager-1.31.90.tar.xz
+SOURCES/NetworkManager-1.32.0.tar.xz
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
new file mode 100644
index 0000000..7f3badc
--- /dev/null
+++ b/SOURCES/0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch
@@ -0,0 +1,34 @@
+From 35fa1c22b6b6f89fd74f31186ec92ec70ed34af2 Mon Sep 17 00:00:00 2001
+From: Wen Liang <wenliang@redhat.com>
+Date: Wed, 16 Jun 2021 22:43:32 +0200
+Subject: [PATCH 1/1] 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.
+---
+ src/core/nm-firewall-utils.c | 9 +++------
+ 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
+--- 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)
+ static NMFirewallBackend
+ _firewall_backend_detect(void)
+ {
+-    if (g_file_test(NFT_PATH, G_FILE_TEST_IS_EXECUTABLE))
+-        return NM_FIREWALL_BACKEND_NFTABLES;
+-    if (g_file_test(IPTABLES_PATH, G_FILE_TEST_IS_EXECUTABLE))
+-        return NM_FIREWALL_BACKEND_IPTABLES;
+-
+-    return NM_FIREWALL_BACKEND_NFTABLES;
++    /* For upsteam, the default is "nftables" (if nft is installed). On RHEL8, we will
++     * always default to "iptables" to preserve behavior. */
++    return NM_FIREWALL_BACKEND_IPTABLES;
+ }
+ 
+ NMFirewallBackend
+-- 
+2.31.1
+
diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec
index 7de4854..00d58f1 100644
--- a/SPECS/NetworkManager.spec
+++ b/SPECS/NetworkManager.spec
@@ -6,8 +6,8 @@
 
 %global epoch_version 1
 %global rpm_version 1.32.0
-%global real_version 1.31.90
-%global release_version 0.5
+%global real_version 1.32.0
+%global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -190,6 +190,7 @@ Source6: 70-nm-connectivity.conf
 # These are not bugfixes, hence they are also relevant after
 # the next rebase of the source tarball.
 Patch1: 0001-cloud-setup-systemd-unit-rh1791758.patch
+Patch2: 0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch
 
 # Bugfixes that are only relevant until next rebase of the package.
 #Patch1000: 1000-some.patch
@@ -1002,6 +1003,7 @@ fi
 %{_libexecdir}/nm-dispatcher
 %{_libexecdir}/nm-iface-helper
 %{_libexecdir}/nm-initrd-generator
+%{_libexecdir}/nm-daemon-helper
 %dir %{_libdir}/%{name}
 %dir %{nmplugindir}
 %{nmplugindir}/libnm-settings-plugin*.so
@@ -1161,6 +1163,13 @@ fi
 
 
 %changelog
+* Fri Jun 18 2021 Wen Liang <wenliang@redhat.com> - 1:1.32.0-1
+- update to 1.32.0 release
+- veth: fix null error when deleting the device (rh #1915278)
+- veth: fix crash when deleting the device profile (rh #1915276)
+- firewall: add new "nftables" firewall-backend (rh #1548825)
+- DNS: fix lookup of hostname via DNS (rh #1970335)
+
 * Mon Jun  7 2021 Thomas Haller <thaller@redhat.com> - 1:1.32.0-0.5
 - update to 1.32-rc1 (1.31.90) (release candidate)
 - core: allow to preserved external TFilter and QDisc settings (rh #1928078)