From a6d8fe8f122fac3197eac2b10d1017c179b09b00 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Mar 2023 08:51:49 +0000 Subject: [PATCH] import NetworkManager-1.42.2-1.el9 --- .NetworkManager.metadata | 2 +- .gitignore | 2 +- SPECS/NetworkManager.spec | 180 ++++++++++++++++++++++++++++---------- 3 files changed, 134 insertions(+), 50 deletions(-) diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata index 2f0085e..3d5d32c 100644 --- a/.NetworkManager.metadata +++ b/.NetworkManager.metadata @@ -1 +1 @@ -bdfa8c04223ec176d348062f5843353fb82c0704 SOURCES/NetworkManager-1.39.90.tar.xz +83eaa880bb7d4d8f178e426c30d17895e117fb79 SOURCES/NetworkManager-1.42.2.tar.xz diff --git a/.gitignore b/.gitignore index 3482316..b799024 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-1.39.90.tar.xz +SOURCES/NetworkManager-1.42.2.tar.xz diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index 3402d01..612c571 100644 --- a/SPECS/NetworkManager.spec +++ b/SPECS/NetworkManager.spec @@ -4,13 +4,14 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global real_version 1.39.90 +%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_test 1 +%global bcond_default_lto %{nil} +%global bcond_default_test 0 %global obsoletes_device_plugins 1:0.9.9.95-1 %global obsoletes_ppp_plugin 1:1.5.3 @@ -60,23 +61,31 @@ %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 %else %bcond_with connectivity_fedora %endif -%if 0%{?rhel} && 0%{?rhel} > 7 +%if 0%{?rhel} && 0%{?rhel} >= 8 %bcond_without connectivity_redhat %else %bcond_with connectivity_redhat %endif -%if 0%{?fedora} > 28 || 0%{?rhel} > 7 +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 %bcond_without crypto_gnutls %else %bcond_with crypto_gnutls @@ -86,7 +95,7 @@ %else %bcond_without iwd %endif -%if 0%{?fedora} > 31 || 0%{?rhel} > 7 +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8 %bcond_without firewalld_zone %else %bcond_with firewalld_zone @@ -94,7 +103,7 @@ ############################################################################### -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} >= 8 %global dbus_version 1.9.18 %global dbus_sys_dir %{_datadir}/dbus-1/system.d %else @@ -116,15 +125,15 @@ %global with_modem_manager_1 0 %endif -%if 0%{?fedora} >= 31 || 0%{?rhel} > 7 +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8 %global dhcp_default internal %else %global dhcp_default dhclient %endif -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} >= 8 %global logging_backend_default journal -%if 0%{?fedora} || 0%{?rhel} > 8 +%if 0%{?fedora} || 0%{?rhel} >= 9 %global dns_rc_manager_default auto %else %global dns_rc_manager_default symlink @@ -134,19 +143,19 @@ %global dns_rc_manager_default file %endif -%if 0%{?rhel} > 8 || 0%{?fedora} > 32 +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %global config_plugins_default_ifcfg_rh 0 %else %global config_plugins_default_ifcfg_rh 1 %endif -%if 0%{?rhel} > 9 || 0%{?fedora} > 35 +%if 0%{?fedora} >= 36 || 0%{?rhel} >= 10 %global split_ifcfg_rh 1 %else %global split_ifcfg_rh 0 %endif -%if 0%{?rhel} > 8 || 0%{?fedora} > 35 +%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 %global ifcfg_warning 1 %else %global ifcfg_warning 0 @@ -196,7 +205,7 @@ Source7: readme-ifcfg-rh.txt # Patch1001: 1001-some.patch Requires(post): systemd -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} >= 8 Requires(post): systemd-udev %endif Requires(post): /usr/sbin/update-alternatives @@ -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} @@ -284,7 +292,7 @@ BuildRequires: mobile-broadband-provider-info-devel BuildRequires: newt-devel %endif BuildRequires: /usr/bin/dbus-launch -%if 0%{?fedora} > 27 || 0%{?rhel} > 7 +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 BuildRequires: python3 BuildRequires: python3-gobject-base BuildRequires: python3-dbus @@ -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 @@ -308,7 +320,7 @@ BuildRequires: libubsan BuildRequires: firewalld-filesystem %endif BuildRequires: iproute -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: iproute-tc %endif @@ -397,7 +409,7 @@ Requires: wireless-regdb Requires: crda %endif -%if %{with iwd} && (0%{?fedora} > 24 || 0%{?rhel} > 7) +%if %{with iwd} && (0%{?fedora} >= 25 || 0%{?rhel} >= 8) Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd) Suggests: wpa_supplicant %else @@ -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. %else -Ddocs=false \ %endif + -Dqt=false \ %if %{with team} -Dteamdctl=true \ %else @@ -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. -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 \ @@ -737,11 +755,11 @@ gtkdocize autoreconf --install --force %configure \ --with-runstatedir=%{_rundir} \ - --disable-silent-rules \ - --disable-static \ - --with-nft=/usr/sbin/nft \ - --with-iptables=/usr/sbin/iptables \ - --with-dhclient=yes \ + --enable-silent-rules=no \ + --enable-static=no \ + --with-nft=%{_sbindir}/nft \ + --with-iptables=%{_sbindir}/iptables \ + --with-dhclient=%{_sbindir}/dhclient \ --with-dhcpcd=no \ --with-dhcpcanon=no \ --with-config-dhcp-default=%{dhcp_default} \ @@ -753,26 +771,26 @@ autoreconf --install --force %if %{with sanitizer} --with-address-sanitizer=exec \ %if 0%{?fedora} || 0%{?rhel} >= 8 - --enable-undefined-sanitizer \ + --enable-undefined-sanitizer=yes \ %else - --disable-undefined-sanitizer \ + --enable-undefined-sanitizer=no \ %endif %else --with-address-sanitizer=no \ - --disable-undefined-sanitizer \ + --enable-undefined-sanitizer=no \ %endif %if %{with debug} - --enable-more-logging \ + --enable-more-logging=yes \ --with-more-asserts=10000 \ %else - --disable-more-logging \ - --without-more-asserts \ + --enable-more-logging=no \ + --with-more-asserts=0 \ %endif - --enable-ld-gc \ + --enable-ld-gc=yes \ %if %{with lto} - --enable-lto \ + --enable-lto=yes \ %else - --disable-lto \ + --enable-lto=no \ %endif --with-libaudit=yes-disabled-by-default \ %if 0%{?with_modem_manager_1} @@ -811,11 +829,11 @@ autoreconf --install --force --with-nm-cloud-setup=no \ %endif --enable-vala=yes \ - --enable-introspection \ + --enable-introspection=yes \ %if %{with regen_docs} - --enable-gtk-doc \ + --enable-gtk-doc=yes \ %else - --disable-gtk-doc \ + --enable-gtk-doc=no \ %endif %if %{with team} --enable-teamdctl=yes \ @@ -830,15 +848,16 @@ autoreconf --install --force --with-selinux=yes \ --enable-polkit=yes \ --enable-modify-system=yes \ - --enable-concheck \ + --enable-concheck=yes \ %if 0%{?fedora} - --with-libpsl \ + --with-libpsl=yes \ %else - --without-libpsl \ + --with-libpsl=no \ %endif --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,13 +870,16 @@ 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 \ + --enable-firewalld-zone=yes \ %else - --disable-firewalld-zone \ + --enable-firewalld-zone=no \ %endif --with-dist-version=%{version}-%{release} \ %if %{?config_plugins_default_ifcfg_rh} @@ -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 %{_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 @@ -1229,6 +1251,68 @@ fi %changelog +* Thu Feb 23 2023 Beniamino Galvani - 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 - 1:1.42.0-1 +- Update to 1.42.0 release + +* Thu Jan 26 2023 Lubomir Rintel - - 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 - 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 - 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 - 1:1.41.7-2 +- core: avoid infinite autoconnect with multi-connect profiles (rh #2150000) + +* Thu Dec 15 2022 Lubomir Rintel - 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 - 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 - 1:1.41.5-1 +- Update to 1.41.5 release (development) + +* Thu Nov 3 2022 Thomas Haller - 1:1.41.4-2 +- fix generating stable UUIDs for keyfile (gitlab#1130) + +* Wed Nov 2 2022 Wen Liang - 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 - 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 - 1:1.40.0-1 +- Update to 1.40.0 release + * Tue Aug 16 2022 Ana Cabral - 1:1.39.90-1 - Update to 1.39.90 release (release candidate) - Add support for MPTCP (rh #2029636)