Upgrade to 1.35.6 (development)

Resolves: #2022418
Resolves: #1980387

.gitignore

@@ -398,3 +398,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.35.2.tar.xz
 /NetworkManager-1.35.3.tar.xz
 /NetworkManager-1.35.4.tar.xz
+/NetworkManager-1.35.6.tar.xz

NetworkManager.spec

@@ -6,13 +6,14 @@
 
 %global epoch_version 1
 %global rpm_version 1.36.0
-%global real_version 1.35.4
-%global release_version 0.5
+%global real_version 1.35.6
+%global release_version 0.6
 %global snapshot %{nil}
 %global git_sha %{nil}
 
-%global obsoletes_device_plugins 1:0.9.9.95-1
-%global obsoletes_ppp_plugin     1:1.5.3
+%global obsoletes_device_plugins     1:0.9.9.95-1
+%global obsoletes_ppp_plugin         1:1.5.3
+%global obsoletes_initscripts_updown 1:1.36.0-0.6
 
 %global systemd_dir %{_prefix}/lib/systemd/system
 %global sysctl_dir %{_prefix}/lib/sysctl.d
@@ -211,6 +212,10 @@ Requires: libndp >= %{libndp_version}
 Obsoletes: NetworkManager < %{obsoletes_device_plugins}
 Obsoletes: NetworkManager < %{obsoletes_ppp_plugin}
 Obsoletes: NetworkManager-wimax < 1.2
+%if 0%{?rhel} && 0%{?rhel} == 8
+Suggests: NetworkManager-initscripts-updown
+%endif
+Obsoletes: NetworkManager < %{obsoletes_initscripts_updown}
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # Kept for RHEL to ensure that wired 802.1x works out of the box
@@ -558,6 +563,20 @@ This tool is still experimental.
 %endif
 
 
+%package initscripts-updown
+Summary: Legacy ifup/ifdown scripts for NetworkManager that replace initscripts (network-scripts)
+Group: System Environment/Base
+BuildArch: noarch
+Requires: NetworkManager
+Requires: /usr/bin/nmcli
+Obsoletes: NetworkManager < %{obsoletes_initscripts_updown}
+
+%description initscripts-updown
+Installs alternative ifup/ifdown scripts that talk to NetworkManager.
+This is only for backward compatibility with initscripts (network-scripts).
+Preferably use nmcli instead.
+
+
 %prep
 %autosetup -p1 -n NetworkManager-%{real_version}
 
@@ -871,7 +890,8 @@ mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}
 cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}
 %endif
 
-touch %{buildroot}%{_sbindir}/ifup %{buildroot}%{_sbindir}/ifdown
+touch %{buildroot}%{_sbindir}/ifup
+touch %{buildroot}%{_sbindir}/ifdown
 
 
 %check
@@ -914,7 +934,8 @@ fi
 
 %systemd_post %{systemd_units}
 
-%triggerin -- initscripts
+
+%post initscripts-updown
 if [ -f %{_sbindir}/ifup -a ! -L %{_sbindir}/ifup ]; then
     # initscripts package too old, won't let us set an alternative
     /usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
@@ -937,12 +958,16 @@ if [ $1 -eq 0 ]; then
 
     # Don't kill networking entirely just on package remove
     #/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
-
-    /usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
 fi
 %systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
 
 
+%preun initscripts-updown
+if [ $1 -eq 0 ]; then
+    /usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
+fi
+
+
 %if %{with nm_cloud_setup}
 %preun cloud-setup
 %systemd_preun %{systemd_units_cloud_setup}
@@ -991,10 +1016,6 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
 %ghost %{_sysconfdir}/%{name}/VPN
 %{_bindir}/nm-online
-%{_libexecdir}/nm-ifup
-%ghost %attr(755, root, root) %{_sbindir}/ifup
-%{_libexecdir}/nm-ifdown
-%ghost %attr(755, root, root) %{_sbindir}/ifdown
 %{_libexecdir}/nm-dhcp-helper
 %{_libexecdir}/nm-dispatcher
 %{_libexecdir}/nm-initrd-generator
@@ -1160,7 +1181,22 @@ fi
 %endif
 
 
+%files initscripts-updown
+%{_libexecdir}/nm-ifup
+%ghost %attr(755, root, root) %{_sbindir}/ifup
+%{_libexecdir}/nm-ifdown
+%ghost %attr(755, root, root) %{_sbindir}/ifdown
+
+
 %changelog
+* Wed Jan 26 2022 Thomas Haller <thaller@redhat.com> - 1:1.36.0-0.6
+- Upgrade to 1.35.6 release (development)
+- Move ifup/ifdown scripts to new NetworkManager-initscripts-updown package (rh #2022418)
+- wwan: fix assertion failure in modem/ppp code (rh #2028385)
+- core: fix performance regression with 500vlans test (rh #2028849)
+- core: drop defective BPF filter for netlink sockets that caused hangs (rh #2037411)
+- initrd: add support for rd.znet_ifnames (rh #1980387)
+
 * Thu Jan 20 2022 Thomas Haller <thaller@redhat.com> - 1:1.36.0-0.5
 - generate docs during build instead of using pre-generated (rh #2042875)
 

sources

@@ -1 +1 @@
-SHA512 (NetworkManager-1.35.4.tar.xz) = 16c57dd86cfd827d830b9cf0b46444f210d78d1da0ce0908114bb6a8bfa2888bd7d7397ea7172854d4ec4a8c709e56ec74349a2115dfb4382ece38115a3147c2
+SHA512 (NetworkManager-1.35.6.tar.xz) = e905b45b43780ffc6bd60df9b077d28c3102762c9cc5a21fbe00a2cdfee37e5e7504ac8d9c2d60a0717df37016c4a3b53bb082b605a6af02b2b6dea72e015185