diff -Nru network-manager-0.9.8.10/debian/changelog network-manager-0.9.8.8/debian/changelog --- network-manager-0.9.8.10/debian/changelog 2014-06-20 07:05:38.000000000 +1000 +++ network-manager-0.9.8.8/debian/changelog 2014-06-11 05:43:23.000000000 +1000 @@ -1,12 +1,3 @@ -network-manager (0.9.8.10-0ubuntu1) utopic; urgency=medium - - * New upstream release - * Drop some git patches - * Refresh patches - * debian/watch: Track .xz tarballs - - -- Jackson Doak 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 diff -Nru network-manager-0.9.8.10/debian/patches/add_ofono_settings_support.patch network-manager-0.9.8.8/debian/patches/add_ofono_settings_support.patch --- network-manager-0.9.8.10/debian/patches/add_ofono_settings_support.patch 2014-06-20 06:53:38.000000000 +1000 +++ network-manager-0.9.8.8/debian/patches/add_ofono_settings_support.patch 2014-06-11 05:43:23.000000000 +1000 @@ -15,9 +15,11 @@ src/settings/plugins/ofono/plugin.h | 53 + 11 files changed, 1221 insertions(+) +Index: b/configure.ac +=================================================================== --- a/configure.ac +++ b/configure.ac -@@ -98,6 +98,7 @@ AC_ARG_ENABLE(ifcfg-rh, AS_HELP_STRING([ +@@ -96,6 +96,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)])) @@ -25,7 +27,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)) -@@ -110,11 +111,14 @@ AS_IF([test -z "$enable_ifcfg_rh"], enab +@@ -108,11 +109,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) @@ -40,7 +42,7 @@ # Code coverage GNOME_CODE_COVERAGE -@@ -688,6 +692,7 @@ src/settings/Makefile +@@ -671,6 +675,7 @@ src/settings/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile @@ -48,7 +50,7 @@ src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile -@@ -797,6 +802,7 @@ echo " ifcfg-rh: ${enable_ifcfg_rh}" +@@ -780,6 +785,7 @@ echo " ifcfg-rh: ${enable_ifcfg_rh}" echo " ifcfg-suse: ${enable_ifcfg_suse}" echo " ifupdown: ${enable_ifupdown}" echo " ifnet: ${enable_ifnet}" @@ -56,6 +58,8 @@ 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 @@ -67,6 +71,8 @@ +SUBDIRS+=ofono +endif + +Index: b/src/settings/plugins/ofono/Makefile.am +=================================================================== --- /dev/null +++ b/src/settings/plugins/ofono/Makefile.am @@ -0,0 +1,65 @@ @@ -135,6 +141,8 @@ + 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 @@ @@ -304,6 +312,8 @@ + 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 @@ @@ -361,6 +371,8 @@ +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 @@ @@ -487,6 +499,8 @@ + 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 @@ @@ -523,6 +537,8 @@ + 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 @@ @@ -1208,6 +1224,8 @@ + 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 @@ @@ -1264,6 +1282,8 @@ +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 @@ @@ -1283,6 +1303,8 @@ + + + +Index: b/src/settings/plugins/ofono/nm-ofono.conf +=================================================================== --- /dev/null +++ b/src/settings/plugins/ofono/nm-ofono.conf @@ -0,0 +1,18 @@ diff -Nru network-manager-0.9.8.10/debian/patches/add_ofono_support.patch network-manager-0.9.8.8/debian/patches/add_ofono_support.patch --- network-manager-0.9.8.10/debian/patches/add_ofono_support.patch 2014-06-20 06:53:36.000000000 +1000 +++ network-manager-0.9.8.8/debian/patches/add_ofono_support.patch 2014-06-11 05:43:23.000000000 +1000 @@ -12,6 +12,8 @@ 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 @@ @@ -75,6 +77,8 @@ 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 @@ @@ -1395,9 +1399,11 @@ + //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 -@@ -7,6 +7,7 @@ libmodem_manager_la_CPPFLAGS = \ +@@ -5,6 +5,7 @@ INCLUDES = \ -I${top_builddir}/src/generated \ -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ @@ -1405,7 +1411,7 @@ -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -@@ -23,6 +24,8 @@ libmodem_manager_la_SOURCES = \ +@@ -21,6 +22,8 @@ libmodem_manager_la_SOURCES = \ nm-modem-cdma.h \ nm-modem-gsm.c \ nm-modem-gsm.h \ @@ -1414,6 +1420,8 @@ 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 @@ @@ -1431,6 +1439,8 @@ #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 @@ -1731,6 +1741,8 @@ 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 @@ @@ -2040,7 +2052,7 @@ } /************************************************************************/ -@@ -786,15 +951,20 @@ nm_modem_manager_init (NMModemManager *s +@@ -769,15 +934,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); @@ -2065,6 +2077,8 @@ #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 @@ @@ -2124,6 +2138,8 @@ +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 { diff -Nru network-manager-0.9.8.10/debian/patches/add_sendsigs_omissions.patch network-manager-0.9.8.8/debian/patches/add_sendsigs_omissions.patch --- network-manager-0.9.8.10/debian/patches/add_sendsigs_omissions.patch 2014-06-20 06:51:28.000000000 +1000 +++ network-manager-0.9.8.8/debian/patches/add_sendsigs_omissions.patch 2014-06-11 05:43:23.000000000 +1000 @@ -9,12 +9,14 @@ --- src/dhcp-manager/nm-dhcp-dhclient.c | 2 +- - src/dns-manager/nm-dns-dnsmasq.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + src/dns-manager/nm-dns-dnsmasq.c | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) +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 -@@ -520,7 +520,7 @@ dhclient_start (NMDHCPClient *client, +@@ -553,7 +553,7 @@ dhclient_start (NMDHCPClient *client, return -1; } @@ -23,6 +25,8 @@ 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 diff -Nru network-manager-0.9.8.10/debian/patches/add-veth-support.diff network-manager-0.9.8.8/debian/patches/add-veth-support.diff --- network-manager-0.9.8.10/debian/patches/add-veth-support.diff 2014-06-20 06:51:39.000000000 +1000 +++ network-manager-0.9.8.8/debian/patches/add-veth-support.diff 2014-06-11 05:43:23.000000000 +1000 @@ -8,6 +8,8 @@ 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, @@ -22,9 +24,11 @@ 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 -@@ -1918,6 +1918,8 @@ nm_system_get_iface_type (int ifindex, c +@@ -1882,6 +1882,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; @@ -33,6 +37,8 @@ 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 { @@ -45,9 +51,11 @@ }; 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 -@@ -253,7 +253,7 @@ constructor (GType type, +@@ -252,7 +252,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)); diff -Nru network-manager-0.9.8.10/debian/patches/adhoc_use_wpa_rsn_part1.patch network-manager-0.9.8.8/debian/patches/adhoc_use_wpa_rsn_part1.patch --- network-manager-0.9.8.10/debian/patches/adhoc_use_wpa_rsn_part1.patch 2014-06-20 06:53:23.000000000 +1000 +++ network-manager-0.9.8.8/debian/patches/adhoc_use_wpa_rsn_part1.patch 2014-06-11 05:43:23.000000000 +1000 @@ -10,6 +10,8 @@ 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 @@ -30,6 +32,8 @@ 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) @@ -103,7 +107,7 @@ g_assert (ssid); str_ssid = nm_utils_ssid_to_utf8 (ssid); format = g_strdup_printf ("%s %%d", str_ssid); -@@ -2975,16 +2925,6 @@ act_stage1_prepare (NMDevice *dev, NMDev +@@ -2973,16 +2923,6 @@ act_stage1_prepare (NMDevice *dev, NMDev } g_object_notify (G_OBJECT (self), NM_DEVICE_WIFI_MODE); @@ -120,9 +124,11 @@ /* 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 -@@ -1074,38 +1074,6 @@ add_cb (NMSettings *self, +@@ -1065,38 +1065,6 @@ add_cb (NMSettings *self, dbus_g_method_return (context, nm_connection_get_path (NM_CONNECTION (connection))); } @@ -161,7 +167,7 @@ void nm_settings_add_connection (NMSettings *self, NMConnection *connection, -@@ -1131,19 +1099,6 @@ nm_settings_add_connection (NMSettings * +@@ -1122,19 +1090,6 @@ nm_settings_add_connection (NMSettings * callback (self, NULL, error, context, user_data); g_error_free (error); return; diff -Nru network-manager-0.9.8.10/debian/patches/adhoc_use_wpa_rsn_part2.patch network-manager-0.9.8.8/debian/patches/adhoc_use_wpa_rsn_part2.patch --- network-manager-0.9.8.10/debian/patches/adhoc_use_wpa_rsn_part2.patch 2014-06-20 06:53:26.000000000 +1000 +++ network-manager-0.9.8.8/debian/patches/adhoc_use_wpa_rsn_part2.patch 2014-06-11 05:43:23.000000000 +1000 @@ -38,9 +38,11 @@ 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 -@@ -180,6 +180,7 @@ typedef enum { +@@ -159,6 +159,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 @@ -48,7 +50,7 @@ * * 802.11 specific device encryption and authentication capabilities. **/ -@@ -192,7 +193,8 @@ typedef enum { +@@ -171,7 +172,8 @@ typedef enum { NM_WIFI_DEVICE_CAP_WPA = 0x00000010, NM_WIFI_DEVICE_CAP_RSN = 0x00000020, NM_WIFI_DEVICE_CAP_AP = 0x00000040, @@ -58,6 +60,8 @@ } 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, @@ -70,6 +74,8 @@ || !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) @@ -156,6 +162,8 @@ "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 @@ -177,6 +185,8 @@ } /* 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 @@ -228,6 +238,8 @@ 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 @@ -334,6 +346,8 @@ } 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 @@ -421,9 +435,11 @@ 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 -@@ -2001,8 +2001,8 @@ fill_wpa_ciphers (shvarFile *ifcfg, +@@ -1990,8 +1990,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; @@ -434,7 +450,7 @@ *iter); continue; } -@@ -2791,8 +2791,8 @@ make_wpa_setting (shvarFile *ifcfg, +@@ -2777,8 +2777,8 @@ make_wpa_setting (shvarFile *ifcfg, /* WPA and/or RSN */ if (adhoc) { @@ -445,7 +461,7 @@ } else { char *allow_wpa, *allow_rsn; -@@ -2831,10 +2831,7 @@ make_wpa_setting (shvarFile *ifcfg, +@@ -2817,10 +2817,7 @@ make_wpa_setting (shvarFile *ifcfg, } } @@ -457,6 +473,8 @@ } 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 @@ -468,6 +486,8 @@ 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, @@ -553,6 +573,8 @@ 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={ @@ -571,6 +593,8 @@ + 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 @@ -583,6 +607,8 @@ || !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 @@ -594,9 +620,11 @@ "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 -@@ -730,6 +730,9 @@ static int nl80211_wiphy_info_handler (s +@@ -720,6 +720,9 @@ static int nl80211_wiphy_info_handler (s } } diff -Nru network-manager-0.9.8.10/debian/patches/bridge_ignore_without_connections.patch network-manager-0.9.8.8/debian/patches/bridge_ignore_without_connections.patch --- network-manager-0.9.8.10/debian/patches/bridge_ignore_without_connections.patch 2014-06-20 06:53:28.000000000 +1000 +++ network-manager-0.9.8.8/debian/patches/bridge_ignore_without_connections.patch 2014-06-11 05:43:23.000000000 +1000 @@ -8,9 +8,11 @@ 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 -@@ -1921,7 +1921,7 @@ add_device (NMManager *self, NMDevice *d +@@ -1723,7 +1723,7 @@ add_device (NMManager *self, NMDevice *d static guint32 devcount = 0; const GSList *unmanaged_specs; NMConnection *existing = NULL; @@ -19,7 +21,7 @@ RfKillType rtype; NMDeviceType devtype; -@@ -1973,6 +1973,14 @@ add_device (NMManager *self, NMDevice *d +@@ -1775,6 +1775,14 @@ add_device (NMManager *self, NMDevice *d g_signal_connect (device, NM_DEVICE_MODEM_ENABLE_CHANGED, G_CALLBACK (manager_modem_enabled_changed), self); @@ -34,7 +36,7 @@ } /* Update global rfkill state for this device type with the device's -@@ -2021,7 +2029,8 @@ add_device (NMManager *self, NMDevice *d +@@ -1823,7 +1831,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) @@ -44,7 +46,7 @@ nm_device_set_managed (device, TRUE, existing ? NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED : -@@ -3441,6 +3450,7 @@ do_sleep_wake (NMManager *self) +@@ -3157,6 +3166,7 @@ do_sleep_wake (NMManager *self) { NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); const GSList *unmanaged_specs; @@ -52,7 +54,7 @@ GSList *iter; if (manager_sleeping (self)) { -@@ -3466,6 +3476,7 @@ do_sleep_wake (NMManager *self) +@@ -3182,6 +3192,7 @@ do_sleep_wake (NMManager *self) /* Re-manage managed devices */ for (iter = priv->devices; iter; iter = iter->next) { NMDevice *device = NM_DEVICE (iter->data); @@ -60,7 +62,7 @@ guint i; /* enable/disable wireless devices since that we don't respond -@@ -3485,9 +3496,19 @@ do_sleep_wake (NMManager *self) +@@ -3201,9 +3212,19 @@ do_sleep_wake (NMManager *self) nm_device_set_enabled (device, enabled); } diff -Nru network-manager-0.9.8.10/debian/patches/connectivity_check_default_interval.patch network-manager-0.9.8.8/debian/patches/connectivity_check_default_interval.patch --- network-manager-0.9.8.10/debian/patches/connectivity_check_default_interval.patch 2014-06-20 06:54:07.000000000 +1000 +++ network-manager-0.9.8.8/debian/patches/connectivity_check_default_interval.patch 2014-06-11 05:43:23.000000000 +1000 @@ -11,6 +11,8 @@ 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 @@ @@ -50,6 +52,8 @@ 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 @@ @@ -69,6 +73,8 @@ 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 @@ diff -Nru network-manager-0.9.8.10/debian/patches/dns-dnsmasq-interface-and-dbus-path.patch network-manager-0.9.8.8/debian/patches/dns-dnsmasq-interface-and-dbus-path.patch --- network-manager-0.9.8.10/debian/patches/dns-dnsmasq-interface-and-dbus-path.patch 2014-06-20 06:53:18.000000000 +1000 +++ network-manager-0.9.8.8/debian/patches/dns-dnsmasq-interface-and-dbus-path.patch 2014-06-11 05:43:23.000000000 +1000 @@ -4,9 +4,11 @@ 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 -@@ -48,7 +48,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm +@@ -52,7 +52,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm #define CONFFILE NMRUNDIR "/dnsmasq.conf" #define CONFDIR NMCONFDIR "/dnsmasq.d" @@ -15,7 +17,7 @@ #define DNSMASQ_DBUS_PATH "/uk/org/thekelleys/dnsmasq" #define DNSMASQ_DBUS_INTERFACE "uk.org.thekelleys.dnsmasq" -@@ -285,11 +285,11 @@ start_dnsmasq (NMDnsDnsmasq *self) +@@ -289,11 +289,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; @@ -29,7 +31,7 @@ /* dnsmasq exits if the conf dir is not present */ if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR)) -@@ -410,7 +410,7 @@ update (NMDnsPlugin *plugin, +@@ -414,7 +414,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 @@ -38,6 +40,8 @@ */ 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, @@ -67,12 +71,14 @@ * 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 -@@ -25,6 +25,13 @@ +@@ -24,6 +24,13 @@ + - + +