diff -Nru network-manager-0.9.10.0/debian/changelog network-manager-0.9.10.0/debian/changelog --- network-manager-0.9.10.0/debian/changelog 2015-08-11 19:41:48.000000000 +0000 +++ network-manager-0.9.10.0/debian/changelog 2015-08-12 19:45:47.000000000 +0000 @@ -1,11 +1,19 @@ +network-manager (0.9.10.0-4ubuntu23) wily; urgency=medium + + [ Tony Espy ] + * d/p/lp1444162-add-ip6-config-to-nm-ofono-connections.patch: disable + IPv6 for ofono connections (LP: #1444162). + + -- Mathieu Trudel-Lapierre Wed, 12 Aug 2015 15:45:38 -0400 + network-manager (0.9.10.0-4ubuntu22) wily; urgency=medium [ Tony Espy ] * d/p/lp1425172-fix-wifi-scanlist-cull.patch: fix cull_scan_list so that APs are removed when wpa_supplicant indicates that they've - been removed ( vs. waiting 6m to do so ). + been removed vs. waiting 6m to do so ( LP: #1425172 ). - -- Mathieu Trudel-Lapierre Tue, 11 Aug 2015 15:41:34 -0400 + -- Mathieu Trudel-Lapierre Wed, 11 Aug 2015 13:34:51 -0400 network-manager (0.9.10.0-4ubuntu21) wily; urgency=medium diff -Nru network-manager-0.9.10.0/debian/patches/lp1425172-fix-wifi-scanlist-cull.patch network-manager-0.9.10.0/debian/patches/lp1425172-fix-wifi-scanlist-cull.patch --- network-manager-0.9.10.0/debian/patches/lp1425172-fix-wifi-scanlist-cull.patch 2015-08-11 19:41:48.000000000 +0000 +++ network-manager-0.9.10.0/debian/patches/lp1425172-fix-wifi-scanlist-cull.patch 2015-08-12 19:45:47.000000000 +0000 @@ -1,13 +1,12 @@ Author: Tony Espy Subject: Remove APs when wpa_supplicant removes them +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1425172 This patch modifies NMDeviceWiFi's cull_scan_list function such that APs are removed when the WPAS_REMOVED_TAG is detected. This leads to earleir removal of APs that are no longer present. -Bug: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1425172 - Index: network-manager-0.9.10.0/src/devices/wifi/nm-device-wifi.c =================================================================== --- network-manager-0.9.10.0.orig/src/devices/wifi/nm-device-wifi.c diff -Nru network-manager-0.9.10.0/debian/patches/lp1444162-add-ip6-config-to-nm-ofono-connections.patch network-manager-0.9.10.0/debian/patches/lp1444162-add-ip6-config-to-nm-ofono-connections.patch --- network-manager-0.9.10.0/debian/patches/lp1444162-add-ip6-config-to-nm-ofono-connections.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-0.9.10.0/debian/patches/lp1444162-add-ip6-config-to-nm-ofono-connections.patch 2015-08-12 19:45:47.000000000 +0000 @@ -0,0 +1,43 @@ +Author: Tony Espy +Subject: Set IP6_CONFIG_METHOD_IGNORE for ofono connections +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1444162 + +This patch modifies the ofono settings plugin to add IP6_CONFIG +settings that contain an IP6_CONFIG_METHOD set to ignore indicate +to NM that IPv6 is not required. This fixes an issue with QNetwork +which incorrectly assumed that the ofono mobile data connection +support IPv6. + +Index: network-manager-0.9.10.0/src/settings/plugins/ofono/parser.c +=================================================================== +--- network-manager-0.9.10.0.orig/src/settings/plugins/ofono/parser.c ++++ network-manager-0.9.10.0/src/settings/plugins/ofono/parser.c +@@ -49,6 +49,7 @@ ofono_update_connection_from_context (NM + { + NMSettingConnection *s_con; + NMSettingGsm *s_gsm; ++ NMSettingIP6Config *s_ip6_config; + gboolean success = FALSE; + char *idstr = NULL; + char *uuid_base = NULL; +@@ -89,6 +90,20 @@ ofono_update_connection_from_context (NM + */ + g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL); + ++ /* IP6 setting */ ++ s_ip6_config = NM_SETTING_IP6_CONFIG (nm_setting_ip6_config_new()); ++ g_assert (s_ip6_config); ++ nm_connection_add_setting (connection, NM_SETTING (s_ip6_config)); ++ ++ /* ++ * Set IP6_CONFIG_METHOD to ignore to prevent NM from configuring IPv6 ++ * for ofono connections. ++ */ ++ g_object_set (s_ip6_config, ++ NM_SETTING_IP6_CONFIG_METHOD, ++ NM_SETTING_IP6_CONFIG_METHOD_IGNORE, ++ NULL); ++ + nm_log_info (LOGD_SETTINGS, "SCPlugin-Ofono: " + "update_connection_setting_from_context: name:%s, path:%s, id:%s, uuid: %s", + (char *) g_hash_table_lookup (context, "Name"), diff -Nru network-manager-0.9.10.0/debian/patches/series network-manager-0.9.10.0/debian/patches/series --- network-manager-0.9.10.0/debian/patches/series 2015-08-11 19:41:48.000000000 +0000 +++ network-manager-0.9.10.0/debian/patches/series 2015-08-12 19:45:47.000000000 +0000 @@ -79,3 +79,4 @@ git_route_fixes_part2_529591d8.patch git_avoid_conflict_reinstall_dev_route_e439478c.patch lp1425172-fix-wifi-scanlist-cull.patch +lp1444162-add-ip6-config-to-nm-ofono-connections.patch