|
|
|
@ -4,12 +4,13 @@
@@ -4,12 +4,13 @@
|
|
|
|
|
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) |
|
|
|
|
|
|
|
|
|
%global epoch_version 1 |
|
|
|
|
%global real_version 1.40.0 |
|
|
|
|
%global real_version 1.42.2 |
|
|
|
|
%global rpm_version %{real_version} |
|
|
|
|
%global release_version 1 |
|
|
|
|
%global snapshot %{nil} |
|
|
|
|
%global git_sha %{nil} |
|
|
|
|
%global bcond_default_debug 0 |
|
|
|
|
%global bcond_default_lto %{nil} |
|
|
|
|
%global bcond_default_test 0 |
|
|
|
|
|
|
|
|
|
%global obsoletes_device_plugins 1:0.9.9.95-1 |
|
|
|
@ -60,11 +61,19 @@
@@ -60,11 +61,19 @@
|
|
|
|
|
%else |
|
|
|
|
%bcond_with test |
|
|
|
|
%endif |
|
|
|
|
%if "%{?bcond_default_lto}" == "" |
|
|
|
|
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 |
|
|
|
|
%bcond_without lto |
|
|
|
|
%else |
|
|
|
|
%bcond_with lto |
|
|
|
|
%endif |
|
|
|
|
%else |
|
|
|
|
%if %{bcond_default_lto} |
|
|
|
|
%bcond_without lto |
|
|
|
|
%else |
|
|
|
|
%bcond_with lto |
|
|
|
|
%endif |
|
|
|
|
%endif |
|
|
|
|
%bcond_with sanitizer |
|
|
|
|
%if 0%{?fedora} |
|
|
|
|
%bcond_without connectivity_fedora |
|
|
|
@ -72,9 +81,9 @@
@@ -72,9 +81,9 @@
|
|
|
|
|
%bcond_with connectivity_fedora |
|
|
|
|
%endif |
|
|
|
|
%if 0%{?rhel} && 0%{?rhel} >= 8 |
|
|
|
|
%bcond_without connectivity_redhat |
|
|
|
|
%bcond_without connectivity_powerel |
|
|
|
|
%else |
|
|
|
|
%bcond_with connectivity_redhat |
|
|
|
|
%bcond_with connectivity_powerel |
|
|
|
|
%endif |
|
|
|
|
%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 |
|
|
|
|
%bcond_without crypto_gnutls |
|
|
|
@ -183,7 +192,7 @@ Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/
@@ -183,7 +192,7 @@ Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/
|
|
|
|
|
Source1: NetworkManager.conf |
|
|
|
|
Source2: 00-server.conf |
|
|
|
|
Source4: 20-connectivity-fedora.conf |
|
|
|
|
Source5: 20-connectivity-redhat.conf |
|
|
|
|
Source5: 20-connectivity-powerel.conf |
|
|
|
|
Source6: 70-nm-connectivity.conf |
|
|
|
|
Source7: readme-ifcfg-rh.txt |
|
|
|
|
|
|
|
|
@ -255,7 +264,6 @@ BuildRequires: gnutls-devel >= 2.12
@@ -255,7 +264,6 @@ BuildRequires: gnutls-devel >= 2.12
|
|
|
|
|
%else |
|
|
|
|
BuildRequires: nss-devel >= 3.11.7 |
|
|
|
|
%endif |
|
|
|
|
BuildRequires: dhclient |
|
|
|
|
BuildRequires: readline-devel |
|
|
|
|
BuildRequires: audit-libs-devel |
|
|
|
|
%if %{with regen_docs} |
|
|
|
@ -294,6 +302,10 @@ BuildRequires: python2
@@ -294,6 +302,10 @@ BuildRequires: python2
|
|
|
|
|
BuildRequires: pygobject3-base |
|
|
|
|
BuildRequires: dbus-python |
|
|
|
|
BuildRequires: pexpect |
|
|
|
|
%if 0%{?rhel} >= 7 && %{with meson} |
|
|
|
|
BuildRequires: python36-dbus |
|
|
|
|
BuildRequires: python36-gobject |
|
|
|
|
%endif |
|
|
|
|
%endif |
|
|
|
|
BuildRequires: libselinux-devel |
|
|
|
|
BuildRequires: polkit-devel |
|
|
|
@ -498,14 +510,14 @@ via Fedora infrastructure.
@@ -498,14 +510,14 @@ via Fedora infrastructure.
|
|
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with connectivity_redhat} |
|
|
|
|
%package config-connectivity-redhat |
|
|
|
|
%if %{with connectivity_powerel} |
|
|
|
|
%package config-connectivity-powerel |
|
|
|
|
Summary: NetworkManager config file for connectivity checking via Red Hat servers |
|
|
|
|
Group: System Environment/Base |
|
|
|
|
BuildArch: noarch |
|
|
|
|
Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release} |
|
|
|
|
|
|
|
|
|
%description config-connectivity-redhat |
|
|
|
|
%description config-connectivity-powerel |
|
|
|
|
This adds a NetworkManager configuration file to enable connectivity checking |
|
|
|
|
via Red Hat infrastructure. |
|
|
|
|
%endif |
|
|
|
@ -610,8 +622,9 @@ Preferably use nmcli instead.
@@ -610,8 +622,9 @@ Preferably use nmcli instead.
|
|
|
|
|
%if %{with test} |
|
|
|
|
--werror \ |
|
|
|
|
%endif |
|
|
|
|
-Dnft=/usr/sbin/nft \ |
|
|
|
|
-Diptables=/usr/sbin/iptables \ |
|
|
|
|
-Dnft=%{_sbindir}/nft \ |
|
|
|
|
-Diptables=%{_sbindir}/iptables \ |
|
|
|
|
-Ddhclient=%{_sbindir}/dhclient \ |
|
|
|
|
-Ddhcpcanon=no \ |
|
|
|
|
-Ddhcpcd=no \ |
|
|
|
|
-Dconfig_dhcp_default=%{dhcp_default} \ |
|
|
|
@ -676,6 +689,7 @@ Preferably use nmcli instead.
@@ -676,6 +689,7 @@ Preferably use nmcli instead.
|
|
|
|
|
%else |
|
|
|
|
-Ddocs=false \ |
|
|
|
|
%endif |
|
|
|
|
-Dqt=false \ |
|
|
|
|
%if %{with team} |
|
|
|
|
-Dteamdctl=true \ |
|
|
|
|
%else |
|
|
|
@ -703,6 +717,7 @@ Preferably use nmcli instead.
@@ -703,6 +717,7 @@ Preferably use nmcli instead.
|
|
|
|
|
%endif |
|
|
|
|
-Dsession_tracking=systemd \ |
|
|
|
|
-Dsuspend_resume=systemd \ |
|
|
|
|
-Dsystemdsystemunitdir=%{_unitdir} \ |
|
|
|
|
-Dsystem_ca_path=/etc/pki/tls/cert.pem \ |
|
|
|
|
-Ddbus_conf_dir=%{dbus_sys_dir} \ |
|
|
|
|
-Dtests=yes \ |
|
|
|
@ -710,8 +725,11 @@ Preferably use nmcli instead.
@@ -710,8 +725,11 @@ Preferably use nmcli instead.
|
|
|
|
|
-Difcfg_rh=true \ |
|
|
|
|
-Difupdown=false \ |
|
|
|
|
%if %{with ppp} |
|
|
|
|
-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \ |
|
|
|
|
-Dpppd_plugin_dir="%{_libdir}/pppd/%{ppp_version}" \ |
|
|
|
|
-Dpppd="%{_sbindir}/pppd" \ |
|
|
|
|
-Dppp=true \ |
|
|
|
|
%else |
|
|
|
|
-Dppp=false \ |
|
|
|
|
%endif |
|
|
|
|
%if %{with firewalld_zone} |
|
|
|
|
-Dfirewalld_zone=true \ |
|
|
|
@ -739,9 +757,9 @@ autoreconf --install --force
@@ -739,9 +757,9 @@ autoreconf --install --force
|
|
|
|
|
--with-runstatedir=%{_rundir} \ |
|
|
|
|
--enable-silent-rules=no \ |
|
|
|
|
--enable-static=no \ |
|
|
|
|
--with-nft=/usr/sbin/nft \ |
|
|
|
|
--with-iptables=/usr/sbin/iptables \ |
|
|
|
|
--with-dhclient=yes \ |
|
|
|
|
--with-nft=%{_sbindir}/nft \ |
|
|
|
|
--with-iptables=%{_sbindir}/iptables \ |
|
|
|
|
--with-dhclient=%{_sbindir}/dhclient \ |
|
|
|
|
--with-dhcpcd=no \ |
|
|
|
|
--with-dhcpcanon=no \ |
|
|
|
|
--with-config-dhcp-default=%{dhcp_default} \ |
|
|
|
@ -839,6 +857,7 @@ autoreconf --install --force
@@ -839,6 +857,7 @@ autoreconf --install --force
|
|
|
|
|
--with-ebpf=%{ebpf_enabled} \ |
|
|
|
|
--with-session-tracking=systemd \ |
|
|
|
|
--with-suspend-resume=systemd \ |
|
|
|
|
--with-systemdsystemunitdir=%{_unitdir} \ |
|
|
|
|
--with-system-ca-path=/etc/pki/tls/cert.pem \ |
|
|
|
|
--with-dbus-sys-dir=%{dbus_sys_dir} \ |
|
|
|
|
--with-tests=yes \ |
|
|
|
@ -851,8 +870,11 @@ autoreconf --install --force
@@ -851,8 +870,11 @@ autoreconf --install --force
|
|
|
|
|
--enable-ifcfg-rh=yes \ |
|
|
|
|
--enable-ifupdown=no \ |
|
|
|
|
%if %{with ppp} |
|
|
|
|
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ |
|
|
|
|
--enable-ppp=yes \ |
|
|
|
|
--with-pppd="%{_sbindir}/pppd" \ |
|
|
|
|
--with-pppd-plugin-dir="%{_libdir}/pppd/%{ppp_version}" \ |
|
|
|
|
%else |
|
|
|
|
--enable-ppp=no \ |
|
|
|
|
%endif |
|
|
|
|
%if %{with firewalld_zone} |
|
|
|
|
--enable-firewalld-zone=yes \ |
|
|
|
@ -887,7 +909,7 @@ cp %{SOURCE2} %{buildroot}%{nmlibdir}/conf.d/
@@ -887,7 +909,7 @@ cp %{SOURCE2} %{buildroot}%{nmlibdir}/conf.d/
|
|
|
|
|
cp %{SOURCE4} %{buildroot}%{nmlibdir}/conf.d/ |
|
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
%if %{with connectivity_redhat} |
|
|
|
|
%if %{with connectivity_powerel} |
|
|
|
|
cp %{SOURCE5} %{buildroot}%{nmlibdir}/conf.d/ |
|
|
|
|
mkdir -p %{buildroot}%{_sysctldir} |
|
|
|
|
cp %{SOURCE6} %{buildroot}%{_sysctldir} |
|
|
|
@ -910,7 +932,7 @@ rm -f %{buildroot}%{nmplugindir}/*.la
@@ -910,7 +932,7 @@ rm -f %{buildroot}%{nmplugindir}/*.la
|
|
|
|
|
# Ensure the documentation timestamps are constant to avoid multilib conflicts |
|
|
|
|
find %{buildroot}%{_datadir}/gtk-doc -exec touch --reference configure.ac '{}' \+ |
|
|
|
|
|
|
|
|
|
%if 0%{?__debug_package} |
|
|
|
|
%if 0%{?__debug_package} && ! 0%{?flatpak} |
|
|
|
|
mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version} |
|
|
|
|
cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version} |
|
|
|
|
%endif |
|
|
|
@ -1067,10 +1089,10 @@ fi
@@ -1067,10 +1089,10 @@ fi
|
|
|
|
|
%{_mandir}/man1/* |
|
|
|
|
%{_mandir}/man5/* |
|
|
|
|
%{_mandir}/man7/nmcli-examples.7* |
|
|
|
|
%{_mandir}/man8/nm-initrd-generator.8.gz |
|
|
|
|
%{_mandir}/man8/NetworkManager.8.gz |
|
|
|
|
%{_mandir}/man8/NetworkManager-dispatcher.8.gz |
|
|
|
|
%{_mandir}/man8/NetworkManager-wait-online.service.8.gz |
|
|
|
|
%{_mandir}/man8/nm-initrd-generator.8* |
|
|
|
|
%{_mandir}/man8/NetworkManager.8* |
|
|
|
|
%{_mandir}/man8/NetworkManager-dispatcher.8* |
|
|
|
|
%{_mandir}/man8/NetworkManager-wait-online.service.8* |
|
|
|
|
%dir %{_localstatedir}/lib/NetworkManager |
|
|
|
|
%dir %{_sysconfdir}/sysconfig/network-scripts |
|
|
|
|
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service |
|
|
|
@ -1172,11 +1194,11 @@ fi
@@ -1172,11 +1194,11 @@ fi
|
|
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with connectivity_redhat} |
|
|
|
|
%files config-connectivity-redhat |
|
|
|
|
%if %{with connectivity_powerel} |
|
|
|
|
%files config-connectivity-powerel |
|
|
|
|
%dir %{nmlibdir} |
|
|
|
|
%dir %{nmlibdir}/conf.d |
|
|
|
|
%{nmlibdir}/conf.d/20-connectivity-redhat.conf |
|
|
|
|
%{nmlibdir}/conf.d/20-connectivity-powerel.conf |
|
|
|
|
%{_sysctldir}/70-nm-connectivity.conf |
|
|
|
|
%endif |
|
|
|
|
|
|
|
|
@ -1229,6 +1251,65 @@ fi
@@ -1229,6 +1251,65 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog |
|
|
|
|
* Thu Feb 23 2023 Beniamino Galvani <bgalvani@redhat.com> - 1:1.42.2-1 |
|
|
|
|
- Update to 1.42.2 release |
|
|
|
|
- fix hostname lookup from IPv6 address (rh #2167816) |
|
|
|
|
- add new connection property to remove the autogenerated local route rule (rh #2167805) |
|
|
|
|
- fix race condition while setting the MAC of a OVS interface (rh #2168477) |
|
|
|
|
- expose the DHCP IAID in the lease information (rh #2169869) |
|
|
|
|
|
|
|
|
|
* Fri Feb 10 2023 Thomas Haller <thaller@redhat.com> - 1:1.42.0-1 |
|
|
|
|
- Update to 1.42.0 release |
|
|
|
|
|
|
|
|
|
* Thu Jan 26 2023 Lubomir Rintel <lkundrak@v3.sk> - - 1:1.41.91-1 |
|
|
|
|
- Update to 1.41.91 release (release candidate) |
|
|
|
|
- core: retry if a rtnetlink socket runs out of buffer space (rh #2154350) |
|
|
|
|
- dns: allow changing resolv.conf options alone via global-dns (rh #2019306) |
|
|
|
|
|
|
|
|
|
* Fri Jan 20 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 1:1.41.90-1 |
|
|
|
|
- Update to 1.41.90 release (release candidate) |
|
|
|
|
- l3cfg: schedule an update after every commit-type/config-data register/unregister (rh #2158394) |
|
|
|
|
- all: add support for ovs-dpdk n-rxq-desc and n-txq-desc (rh #2156385) |
|
|
|
|
- core: fix consistency for internal cache for IPv6 routes (rh #2060684) |
|
|
|
|
|
|
|
|
|
* Wed Jan 11 2023 Beniamino Galvani <bgalvani@redhat.com> - 1:1.41.8-1 |
|
|
|
|
- Update to 1.41.8 release (development) |
|
|
|
|
- core: add support for equal-cost multi-path (ECMP) routes (rh #2081302) |
|
|
|
|
- device: preserve the DHCP lease during reapply (rh #2117352) |
|
|
|
|
- ovs: add support for 'other_config' settings (rh #2151455) |
|
|
|
|
|
|
|
|
|
* Wed Dec 21 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.7-2 |
|
|
|
|
- core: avoid infinite autoconnect with multi-connect profiles (rh #2150000) |
|
|
|
|
|
|
|
|
|
* Thu Dec 15 2022 Lubomir Rintel <lkundrak@v3.sk> - 1:1.41.7-1 |
|
|
|
|
- Update to 1.41.7 release (development) |
|
|
|
|
- macsec: fix tracking of parent ifindex (rh #2122564) |
|
|
|
|
- cloud-setup: set preserve-external-ip flag during reapply (rh #2132754) |
|
|
|
|
|
|
|
|
|
* Wed Nov 30 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.6-1 |
|
|
|
|
- Update to 1.41.6 release (development) |
|
|
|
|
- add support for loopback interfaces (rh #2073512) |
|
|
|
|
- ovs: support VLAN trunks for OVS port (rh #2111959) |
|
|
|
|
|
|
|
|
|
* Fri Nov 18 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.5-1 |
|
|
|
|
- Update to 1.41.5 release (development) |
|
|
|
|
|
|
|
|
|
* Thu Nov 3 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.4-2 |
|
|
|
|
- fix generating stable UUIDs for keyfile (gitlab#1130) |
|
|
|
|
|
|
|
|
|
* Wed Nov 2 2022 Wen Liang <wenliang@redhat.com> - 1:1.41.4-1 |
|
|
|
|
- Update to 1.41.4 release (development) |
|
|
|
|
- device: don't emit recheck-assume if there is a queued activation request (rh #2092215) |
|
|
|
|
- device: allow configuration of VLAN on an unmanaged interface (rh #2110307) |
|
|
|
|
|
|
|
|
|
* Fri Oct 14 2022 Beniamino Galvani <bgalvani@redhat.com> - 1:1.41.3-1 |
|
|
|
|
- Update to 1.41.3 release (development) |
|
|
|
|
- core: fix reapply of mptcp-flags (rh #2120471) |
|
|
|
|
- core: fix autoconnection for devices with a unrealized parent (rh #2101317) |
|
|
|
|
- device: fix hanging port devices when controller goes down (rh #2130287) |
|
|
|
|
- bond: add "balance-slb" option which implements source load balancing (rh #2128216) |
|
|
|
|
- bond: fix setting primary option when the interface is missing (rh #2126347) |
|
|
|
|
|
|
|
|
|
* Fri Aug 26 2022 Ana Cabral <acabral@redhat.com> - 1:1.40.0-1 |
|
|
|
|
- Update to 1.40.0 release |
|
|
|
|
|
|
|
|
|