!176 upgrade to 1.42.8
From: @robertxw Reviewed-by: @gebidelidaye Signed-off-by: @gebidelidaye
This commit is contained in:
openeuler-ci-bot
Gitee
commit
5106de7c8f
Binary file not shown.
BIN
NetworkManager-1.42.8.tar.xz
Normal file
BIN
NetworkManager-1.42.8.tar.xz
Normal file
Binary file not shown.
@ -1,9 +1,8 @@
|
||||
%global dbus_glib_version 0.100
|
||||
%global wireless_tools_version 1:28-0pre9
|
||||
%global wpa_supplicant_version 1:1.1
|
||||
%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
|
||||
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
||||
%global real_version 1.32.12
|
||||
%global real_version 1.42.8
|
||||
%global snapshot %{nil}
|
||||
%global git_sha %{nil}
|
||||
%global obsoletes_device_plugins 1:0.9.9.95-1
|
||||
@ -34,9 +33,9 @@
|
||||
%bcond_with test
|
||||
%bcond_with lto
|
||||
%bcond_with sanitizer
|
||||
%bcond_with libnm_glib
|
||||
%bcond_without crypto_gnutls
|
||||
%bcond_without nm_cloud_setup
|
||||
%bcond_with firewalld_zone
|
||||
|
||||
%global dbus_version 1.1
|
||||
%global dbus_sys_dir %{_datadir}/dbus-1/system.d
|
||||
@ -48,9 +47,9 @@
|
||||
%global dhcp_default dhclient
|
||||
|
||||
Name: NetworkManager
|
||||
Version: 1.32.12
|
||||
Version: 1.42.8
|
||||
Epoch: 1
|
||||
Release: 18
|
||||
Release: 1
|
||||
Summary: Network Link Manager and User Applications
|
||||
License: GPLv2+
|
||||
URL: https://networkmanager.dev/
|
||||
@ -59,23 +58,22 @@ Source1: NetworkManager.conf
|
||||
Source2: 00-server.conf
|
||||
Patch1: fix-wants-and-add-requires.patch
|
||||
Patch2: bugfix-use-PartOf-replace-Requires-in-service.patch
|
||||
Patch3: bugfix-ipv6-external-route-miss.patch
|
||||
Patch4: bugfix-recover-to-30s-timeout-in-NetworkManager-wait-online.patch
|
||||
Patch3: bugfix-recover-to-30s-timeout-in-NetworkManager-wait-online.patch
|
||||
|
||||
Patch6000: backport-libnm-fix-crash-in-_nm_ip_route_validate_all-for-invalid-route.patch
|
||||
Patch6001: backport-libnm-fix-crash-on-failure-of-nm_vpn_plugin_info_new_from_file.patch
|
||||
Patch6002: backport-core-reload-config-for-active-devices.patch
|
||||
Patch6003: backport-libnm-fix-warning-when-setting-wrong-ethtool-ternary-value.patch
|
||||
Patch6004: fix-minor-written-mistake.patch
|
||||
Patch6005: NetworkManager-Add-sw64-architecture.patch
|
||||
Patch6006: delete-lease-file-when-connection-deleted.patch
|
||||
Patch6007: bugfix-correct-info-for-nmcli-device-connect.patch
|
||||
#Patch6006: delete-lease-file-when-connection-deleted.patch
|
||||
|
||||
BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel
|
||||
BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel
|
||||
BuildRequires: dbus-devel glib2-devel gobject-introspection-devel jansson-devel
|
||||
BuildRequires: dhclient readline-devel audit-libs-devel gtk-doc libudev-devel libuuid-devel /usr/bin/valac polkit-devel
|
||||
BuildRequires: iptables libxslt systemd systemd-devel libcurl-devel libndp-devel python3-gobject-base teamd-devel
|
||||
BuildRequires: iptables libxslt systemd systemd-devel libcurl-devel libndp-devel python3-gobject-base
|
||||
BuildRequires: ModemManager-glib-devel newt-devel /usr/bin/dbus-launch python3 python3-dbus libselinux-devel chrpath
|
||||
%if %{with team}
|
||||
BuildRequires: teamd-devel
|
||||
%endif
|
||||
%if %{with firewalld_zone}
|
||||
BuildRequires: firewalld-filesystem
|
||||
%endif
|
||||
|
||||
%if %{with bluetooth}
|
||||
BuildRequires: bluez-libs-devel
|
||||
@ -99,8 +97,6 @@ Provides: %{name}-dispatcher-routing-rules
|
||||
Obsoletes: %{name}-dispatcher-routing-rules
|
||||
Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release}
|
||||
Provides: %{name}-team
|
||||
Obsoletes: %{name}-team
|
||||
Provides: %{name}-tui
|
||||
Obsoletes: %{name}-tui
|
||||
Provides: %{name}-adsl
|
||||
@ -115,11 +111,23 @@ obtain IP addresses from a DHCP server, and change name servers
|
||||
whenever it sees fit.
|
||||
|
||||
|
||||
%if %{with nm_cloud_setup}
|
||||
%package cloud-setup
|
||||
Summary: Automatically configure NetworkManager in cloud
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description cloud-setup
|
||||
Installs a nm-cloud-setup tool that can automatically configure
|
||||
NetworkManager in cloud setups. Currently only EC2 is supported.
|
||||
This tool is still experimental.
|
||||
%endif
|
||||
%if %{with wifi}
|
||||
%package wifi
|
||||
Summary: Wifi plugin for NetworkManager
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: wpa_supplicant
|
||||
Requires: wireless-regdb
|
||||
|
||||
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
||||
|
||||
@ -158,6 +166,15 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
This package contains NetworkManager support for Open vSwitch bridges.
|
||||
%endif
|
||||
|
||||
%if %{with team}
|
||||
%package team
|
||||
Summary:Team device plugin for NetworkManager
|
||||
Requires:%{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Obsoletes:NetworkManager < %{obsoletes_device_plugins}
|
||||
|
||||
%description team
|
||||
This package contains NetworkManager support for team devices.
|
||||
%endif
|
||||
|
||||
%if %{with ppp}
|
||||
%package ppp
|
||||
@ -179,6 +196,8 @@ This package contains the libraries that add NetworkManager support to applicati
|
||||
%package libnm-devel
|
||||
Summary: Header files and Development files for adding NetworkManager support to applications (new API).
|
||||
Requires: %{name}-libnm = %{epoch}:%{version}-%{release} pkgconfig glib2-devel
|
||||
Requires: glib2-devel
|
||||
Requires: pkgconfig
|
||||
|
||||
%description libnm-devel
|
||||
This package contains the header and development files for
|
||||
@ -205,7 +224,7 @@ ethernet devices with no carrier.
|
||||
gtkdocize
|
||||
%endif
|
||||
autoreconf --install --force
|
||||
intltoolize --automake --copy --force
|
||||
#intltoolize --automake --copy --force
|
||||
%configure \
|
||||
--disable-silent-rules \
|
||||
--with-dhclient=yes \
|
||||
@ -253,12 +272,17 @@ intltoolize --automake --copy --force
|
||||
%else
|
||||
--with-iwd=no \
|
||||
%endif
|
||||
--enable-vala=yes \
|
||||
--enable-introspection \
|
||||
%if %{with regen_docs}
|
||||
--enable-gtk-doc \
|
||||
%if %{with nm_cloud_setup}
|
||||
--with-nm-cloud-setup=yes \
|
||||
%else
|
||||
--disable-gtk-doc \
|
||||
--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 \
|
||||
@ -274,9 +298,9 @@ intltoolize --automake --copy --force
|
||||
--enable-polkit=yes \
|
||||
--enable-polkit-agent \
|
||||
--enable-modify-system=yes \
|
||||
--enable-concheck \
|
||||
--without-libpsl \
|
||||
--without-ebpf \
|
||||
--enable-concheck=yes \
|
||||
--with-libpsl=no \
|
||||
--with-ebpf=no \
|
||||
--with-session-tracking=systemd \
|
||||
--with-suspend-resume=systemd \
|
||||
--with-systemdsystemunitdir=%{systemd_dir} \
|
||||
@ -290,6 +314,7 @@ intltoolize --automake --copy --force
|
||||
%endif
|
||||
--with-valgrind=no \
|
||||
--enable-ifcfg-rh=yes \
|
||||
--enable-ifupdown=no \
|
||||
%if %{with ppp}
|
||||
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
|
||||
--enable-ppp=yes \
|
||||
@ -299,11 +324,13 @@ intltoolize --automake --copy --force
|
||||
--with-config-dns-rc-manager-default=symlink \
|
||||
--with-config-logging-backend-default=journal \
|
||||
--enable-json-validation \
|
||||
%if %{with libnm_glib}
|
||||
--with-libnm-glib \
|
||||
%if %{with firewalld_zone}
|
||||
--enable-firewalld-zone=yes \
|
||||
%else
|
||||
--without-libnm-glib \
|
||||
--enable-firewalld-zone=no \
|
||||
%endif
|
||||
--with-resolvconf=no \
|
||||
--with-netconfig=no \
|
||||
%if %{with nm_cloud_setup}
|
||||
--with-nm-cloud_setup=yes
|
||||
%else
|
||||
@ -344,10 +371,19 @@ if [ -f "%{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.s
|
||||
fi
|
||||
|
||||
%post
|
||||
/usr/bin/udevadm control --reload-rules || :
|
||||
/usr/bin/udevadm trigger --subsystem-match=net || :
|
||||
%systemd_post NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
|
||||
%triggerin -- initscripts
|
||||
# skip triggering if udevd isn't even accessible, e.g. containers or
|
||||
# rpm-ostree-based systems
|
||||
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 [ -f %{_sbindir}/ifup -a ! -L %{_sbindir}/ifup ]; then
|
||||
/usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
|
||||
else
|
||||
@ -356,27 +392,46 @@ else
|
||||
fi
|
||||
/sbin/ldconfig
|
||||
|
||||
%if %{with nm_cloud_setup}
|
||||
%post cloud-setup
|
||||
%systemd_post %{systemd_units_cloud_setup}
|
||||
%endif
|
||||
|
||||
|
||||
%preun
|
||||
if [ $1 -eq 0 ]; then
|
||||
# Package removal, not upgrade
|
||||
/bin/systemctl --no-reload disable NetworkManager.service >/dev/null 2>&1 || :
|
||||
/usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
|
||||
fi
|
||||
%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service
|
||||
%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
|
||||
|
||||
%if %{with nm_cloud_setup}
|
||||
%preun cloud-setup
|
||||
%systemd_preun %{systemd_units_cloud_setup}
|
||||
%endif
|
||||
|
||||
|
||||
%postun
|
||||
/usr/bin/udevadm control --reload-rules || :
|
||||
/usr/bin/udevadm trigger --subsystem-match=net || :
|
||||
|
||||
%systemd_postun NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
|
||||
%systemd_postun NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
|
||||
|
||||
%ldconfig_scriptlets glib
|
||||
%ldconfig_scriptlets libnm
|
||||
/sbin/ldconfig
|
||||
%if %{with nm_cloud_setup}
|
||||
%postun cloud-setup
|
||||
%systemd_postun %{systemd_units_cloud_setup}
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS
|
||||
%license COPYING
|
||||
%license COPYING.LGPL
|
||||
%license COPYING.GFDL
|
||||
%{_datadir}/doc/NetworkManager/examples/server.conf
|
||||
%{_bindir}/nmcli
|
||||
%{_bindir}/nm-online
|
||||
@ -389,9 +444,11 @@ fi
|
||||
%{systemd_dir}/NetworkManager.service
|
||||
%{systemd_dir}/NetworkManager-wait-online.service
|
||||
%{systemd_dir}/NetworkManager-dispatcher.service
|
||||
%{systemd_dir}/nm-priv-helper.service
|
||||
%{_prefix}/lib/udev/rules.d/*.rules
|
||||
%{_libdir}/%{name}/%{version}-%{release}/libnm-settings-plugin-ifcfg-rh.so
|
||||
%{_libexecdir}/nm-if*
|
||||
%{_libexecdir}/nm-priv-helper
|
||||
%{_libexecdir}/nm-dhcp-helper
|
||||
%{_libexecdir}/nm-daemon-helper
|
||||
%{_libexecdir}/nm-dispatcher
|
||||
@ -411,22 +468,29 @@ fi
|
||||
%{_sysconfdir}/%{name}/dispatcher.d/no-wait.d/10-ifcfg-rh-routes.sh
|
||||
%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh
|
||||
%{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
|
||||
%if %{with team}
|
||||
%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-team.so
|
||||
%endif
|
||||
%{_bindir}/nmtui*
|
||||
%if %{with adsl}
|
||||
%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-adsl.so
|
||||
%endif
|
||||
%if %{with firewalld_zone}
|
||||
%{_prefix}/lib/firewalld/zones/nm-shared.xml
|
||||
%endif
|
||||
%config(noreplace) /etc/ld.so.conf.d/*
|
||||
|
||||
%if %{with nm_cloud_setup}
|
||||
%files cloud-setup
|
||||
%{_libexecdir}/nm-cloud-setup
|
||||
%{systemd_dir}/nm-cloud-setup.service
|
||||
%{systemd_dir}/nm-cloud-setup.timer
|
||||
%{_prefix}/lib/%{name}/dispatcher.d/90-nm-cloud-setup.sh
|
||||
%{_prefix}/lib/%{name}/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
|
||||
%endif
|
||||
%{_prefix}/lib/firewalld/zones/nm-shared.xml
|
||||
%config(noreplace) /etc/ld.so.conf.d/*
|
||||
|
||||
%if %{with team}
|
||||
%files team
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-team.so
|
||||
%endif
|
||||
|
||||
%if %{with wwan}
|
||||
%files wwan
|
||||
@ -478,7 +542,7 @@ fi
|
||||
|
||||
%files help
|
||||
%defattr(-,root,root)
|
||||
%doc CONTRIBUTING.md NEWS README TODO
|
||||
%doc CONTRIBUTING.md NEWS TODO
|
||||
%{_mandir}/man1/nmcli.1.gz
|
||||
%{_mandir}/man1/nm-online.1.gz
|
||||
%{_mandir}/man5/*.5.gz
|
||||
@ -490,6 +554,12 @@ fi
|
||||
%{_datadir}/gtk-doc/html/NetworkManager/*
|
||||
|
||||
%changelog
|
||||
* Sat Jul 29 2023 gaoxingwang <gaoxingwang1@huawei.com> - 1:1.42.8-1
|
||||
- Type:requirement
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:update to 1.42.8
|
||||
|
||||
* Thu Mar 30 2023 Dongxing Wang <dxwangk@isoftstone.com> - 1:1.32.12-18
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From e2b75a388672eee514e4efa02b506b0a9ffaa9f0 Mon Sep 17 00:00:00 2001
|
||||
From: Fernando Fernandez Mancera <ffmancera@riseup.net>
|
||||
Date: Sun, 17 Oct 2021 12:12:58 +0200
|
||||
Subject: [PATCH] core: reload config for active devices
|
||||
|
||||
When NetworkManager is reloaded the config from active devices is not
|
||||
being reloaded properly.
|
||||
|
||||
Related: https://bugzilla.redhat.com/1852445
|
||||
|
||||
Fixes: 121c58f0c48d ('core: set number of SR-IOV VFs asynchronously')
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/e2b75a388672eee514e4efa02b506b0a9ffaa9f0
|
||||
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
|
||||
(cherry picked from commit ff9b64c923abf072aa789862be94bcb0de08e2f4)
|
||||
---
|
||||
src/core/devices/nm-device.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
|
||||
index 50386d0018..7bfdf80137 100644
|
||||
--- a/src/core/devices/nm-device.c
|
||||
+++ b/src/core/devices/nm-device.c
|
||||
@@ -5976,9 +5976,10 @@ config_changed(NMConfig * config,
|
||||
{
|
||||
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
|
||||
|
||||
- if (priv->state <= NM_DEVICE_STATE_DISCONNECTED || priv->state > NM_DEVICE_STATE_ACTIVATED) {
|
||||
+ if (priv->state <= NM_DEVICE_STATE_DISCONNECTED || priv->state >= NM_DEVICE_STATE_ACTIVATED) {
|
||||
priv->ignore_carrier = nm_config_data_get_ignore_carrier(config_data, self);
|
||||
- if (NM_FLAGS_HAS(changes, NM_CONFIG_CHANGE_VALUES))
|
||||
+ if (NM_FLAGS_HAS(changes, NM_CONFIG_CHANGE_VALUES)
|
||||
+ && !nm_device_get_applied_setting(self, NM_TYPE_SETTING_SRIOV))
|
||||
device_init_static_sriov_num_vfs(self);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.23.0
|
||||
@ -1,55 +0,0 @@
|
||||
From 00723dd5e85ce5eb27e189acad3fe76b09ff2890 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Bubela <vbubela@redhat.com>
|
||||
Date: Wed, 29 Sep 2021 12:38:40 +0200
|
||||
Subject: [PATCH] libnm: fix crash in _nm_ip_route_validate_all for invalid
|
||||
route
|
||||
|
||||
backtrace from coredump, NetworkManager-1.30.6-1.fc34
|
||||
|
||||
#0 verify
|
||||
(setting=0x55d081fe8690, connection=<optimized out>, error=0x7ffe0fa06870)
|
||||
at libnm-core/nm-setting-ip-config.c:5249
|
||||
#1 0x000055d081ab98d4 in verify
|
||||
(setting=0x55d081fe8690, connection=0x55d0820a2b80, error=0x7ffe0fa06870)
|
||||
at libnm-core/nm-setting-ip4-config.c:119
|
||||
#2 0x000055d081aa3d54 in _nm_connection_verify
|
||||
(connection=0x55d0820a2b80, error=0x7ffe0fa068c0)
|
||||
at libnm-core/nm-connection.c:1441
|
||||
#3 0x000055d081aa78ec in nm_connection_normalize
|
||||
(connection=0x55d0820a2b80, parameters=0x0, modified=0x0, error=0x7ffe0fa06de8)
|
||||
at libnm-core/nm-connection.c:1688
|
||||
#4 0x000055d081aa81f4 in _nm_connection_replace_settings
|
||||
(connection=0x55d0820a2b80, new_settings=<optimized out>, parse_flags=_NM_SETTING_PARSE_FLAGS_LAST, error=0x7ffe0fa06de8) at libnm-core/nm-connection.c:432
|
||||
#5 0x000055d081aa83a6 in _nm_simple_connection_new_from_dbus
|
||||
(dict=0x55d082089950, error=0x7ffe0fa06de8, parse_flags=_NM_SETTING_PARSE_FLAGS_LAST) at libnm-core/nm-simple-connection.c:77
|
||||
#6 0x000055d081bbf942 in settings_connection_update
|
||||
(self=0x55d081fdd9f0, is_update2=1, context=0x7fc06c021dd0, new_settings=0x55d082089950, flags=NM_SETTINGS_UPDATE2_FLAG_TO_DISK)
|
||||
at src/core/settings/nm-settings-connection.c:1637
|
||||
#7 0x000055d081bbfb09 in impl_settings_connection_update2
|
||||
(obj=0x55d081fdd9f0, interface_info=<optimized out>, method_info=<optimized out>, connection=<optimized out>, sender=<optimized out>, invocation=0x7fc06c021dd0, parameters=0x55d0820f5e60) at src/core/settings/nm-settings-connection.c:1796
|
||||
#8 0x00007fc08a9db482 in call_in_idle_cb.lto_priv () at /lib64/libgio-2.0.so.0
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/00723dd5e85ce5eb27e189acad3fe76b09ff2890
|
||||
|
||||
Fixes: bb6c2d73713f ('libnm: ensure stable behavior in _nm_ip_route_attribute_validate_all()')
|
||||
(cherry picked from commit 0ed099374d92d1c4f7472df5fe503f3cd3e67905)
|
||||
---
|
||||
src/libnm-core-impl/nm-setting-ip-config.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c
|
||||
index f37e9d351e..311babefa1 100644
|
||||
--- a/src/libnm-core-impl/nm-setting-ip-config.c
|
||||
+++ b/src/libnm-core-impl/nm-setting-ip-config.c
|
||||
@@ -1440,7 +1440,7 @@ _nm_ip_route_attribute_validate_all(const NMIPRoute *route, GError **error)
|
||||
const char *key = attrs[i].name;
|
||||
GVariant * val2 = attrs[i].value_ptr;
|
||||
|
||||
- if (!nm_ip_route_attribute_validate(key, val2, route->family, NULL, NULL))
|
||||
+ if (!nm_ip_route_attribute_validate(key, val2, route->family, NULL, error))
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
--
|
||||
2.23.0
|
||||
@ -1,52 +0,0 @@
|
||||
From 9d7c09261475b29e30f62d7ea644ec5a782e6cec Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
Date: Mon, 11 Oct 2021 22:16:00 +0200
|
||||
Subject: [PATCH] libnm: fix crash on failure of
|
||||
nm_vpn_plugin_info_new_from_file()
|
||||
|
||||
nm_vpn_plugin_info_new_from_file() may fail as NMVpnPlugin is an
|
||||
GInitable. As such, the destructor must handle the case where the
|
||||
instance was only partly initialized.
|
||||
|
||||
#0 g_logv (log_domain=0x7f7144703071 "GLib", log_level=G_LOG_LEVEL_CRITICAL, format=<optimized out>, args=<optimized out>) at ../glib/gmessages.c:1413
|
||||
#1 0x00007f71446b3903 in g_log (log_domain=<optimized out>, log_level=<optimized out>, format=<optimized out>) at ../glib/gmessages.c:1451
|
||||
#2 0x000056455b8e58d0 in finalize (object=0x7f7128008180 [NMVpnPluginInfo]) at src/libnm-core-impl/nm-vpn-plugin-info.c:1280
|
||||
#3 0x00007f71447b8b18 in g_object_unref (_object=<optimized out>) at ../gobject/gobject.c:3524
|
||||
#4 g_object_unref (_object=0x7f7128008180) at ../gobject/gobject.c:3416
|
||||
#5 0x00007f714486bc09 in g_initable_new_valist
|
||||
(object_type=<optimized out>, first_property_name=0x56455b925c20 "filename", var_args=var_args@entry=0x7ffe702b1140, cancellable=cancellable@entry=0x0, error=error@entry=0x7ffe702b1248) at ../gio/ginitable.c:250
|
||||
#6 0x00007f714486bcad in g_initable_new
|
||||
(object_type=<optimized out>, cancellable=cancellable@entry=0x0, error=error@entry=0x7ffe702b1248, first_property_name=first_property_name@entry=0x56455b925c20 "filename")
|
||||
at ../gio/ginitable.c:162
|
||||
#7 0x000056455b8e69f6 in nm_vpn_plugin_info_new_from_file
|
||||
(filename=filename@entry=0x56455c951ec0 "/opt/test/lib/NetworkManager/VPN/nm-openvpn-service.name", error=error@entry=0x7ffe702b1248) at src/libnm-core-impl/nm-vpn-plugin-info.c:1221
|
||||
#8 0x000056455b88ce9a in vpn_dir_changed
|
||||
(monitor=monitor@entry=0x7f7128007860 [GInotifyFileMonitor], file=file@entry=0x7f712c005600, other_file=other_file@entry=0x0, event_type=<optimized out>, user_data=<optimized out>)
|
||||
at src/core/vpn/nm-vpn-manager.c:182
|
||||
#9 0x00007f71448697a3 in _g_cclosure_marshal_VOID__OBJECT_OBJECT_ENUMv
|
||||
(closure=0x56455c7e4250, return_value=<optimized out>, instance=<optimized out>, args=<optimized out>, marshal_data=<optimized out>, n_params=<optimized out>, param_types=0x56455c7355a0) at ../gio/gmarshal-internal.c:1380
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/9d7c09261475b29e30f62d7ea644ec5a782e6cec
|
||||
|
||||
Fixes: d6226bd98713 ('libnm: add NMVpnPluginInfo class')
|
||||
(cherry picked from commit 841c45a4f5c0ee34674fe24ef8f9198ca506a64e)
|
||||
---
|
||||
src/libnm-core-impl/nm-vpn-plugin-info.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libnm-core-impl/nm-vpn-plugin-info.c b/src/libnm-core-impl/nm-vpn-plugin-info.c
|
||||
index dc77dfd025..665863d108 100644
|
||||
--- a/src/libnm-core-impl/nm-vpn-plugin-info.c
|
||||
+++ b/src/libnm-core-impl/nm-vpn-plugin-info.c
|
||||
@@ -1277,7 +1277,7 @@ finalize(GObject *object)
|
||||
g_free(priv->auth_dialog);
|
||||
g_strfreev(priv->aliases);
|
||||
g_free(priv->filename);
|
||||
- g_hash_table_unref(priv->keys);
|
||||
+ nm_g_hash_table_unref(priv->keys);
|
||||
|
||||
nm_clear_pointer(&priv->keyfile, g_key_file_unref);
|
||||
|
||||
--
|
||||
2.23.0
|
||||
@ -1,36 +0,0 @@
|
||||
From 45f8c78c61e5b42f5b39c354f83109bae3cdcf43 Mon Sep 17 00:00:00 2001
|
||||
From: Beniamino Galvani <bgalvani@redhat.com>
|
||||
Date: Mon, 20 Dec 2021 07:46:59 +0100
|
||||
Subject: [PATCH] libnm: fix warning when setting wrong ethtool ternary value
|
||||
|
||||
$ nmcli connection modify dummy1 ethtool.feature-rx a
|
||||
(process:3077356): GLib-WARNING **: GError set over the top of a previous GError or uninitialized memory.
|
||||
This indicates a bug in someone's code. You must ensure an error is NULL before it's set.
|
||||
The overwriting error message was: 'a' is not valid; use 'on', 'off', or 'ignore'
|
||||
Error: failed to modify ethtool.feature-rx: 'a' is not valid; use [true, yes, on], [false, no, off] or [unknown].
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/45f8c78c61e5b42f5b39c354f83109bae3cdcf43
|
||||
|
||||
Fixes: e5b46aa38ab1 ('cli: use nmc_string_to_ternary() to parse ternary in _set_fcn_ethtool()')
|
||||
(cherry picked from commit 25e705c361c5edbf152c5a2570c0038faa4195cf)
|
||||
(cherry picked from commit 2aa19708c217f4ae46f939d80c565ca156af7ee3)
|
||||
---
|
||||
src/libnmc-setting/nm-meta-setting-desc.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libnmc-setting/nm-meta-setting-desc.c b/src/libnmc-setting/nm-meta-setting-desc.c
|
||||
index 1cc5f9c15f..1ee9e3077c 100644
|
||||
--- a/src/libnmc-setting/nm-meta-setting-desc.c
|
||||
+++ b/src/libnmc-setting/nm-meta-setting-desc.c
|
||||
@@ -4318,7 +4318,7 @@ static gboolean _set_fcn_ethtool(ARGS_SET_FCN)
|
||||
if (!nmc_string_to_ternary_full(value,
|
||||
NMC_STRING_TO_TERNARY_FLAGS_IGNORE_FOR_DEFAULT,
|
||||
&t,
|
||||
- error)) {
|
||||
+ NULL)) {
|
||||
g_set_error(error,
|
||||
NM_UTILS_ERROR,
|
||||
NM_UTILS_ERROR_INVALID_ARGUMENT,
|
||||
--
|
||||
2.23.0
|
||||
@ -1,25 +0,0 @@
|
||||
From 50ffde33c10ad5c536857bcdfcd815b9a25b9de7 Mon Sep 17 00:00:00 2001
|
||||
From: desert-sailor <dxwangk@isoftstone.com>
|
||||
Date: Thu, 30 Mar 2023 15:24:14 +0800
|
||||
Subject: [PATCH] bugfix for incorrect translations
|
||||
|
||||
---
|
||||
po/zh_CN.po | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/po/zh_CN.po b/po/zh_CN.po
|
||||
index 6df2d6a..de279f8 100644
|
||||
--- a/po/zh_CN.po
|
||||
+++ b/po/zh_CN.po
|
||||
@@ -12456,7 +12456,7 @@ msgstr "错误：超时时间 %d 秒已到。"
|
||||
#: ../src/nmcli/devices.c:2076
|
||||
#, c-format
|
||||
msgid "Device '%s' successfully activated with '%s'.\n"
|
||||
-msgstr "成功用 \"%s%s\" 激活了设备 \"\"。\n"
|
||||
+msgstr "设备 \"%s\" 成功以 \"%s\" 激活。\n"
|
||||
|
||||
#: ../src/nmcli/devices.c:2082
|
||||
#, c-format
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,94 +0,0 @@
|
||||
From 386467d16455cc027d1ff9a6ef65d01c172a9f8f Mon Sep 17 00:00:00 2001
|
||||
From: gaoxingwang <gaoxingwang@huawei.com>
|
||||
Date: Mon, 7 Mar 2022 11:04:17 +0800
|
||||
Subject: [PATCH] revert external flag
|
||||
|
||||
---
|
||||
src/libnm-platform/nm-platform.c | 44 ++++++++------------------------
|
||||
1 file changed, 10 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c
|
||||
index b7a65df..9b9c194 100644
|
||||
--- a/src/libnm-platform/nm-platform.c
|
||||
+++ b/src/libnm-platform/nm-platform.c
|
||||
@@ -4528,20 +4528,6 @@ nm_platform_ip_route_sync(NMPlatform *self,
|
||||
|
||||
conf_o = routes->pdata[i];
|
||||
|
||||
- if (NMP_OBJECT_CAST_IP_ROUTE(conf_o)->is_external) {
|
||||
- /* This route is added externally. We don't have our own agenda to
|
||||
- * add it, so skip. */
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- /* User space cannot add IPv6 routes with metric 0. However, kernel can, and we might track such
|
||||
- * routes in @route as they are present external. As we already skipped external routes above,
|
||||
- * we don't expect a user's choice to add such a route (it won't work anyway). */
|
||||
- nm_assert(
|
||||
- IS_IPv4
|
||||
- || nm_platform_ip6_route_get_effective_metric(NMP_OBJECT_CAST_IP6_ROUTE(conf_o))
|
||||
- != 0);
|
||||
-
|
||||
#define VTABLE_IS_DEVICE_ROUTE(vt, o) \
|
||||
(vt->is_ip4 ? (NMP_OBJECT_CAST_IP4_ROUTE(o)->gateway == 0) \
|
||||
: IN6_IS_ADDR_UNSPECIFIED(&NMP_OBJECT_CAST_IP6_ROUTE(o)->gateway))
|
||||
@@ -4558,7 +4544,7 @@ nm_platform_ip_route_sync(NMPlatform *self,
|
||||
routes_idx = g_hash_table_new((GHashFunc) nmp_object_id_hash,
|
||||
(GEqualFunc) nmp_object_id_equal);
|
||||
}
|
||||
- if (!g_hash_table_add(routes_idx, (gpointer) conf_o)) {
|
||||
+ if (!g_hash_table_insert(routes_idx, (gpointer) conf_o, (gpointer) conf_o)) {
|
||||
_LOG3D("route-sync: skip adding duplicate route %s",
|
||||
nmp_object_to_string(conf_o,
|
||||
NMP_OBJECT_TO_STRING_PUBLIC,
|
||||
@@ -4567,6 +4553,14 @@ nm_platform_ip_route_sync(NMPlatform *self,
|
||||
continue;
|
||||
}
|
||||
|
||||
+ if (!IS_IPv4
|
||||
+ && nm_platform_ip6_route_get_effective_metric(NMP_OBJECT_CAST_IP6_ROUTE(conf_o))
|
||||
+ == 0) {
|
||||
+ /* User space cannot add routes with metric 0. However, kernel can, and we might track such
|
||||
+ * routes in @route as they are present external. Skip them silently. */
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
plat_entry = nm_platform_lookup_entry(self, NMP_CACHE_ID_TYPE_OBJECT_TYPE, conf_o);
|
||||
if (plat_entry) {
|
||||
const NMPObject *plat_o;
|
||||
@@ -4729,24 +4723,6 @@ sync_route_add:
|
||||
}
|
||||
|
||||
if (routes_prune) {
|
||||
- if (routes) {
|
||||
- for (i = 0; i < routes->len; i++) {
|
||||
- conf_o = routes->pdata[i];
|
||||
-
|
||||
- if (NMP_OBJECT_CAST_IP_ROUTE(conf_o)->is_external) {
|
||||
- /* this is only to catch the case where an external route is
|
||||
- * both in @routes and @routes_prune list. In that case,
|
||||
- * @routes should win and we should not remove the address. */
|
||||
- if (!routes_idx) {
|
||||
- routes_idx = g_hash_table_new((GHashFunc) nmp_object_id_hash,
|
||||
- (GEqualFunc) nmp_object_id_equal);
|
||||
- }
|
||||
- g_hash_table_add(routes_idx, (gpointer) conf_o);
|
||||
- continue;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
for (i = 0; i < routes_prune->len; i++) {
|
||||
const NMPObject *prune_o;
|
||||
|
||||
@@ -4757,7 +4733,7 @@ sync_route_add:
|
||||
|| (!NM_IS_IPv4(addr_family)
|
||||
&& NMP_OBJECT_GET_TYPE(prune_o) == NMP_OBJECT_TYPE_IP6_ROUTE));
|
||||
|
||||
- if (nm_g_hash_table_lookup(routes_idx, prune_o))
|
||||
+ if (routes_idx && g_hash_table_lookup(routes_idx, prune_o))
|
||||
continue;
|
||||
|
||||
if (!nm_platform_lookup_entry(self, NMP_CACHE_ID_TYPE_OBJECT_TYPE, prune_o))
|
||||
--
|
||||
2.33.0
|
||||
@ -1,35 +0,0 @@
|
||||
From 775f9254884041d9d85affade706f2e223a9b755 Mon Sep 17 00:00:00 2001
|
||||
From: yuelg <yuelg@chinaunicom.cn>
|
||||
Date: Tue, 15 Nov 2022 21:53:04 +0800
|
||||
Subject: [PATCH] Fix minor written mistake
|
||||
|
||||
Signed-off-by: yuelg <yuelg@chinaunicom.cn>
|
||||
---
|
||||
po/zh_CN.po | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/po/zh_CN.po b/po/zh_CN.po
|
||||
index 6df2d6a..2b4b10a 100644
|
||||
--- a/po/zh_CN.po
|
||||
+++ b/po/zh_CN.po
|
||||
@@ -9856,7 +9856,7 @@ msgstr "访问遭到拒绝"
|
||||
|
||||
#: ../src/nmcli/common.c:1444
|
||||
msgid "NetworkManager is not running"
|
||||
-msgstr "NetworkManaer 未运行"
|
||||
+msgstr "NetworkManager 未运行"
|
||||
|
||||
#: ../src/nmcli/common.c:1454
|
||||
msgid "none"
|
||||
@@ -13145,7 +13145,7 @@ msgstr "错误：只允许使用这些字段：%s"
|
||||
#: ../src/nmcli/general.c:540 ../src/nmtui/nmtui.c:246
|
||||
#, c-format
|
||||
msgid "NetworkManager is not running."
|
||||
-msgstr "NetworkManaer 未运行。"
|
||||
+msgstr "NetworkManager 未运行。"
|
||||
|
||||
#: ../src/nmcli/general.c:562
|
||||
msgid "NetworkManager permissions"
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user