Merge lp:~noskcaj/network-manager/merge into lp:~network-manager/network-manager/ubuntu

[Jackson Doak]

New upstream bugfix release

[Mathieu Trudel-Lapierre (cyphermox)]

Sorry about the delay in noticing this. Since we're already past that release, marking as Rejected. We'll need to start thinking about merge 1.0 or later, now.

review: Disapprove

Unmerged revisions

841. By Jackson Doak on 2014-06-20

* New upstream release. LP: #1332338
* Drop some git patches
* Refresh patches
* debian/watch: Track .xz tarballs

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-11 18:43:53 +0000
+++ debian/changelog	2014-06-20 21:41:36 +0000
@@ -1,3 +1,12 @@
+network-manager (0.9.8.10-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release. LP: #1332338
+  * Drop some git patches
+  * Refresh patches
+  * debian/watch: Track .xz tarballs
+
+ -- Jackson Doak <[e-mail]>  Fri, 20 Jun 2014 06:41:29 +1000
+
 network-manager (0.9.8.8-0ubuntu18) utopic; urgency=medium
 
   * debian/control: allow for ofono to be installed instead of modemmanager

=== modified file 'debian/patches/add-veth-support.diff'
--- debian/patches/add-veth-support.diff	2012-12-10 19:51:29 +0000
+++ debian/patches/add-veth-support.diff	2014-06-20 21:41:36 +0000
@@ -8,8 +8,6 @@
  src/nm-udev-manager.c    |    5 +++++
  4 files changed, 10 insertions(+), 2 deletions(-)
 
-Index: b/src/nm-udev-manager.c
-===================================================================
 --- a/src/nm-udev-manager.c
 +++ b/src/nm-udev-manager.c
 @@ -407,6 +407,11 @@ dev_get_attrs (GUdevDevice *udev_device,
@@ -24,11 +22,9 @@
  		default:
  			if (g_str_has_prefix (ifname, "easytether"))
  				driver = "easytether";
-Index: b/src/nm-system.c
-===================================================================
 --- a/src/nm-system.c
 +++ b/src/nm-system.c
-@@ -1882,6 +1882,8 @@ nm_system_get_iface_type (int ifindex, c
+@@ -1918,6 +1918,8 @@ nm_system_get_iface_type (int ifindex, c
  		res = NM_IFACE_TYPE_BRIDGE;
  	else if (!g_strcmp0 (type, "dummy"))
  		res = NM_IFACE_TYPE_DUMMY;
@@ -37,8 +33,6 @@
  
  	rtnl_link_put (result);
  out:
-Index: b/src/nm-system.h
-===================================================================
 --- a/src/nm-system.h
 +++ b/src/nm-system.h
 @@ -114,7 +114,8 @@ enum {
@@ -51,11 +45,9 @@
  };
  
  int             nm_system_get_iface_type      (int ifindex, const char *name);
-Index: b/src/nm-device-ethernet.c
-===================================================================
 --- a/src/nm-device-ethernet.c
 +++ b/src/nm-device-ethernet.c
-@@ -252,7 +252,7 @@ constructor (GType type,
+@@ -253,7 +253,7 @@ constructor (GType type,
  		// FIXME: Convert this into a no-export property so type can be specified
  		//        when the device is created.
  		itype = nm_system_get_iface_type (nm_device_get_ifindex (self), nm_device_get_iface (self));

=== modified file 'debian/patches/add_ofono_settings_support.patch'
--- debian/patches/add_ofono_settings_support.patch	2014-05-06 16:36:03 +0000
+++ debian/patches/add_ofono_settings_support.patch	2014-06-20 21:41:36 +0000
@@ -15,11 +15,9 @@
  src/settings/plugins/ofono/plugin.h              |   53 +
  11 files changed, 1221 insertions(+)
 
-Index: b/configure.ac
-===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -96,6 +96,7 @@ AC_ARG_ENABLE(ifcfg-rh, AS_HELP_STRING([
+@@ -98,6 +98,7 @@ AC_ARG_ENABLE(ifcfg-rh, AS_HELP_STRING([
  AC_ARG_ENABLE(ifcfg-suse, AS_HELP_STRING([--enable-ifcfg-suse], [enable ifcfg-suse configuration plugin (SUSE)]))
  AC_ARG_ENABLE(ifupdown, AS_HELP_STRING([--enable-ifupdown], [enable ifupdown configuration plugin (Debian/Ubuntu)]))
  AC_ARG_ENABLE(ifnet, AS_HELP_STRING([--enable-ifnet], [enable ifnet configuration plugin (Gentoo)]))
@@ -27,7 +25,7 @@
  # Default alternative plugins by distribution
  AS_IF([test -z "$enable_ifcfg_rh"], AC_CHECK_FILE(/etc/redhat-release, enable_ifcfg_rh=yes))
  AS_IF([test -z "$enable_ifcfg_rh"], AC_CHECK_FILE(/etc/fedora-release, enable_ifcfg_rh=yes))
-@@ -108,11 +109,14 @@ AS_IF([test -z "$enable_ifcfg_rh"], enab
+@@ -110,11 +111,14 @@ AS_IF([test -z "$enable_ifcfg_rh"], enab
  AS_IF([test -z "$enable_ifcfg_suse"], enable_ifcfg_suse=no)
  AS_IF([test -z "$enable_ifupdown"], enable_ifupdown=no)
  AS_IF([test -z "$enable_ifnet"], enable_ifnet=no)
@@ -42,7 +40,7 @@
  # Code coverage
  GNOME_CODE_COVERAGE
  
-@@ -671,6 +675,7 @@ src/settings/Makefile
+@@ -688,6 +692,7 @@ src/settings/Makefile
  src/settings/plugins/Makefile
  src/settings/plugins/ifupdown/Makefile
  src/settings/plugins/ifupdown/tests/Makefile
@@ -50,7 +48,7 @@
  src/settings/plugins/ifnet/Makefile
  src/settings/plugins/ifnet/tests/Makefile
  src/settings/plugins/ifcfg-rh/Makefile
-@@ -780,6 +785,7 @@ echo "  ifcfg-rh: ${enable_ifcfg_rh}"
+@@ -797,6 +802,7 @@ echo "  ifcfg-rh: ${enable_ifcfg_rh}"
  echo "  ifcfg-suse: ${enable_ifcfg_suse}"
  echo "  ifupdown: ${enable_ifupdown}"
  echo "  ifnet: ${enable_ifnet}"
@@ -58,8 +56,6 @@
  echo
  
  echo "Handlers for /etc/resolv.conf:"
-Index: b/src/settings/plugins/Makefile.am
-===================================================================
 --- a/src/settings/plugins/Makefile.am
 +++ b/src/settings/plugins/Makefile.am
 @@ -15,3 +15,8 @@ endif
@@ -71,8 +67,6 @@
 +SUBDIRS+=ofono
 +endif
 +
-Index: b/src/settings/plugins/ofono/Makefile.am
-===================================================================
 --- /dev/null
 +++ b/src/settings/plugins/ofono/Makefile.am
 @@ -0,0 +1,65 @@
@@ -141,8 +135,6 @@
 +	nm-ofono.xml
 +
 +CLEANFILES = $(BUILT_SOURCES)
-Index: b/src/settings/plugins/ofono/nm-ofono-connection.c
-===================================================================
 --- /dev/null
 +++ b/src/settings/plugins/ofono/nm-ofono-connection.c
 @@ -0,0 +1,166 @@
@@ -312,8 +304,6 @@
 +						   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 +}
 +
-Index: b/src/settings/plugins/ofono/nm-ofono-connection.h
-===================================================================
 --- /dev/null
 +++ b/src/settings/plugins/ofono/nm-ofono-connection.h
 @@ -0,0 +1,54 @@
@@ -371,8 +361,6 @@
 +G_END_DECLS
 +
 +#endif /* NM_OFONO_CONNECTION_H */
-Index: b/src/settings/plugins/ofono/parser.c
-===================================================================
 --- /dev/null
 +++ b/src/settings/plugins/ofono/parser.c
 @@ -0,0 +1,123 @@
@@ -499,8 +487,6 @@
 +	g_free (idstr);
 +	return success;
 +}
-Index: b/src/settings/plugins/ofono/parser.h
-===================================================================
 --- /dev/null
 +++ b/src/settings/plugins/ofono/parser.h
 @@ -0,0 +1,33 @@
@@ -537,8 +523,6 @@
 +                                      GError **error);
 +
 +G_END_DECLS
-Index: b/src/settings/plugins/ofono/plugin.c
-===================================================================
 --- /dev/null
 +++ b/src/settings/plugins/ofono/plugin.c
 @@ -0,0 +1,682 @@
@@ -1224,8 +1208,6 @@
 +	return G_OBJECT (singleton);
 +}
 +
-Index: b/src/settings/plugins/ofono/plugin.h
-===================================================================
 --- /dev/null
 +++ b/src/settings/plugins/ofono/plugin.h
 @@ -0,0 +1,53 @@
@@ -1282,8 +1264,6 @@
 +GQuark ofono_plugin_error_quark (void);
 +
 +#endif	/* _PLUGIN_H_ */
-Index: b/src/settings/plugins/ofono/nm-ofono.xml
-===================================================================
 --- /dev/null
 +++ b/src/settings/plugins/ofono/nm-ofono.xml
 @@ -0,0 +1,16 @@
@@ -1303,8 +1283,6 @@
 +		</method>
 +	</interface>
 +</node>
-Index: b/src/settings/plugins/ofono/nm-ofono.conf
-===================================================================
 --- /dev/null
 +++ b/src/settings/plugins/ofono/nm-ofono.conf
 @@ -0,0 +1,18 @@

=== modified file 'debian/patches/add_ofono_support.patch'
--- debian/patches/add_ofono_support.patch	2014-05-01 17:36:54 +0000
+++ debian/patches/add_ofono_support.patch	2014-06-20 21:41:36 +0000
@@ -12,8 +12,6 @@
  src/nm-device-modem.c                |   16 
  8 files changed, 1658 insertions(+), 22 deletions(-)
 
-Index: b/src/nm-device-modem.c
-===================================================================
 --- a/src/nm-device-modem.c
 +++ b/src/nm-device-modem.c
 @@ -26,6 +26,7 @@
@@ -77,8 +75,6 @@
  	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (object);
  
  	switch (prop_id) {
-Index: b/src/modem-manager/nm-modem-ofono.c
-===================================================================
 --- /dev/null
 +++ b/src/modem-manager/nm-modem-ofono.c
 @@ -0,0 +1,1317 @@
@@ -1399,11 +1395,9 @@
 +	//dbus_g_error_domain_register (NM_OFONO_ERROR, NULL, NM_TYPE_OFONO_ERROR);
 +}
 +
-Index: b/src/modem-manager/Makefile.am
-===================================================================
 --- a/src/modem-manager/Makefile.am
 +++ b/src/modem-manager/Makefile.am
-@@ -5,6 +5,7 @@ INCLUDES = \
+@@ -7,6 +7,7 @@ libmodem_manager_la_CPPFLAGS = \
  	-I${top_builddir}/src/generated \
  	-I${top_srcdir}/src/generated \
  	-I${top_srcdir}/src/logging \
@@ -1411,7 +1405,7 @@
  	-I${top_builddir}/include \
  	-I${top_srcdir}/include \
  	-I${top_builddir}/libnm-util \
-@@ -21,6 +22,8 @@ libmodem_manager_la_SOURCES = \
+@@ -23,6 +24,8 @@ libmodem_manager_la_SOURCES = \
  	nm-modem-cdma.h \
  	nm-modem-gsm.c \
  	nm-modem-gsm.h \
@@ -1420,8 +1414,6 @@
  	nm-modem-manager.h \
  	nm-modem-manager.c \
  	nm-modem-types.h
-Index: b/src/modem-manager/nm-modem-types.h
-===================================================================
 --- a/src/modem-manager/nm-modem-types.h
 +++ b/src/modem-manager/nm-modem-types.h
 @@ -21,6 +21,14 @@
@@ -1439,8 +1431,6 @@
  #define MM_OLD_DBUS_SERVICE                     "org.freedesktop.ModemManager"
  #define MM_OLD_DBUS_PATH                        "/org/freedesktop/ModemManager"
  #define MM_OLD_DBUS_INTERFACE                   "org.freedesktop.ModemManager"
-Index: b/src/modem-manager/nm-modem.c
-===================================================================
 --- a/src/modem-manager/nm-modem.c
 +++ b/src/modem-manager/nm-modem.c
 @@ -92,6 +92,7 @@ static guint signals[LAST_SIGNAL] = { 0
@@ -1741,8 +1731,6 @@
  	g_type_class_add_private (object_class, sizeof (NMModemPrivate));
  
  	/* Virtual methods */
-Index: b/src/modem-manager/nm-modem-manager.c
-===================================================================
 --- a/src/modem-manager/nm-modem-manager.c
 +++ b/src/modem-manager/nm-modem-manager.c
 @@ -17,7 +17,7 @@
@@ -2052,7 +2040,7 @@
  }
  
  /************************************************************************/
-@@ -769,15 +934,20 @@ nm_modem_manager_init (NMModemManager *s
+@@ -786,15 +951,20 @@ nm_modem_manager_init (NMModemManager *s
  
  	self->priv->modems = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
  
@@ -2077,8 +2065,6 @@
  
  #if WITH_MODEM_MANAGER_1
  	/* ModemManager >= 0.7 */
-Index: b/src/modem-manager/nm-modem-ofono.h
-===================================================================
 --- /dev/null
 +++ b/src/modem-manager/nm-modem-ofono.h
 @@ -0,0 +1,56 @@
@@ -2138,8 +2124,6 @@
 +G_END_DECLS
 +
 +#endif /* NM_MODEM_OFONO_H */
-Index: b/include/NetworkManager.h
-===================================================================
 --- a/include/NetworkManager.h
 +++ b/include/NetworkManager.h
 @@ -309,6 +309,7 @@ typedef enum {

=== modified file 'debian/patches/add_sendsigs_omissions.patch'
--- debian/patches/add_sendsigs_omissions.patch	2014-04-08 00:30:45 +0000
+++ debian/patches/add_sendsigs_omissions.patch	2014-06-20 21:41:36 +0000
@@ -9,14 +9,12 @@
 
 ---
  src/dhcp-manager/nm-dhcp-dhclient.c |    2 +-
- src/dns-manager/nm-dns-dnsmasq.c    |    4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ src/dns-manager/nm-dns-dnsmasq.c    |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: b/src/dhcp-manager/nm-dhcp-dhclient.c
-===================================================================
 --- a/src/dhcp-manager/nm-dhcp-dhclient.c
 +++ b/src/dhcp-manager/nm-dhcp-dhclient.c
-@@ -553,7 +553,7 @@ dhclient_start (NMDHCPClient *client,
+@@ -520,7 +520,7 @@ dhclient_start (NMDHCPClient *client,
  		return -1;
  	}
  
@@ -25,8 +23,6 @@
  		                        ipv6 ? "6" : "",
  		                        iface);
  	if (!pid_file) {
-Index: b/src/dns-manager/nm-dns-dnsmasq.c
-===================================================================
 --- a/src/dns-manager/nm-dns-dnsmasq.c
 +++ b/src/dns-manager/nm-dns-dnsmasq.c
 @@ -39,7 +39,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm

=== modified file 'debian/patches/adhoc_use_wpa_rsn_part1.patch'
--- debian/patches/adhoc_use_wpa_rsn_part1.patch	2013-02-22 17:35:24 +0000
+++ debian/patches/adhoc_use_wpa_rsn_part1.patch	2014-06-20 21:41:36 +0000
@@ -10,8 +10,6 @@
  src/settings/nm-settings.c |   45 ---------------------------------
  3 files changed, 109 deletions(-)
 
-Index: b/libnm-util/nm-utils.c
-===================================================================
 --- a/libnm-util/nm-utils.c
 +++ b/libnm-util/nm-utils.c
 @@ -1325,8 +1325,6 @@ nm_utils_security_valid (NMUtilsSecurity
@@ -32,8 +30,6 @@
  		if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN))
  			return FALSE;
  		if (have_ap) {
-Index: b/src/nm-device-wifi.c
-===================================================================
 --- a/src/nm-device-wifi.c
 +++ b/src/nm-device-wifi.c
 @@ -976,36 +976,6 @@ deactivate (NMDevice *dev)
@@ -107,7 +103,7 @@
  	g_assert (ssid);
  	str_ssid = nm_utils_ssid_to_utf8 (ssid);
  	format = g_strdup_printf ("%s %%d", str_ssid);
-@@ -2973,16 +2923,6 @@ act_stage1_prepare (NMDevice *dev, NMDev
+@@ -2975,16 +2925,6 @@ act_stage1_prepare (NMDevice *dev, NMDev
  	}
  	g_object_notify (G_OBJECT (self), NM_DEVICE_WIFI_MODE);
  
@@ -124,11 +120,9 @@
  	/* Set spoof MAC to the interface */
  	cloned_mac = nm_setting_wireless_get_cloned_mac_address (s_wireless);
  	if (cloned_mac && (cloned_mac->len == ETH_ALEN))
-Index: b/src/settings/nm-settings.c
-===================================================================
 --- a/src/settings/nm-settings.c
 +++ b/src/settings/nm-settings.c
-@@ -1065,38 +1065,6 @@ add_cb (NMSettings *self,
+@@ -1074,38 +1074,6 @@ add_cb (NMSettings *self,
  		dbus_g_method_return (context, nm_connection_get_path (NM_CONNECTION (connection)));
  }
  
@@ -167,7 +161,7 @@
  void
  nm_settings_add_connection (NMSettings *self,
                              NMConnection *connection,
-@@ -1122,19 +1090,6 @@ nm_settings_add_connection (NMSettings *
+@@ -1131,19 +1099,6 @@ nm_settings_add_connection (NMSettings *
  		callback (self, NULL, error, context, user_data);
  		g_error_free (error);
  		return;

=== modified file 'debian/patches/adhoc_use_wpa_rsn_part2.patch'
--- debian/patches/adhoc_use_wpa_rsn_part2.patch	2013-02-22 17:44:08 +0000
+++ debian/patches/adhoc_use_wpa_rsn_part2.patch	2014-06-20 21:41:36 +0000
@@ -38,11 +38,9 @@
  src/wifi/wifi-utils-nl80211.c                          |    3 +
  14 files changed, 108 insertions(+), 162 deletions(-)
 
-Index: b/include/NetworkManager.h
-===================================================================
 --- a/include/NetworkManager.h
 +++ b/include/NetworkManager.h
-@@ -159,6 +159,7 @@ typedef enum {
+@@ -180,6 +180,7 @@ typedef enum {
   * @NM_WIFI_DEVICE_CAP_RSN: device supports WPA2/RSN authentication
   * @NM_WIFI_DEVICE_CAP_AP: device supports Access Point mode
   * @NM_WIFI_DEVICE_CAP_ADHOC: device supports Ad-Hoc mode
@@ -50,7 +48,7 @@
   *
   * 802.11 specific device encryption and authentication capabilities.
   **/
-@@ -171,7 +172,8 @@ typedef enum {
+@@ -192,7 +193,8 @@ typedef enum {
  	NM_WIFI_DEVICE_CAP_WPA           = 0x00000010,
  	NM_WIFI_DEVICE_CAP_RSN           = 0x00000020,
  	NM_WIFI_DEVICE_CAP_AP            = 0x00000040,
@@ -60,8 +58,6 @@
  } NMDeviceWifiCapabilities;
  
  
-Index: b/libnm-glib/nm-device-wifi.c
-===================================================================
 --- a/libnm-glib/nm-device-wifi.c
 +++ b/libnm-glib/nm-device-wifi.c
 @@ -534,8 +534,7 @@ connection_compatible (NMDevice *device,
@@ -74,8 +70,6 @@
  		    || !g_strcmp0 (key_mgmt, "wpa-eap")) {
  
  			/* Is device only WEP capable? */
-Index: b/libnm-util/nm-setting-wireless-security.c
-===================================================================
 --- a/libnm-util/nm-setting-wireless-security.c
 +++ b/libnm-util/nm-setting-wireless-security.c
 @@ -732,8 +732,7 @@ need_secrets (NMSetting *setting)
@@ -162,8 +156,6 @@
  						  "or 'wpa-eap' (WPA-Enterprise).  This property must "
  						  "be set for any WiFi connection that uses security.",
  						  NULL,
-Index: b/libnm-util/nm-setting-wireless.c
-===================================================================
 --- a/libnm-util/nm-setting-wireless.c
 +++ b/libnm-util/nm-setting-wireless.c
 @@ -190,11 +190,13 @@ nm_setting_wireless_ap_security_compatib
@@ -185,8 +177,6 @@
  	}
  
  	/* Adhoc WPA2 (ie, RSN IBSS) */
-Index: b/libnm-util/nm-utils.c
-===================================================================
 --- a/libnm-util/nm-utils.c
 +++ b/libnm-util/nm-utils.c
 @@ -1327,25 +1327,16 @@ nm_utils_security_valid (NMUtilsSecurity
@@ -238,8 +228,6 @@
  					return TRUE;
  			} else {
  				if (ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) {
-Index: b/src/nm-wifi-ap-utils.c
-===================================================================
 --- a/src/nm-wifi-ap-utils.c
 +++ b/src/nm-wifi-ap-utils.c
 @@ -271,7 +271,7 @@ verify_wpa_psk (NMSettingWirelessSecurit
@@ -346,8 +334,6 @@
  	} else if (s_8021x) {
  		g_object_set (s_wsec,
  		              NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-eap",
-Index: b/src/nm-wifi-ap.c
-===================================================================
 --- a/src/nm-wifi-ap.c
 +++ b/src/nm-wifi-ap.c
 @@ -629,6 +629,7 @@ nm_ap_new_fake_from_connection (NMConnec
@@ -435,11 +421,9 @@
  
  done:
  	return ap;
-Index: b/src/settings/plugins/ifcfg-rh/reader.c
-===================================================================
 --- a/src/settings/plugins/ifcfg-rh/reader.c
 +++ b/src/settings/plugins/ifcfg-rh/reader.c
-@@ -1990,8 +1990,8 @@ fill_wpa_ciphers (shvarFile *ifcfg,
+@@ -2001,8 +2001,8 @@ fill_wpa_ciphers (shvarFile *ifcfg,
  				PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: ignoring group cipher '%s' (only one group cipher allowed in Ad-Hoc mode)",
  				             *iter);
  				continue;
@@ -450,7 +434,7 @@
  				             *iter);
  				continue;
  			}
-@@ -2777,8 +2777,8 @@ make_wpa_setting (shvarFile *ifcfg,
+@@ -2791,8 +2791,8 @@ make_wpa_setting (shvarFile *ifcfg,
  
  	/* WPA and/or RSN */
  	if (adhoc) {
@@ -461,7 +445,7 @@
  	} else {
  		char *allow_wpa, *allow_rsn;
  
-@@ -2817,10 +2817,7 @@ make_wpa_setting (shvarFile *ifcfg,
+@@ -2831,10 +2831,7 @@ make_wpa_setting (shvarFile *ifcfg,
  			}
  		}
  
@@ -473,8 +457,6 @@
  	} else if (!strcmp (value, "WPA-EAP") || !strcmp (value, "IEEE8021X")) {
  		/* Adhoc mode is mutually exclusive with any 802.1x-based authentication */
  		if (adhoc) {
-Index: b/src/settings/plugins/ifcfg-rh/writer.c
-===================================================================
 --- a/src/settings/plugins/ifcfg-rh/writer.c
 +++ b/src/settings/plugins/ifcfg-rh/writer.c
 @@ -591,7 +591,7 @@ write_wireless_security_setting (NMConne
@@ -486,8 +468,6 @@
  		svSetValue (ifcfg, "KEY_MGMT", "WPA-PSK", FALSE);
  		wpa = TRUE;
  		*no_8021x = TRUE;
-Index: b/src/settings/plugins/ifnet/connection_parser.c
-===================================================================
 --- a/src/settings/plugins/ifnet/connection_parser.c
 +++ b/src/settings/plugins/ifnet/connection_parser.c
 @@ -1353,23 +1353,6 @@ fill_wpa_ciphers (const char *ssid,
@@ -573,8 +553,6 @@
  		wpa_set_data (conn_name, "key_mgmt", "WPA-PSK");
  		wpa = TRUE;
  		*no_8021x = TRUE;
-Index: b/src/settings/plugins/ifnet/tests/wpa_supplicant.conf
-===================================================================
 --- a/src/settings/plugins/ifnet/tests/wpa_supplicant.conf
 +++ b/src/settings/plugins/ifnet/tests/wpa_supplicant.conf
 @@ -68,3 +68,15 @@ network={
@@ -593,8 +571,6 @@
 +        psk="secret passphrase"
 +}
 +
-Index: b/src/supplicant-manager/nm-supplicant-config.c
-===================================================================
 --- a/src/supplicant-manager/nm-supplicant-config.c
 +++ b/src/supplicant-manager/nm-supplicant-config.c
 @@ -651,8 +651,7 @@ nm_supplicant_config_add_setting_wireles
@@ -607,8 +583,6 @@
  	    || !strcmp (key_mgmt, "wpa-eap")) {
  		ADD_STRING_LIST_VAL (setting, wireless_security, proto, protos, "proto", ' ', TRUE, FALSE);
  		ADD_STRING_LIST_VAL (setting, wireless_security, pairwise, pairwise, "pairwise", ' ', TRUE, FALSE);
-Index: b/src/supplicant-manager/nm-supplicant-settings-verify.c
-===================================================================
 --- a/src/supplicant-manager/nm-supplicant-settings-verify.c
 +++ b/src/supplicant-manager/nm-supplicant-settings-verify.c
 @@ -70,7 +70,7 @@ static const struct validate_entry valid
@@ -620,11 +594,9 @@
                                      "NONE", NULL };
  const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL };
  const char * eap_allowed[] =      { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM",
-Index: b/src/wifi/wifi-utils-nl80211.c
-===================================================================
 --- a/src/wifi/wifi-utils-nl80211.c
 +++ b/src/wifi/wifi-utils-nl80211.c
-@@ -720,6 +720,9 @@ static int nl80211_wiphy_info_handler (s
+@@ -730,6 +730,9 @@ static int nl80211_wiphy_info_handler (s
  		}
  	}
  

=== modified file 'debian/patches/bridge_ignore_without_connections.patch'
--- debian/patches/bridge_ignore_without_connections.patch	2013-01-21 23:59:00 +0000
+++ debian/patches/bridge_ignore_without_connections.patch	2014-06-20 21:41:36 +0000
@@ -8,11 +8,9 @@
  src/nm-manager.c |   27 ++++++++++++++++++++++++---
  1 file changed, 24 insertions(+), 3 deletions(-)
 
-Index: b/src/nm-manager.c
-===================================================================
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -1723,7 +1723,7 @@ add_device (NMManager *self, NMDevice *d
+@@ -1921,7 +1921,7 @@ add_device (NMManager *self, NMDevice *d
  	static guint32 devcount = 0;
  	const GSList *unmanaged_specs;
  	NMConnection *existing = NULL;
@@ -21,7 +19,7 @@
  	RfKillType rtype;
  	NMDeviceType devtype;
  
-@@ -1775,6 +1775,14 @@ add_device (NMManager *self, NMDevice *d
+@@ -1973,6 +1973,14 @@ add_device (NMManager *self, NMDevice *d
  		g_signal_connect (device, NM_DEVICE_MODEM_ENABLE_CHANGED,
  		                  G_CALLBACK (manager_modem_enabled_changed),
  		                  self);
@@ -36,7 +34,7 @@
  	}
  
  	/* Update global rfkill state for this device type with the device's
-@@ -1823,7 +1831,8 @@ add_device (NMManager *self, NMDevice *d
+@@ -2021,7 +2029,8 @@ add_device (NMManager *self, NMDevice *d
  	/* Start the device if it's supposed to be managed */
  	unmanaged_specs = nm_settings_get_unmanaged_specs (priv->settings);
  	if (   !manager_sleeping (self)
@@ -46,7 +44,7 @@
  		nm_device_set_managed (device,
  		                       TRUE,
  		                       existing ? NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED :
-@@ -3157,6 +3166,7 @@ do_sleep_wake (NMManager *self)
+@@ -3441,6 +3450,7 @@ do_sleep_wake (NMManager *self)
  {
  	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
  	const GSList *unmanaged_specs;
@@ -54,7 +52,7 @@
  	GSList *iter;
  
  	if (manager_sleeping (self)) {
-@@ -3182,6 +3192,7 @@ do_sleep_wake (NMManager *self)
+@@ -3466,6 +3476,7 @@ do_sleep_wake (NMManager *self)
  		/* Re-manage managed devices */
  		for (iter = priv->devices; iter; iter = iter->next) {
  			NMDevice *device = NM_DEVICE (iter->data);
@@ -62,7 +60,7 @@
  			guint i;
  
  			/* enable/disable wireless devices since that we don't respond
-@@ -3201,9 +3212,19 @@ do_sleep_wake (NMManager *self)
+@@ -3485,9 +3496,19 @@ do_sleep_wake (NMManager *self)
  					nm_device_set_enabled (device, enabled);
  			}
  

=== modified file 'debian/patches/connectivity_check_default_interval.patch'
--- debian/patches/connectivity_check_default_interval.patch	2014-01-31 17:05:11 +0000
+++ debian/patches/connectivity_check_default_interval.patch	2014-06-20 21:41:36 +0000
@@ -11,8 +11,6 @@
  src/nm-connectivity.c    |    3 ++-
  3 files changed, 18 insertions(+), 3 deletions(-)
 
-Index: b/src/nm-config.c
-===================================================================
 --- a/src/nm-config.c
 +++ b/src/nm-config.c
 @@ -22,6 +22,7 @@
@@ -52,8 +50,6 @@
  
  		if (cli_connectivity_response && strlen (cli_connectivity_response))
  			config->connectivity_response = g_strdup (cli_connectivity_response);
-Index: b/src/nm-connectivity.c
-===================================================================
 --- a/src/nm-connectivity.c
 +++ b/src/nm-connectivity.c
 @@ -26,6 +26,7 @@
@@ -73,8 +69,6 @@
  		                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
  
  	g_object_class_install_property
-Index: b/include/NetworkManager.h
-===================================================================
 --- a/include/NetworkManager.h
 +++ b/include/NetworkManager.h
 @@ -68,6 +68,8 @@

=== modified file 'debian/patches/dns-dnsmasq-interface-and-dbus-path.patch'
--- debian/patches/dns-dnsmasq-interface-and-dbus-path.patch	2013-10-07 16:00:58 +0000
+++ debian/patches/dns-dnsmasq-interface-and-dbus-path.patch	2014-06-20 21:41:36 +0000
@@ -4,11 +4,9 @@
  src/org.freedesktop.NetworkManager.conf |   10 ++++++++++
  3 files changed, 17 insertions(+), 7 deletions(-)
 
-Index: b/src/dns-manager/nm-dns-dnsmasq.c
-===================================================================
 --- a/src/dns-manager/nm-dns-dnsmasq.c
 +++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -52,7 +52,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
+@@ -48,7 +48,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
  #define CONFFILE NMRUNDIR "/dnsmasq.conf"
  #define CONFDIR NMCONFDIR "/dnsmasq.d"
  
@@ -17,7 +15,7 @@
  #define DNSMASQ_DBUS_PATH "/uk/org/thekelleys/dnsmasq"
  #define DNSMASQ_DBUS_INTERFACE "uk.org.thekelleys.dnsmasq"
  
-@@ -289,11 +289,11 @@ start_dnsmasq (NMDnsDnsmasq *self)
+@@ -285,11 +285,11 @@ start_dnsmasq (NMDnsDnsmasq *self)
  	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
  	argv[idx++] = "--bind-interfaces";
  	argv[idx++] = "--pid-file=" PIDFILE;
@@ -31,7 +29,7 @@
  
  	/* dnsmasq exits if the conf dir is not present */
  	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
-@@ -414,7 +414,7 @@ update (NMDnsPlugin *plugin,
+@@ -410,7 +410,7 @@ update (NMDnsPlugin *plugin,
  
  	/* If all the configs lists are empty, there is just nothing to be caching --
  	 * we cleared up the dnsmasq cache; but we should also fail the update, so
@@ -40,8 +38,6 @@
  	 */
  	if (((vpn_configs && g_slist_length (vpn_configs) < 1) || !vpn_configs) &&
  	    ((dev_configs && g_slist_length (dev_configs) < 1) || !dev_configs) &&
-Index: b/src/dns-manager/nm-dns-manager.c
-===================================================================
 --- a/src/dns-manager/nm-dns-manager.c
 +++ b/src/dns-manager/nm-dns-manager.c
 @@ -728,7 +728,7 @@ update_dns (NMDnsManager *self,
@@ -71,14 +67,12 @@
  		 * DNS after disposing of all plugins.  But if we haven't done any
  		 * DNS updates yet, there's no reason to touch resolv.conf on shutdown.
  		 */
-Index: b/src/org.freedesktop.NetworkManager.conf
-===================================================================
 --- a/src/org.freedesktop.NetworkManager.conf
 +++ b/src/org.freedesktop.NetworkManager.conf
-@@ -24,6 +24,13 @@
-                 <allow send_destination="org.freedesktop.NetworkManager.pptp"/>
+@@ -25,6 +25,13 @@
                  <allow send_destination="org.freedesktop.NetworkManager.vpnc"/>
                  <allow send_destination="org.freedesktop.NetworkManager.ssh"/>
+                 <allow send_destination="org.freedesktop.NetworkManager.iodine"/>
 +
 +                <!-- Allow the custom name for the dnsmasq instance spawned by NM
 +                     from the dns dnsmasq plugin to own it's dbus name, and for
@@ -89,7 +83,7 @@
          </policy>
          <policy at_console="true">
                  <allow send_destination="org.freedesktop.NetworkManager"/>
-@@ -130,6 +137,9 @@
+@@ -131,6 +138,9 @@
                  <deny send_destination="org.freedesktop.NetworkManager"
                         send_interface="org.freedesktop.NetworkManager"
                         send_member="wake"/>

=== modified file 'debian/patches/dnsmasq-dbus-updates.patch'
--- debian/patches/dnsmasq-dbus-updates.patch	2014-03-06 20:21:52 +0000
+++ debian/patches/dnsmasq-dbus-updates.patch	2014-06-20 21:41:36 +0000
@@ -10,8 +10,6 @@
  src/dns-manager/nm-dns-plugin.h  |    1 
  4 files changed, 279 insertions(+), 134 deletions(-)
 
-Index: b/src/dns-manager/nm-dns-dnsmasq.c
-===================================================================
 --- a/src/dns-manager/nm-dns-dnsmasq.c
 +++ b/src/dns-manager/nm-dns-dnsmasq.c
 @@ -29,11 +29,16 @@
@@ -31,7 +29,7 @@
  
  G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsmasq, NM_TYPE_DNS_PLUGIN)
  
-@@ -47,8 +52,13 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
+@@ -43,8 +48,13 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
  #define CONFFILE NMRUNDIR "/dnsmasq.conf"
  #define CONFDIR NMCONFDIR "/dnsmasq.d"
  
@@ -46,7 +44,7 @@
  } NMDnsDnsmasqPrivate;
  
  /*******************************************/
-@@ -73,12 +83,12 @@ find_dnsmasq (void)
+@@ -70,12 +80,12 @@ find_dnsmasq (void)
  }
  
  static gboolean
@@ -61,7 +59,7 @@
  
  	nnameservers = nm_ip4_config_get_num_nameservers (ip4);
  
-@@ -89,17 +99,18 @@ add_ip4_config (GString *str, NMIP4Confi
+@@ -86,17 +96,18 @@ add_ip4_config (GString *str, NMIP4Confi
  			return FALSE;
  
  		for (i_nameserver = 0; i_nameserver < nnameservers; i_nameserver++) {
@@ -87,7 +85,7 @@
  				added = TRUE;
  			}
  
-@@ -107,9 +118,10 @@ add_ip4_config (GString *str, NMIP4Confi
+@@ -104,9 +115,10 @@ add_ip4_config (GString *str, NMIP4Confi
  				/* If not searches, use any domains */
  				n = nm_ip4_config_get_num_domains (ip4);
  				for (i = 0; i < n; i++) {
@@ -101,7 +99,7 @@
  					added = TRUE;
  				}
  			}
-@@ -120,7 +132,9 @@ add_ip4_config (GString *str, NMIP4Confi
+@@ -117,7 +129,9 @@ add_ip4_config (GString *str, NMIP4Confi
  			domains = nm_dns_utils_get_ip4_rdns_domains (ip4);
  			if (domains) {
  				for (iter = domains; iter && *iter; iter++)
@@ -112,7 +110,7 @@
  				g_strfreev (domains);
  				added = TRUE;
  			}
-@@ -130,68 +144,20 @@ add_ip4_config (GString *str, NMIP4Confi
+@@ -127,68 +141,20 @@ add_ip4_config (GString *str, NMIP4Confi
  	/* If no searches or domains, just add the namservers */
  	if (!added) {
  		for (i = 0; i < nnameservers; i++) {
@@ -186,7 +184,7 @@
  	int nnameservers, i_nameserver, n, i;
  	gboolean added = FALSE;
  	const char *iface;
-@@ -207,16 +173,32 @@ add_ip6_config (GString *str, NMIP6Confi
+@@ -204,16 +170,32 @@ add_ip6_config (GString *str, NMIP6Confi
  
  		for (i_nameserver = 0; i_nameserver < nnameservers; i_nameserver++) {
  			addr = nm_ip6_config_get_nameserver (ip6, i_nameserver);
@@ -225,7 +223,7 @@
  				added = TRUE;
  			}
  
-@@ -224,26 +206,38 @@ add_ip6_config (GString *str, NMIP6Confi
+@@ -221,26 +203,38 @@ add_ip6_config (GString *str, NMIP6Confi
  				/* If not searches, use any domains */
  				n = nm_ip6_config_get_num_domains (ip6);
  				for (i = 0; i < n; i++) {
@@ -274,7 +272,7 @@
  		}
  	}
  
-@@ -251,6 +245,71 @@ add_ip6_config (GString *str, NMIP6Confi
+@@ -248,6 +242,71 @@ add_ip6_config (GString *str, NMIP6Confi
  }
  
  static gboolean
@@ -346,7 +344,7 @@
  update (NMDnsPlugin *plugin,
          const GSList *vpn_configs,
          const GSList *dev_configs,
-@@ -258,24 +317,29 @@ update (NMDnsPlugin *plugin,
+@@ -255,24 +314,29 @@ update (NMDnsPlugin *plugin,
          const char *hostname)
  {
  	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
@@ -389,7 +387,7 @@
  
  	/* Work on a copy of the vpn_configs list because we might want to remove
  	 * some items from it, yet not affect other DNS plugins that might run
-@@ -292,9 +356,9 @@ update (NMDnsPlugin *plugin,
+@@ -289,9 +353,9 @@ update (NMDnsPlugin *plugin,
  			might_default = !nm_ip6_config_get_never_default (iter->data);
  		if (might_default) {
  			if (NM_IS_IP4_CONFIG (iter->data))
@@ -401,7 +399,7 @@
  			vpn_configs_copy = g_slist_remove (vpn_configs_copy, iter->data);
  			break;
  		}
-@@ -303,9 +367,9 @@ update (NMDnsPlugin *plugin,
+@@ -300,9 +364,9 @@ update (NMDnsPlugin *plugin,
  	/* Use split DNS for remaining VPN configs */
  	for (iter = (GSList *) vpn_configs_copy; iter; iter = g_slist_next (iter)) {
  		if (NM_IS_IP4_CONFIG (iter->data))
@@ -413,7 +411,7 @@
  	}
  
  	/* Now add interface configs without split DNS, unless some VPN
-@@ -316,62 +380,84 @@ update (NMDnsPlugin *plugin,
+@@ -313,62 +377,84 @@ update (NMDnsPlugin *plugin,
  	if (!might_default) {
  		for (iter = (GSList *) dev_configs; iter; iter = g_slist_next (iter)) {
  			if (NM_IS_IP4_CONFIG (iter->data))
@@ -532,7 +530,7 @@
  static const char *
  dm_exit_code_to_msg (int status)
  {
-@@ -449,13 +535,31 @@ nm_dns_dnsmasq_new (void)
+@@ -446,13 +532,31 @@ nm_dns_dnsmasq_new (void)
  static void
  nm_dns_dnsmasq_init (NMDnsDnsmasq *self)
  {
@@ -564,8 +562,6 @@
  	G_OBJECT_CLASS (nm_dns_dnsmasq_parent_class)->dispose (object);
  }
  
-Index: b/src/dns-manager/nm-dns-plugin.c
-===================================================================
 --- a/src/dns-manager/nm-dns-plugin.c
 +++ b/src/dns-manager/nm-dns-plugin.c
 @@ -44,6 +44,7 @@ G_DEFINE_TYPE_EXTENDED (NMDnsPlugin, nm_
@@ -605,8 +601,6 @@
  					  NULL, NULL,
  					  g_cclosure_marshal_VOID__VOID,
  					  G_TYPE_NONE, 0);
-Index: b/src/dns-manager/nm-dns-manager.c
-===================================================================
 --- a/src/dns-manager/nm-dns-manager.c
 +++ b/src/dns-manager/nm-dns-manager.c
 @@ -768,6 +768,27 @@ update_dns (NMDnsManager *self,
@@ -647,8 +641,6 @@
  			g_signal_connect (plugin, NM_DNS_PLUGIN_FAILED,
  			                  G_CALLBACK (plugin_failed),
  			                  self);
-Index: b/src/dns-manager/nm-dns-plugin.h
-===================================================================
 --- a/src/dns-manager/nm-dns-plugin.h
 +++ b/src/dns-manager/nm-dns-plugin.h
 @@ -30,6 +30,7 @@

=== modified file 'debian/patches/dnsmasq-vpn-dns-filtering.patch'
--- debian/patches/dnsmasq-vpn-dns-filtering.patch	2013-02-22 16:20:01 +0000
+++ debian/patches/dnsmasq-vpn-dns-filtering.patch	2014-06-20 21:41:36 +0000
@@ -6,11 +6,9 @@
  src/dns-manager/nm-dns-dnsmasq.c |   48 +++++++++++++++++++++++++++++++--------
  1 file changed, 39 insertions(+), 9 deletions(-)
 
-Index: b/src/dns-manager/nm-dns-dnsmasq.c
-===================================================================
 --- a/src/dns-manager/nm-dns-dnsmasq.c
 +++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -255,12 +255,13 @@ update (NMDnsPlugin *plugin,
+@@ -254,12 +254,13 @@ update (NMDnsPlugin *plugin,
  {
  	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
  	GString *conf;
@@ -25,7 +23,7 @@
  
  	/* Kill the old dnsmasq; there doesn't appear to be a way to get dnsmasq
  	 * to reread the config file using SIGHUP or similar.  This is a small race
-@@ -272,20 +273,49 @@ update (NMDnsPlugin *plugin,
+@@ -271,20 +272,49 @@ update (NMDnsPlugin *plugin,
  	/* Build up the new dnsmasq config file */
  	conf = g_string_sized_new (150);
  

=== modified file 'debian/patches/dont-check-secrets-for-ofono.patch'
--- debian/patches/dont-check-secrets-for-ofono.patch	2014-05-01 17:36:54 +0000
+++ debian/patches/dont-check-secrets-for-ofono.patch	2014-06-20 21:41:36 +0000
@@ -9,11 +9,9 @@
  src/modem-manager/nm-modem-ofono.c |   12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
-Index: b/src/modem-manager/nm-modem-ofono.c
-===================================================================
 --- a/src/modem-manager/nm-modem-ofono.c
 +++ b/src/modem-manager/nm-modem-ofono.c
-@@ -1048,8 +1048,13 @@ act_stage1_prepare (NMModem *modem,
+@@ -1049,8 +1049,13 @@ act_stage1_prepare (NMModem *modem,
  	                                      id[2]);
  	g_strfreev (id);
  
@@ -29,7 +27,7 @@
  		gboolean enabled = nm_modem_get_mm_enabled (modem);
  
  		if (priv->connect_properties)
-@@ -1065,7 +1070,8 @@ act_stage1_prepare (NMModem *modem,
+@@ -1066,7 +1071,8 @@ act_stage1_prepare (NMModem *modem,
  			do_context_activate (self, priv->context_path);
  		}
  	} else {

=== modified file 'debian/patches/enable-ipv6-privacy.patch'
--- debian/patches/enable-ipv6-privacy.patch	2012-03-08 22:06:06 +0000
+++ debian/patches/enable-ipv6-privacy.patch	2014-06-20 21:41:36 +0000
@@ -5,11 +5,9 @@
  libnm-util/nm-setting-ip6-config.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: b/libnm-util/nm-setting-ip6-config.c
-===================================================================
 --- a/libnm-util/nm-setting-ip6-config.c
 +++ b/libnm-util/nm-setting-ip6-config.c
-@@ -1084,7 +1084,7 @@ nm_setting_ip6_config_class_init (NMSett
+@@ -1171,7 +1171,7 @@ nm_setting_ip6_config_class_init (NMSett
  		                   "2: enabled (prefer temporary addresses).",
  		                   NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN,
  		                   NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR,

=== removed file 'debian/patches/git_agent_removing_requests_b2312d4.patch'
--- debian/patches/git_agent_removing_requests_b2312d4.patch	2014-01-29 10:05:27 +0000
+++ debian/patches/git_agent_removing_requests_b2312d4.patch	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-From b2312d45c473088de450a4a6e6b4e173b855f18d Mon Sep 17 00:00:00 2001
-From: Jiří Klimeš <[e-mail]>
-Date: Wed, 27 Nov 2013 11:52:42 +0000
-Subject: agents: fix removing requests from hash table while iterating it
-
-GLib-CRITICAL **: g_hash_table_iter_next: assertion 'ri->version == ri->hash_table->version' failed
-
-It is not allowed to modify hash table while it is iterated. Unfortunately,
-request_remove_agent() may remove the request from the 'requests' hash table,
-making it not usable in the loop hash table looping.
-
-Test case:
-1. start NM and nm-applet
-2. activate a Wi-Fi WPA connection
-3. nm-applet displays a dialog asking for a password
-4. kill nm-applet
----
-diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
-index bf27419..e20afe3 100644
---- a/src/settings/nm-agent-manager.c
-+++ b/src/settings/nm-agent-manager.c
-@@ -74,7 +74,7 @@ static void request_add_agent (Request *req,
-                                NMSecretAgent *agent,
-                                NMSessionMonitor *session_monitor);
- 
--static void request_remove_agent (Request *req, NMSecretAgent *agent);
-+static void request_remove_agent (gpointer key, gpointer value, gpointer user_data);
- 
- static void impl_agent_manager_register (NMAgentManager *self,
-                                          const char *identifier,
-@@ -101,13 +101,60 @@ nm_agent_manager_error_quark (void)
- 
- /*************************************************************/
- 
-+/*----------------------------------------------------------------------------*/
-+/* GHashTable safe iterating function: x_g_hash_table_safe_for_each()
-+ * GHashTable can't be modified while iterating, the common solution for that is
-+ * to flatten the hash table first and iterate over list.
-+ * Taken from https://github.com/linuxmint/nemo/blob/master/eel/eel-glib-extensions.c
-+ */
-+typedef struct {
-+	GList *keys;
-+	GList *values;
-+} FlattenedHashTable;
-+
-+static void
-+flatten_hash_table_element (gpointer key, gpointer value, gpointer callback_data)
-+{
-+	FlattenedHashTable *flattened_table;
-+
-+	flattened_table = callback_data;
-+	flattened_table->keys = g_list_prepend
-+	        (flattened_table->keys, key);
-+	flattened_table->values = g_list_prepend
-+	        (flattened_table->values, value);
-+}
-+
-+static void
-+x_g_hash_table_safe_for_each (GHashTable *hash_table,
-+                              GHFunc callback,
-+                              gpointer callback_data)
-+{
-+	FlattenedHashTable flattened;
-+	GList *p, *q;
-+
-+	flattened.keys = NULL;
-+	flattened.values = NULL;
-+
-+	g_hash_table_foreach (hash_table,
-+	                      flatten_hash_table_element,
-+	                      &flattened);
-+
-+	for (p = flattened.keys, q = flattened.values;
-+	     p != NULL;
-+	     p = p->next, q = q->next) {
-+	        (* callback) (p->data, q->data, callback_data);
-+	}
-+
-+	g_list_free (flattened.keys);
-+	g_list_free (flattened.values);
-+}
-+/*----------------------------------------------------------------------------*/
-+
- static gboolean
- remove_agent (NMAgentManager *self, const char *owner)
- {
- 	NMAgentManagerPrivate *priv = NM_AGENT_MANAGER_GET_PRIVATE (self);
- 	NMSecretAgent *agent;
--	GHashTableIter iter;
--	gpointer data;
- 
- 	g_return_val_if_fail (owner != NULL, FALSE);
- 
-@@ -119,10 +166,8 @@ remove_agent (NMAgentManager *self, const char *owner)
- 	nm_log_dbg (LOGD_AGENTS, "(%s) agent unregistered",
- 	            nm_secret_agent_get_description (agent));
- 
--	/* Remove this agent to any in-progress secrets requests */
--	g_hash_table_iter_init (&iter, priv->requests);
--	while (g_hash_table_iter_next (&iter, NULL, &data))
--		request_remove_agent ((Request *) data, agent);
-+	/* Remove this agent from any in-progress secrets requests */
-+	x_g_hash_table_safe_for_each (priv->requests, request_remove_agent, agent);
- 
- 	/* And dispose of the agent */
- 	g_hash_table_remove (priv->agents, owner);
-@@ -594,8 +639,10 @@ request_add_agents (NMAgentManager *self, Request *req)
- }
- 
- static void
--request_remove_agent (Request *req, NMSecretAgent *agent)
-+request_remove_agent (gpointer key, gpointer value, gpointer user_data)
- {
-+	Request *req = (Request *) value;
-+	NMSecretAgent *agent = (NMSecretAgent *) user_data;
- 	gboolean try_next = FALSE;
- 	const char *detail = "";
- 
---
-cgit v0.9.0.2-2-gbebe

=== removed file 'debian/patches/git_default_route_active_device_9820258.patch'
--- debian/patches/git_default_route_active_device_9820258.patch	2014-05-01 17:36:54 +0000
+++ debian/patches/git_default_route_active_device_9820258.patch	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-From 98202586d069bcb7aad3aa99a136d8519c1f3549 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <[e-mail]>
-Date: Thu, 27 Feb 2014 15:27:57 +0000
-Subject: core: default route should stay on the current active device
-
-get_best_ip4_device() and get_best_ip6_device() iterate over
-the list of devices to find the device with the default route.
-The order of iteration is arbitrarly choosen.
-
-Before, if two devices had the same priority, it would choose
-the first one. Change it so that the device which currently has
-the default route keeps it -- until it gets deactivated or a higher
-priorty device gets connected.
-
-Signed-off-by: Thomas Haller <[e-mail]>
-
-(cherry picked from commit 033285062757f912f39bec9fc0fab5e5127386f5)
----
-diff --git a/src/nm-policy.c b/src/nm-policy.c
-index c6ce0b5..f95caf9 100644
---- a/src/nm-policy.c
-+++ b/src/nm-policy.c
-@@ -97,16 +97,14 @@ static void schedule_activate_all (NMPolicy *policy);
- 
- 
- static NMDevice *
--get_best_ip4_device (NMManager *manager, gboolean fully_activated)
-+get_best_ip4_device (NMPolicy *self, gboolean fully_activated)
- {
-+	NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self);
- 	GSList *devices, *iter;
- 	NMDevice *best = NULL;
- 	int best_prio = G_MAXINT;
- 
--	g_return_val_if_fail (manager != NULL, NULL);
--	g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
--
--	devices = nm_manager_get_devices (manager);
-+	devices = nm_manager_get_devices (priv->manager);
- 	for (iter = devices; iter; iter = g_slist_next (iter)) {
- 		NMDevice *dev = NM_DEVICE (iter->data);
- 		NMDeviceType devtype = nm_device_get_device_type (dev);
-@@ -167,7 +165,9 @@ get_best_ip4_device (NMManager *manager, gboolean fully_activated)
- 		}
- 
- 		prio = nm_device_get_priority (dev);
--		if (prio > 0 && prio < best_prio) {
-+		if (   prio < best_prio
-+		    || (priv->default_device4 == dev && prio == best_prio)
-+		    || !best) {
- 			best = dev;
- 			best_prio = prio;
- 		}
-@@ -191,16 +191,14 @@ get_best_ip4_device (NMManager *manager, gboolean fully_activated)
- }
- 
- static NMDevice *
--get_best_ip6_device (NMManager *manager, gboolean fully_activated)
-+get_best_ip6_device (NMPolicy *self, gboolean fully_activated)
- {
-+	NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self);
- 	GSList *devices, *iter;
- 	NMDevice *best = NULL;
- 	int best_prio = G_MAXINT;
- 
--	g_return_val_if_fail (manager != NULL, NULL);
--	g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
--
--	devices = nm_manager_get_devices (manager);
-+	devices = nm_manager_get_devices (priv->manager);
- 	for (iter = devices; iter; iter = g_slist_next (iter)) {
- 		NMDevice *dev = NM_DEVICE (iter->data);
- 		NMDeviceType devtype = nm_device_get_device_type (dev);
-@@ -257,7 +255,9 @@ get_best_ip6_device (NMManager *manager, gboolean fully_activated)
- 		}
- 
- 		prio = nm_device_get_priority (dev);
--		if (prio > 0 && prio < best_prio) {
-+		if (   prio < best_prio
-+		    || (priv->default_device6 == dev && prio == best_prio)
-+		    || !best) {
- 			best = dev;
- 			best_prio = prio;
- 		}
-@@ -383,9 +383,9 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
- 
- 	/* Try automatically determined hostname from the best device's IP config */
- 	if (!best4)
--		best4 = get_best_ip4_device (priv->manager, TRUE);
-+		best4 = get_best_ip4_device (policy, TRUE);
- 	if (!best6)
--		best6 = get_best_ip6_device (priv->manager, TRUE);
-+		best6 = get_best_ip6_device (policy, TRUE);
- 
- 	if (!best4 && !best6) {
- 		/* No best device; fall back to original hostname or if there wasn't
-@@ -582,7 +582,7 @@ get_best_ip4_config (NMPolicy *policy,
- 
- 	/* If no VPN connections, we use the best device instead */
- 	if (!ip4_config) {
--		device = get_best_ip4_device (priv->manager, TRUE);
-+		device = get_best_ip4_device (policy, TRUE);
- 		if (device) {
- 			ip4_config = nm_device_get_ip4_config (device);
- 			g_assert (ip4_config);
-@@ -766,7 +766,7 @@ get_best_ip6_config (NMPolicy *policy,
- 
- 	/* If no VPN connections, we use the best device instead */
- 	if (!ip6_config) {
--		device = get_best_ip6_device (priv->manager, TRUE);
-+		device = get_best_ip6_device (policy, TRUE);
- 		if (device) {
- 			req = nm_device_get_act_request (device);
- 			g_assert (req);
-@@ -923,8 +923,8 @@ check_activating_devices (NMPolicy *policy)
- 	GObject *object = G_OBJECT (policy);
- 	NMDevice *best4, *best6 = NULL;
- 
--	best4 = get_best_ip4_device (priv->manager, FALSE);
--	best6 = get_best_ip6_device (priv->manager, FALSE);
-+	best4 = get_best_ip4_device (policy, FALSE);
-+	best6 = get_best_ip6_device (policy, FALSE);
- 
- 	g_object_freeze_notify (object);
- 
---
-cgit v0.9.0.2-2-gbebe

=== modified file 'debian/patches/git_disp_logging_crash_aca907f.patch'
--- debian/patches/git_disp_logging_crash_aca907f.patch	2014-01-29 10:13:39 +0000
+++ debian/patches/git_disp_logging_crash_aca907f.patch	2014-06-20 21:41:36 +0000
@@ -21,8 +21,10 @@
 
 Signed-off-by: Thomas Haller <[e-mail]>
 ---
-diff --git a/callouts/nm-dispatcher-action.c b/callouts/nm-dispatcher-action.c
-index 0e4b11a..ed16a23 100644
+---
+ callouts/nm-dispatcher-action.c |   28 +++++++++-------------------
+ 1 file changed, 9 insertions(+), 19 deletions(-)
+
 --- a/callouts/nm-dispatcher-action.c
 +++ b/callouts/nm-dispatcher-action.c
 @@ -31,6 +31,7 @@
@@ -33,7 +35,7 @@
  #include <dbus/dbus.h>
  #include <dbus/dbus-glib-lowlevel.h>
  #include <dbus/dbus-glib.h>
-@@ -594,27 +595,15 @@ logging_shutdown (void)
+@@ -596,27 +597,15 @@ logging_shutdown (void)
  	closelog ();
  }
  
@@ -54,21 +56,20 @@
 -{
 -	struct sigaction action;
 -	sigset_t mask;
--
++	g_message ("Caught signal %d, shutting down...", signo);
++	g_main_loop_quit (loop);
+ 
 -	sigemptyset (&mask);
 -	action.sa_handler = signal_handler;
 -	action.sa_mask = mask;
 -	action.sa_flags = 0;
 -	sigaction (SIGTERM,  &action, NULL);
 -	sigaction (SIGINT,  &action, NULL);
-+	g_message ("Caught signal %d, shutting down...", signo);
-+	g_main_loop_quit (loop);
-+
 +	return G_SOURCE_REMOVE;
  }
  
  int
-@@ -645,7 +634,8 @@ main (int argc, char **argv)
+@@ -647,7 +636,8 @@ main (int argc, char **argv)
  	g_option_context_free (opt_ctx);
  
  	g_type_init ();
@@ -78,5 +79,3 @@
  
  	if (!debug)
  		logging_setup ();
---
-cgit v0.9.0.2-2-gbebe

=== removed file 'debian/patches/git_fix_shadowed_var_abe208e.patch'
--- debian/patches/git_fix_shadowed_var_abe208e.patch	2014-01-29 10:38:25 +0000
+++ debian/patches/git_fix_shadowed_var_abe208e.patch	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-From abe208ed8d6c5dcd77300d46f599a2375c18fd10 Mon Sep 17 00:00:00 2001
-From: Dan Williams <[e-mail]>
-Date: Wed, 18 Dec 2013 18:31:39 +0000
-Subject: core: fix shadowed local variable
-
----
-diff --git a/src/nm-system.c b/src/nm-system.c
-index 7f6de91..3998342 100644
---- a/src/nm-system.c
-+++ b/src/nm-system.c
-@@ -1696,15 +1696,15 @@ nm_system_bond_enslave (gint master_ifindex,
- 	g_assert (!nm_system_iface_is_up (slave_ifindex));
- 
- 	if (nm_system_iface_get_flags (slave_ifindex) & IFF_SLAVE) {
--		struct rtnl_link *link;
-+		struct rtnl_link *lk;
- 		int existing_master = -1;
- 
- 		/* Get the ifindex of the existing master device */
--		link = nm_netlink_index_to_rtnl_link (slave_ifindex);
--		g_warn_if_fail (link != NULL);
--		if (link) {
--			existing_master = rtnl_link_get_master (link);
--			rtnl_link_put (link);
-+		lk = nm_netlink_index_to_rtnl_link (slave_ifindex);
-+		g_warn_if_fail (lk != NULL);
-+		if (lk) {
-+			existing_master = rtnl_link_get_master (lk);
-+			rtnl_link_put (lk);
- 		}
- 
- 		if (existing_master > 0) {
---
-cgit v0.9.0.2-2-gbebe

=== removed file 'debian/patches/git_kernel_ipv6_default_route_77de91e.patch'
--- debian/patches/git_kernel_ipv6_default_route_77de91e.patch	2012-05-22 22:10:35 +0000
+++ debian/patches/git_kernel_ipv6_default_route_77de91e.patch	1970-01-01 00:00:00 +0000
@@ -1,121 +0,0 @@
-From 77de91e5a8b1c1993ae65c54b37e0411e78e6fe6 Mon Sep 17 00:00:00 2001
-From: Dan Winship <[e-mail]>
-Date: Thu, 19 Apr 2012 18:27:12 +0000
-Subject: core: don't fight with the kernel over the default IPv6 route
-
-The kernel wants there to be a default route over every RA-ed IPv6
-interface, and it gets confused and annoyed if we remove that default
-route and replace it with our own (causing it to effectively drop all
-further RAs on the floor, which is particularly bad if some of the
-information in the earlier RA had an expiration time).
-
-So, rather than replacing the kernel's default route(s), just add an
-additional one of our own, with a lower (ie, higher priority) metric.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=785772
----
-diff --git a/src/nm-system.c b/src/nm-system.c
-index 91153ec..4cebb13 100644
---- a/src/nm-system.c
-+++ b/src/nm-system.c
-@@ -1023,7 +1023,7 @@ add_ip6_route_to_gateway (int ifindex, const struct in6_addr *gw)
- }
- 
- static int
--replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
-+add_default_ip6_route (int ifindex, const struct in6_addr *gw)
- {
- 	struct rtnl_route *route = NULL;
- 	struct nl_sock *nlh;
-@@ -1037,22 +1037,36 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- 	route = nm_netlink_route_new (ifindex, AF_INET6, 0,
- 	                              NMNL_PROP_SCOPE, RT_SCOPE_UNIVERSE,
- 	                              NMNL_PROP_TABLE, RT_TABLE_MAIN,
-+	                              NMNL_PROP_PRIO, 1,
- 	                              NULL);
- 	g_return_val_if_fail (route != NULL, -ENOMEM);
- 
- 	/* Add the new default route */
--	err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_REPLACE);
--	if (err == -NLE_EXIST) {
--		/* FIXME: even though we use NLM_F_REPLACE the kernel won't replace
--		 * the route if it's the same.  Suppress the pointless error.
--		 */
-+	err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_CREATE);
-+	if (err == -NLE_EXIST)
- 		err = 0;
--	}
- 
- 	rtnl_route_put (route);
- 	return err;
- }
- 
-+static struct rtnl_route *
-+find_static_default_routes (struct rtnl_route *route,
-+                            struct nl_addr *dst,
-+                            const char *iface,
-+                            gpointer user_data)
-+{
-+	GList **def_routes = user_data;
-+
-+	if (   nl_addr_get_prefixlen (dst) == 0
-+	    && rtnl_route_get_protocol (route) == RTPROT_STATIC) {
-+		rtnl_route_get (route);
-+		*def_routes = g_list_prepend (*def_routes, route);
-+	}
-+
-+	return NULL;
-+}
-+
- /*
-  * nm_system_replace_default_ip6_route
-  *
-@@ -1062,12 +1076,35 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- gboolean
- nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- {
--	struct rtnl_route *gw_route = NULL;
-+	GList *def_routes, *iter;
-+	struct rtnl_route *route, *gw_route = NULL;
- 	gboolean success = FALSE;
- 	char *iface;
- 	int err;
- 
--	err = replace_default_ip6_route (ifindex, gw);
-+	/* We can't just use NLM_F_REPLACE here like in the IPv4 case, because
-+	 * the kernel doesn't like it if we replace the default routes it
-+	 * creates. (See rh#785772.) So we delete any non-kernel default routes,
-+	 * and then add a new default route of our own with a lower metric than
-+	 * the kernel ones.
-+	 */
-+	def_routes = NULL;
-+	nm_netlink_foreach_route (ifindex, AF_INET6, RT_SCOPE_UNIVERSE, TRUE,
-+	                          find_static_default_routes, &def_routes);
-+	for (iter = def_routes; iter; iter = iter->next) {
-+		route = iter->data;
-+		if (!nm_netlink_route_delete (route)) {
-+			iface = nm_netlink_index_to_iface (ifindex);
-+			nm_log_err (LOGD_DEVICE | LOGD_IP6,
-+			            "(%s): failed to delete existing IPv6 default route",
-+			            iface);
-+			g_free (iface);
-+		}
-+		rtnl_route_put (route);
-+	}
-+	g_list_free (def_routes);
-+
-+	err = add_default_ip6_route (ifindex, gw);
- 	if (err == 0)
- 		return TRUE;
- 
-@@ -1091,7 +1128,7 @@ nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- 		goto out;
- 
- 	/* Try adding the original route again */
--	err = replace_default_ip6_route (ifindex, gw);
-+	err = add_default_ip6_route (ifindex, gw);
- 	if (err != 0) {
- 		nm_netlink_route_delete (gw_route);
- 		nm_log_err (LOGD_DEVICE | LOGD_IP6,
---
-cgit v0.9.0.2-2-gbebe

=== removed file 'debian/patches/git_remove_ifpppstatsreq_6b64e4d.patch'
--- debian/patches/git_remove_ifpppstatsreq_6b64e4d.patch	2012-05-23 19:28:33 +0000
+++ debian/patches/git_remove_ifpppstatsreq_6b64e4d.patch	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-From 6b64e4db2f3c9cfc0e0e240cf0bc58f3b3e90c1f Mon Sep 17 00:00:00 2001
-From: Jiří Klimeš <[e-mail]>
-Date: Wed, 28 Mar 2012 14:42:24 +0000
-Subject: ppp: don't use struct ifpppstatsreq that was removed from linux/ip_ppp.h
-
-in recent kernels.
-
-We can use ifreq and ppp_stats structures separately. They needn't have to
-to be packed in a structure.
----
-diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
-index 59698c3..243d2e1 100644
---- a/src/ppp-manager/nm-ppp-manager.c
-+++ b/src/ppp-manager/nm-ppp-manager.c
-@@ -304,18 +304,20 @@ monitor_cb (gpointer user_data)
- {
- 	NMPPPManager *manager = NM_PPP_MANAGER (user_data);
- 	NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (manager);
--	struct ifpppstatsreq req;
-+	struct ifreq req;
-+	struct ppp_stats stats;
- 
- 	memset (&req, 0, sizeof (req));
--	req.stats_ptr = (caddr_t) &req.stats;
-+	memset (&stats, 0, sizeof (stats));
-+	req.ifr_data = (caddr_t) &stats;
- 
--	strncpy (req.ifr__name, priv->ip_iface, sizeof (req.ifr__name));
-+	strncpy (req.ifr_name, priv->ip_iface, sizeof (req.ifr_name));
- 	if (ioctl (priv->monitor_fd, SIOCGPPPSTATS, &req) < 0) {
- 		nm_log_warn (LOGD_PPP, "could not read ppp stats: %s", strerror (errno));
- 	} else {
- 		g_signal_emit (manager, signals[STATS], 0, 
--		               req.stats.p.ppp_ibytes,
--		               req.stats.p.ppp_obytes);
-+		               stats.p.ppp_ibytes,
-+		               stats.p.ppp_obytes);
- 	}
- 
- 	return TRUE;
---
-cgit v0.9.0.2-2-gbebe

=== removed file 'debian/patches/git_segfault_nmagentmanager_3227cf0.patch'
--- debian/patches/git_segfault_nmagentmanager_3227cf0.patch	2014-01-29 09:38:05 +0000
+++ debian/patches/git_segfault_nmagentmanager_3227cf0.patch	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-From 3227cf0ca907fa00a00d68946092990a82c11e85 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <[e-mail]>
-Date: Mon, 18 Nov 2013 18:43:51 +0000
-Subject: core: fix segfault in NMAgentManager (rh #1031196)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1031196
-
-Signed-off-by: Thomas Haller <[e-mail]>
----
-diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
-index 531fabc..bf27419 100644
---- a/src/settings/nm-agent-manager.c
-+++ b/src/settings/nm-agent-manager.c
-@@ -604,7 +604,8 @@ request_remove_agent (Request *req, NMSecretAgent *agent)
- 
- 	/* If this agent is being asked right now, cancel the request */
- 	if (agent == req->current) {
--		req->cancel_callback (req);
-+		if (req->cancel_callback)
-+			req->cancel_callback (req);
- 		req->current_has_modify = FALSE;
- 		req->current = NULL;
- 		req->current_call_id = NULL;
---
-cgit v0.9.0.2-2-gbebe

=== modified file 'debian/patches/ignore_rfkill_if_urfkill_is_present.patch'
--- debian/patches/ignore_rfkill_if_urfkill_is_present.patch	2014-05-21 19:30:08 +0000
+++ debian/patches/ignore_rfkill_if_urfkill_is_present.patch	2014-06-20 21:41:36 +0000
@@ -12,8 +12,6 @@
  src/nm-urfkill-manager.h |   49 +++++++
  6 files changed, 496 insertions(+), 1 deletion(-)
 
-Index: b/src/nm-manager.c
-===================================================================
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -59,6 +59,7 @@
@@ -24,17 +22,17 @@
  #include "nm-hostname-provider.h"
  #include "nm-bluez-manager.h"
  #include "nm-bluez-common.h"
-@@ -222,6 +223,9 @@ typedef struct {
- 	guint          dbus_connection_changed_id;
+@@ -223,6 +224,9 @@ typedef struct {
  	NMUdevManager *udev_mgr;
  	NMBluezManager *bluez_mgr;
+ 	NMSessionMonitor *session_monitor;
 +#if WITH_URFKILL
 +	NMUrfkillManager *urfkill_mgr;
 +#endif
  
  	/* List of NMDeviceFactoryFunc pointers sorted in priority order */
  	GSList *factories;
-@@ -251,6 +255,8 @@ typedef struct {
+@@ -252,6 +256,8 @@ typedef struct {
  
  	guint timestamp_update_id;
  
@@ -43,7 +41,7 @@
  	GHashTable *nm_bridges;
  
  	gboolean disposed;
-@@ -4326,6 +4332,76 @@ out:
+@@ -4403,6 +4409,76 @@ out:
  	return DBUS_HANDLER_RESULT_HANDLED;
  }
  
@@ -120,7 +118,7 @@
  static NMManager *singleton = NULL;
  
  NMManager *
-@@ -4335,6 +4411,28 @@ nm_manager_get (void)
+@@ -4412,6 +4488,28 @@ nm_manager_get (void)
  	return g_object_ref (singleton);
  }
  
@@ -149,9 +147,9 @@
  NMManager *
  nm_manager_new (NMSettings *settings,
                  const char *state_file,
-@@ -4436,11 +4534,33 @@ nm_manager_new (NMSettings *settings,
- 	                  G_CALLBACK (bluez_manager_bdaddr_removed_cb),
- 	                  singleton);
+@@ -4515,11 +4613,33 @@ nm_manager_new (NMSettings *settings,
+ 
+ 	priv->session_monitor = nm_session_monitor_get ();
  
 +#if WITH_URFKILL
 +	priv->urfkill_mgr = nm_urfkill_manager_new ();
@@ -184,8 +182,6 @@
  
  	return singleton;
  }
-Index: b/src/nm-urfkill-manager.c
-===================================================================
 --- /dev/null
 +++ b/src/nm-urfkill-manager.c
 @@ -0,0 +1,304 @@
@@ -493,8 +489,6 @@
 +		              G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 +}
 +
-Index: b/src/nm-urfkill-manager.h
-===================================================================
 --- /dev/null
 +++ b/src/nm-urfkill-manager.h
 @@ -0,0 +1,49 @@
@@ -547,11 +541,9 @@
 +G_END_DECLS
 +
 +#endif /* __NM_URFKILL_MANAGER_H__ */
-Index: b/src/Makefile.am
-===================================================================
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -202,6 +202,13 @@ NetworkManager_SOURCES = \
+@@ -206,6 +206,13 @@ NetworkManager_SOURCES = \
  		nm-connectivity.c \
  		nm-connectivity.h
  
@@ -565,11 +557,9 @@
  if SESSION_TRACKING_SYSTEMD
  NetworkManager_SOURCES += nm-session-monitor-systemd.c
  else
-Index: b/configure.ac
-===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -199,6 +199,17 @@ else
+@@ -201,6 +201,17 @@ else
  fi
  
  dnl
@@ -587,7 +577,7 @@
  dnl Checks for libm - needed for pow()
  dnl
  LT_LIB_M
-@@ -778,6 +789,7 @@ echo "  ppp: $enable_ppp"
+@@ -795,6 +806,7 @@ echo "  ppp: $enable_ppp"
  echo "  modemmanager-1: $with_modem_manager_1"
  echo "  concheck: $enable_concheck"
  echo "  bluez 4: $enable_bluez4"
@@ -595,11 +585,9 @@
  echo
  
  echo "Configuration plugins"
-Index: b/config.h.in
-===================================================================
 --- a/config.h.in
 +++ b/config.h.in
-@@ -97,6 +97,9 @@
+@@ -106,6 +106,9 @@
  /* Define if you have Linux Wireless Extensions support */
  #undef HAVE_WEXT
  

=== modified file 'debian/patches/ignore_rmnet_devices.patch'
--- debian/patches/ignore_rmnet_devices.patch	2013-07-03 15:51:38 +0000
+++ debian/patches/ignore_rmnet_devices.patch	2014-06-20 21:41:36 +0000
@@ -4,11 +4,9 @@
  src/nm-device-ethernet.c |    4 ++++
  1 file changed, 4 insertions(+)
 
-Index: b/src/nm-device-ethernet.c
-===================================================================
 --- a/src/nm-device-ethernet.c
 +++ b/src/nm-device-ethernet.c
-@@ -502,6 +502,10 @@ get_generic_capabilities (NMDevice *dev)
+@@ -503,6 +503,10 @@ get_generic_capabilities (NMDevice *dev)
  	if (strstr (nm_device_get_iface (dev), "cipsec"))
  		return NM_DEVICE_CAP_NONE;
  

=== modified file 'debian/patches/lp1025498_link-local_dns_with_null_iface.patch'
--- debian/patches/lp1025498_link-local_dns_with_null_iface.patch	2012-07-20 18:32:41 +0000
+++ debian/patches/lp1025498_link-local_dns_with_null_iface.patch	2014-06-20 21:41:36 +0000
@@ -7,11 +7,9 @@
  src/dns-manager/nm-dns-dnsmasq.c |    6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-Index: b/src/dns-manager/nm-dns-dnsmasq.c
-===================================================================
 --- a/src/dns-manager/nm-dns-dnsmasq.c
 +++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -168,8 +168,10 @@ ip6_addr_to_string (const struct in6_add
+@@ -169,8 +169,10 @@ ip6_addr_to_string (const struct in6_add
  		 * only since version 2.58 and up
  		 */
  		*p = '@';

=== modified file 'debian/patches/lp1099983_ignore-p2p-wifi-devices.patch'
--- debian/patches/lp1099983_ignore-p2p-wifi-devices.patch	2013-06-05 20:34:22 +0000
+++ debian/patches/lp1099983_ignore-p2p-wifi-devices.patch	2014-06-20 21:41:36 +0000
@@ -1,8 +1,10 @@
-Index: nm-0.9.6.0+git201301221753.{revno}-0~pkg{revno:debian}/src/nm-manager.c
-===================================================================
---- nm-0.9.6.0+git201301221753.{revno}-0~pkg{revno:debian}.orig/src/nm-manager.c	2013-01-22 12:55:32.353177930 -0500
-+++ nm-0.9.6.0+git201301221753.{revno}-0~pkg{revno:debian}/src/nm-manager.c	2013-01-22 13:26:36.849268166 -0500
-@@ -1665,6 +1665,17 @@
+---
+ src/nm-manager.c |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -1943,6 +1943,17 @@ add_device (NMManager *self, NMDevice *d
  		return;
  	}
  

=== modified file 'debian/patches/lp191889_always_offline_with_unmanaged_devices.patch'
--- debian/patches/lp191889_always_offline_with_unmanaged_devices.patch	2013-10-07 16:00:58 +0000
+++ debian/patches/lp191889_always_offline_with_unmanaged_devices.patch	2014-06-20 21:41:36 +0000
@@ -6,11 +6,9 @@
  src/nm-manager.c |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: b/src/nm-manager.c
-===================================================================
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -617,6 +617,12 @@ nm_manager_update_state (NMManager *mana
+@@ -620,6 +620,12 @@ nm_manager_update_state (NMManager *mana
  				}
  			}
  

=== modified file 'debian/patches/lp859373_upgrade_policy_fix.patch'
--- debian/patches/lp859373_upgrade_policy_fix.patch	2012-10-15 21:02:17 +0000
+++ debian/patches/lp859373_upgrade_policy_fix.patch	2014-06-20 21:41:36 +0000
@@ -2,8 +2,6 @@
  policy/org.freedesktop.NetworkManager.policy.in.in |    9 +++++++++
  1 file changed, 9 insertions(+)
 
-Index: b/policy/org.freedesktop.NetworkManager.policy.in.in
-===================================================================
 --- a/policy/org.freedesktop.NetworkManager.policy.in.in
 +++ b/policy/org.freedesktop.NetworkManager.policy.in.in
 @@ -108,5 +108,14 @@

=== modified file 'debian/patches/lp912702_fix_multiple_dialogs.patch'
--- debian/patches/lp912702_fix_multiple_dialogs.patch	2014-01-24 17:35:27 +0000
+++ debian/patches/lp912702_fix_multiple_dialogs.patch	2014-06-20 21:41:36 +0000
@@ -6,14 +6,12 @@
 
 Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
 ---
- src/nm-policy.c | 10 +++++++---
+ src/nm-policy.c |   10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/src/nm-policy.c b/src/nm-policy.c
-index e6a0498..6c62f94 100644
 --- a/src/nm-policy.c
 +++ b/src/nm-policy.c
-@@ -1271,9 +1271,13 @@ reset_connections_retries (gpointer user_data)
+@@ -1263,9 +1263,13 @@ reset_connections_retries (gpointer user
  		if (con_stamp == 0)
  			continue;
  		if (con_stamp + RESET_RETRIES_TIMER <= now) {
@@ -30,6 +28,3 @@
  			continue;
  		}
  		if (con_stamp < min_stamp)
--- 
-1.8.5.2
-

=== modified file 'debian/patches/lp936712_dnsmasq_ip6_ns_ordering.patch'
--- debian/patches/lp936712_dnsmasq_ip6_ns_ordering.patch	2012-02-21 22:08:22 +0000
+++ debian/patches/lp936712_dnsmasq_ip6_ns_ordering.patch	2014-06-20 21:41:36 +0000
@@ -14,11 +14,13 @@
 include nameservers, search domains, etc.), the IPv4 data will be appended
 right after.
 
-Index: network-manager-0.9.2.0+git201202161854.8572ecf/src/dns-manager/nm-dns-manager.c
-===================================================================
---- network-manager-0.9.2.0+git201202161854.8572ecf.orig/src/dns-manager/nm-dns-manager.c	2012-02-16 15:07:04.000000000 -0500
-+++ network-manager-0.9.2.0+git201202161854.8572ecf/src/dns-manager/nm-dns-manager.c	2012-02-21 16:21:42.090870401 -0500
-@@ -675,14 +675,14 @@
+---
+ src/dns-manager/nm-dns-manager.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/src/dns-manager/nm-dns-manager.c
++++ b/src/dns-manager/nm-dns-manager.c
+@@ -679,14 +679,14 @@ update_dns (NMDnsManager *self,
  	 * still use the domain information in each config to provide split DNS if
  	 * they want to.
  	 */

=== modified file 'debian/patches/lp990011_use_tempaddr_sysctl_default.patch'
--- debian/patches/lp990011_use_tempaddr_sysctl_default.patch	2014-04-08 00:30:45 +0000
+++ debian/patches/lp990011_use_tempaddr_sysctl_default.patch	2014-06-20 21:41:36 +0000
@@ -14,14 +14,12 @@
 sysctl instead of trying to read these files, but this will do for now ;)
 
 ---
- src/nm-device.c |   35 +++++++++++++++++++++++++----------
- 1 file changed, 25 insertions(+), 10 deletions(-)
+ src/nm-device.c |   33 +++++++++++++++++++++++----------
+ 1 file changed, 23 insertions(+), 10 deletions(-)
 
-Index: b/src/nm-device.c
-===================================================================
 --- a/src/nm-device.c
 +++ b/src/nm-device.c
-@@ -2513,6 +2513,12 @@ addrconf6_cleanup (NMDevice *self)
+@@ -2698,6 +2698,12 @@ addrconf6_cleanup (NMDevice *self)
  
  /******************************************/
  
@@ -34,7 +32,7 @@
  /* Get net.ipv6.conf.default.use_tempaddr value from /etc/sysctl.conf or
   * /lib/sysctl.d/sysctl.conf
   */
-@@ -2522,24 +2528,30 @@ ip6_use_tempaddr (void)
+@@ -2707,24 +2713,30 @@ ip6_use_tempaddr (void)
  	char *contents = NULL;
  	gsize len = 0;
  	const char *group_name = "[forged_group]\n";
@@ -73,7 +71,7 @@
  		goto done;
  
  	tmp = g_key_file_get_integer (keyfile, "forged_group", "net.ipv6.conf.default.use_tempaddr", &error);
-@@ -2547,11 +2559,12 @@ ip6_use_tempaddr (void)
+@@ -2732,11 +2744,12 @@ ip6_use_tempaddr (void)
  		ret = tmp;
  
  done:

=== modified file 'debian/patches/nm-change-dnsmasq-parameters.diff'
--- debian/patches/nm-change-dnsmasq-parameters.diff	2012-12-10 19:40:41 +0000
+++ debian/patches/nm-change-dnsmasq-parameters.diff	2014-06-20 21:41:36 +0000
@@ -11,11 +11,9 @@
  src/dns-manager/nm-dns-dnsmasq.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: b/src/dns-manager/nm-dns-dnsmasq.c
-===================================================================
 --- a/src/dns-manager/nm-dns-dnsmasq.c
 +++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -315,7 +315,7 @@ update (NMDnsPlugin *plugin,
+@@ -317,7 +317,7 @@ update (NMDnsPlugin *plugin,
  	argv[idx++] = "--pid-file=" PIDFILE;
  	argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
  	argv[idx++] = "--conf-file=" CONFFILE;

=== modified file 'debian/patches/nm-ipv6-route-cache.patch'
--- debian/patches/nm-ipv6-route-cache.patch	2012-08-29 20:38:44 +0000
+++ debian/patches/nm-ipv6-route-cache.patch	2014-06-20 21:41:36 +0000
@@ -5,11 +5,9 @@
  src/ip6-manager/nm-ip6-manager.c |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: b/src/ip6-manager/nm-ip6-manager.c
-===================================================================
 --- a/src/ip6-manager/nm-ip6-manager.c
 +++ b/src/ip6-manager/nm-ip6-manager.c
-@@ -923,6 +923,12 @@ process_route_change (NMIP6Manager *mana
+@@ -918,6 +918,12 @@ process_route_change (NMIP6Manager *mana
  
  	device = nm_ip6_manager_get_device (manager, rtnl_route_get_oif (rtnlroute));
  

=== modified file 'debian/patches/nm-revert-core-dont-enumerate-unint-devices-udev.patch'
--- debian/patches/nm-revert-core-dont-enumerate-unint-devices-udev.patch	2013-06-05 20:24:48 +0000
+++ debian/patches/nm-revert-core-dont-enumerate-unint-devices-udev.patch	2014-06-20 21:41:36 +0000
@@ -8,14 +8,12 @@
 
 Signed-off-by: Ricardo Salveti de Araujo <[e-mail]>
 ---
- src/nm-udev-manager.c | 14 ++------------
+ src/nm-udev-manager.c |   14 ++------------
  1 file changed, 2 insertions(+), 12 deletions(-)
 
-diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c
-index de657e9..018460d 100644
 --- a/src/nm-udev-manager.c
 +++ b/src/nm-udev-manager.c
-@@ -520,35 +520,25 @@ void
+@@ -523,35 +523,25 @@ void
  nm_udev_manager_query_devices (NMUdevManager *self)
  {
  	NMUdevManagerPrivate *priv = NM_UDEV_MANAGER_GET_PRIVATE (self);
@@ -53,6 +51,3 @@
  }
  
  static void
--- 
-1.8.1.2
-

=== modified file 'debian/patches/nm-source-stanza.patch'
--- debian/patches/nm-source-stanza.patch	2014-01-23 20:22:18 +0000
+++ debian/patches/nm-source-stanza.patch	2014-06-20 21:41:36 +0000
@@ -5,10 +5,16 @@
 http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=48ed1abca77195ed9b36645593733da143e3be3f
 http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=4e09b87d5404580ec5a75234fe48d4c6137c4e40
 
-Index: network-manager-0.9.8.4/src/settings/plugins/ifupdown/interface_parser.c
-===================================================================
---- network-manager-0.9.8.4.orig/src/settings/plugins/ifupdown/interface_parser.c	2014-01-23 10:55:18.150494764 +0000
-+++ network-manager-0.9.8.4/src/settings/plugins/ifupdown/interface_parser.c	2014-01-23 10:55:18.146494765 +0000
+---
+ src/settings/plugins/ifupdown/interface_parser.c              |   81 +++++++++-
+ src/settings/plugins/ifupdown/tests/test-ifupdown.c           |   27 +++
+ src/settings/plugins/ifupdown/tests/test20-source-stanza      |    1 
+ src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 |    2 
+ src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 |    2 
+ 5 files changed, 107 insertions(+), 6 deletions(-)
+
+--- a/src/settings/plugins/ifupdown/interface_parser.c
++++ b/src/settings/plugins/ifupdown/interface_parser.c
 @@ -25,6 +25,8 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -18,7 +24,7 @@
  #include "nm-utils.h"
  
  if_block* first;
-@@ -96,21 +98,33 @@
+@@ -96,21 +98,33 @@ static char *join_values_with_spaces(cha
  	return(dst);
  }
  
@@ -55,7 +61,7 @@
  	while (!feof(inp))
  	{
  		char *token[128];	// 255 chars can only be split into 127 tokens
-@@ -175,8 +189,9 @@
+@@ -175,8 +189,9 @@ void ifparser_init (const char *eni_file
  			continue;
  		}
  
@@ -67,7 +73,7 @@
  
  		// iface stanza takes at least 3 parameters
  		if (strcmp(token[0], "iface") == 0) {
-@@ -211,17 +226,71 @@
+@@ -211,17 +226,71 @@ void ifparser_init (const char *eni_file
  				add_block(token[0], token[i]);
  			skip_to_block = 0;
  		}
@@ -140,11 +146,9 @@
  }
  
  void _destroy_data(if_data *ifd)
-Index: network-manager-0.9.8.4/src/settings/plugins/ifupdown/tests/test-ifupdown.c
-===================================================================
---- network-manager-0.9.8.4.orig/src/settings/plugins/ifupdown/tests/test-ifupdown.c	2014-01-23 10:55:18.150494764 +0000
-+++ network-manager-0.9.8.4/src/settings/plugins/ifupdown/tests/test-ifupdown.c	2014-01-23 10:55:18.146494765 +0000
-@@ -903,6 +903,32 @@
+--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
++++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+@@ -903,6 +903,32 @@ test19_read_static_ipv4_plen (const char
  	g_object_unref (connection);
  }
  
@@ -177,7 +181,7 @@
  
  #if GLIB_CHECK_VERSION(2,25,12)
  typedef GTestFixtureFunc TCFunc;
-@@ -947,6 +973,7 @@
+@@ -947,6 +973,7 @@ int main (int argc, char **argv)
  	g_test_suite_add (suite, TESTCASE (test17_read_static_ipv4, TEST_ENI_DIR));
  	g_test_suite_add (suite, TESTCASE (test18_read_static_ipv6, TEST_ENI_DIR));
  	g_test_suite_add (suite, TESTCASE (test19_read_static_ipv4_plen, TEST_ENI_DIR));
@@ -185,23 +189,17 @@
  
  	return g_test_run ();
  }
-Index: network-manager-0.9.8.4/src/settings/plugins/ifupdown/tests/test20-source-stanza
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ network-manager-0.9.8.4/src/settings/plugins/ifupdown/tests/test20-source-stanza	2014-01-23 10:55:18.146494765 +0000
+--- /dev/null
++++ b/src/settings/plugins/ifupdown/tests/test20-source-stanza
 @@ -0,0 +1 @@
 +source test20-source-stanza.eth*
-Index: network-manager-0.9.8.4/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ network-manager-0.9.8.4/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0	2014-01-23 10:55:18.146494765 +0000
+--- /dev/null
++++ b/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0
 @@ -0,0 +1,2 @@
 +auto eth0
 +iface eth0 inet dhcp
-Index: network-manager-0.9.8.4/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ network-manager-0.9.8.4/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1	2014-01-23 10:55:18.146494765 +0000
+--- /dev/null
++++ b/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1
 @@ -0,0 +1,2 @@
 +auto eth1
 +iface eth1 inet dhcp

=== modified file 'debian/patches/prioritize_3g_later.patch'
--- debian/patches/prioritize_3g_later.patch	2013-06-05 20:36:07 +0000
+++ debian/patches/prioritize_3g_later.patch	2014-06-20 21:41:36 +0000
@@ -5,8 +5,6 @@
  src/nm-device.c |   16 ++++++++++------
  1 file changed, 10 insertions(+), 6 deletions(-)
 
-Index: b/src/nm-device.c
-===================================================================
 --- a/src/nm-device.c
 +++ b/src/nm-device.c
 @@ -688,6 +688,10 @@ nm_device_get_priority (NMDevice *dev)

=== modified file 'debian/patches/provisioning_wait_ofono_properties.patch'
--- debian/patches/provisioning_wait_ofono_properties.patch	2013-09-24 15:19:55 +0000
+++ debian/patches/provisioning_wait_ofono_properties.patch	2014-06-20 21:41:36 +0000
@@ -13,11 +13,9 @@
  src/modem-manager/nm-modem-ofono.c |  331 ++++++++++++++++++++-----------------
  1 file changed, 184 insertions(+), 147 deletions(-)
 
-Index: b/src/modem-manager/nm-modem-ofono.c
-===================================================================
 --- a/src/modem-manager/nm-modem-ofono.c
 +++ b/src/modem-manager/nm-modem-ofono.c
-@@ -106,6 +106,8 @@ typedef struct {
+@@ -107,6 +107,8 @@ typedef struct {
  	gboolean gprs_attached;
  	gboolean gprs_powered;
  
@@ -26,7 +24,7 @@
  	NMModemState state;
  } NMModemOfonoPrivate;
  
-@@ -332,7 +334,7 @@ ofono_read_contexts (NMModemOfono *self)
+@@ -333,7 +335,7 @@ ofono_read_contexts (NMModemOfono *self)
  	char *imsi = NULL;
  
  	nm_log_dbg (LOGD_MB, "in %s", __func__);
@@ -35,7 +33,7 @@
  
  	bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
  
-@@ -402,7 +404,6 @@ ofono_properties_changed (DBusGProxy *pr
+@@ -403,7 +405,6 @@ ofono_properties_changed (DBusGProxy *pr
  	} else if (g_strcmp0 (key, "Interfaces") == 0 && G_VALUE_HOLDS_BOXED (value)) {
  		gboolean found_simmanager = FALSE;
  		gboolean found_conn_manager = FALSE;
@@ -43,7 +41,7 @@
  		int i;
  
  		priv->interfaces = (char **) g_value_get_boxed (value);
-@@ -413,58 +414,62 @@ ofono_properties_changed (DBusGProxy *pr
+@@ -414,58 +415,62 @@ ofono_properties_changed (DBusGProxy *pr
  				found_simmanager = TRUE;
  			if (g_strrstr (priv->interfaces[i], "ConnectionManager"))
  				found_conn_manager = TRUE;
@@ -134,7 +132,7 @@
  				g_object_unref (priv->connman_proxy);
  				priv->connman_proxy = NULL;
  
-@@ -476,16 +481,6 @@ ofono_properties_changed (DBusGProxy *pr
+@@ -477,16 +482,6 @@ ofono_properties_changed (DBusGProxy *pr
  				priv->gprs_attached = FALSE;
  			}
  		}
@@ -151,7 +149,7 @@
  	}
  }
  
-@@ -570,26 +565,132 @@ stage1_prepare_done (DBusGProxy *proxy,
+@@ -571,26 +566,132 @@ stage1_prepare_done (DBusGProxy *proxy,
  		priv->connect_properties = NULL;
  	}
  
@@ -297,7 +295,7 @@
  do_context_activate (NMModemOfono *self, char *context_path)
  {
  	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-@@ -623,6 +724,23 @@ do_context_activate (NMModemOfono *self,
+@@ -624,6 +725,23 @@ do_context_activate (NMModemOfono *self,
  		return;
  	}
  
@@ -321,7 +319,7 @@
  	dbus_g_proxy_begin_call_with_timeout (priv->context_proxy,
  	                                      "SetProperty", stage1_prepare_done,
  	                                      self, NULL, 20000,
-@@ -967,108 +1085,22 @@ act_stage1_prepare (NMModem *modem,
+@@ -942,108 +1060,22 @@ act_stage1_prepare (NMModem *modem,
  	return NM_ACT_STAGE_RETURN_POSTPONE;
  }
  
@@ -438,7 +436,7 @@
  }
  
  static gboolean
-@@ -1239,6 +1271,8 @@ nm_modem_ofono_init (NMModemOfono *self)
+@@ -1226,6 +1258,8 @@ nm_modem_ofono_init (NMModemOfono *self)
  	priv->modem_online = FALSE;
  	priv->gprs_powered = FALSE;
  	priv->gprs_attached = FALSE;
@@ -447,7 +445,7 @@
  }
  
  static GObject*
-@@ -1290,6 +1324,9 @@ dispose (GObject *object)
+@@ -1277,6 +1311,9 @@ dispose (GObject *object)
  	if (priv->connect_properties)
  		g_hash_table_destroy (priv->connect_properties);
  

=== modified file 'debian/patches/quit_dhclient_on_exit.patch'
--- debian/patches/quit_dhclient_on_exit.patch	2014-04-08 00:30:45 +0000
+++ debian/patches/quit_dhclient_on_exit.patch	2014-06-20 21:41:36 +0000
@@ -25,11 +25,9 @@
  src/nm-manager.c |    2 ++
  2 files changed, 4 insertions(+)
 
-Index: b/src/nm-device.c
-===================================================================
 --- a/src/nm-device.c
 +++ b/src/nm-device.c
-@@ -3801,6 +3801,7 @@ dispose (GObject *object)
+@@ -4271,6 +4271,7 @@ dispose (GObject *object)
  
  	priv->disposed = TRUE;
  
@@ -37,7 +35,7 @@
  	/* Don't down can-assume-connection capable devices that are activated with
  	 * a connection that can be assumed.
  	 */
-@@ -3825,6 +3826,7 @@ dispose (GObject *object)
+@@ -4295,6 +4296,7 @@ dispose (GObject *object)
  				take_down = FALSE;
  		}
  	}
@@ -45,11 +43,9 @@
  
  	/* Clear any queued transitions */
  	nm_device_queued_state_clear (self);
-Index: b/src/nm-manager.c
-===================================================================
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -525,6 +525,7 @@ remove_one_device (NMManager *manager,
+@@ -680,6 +680,7 @@ remove_one_device (NMManager *manager,
  	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
  
  	if (nm_device_get_managed (device)) {
@@ -57,7 +53,7 @@
  		/* When quitting, we want to leave up interfaces & connections
  		 * that can be taken over again (ie, "assumed") when NM restarts
  		 * so that '/etc/init.d/NetworkManager restart' will not distrupt
-@@ -536,6 +537,7 @@ remove_one_device (NMManager *manager,
+@@ -691,6 +692,7 @@ remove_one_device (NMManager *manager,
  		if (   !nm_device_can_assume_connections (device)
  		    || (nm_device_get_state (device) != NM_DEVICE_STATE_ACTIVATED)
  		    || !quitting)

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-05-01 17:36:54 +0000
+++ debian/patches/series	2014-06-20 21:41:36 +0000
@@ -1,8 +1,4 @@
-git_segfault_nmagentmanager_3227cf0.patch
-git_agent_removing_requests_b2312d4.patch
 git_disp_logging_crash_aca907f.patch
-git_fix_shadowed_var_abe208e.patch
-git_default_route_active_device_9820258.patch
 fix-vapigen-detection.patch
 lp191889_always_offline_with_unmanaged_devices.patch
 lp859373_upgrade_policy_fix.patch

=== modified file 'debian/patches/track_ip_settings_post_connection.patch'
--- debian/patches/track_ip_settings_post_connection.patch	2013-10-02 17:41:30 +0000
+++ debian/patches/track_ip_settings_post_connection.patch	2014-06-20 21:41:36 +0000
@@ -5,11 +5,9 @@
  src/modem-manager/nm-modem-ofono.c |   24 +++++++++++++++++++-----
  1 file changed, 19 insertions(+), 5 deletions(-)
 
-Index: b/src/modem-manager/nm-modem-ofono.c
-===================================================================
 --- a/src/modem-manager/nm-modem-ofono.c
 +++ b/src/modem-manager/nm-modem-ofono.c
-@@ -167,6 +167,8 @@ disconnect_done (DBusGProxy *proxy, DBus
+@@ -168,6 +168,8 @@ disconnect_done (DBusGProxy *proxy, DBus
  	}
  
          simple_disconnect_context_free (ctx);
@@ -18,7 +16,7 @@
  }
  
  static void
-@@ -230,8 +232,12 @@ update_ofono_enabled (NMModemOfono *self
+@@ -231,8 +233,12 @@ update_ofono_enabled (NMModemOfono *self
  		              NM_MODEM_ENABLED, new_enabled,
  		              NULL);
  		nm_log_info (LOGD_MB, "(%s) marked enabled: %d", nm_modem_get_path (NM_MODEM (self)), new_enabled);
@@ -32,7 +30,7 @@
  }
  
  static void
-@@ -595,8 +601,6 @@ ofono_context_get_ip_properties (NMModem
+@@ -596,8 +602,6 @@ ofono_context_get_ip_properties (NMModem
  
  	nm_log_dbg (LOGD_MB, "in %s", __func__);
  
@@ -41,7 +39,7 @@
  	prop_dict = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
  	dbus_g_proxy_call_with_timeout (priv->context_proxy,
  	                                "GetProperties",
-@@ -607,9 +611,14 @@ ofono_context_get_ip_properties (NMModem
+@@ -608,9 +612,14 @@ ofono_context_get_ip_properties (NMModem
  
  	if (!error) {
  		settings = g_hash_table_lookup (properties, "Settings");
@@ -57,7 +55,7 @@
  			nm_log_info (LOGD_MB, "(%s): IPv4 static configuration:",
  			             nm_modem_get_uid (NM_MODEM (self)));
  
-@@ -617,6 +626,8 @@ ofono_context_get_ip_properties (NMModem
+@@ -618,6 +627,8 @@ ofono_context_get_ip_properties (NMModem
  			if (iface)
  				g_object_set (self, NM_MODEM_DATA_PORT, iface, NULL);
  
@@ -66,7 +64,7 @@
  			priv->ip4_config = nm_ip4_config_new ();
  			addr = nm_ip4_address_new ();
  
-@@ -673,7 +684,8 @@ out:
+@@ -674,7 +685,8 @@ out:
  		}
  	}
  
@@ -76,7 +74,7 @@
  }
  
  static void
-@@ -1097,6 +1109,8 @@ static_stage3_ip4_config_start (NMModem
+@@ -1072,6 +1084,8 @@ static_stage3_ip4_config_start (NMModem
  
  	if (priv->ip4_config) {
  		g_signal_emit_by_name (self, NM_MODEM_IP4_CONFIG_RESULT, priv->ip4_config, error);

=== modified file 'debian/patches/whoopsie-daisy-dbus-support.patch'
--- debian/patches/whoopsie-daisy-dbus-support.patch	2012-03-27 15:36:38 +0000
+++ debian/patches/whoopsie-daisy-dbus-support.patch	2014-06-20 21:41:36 +0000
@@ -5,11 +5,13 @@
 the information NM keeps about devices to avoid sending data over the network
 when connected to 3G or other systems that are potentially billable.
 
-Index: b/src/org.freedesktop.NetworkManager.conf
-===================================================================
+---
+ src/org.freedesktop.NetworkManager.conf |   18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
 --- a/src/org.freedesktop.NetworkManager.conf
 +++ b/src/org.freedesktop.NetworkManager.conf
-@@ -88,6 +88,24 @@
+@@ -87,6 +87,24 @@
                         send_interface="org.freedesktop.NetworkManager"
                         send_member="wake"/>
          </policy>

=== modified file 'debian/watch'
--- debian/watch	2011-05-03 21:26:20 +0000
+++ debian/watch	2014-06-20 21:41:36 +0000
@@ -1,3 +1,3 @@
 version=3
 
-http://download.gnome.org/sources/NetworkManager/([\d\.]+)/NetworkManager-(.*)\.tar\.bz2
+http://download.gnome.org/sources/NetworkManager/([\d\.]+)/NetworkManager-(.*)\.tar\.xz