update to 1.24.2
This commit is contained in:
compile_success
parent
2c42de3233
commit
5471469fa8
Binary file not shown.
BIN
NetworkManager-1.24.2.tar.xz
Normal file
BIN
NetworkManager-1.24.2.tar.xz
Normal file
Binary file not shown.
@ -3,7 +3,7 @@
|
||||
%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.20.10
|
||||
%global real_version 1.24.2
|
||||
%global snapshot %{nil}
|
||||
%global git_sha %{nil}
|
||||
%global obsoletes_device_plugins 1:0.9.9.95-1
|
||||
@ -37,6 +37,7 @@
|
||||
%bcond_with sanitizer
|
||||
%bcond_with libnm_glib
|
||||
%bcond_without crypto_gnutls
|
||||
%bcond_without nm_cloud_setup
|
||||
|
||||
%global dbus_version 1.1
|
||||
%global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
|
||||
@ -44,18 +45,17 @@
|
||||
%global dhcp_default dhclient
|
||||
|
||||
Name: NetworkManager
|
||||
Version: 1.20.10
|
||||
Version: 1.24.2
|
||||
Epoch: 1
|
||||
Release: 2
|
||||
Release: 1
|
||||
Summary: Network Link Manager and User Applications
|
||||
License: GPLv2+
|
||||
URL: https://www.gnome.org/projects/NetworkManager/
|
||||
Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz
|
||||
Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{version}.tar.xz
|
||||
Source1: NetworkManager.conf
|
||||
Source2: 00-server.conf
|
||||
# PATCH-FEATURE-FIX fix-wants-and-add-requires.patch --fix wants and add requires in the file of NetworkManager.service.in
|
||||
Patch9000: fix-wants-and-add-requires.patch
|
||||
Patch9001: bugfix-NetworkManager-tui-solve-bond-module.patch
|
||||
Patch9002: bugfix-NetworkManager-tui-bond-page-when-modify.patch
|
||||
|
||||
BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel
|
||||
@ -148,7 +148,7 @@ ethernet devices with no carrier.
|
||||
%package_help
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n NetworkManager-%{real_version}
|
||||
%autosetup -p1 -n NetworkManager-%{version}
|
||||
|
||||
%build
|
||||
%if %{with regen_docs}
|
||||
@ -250,10 +250,16 @@ intltoolize --automake --copy --force
|
||||
--with-config-logging-backend-default=journal \
|
||||
--enable-json-validation \
|
||||
%if %{with libnm_glib}
|
||||
--with-libnm-glib
|
||||
--with-libnm-glib \
|
||||
%else
|
||||
--without-libnm-glib
|
||||
--without-libnm-glib \
|
||||
%endif
|
||||
%if %{with nm_cloud_setup}
|
||||
--with-nm-cloud_setup=yes
|
||||
%else
|
||||
--with-nm-cloud_setup=no
|
||||
%endif
|
||||
|
||||
make
|
||||
|
||||
%install
|
||||
@ -347,7 +353,7 @@ fi
|
||||
%{_sysconfdir}/%{name}/dispatcher.d/10-ifcfg-rh-routes.sh
|
||||
%{_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/2.4.7/nm-pppd-plugin.so
|
||||
%{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
|
||||
%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-wifi.so
|
||||
%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-team.so
|
||||
%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-ovs.so
|
||||
@ -356,6 +362,14 @@ fi
|
||||
%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-bluetooth.so
|
||||
%{_bindir}/nmtui*
|
||||
%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-adsl.so
|
||||
%if %{with nm_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
|
||||
|
||||
%files wwan
|
||||
%defattr(-,root,root)
|
||||
@ -393,6 +407,9 @@ fi
|
||||
%{_datadir}/gtk-doc/html/NetworkManager/*
|
||||
|
||||
%changelog
|
||||
* Thu Jul 30 2020 zhujunhao <zhujunhao8@huawei.com> - 1.24.2-1
|
||||
- update t0 1.24.2
|
||||
|
||||
* Thu Jul 2 2020 gaoxingwang <gxw94linux@163.com> - 1.20.10-2
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
@ -1,94 +0,0 @@
|
||||
diff -Nur NetworkManager-1.20.10.org/libnm-core/nm-core-internal.h NetworkManager-1.20.10/libnm-core/nm-core-internal.h
|
||||
--- NetworkManager-1.20.10.org/libnm-core/nm-core-internal.h 2020-06-12 11:29:24.997178184 +0800
|
||||
+++ NetworkManager-1.20.10/libnm-core/nm-core-internal.h 2020-06-12 14:14:02.965298351 +0800
|
||||
@@ -495,6 +495,7 @@
|
||||
NM_BOND_OPTION_TYPE_IP,
|
||||
NM_BOND_OPTION_TYPE_MAC,
|
||||
NM_BOND_OPTION_TYPE_IFNAME,
|
||||
+ NM_BOND_OPTION_TYPE_PRIMARY_SLAVE,
|
||||
} NMBondOptionType;
|
||||
|
||||
NMBondOptionType
|
||||
diff -Nur NetworkManager-1.20.10.org/libnm-core/nm-setting-bond.c NetworkManager-1.20.10/libnm-core/nm-setting-bond.c
|
||||
--- NetworkManager-1.20.10.org/libnm-core/nm-setting-bond.c 2020-06-12 11:29:24.997178184 +0800
|
||||
+++ NetworkManager-1.20.10/libnm-core/nm-setting-bond.c 2020-06-12 14:19:44.310508536 +0800
|
||||
@@ -77,7 +77,7 @@
|
||||
{ NM_SETTING_BOND_OPTION_ARP_IP_TARGET, "", NM_BOND_OPTION_TYPE_IP },
|
||||
{ NM_SETTING_BOND_OPTION_ARP_VALIDATE, "none", NM_BOND_OPTION_TYPE_BOTH, 0, 6,
|
||||
{ "none", "active", "backup", "all", "filter", "filter_active", "filter_backup", NULL } },
|
||||
- { NM_SETTING_BOND_OPTION_PRIMARY, "", NM_BOND_OPTION_TYPE_IFNAME },
|
||||
+ { NM_SETTING_BOND_OPTION_PRIMARY, "", NM_BOND_OPTION_TYPE_PRIMARY_SLAVE },
|
||||
{ NM_SETTING_BOND_OPTION_PRIMARY_RESELECT, "always", NM_BOND_OPTION_TYPE_BOTH, 0, 2,
|
||||
{ "always", "better", "failure", NULL } },
|
||||
{ NM_SETTING_BOND_OPTION_FAIL_OVER_MAC, "none", NM_BOND_OPTION_TYPE_BOTH, 0, 2,
|
||||
@@ -232,7 +232,16 @@
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
+static gboolean
|
||||
+nm_check_primary_slave (const char *value)
|
||||
+{
|
||||
+ if (!value || !value[0]){
|
||||
+ return TRUE;
|
||||
+ }
|
||||
|
||||
+
|
||||
+ return nm_utils_is_valid_iface_name (value, NULL);
|
||||
+}
|
||||
static gboolean
|
||||
validate_ifname (const char *name, const char *value)
|
||||
{
|
||||
@@ -280,6 +289,8 @@
|
||||
return nm_utils_hwaddr_valid (value, ETH_ALEN);
|
||||
case NM_BOND_OPTION_TYPE_IFNAME:
|
||||
return validate_ifname (name, value);
|
||||
+ case NM_BOND_OPTION_TYPE_PRIMARY_SLAVE:
|
||||
+ return nm_check_primary_slave (value);
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
@@ -333,6 +344,9 @@
|
||||
const char *value)
|
||||
{
|
||||
NMSettingBondPrivate *priv;
|
||||
+ const char *init_updelay = "0";
|
||||
+ const char *init_downdelay = "0";
|
||||
+ const char *tmp = NULL;
|
||||
|
||||
g_return_val_if_fail (NM_IS_SETTING_BOND (setting), FALSE);
|
||||
|
||||
@@ -348,11 +362,22 @@
|
||||
&& strcmp (value, "0") != 0) {
|
||||
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_ARP_INTERVAL);
|
||||
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_ARP_IP_TARGET);
|
||||
+
|
||||
+ tmp = g_hash_table_lookup (NM_SETTING_BOND_GET_PRIVATE (setting)->options, NM_SETTING_BOND_OPTION_DOWNDELAY);
|
||||
+ if(!tmp){
|
||||
+ g_hash_table_insert (priv->options, g_strdup (NM_SETTING_BOND_OPTION_DOWNDELAY), g_strdup (init_downdelay));
|
||||
+ }
|
||||
+ tmp = g_hash_table_lookup (NM_SETTING_BOND_GET_PRIVATE (setting)->options,NM_SETTING_BOND_OPTION_UPDELAY);
|
||||
+ if(!tmp){
|
||||
+ g_hash_table_insert (priv->options, g_strdup (NM_SETTING_BOND_OPTION_UPDELAY),g_strdup (init_updelay));
|
||||
+ }
|
||||
} else if ( !strcmp (name, NM_SETTING_BOND_OPTION_ARP_INTERVAL)
|
||||
&& strcmp (value, "0") != 0) {
|
||||
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_MIIMON);
|
||||
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_DOWNDELAY);
|
||||
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_UPDELAY);
|
||||
+ }else if( !strcmp (name, NM_SETTING_BOND_OPTION_PRIMARY) && !strcmp (value, "") ){
|
||||
+ g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_PRIMARY);
|
||||
}
|
||||
|
||||
_notify (setting, PROP_OPTIONS);
|
||||
diff -Nur NetworkManager-1.20.10.org/libnm-core/tests/test-setting.c NetworkManager-1.20.10/libnm-core/tests/test-setting.c
|
||||
--- NetworkManager-1.20.10.org/libnm-core/tests/test-setting.c 2020-06-12 11:29:24.993178124 +0800
|
||||
+++ NetworkManager-1.20.10/libnm-core/tests/test-setting.c 2020-06-12 14:08:36.560383748 +0800
|
||||
@@ -688,7 +688,7 @@
|
||||
((const char *[]){ "mode", "802.3ad", "ad_actor_system", "00:02:03:04:05:06", NULL }));
|
||||
test_bond_normalize_options (
|
||||
((const char *[]){ "mode", "1", "miimon", "1", NULL }),
|
||||
- ((const char *[]){ "mode", "active-backup", "miimon", "1", NULL }));
|
||||
+ ((const char *[]){ "mode", "active-backup", "miimon", "1", NM_SETTING_BOND_OPTION_DOWNDELAY, "0", NM_SETTING_BOND_OPTION_UPDELAY, "0", NULL }));
|
||||
test_bond_normalize_options (
|
||||
((const char *[]){ "mode", "balance-alb", "tlb_dynamic_lb", "1", NULL }),
|
||||
((const char *[]){ "mode", "balance-alb", NULL }));
|
||||
Loading…
x
Reference in New Issue
Block a user