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

[Tony Espy]

This change affects the ofono settings plugin and the way that it configures system connections based on ofono gprs_contexts ( aka APNs ).

The change removes the addition of USERNAME and PASSWORD NM_SETTING_GSM settings to the connection, as they're not needed by network-manager, and can cause secret-related activation errors.

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good; let's just merge the patch in to the ofono settings patch, so that things can be more easily upstreamed. Separate patch is fine for SRU purposes, but I don't think this is relevant to SRU.

review: Approve

[lp:~phablet-team/network-manager/lp1435776-wily]

967. By Tony Espy on 2015-07-15

debian/patches/add_ofono_settings_support.patch: remove code
that added APN, USERNAME and PASSWORD to NM_SETTING_GSM object.
NM doesn't actually need access to these settings, and USERNAME/
PASSWORD can cause issues with NM's secrets needed logic.

[Mathieu Trudel-Lapierre (cyphermox)]

Rockin'. Full ack, I will merge this in the morning (but if I forget don't hesitate to remind me).

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-14 22:17:15 +0000
+++ debian/changelog	2015-07-15 19:40:27 +0000
@@ -1,3 +1,12 @@
+network-manager (0.9.10.0-4ubuntu19) UNRELEASED; urgency=medium
+
+  * debian/patches/add_ofono_settings_support.patch: remove code
+    that added APN, USERNAME and PASSWORD to NM_SETTING_GSM object.
+    NM doesn't actually need access to these settings, and USERNAME/
+    PASSWORD can cause issues with NM's secrets needed logic.
+
+ -- Tony Espy <[e-mail]>  Wed, 15 Jul 2015 15:35:17 -0400
+
 network-manager (0.9.10.0-4ubuntu18) wily; urgency=medium
 
   * debian/tests/nm, debian/tests/wpa-dhclient: 802.11a appears to no longer

=== modified file 'debian/patches/add_ofono_settings_support.patch'
--- debian/patches/add_ofono_settings_support.patch	2014-11-18 19:44:11 +0000
+++ debian/patches/add_ofono_settings_support.patch	2015-07-15 19:40:27 +0000
@@ -42,7 +42,7 @@
  
  if test "$enable_ifcfg_rh" = "yes"; then
      DISTRO_NETWORK_SERVICE=network.service
-@@ -792,6 +796,7 @@ src/ppp-manager/Makefile
+@@ -801,6 +805,7 @@ src/ppp-manager/Makefile
  src/settings/plugins/Makefile
  src/settings/plugins/ifupdown/Makefile
  src/settings/plugins/ifupdown/tests/Makefile
@@ -50,7 +50,7 @@
  src/settings/plugins/ifnet/Makefile
  src/settings/plugins/ifnet/tests/Makefile
  src/settings/plugins/ifcfg-rh/Makefile
-@@ -913,6 +918,7 @@ echo "  ifcfg-rh: ${enable_ifcfg_rh}"
+@@ -922,6 +927,7 @@ echo "  ifcfg-rh: ${enable_ifcfg_rh}"
  echo "  ifcfg-suse: ${enable_ifcfg_suse}"
  echo "  ifupdown: ${enable_ifupdown}"
  echo "  ifnet: ${enable_ifnet}"
@@ -378,7 +378,7 @@
 ===================================================================
 --- /dev/null
 +++ b/src/settings/plugins/ofono/parser.c
-@@ -0,0 +1,124 @@
+@@ -0,0 +1,103 @@
 +/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
 +
 +/* NetworkManager system settings service (ofono)
@@ -434,8 +434,6 @@
 +	char *idstr = NULL;
 +	char *uuid_base = NULL;
 +	char *uuid = NULL;
-+	const char *username = NULL;
-+	const char *password = NULL;
 +
 +	s_con = nm_connection_get_setting_connection (connection);
 +	if(!s_con) {
@@ -472,25 +470,6 @@
 +	 */
 +	g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL);
 +
-+	/* Set the APN we got from oFono config. */
-+	g_object_set (s_gsm,
-+	              NM_SETTING_GSM_APN, g_hash_table_lookup (context, "Apn"),
-+	              NULL);
-+
-+	username = g_hash_table_lookup (context, "Username");
-+	if (username && g_strcmp0 (username, "") != 0) {
-+        	g_object_set (s_gsm,
-+		              NM_SETTING_GSM_USERNAME, username,
-+	                      NULL);
-+	}
-+
-+	password = g_hash_table_lookup (context, "Password");
-+	if (password && g_strcmp0 (password, "") != 0) {
-+        	g_object_set (s_gsm,
-+		              NM_SETTING_GSM_PASSWORD, password,
-+	                      NULL);
-+	}
-+
 +	nm_log_info (LOGD_SETTINGS, "SCPlugin-Ofono: "
 +	             "update_connection_setting_from_context: name:%s, path:%s, type:%s, id:%s, uuid: %s",
 +	             (char *) g_hash_table_lookup (context, "Name"),