From 3ad2ccc23710b88711b7571143345e2045220516 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 1 Oct 2024 09:19:41 +0200 Subject: [PATCH] Upgrade to 1.51.2 (dev) Resolves: RHEL-60883 RHEL-60884 RHEL-60885 --- .gitignore | 1 + NetworkManager.spec | 191 ++------------------------------------------ sources | 2 +- 3 files changed, 10 insertions(+), 184 deletions(-) diff --git a/.gitignore b/.gitignore index ec0eb7e..3f61563 100644 --- a/.gitignore +++ b/.gitignore @@ -447,3 +447,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.48.4.tar.xz /NetworkManager-1.48.8.tar.xz /NetworkManager-1.48.10.tar.xz +/NetworkManager-1.51.2.tar.xz diff --git a/NetworkManager.spec b/NetworkManager.spec index 66d18e2..b502930 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -4,7 +4,7 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global real_version 1.48.10 +%global real_version 1.51.2 %global rpm_version %{real_version} %global release_version 1 %global snapshot %{nil} @@ -42,11 +42,6 @@ %global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer ############################################################################### -%if 0%{?fedora} > 40 || 0%{?rhel} >= 10 -%bcond_without meson -%else -%bcond_with meson -%endif %bcond_without adsl %bcond_without bluetooth %bcond_without wwan @@ -275,16 +270,10 @@ Conflicts: NetworkManager-initscripts-ifcfg-rh <= 1:1.47.5-3 Conflicts: NetworkManager-dispatcher-routing-rules <= 1:1.47.5-3 %endif -BuildRequires: make BuildRequires: gcc BuildRequires: libtool BuildRequires: pkgconfig -%if %{with meson} BuildRequires: meson -%else -BuildRequires: automake -BuildRequires: autoconf -%endif BuildRequires: gettext-devel >= 0.19.8 BuildRequires: dbus-devel >= %{dbus_version} @@ -641,7 +630,6 @@ Preferably use nmcli instead. %build -%if %{with meson} %meson \ -Db_ndebug=false \ --warnlevel 2 \ @@ -780,167 +768,8 @@ Preferably use nmcli instead. %meson_build -%else -# autotools -%if %{with regen_docs} -gtkdocize -%endif -autoreconf --install --force -%configure \ - --with-runstatedir=%{_rundir} \ - --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} \ -%if %{with crypto_gnutls} - --with-crypto=gnutls \ -%else - --with-crypto=nss \ -%endif -%if %{with sanitizer} - --with-address-sanitizer=exec \ -%if 0%{?fedora} || 0%{?rhel} >= 8 - --enable-undefined-sanitizer=yes \ -%else - --enable-undefined-sanitizer=no \ -%endif -%else - --with-address-sanitizer=no \ - --enable-undefined-sanitizer=no \ -%endif -%if %{with debug} - --enable-more-logging=yes \ - --with-more-asserts=10000 \ -%else - --enable-more-logging=no \ - --with-more-asserts=0 \ -%endif - --enable-ld-gc=yes \ -%if %{with lto} - --enable-lto=yes \ -%else - --enable-lto=no \ -%endif - --with-libaudit=yes-disabled-by-default \ -%if 0%{?with_modem_manager_1} - --with-modem-manager-1=yes \ -%else - --with-modem-manager-1=no \ -%endif -%if %{with wifi} - --enable-wifi=yes \ -%if 0%{?fedora} - --with-wext=yes \ -%else - --with-wext=no \ -%endif -%else - --enable-wifi=no \ -%endif -%if %{with iwd} - --with-iwd=yes \ -%else - --with-iwd=no \ -%endif -%if %{with bluetooth} - --enable-bluez5-dun=yes \ -%else - --enable-bluez5-dun=no \ -%endif -%if %{with nmtui} - --with-nmtui=yes \ -%else - --with-nmtui=no \ -%endif -%if %{with nm_cloud_setup} - --with-nm-cloud-setup=yes \ -%else - --with-nm-cloud-setup=no \ -%endif - --enable-vala=yes \ - --enable-introspection=yes \ -%if %{with regen_docs} - --enable-gtk-doc=yes \ -%else - --enable-gtk-doc=no \ -%endif -%if %{with team} - --enable-teamdctl=yes \ -%else - --enable-teamdctl=no \ -%endif -%if %{with ovs} - --enable-ovs=yes \ -%else - --enable-ovs=no \ -%endif - --with-selinux=yes \ - --enable-polkit=yes \ - --enable-modify-system=yes \ - --enable-concheck=yes \ -%if 0%{?fedora} - --with-libpsl=yes \ -%else - --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 \ -%if %{with test} - --enable-more-warnings=error \ -%else - --enable-more-warnings=yes \ -%endif - --with-valgrind=no \ -%if %{?with_ifcfg_rh} - --enable-ifcfg-rh=yes \ -%else - --enable-ifcfg-rh=no \ -%endif - --enable-ifupdown=no \ -%if %{with ppp} - --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 \ -%else - --enable-firewalld-zone=no \ -%endif - --with-dist-version=%{version}-%{release} \ -%if %{?config_plugins_default_ifcfg_rh} - --with-config-plugins-default=ifcfg-rh \ -%endif -%if %{?ifcfg_migrate} - --with-config-migrate-ifcfg-rh-default=yes \ -%endif - --with-resolvconf=no \ - --with-netconfig=no \ - --with-config-dns-rc-manager-default=%{dns_rc_manager_default} \ - --with-config-logging-backend-default=%{logging_backend_default} \ - --disable-autotools-deprecation - -%make_build - -%endif - %install -%if %{with meson} %meson_install -%else -%make_install -%endif cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/ @@ -980,7 +809,7 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la 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 '{}' \+ +find %{buildroot}%{_datadir}/gtk-doc -exec touch --reference meson.build '{}' \+ %if 0%{?__debug_package} && ! 0%{?flatpak} mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version} @@ -993,21 +822,11 @@ touch %{buildroot}%{_sbindir}/ifdown %endif %check -%if %{with meson} %if %{with test} %meson_test %else %ninja_test -C %{_vpath_builddir} || : %endif -%else -# autotools -%if %{with test} -make -k %{?_smp_mflags} check -%else -make -k %{?_smp_mflags} check || : -%endif -%endif - %pre if [ -f "%{_unitdir}/network-online.target.wants/NetworkManager-wait-online.service" ] ; then @@ -1315,6 +1134,12 @@ fi %changelog +* Tue Oct 01 2024 Fernando Fernandez Mancera - 1:51.2-1 +- Upgrade to 1.51.2 (dev) +- Fix OVS race condition removing OVS interface (RHEL-60883) +- Fix OVS DPDK interface name validation (RHEL-60884) +- Support IPVLAN interface (RHEL-60885) + * Thu Aug 22 2024 Íñigo Huguet - 1:1.48.10-1 - Unblock the autoconnect for children when parent is available (RHEL-46904) - Fix crash produced by malformed LLDP package when debug logging (RHEL-46199) diff --git a/sources b/sources index abced56..c41469a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.48.10.tar.xz) = baef2ecc7da5c2f00278e8596f47c9304321896f1b79a6f304e27365c89a5fbaac6fbb68433a8fad94eeeffa56561968d0afee1adb24df6a8e6f2dba978cc620 +SHA512 (NetworkManager-1.51.2.tar.xz) = 4c9caa3ef44d5ce0ab7e046f08baf01924c0ba0bc6dbdc1b27a35bf4fc6321d5359f0b43a7b57b3f6030073e014616d16e93f64e9a6aab4c02ced3dcd03107ce