From ea8506b16e1e053d141677ffcdcf0ee680d46b73 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 08 2022 10:10:13 +0000
Subject: import NetworkManager-1.39.6-1.el8


---

diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata
index 4b737a4..6ae759e 100644
--- a/.NetworkManager.metadata
+++ b/.NetworkManager.metadata
@@ -1 +1 @@
-8ad097ff1b6e7e8039d4df3996375332379bbc2b SOURCES/NetworkManager-1.39.5.tar.xz
+dc601aff6188543309e25596a79f74c5339482ee SOURCES/NetworkManager-1.39.6.tar.xz
diff --git a/.gitignore b/.gitignore
index ffc9fc1..c5e3ce1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/NetworkManager-1.39.5.tar.xz
+SOURCES/NetworkManager-1.39.6.tar.xz
diff --git a/SOURCES/readme-ifcfg-rh.txt b/SOURCES/readme-ifcfg-rh.txt
new file mode 100644
index 0000000..b69a681
--- /dev/null
+++ b/SOURCES/readme-ifcfg-rh.txt
@@ -0,0 +1,31 @@
+NetworkManager stores new network profiles in keyfile format in the
+/etc/NetworkManager/system-connections/ directory.
+
+Previously, NetworkManager stored network profiles in ifcfg format
+in this directory (/etc/sysconfig/network-scripts/). However, the ifcfg
+format is deprecated. By default, NetworkManager no longer creates
+new profiles in this format.
+
+Connection profiles in keyfile format have many benefits. For example,
+this format is INI file-based and can easily be parsed and generated.
+
+Each section in NetworkManager keyfiles corresponds to a NetworkManager
+setting name as described in the nm-settings(5) and nm-settings-keyfile(5)
+man pages. Each key-value-pair in a section is one of the properties
+listed in the settings specification of the man page.
+
+If you still use network profiles in ifcfg format, consider migrating
+them to keyfile format. To migrate all profiles at once, enter:
+
+# nmcli connection migrate
+
+This command migrates all profiles from ifcfg format to keyfile
+format and stores them in /etc/NetworkManager/system-connections/.
+
+Alternatively, to migrate only a specific profile, enter:
+
+# nmcli connection migrate <profile_name|UUID|D-Bus_path>
+
+For further details, see:
+* nm-settings-keyfile(5)
+* nmcli(1)
diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec
index 973d5ca..22b33cc 100644
--- a/SPECS/NetworkManager.spec
+++ b/SPECS/NetworkManager.spec
@@ -5,7 +5,7 @@
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 
 %global epoch_version 1
-%global real_version 1.39.5
+%global real_version 1.39.6
 %global rpm_version %{real_version}
 %global release_version 1
 %global snapshot %{nil}
@@ -157,6 +157,12 @@
 %global split_ifcfg_rh 0
 %endif
 
+%if 0%{?rhel} > 8 || 0%{?fedora} > 35
+%global ifcfg_warning 1
+%else
+%global ifcfg_warning 0
+%endif
+
 %if 0%{?fedora}
 # Although eBPF would be available on Fedora's kernel, it seems
 # we often get SELinux denials (rh#1651654). But even aside them,
@@ -190,6 +196,7 @@ Source2: 00-server.conf
 Source4: 20-connectivity-fedora.conf
 Source5: 20-connectivity-redhat.conf
 Source6: 70-nm-connectivity.conf
+Source7: readme-ifcfg-rh.txt
 
 # RHEL downstream patches that change behavior from upstream.
 # These are not bugfixes, hence they are also relevant after
@@ -899,6 +906,10 @@ mkdir -p %{buildroot}%{_sysctldir}
 cp %{SOURCE6} %{buildroot}%{_sysctldir}
 %endif
 
+%if 0%{?ifcfg_warning}
+cp %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
+%endif
+
 cp examples/dispatcher/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/
 ln -s ../no-wait.d/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/pre-up.d/
 ln -s ../10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/no-wait.d/
@@ -1074,9 +1085,7 @@ fi
 %{_mandir}/man8/NetworkManager-dispatcher.8.gz
 %{_mandir}/man8/NetworkManager-wait-online.service.8.gz
 %dir %{_localstatedir}/lib/NetworkManager
-%if 0%{?split_ifcfg_rh} == 0
 %dir %{_sysconfdir}/sysconfig/network-scripts
-%endif
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service
 %{_datadir}/polkit-1/actions/*.policy
@@ -1091,6 +1100,9 @@ fi
 %exclude %{_unitdir}/nm-priv-helper.service
 %dir %{_datadir}/doc/NetworkManager/examples
 %{_datadir}/doc/NetworkManager/examples/server.conf
+%if 0%{?ifcfg_warning}
+%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
+%endif
 %doc NEWS AUTHORS README.md CONTRIBUTING.md
 %license COPYING
 %license COPYING.LGPL
@@ -1206,7 +1218,6 @@ fi
 
 %if 0%{?split_ifcfg_rh}
 %files initscripts-ifcfg-rh
-%dir %{_sysconfdir}/sysconfig/network-scripts
 %{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so
 %{dbus_sys_dir}/nm-ifcfg-rh.conf
 %endif
@@ -1231,6 +1242,10 @@ fi
 
 
 %changelog
+* Wed Jun  1 2022 Beniamino Galvani <bgalvani@redhat.com> - 1:1.39.6-1
+- Update to 1.39.6 release (development)
+- Implement ACD (address conflict detection) for DHCPv4 (rh #1713380)
+
 * Thu May 19 2022 Ana Cabral <acabral@redhat.com> - 1:1.39.5-1
 - Update to 1.39.5 release (development)
 - device: commit l3cfg on link change only when the device is activating (rh #2079054)