diff --git a/NetworkManager-1.16.0.tar.xz b/NetworkManager-1.26.2.tar.xz similarity index 39% rename from NetworkManager-1.16.0.tar.xz rename to NetworkManager-1.26.2.tar.xz index 8750a6de66dfbea5927f6923f2ae9f1d2c987506..7f6af0251290b9ffe7093a949e65bb616df8eb43 100644 Binary files a/NetworkManager-1.16.0.tar.xz and b/NetworkManager-1.26.2.tar.xz differ diff --git a/NetworkManager.spec b/NetworkManager.spec index 296a498a21d1a25e3b4eb9728724a2858aa795cf..6e4067df37ff70d4092761585fe390ca76ae274d 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -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.16.0 +%global real_version 1.26.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,20 +45,17 @@ %global dhcp_default dhclient Name: NetworkManager -Version: 1.16.0 +Version: 1.26.2 Epoch: 1 -Release: 7 +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 -Patch9003: bugfix-NetworkManager-tui-solve-team-page-problem-when-use-json.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 @@ -149,7 +147,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} @@ -251,10 +249,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 @@ -348,7 +352,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 @@ -357,6 +361,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) @@ -394,6 +406,9 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Thu Aug 27 2020 yuboyun - 1.26.2-1 +- update to 1.26.2 + * Thu Feb 27 2020 openEuler Buildteam - 1.16.0-7 - Type:bugfix - ID:NA diff --git a/bugfix-NetworkManager-tui-bond-page-when-modify.patch b/bugfix-NetworkManager-tui-bond-page-when-modify.patch deleted file mode 100644 index 0d1e66cf14c90f40b09cde35044f03528dfcc6ab..0000000000000000000000000000000000000000 --- a/bugfix-NetworkManager-tui-bond-page-when-modify.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 06742d70c395be910894f116e9ef3d89d9b2da19 Mon Sep 17 00:00:00 2001 -From: zhangyao -Date: Wed, 25 Sep 2019 17:41:10 +0800 -Subject: [PATCH] NetworkManager-tui: solve bond page problem when editing - ---- - clients/tui/nmt-page-bond.c | 21 +++++++++++++++++++-- - 1 file changed, 19 insertions(+), 2 deletions(-) - -diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c -index 1629c8b..0dc1b1d 100644 ---- a/clients/tui/nmt-page-bond.c -+++ b/clients/tui/nmt-page-bond.c -@@ -226,6 +226,20 @@ WIDGET_CHANGED_FUNC (updelay, nmt_newt_entry_get_text, NM_SETTING_BOND_OPTION_UP - WIDGET_CHANGED_FUNC (downdelay, nmt_newt_entry_get_text, NM_SETTING_BOND_OPTION_DOWNDELAY) - WIDGET_CHANGED_FUNC (arp_interval, nmt_newt_entry_get_text, NM_SETTING_BOND_OPTION_ARP_INTERVAL) - -+static void -+refresh_page_option_by_mode(NmtPageBondPrivate *priv) -+{ -+ const char *mode; -+ mode = nmt_newt_popup_get_active_id (priv->mode); -+ if (!strcmp (mode, "balance-tlb") || !strcmp (mode, "balance-alb") -+ || !strcmp (mode, "802.3ad")) { -+ nmt_newt_popup_set_active (priv->monitoring, NMT_PAGE_BOND_MONITORING_MII); -+ nmt_newt_component_set_sensitive (NMT_NEWT_COMPONENT (priv->monitoring), FALSE); -+ } else -+ nmt_newt_component_set_sensitive (NMT_NEWT_COMPONENT (priv->monitoring), TRUE); -+} -+ -+ - static void - mode_widget_changed (GObject *object, - GParamSpec *pspec, -@@ -236,14 +250,17 @@ mode_widget_changed (GObject *object, - const char *mode; - - if (priv->updating) -- return; -+ { -+ refresh_page_option_by_mode(priv); -+ return; -+ } - - mode = nmt_newt_popup_get_active_id (priv->mode); - priv->updating = TRUE; - nm_setting_bond_add_option (priv->s_bond, NM_SETTING_BOND_OPTION_MODE, mode); - priv->updating = FALSE; - -- if (!strcmp (mode, "balance-tlb") || !strcmp (mode, "balance-alb")) { -+ if (!strcmp (mode, "balance-tlb") || !strcmp (mode, "balance-alb") || !strcmp (mode, "802.3ad")) { - nmt_newt_popup_set_active (priv->monitoring, NMT_PAGE_BOND_MONITORING_MII); - nmt_newt_component_set_sensitive (NMT_NEWT_COMPONENT (priv->monitoring), FALSE); - } else --- -1.8.3.1 - diff --git a/bugfix-NetworkManager-tui-solve-bond-module.patch b/bugfix-NetworkManager-tui-solve-bond-module.patch deleted file mode 100644 index a7427058042803bd865b6119f3a6e73b02e96cfa..0000000000000000000000000000000000000000 --- a/bugfix-NetworkManager-tui-solve-bond-module.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 600ac34d381425f715ceff4cbaead751fae69430 Mon Sep 17 00:00:00 2001 -From: zhangyao -Date: Wed, 25 Sep 2019 17:33:40 +0800 -Subject: [PATCH] NetworkManager-tui: solve bond module - ---- - .../libnm-core/nm-core-internal.h | 1 + - NetworkManager-1.16.0/libnm-core/nm-setting-bond.c | 29 ++++++++++++++++++++-- - .../libnm-core/tests/test-setting.c | 2 +- - 3 files changed, 29 insertions(+), 3 deletions(-) - -diff --git NetworkManager-1.16.0/libnm-core/nm-core-internal.h NetworkManager-1.16.0/libnm-core/nm-core-internal.h -index f2332f7..64d7f65 100644 ---- NetworkManager-1.16.0/libnm-core/nm-core-internal.h -+++ NetworkManager-1.16.0/libnm-core/nm-core-internal.h -@@ -461,6 +461,7 @@ typedef enum { - NM_BOND_OPTION_TYPE_IP, - NM_BOND_OPTION_TYPE_MAC, - NM_BOND_OPTION_TYPE_IFNAME, -+ NM_BOND_OPTION_TYPE_PRIMARY_SLAVE, - } NMBondOptionType; - - NMBondOptionType -diff --git NetworkManager-1.16.0/libnm-core/nm-setting-bond.c NetworkManager-1.16.0/libnm-core/nm-setting-bond.c -index 51ce2de..5b60435 100644 ---- NetworkManager-1.16.0/libnm-core/nm-setting-bond.c -+++ NetworkManager-1.16.0/libnm-core/nm-setting-bond.c -@@ -79,8 +79,8 @@ static const BondDefault defaults[] = { - { 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, 3, - { "none", "active", "backup", "all", NULL } }, -- { NM_SETTING_BOND_OPTION_PRIMARY, "", NM_BOND_OPTION_TYPE_IFNAME }, -- { NM_SETTING_BOND_OPTION_PRIMARY_RESELECT, "always", NM_BOND_OPTION_TYPE_BOTH, 0, 2, -+ { 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, - { "none", "active", "follow", NULL } }, -@@ -234,7 +234,16 @@ validate_ip (const char *name, const char *value) - } - 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) - { -@@ -282,6 +291,8 @@ nm_setting_bond_validate_option (const char *name, - 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; - } -@@ -335,6 +346,9 @@ nm_setting_bond_add_option (NMSettingBond *setting, - 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); - -@@ -350,11 +364,22 @@ nm_setting_bond_add_option (NMSettingBond *setting, - && 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 --git NetworkManager-1.16.0/libnm-core/tests/test-setting.c NetworkManager-1.16.0/libnm-core/tests/test-setting.c -index 2011273..4c72d02 100644 ---- NetworkManager-1.16.0/libnm-core/tests/test-setting.c -+++ NetworkManager-1.16.0/libnm-core/tests/test-setting.c -@@ -678,7 +678,7 @@ test_bond_normalize (void) - ((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 })); --- -1.8.3.1 - diff --git a/bugfix-NetworkManager-tui-solve-team-page-problem-when-use-json.patch b/bugfix-NetworkManager-tui-solve-team-page-problem-when-use-json.patch deleted file mode 100644 index ec25711b3e14e1595c39eb17941e932db629eb5e..0000000000000000000000000000000000000000 --- a/bugfix-NetworkManager-tui-solve-team-page-problem-when-use-json.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4ad2335f5b798046e530fa1c670d0f0ffdea200a Mon Sep 17 00:00:00 2001 -From: zhangyao -Date: Wed, 25 Sep 2019 17:45:01 +0800 -Subject: [PATCH] NetworkManager-tui: solve team page problem when use json - ---- - NetworkManager-1.16.0/clients/tui/newt/nmt-newt-utils.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git NetworkManager-1.16.0/clients/tui/newt/nmt-newt-utils.c NetworkManager-1.16.0/clients/tui/newt/nmt-newt-utils.c -index 475faf7..8a14f68 100644 ---- NetworkManager-1.16.0/clients/tui/newt/nmt-newt-utils.c -+++ NetworkManager-1.16.0/clients/tui/newt/nmt-newt-utils.c -@@ -102,9 +102,7 @@ nmt_newt_basic_g_log_handler (const char *log_domain, - const char *message, - gpointer user_data) - { -- newtSuspend (); - g_log_default_handler (log_domain, log_level, message, NULL); -- newtResume (); - } - - static void --- -1.8.3.1 -