From 8a786b0d3ed7562d967af80a27368757170038cb Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Tue, 27 Jul 2021 16:33:56 +0800 Subject: [PATCH] Upgrade to 1.32.4 release Resolves: RHBZ#1966123 RHBZ##1916192 RHBZ#1963854 Signed-off-by: Gris Ge --- .gitignore | 1 + NetworkManager.conf | 24 +++++++++++++----------- NetworkManager.spec | 36 ++++++++++++++++++++++++++---------- sources | 2 +- 4 files changed, 41 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index c1642ef..825d14e 100644 --- a/.gitignore +++ b/.gitignore @@ -389,3 +389,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.31.5.tar.xz /NetworkManager-1.32.0.tar.xz /NetworkManager-1.32.2.tar.xz +/NetworkManager-1.32.4.tar.xz diff --git a/NetworkManager.conf b/NetworkManager.conf index b362fd0..287c9d0 100644 --- a/NetworkManager.conf +++ b/NetworkManager.conf @@ -3,20 +3,18 @@ # See "man 5 NetworkManager.conf" for details. # # The directories /usr/lib/NetworkManager/conf.d/ and /run/NetworkManager/conf.d/ -# can contain additional configuration snippets installed by packages. These files are +# can contain additional .conf snippets installed by packages. These files are # read before NetworkManager.conf and have thus lowest priority. -# The directory /etc/NetworkManager/conf.d/ can contain additional configuration +# The directory /etc/NetworkManager/conf.d/ can contain additional .conf # snippets. Those snippets are merged last and overwrite the settings from this main # file. # # The files within one conf.d/ directory are read in asciibetical order. # -# If /etc/NetworkManager/conf.d/ contains a file with the same name as -# /usr/lib/NetworkManager/conf.d/, the latter file is shadowed and thus ignored. -# Hence, to disable loading a file from /usr/lib/NetworkManager/conf.d/ you can -# put an empty file to /etc with the same name. The same applies with respect -# to the directory /run/NetworkManager/conf.d where files in /run shadow -# /usr/lib and are themselves shadowed by files under /etc. +# You can prevent loading a file /usr/lib/NetworkManager/conf.d/NAME.conf +# by having a file NAME.conf in either /run/NetworkManager/conf.d/ or /etc/NetworkManager/conf.d/. +# Likewise, snippets from /run can be prevented from loading by placing +# a file with the same name in /etc/NetworkManager/conf.d/. # # If two files define the same key, the one that is read afterwards will overwrite # the previous one. @@ -30,8 +28,7 @@ # # Logfiles contain no passwords and little sensitive information. But please # check before posting the file online. You can also personally hand over the -# logfile to a NM developer to treat it confidential. Meet us on #nm on freenode. -# Please post full logfiles except minimal modifications of private data. +# logfile to a NM developer to treat it confidential. Meet us on #nm on Libera.Chat. # # You can also change the log-level at runtime via # $ nmcli general logging level TRACE domains ALL @@ -42,9 +39,14 @@ # You will find the logfiles in syslog, for example via # $ journalctl -u NetworkManager # +# Please post full logfiles for bug reports without pre-filtering or truncation. +# Also, for debugging the entire `journalctl` output can be interesting. Don't +# limit unnecessarily with `journalctl -u`. Exceptions are if you are worried +# about private data. Check before posting logfiles! +# # Note that debug logging of NetworkManager can be quite verbose. Some messages # might be rate-limited by the logging daemon (see RateLimitIntervalSec, RateLimitBurst -# in man journald.conf). Please disable rate-limiting before collecting debug logs. +# in man journald.conf). Please disable rate-limiting before collecting debug logs! # #level=TRACE #domains=ALL diff --git a/NetworkManager.spec b/NetworkManager.spec index 67076dc..ca5f753 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -5,8 +5,8 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global rpm_version 1.32.2 -%global real_version 1.32.2 +%global rpm_version 1.32.4 +%global real_version 1.32.4 %global release_version 1 %global snapshot %{nil} %global git_sha %{nil} @@ -114,6 +114,14 @@ %global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d %endif +# Older libndp versions use select() (rh#1933041). On well known distros, +# choose a version that has the necessary fix. +%if 0%{?rhel} && 0%{?rhel} == 8 +%global libndp_version 1.7-4 +%else +%global libndp_version %{nil} +%endif + %if %{with bluetooth} || %{with wwan} %global with_modem_manager_1 1 %else @@ -200,7 +208,9 @@ Requires(postun): systemd Requires: dbus >= %{dbus_version} Requires: glib2 >= %{glib2_version} Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: dhcdbd +%if "%{libndp_version}" != "" +Requires: libndp >= %{libndp_version} +%endif Obsoletes: NetworkManager < %{obsoletes_device_plugins} Obsoletes: NetworkManager < %{obsoletes_ppp_plugin} Obsoletes: NetworkManager-wimax < 1.2 @@ -249,7 +259,6 @@ BuildRequires: gtk-doc BuildRequires: libudev-devel BuildRequires: libuuid-devel BuildRequires: /usr/bin/valac -BuildRequires: iptables BuildRequires: libxslt %if %{with bluetooth} BuildRequires: bluez-libs-devel @@ -325,7 +334,6 @@ Summary: ADSL device plugin for NetworkManager Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: NetworkManager < %{obsoletes_device_plugins} -Obsoletes: NetworkManager-atm %description adsl This package contains NetworkManager support for ADSL devices. @@ -345,7 +353,6 @@ Requires: NetworkManager-wwan = %{epoch}:%{version}-%{release} Requires: bluez >= 4.101-5 %endif Obsoletes: NetworkManager < %{obsoletes_device_plugins} -Obsoletes: NetworkManager-bt %description bluetooth This package contains NetworkManager support for Bluetooth devices. @@ -566,6 +573,8 @@ This tool is still experimental. %if %{with test} --werror \ %endif + -Dnft=/usr/sbin/nft \ + -Diptables=/usr/sbin/iptables \ -Ddhcpcanon=no \ -Ddhcpcd=no \ -Dconfig_dhcp_default=%{dhcp_default} \ @@ -694,6 +703,8 @@ intltoolize --automake --copy --force --with-runstatedir=%{_rundir} \ --disable-silent-rules \ --disable-static \ + --with-nft=/usr/sbin/nft \ + --with-iptables=/usr/sbin/iptables \ --with-dhclient=yes \ --with-dhcpcd=no \ --with-dhcpcanon=no \ @@ -1150,6 +1161,11 @@ fi %changelog +* Tue Jul 27 2021 Gris Ge - 1:1.32.4-1 +- Upgrade to 1.32.4 release +- core/wwan: avoid assertion failure in modem_ip{4,6}_config_result() (rh #1916192) +- bond: support the peer_notif_delay option (rh #1963854) + * Thu Jul 1 2021 Wen Liang - 1:1.32.2-1 - update to 1.32.2 release - dhcp/systemd: ignore FORCERENEW requests for DHCPV4 (rh #1966123, CVE-2020-13529) @@ -3024,7 +3040,7 @@ fi - Add dbus-glib-devel BuildRequires for NetworkManager-glib-devel (rh #442978) - Add PPP settings page to connection editor - Fix a few crashes with PPPoE -- Fix active connection state changes that confused clients +- Fix active connection state changes that confused clients * Thu Apr 17 2008 Dan Williams - 1:0.7.0-0.9.2.svn3571 - Fix build in pppd-plugin @@ -3355,7 +3371,7 @@ fi * Fri Feb 2 2007 Christopher Aillon - 1:0.6.5-0.2.cvs20061025 - Move .so file to -devel package -* Sat Nov 25 2006 Matthias Clasen +* Sat Nov 25 2006 Matthias Clasen - Own the /etc/NetworkManager/dispatcher.d directory - Require pkgconfig for the -devel packages - Fix compilation with dbus 1.0 @@ -3433,7 +3449,7 @@ fi (did he fire ten args, or only nine?) * Thu Apr 27 2006 Jeremy Katz - 0.6.2-2.fc6 -- use the hal device type instead of poking via ioctl so that wireless +- use the hal device type instead of poking via ioctl so that wireless devices are properly detected even if the kill switch has been used * Thu Mar 30 2006 Dan Williams - 0.6.2-1 @@ -3577,7 +3593,7 @@ fi o Better caching of information in the applet (Bill Moss) o Generate automatic suggested Ad-Hoc network name from machine's hostname (Robert Love) - o Update all network information on successfull connect, not just + o Update all network information on successfull connect, not just authentication method * Fri Jul 29 2005 Ray Strode - 0.4-34.cvs20050729 diff --git a/sources b/sources index 0925f76..fcbf8ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.32.2.tar.xz) = 9c7891a1106ebf333344818d29810ae182b284d1966760ec79bafa0618378a5ca68d58ec941357328ae8d4a43473f3916d62e4cfa316a46532773326312c0cc1 +SHA512 (NetworkManager-1.32.4.tar.xz) = 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684