Merge lp:~awe/network-manager/lp1579222-fix-openvpn into lp:~phablet-team/network-manager/touch-1.2

Proposed by Tony Espy on 2016-05-09
Status: Merged
Merged at revision: 1037
Proposed branch: lp:~awe/network-manager/lp1579222-fix-openvpn
Merge into: lp:~phablet-team/network-manager/touch-1.2
Diff against target: 142 lines (+80/-16)
4 files modified
debian/changelog (+10/-0)
debian/patches/default_powersave_on.patch (+39/-16)
debian/patches/lp1579222-fix-openvpn-platform-nl-logic.patch (+30/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~awe/network-manager/lp1579222-fix-openvpn
Reviewer Review Type Date Requested Status
Simon Fels 2016-05-09 Needs Fixing on 2016-05-10
Review via email: mp+294170@code.launchpad.net

Description of the change

This change fixes openvpn which was broken on some devices running the latest version of network-manager ( 1.1.93-0ubuntu1~vivid1 ).

To post a comment you must log in.
Simon Fels (morphis) wrote :

Minor comment inline, otherwise LGTM

review: Needs Fixing
1038. By Tony Espy on 2016-05-10

d/p/lp1579222-fix-openvpn-platform-nl-logic.patch: add description

1039. By Tony Espy on 2016-05-11

Updated d/p/default_powersave_on.patch: fix WiFi powersave; the
'powersave' setting was changed from a boolean value to an enum.

1040. By Tony Espy on 2016-05-11

Update d/p/lp1579222-fix-openvpn-platform-nl-logic.patch: remove
the peer_address IFA_ADDRESS change after discussion with upstream.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-04-27 16:18:13 +0000
3+++ debian/changelog 2016-05-11 15:47:45 +0000
4@@ -1,3 +1,13 @@
5+network-manager (1.1.93-0ubuntu1~vivid3) vivid; urgency=medium
6+
7+ * Added d/p/lp1579222-fix-openvpn-platform-nl-logic.patch: this
8+ changes the NMLinuxPlatform netlink logic so that a seq_result
9+ of -EEXIST is treated as success.
10+ * Updated d/p/default_powersave_on.patch: fix WiFi powersave; the
11+ 'powersave' setting was changed from a boolean value to an enum.
12+
13+ -- Tony Espy <espy@canonical.com> Mon, 09 May 2016 13:46:50 -0400
14+
15 network-manager (1.1.93-0ubuntu1~vivid1) vivid; urgency=medium
16
17 * New upstream release.
18
19=== modified file 'debian/patches/default_powersave_on.patch'
20--- debian/patches/default_powersave_on.patch 2016-03-03 22:47:33 +0000
21+++ debian/patches/default_powersave_on.patch 2016-05-11 15:47:45 +0000
22@@ -15,29 +15,21 @@
23 /etc/NetworkManager/system-connections/.
24
25 ---
26- libnm-util/nm-setting-wireless.c | 7 +++++--
27- 1 file changed, 5 insertions(+), 2 deletions(-)
28+ libnm-core/nm-setting-wireless.c | 6 ++++--
29+ libnm-util/nm-setting-wireless.c | 5 ++++-
30+ 2 files changed, 8 insertions(+), 3 deletions(-)
31
32 Index: b/libnm-util/nm-setting-wireless.c
33 ===================================================================
34 --- a/libnm-util/nm-setting-wireless.c
35 +++ b/libnm-util/nm-setting-wireless.c
36-@@ -675,7 +675,7 @@ nm_setting_wireless_get_hidden (NMSettin
37- guint32
38- nm_setting_wireless_get_powersave (NMSettingWireless *setting)
39- {
40-- g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 0);
41-+ g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 1);
42-
43- return NM_SETTING_WIRELESS_GET_PRIVATE (setting)->powersave;
44- }
45 @@ -885,6 +885,9 @@ verify (NMSetting *setting, GSList *all_
46 static void
47 nm_setting_wireless_init (NMSettingWireless *setting)
48 {
49 + NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
50 +
51-+ priv->powersave = 1;
52++ priv->powersave = 0;
53 }
54
55 static void
56@@ -46,7 +38,38 @@
57 (object_class, PROP_POWERSAVE,
58 g_param_spec_uint (NM_SETTING_WIRELESS_POWERSAVE, "", "",
59 - 0, G_MAXUINT32, 0,
60-+ 0, G_MAXUINT32, 1,
61- G_PARAM_READWRITE |
62- G_PARAM_STATIC_STRINGS));
63- }
64++ 0, G_MAXUINT32, 0,
65+ G_PARAM_READWRITE |
66+ G_PARAM_STATIC_STRINGS));
67+ }
68+Index: b/libnm-core/nm-setting-wireless.c
69+===================================================================
70+--- a/libnm-core/nm-setting-wireless.c
71++++ b/libnm-core/nm-setting-wireless.c
72+@@ -614,7 +614,7 @@ nm_setting_wireless_get_hidden (NMSettin
73+ guint32
74+ nm_setting_wireless_get_powersave (NMSettingWireless *setting)
75+ {
76+- g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 0);
77++ g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), NM_SETTING_WIRELESS_POWERSAVE_ENABLE);
78+
79+ return NM_SETTING_WIRELESS_GET_PRIVATE (setting)->powersave;
80+ }
81+@@ -864,6 +864,8 @@ nm_setting_wireless_init (NMSettingWirel
82+ /* We use GArray rather than GPtrArray so it will automatically be NULL-terminated */
83+ priv->mac_address_blacklist = g_array_new (TRUE, FALSE, sizeof (char *));
84+ g_array_set_clear_func (priv->mac_address_blacklist, (GDestroyNotify) clear_blacklist_item);
85++
86++ priv->powersave = NM_SETTING_WIRELESS_POWERSAVE_ENABLE;
87+ }
88+
89+ static void
90+@@ -1384,7 +1386,7 @@ nm_setting_wireless_class_init (NMSettin
91+ g_object_class_install_property
92+ (object_class, PROP_POWERSAVE,
93+ g_param_spec_uint (NM_SETTING_WIRELESS_POWERSAVE, "", "",
94+- 0, G_MAXUINT32, NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
95++ 0, G_MAXUINT32, NM_SETTING_WIRELESS_POWERSAVE_ENABLE,
96+ G_PARAM_READWRITE |
97+ G_PARAM_STATIC_STRINGS));
98+
99
100=== added file 'debian/patches/lp1579222-fix-openvpn-platform-nl-logic.patch'
101--- debian/patches/lp1579222-fix-openvpn-platform-nl-logic.patch 1970-01-01 00:00:00 +0000
102+++ debian/patches/lp1579222-fix-openvpn-platform-nl-logic.patch 2016-05-11 15:47:45 +0000
103@@ -0,0 +1,30 @@
104+From: Tony Espy <espy@canonical.com>
105+Subject: Fix NMLinuxPlatform NL logic for older kernels
106+
107+This patch fixes issues with the updated Netlink code in
108+NMLinuxPlatform and ineroperability with older ( <= 3.10 )
109+kernels.
110+
111+Add EEXIST logic similar to logic found in 0.9.10 to the
112+NMLinuxPlatform do_add_addroute().
113+
114+---
115+ src/platform/nm-linux-platform.c | 5 +++++
116+ 1 file changed, 5 insertions(+)
117+
118+Index: b/src/platform/nm-linux-platform.c
119+===================================================================
120+--- a/src/platform/nm-linux-platform.c
121++++ b/src/platform/nm-linux-platform.c
122+@@ -3817,6 +3817,11 @@ do_add_addrroute (NMPlatform *platform,
123+ obj = nmp_cache_lookup_obj (priv->cache, obj_id);
124+ }
125+
126++ if (seq_result == -EEXIST) {
127++ _LOGD ("do_add_addroute: seq_restul == -EEXISTS; treating as OK");
128++ seq_result = WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK;
129++ }
130++
131+ /* Adding is only successful, if kernel reported success *and* we have the
132+ * expected object in cache afterwards. */
133+ return obj && seq_result == WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK;
134
135=== modified file 'debian/patches/series'
136--- debian/patches/series 2016-04-27 16:18:13 +0000
137+++ debian/patches/series 2016-05-11 15:47:45 +0000
138@@ -47,3 +47,4 @@
139 dbus-conf-add-sudo-for-indicator-network.patch
140 wifi-wpas-inactive.patch
141 clear-requested-scan-when-supplicant-goes-down.patch
142+lp1579222-fix-openvpn-platform-nl-logic.patch

Subscribers

People subscribed via source and target branches

to all changes: