Merge lp:~awe/network-manager/update-1.2-touch into lp:~phablet-team/network-manager/touch-1.2

[Tony Espy]

This merge proposal backports the recent desktop/xenial landing of NM 1.2 to vivid for use on Touch.

Differences include:

 * bluez5 explicitly disabled ( DUN ! supported on Touch yet )

 * ppp disabled ( 2.4.7 needs to be backported )

 * systemd logging disabled

 * updates to ignore_device patches ( rild & p2p )

 * updates to wwan plugin NMModemOfono and NMModemManager classes

[lp:~awe/network-manager/update-1.2-touch]

1055. By Tony Espy on 2016-04-27

* Added d/p/wifi-wpas-inactive.patch: handle wpa_supplicant
  WiFi stall related to INACTIVE state.
* Added d/p/clear-requested-scan-when-supplicant-goes-down.patch:
  Clear scan_requested flag if supplicant released.

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-07 21:09:58 +0000
+++ debian/changelog	2016-04-27 16:19:01 +0000
@@ -1,4 +1,4 @@
-network-manager (1.1.93-0ubuntu1) UNRELEASED; urgency=medium
+network-manager (1.1.93-0ubuntu1~vivid1) vivid; urgency=medium
 
   * New upstream release.
   * Resynchronize with Debian; remaining changes:
@@ -58,17 +58,45 @@
   * Renamed 0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch
     to wwan-add-ofono-modem-support.patch as this patch needed to be
     extensively re-worked due to dbus-glib being deprecated in NM1.2.
-  * Remove upstreamed patches:
+  * Removed upstreamed patches:
     - tests-fix-bashism-in-run-test-dbus-session.sh.patch
     - wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch
     - lp1496434_warn_on_invalid_new_link.patch: alternate fix landed
       upstream which ensures that a valid error instance is returned
       by the factory_create_link method.
-  * Update all symbols files.
-  * Rename ignore_rmnet_devices.path to ignore_rild_modem_devices.patch
-  * Restore wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch
+  * Updated all symbols files.
+  * Renamed ignore_rmnet_devices.path to ignore_rild_modem_devices.patch
+  * Restored wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch
+  * Restored lp1461593-add-modem-reconnect-delay-to-policy.patch
+  * Updated d/control: temporarily remove ppp-dev till 2.4.7 backported.
+  * Updated d/rules:
+    - Temporarily disable gir, and ppp.
+    - Disable systemd-journal to restore syslog support.
+    - Fix dh_strip for vivid.
+    - Disable bluez5_dun support ( not supported on Touch yet ).
+  * Restored d/network-manager.upstart.
+  * Updated d/network-manager.install: disable install of pppd/*.
+  * Updated d/libnm-dev.install: disable install of gir/*.
+  * Added d/p/dbus-conf-add-sudo-for-indicator-network.patch: this patch
+    adds a 'sudo' policy group to allow indicator-network to use the
+    NetworkManager and NetworkManager.SecretAgent DBus interfaces.
+  * Added d/indicator-network.pkla, d/rules: install policy kit conf
+    file; this replaces a dirty hack in livecd-rootfs which created
+    this file on behalf of indicator-network.
+  * Updated d/p/wwan-add-ofono-modem-support.patch: fix MM and ofono
+    bus detection and MM restart logic so that NM doesn't keep trying
+    to start MM if it's not installed.
+  * Updated d/p/ignore_rild_modem_devices.patch: add 'rev_rmnet' (mako)
+    to list; also move filter logic before device creation.
+  * Updated d/p/lp1099983_ignore-p2p-wifi-devices.patch: move filter
+    logic before device creation.
+  * d/rules: add explicit --disable-bluez5 to configure.
+  * Added d/p/wifi-wpas-inactive.patch: handle wpa_supplicant
+    WiFi stall related to INACTIVE state.
+  * Added d/p/clear-requested-scan-when-supplicant-goes-down.patch:
+    Clear scan_requested flag if supplicant released.
 
- -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 03 Mar 2016 15:51:48 -0500
+ -- Tony Espy <[e-mail]>  Wed, 27 Apr 2016 12:17:48 -0500
 
 network-manager (1.0.4-0ubuntu10) xenial; urgency=medium
 
 
=== modified file 'debian/control'
--- debian/control	2016-03-15 21:52:04 +0000
+++ debian/control	2016-04-27 16:19:01 +0000
@@ -16,7 +16,7 @@
                libnl-3-dev (>= 3.2.8),
                libnl-route-3-dev (>= 3.2.8),
                libnl-genl-3-dev (>= 3.2.8),
-               ppp-dev (>= 2.4.7-1+1),
+               ppp-dev (>= 2.4.6),	       
                libpolkit-gobject-1-dev,
                libpolkit-agent-1-dev (>= 0.97),
                libgnutls-dev,
 
=== added file 'debian/indicator-network.pkla'
--- debian/indicator-network.pkla	1970-01-01 00:00:00 +0000
+++ debian/indicator-network.pkla	2016-04-27 16:19:01 +0000
@@ -0,0 +1,6 @@
+[indicator-network-service]
+Identity=unix-group:sudo
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
 
=== modified file 'debian/libnm-dev.install'
--- debian/libnm-dev.install	2015-08-20 09:47:16 +0000
+++ debian/libnm-dev.install	2016-04-27 16:19:01 +0000
@@ -2,4 +2,5 @@
 usr/lib/*/libnm.so
 usr/include/libnm/
 usr/share/gtk-doc/html/libnm/
-usr/share/gir-1.0/NM-1.0.gir
+# temporarily disabled for 1.2 landing:
+#usr/share/gir-1.0/NM-1.0.gir
 
=== modified file 'debian/network-manager.install'
--- debian/network-manager.install	2016-03-15 21:52:04 +0000
+++ debian/network-manager.install	2016-04-27 16:19:01 +0000
@@ -6,11 +6,10 @@
 usr/lib/NetworkManager/nm-iface-helper
 usr/lib/NetworkManager/nm-dispatcher
 usr/lib/*/NetworkManager/libnm-settings-plugin-ifupdown.so
-usr/lib/*/NetworkManager/libnm-settings-plugin-ibft.so
 usr/lib/*/NetworkManager/libnm-settings-plugin-ofono.so
 usr/lib/*/NetworkManager/libnm-device-plugin-*.so
 usr/lib/*/NetworkManager/libnm-wwan.so
-usr/lib/pppd/*/*.so
+#usr/lib/pppd/*/*.so
 usr/share/doc/NetworkManager/examples/
 usr/share/locale/
 usr/share/man/
 
=== added file 'debian/network-manager.upstart'
--- debian/network-manager.upstart	1970-01-01 00:00:00 +0000
+++ debian/network-manager.upstart	2016-04-27 16:19:01 +0000
@@ -0,0 +1,24 @@
+# network-manager - network connection manager
+#
+# The Network Manager daemon manages the system's network connections,
+# automatically switching between the best available.
+
+description	"network connection manager"
+
+start on (local-filesystems
+	  and started dbus
+	  and static-network-up)
+stop on stopping dbus
+
+expect fork
+respawn
+
+script
+	# set $LANG so that messages appearing on the GUI will be translated. See LP: 875017
+	if [ -r /etc/default/locale ]; then
+		. /etc/default/locale
+		export LANG LANGUAGE LC_MESSAGES LC_ALL
+	fi
+
+	exec NetworkManager
+end script
 
=== added file 'debian/patches/clear-requested-scan-when-supplicant-goes-down.patch'
--- debian/patches/clear-requested-scan-when-supplicant-goes-down.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/clear-requested-scan-when-supplicant-goes-down.patch	2016-04-27 16:19:01 +0000
@@ -0,0 +1,31 @@
+---
+ src/devices/wifi/nm-device-wifi.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+Index: network-manager-1.1.93/src/devices/wifi/nm-device-wifi.c
+===================================================================
+--- network-manager-1.1.93.orig/src/devices/wifi/nm-device-wifi.c
++++ network-manager-1.1.93/src/devices/wifi/nm-device-wifi.c
+@@ -246,6 +246,13 @@ supplicant_interface_release (NMDeviceWi
+ 
+ 	priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+ 
++	if (priv->requested_scan) {
++		nm_log_dbg (LOGD_WIFI_SCAN, "(%s): reset requested_scan flag to FALSE",
++					nm_device_get_iface (NM_DEVICE (self)));
++		priv->requested_scan = FALSE;
++		nm_device_remove_pending_action (NM_DEVICE (self), "scan", TRUE);
++	}
++
+ 	nm_clear_g_source (&priv->pending_scan_id);
+ 
+ 	/* Reset the scan interval to be pretty frequent when disconnected */
+@@ -1915,7 +1922,7 @@ supplicant_iface_state_cb (NMSupplicantI
+ 				priv->requested_scan = FALSE;
+ 			}
+ 
+-			cancel_pending_scan (self);
++			nm_clear_g_source (&priv->pending_scan_id);
+ 			request_wireless_scan (self, NULL);
+ 		}
+ 	default:
 
=== added file 'debian/patches/dbus-conf-add-sudo-for-indicator-network.patch'
--- debian/patches/dbus-conf-add-sudo-for-indicator-network.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dbus-conf-add-sudo-for-indicator-network.patch	2016-04-27 16:19:01 +0000
@@ -0,0 +1,30 @@
+Author: Tony Espy <[e-mail]>
+Subject: Add sudo policy to DBus conf for indicator-network
+
+This patch adds a 'sudo' group DBus policy to allow
+indicator-network to interact with the NetworkManager and
+NetworkManager.SecretAgent interfaces.
+
+This was previously handled by a dirty hack/hook in the
+livecd-rootfs tool used to build touch images.
+
+---
+ src/org.freedesktop.NetworkManager.conf |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: b/src/org.freedesktop.NetworkManager.conf
+===================================================================
+--- a/src/org.freedesktop.NetworkManager.conf
++++ b/src/org.freedesktop.NetworkManager.conf
+@@ -2,6 +2,11 @@
+  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+ <busconfig>
++        <policy group="sudo">
++                <allow send_destination="org.freedesktop.NetworkManager"/>
++                <allow send_interface="org.freedesktop.NetworkManager"/>
++                <allow send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
++        </policy>
+         <policy user="root">
+                 <allow own="org.freedesktop.NetworkManager"/>
+                 <allow send_destination="org.freedesktop.NetworkManager"/>
 
=== modified file 'debian/patches/ignore_rild_modem_devices.patch'
--- debian/patches/ignore_rild_modem_devices.patch	2016-04-07 19:30:51 +0000
+++ debian/patches/ignore_rild_modem_devices.patch	2016-04-27 16:19:01 +0000
@@ -1,23 +1,25 @@
 From: Mathieu Trudel-Lapierre <[e-mail]>
 Subject: Ignore rmnet_usbX devices.
 ---
- src/nm-manager.c |    6 ++++++
- 1 file changed, 6 insertions(+)
+ src/nm-manager.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 Index: b/src/nm-manager.c
 ===================================================================
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -2042,6 +2042,12 @@ platform_link_added (NMManager *self,
- 		}
- 	}
+@@ -2078,6 +2078,14 @@ platform_link_added (NMManager *self,
+ 		gboolean ignore = FALSE;
+ 		gs_free_error GError *error = NULL;
  
-+	/* Ignore rmnet_usb devices, which will be handled by their modem parent
-+	 */
-+	if (!strncmp (plink->name, "rmnet_usb", NM_STRLEN ("rmnet_usb")) ||
-+		!strncmp (plink->name, "ccmni", NM_STRLEN ("ccmni")))
-+		return;
++		/* Ignore rild modem devices, which will be handled by their modem parent */
++		if (g_strstr_len (plink->name, NM_STRLEN ("rmnet"), "rmnet") ||
++			g_strstr_len (plink->name, NM_STRLEN ("rev_rmnet"), "rev_rmnet") ||
++			g_strstr_len (plink->name, NM_STRLEN ("ccmni"), "ccmni")) {
++			_LOGW (LOGD_HW, "Ignoring rild modem device: %s", plink->name);
++			return;
++		}
 +
- 	if (device == NULL) {
- 		switch (plink->type) {
- 		case NM_LINK_TYPE_WWAN_ETHERNET:
+ 		device = nm_device_factory_create_device (factory, plink->name, plink, NULL, &ignore, &error);
+ 		if (!device) {
+ 			if (!ignore) {
 
=== modified file 'debian/patches/lp1099983_ignore-p2p-wifi-devices.patch'
--- debian/patches/lp1099983_ignore-p2p-wifi-devices.patch	2016-03-03 22:47:33 +0000
+++ debian/patches/lp1099983_ignore-p2p-wifi-devices.patch	2016-04-27 16:19:01 +0000
@@ -2,27 +2,28 @@
 Subject: Ignore p2p0 wifi devices from android.
 
 ---
- src/nm-manager.c |   10 ++++++++++
- 1 file changed, 10 insertions(+)
+ src/nm-manager.c |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
 
 Index: b/src/nm-manager.c
 ===================================================================
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -2048,6 +2048,16 @@ platform_link_added (NMManager *self,
- 		!strncmp (plink->name, "ccmni", NM_STRLEN ("ccmni")))
- 		return;
+@@ -2086,6 +2086,17 @@ platform_link_added (NMManager *self,
+ 			return;
+ 		}
  
-+	/*
-+	 * Ubuntu: Explicitly unmanage p2p Wi-Fi devices exposed by Android JB Wi-Fi drivers.
-+	 */
-+	NMDeviceType devtype = nm_device_get_device_type (device);
-+	if ((plink->type == NM_LINK_TYPE_WIFI)
-+	    && !strncmp (plink->name, "p2p0", NM_STRLEN ("p2p0"))) {
-+		nm_log_info (LOGD_HW, "(%s): ignoring P2P wireless iface", plink->name);
-+		return;
-+	}
++		/*
++		 * Ubuntu: Explicitly unmanage all p2p Wi-Fi devices which are
++		 * managed externally in the case of Wi-Fi Direct.
++		 */
++		NMDeviceType devtype = nm_device_get_device_type (device);
++		if ((plink->type == NM_LINK_TYPE_WIFI)
++			&& g_strstr_len (plink->name, NM_STRLEN ("p2p"), "p2p")) {
++			nm_log_info (LOGD_HW, "(%s): ignoring P2P wireless iface", plink->name);
++			return;
++		}
 +
- 	if (device == NULL) {
- 		switch (plink->type) {
- 		case NM_LINK_TYPE_WWAN_ETHERNET:
+ 		device = nm_device_factory_create_device (factory, plink->name, plink, NULL, &ignore, &error);
+ 		if (!device) {
+ 			if (!ignore) {
 
=== modified file 'debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch'
--- debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch	2016-03-03 22:47:33 +0000
+++ debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch	2016-04-27 16:19:01 +0000
@@ -7,29 +7,26 @@
 timeout ( which defaults to 300s ).
 
 Bug: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1461593
-
----
-
----
- src/nm-policy.c |   36 +++++++++++++++++++++++++++++-------
- 1 file changed, 29 insertions(+), 7 deletions(-)
+---
+ src/nm-policy.c |   34 +++++++++++++++++++++++++++-------
+ 1 file changed, 27 insertions(+), 7 deletions(-)
 
 Index: b/src/nm-policy.c
 ===================================================================
 --- a/src/nm-policy.c
 +++ b/src/nm-policy.c
-@@ -901,7 +901,7 @@ sleeping_changed (NMManager *manager, GP
+@@ -931,7 +931,7 @@ sleeping_changed (NMManager *manager, GP
  }
  
  static void
--schedule_activate_check (NMPolicy *policy, NMDevice *device)
-+schedule_activate_check (NMPolicy *policy, NMDevice *device, guint delay)
+-schedule_activate_check (NMPolicy *self, NMDevice *device)
++schedule_activate_check (NMPolicy *self, NMDevice *device, guint delay)
  {
- 	NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy);
+ 	NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self);
  	ActivateData *data;
-@@ -930,7 +930,12 @@ schedule_activate_check (NMPolicy *polic
- 	data = g_malloc0 (sizeof (ActivateData));
- 	data->policy = policy;
+@@ -960,7 +960,12 @@ schedule_activate_check (NMPolicy *self,
+ 	data = g_slice_new0 (ActivateData);
+ 	data->policy = self;
  	data->device = g_object_ref (device);
 -	data->autoactivate_id = g_idle_add (auto_activate_device, data);
 +
@@ -41,7 +38,7 @@
  	priv->pending_activation_checks = g_slist_append (priv->pending_activation_checks, data);
  }
  
-@@ -1125,6 +1130,7 @@ device_state_changed (NMDevice *device,
+@@ -1155,6 +1160,7 @@ device_state_changed (NMDevice *device,
  	NMIP4Config *ip4_config;
  	NMIP6Config *ip6_config;
  	NMSettingConnection *s_con = NULL;
@@ -49,64 +46,69 @@
  
  	switch (new_state) {
  	case NM_DEVICE_STATE_FAILED:
-@@ -1153,9 +1159,14 @@ device_state_changed (NMDevice *device,
+@@ -1172,7 +1178,7 @@ device_state_changed (NMDevice *device,
+ 
+ 				nm_settings_connection_set_autoconnect_blocked_reason (connection, NM_DEVICE_STATE_REASON_NO_SECRETS);
+ 			} else if (tries > 0) {
+-				_LOGD (LOGD_DEVICE, "connection '%s' failed to autoconnect; %d tries left",
++				_LOGI (LOGD_DEVICE, "connection '%s' failed to autoconnect; %d tries left",
+ 				       nm_settings_connection_get_id (connection), tries);
+ 				nm_settings_connection_set_autoconnect_retries (connection, tries - 1);
+ 			}
+@@ -1183,6 +1189,10 @@ device_state_changed (NMDevice *device,
  				/* Schedule a handler to reset retries count */
  				if (!priv->reset_retries_id) {
  					gint32 retry_time = nm_settings_connection_get_autoconnect_retry_time (connection);
 +					gint32 actual_time = MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ());
 +
-+					nm_log_info (LOGD_DEVICE, "Disabling autoconnect for connection '%s'; setting retry of %d.",
-+					             nm_connection_get_id (NM_CONNECTION (connection)), actual_time);
-+
++					_LOGI (LOGD_DEVICE, "Disabling autoconnect for connection '%s'; setting retry of %d.",
++						   nm_connection_get_id (NM_CONNECTION (connection)), actual_time);
  
  					g_warn_if_fail (retry_time != 0);
--					priv->reset_retries_id = g_timeout_add_seconds (MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ()), reset_connections_retries, policy);
-+					priv->reset_retries_id = g_timeout_add_seconds (actual_time, reset_connections_retries, policy);
- 				}
- 			}
- 			nm_connection_clear_secrets (NM_CONNECTION (connection));
-@@ -1220,7 +1231,18 @@ device_state_changed (NMDevice *device,
- 			update_routing_and_dns (policy, FALSE);
+ 					priv->reset_retries_id = g_timeout_add_seconds (MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ()), reset_connections_retries, self);
+@@ -1250,7 +1260,17 @@ device_state_changed (NMDevice *device,
+ 			update_routing_and_dns (self, FALSE);
  
  		/* Device is now available for auto-activation */
--		schedule_activate_check (policy, device);
-+
+-		schedule_activate_check (self, device);
 +		if (nm_device_get_device_type (device) == NM_DEVICE_TYPE_MODEM)
 +			delay = 5;
 +
 +		if (connection)
-+			nm_log_info (LOGD_DEVICE, "Connection '%s' disconnected, scheduling activate_check in %u seconds.",
-+			             nm_connection_get_id (NM_CONNECTION (connection)), delay);
++			_LOGI (LOGD_DEVICE, "Connection '%s' disconnected, scheduling activate_check in %u seconds.",
++				nm_connection_get_id (NM_CONNECTION (connection)), delay);
 +		else
-+			nm_log_info (LOGD_DEVICE, "Device '%s' has no connection; scheduling activate_check in %u seconds.",
-+			             nm_device_get_iface (device), delay);
++			_LOGI (LOGD_DEVICE, "Device '%s' has no connection; scheduling activate_check in %u seconds.",
++				nm_device_get_iface (device), delay);
 +
-+		schedule_activate_check (policy, device, delay);
++		schedule_activate_check (self, device, delay);
  		break;
  
  	case NM_DEVICE_STATE_PREPARE:
-@@ -1330,13 +1352,13 @@ device_autoconnect_changed (NMDevice *de
-                             gpointer user_data)
- {
+@@ -1363,7 +1383,7 @@ device_autoconnect_changed (NMDevice *de
+ 	NMPolicy *self = priv->self;
+ 
  	if (nm_device_autoconnect_allowed (device))
--		schedule_activate_check ((NMPolicy *) user_data, device);
-+		schedule_activate_check ((NMPolicy *) user_data, device, 0);
- }
- 
- static void
- device_recheck_auto_activate (NMDevice *device, gpointer user_data)
- {
--	schedule_activate_check (NM_POLICY (user_data), device);
-+	schedule_activate_check (NM_POLICY (user_data), device, 0);
- }
- 
- typedef struct {
-@@ -1561,7 +1583,7 @@ schedule_activate_all (NMPolicy *policy)
+-		schedule_activate_check (self, device);
++		schedule_activate_check (self, device, 0);
+ }
+ 
+ static void
+@@ -1372,7 +1392,7 @@ device_recheck_auto_activate (NMDevice *
+ 	NMPolicyPrivate *priv = user_data;
+ 	NMPolicy *self = priv->self;
+ 
+-	schedule_activate_check (self, device);
++	schedule_activate_check (self, device, 0);
+ }
+ 
+ static void
+@@ -1586,7 +1606,7 @@ schedule_activate_all (NMPolicy *self)
  	const GSList *iter;
  
  	for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter))
--		schedule_activate_check (policy, NM_DEVICE (iter->data));
-+		schedule_activate_check (policy, NM_DEVICE (iter->data), 0);
+-		schedule_activate_check (self, NM_DEVICE (iter->data));
++		schedule_activate_check (self, NM_DEVICE (iter->data), 0);
  }
  
  static void
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2016-04-07 21:09:58 +0000
+++ debian/patches/series	2016-04-27 16:19:01 +0000
@@ -35,7 +35,7 @@
 wwan-add-ofono-modem-support.patch
 lp1461593-add-nm-settings-connection-reset-retries-methods.patch
 add_ofono_settings_support.patch
-#lp1461593-add-modem-reconnect-delay-to-policy.patch
+lp1461593-add-modem-reconnect-delay-to-policy.patch
 lp1445080-modify-device-modem-avail.patch
 
 # killswitch
@@ -44,3 +44,6 @@
 # more fixes
 conditional_libteam_tests.patch
 disable_general_with_expect_test.patch
+dbus-conf-add-sudo-for-indicator-network.patch
+wifi-wpas-inactive.patch
+clear-requested-scan-when-supplicant-goes-down.patch
 
=== added file 'debian/patches/wifi-wpas-inactive.patch'
--- debian/patches/wifi-wpas-inactive.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/wifi-wpas-inactive.patch	2016-04-27 16:19:01 +0000
@@ -0,0 +1,30 @@
+---
+ src/devices/wifi/nm-device-wifi.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+Index: b/src/devices/wifi/nm-device-wifi.c
+===================================================================
+--- a/src/devices/wifi/nm-device-wifi.c
++++ b/src/devices/wifi/nm-device-wifi.c
+@@ -1903,6 +1903,21 @@ supplicant_iface_state_cb (NMSupplicantI
+ 		else
+ 			_LOGI (LOGD_DEVICE | LOGD_WIFI, "supplicant interface keeps failing, giving up");
+ 		break;
++	case NM_SUPPLICANT_INTERFACE_STATE_INACTIVE:
++		if (old_state == NM_SUPPLICANT_INTERFACE_STATE_SCANNING) {
++			nm_log_warn (LOGD_HW | LOGD_WIFI, "(%s): supplicant state: SCANNING -> INACTIVE",
++						 nm_device_get_iface (NM_DEVICE (self)));
++
++			if (priv->requested_scan) {
++				nm_log_dbg (LOGD_WIFI_SCAN, "(%s): clearing requested_scan",
++							nm_device_get_iface (NM_DEVICE (self)));
++
++				priv->requested_scan = FALSE;
++			}
++
++			cancel_pending_scan (self);
++			request_wireless_scan (self, NULL);
++		}
+ 	default:
+ 		break;
+ 	}
 
=== modified file 'debian/patches/wwan-add-ofono-modem-support.patch'
--- debian/patches/wwan-add-ofono-modem-support.patch	2016-04-08 14:49:37 +0000
+++ debian/patches/wwan-add-ofono-modem-support.patch	2016-04-27 16:19:01 +0000
@@ -9,13 +9,12 @@
 ---
  configure.ac                        |    9 
  src/devices/wwan/Makefile.am        |    7 
- src/devices/wwan/nm-device-modem.c  |   20 
- src/devices/wwan/nm-modem-manager.c |  220 +++++
- src/devices/wwan/nm-modem-ofono.c   | 1449 ++++++++++++++++++++++++++++++++++++
+ src/devices/wwan/nm-modem-manager.c |  238 +++++
+ src/devices/wwan/nm-modem-ofono.c   | 1435 ++++++++++++++++++++++++++++++++++++
  src/devices/wwan/nm-modem-ofono.h   |   64 +
  src/devices/wwan/nm-modem.c         |    8 
  src/nm-core-utils.c                 |   20 
- 8 files changed, 1787 insertions(+), 10 deletions(-)
+ 7 files changed, 1762 insertions(+), 19 deletions(-)
 
 Index: b/configure.ac
 ===================================================================
@@ -93,58 +92,6 @@
  WWAN_SYMBOL_VIS_FILE=$(srcdir)/wwan-exports.ver
  
  libnm_wwan_la_LDFLAGS = \
-Index: b/src/devices/wwan/nm-device-modem.c
-===================================================================
---- a/src/devices/wwan/nm-device-modem.c
-+++ b/src/devices/wwan/nm-device-modem.c
-@@ -100,6 +100,7 @@ modem_prepare_result (NMModem *modem,
- 	if (success)
- 		nm_device_activate_schedule_stage2_device_config (device);
- 	else {
-+
- 		if (reason == NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT) {
- 			/* If the connect failed because the SIM PIN was wrong don't allow
- 			 * the device to be auto-activated anymore, which would risk locking
-@@ -282,6 +283,16 @@ modem_state_cb (NMModem *modem,
- 		}
- 	}
- 
-+	if (dev_state >= NM_DEVICE_STATE_DISCONNECTED &&
-+		new_state == NM_MODEM_STATE_REGISTERED && old_state < NM_MODEM_STATE_REGISTERED) {
-+
-+		nm_log_info (LOGD_MB, "(%s): modem re-registered; re-checking autoconnect",
-+					 nm_device_get_iface (device));
-+
-+		g_object_set (G_OBJECT (device), NM_DEVICE_AUTOCONNECT, TRUE, NULL);
-+		nm_device_emit_recheck_auto_activate (device);
-+	}
-+
- 	if (new_state < NM_MODEM_STATE_CONNECTING &&
- 	    old_state >= NM_MODEM_STATE_CONNECTING &&
- 	    dev_state >= NM_DEVICE_STATE_NEED_AUTH &&
-@@ -345,6 +356,14 @@ device_state_changed (NMDevice *device,
- 		       nm_modem_state_to_string (nm_modem_get_state (priv->modem)));
- 	}
- 
-+	/* Block autoconnect until the modem is registered again */
-+	if (new_state == NM_DEVICE_STATE_FAILED && nm_modem_get_state (priv->modem) == NM_MODEM_STATE_SEARCHING) {
-+		nm_log_info (LOGD_MB, "(%s): modem searching; disabling autoconnect",
-+					 nm_device_get_iface (device));
-+
-+		g_object_set (G_OBJECT (device), NM_DEVICE_AUTOCONNECT, FALSE, NULL);
-+	}
-+
- 	nm_modem_device_state_changed (priv->modem, new_state, old_state, reason);
- 
- 	switch (reason) {
-@@ -545,6 +564,7 @@ get_ip_iface_identifier (NMDevice *devic
- 
- 	g_return_val_if_fail (priv->modem, FALSE);
- 	success = nm_modem_get_iid (priv->modem, out_iid);
-+
- 	if (!success)
- 		success = NM_DEVICE_CLASS (nm_device_modem_parent_class)->get_ip_iface_identifier (device, out_iid);
- 	return success;
 Index: b/src/devices/wwan/nm-modem-manager.c
 ===================================================================
 --- a/src/devices/wwan/nm-modem-manager.c
@@ -288,7 +235,7 @@
 +{
 +	gchar *name_owner;
 +
-+	name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->ofono_proxy));
++	name_owner = g_dbus_proxy_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->ofono_proxy));
 +	if (name_owner) {
 +		/* Available! */
 +		ofono_appeared (self);
@@ -361,6 +308,35 @@
  
  static void
  modem_manager_poke_cb (GDBusConnection *connection,
+@@ -233,19 +415,19 @@ modem_manager_poke_cb (GDBusConnection *
+ 
+ 	result = g_dbus_connection_call_finish (connection, res, &error);
+ 	if (error) {
+-		/* Ignore common errors when MM is not installed and such */
+-		if (   !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)
+-		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_EXEC_FAILED)
+-		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_FORK_FAILED)
+-		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_FAILED)
+-		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_TIMEOUT)
++		nm_log_warn (LOGD_MB, "error poking ModemManager: %s",
++					 error ? error->message : "");
++
++		/* Don't reschedule poke is MM service doesn't exist. */
++		if (!g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)
+ 		    && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND)) {
+-			nm_log_dbg (LOGD_MB, "error poking ModemManager: %s", error->message);
++
++			/* Setup timeout to relaunch */
++			schedule_modem_manager_relaunch (self, MODEM_POKE_INTERVAL);
+ 		}
++
+ 		g_error_free (error);
+ 
+-		/* Setup timeout to relaunch */
+-		schedule_modem_manager_relaunch (self, MODEM_POKE_INTERVAL);
+ 	} else
+ 		g_variant_unref (result);
+ 
 @@ -336,22 +518,44 @@ manager_new_ready (GObject *source,
  static void
  ensure_client (NMModemManager *self)
@@ -496,7 +472,7 @@
 ===================================================================
 --- /dev/null
 +++ b/src/devices/wwan/nm-modem-ofono.c
-@@ -0,0 +1,1449 @@
+@@ -0,0 +1,1435 @@
 +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 +/* NetworkManager -- Network link manager
 + *
@@ -709,12 +685,7 @@
 +	nm_log_dbg (LOGD_MB, "(%s): modem disconnected",
 +				nm_modem_get_uid (NM_MODEM (self)));
 +
-+	/* NOTES(1.2): This doesn't accomplish anything as none of the attributes that
-+	 * are checked by update_modem_state are changed by this function!
-+	 *
-+	 *	update_modem_state (self);
-+	 */
-+
++	update_modem_state (self);
 +	disconnect_context_complete (ctx);
 +}
 +
@@ -889,7 +860,7 @@
 +											   &error);
 +	if (!v_properties) {
 +		g_dbus_error_strip_remote_error (error);
-+		nm_log_warn (LOGD_BT, "(%s) error getting sim properties: %s",
++		nm_log_warn (LOGD_MB, "(%s) error getting sim properties: %s",
 +					 nm_modem_get_uid (NM_MODEM (self)),
 +		             error->message);
 +		g_error_free (error);
@@ -900,7 +871,7 @@
 +
 +	v_dict = g_variant_get_child_value (v_properties, 0);
 +	if (!v_dict) {
-+		nm_log_warn (LOGD_BT, "(%s) error getting sim properties: no v_dict",
++		nm_log_warn (LOGD_MB, "(%s) error getting sim properties: no v_dict",
 +					 nm_modem_get_uid (NM_MODEM (self)));
 +		return;
 +	}
@@ -1002,7 +973,7 @@
 +		gboolean attached = g_variant_get_boolean (v);
 +
 +		nm_log_dbg (LOGD_MB, "(%s): Attached: %s",
-+					nm_modem_get_uid (NM_MODEM (self)), property ? "True" : "False");
++					nm_modem_get_uid (NM_MODEM (self)), attached ? "True" : "False");
 +
 +		if (priv->gprs_attached != attached) {
 +			priv->gprs_attached = attached;
@@ -1046,7 +1017,7 @@
 +											   &error);
 +	if (!v_properties) {
 +		g_dbus_error_strip_remote_error (error);
-+		nm_log_warn (LOGD_BT, "(%s) error getting connman properties: %s",
++		nm_log_warn (LOGD_MB, "(%s) error getting connman properties: %s",
 +					 nm_modem_get_uid (NM_MODEM (self)),
 +		             error->message);
 +		g_error_free (error);
@@ -1226,7 +1197,7 @@
 +											   &error);
 +	if (!v_properties) {
 +		g_dbus_error_strip_remote_error (error);
-+		nm_log_warn (LOGD_BT, "(%s) error getting modem properties: %s",
++		nm_log_warn (LOGD_MB, "(%s) error getting modem properties: %s",
 +					 nm_modem_get_uid (NM_MODEM (self)),
 +		             error->message);
 +		g_error_free (error);
@@ -1235,7 +1206,7 @@
 +
 +	v_dict = g_variant_get_child_value (v_properties, 0);
 +	if (!v_dict) {
-+		nm_log_warn (LOGD_BT, "(%s) error getting modem properties: no v_dict",
++		nm_log_warn (LOGD_MB, "(%s) error getting modem properties: no v_dict",
 +					 nm_modem_get_uid (NM_MODEM (self)));
 +		return;
 +	}
@@ -1331,14 +1302,6 @@
 +	nm_log_dbg (LOGD_MB, "PropertyChanged: %s", property);
 +
 +	/*
-+	 * 0.9.10.x:
-+	 *
-+	 * The old code got PropertyChanged for Settings, and then immediately
-+	 * called 'GetProperties' to get the current values of 'Settings'.
-+	 *
-+	 * There's no need to do this, as the PropertyChanged has the value of
-+	 * 'Settings' as its payload!!!
-+	 *
 +	 * TODO: might be a good idea and re-factor this to mimic bluez-device,
 +	 * ie. have this function just check the key, and call a sub-func to
 +	 * handle the action.
@@ -1347,24 +1310,14 @@
 +	if (g_strcmp0 (property, "Settings") != 0)
 +		return;
 +
-+	nm_log_dbg (LOGD_MB, "found 'Settings' DICTIONARY property");
-+
-+	if (nm_modem_get_state (NM_MODEM (self)) == NM_MODEM_STATE_CONNECTED && g_variant_n_children (v) <= 0) {
-+		nm_log_warn (LOGD_MB, "ofono: (%s): Settings empty", nm_modem_get_uid (NM_MODEM (self)));
-+
-+		goto out;
-+	}
-+
-+	nm_log_info (LOGD_MB, "ofono: (%s): IPv4 static configuration:", nm_modem_get_uid (NM_MODEM (self)));
-+
 +	v_dict = g_variant_get_child_value (v, 0);
 +	if (!v_dict) {
-+		nm_log_warn (LOGD_BT, "ofono: (%s): error getting IPv4 Settings: no v_dict",
++		nm_log_warn (LOGD_MB, "ofono: (%s): error getting IPv4 Settings",
 +					 nm_modem_get_uid (NM_MODEM (self)));
-+		return;
++		goto out;
 +	}
 +
-+	/* NOTE - 0.9.10x code didn't fail if 'Interface' missing */
++	nm_log_info (LOGD_MB, "ofono: (%s): IPv4 static Settings:", nm_modem_get_uid (NM_MODEM (self)));
 +
 +	if (g_variant_lookup (v_dict, "Interface", "&s", &s)) {
 +
@@ -1376,7 +1329,7 @@
 +						  NM_MODEM_IP4_METHOD, NM_MODEM_IP_METHOD_STATIC,
 +						  NULL);
 +		} else {
-+			nm_log_warn (LOGD_BT, "ofono: (%s): Settings 'Interface'; empty",
++			nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'Interface'; empty",
 +						nm_modem_get_uid (NM_MODEM (self)));
 +			goto out;
 +		}
@@ -1428,6 +1381,7 @@
 +	} else {
 +		nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'Address' missing",
 +					nm_modem_get_uid (NM_MODEM (self)));
++		goto out;
 +	}
 +
 +	if (g_variant_lookup (v_dict, "Netmask", "&s", &s)) {
@@ -1450,7 +1404,8 @@
 +		goto out;
 +	}
 +
-+	nm_log_info (LOGD_MB, "  address %s/%d", addr_s, prefix);
++	nm_log_info (LOGD_MB, "ofono (%s) Address: %s/%d",
++	             nm_modem_get_uid (NM_MODEM (self)), addr_s, prefix);
 +	nm_ip4_config_add_address (priv->ip4_config, &addr);
 +
 +	if (g_variant_lookup (v_dict, "Gateway", "&s", &s)) {
@@ -1477,7 +1432,7 @@
 +
 +		while (*iter) {
 +			if (ip_string_to_network_address (*iter, &address_network) && address_network > 0) {
-+				nm_log_info (LOGD_MB, "ofono: (%s): DNS %s",
++				nm_log_info (LOGD_MB, "ofono: (%s): DNS: %s",
 +							nm_modem_get_uid (NM_MODEM (self)), *iter);
 +
 +				nm_ip4_config_add_nameserver (priv->ip4_config, address_network);
@@ -1489,13 +1444,15 @@
 +			*iter++;
 +		}
 +
-+		/* TOOD: check for minimum NameServers >= 1? */
++		if (iter == array) {
++			nm_log_warn (LOGD_MB, "ofono: (%s): Settings: 'DomainNameServers': none specified",
++			             nm_modem_get_uid (NM_MODEM (self)));
++			g_free (array);
++			goto out;
++		}
 +
 +		g_free (array);
 +	} else {
-+
-+		/* NOTE - 0.9.10.x would not throw an error in this case!!! */
-+
 +		nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'DomainNameServers' missing",
 +					 nm_modem_get_uid (NM_MODEM (self)));
 +		goto out;
@@ -1524,14 +1481,19 @@
 +	ret = TRUE;
 +
 +out:
-+	if (!ret)
-+		reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
-+
-+	nm_log_dbg (LOGD_MB, "(%s): DONE w/Settings; ret: %s",
-+				nm_modem_get_uid (NM_MODEM (self)), ret ? "TRUE" : "FALSE");
-+
-+	if (nm_modem_get_state (NM_MODEM (self)) != NM_MODEM_STATE_CONNECTED)
++	if (nm_modem_get_state (NM_MODEM (self)) != NM_MODEM_STATE_CONNECTED) {
++		nm_log_info (LOGD_MB, "ofono: (%s): emitting PREPARE_RESULT: %s",
++		             nm_modem_get_uid (NM_MODEM (self)), ret ? "TRUE" : "FALSE");
++
++		if (!ret)
++			reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
++
 +		g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, ret, reason);
++	} else {
++		nm_log_warn (LOGD_MB, "ofono: (%s): MODEM_PPP_FAILED", nm_modem_get_uid (NM_MODEM (self)));
++
++		g_signal_emit_by_name (self, NM_MODEM_PPP_FAILED, NM_DEVICE_STATE_REASON_PPP_FAILED);
++	}
 +}
 +
 +static NMActStageReturn
 
=== modified file 'debian/rules'
--- debian/rules	2016-04-06 20:01:36 +0000
+++ debian/rules	2016-04-27 16:19:01 +0000
@@ -2,11 +2,24 @@
 
 include /usr/share/dpkg/architecture.mk
 
-PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir)
+# The following line is used by 1.2x desktop, but doesn't
+# work on vivid or wily, preventing a source package from
+# being built on this releases.  This is because ppp 2.4.6-3*
+# doesn't include dh_ppp.
+#
+# PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-	dh $@ --with gir,systemd,autoreconf,ppp
+# This is from the 1.2x desktop branch; ppp fails due to lack of
+# dh_ppp ( see above ).  This is a no-op until we fix pptp VPN
+# on the phone.  gir fails when building the binary packages with
+# the error:
+#
+# dh_girepository: Could not find gir file for NM-1.0.typelib
+#
+#       dh $@ --with gir,systemd,autoreconf,ppp
+	dh $@ --with systemd,autoreconf
 
 autoreconf:
 	gtkdocize --copy
@@ -19,14 +32,13 @@
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--libexecdir=/usr/lib/NetworkManager \
-		--with-pppd-plugin-dir=$(PPPD_PLUGIN_DIR) \
-		--with-pppd=/usr/sbin/pppd \
 		--with-resolvconf=/sbin/resolvconf \
 		--with-dhclient=/sbin/dhclient \
 		--with-iptables=/sbin/iptables \
 		--with-dnsmasq=/usr/sbin/dnsmasq \
 		--with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \
 		--with-systemdsystemunitdir=/lib/systemd/system \
+		--with-systemd-journal=no \
 		--with-udev-dir=/lib/udev \
 		--with-crypto=gnutls \
 		--with-session-tracking=systemd \
@@ -36,9 +48,9 @@
 		--with-nmcli \
 		--disable-more-warnings \
 		--disable-modify-system \
+		--disable-bluez5 \
 		--enable-polkit \
 		--enable-polkit-agent \
-		--enable-ppp \
 		--enable-ifupdown \
 		--enable-config-plugin-ibft \
 		--enable-introspection \
@@ -46,8 +58,7 @@
 		--enable-concheck \
 		--enable-teamdctl=no \
 		--enable-vala \
-		--with-tests \
-		--enable-bluez5-dun
+		--with-tests
 
 override_dh_install:
 	rm -vf $(CURDIR)/debian/tmp/etc/init.d/NetworkManager
@@ -59,6 +70,9 @@
 	# copy dnsmasq configuration
 	mkdir -p debian/network-manager/etc/dnsmasq.d
 	cp debian/network-manager.dnsmasq debian/network-manager/etc/dnsmasq.d/network-manager
+	mkdir -p debian/network-manager/etc/polkit-1/localauthority/50-local.d
+	cp debian/indicator-network.pkla \
+	debian/network-manager/etc/polkit-1/localauthority/50-local.d/org.freedesktop.NetworkManager.pkla
 
 override_dh_installinit:
 	dh_installinit --noscripts
@@ -67,7 +81,7 @@
 	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/
 
 override_dh_strip:
-	dh_strip --dbgsym-migration='network-manager-dbg (<< 1.1.91-2~)'
+	dh_strip --dbg-package=network-manager-dbg
 
 override_dh_systemd_enable:
 	dh_systemd_enable -pnetwork-manager NetworkManager-dispatcher.service
@@ -81,9 +95,6 @@
 	dh_systemd_start -pnetwork-manager --no-start NetworkManager-wait-online.service
 	dh_systemd_start -pnetwork-manager --restart-after-upgrade NetworkManager.service
 
-override_dh_ppp:
-	dh_ppp --breaks
-
 override_dh_auto_test:
 ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
 	make check || ( find . -name test-suite.log -exec cat {} \;; exit 1; )