packages/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!11 update from 1.24.2 to 1.26.0

Browse Source 
Merge pull request !11 from compile_success/master
This commit is contained in:
openeuler-ci-bot 2020-07-31 20:48:18 +08:00 committed by Gitee
commit 187c907bd0
4 changed files with 6 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
NetworkManager-1.24.2.tar.xz
View File

Binary file not shown.

BIN
NetworkManager-1.26.0.tar.xz Normal file
View File

Binary file not shown.

10
NetworkManager.spec
View File

@ -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.24.2
%global real_version 1.26.0
%global snapshot %{nil}
%global git_sha %{nil}
%global obsoletes_device_plugins 1:0.9.9.95-1
@ -45,7 +45,7 @@
%global dhcp_default dhclient
Name: NetworkManager
Version: 1.24.2
Version: 1.26.0
Epoch: 1
Release: 1
Summary: Network Link Manager and User Applications
@ -56,7 +56,6 @@ 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
Patch9002: bugfix-NetworkManager-tui-bond-page-when-modify.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
@ -407,8 +406,11 @@ fi
%{_datadir}/gtk-doc/html/NetworkManager/*
%changelog
* Fri Jul 31 2020 zhujunhao <zhujunhao8@huawei.com> - 1.26.0-1
- update to 1.26.0
* Thu Jul 30 2020 zhujunhao <zhujunhao8@huawei.com> - 1.24.2-1
- update t0 1.24.2
- update to 1.24.2
* Thu Jul 2 2020 gaoxingwang <gxw94linux@163.com> - 1.20.10-2
- Type:bugfix

57
bugfix-NetworkManager-tui-bond-page-when-modify.patch
View File

@ -1,57 +0,0 @@
From 06742d70c395be910894f116e9ef3d89d9b2da19 Mon Sep 17 00:00:00 2001
From: zhangyao <zhangyao65@huawei.com>
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