From d26afaebc8522e6a2c46db5ab5a6ffedb21706ca Mon Sep 17 00:00:00 2001
From: Wen Liang <wenliang@redhat.com>
Date: Wed, 12 Jan 2022 12:59:17 -0500
Subject: [PATCH] Upgrade to 1.35.4 release (development)

Related: #1996582
Resolves: #2012182
Resolves: #2012934
Resolves: #2034086

Signed-off-by: Wen Liang <wenliang@redhat.com>
---
 .gitignore          |  1 +
 NetworkManager.spec | 22 ++++++++++++++--------
 sources             |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9a4ec91..ca8dcd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -397,3 +397,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.35.1.tar.xz
 /NetworkManager-1.35.2.tar.xz
 /NetworkManager-1.35.3.tar.xz
+/NetworkManager-1.35.4.tar.xz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 03fc06b..05c0c92 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,8 +6,8 @@
 
 %global epoch_version 1
 %global rpm_version 1.36.0
-%global real_version 1.35.3
-%global release_version 0.3
+%global real_version 1.35.4
+%global release_version 0.4
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -32,7 +32,7 @@
 
 %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[0-9][0-9]*\\)\\.[0-9][0-9]*$/\\1/p')
 
-%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-sudo.service
+%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
 
 %global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer
 
@@ -947,7 +947,7 @@ if [ $1 -eq 0 ]; then
 
     /usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
 fi
-%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-sudo.service
+%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
 
 
 %if %{with nm_cloud_setup}
@@ -981,7 +981,7 @@ fi
 %files
 %{dbus_sys_dir}/org.freedesktop.NetworkManager.conf
 %{dbus_sys_dir}/nm-dispatcher.conf
-%{dbus_sys_dir}/nm-sudo.conf
+%{dbus_sys_dir}/nm-priv-helper.conf
 %{dbus_sys_dir}/nm-ifcfg-rh.conf
 %{_sbindir}/%{name}
 %{_bindir}/nmcli
@@ -1006,7 +1006,7 @@ fi
 %{_libexecdir}/nm-dispatcher
 %{_libexecdir}/nm-initrd-generator
 %{_libexecdir}/nm-daemon-helper
-%{_libexecdir}/nm-sudo
+%{_libexecdir}/nm-priv-helper
 %dir %{_libdir}/%{name}
 %dir %{nmplugindir}
 %{nmplugindir}/libnm-settings-plugin*.so
@@ -1030,7 +1030,7 @@ fi
 %dir %{_localstatedir}/lib/NetworkManager
 %dir %{_sysconfdir}/sysconfig/network-scripts
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.nm.sudo.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm-priv-helper.service
 %{_datadir}/polkit-1/actions/*.policy
 %{_prefix}/lib/udev/rules.d/*.rules
 %if %{with firewalld_zone}
@@ -1040,7 +1040,7 @@ fi
 %{systemd_dir}/NetworkManager.service
 %{systemd_dir}/NetworkManager-wait-online.service
 %{systemd_dir}/NetworkManager-dispatcher.service
-%{systemd_dir}/nm-sudo.service
+%{systemd_dir}/nm-priv-helper.service
 %dir %{_datadir}/doc/NetworkManager/examples
 %{_datadir}/doc/NetworkManager/examples/server.conf
 %doc NEWS AUTHORS README CONTRIBUTING.md TODO
@@ -1168,6 +1168,12 @@ fi
 
 
 %changelog
+* Wed Jan 12 2022 Wen Liang <wenliang@redhat.com> - 1:1.36.0-0.4
+- Upgrade to 1.35.4 release (development)
+- core: don't reset assume state if the device is unmanaged by parent (rh #2012182)
+- nm-device: clean up IP methods if we lose ifindex (rh #2012934)
+- core: log variant properties in connection diff (rh #2034086)
+
 * Thu Dec 16 2021 Wen Liang <wenliang@redhat.com> - 1:1.36.0-0.3
 - Upgrade to 1.35.3 release (development)
 - device: fix update of the ip-iface property (rh #2026024)
diff --git a/sources b/sources
index 2c3290b..62e1993 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.35.3.tar.xz) = 3d7006159a47148d4bc81df186123a5746dd91ff33ee95ba9704f10f9b44bd5e69987688b843d3678b12de2ab2310e7bad951e457239934f4f8e54065c4acb14
+SHA512 (NetworkManager-1.35.4.tar.xz) = 16c57dd86cfd827d830b9cf0b46444f210d78d1da0ce0908114bb6a8bfa2888bd7d7397ea7172854d4ec4a8c709e56ec74349a2115dfb4382ece38115a3147c2