Merge lp:~phablet-team/network-manager/lp1444162-wily into lp:~network-manager/network-manager/ubuntu

[Tony Espy]

This change fixes NM's ofono setting plugin to add IP6_CONFIG_METHOD_IGNORE setting to ofono connections so that NM doesn't configure IPv6 for ofono connections.

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

[Tony Espy (awe)]

Tested on krillin / devel-proposed / #165.

Ran a subset of tests from:

https://wiki.ubuntu.com/Process/Merges/TestPlans/network-manager

Added new test case to verify the IPv6 is disabled for ofono connections, per the fix.

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-11 18:10:47 +0000
+++ debian/changelog	2015-08-12 15:36:08 +0000
@@ -3,9 +3,11 @@
   [ Tony Espy ]
   * d/p/lp1425172-fix-wifi-scanlist-cull.patch:  fix cull_scan_list
     so that APs are removed when wpa_supplicant indicates that they've
-    been removed ( vs. waiting 6m to do so ).
+    been removed vs. waiting 6m to do so ( LP: #1425172 ).
+  * d/p/lp1444162-add-ip6-config-to-nm-ofono-connections.patch: disable
+    IPv6 for ofono connections (LP: #1444162).
 
- -- Tony Espy <[e-mail]>  Fri, 07 Aug 2015 17:29:13 -0400
+ -- Tony Espy <[e-mail]>  Wed, 12 Aug 2015 11:22:01 -0400
 
 network-manager (0.9.10.0-4ubuntu21) wily; urgency=medium
 

=== added file 'debian/patches/lp1444162-add-ip6-config-to-nm-ofono-connections.patch'
--- debian/patches/lp1444162-add-ip6-config-to-nm-ofono-connections.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1444162-add-ip6-config-to-nm-ofono-connections.patch	2015-08-12 15:36:08 +0000
@@ -0,0 +1,44 @@
+Author: Tony Espy <[e-mail]>
+Subject: Set IP6_CONFIG_METHOD_IGNORE for ofono connections
+
+This patch modifies the ofono settings plugin to add IP6_CONFIG
+settings that contain an IP6_CONFIG_METHOD set to ignore indicate
+to NM that IPv6 is not required.  This fixes an issue with QNetwork
+which incorrectly assumed that the ofono mobile data connection
+support IPv6.
+
+Bug: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1444162
+
+Index: network-manager-0.9.10.0/src/settings/plugins/ofono/parser.c
+===================================================================
+--- network-manager-0.9.10.0.orig/src/settings/plugins/ofono/parser.c
++++ network-manager-0.9.10.0/src/settings/plugins/ofono/parser.c
+@@ -49,6 +49,7 @@ ofono_update_connection_from_context (NM
+ {
+ 	NMSettingConnection *s_con;
+ 	NMSettingGsm *s_gsm;
++	NMSettingIP6Config *s_ip6_config;
+ 	gboolean success = FALSE;
+ 	char *idstr = NULL;
+ 	char *uuid_base = NULL;
+@@ -89,6 +90,20 @@ ofono_update_connection_from_context (NM
+ 	 */
+ 	g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL);
+ 
++	/* IP6 setting */
++	s_ip6_config = NM_SETTING_IP6_CONFIG (nm_setting_ip6_config_new());
++	g_assert (s_ip6_config);
++	nm_connection_add_setting (connection, NM_SETTING (s_ip6_config));
++
++	/*
++	 * Set IP6_CONFIG_METHOD to ignore to prevent NM from configuring IPv6
++	 * for ofono connections.
++	 */
++	g_object_set (s_ip6_config,
++	              NM_SETTING_IP6_CONFIG_METHOD,
++	              NM_SETTING_IP6_CONFIG_METHOD_IGNORE,
++	              NULL);
++
+ 	nm_log_info (LOGD_SETTINGS, "SCPlugin-Ofono: "
+ 	             "update_connection_setting_from_context: name:%s, path:%s, id:%s, uuid: %s",
+ 	             (char *) g_hash_table_lookup (context, "Name"),

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-08-07 21:40:51 +0000
+++ debian/patches/series	2015-08-12 15:36:08 +0000
@@ -79,3 +79,5 @@
 git_route_fixes_part2_529591d8.patch
 git_avoid_conflict_reinstall_dev_route_e439478c.patch
 lp1425172-fix-wifi-scanlist-cull.patch
+lp1444162-add-ip6-config-to-nm-ofono-connections.patch
+