diff --git a/.gitignore b/.gitignore index 1f38200..a206286 100644 --- a/.gitignore +++ b/.gitignore @@ -450,3 +450,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.51.2.tar.xz /NetworkManager-1.51.4.tar.xz /NetworkManager-1.51.5.tar.xz +/NetworkManager-1.51.6.tar.xz diff --git a/NetworkManager.spec b/NetworkManager.spec index 5093d12..5300fe8 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.5 +%global real_version 1.51.6 %global git_tag_version_suffix -dev %global rpm_version %{real_version} %global release_version 1 @@ -18,9 +18,6 @@ %global obsoletes_ppp_plugin 1:1.5.3 %global obsoletes_initscripts_updown 1:1.36.0-0.6 %global obsoletes_ifcfg_rh 1:1.36.2 -%global obsoletes_team 1:1.47.5-3 -%global obsoletes_initscripts_ifcfg_rh 1:1.47.5-3 -%global obsoletes_dispatcher_routing_rules 1:1.47.5-3 %global nmlibdir %{_prefix}/lib/%{name} %global nmplugindir %{_libdir}/%{name}/%{version}-%{release} @@ -43,6 +40,11 @@ %global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer ############################################################################### +%if 0%{?fedora} > 40 || 0%{?rhel} >= 10 +%bcond_with dhclient +%else +%bcond_without dhclient +%endif %bcond_without adsl %bcond_without bluetooth %bcond_without wwan @@ -68,7 +70,7 @@ %bcond_with test %endif %if "%{?bcond_default_lto}" == "" -%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} >= 9 %bcond_without lto %else %bcond_with lto @@ -86,44 +88,21 @@ %else %bcond_with connectivity_fedora %endif -%if 0%{?rhel} && 0%{?rhel} >= 8 +%if 0%{?rhel} %bcond_without connectivity_redhat %else %bcond_with connectivity_redhat %endif -%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 -%bcond_without crypto_gnutls -%else -%bcond_with crypto_gnutls -%endif %if 0%{?rhel} %bcond_with iwd %else %bcond_without iwd %endif -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8 -%bcond_without firewalld_zone -%else -%bcond_with firewalld_zone -%endif ############################################################################### -%if 0%{?fedora} || 0%{?rhel} >= 8 %global dbus_version 1.9.18 %global dbus_sys_dir %{_datadir}/dbus-1/system.d -%else -%global dbus_version 1.1 -%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 @@ -131,51 +110,39 @@ %global with_modem_manager_1 0 %endif -%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8 -%global dhcp_default internal -%else -%global dhcp_default dhclient -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 8 -%global logging_backend_default journal %if 0%{?fedora} || 0%{?rhel} >= 9 %global dns_rc_manager_default auto %else %global dns_rc_manager_default symlink %endif -%else -%global logging_backend_default syslog -%global dns_rc_manager_default file -%endif %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 -%global config_plugins_default_ifcfg_rh 0 +%bcond_with default_ifcfg_rh %else -%global config_plugins_default_ifcfg_rh 1 +%bcond_without default_ifcfg_rh %endif -%if 0%{?rhel} >= 10 -%global with_ifcfg_rh 0 -%global split_ifcfg_rh 0 +%if 0%{?rhel} >= 10 || 0%{?fedora} >= 41 +%bcond_with ifcfg_rh +%bcond_with split_ifcfg_rh %elif 0%{?fedora} >= 36 -%global with_ifcfg_rh 1 -%global split_ifcfg_rh 1 +%bcond_without ifcfg_rh +%bcond_without split_ifcfg_rh %else -%global with_ifcfg_rh 1 -%global split_ifcfg_rh 0 +%bcond_without ifcfg_rh +%bcond_with split_ifcfg_rh %endif %if (0%{?fedora} >= 36 && 0%{?fedora} < 39) || 0%{?rhel} == 9 -%global ifcfg_warning 1 +%bcond_without ifcfg_warning %else -%global ifcfg_warning 0 +%bcond_with ifcfg_warning %endif -%if 0%{?fedora} >= 39 -%global ifcfg_migrate 1 +%if %{with ifcfg_rh} && 0%{?fedora} >= 39 +%bcond_without ifcfg_migrate %else -%global ifcfg_migrate 0 +%bcond_with ifcfg_migrate %endif %if 0%{?fedora} @@ -224,9 +191,7 @@ Source9: readme-ifcfg-rh-migrated.txt # Patch1001: 1001-some.patch Requires(post): systemd -%if 0%{?fedora} || 0%{?rhel} >= 8 Requires(post): systemd-udev -%endif Requires(post): /usr/sbin/update-alternatives Requires(preun): systemd Requires(preun): /usr/sbin/update-alternatives @@ -235,30 +200,40 @@ Requires(postun): systemd Requires: dbus >= %{dbus_version} Requires: glib2 >= %{glib2_version} Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release} -%if "%{libndp_version}" != "" -Requires: libndp >= %{libndp_version} -%endif + Recommends: iputils + +%if 0%{?rhel} == 8 +# Older libndp versions use select() (rh#1933041). On well known distros, +# choose a version that has the necessary fix. +Requires: libndp >= 1.7-4 +%endif + Obsoletes: NetworkManager < %{obsoletes_device_plugins} Obsoletes: NetworkManager < %{obsoletes_ppp_plugin} Obsoletes: NetworkManager-wimax < 1:1.2 -%if 0%{?rhel} && 0%{?rhel} == 8 +%if 0%{?rhel} == 8 Suggests: NetworkManager-initscripts-updown %endif Obsoletes: NetworkManager < %{obsoletes_initscripts_updown} -%if 0%{?split_ifcfg_rh} +%if %{with split_ifcfg_rh} Obsoletes: NetworkManager < %{obsoletes_ifcfg_rh} %endif -%if 0%{?rhel} && 0%{?rhel} <= 7 -# Kept for RHEL to ensure that wired 802.1x works out of the box -Requires: wpa_supplicant >= 1:1.1 +%if 0%{?rhel} >= 10 +%if 0%{without team} +Obsoletes: NetworkManager-team < 1:1.47.5-3 +%endif +Obsoletes: NetworkManager-initscripts-ifcfg-rh < 1:1.47.5-3 +Obsoletes: NetworkManager-dispatcher-routing-rules < 1:1.47.5-3 %endif -%if 0%{?rhel} && 0%{?rhel} >= 10 -Obsoletes: NetworkManager-team < %{obsoletes_team} -Obsoletes: NetworkManager-initscripts-ifcfg-rh < %{obsoletes_initscripts_ifcfg_rh} -Obsoletes: NetworkManager-dispatcher-routing-rules < %{obsoletes_dispatcher_routing_rules} +%if 0%{?fedora} >= 41 +%if %{without ifcfg_rh} +Obsoletes: NetworkManager-initscripts-ifcfg-rh < 1:1.49-3.1 +Obsoletes: NetworkManager-dispatcher-routing-rules < 1:1.49.3-1 +Obsoletes: NetworkManager-initscripts-updown < 1:1.49.3-1 +%endif %endif Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 @@ -266,8 +241,10 @@ Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 Conflicts: NetworkManager-pptp < 1:0.7.0.99-1 Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1 Conflicts: kde-plasma-networkmanagement < 1:0.9-0.49.20110527git.nm09 -%if 0%{?rhel} && 0%{?rhel} >= 10 +%if 0%{?rhel} >= 10 +%if 0%{without team} Conflicts: NetworkManager-team <= 1:1.47.5-3 +%endif Conflicts: NetworkManager-initscripts-ifcfg-rh <= 1:1.47.5-3 Conflicts: NetworkManager-dispatcher-routing-rules <= 1:1.47.5-3 %endif @@ -284,11 +261,7 @@ BuildRequires: gobject-introspection-devel >= 0.10.3 %if %{with ppp} BuildRequires: ppp-devel >= 2.4.5 %endif -%if %{with crypto_gnutls} BuildRequires: gnutls-devel >= 2.12 -%else -BuildRequires: nss-devel >= 3.11.7 -%endif BuildRequires: readline-devel BuildRequires: audit-libs-devel %if %{with regen_docs} @@ -326,17 +299,11 @@ BuildRequires: polkit-devel BuildRequires: jansson-devel %if %{with sanitizer} BuildRequires: libasan -%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: libubsan %endif -%endif -%if %{with firewalld_zone} BuildRequires: firewalld-filesystem -%endif BuildRequires: iproute -%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: iproute-tc -%endif Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release} @@ -379,12 +346,7 @@ Summary: Bluetooth device plugin for NetworkManager Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: NetworkManager-wwan = %{epoch}:%{version}-%{release} -%if 0%{?rhel} && 0%{?rhel} <= 7 -# No Requires:bluez to prevent it being installed when updating -# to the split NM package -%else Requires: bluez >= 4.101-5 -%endif Obsoletes: NetworkManager < %{obsoletes_device_plugins} %description bluetooth @@ -399,12 +361,10 @@ Group: System Environment/Base BuildRequires: teamd-devel Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: NetworkManager < %{obsoletes_device_plugins} -%if 0%{?fedora} || 0%{?rhel} >= 8 # Team was split from main NM binary between 0.9.10 and 1.0 # We need this Obsoletes in addition to the one above # (git:3aede801521ef7bff039e6e3f1b3c7b566b4338d). Obsoletes: NetworkManager < 1:1.0.0 -%endif %description team This package contains NetworkManager support for team devices. @@ -423,13 +383,10 @@ Requires: wireless-regdb Requires: crda %endif -%if %{with iwd} && (0%{?fedora} >= 25 || 0%{?rhel} >= 8) +%if %{with iwd} Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd) Suggests: wpa_supplicant %else -# Just require wpa_supplicant on platforms that don't support boolean -# dependencies even though the plugin supports both supplicant and -# iwd backend. Requires: wpa_supplicant >= %{wpa_supplicant_version} %endif @@ -445,12 +402,7 @@ This package contains NetworkManager support for Wifi and OLPC devices. Summary: Mobile broadband device plugin for NetworkManager Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -%if 0%{?rhel} && 0%{?rhel} <= 7 -# No Requires:ModemManager to prevent it being installed when updating -# to the split NM package -%else Requires: ModemManager -%endif Obsoletes: NetworkManager < %{obsoletes_device_plugins} %description wwan @@ -553,13 +505,14 @@ This package is intended to be installed by default for server deployments. -%if %{?with_ifcfg_rh} +%if %{with ifcfg_rh} %package dispatcher-routing-rules Summary: NetworkManager dispatcher file for advanced routing rules Group: System Environment/Base -%if 0%{?split_ifcfg_rh} +%if %{with split_ifcfg_rh} Requires: %{name}-initscripts-ifcfg-rh %endif +Requires: ipcalc BuildArch: noarch Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release} Obsoletes: %{name}-config-routing-rules < 1:1.31.0 @@ -585,7 +538,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment. %endif -%if 0%{?split_ifcfg_rh} +%if %{with split_ifcfg_rh} %package initscripts-ifcfg-rh Summary: NetworkManager plugin for reading and writing connections in ifcfg-rh format Group: System Environment/Base @@ -612,7 +565,7 @@ like Aliyun, Azure, EC2, GCP are supported. %endif -%if %{?with_ifcfg_rh} +%if %{with ifcfg_rh} %package initscripts-updown Summary: Legacy ifup/ifdown scripts for NetworkManager that replace initscripts (network-scripts) Group: System Environment/Base @@ -627,6 +580,7 @@ This is only for backward compatibility with initscripts (network-scripts). Preferably use nmcli instead. %endif + %prep %autosetup -p1 -n NetworkManager-%{real_version} @@ -640,15 +594,14 @@ Preferably use nmcli instead. %endif -Dnft=%{_sbindir}/nft \ -Diptables=%{_sbindir}/iptables \ +%if %{with dhclient} -Ddhclient=%{_sbindir}/dhclient \ +%else + -Ddhclient=no \ +%endif -Ddhcpcanon=no \ -Ddhcpcd=no \ - -Dconfig_dhcp_default=%{dhcp_default} \ -%if %{with crypto_gnutls} -Dcrypto=gnutls \ -%else - -Dcrypto=nss \ -%endif %if %{with debug} -Dmore_logging=true \ -Dmore_asserts=10000 \ @@ -738,7 +691,7 @@ Preferably use nmcli instead. -Ddbus_conf_dir=%{dbus_sys_dir} \ -Dtests=yes \ -Dvalgrind=no \ -%if %{?with_ifcfg_rh} +%if %{with ifcfg_rh} -Difcfg_rh=true \ %else -Difcfg_rh=false \ @@ -750,23 +703,18 @@ Preferably use nmcli instead. -Dpppd_plugin_dir="%{_libdir}/pppd/%{ppp_version}" \ %else -Dppp=false \ -%endif -%if %{with firewalld_zone} - -Dfirewalld_zone=true \ -%else - -Dfirewalld_zone=false \ %endif -Ddist_version=%{version}-%{release} \ -%if %{?config_plugins_default_ifcfg_rh} +%if %{with default_ifcfg_rh} -Dconfig_plugins_default=ifcfg-rh \ %endif -%if %{?ifcfg_migrate} +%if %{with ifcfg_migrate} -Dconfig_migrate_ifcfg_rh_default=true \ %endif -Dresolvconf=no \ -Dnetconfig=no \ -Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \ - -Dconfig_logging_backend_default=%{logging_backend_default} + -Dconfig_logging_backend_default=journal %meson_build @@ -791,14 +739,14 @@ cp %{SOURCE7} %{buildroot}%{_sysctldir} cp %{SOURCE6} %{buildroot}%{nmlibdir}/conf.d/ %endif -%if 0%{?ifcfg_warning} +%if %{with ifcfg_warning} cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts %endif -%if 0%{?ifcfg_migrate} +%if %{with ifcfg_migrate} cp %{SOURCE9} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt %endif -%if %{?with_ifcfg_rh} +%if %{with ifcfg_rh} cp examples/dispatcher/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/ ln -s ../no-wait.d/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/pre-up.d/ ln -s ../10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/no-wait.d/ @@ -818,11 +766,12 @@ mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version} cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version} %endif -%if %{?with_ifcfg_rh} +%if %{with ifcfg_rh} touch %{buildroot}%{_sbindir}/ifup touch %{buildroot}%{_sbindir}/ifdown %endif + %check %if %{with test} %meson_test @@ -847,14 +796,12 @@ if [ -S /run/udev/control ]; then /usr/bin/udevadm control --reload-rules || : /usr/bin/udevadm trigger --subsystem-match=net || : fi -%if %{with firewalld_zone} %firewalld_reload -%endif %systemd_post %{systemd_units} -%if %{?with_ifcfg_rh} +%if %{with ifcfg_rh} %post initscripts-updown if [ -f %{_sbindir}/ifup -a ! -L %{_sbindir}/ifup ]; then # initscripts package too old, won't let us set an alternative @@ -883,7 +830,7 @@ fi %systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service -%if %{?with_ifcfg_rh} +%if %{with ifcfg_rh} %preun initscripts-updown if [ $1 -eq 0 ]; then /usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || : @@ -900,19 +847,11 @@ fi %postun /usr/bin/udevadm control --reload-rules || : /usr/bin/udevadm trigger --subsystem-match=net || : -%if %{with firewalld_zone} %firewalld_reload -%endif %systemd_postun %{systemd_units} -%if (0%{?fedora} && 0%{?fedora} < 28) || 0%{?rhel} -%post libnm -p /sbin/ldconfig -%postun libnm -p /sbin/ldconfig -%endif - - %if %{with nm_cloud_setup} %postun cloud-setup %systemd_postun %{systemd_units_cloud_setup} @@ -923,7 +862,7 @@ fi %{dbus_sys_dir}/org.freedesktop.NetworkManager.conf %{dbus_sys_dir}/nm-dispatcher.conf %{dbus_sys_dir}/nm-priv-helper.conf -%if %{?with_ifcfg_rh} && 0%{?split_ifcfg_rh} == 0 +%if %{with ifcfg_rh} && %{without split_ifcfg_rh} %{dbus_sys_dir}/nm-ifcfg-rh.conf %endif %{_sbindir}/%{name} @@ -951,7 +890,7 @@ fi %{_libexecdir}/nm-priv-helper %dir %{_libdir}/%{name} %dir %{nmplugindir} -%if %{?with_ifcfg_rh} && 0%{?split_ifcfg_rh} == 0 +%if %{with ifcfg_rh} && %{without split_ifcfg_rh} %{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so %endif %if %{with nmtui} @@ -973,16 +912,14 @@ fi %{_mandir}/man8/NetworkManager-dispatcher.8* %{_mandir}/man8/NetworkManager-wait-online.service.8* %dir %{_localstatedir}/lib/NetworkManager -%if %{?with_ifcfg_rh} +%if %{with ifcfg_rh} %dir %{_sysconfdir}/sysconfig/network-scripts %endif %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service %{_datadir}/polkit-1/actions/*.policy %{_prefix}/lib/udev/rules.d/*.rules -%if %{with firewalld_zone} %{_prefix}/lib/firewalld/zones/nm-shared.xml -%endif # systemd stuff %{_unitdir}/NetworkManager.service %{_unitdir}/NetworkManager-wait-online.service @@ -990,7 +927,7 @@ fi %{_unitdir}/nm-priv-helper.service %dir %{_datadir}/doc/NetworkManager/examples %{_datadir}/doc/NetworkManager/examples/server.conf -%if 0%{?ifcfg_warning} || 0%{?ifcfg_migrate} +%if %{with ifcfg_warning} || %{with ifcfg_migrate} %{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt %endif %doc NEWS AUTHORS README.md CONTRIBUTING.md @@ -1090,13 +1027,14 @@ fi %{nmlibdir}/conf.d/00-server.conf -%if %{?with_ifcfg_rh} +%if %{with ifcfg_rh} %files dispatcher-routing-rules %{nmlibdir}/dispatcher.d/10-ifcfg-rh-routes.sh %{nmlibdir}/dispatcher.d/no-wait.d/10-ifcfg-rh-routes.sh %{nmlibdir}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh %endif + %if %{with nmtui} %files tui %{_bindir}/nmtui @@ -1107,7 +1045,7 @@ fi %endif -%if 0%{?split_ifcfg_rh} +%if %{with split_ifcfg_rh} %files initscripts-ifcfg-rh %{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so %{dbus_sys_dir}/nm-ifcfg-rh.conf @@ -1126,7 +1064,7 @@ fi %endif -%if %{?with_ifcfg_rh} +%if %{with ifcfg_rh} %files initscripts-updown %{_libexecdir}/nm-ifup %ghost %attr(755, root, root) %{_sbindir}/ifup @@ -1136,6 +1074,13 @@ fi %changelog +* Mon Jan 20 2025 Beniamino Galvani - 1:1.51.6-1 +- Update to 1.51.6 (dev) +- Honor the routing-rules property for VPN connections (RHEL-69899) +- Fix potential crash when ipv4.dhcp-send-release is enabled (RHEL-67918) +- Support encrypted DNS servers (RHEL-66260) +- Fix configuration of VLAN ingress/egress QoS mapping (RHEL-72475) + * Fri Dec 27 2024 Íñigo Huguet - 1:1.51.5-1 - Upgrade to 1.51.5 (dev) - Never retry ACD on NOARP interfaces (RHEL-47301) diff --git a/sources b/sources index beba118..84eab9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.51.5.tar.xz) = 4b31a072193d769a959c82b49f3506852ea4e432389d84a690f675d852d4ac22ffe7ce8f107f1ef07b7dc64a2437bdb229ef3f941b3ad2c5e15feabfa9232c11 +SHA512 (NetworkManager-1.51.6.tar.xz) = d7bf4ef538348adffbeed52457b6820e457a26d3fb906205e88c1d871e017f76ded6727167515e528f35123b84fb014b11cca681352232aac72b91353875b022