diff --git a/.gitignore b/.gitignore index 1571c28..58630fd 100644 --- a/.gitignore +++ b/.gitignore @@ -467,3 +467,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.49.6.tar.xz /NetworkManager-1.49.90.tar.xz /NetworkManager-1.51.0.tar.xz +/NetworkManager-1.51.1.tar.xz diff --git a/NetworkManager.spec b/NetworkManager.spec index 83cd589..07984ce 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.51.0 +%global real_version 1.51.1 %global rpm_version %{real_version} %global release_version 1 %global snapshot %{nil} @@ -40,10 +40,8 @@ ############################################################################### %if 0%{?fedora} > 40 || 0%{?rhel} >= 10 -%bcond_without meson %bcond_with dhclient %else -%bcond_with meson %bcond_without dhclient %endif %bcond_without adsl @@ -249,16 +247,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} @@ -591,7 +583,6 @@ Preferably use nmcli instead. %build -%if %{with meson} %meson \ -Db_ndebug=false \ --warnlevel 2 \ @@ -724,158 +715,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 \ -%if %{with dhclient} - --with-dhclient=%{_sbindir}/dhclient \ -%else - --with-dhclient=no \ -%endif - --with-dhcpcd=no \ - --with-dhcpcanon=no \ - --with-crypto=gnutls \ -%if %{with sanitizer} - --with-address-sanitizer=exec \ - --enable-undefined-sanitizer=yes \ -%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 - --enable-firewalld-zone=yes \ - --with-dist-version=%{version}-%{release} \ -%if %{with default_ifcfg_rh} - --with-config-plugins-default=ifcfg-rh \ -%endif -%if %{with 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=journal \ - --disable-autotools-deprecation - -%make_build - -%endif - %install -%if %{with meson} %meson_install -%else -%make_install -%endif cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/ @@ -915,7 +756,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} @@ -929,21 +770,11 @@ touch %{buildroot}%{_sbindir}/ifdown %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 @@ -1240,6 +1071,11 @@ fi %changelog +* Mon Sep 16 2024 Fernando Fernandez Mancera - 1:1.51.1-1 +- Upgrade to 1.51.1 (dev) +- Use meson and remove autotools configuration +- Fix crashes (SIGABRT) in several functions (RHEL-17840) + * Tue Sep 10 2024 Fernando Fernandez Mancera - 1:1.51.0-1 - Upgrade to 1.51.0 - cloud-setup: Fix primary and secondary address swap in Azure (RHEL-50855) diff --git a/sources b/sources index 7043278..1c70877 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.51.0.tar.xz) = 29cb3318a0f3a0d5392763dd44a13516e72a040a73d8fc9560d62826e9002da1de2128a94e2330027eab4094cc8a5308439e8ffcca2c3c8d24e91e37f3bfb003 +SHA512 (NetworkManager-1.51.1.tar.xz) = 2d5ed78208e26517e37cc6f9ec202204a5c3f3a50d3a3193c59d758663909b8f3eb1a39f6041c933e66c4ad41542fdf3ffa655ee836d85423c236fddd88309e4