rpms
/
NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrade to 1.32.4 release 

Resolves: RHBZ#1966123 RHBZ##1916192 RHBZ#1963854

Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
Gris Ge 2021-07-27 16:33:56 +08:00 committed by Gris Ge
parent 1254c71598
commit 8a786b0d3e
4 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -389,3 +389,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.31.5.tar.xz /NetworkManager-1.31.5.tar.xz
/NetworkManager-1.32.0.tar.xz /NetworkManager-1.32.0.tar.xz
/NetworkManager-1.32.2.tar.xz /NetworkManager-1.32.2.tar.xz
/NetworkManager-1.32.4.tar.xz

24
NetworkManager.conf
View File

@ -3,20 +3,18 @@
# See "man 5 NetworkManager.conf" for details. # See "man 5 NetworkManager.conf" for details.
# #
# The directories /usr/lib/NetworkManager/conf.d/ and /run/NetworkManager/conf.d/ # 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. # 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 # snippets. Those snippets are merged last and overwrite the settings from this main
# file. # file.
# #
# The files within one conf.d/ directory are read in asciibetical order. # 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 # You can prevent loading a file /usr/lib/NetworkManager/conf.d/NAME.conf
# /usr/lib/NetworkManager/conf.d/, the latter file is shadowed and thus ignored. # by having a file NAME.conf in either /run/NetworkManager/conf.d/ or /etc/NetworkManager/conf.d/.
# Hence, to disable loading a file from /usr/lib/NetworkManager/conf.d/ you can # Likewise, snippets from /run can be prevented from loading by placing
# put an empty file to /etc with the same name. The same applies with respect # a file with the same name in /etc/NetworkManager/conf.d/.
# to the directory /run/NetworkManager/conf.d where files in /run shadow
# /usr/lib and are themselves shadowed by files under /etc.
# #
# If two files define the same key, the one that is read afterwards will overwrite # If two files define the same key, the one that is read afterwards will overwrite
# the previous one. # the previous one.
@ -30,8 +28,7 @@
# #
# Logfiles contain no passwords and little sensitive information. But please # Logfiles contain no passwords and little sensitive information. But please
# check before posting the file online. You can also personally hand over the # 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. # logfile to a NM developer to treat it confidential. Meet us on #nm on Libera.Chat.
# Please post full logfiles except minimal modifications of private data.
# #
# You can also change the log-level at runtime via # You can also change the log-level at runtime via
# $ nmcli general logging level TRACE domains ALL # $ nmcli general logging level TRACE domains ALL
@ -42,9 +39,14 @@
# You will find the logfiles in syslog, for example via # You will find the logfiles in syslog, for example via
# $ journalctl -u NetworkManager # $ 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 # Note that debug logging of NetworkManager can be quite verbose. Some messages
# might be rate-limited by the logging daemon (see RateLimitIntervalSec, RateLimitBurst # 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 #level=TRACE
#domains=ALL #domains=ALL

36
NetworkManager.spec
View File

@ -5,8 +5,8 @@
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global epoch_version 1 %global epoch_version 1
%global rpm_version 1.32.2 %global rpm_version 1.32.4
%global real_version 1.32.2 %global real_version 1.32.4
%global release_version 1 %global release_version 1
%global snapshot %{nil} %global snapshot %{nil}
%global git_sha %{nil} %global git_sha %{nil}
@ -114,6 +114,14 @@
%global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d %global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
%endif %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} %if %{with bluetooth} || %{with wwan}
%global with_modem_manager_1 1 %global with_modem_manager_1 1
%else %else
@ -200,7 +208,9 @@ Requires(postun): systemd
Requires: dbus >= %{dbus_version} Requires: dbus >= %{dbus_version}
Requires: glib2 >= %{glib2_version} Requires: glib2 >= %{glib2_version}
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release} 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_device_plugins}
Obsoletes: NetworkManager < %{obsoletes_ppp_plugin} Obsoletes: NetworkManager < %{obsoletes_ppp_plugin}
Obsoletes: NetworkManager-wimax < 1.2 Obsoletes: NetworkManager-wimax < 1.2
@ -249,7 +259,6 @@ BuildRequires: gtk-doc
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: /usr/bin/valac BuildRequires: /usr/bin/valac
BuildRequires: iptables
BuildRequires: libxslt BuildRequires: libxslt
%if %{with bluetooth} %if %{with bluetooth}
BuildRequires: bluez-libs-devel BuildRequires: bluez-libs-devel
@ -325,7 +334,6 @@ Summary: ADSL device plugin for NetworkManager
Group: System Environment/Base Group: System Environment/Base
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: NetworkManager < %{obsoletes_device_plugins} Obsoletes: NetworkManager < %{obsoletes_device_plugins}
Obsoletes: NetworkManager-atm
%description adsl %description adsl
This package contains NetworkManager support for ADSL devices. This package contains NetworkManager support for ADSL devices.
@ -345,7 +353,6 @@ Requires: NetworkManager-wwan = %{epoch}:%{version}-%{release}
Requires: bluez >= 4.101-5 Requires: bluez >= 4.101-5
%endif %endif
Obsoletes: NetworkManager < %{obsoletes_device_plugins} Obsoletes: NetworkManager < %{obsoletes_device_plugins}
Obsoletes: NetworkManager-bt
%description bluetooth %description bluetooth
This package contains NetworkManager support for Bluetooth devices. This package contains NetworkManager support for Bluetooth devices.
@ -566,6 +573,8 @@ This tool is still experimental.
%if %{with test} %if %{with test}
--werror \ --werror \
%endif %endif
-Dnft=/usr/sbin/nft \
-Diptables=/usr/sbin/iptables \
-Ddhcpcanon=no \ -Ddhcpcanon=no \
-Ddhcpcd=no \ -Ddhcpcd=no \
-Dconfig_dhcp_default=%{dhcp_default} \ -Dconfig_dhcp_default=%{dhcp_default} \
@ -694,6 +703,8 @@ intltoolize --automake --copy --force
--with-runstatedir=%{_rundir} \ --with-runstatedir=%{_rundir} \
--disable-silent-rules \ --disable-silent-rules \
--disable-static \ --disable-static \
--with-nft=/usr/sbin/nft \
--with-iptables=/usr/sbin/iptables \
--with-dhclient=yes \ --with-dhclient=yes \
--with-dhcpcd=no \ --with-dhcpcd=no \
--with-dhcpcanon=no \ --with-dhcpcanon=no \
@ -1150,6 +1161,11 @@ fi
%changelog %changelog
* Tue Jul 27 2021 Gris Ge <fge@redhat.com> - 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 <wenliang@redhat.com> - 1:1.32.2-1 * Thu Jul 1 2021 Wen Liang <wenliang@redhat.com> - 1:1.32.2-1
- update to 1.32.2 release - update to 1.32.2 release
- dhcp/systemd: ignore FORCERENEW requests for DHCPV4 (rh #1966123, CVE-2020-13529) - 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 dbus-glib-devel BuildRequires for NetworkManager-glib-devel (rh #442978)
- Add PPP settings page to connection editor - Add PPP settings page to connection editor
- Fix a few crashes with PPPoE - 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 <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3571 * Thu Apr 17 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.2.svn3571
- Fix build in pppd-plugin - Fix build in pppd-plugin
@ -3355,7 +3371,7 @@ fi
* Fri Feb 2 2007 Christopher Aillon <caillon@redhat.com> - 1:0.6.5-0.2.cvs20061025 * Fri Feb 2 2007 Christopher Aillon <caillon@redhat.com> - 1:0.6.5-0.2.cvs20061025
- Move .so file to -devel package - Move .so file to -devel package
* Sat Nov 25 2006 Matthias Clasen <mclasen@redhat.com> * Sat Nov 25 2006 Matthias Clasen <mclasen@redhat.com>
- Own the /etc/NetworkManager/dispatcher.d directory - Own the /etc/NetworkManager/dispatcher.d directory
- Require pkgconfig for the -devel packages - Require pkgconfig for the -devel packages
- Fix compilation with dbus 1.0 - Fix compilation with dbus 1.0
@ -3433,7 +3449,7 @@ fi
(did he fire ten args, or only nine?) (did he fire ten args, or only nine?)
* Thu Apr 27 2006 Jeremy Katz <katzj@redhat.com> - 0.6.2-2.fc6 * Thu Apr 27 2006 Jeremy Katz <katzj@redhat.com> - 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 devices are properly detected even if the kill switch has been used
* Thu Mar 30 2006 Dan Williams <dcbw@redhat.com> - 0.6.2-1 * Thu Mar 30 2006 Dan Williams <dcbw@redhat.com> - 0.6.2-1
@ -3577,7 +3593,7 @@ fi
o Better caching of information in the applet (Bill Moss) o Better caching of information in the applet (Bill Moss)
o Generate automatic suggested Ad-Hoc network name from machine's hostname o Generate automatic suggested Ad-Hoc network name from machine's hostname
(Robert Love) (Robert Love)
o Update all network information on successfull connect, not just o Update all network information on successfull connect, not just
authentication method authentication method
* Fri Jul 29 2005 Ray Strode <rstrode@redhat.com> - 0.4-34.cvs20050729 * Fri Jul 29 2005 Ray Strode <rstrode@redhat.com> - 0.4-34.cvs20050729

2
sources
View File

@ -1 +1 @@
SHA512 (NetworkManager-1.32.2.tar.xz) = 9c7891a1106ebf333344818d29810ae182b284d1966760ec79bafa0618378a5ca68d58ec941357328ae8d4a43473f3916d62e4cfa316a46532773326312c0cc1 SHA512 (NetworkManager-1.32.4.tar.xz) = 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684