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

[Tony Espy]

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

[Simon Fels (morphis)]

Minor comment inline, otherwise LGTM

review: Needs Fixing

[lp:~awe/network-manager/lp1579222-fix-openvpn]

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.

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-27 16:18:13 +0000
+++ debian/changelog	2016-05-11 15:47:45 +0000
@@ -1,3 +1,13 @@
+network-manager (1.1.93-0ubuntu1~vivid3) vivid; urgency=medium
+
+  * Added d/p/lp1579222-fix-openvpn-platform-nl-logic.patch: this
+    changes the NMLinuxPlatform netlink logic so that a seq_result
+    of -EEXIST is treated as success.
+  * Updated d/p/default_powersave_on.patch: fix WiFi powersave; the
+    'powersave' setting was changed from a boolean value to an enum.
+
+ -- Tony Espy <[e-mail]>  Mon, 09 May 2016 13:46:50 -0400
+
 network-manager (1.1.93-0ubuntu1~vivid1) vivid; urgency=medium
 
   * New upstream release.

=== modified file 'debian/patches/default_powersave_on.patch'
--- debian/patches/default_powersave_on.patch	2016-03-03 22:47:33 +0000
+++ debian/patches/default_powersave_on.patch	2016-05-11 15:47:45 +0000
@@ -15,29 +15,21 @@
 /etc/NetworkManager/system-connections/.
 
 ---
- libnm-util/nm-setting-wireless.c |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ libnm-core/nm-setting-wireless.c |    6 ++++--
+ libnm-util/nm-setting-wireless.c |    5 ++++-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
 
 Index: b/libnm-util/nm-setting-wireless.c
 ===================================================================
 --- a/libnm-util/nm-setting-wireless.c
 +++ b/libnm-util/nm-setting-wireless.c
-@@ -675,7 +675,7 @@ nm_setting_wireless_get_hidden (NMSettin
- guint32
- nm_setting_wireless_get_powersave (NMSettingWireless *setting)
- {
--	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 0);
-+	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 1);
- 
- 	return NM_SETTING_WIRELESS_GET_PRIVATE (setting)->powersave;
- }
 @@ -885,6 +885,9 @@ verify (NMSetting *setting, GSList *all_
  static void
  nm_setting_wireless_init (NMSettingWireless *setting)
  {
 +	NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
 +
-+	priv->powersave = 1;
++	priv->powersave = 0;
  }
  
  static void
@@ -46,7 +38,38 @@
  		(object_class, PROP_POWERSAVE,
  		 g_param_spec_uint (NM_SETTING_WIRELESS_POWERSAVE, "", "",
 -		                    0, G_MAXUINT32, 0,
-+		                    0, G_MAXUINT32, 1,
- 		                    G_PARAM_READWRITE |
- 		                    G_PARAM_STATIC_STRINGS));
- }
++						    0, G_MAXUINT32, 0,
+ 		                    G_PARAM_READWRITE |
+ 		                    G_PARAM_STATIC_STRINGS));
+ }
+Index: b/libnm-core/nm-setting-wireless.c
+===================================================================
+--- a/libnm-core/nm-setting-wireless.c
++++ b/libnm-core/nm-setting-wireless.c
+@@ -614,7 +614,7 @@ nm_setting_wireless_get_hidden (NMSettin
+ guint32
+ nm_setting_wireless_get_powersave (NMSettingWireless *setting)
+ {
+-	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 0);
++	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), NM_SETTING_WIRELESS_POWERSAVE_ENABLE);
+ 
+ 	return NM_SETTING_WIRELESS_GET_PRIVATE (setting)->powersave;
+ }
+@@ -864,6 +864,8 @@ nm_setting_wireless_init (NMSettingWirel
+ 	/* We use GArray rather than GPtrArray so it will automatically be NULL-terminated */
+ 	priv->mac_address_blacklist = g_array_new (TRUE, FALSE, sizeof (char *));
+ 	g_array_set_clear_func (priv->mac_address_blacklist, (GDestroyNotify) clear_blacklist_item);
++
++	priv->powersave = NM_SETTING_WIRELESS_POWERSAVE_ENABLE;
+ }
+ 
+ static void
+@@ -1384,7 +1386,7 @@ nm_setting_wireless_class_init (NMSettin
+ 	g_object_class_install_property
+ 		(object_class, PROP_POWERSAVE,
+ 		 g_param_spec_uint (NM_SETTING_WIRELESS_POWERSAVE, "", "",
+-		                    0, G_MAXUINT32, NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
++		                    0, G_MAXUINT32, NM_SETTING_WIRELESS_POWERSAVE_ENABLE,
+ 		                    G_PARAM_READWRITE |
+ 		                    G_PARAM_STATIC_STRINGS));
+ 

=== added file 'debian/patches/lp1579222-fix-openvpn-platform-nl-logic.patch'
--- debian/patches/lp1579222-fix-openvpn-platform-nl-logic.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1579222-fix-openvpn-platform-nl-logic.patch	2016-05-11 15:47:45 +0000
@@ -0,0 +1,30 @@
+From: Tony Espy <[e-mail]>
+Subject: Fix NMLinuxPlatform NL logic for older kernels
+
+This patch fixes issues with the updated Netlink code in
+NMLinuxPlatform and ineroperability with older ( <= 3.10 )
+kernels.
+
+Add EEXIST logic similar to logic found in 0.9.10 to the 
+NMLinuxPlatform do_add_addroute().
+
+---
+ src/platform/nm-linux-platform.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: b/src/platform/nm-linux-platform.c
+===================================================================
+--- a/src/platform/nm-linux-platform.c
++++ b/src/platform/nm-linux-platform.c
+@@ -3817,6 +3817,11 @@ do_add_addrroute (NMPlatform *platform,
+ 		obj = nmp_cache_lookup_obj (priv->cache, obj_id);
+ 	}
+ 
++	if (seq_result == -EEXIST) {
++		_LOGD ("do_add_addroute: seq_restul == -EEXISTS; treating as OK");
++		seq_result = WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK;
++	}
++
+ 	/* Adding is only successful, if kernel reported success *and* we have the
+ 	 * expected object in cache afterwards. */
+ 	return obj && seq_result == WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK;

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-04-27 16:18:13 +0000
+++ debian/patches/series	2016-05-11 15:47:45 +0000
@@ -47,3 +47,4 @@
 dbus-conf-add-sudo-for-indicator-network.patch
 wifi-wpas-inactive.patch
 clear-requested-scan-when-supplicant-goes-down.patch
+lp1579222-fix-openvpn-platform-nl-logic.patch