Upgrade to 1.47.91 (rc2)

Resolves: NMT-1122
This commit is contained in:
Lubomir Rintel 2024-05-16 22:11:43 +02:00
parent b5fe0cf950
commit c990be2f34
4 changed files with 53 additions and 9 deletions

1
.gitignore vendored
View File

@ -441,3 +441,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.47.4.tar.xz /NetworkManager-1.47.4.tar.xz
/NetworkManager-1.47.5.tar.xz /NetworkManager-1.47.5.tar.xz
/NetworkManager-1.47.90.tar.xz /NetworkManager-1.47.90.tar.xz
/NetworkManager-1.47.91.tar.xz

31
22-wifi-mac-addr.conf Normal file
View File

@ -0,0 +1,31 @@
# This sets defaults for Wi-Fi profiles to set a generated, stable MAC address.
#
# Do not modify this file. You can hide/overwrite this file by placing a file
# to "/etc/NetworkManager/conf.d/22-wifi-mac-addr.conf". You can also add
# configuration snippets with higher priority that override this setting (see
# `man 5 NetworkManager.conf`). Most importantly, this snippet only sets
# default values for the profile. You can explicitly set the value for each
# profile, so that this default value is not used.
#
# For example, on a particular profile/network set
#
# $ nmcli connection modify "$PROFILE" wifi.cloned-mac-address permanent
#
# to use the hardware MAC address. This prevents the default from this file
# to take effect.
#
# Or
#
# $ nmcli connection modify "$PROFILE" wifi.cloned-mac-address stable connection.stable-id '${NETWORK_SSID}/${BOOT}'
#
# to get a generated MAC address that changes on each boot. Note how setting
# "connection.stable-id" also affects other aspects of the profile.
#
# See `man 5 nm-settings` for "wifi.cloned-mac-address" and "connection.stable-id".
[connection.22-wifi-mac-addr]
match-device=type:wifi
wifi.cloned-mac-address=stable-ssid
[.config]
enable=nm-version-min:1.45

View File

@ -4,7 +4,7 @@
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global epoch_version 1 %global epoch_version 1
%global real_version 1.47.90 %global real_version 1.47.91
%global rpm_version %{real_version} %global rpm_version %{real_version}
%global release_version 2 %global release_version 2
%global snapshot %{nil} %global snapshot %{nil}
@ -214,9 +214,10 @@ Source1: NetworkManager.conf
Source2: 00-server.conf Source2: 00-server.conf
Source4: 20-connectivity-fedora.conf Source4: 20-connectivity-fedora.conf
Source5: 20-connectivity-redhat.conf Source5: 20-connectivity-redhat.conf
Source6: 70-nm-connectivity.conf Source6: 22-wifi-mac-addr.conf
Source7: readme-ifcfg-rh.txt Source7: 70-nm-connectivity.conf
Source8: readme-ifcfg-rh-migrated.txt Source8: readme-ifcfg-rh.txt
Source9: readme-ifcfg-rh-migrated.txt
#Patch1: 0001-some.patch #Patch1: 0001-some.patch
@ -917,7 +918,8 @@ autoreconf --install --force
--with-resolvconf=no \ --with-resolvconf=no \
--with-netconfig=no \ --with-netconfig=no \
--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \ --with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
--with-config-logging-backend-default=%{logging_backend_default} --with-config-logging-backend-default=%{logging_backend_default} \
--disable-autotools-deprecation
%make_build %make_build
@ -941,14 +943,18 @@ cp %{SOURCE4} %{buildroot}%{nmlibdir}/conf.d/
%if %{with connectivity_redhat} %if %{with connectivity_redhat}
cp %{SOURCE5} %{buildroot}%{nmlibdir}/conf.d/ cp %{SOURCE5} %{buildroot}%{nmlibdir}/conf.d/
mkdir -p %{buildroot}%{_sysctldir} mkdir -p %{buildroot}%{_sysctldir}
cp %{SOURCE6} %{buildroot}%{_sysctldir} cp %{SOURCE7} %{buildroot}%{_sysctldir}
%endif
%if 0%{?fedora} >= 40
cp %{SOURCE6} %{buildroot}%{nmlibdir}/conf.d/
%endif %endif
%if 0%{?ifcfg_warning} %if 0%{?ifcfg_warning}
cp %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
%endif %endif
%if 0%{?ifcfg_migrate} %if 0%{?ifcfg_migrate}
cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt cp %{SOURCE9} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
%endif %endif
%if %{?with_ifcfg_rh} %if %{?with_ifcfg_rh}
@ -1102,6 +1108,9 @@ fi
%dir %{_sysconfdir}/%{name}/dnsmasq-shared.d %dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
%dir %{_sysconfdir}/%{name}/system-connections %dir %{_sysconfdir}/%{name}/system-connections
%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
%if 0%{?fedora} >= 40
%{nmlibdir}/conf.d/22-wifi-mac-addr.conf
%endif
%ghost %{_sysconfdir}/%{name}/VPN %ghost %{_sysconfdir}/%{name}/VPN
%{_bindir}/nm-online %{_bindir}/nm-online
%{_libexecdir}/nm-dhcp-helper %{_libexecdir}/nm-dhcp-helper
@ -1296,6 +1305,9 @@ fi
%changelog %changelog
* Thu May 16 2024 Lubomir Rintel <lkundrak@v3.sk> - 1:1.47.91-1
- Upgrade to 1.47.91 (rc2)
* Mon May 06 2024 Ján Václav <jvaclav@redhat.com> - 1:1.47.90-2 * Mon May 06 2024 Ján Václav <jvaclav@redhat.com> - 1:1.47.90-2
- Use meson to build by default for RHEL 10 (from upstream) - Use meson to build by default for RHEL 10 (from upstream)

View File

@ -1 +1 @@
SHA512 (NetworkManager-1.47.90.tar.xz) = 8e2f397f00c9caa1cc8b3988ff003b843e3c54922549c637c08cf98bd0f79d2966fee9bf5f21ec5bc73c3d6acec98f810a2752c771542d267df4d26702d6c9a7 SHA512 (NetworkManager-1.47.91.tar.xz) = 83c536e57a6092ece636cb7b73385465782a7f2da34517b0fb151bcb080443a2c3ccf33cb88434df550b15249499365cdd9837de31c82ad874dd5a494e0ac62d