diff --git a/.gitignore b/.gitignore index da30031..e737291 100644 --- a/.gitignore +++ b/.gitignore @@ -389,3 +389,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.31.2.tar.xz /NetworkManager-1.31.3.tar.xz /NetworkManager-1.31.4.tar.xz +/NetworkManager-1.31.90.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 92c7eee..eb38d44 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -6,8 +6,8 @@ %global epoch_version 1 %global rpm_version 1.32.0 -%global real_version 1.31.4 -%global release_version 0.3 +%global real_version 1.31.90 +%global release_version 0.4 %global snapshot %{nil} %global git_sha %{nil} @@ -105,7 +105,7 @@ ############################################################################### -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %global dbus_version 1.9.18 %global dbus_sys_dir %{_datadir}/dbus-1/system.d %else @@ -113,6 +113,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 @@ -188,7 +196,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 @@ -237,7 +247,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 @@ -295,7 +304,7 @@ Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release} # that the scripts that would parse the SPEC file naively would be unlikely # to fail. Refer to git log for the real date and commit number of last # synchronization: -# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commits/master/src/systemd +# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commits/main/src/ Provides: bundled(systemd) = 0 @@ -313,7 +322,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. @@ -333,7 +341,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. @@ -438,7 +445,7 @@ This package contains NetworkManager support for PPP. %package libnm Summary: Libraries for adding NetworkManager support to applications. Group: Development/Libraries -Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release} +Conflicts: NetworkManager-glib < 1:1.31.0 License: LGPLv2+ %description libnm @@ -506,7 +513,7 @@ Summary: NetworkManager dispatcher file for advanced routing rules Group: System Environment/Base BuildArch: noarch Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release} +Obsoletes: %{name}-config-routing-rules < 1:1.31.0 %description dispatcher-routing-rules This adds a NetworkManager dispatcher file to support networking @@ -554,6 +561,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} \ @@ -682,6 +691,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 \ @@ -968,6 +979,7 @@ fi %dir %{_sysconfdir}/%{name}/dnsmasq-shared.d %dir %{_sysconfdir}/%{name}/system-connections %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf +%ghost %{_sysconfdir}/%{name}/VPN %{_bindir}/nm-online %{_libexecdir}/nm-ifup %ghost %attr(755, root, root) %{_sbindir}/ifup @@ -1136,6 +1148,9 @@ fi %changelog +* Fri Jun 4 2021 Thomas Haller - 1:1.32.0-0.4 +- update to 1.32-rc1 (1.31.90) (release candidate) + * Wed May 5 2021 Beniamino Galvani - 1:1.32.0-0.3 - update to an early 1.32 snapshot (1.31.4) diff --git a/sources b/sources index fd3e14e..4d50b6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.31.4.tar.xz) = b927501ea584f812c211f058fc7ea4fe2393c31ef4c181541e897d9077b8e583ea59efa6746c648f0c711e4ce80ceea0c6d70d10da39eb4ab52ec94ab39ca1ef +SHA512 (NetworkManager-1.31.90.tar.xz) = 8ee41e6184fee68feae98d5cd941abd10bf5a633e3142328587a7883aed435463f165f52582f6e331b1aad0799653aca225e16c8a61b43de77cf053c3c495f5c