From e02beef3cb055149aac31c1c7e032152dd7117a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20V=C3=A1clav?= <jvaclav@redhat.com>
Date: Thu, 14 Dec 2023 12:02:06 +0100
Subject: [PATCH] Update to 1.45.9 release (development)

Related: RHEL-2404
Resolves: RHEL-1682
Resolves: RHEL-5852
Resolves: RHEL-19315
Resolves: RHEL-19437
---
 .gitignore            |  1 +
 22-wifi-mac-addr.conf | 31 +++++++++++++++++++++++++++++++
 NetworkManager.spec   | 29 ++++++++++++++++++++++-------
 sources               |  2 +-
 4 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 22-wifi-mac-addr.conf

diff --git a/.gitignore b/.gitignore
index 9714242..10ef5ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -446,3 +446,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.45.6.tar.xz
 /NetworkManager-1.45.7.tar.xz
 /NetworkManager-1.45.8.tar.xz
+/NetworkManager-1.45.9.tar.xz
diff --git a/22-wifi-mac-addr.conf b/22-wifi-mac-addr.conf
new file mode 100644
index 0000000..2e329c8
--- /dev/null
+++ b/22-wifi-mac-addr.conf
@@ -0,0 +1,31 @@
+# This sets defaults for Wi-Fi profiles to set a generated, stable MAC address.
+#
+# Do not modify this file. You can hide/overwrite this file by placing a file
+# to "/etc/NetworkManager/conf.d/22-wifi-mac-addr.conf". You can also add
+# configuration snippets with higher priority that override this setting (see
+# `man 5 NetworkManager.conf`). Most importantly, this snippet only sets
+# default values for the profile. You can explicitly set the value for each
+# profile, so that this default value is not used.
+#
+# For example, on a particular profile/network set
+#
+#   $ nmcli connection modify "$PROFILE" wifi.cloned-mac-address permanent
+#
+# to use the hardware MAC address. This prevents the default from this file
+# to take effect.
+#
+# Or
+#
+#   $ nmcli connection modify "$PROFILE" wifi.cloned-mac-address stable connection.stable-id '${NETWORK_SSID}/${BOOT}'
+#
+# to get a generated MAC address that changes on each boot. Note how setting
+# "connection.stable-id" also affects other aspects of the profile.
+#
+# See `man 5 nm-settings` for "wifi.cloned-mac-address" and "connection.stable-id".
+
+[connection.22-wifi-mac-addr]
+match-device=type:wifi
+wifi.cloned-mac-address=stable-ssid
+
+[.config]
+enable=nm-version-min:1.45
diff --git a/NetworkManager.spec b/NetworkManager.spec
index dcaaa71..19c6fbb 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -4,7 +4,7 @@
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 
 %global epoch_version 1
-%global real_version 1.45.8
+%global real_version 1.45.9
 %global rpm_version %{real_version}
 %global release_version 1
 %global snapshot %{nil}
@@ -199,9 +199,10 @@ Source1: NetworkManager.conf
 Source2: 00-server.conf
 Source4: 20-connectivity-fedora.conf
 Source5: 20-connectivity-redhat.conf
-Source6: 70-nm-connectivity.conf
-Source7: readme-ifcfg-rh.txt
-Source8: readme-ifcfg-rh-migrated.txt
+Source6: 22-wifi-mac-addr.conf
+Source7: 70-nm-connectivity.conf
+Source8: readme-ifcfg-rh.txt
+Source9: readme-ifcfg-rh-migrated.txt
 
 # RHEL downstream patches that change behavior from upstream.
 # These are not bugfixes, hence they are also relevant after
@@ -914,14 +915,18 @@ cp %{SOURCE4} %{buildroot}%{nmlibdir}/conf.d/
 %if %{with connectivity_redhat}
 cp %{SOURCE5} %{buildroot}%{nmlibdir}/conf.d/
 mkdir -p %{buildroot}%{_sysctldir}
-cp %{SOURCE6} %{buildroot}%{_sysctldir}
+cp %{SOURCE7} %{buildroot}%{_sysctldir}
+%endif
+
+%if 0%{?fedora} >= 40
+cp %{SOURCE6} %{buildroot}%{nmlibdir}/conf.d/
 %endif
 
 %if 0%{?ifcfg_warning}
-cp %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
+cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
 %endif
 %if 0%{?ifcfg_migrate}
-cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
+cp %{SOURCE9} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
 %endif
 
 cp examples/dispatcher/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/
@@ -1068,6 +1073,9 @@ fi
 %dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
 %dir %{_sysconfdir}/%{name}/system-connections
 %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
+%if 0%{?fedora} >= 40
+%{nmlibdir}/conf.d/22-wifi-mac-addr.conf
+%endif
 %ghost %{_sysconfdir}/%{name}/VPN
 %{_bindir}/nm-online
 %{_libexecdir}/nm-dhcp-helper
@@ -1257,6 +1265,13 @@ fi
 
 
 %changelog
+* Thu Dec 14 2023 Ján Václav <jvaclav@redhat.com> - 1.45.9-1
+- Update to 1.45.9 (development)
+- Add support for PRP/HSR interface (RHEL-5852)
+- Drop support for the 'slaves-order' option in NetworkManager.conf (RHEL-19437)
+- Return error when setting invalid IP addresses or properties via D-Bus (RHEL-19315)
+- Fix extra route being created besides ECMP route (RHEL-1682)
+
 * Wed Nov 29 2023 Beniamino Galvani <bgalvani@redhat.com> - 1.45.8-1
 - Update to 1.45.8 (development)
 - Introduce "stable-ssid" option for wifi.cloned-mac-address property (RHEL-16470)
diff --git a/sources b/sources
index 806dfea..d1d3ffb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.45.8.tar.xz) = 2857946906885062d56f92fac4bcb62932b6500612b809e83cafd752c9740d211b66a83860bdedda8aa01b6a63763c331af8df8427167f955a4bb8d8e0066d47
+SHA512 (NetworkManager-1.45.9.tar.xz) = 33e4f8504ed4b94acc2a98d66fe6abb5bd3a99b8a473a92b7dd5a9cc1affc87ccd4f2c0214c213985df4b7649bf2c76afe2ed991daf42ad9f16f729171f25c85