Merge lp:~awe/network-manager/update-1.2 into lp:~network-manager/network-manager/ubuntu

[Tony Espy]

This is an update of lp:~cyphermox/network-manager/update-1.2 to rebase it on the recently released NM 1.2 rc1 release ( 1.1.93 ).

The update drops the following patches which have been upstreamed:

  - tests-fix-bashism-in-run-test-dbus-session.sh.patch
  - wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch
  - lp1496434_warn_on_invalid_new_link.patch

The remaining patches have been refreshed where needed, and the issue with incorrect nameservers fixed in the d/p/0001-dns-use-DBus-to-make-dnsmasq-nameserver-changes.patch.

Tested WPA2 WiFi on my Thinkpad 410s, and also tested that the Canonical VPN works correctly.

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

1031. By Tony Espy on 2016-04-07

Remove stale lp1444162-add-ip6-config-to-nm-ofono-connections.patch

Already folded into add_ofono_settings_support.patch.

1032. By Tony Espy on 2016-04-07

Removed stale lp1445080-nm-modem-check-for-set-mm-enabled-func.patch

Code has been upstreamed.

1033. By Tony Espy on 2016-04-07

Rename ignore_rmnet_devices.path to ignore_rild_modem_devices.patch

1034. By Tony Espy on 2016-04-07

Restore wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch

1035. By Tony Espy on 2016-04-08

wwan-add-ofono-modem-support.patch: fix crash

Fix a crash caused by a bad update of the patch, which failed
to remove a g_error call from NM_ASSERT_VALID_PATH_COMPONENT
( which was removed in the earlier version of the patch ).

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-26 20:32:27 +0000
+++ debian/changelog	2016-04-08 14:51:24 +0000
@@ -1,3 +1,75 @@
+network-manager (1.1.93-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Resynchronize with Debian; remaining changes:
+    - debian/control:
+      - Build-Depends on libgnutls-dev and libgcrypt20-dev; drop libteam-dev;
+        added valac and dbus-test-runner.
+      - Updated Vcs tags; enabled autopkgtests.
+      - Reshuffle Depends for network-manager due to main
+        inclusion requirements, and add Breaks for old versions of plugins.
+      - network-manager Conflicts with connman.
+      - update network-manager Description since we don't ship with team
+        support yet, and dnsmasq-base isn't optional.
+      - added a network-manager-dbg package for debug symbols.
+    - debian/ifblacklist_migrate.sh: update to better handle interfaces stanza.
+    - debian/libnm*-dev.install: ship vala bindings.
+    - debian/NetworkManager.conf: enable the ofono plugin and dnsmasq use as a
+      local DNS cache.
+    - debian/network-manager.dnsmasq: enable bind-interfaces for dnsmasq config.
+    - debian/network-manager.install: ship the ofono plugin, Apport hook and
+      examples. 
+    - debian/network-manager.links: link apport hook to the right directory.
+    - debian/network-manager.postinst: Don't need to migrate from sysvinit,
+      just keep removing the sysvinit script symlinks.
+    - debian/network-manager.postinst: Don't add the netdev group.
+    - debian/network-manager.postinst: Notify the user a reboot may be
+      required after upgrade.
+    - Remaining patches:
+      - whoopsie-daisy-dbus-support.patch
+      - 0001-dns-use-DBus-to-make-dnsmasq-nameserver-changes.patch
+      - nm-change-dnsmasq-parameters.diff
+      - dnsmasq-vpn-dns-filtering.patch
+      - lp936712_dnsmasq_ip6_ns_ordering.patch
+      - adhoc_use_wpa_rsn_part1.patch
+      - adhoc_use_wpa_rsn_part2.patch
+      - default_powersave_on.patch
+      - ignore_rmnet_devices.patch
+      - lp1099983_ignore-p2p-wifi-devices.patch
+      - wwan-add-ofono-modem-support.patch
+      - lp1461593-add-nm-settings-connection-reset-retries-methods.patch
+      - add_ofono_settings_support.patch
+      - lp1445080-modify-device-modem-avail.patch
+      - ignore_rfkill_if_urfkill_is_present.patch
+      - conditional_libteam_tests.patch
+      - disable_general_with_expect_test.patch
+    - debian/rules:
+      - configure: disable libteam.
+      - configure: enable building vala bindings.
+      - configure: enable running tests during the build.
+      - don't install sysvinit scripts.
+      - copy over dnsmasq configuration files.
+      - don't restart NetworkManager on upgrade.
+      - add --with-udev-dir to ensure rules end up
+        in the right place.
+    - debian/source_network-manager.py: ship an Apport hook.
+    - debian/tests: Ship autopkgtests for automated functional testing.
+  * Refreshed all patches.
+  * Renamed 0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch
+    to wwan-add-ofono-modem-support.patch as this patch needed to be
+    extensively re-worked due to dbus-glib being deprecated in NM1.2.
+  * Remove upstreamed patches:
+    - tests-fix-bashism-in-run-test-dbus-session.sh.patch
+    - wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch
+    - lp1496434_warn_on_invalid_new_link.patch: alternate fix landed
+      upstream which ensures that a valid error instance is returned
+      by the factory_create_link method.
+  * Update all symbols files.
+  * Rename ignore_rmnet_devices.path to ignore_rild_modem_devices.patch
+  * Restore wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 03 Mar 2016 15:51:48 -0500
+
 network-manager (1.0.4-0ubuntu10) xenial; urgency=medium
 
   * No-change rebuild for gnutls transition.

=== modified file 'debian/control'
--- debian/control	2015-08-20 09:47:16 +0000
+++ debian/control	2016-04-08 14:51:24 +0000
@@ -16,7 +16,7 @@
                libnl-3-dev (>= 3.2.8),
                libnl-route-3-dev (>= 3.2.8),
                libnl-genl-3-dev (>= 3.2.8),
-               ppp-dev (>= 2.4.6),
+               ppp-dev (>= 2.4.7-1+1),
                libpolkit-gobject-1-dev,
                libpolkit-agent-1-dev (>= 0.97),
                libgnutls-dev,
@@ -28,7 +28,7 @@
                libgudev-1.0-dev (>= 165),
                libgirepository1.0-dev (>= 0.10.7-1~),
                gobject-introspection (>= 0.9.12-4~),
-               libsoup2.4-dev (>= 2.26),
+               libsoup2.4-dev (>= 2.40),
                gtk-doc-tools,
                perl,
                libyaml-perl,
@@ -38,13 +38,14 @@
                libreadline-dev,
                libnewt-dev (>= 0.52.15),
                libbluetooth-dev (>= 5),
+               dbus <!nocheck>,
+               python-gi <!nocheck>,
                valac (>= 0.17.1.24),
                dbus-test-runner,
-               python-dbus,
-               python-gi,
-Standards-Version: 3.9.6
+               python-dbus <!nocheck>
+Standards-Version: 3.9.7
 Vcs-Bzr: https://code.launchpad.net/~network-manager/network-manager/ubuntu
-Homepage: http://www.gnome.org/projects/NetworkManager/
+Homepage: https://wiki.gnome.org/Projects/NetworkManager
 XS-Testsuite: autopkgtest
 
 Package: network-manager

=== modified file 'debian/copyright'
--- debian/copyright	2012-03-26 14:27:33 +0000
+++ debian/copyright	2016-04-08 14:51:24 +0000
@@ -3,16 +3,24 @@
 Source: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/
 
 Files: *
-Copyright: 2004 - 2012 Red Hat, Inc.
+Copyright: 2004 - 2014 Red Hat, Inc.
            2005 - 2009 Novell, Inc.
 License: GPL-2+
 
 Files: libnm-util/*
        libnm-glib/*
-Copyright: 2005 - 2012 Red Hat, Inc.
+       libnm-core/*
+       libnm/*
+Copyright: 2005 - 2014 Red Hat, Inc.
            2005 - 2009 Novell, Inc.
 License: LGPL-2+
 
+Files: src/systemd/*
+Copyright: 2013 - 2015 Tom Gundersen
+           2014 Susant Sahani
+           2014 - 2015 Intel Corporation. All rights reserved.
+License: LGPL-2.1+
+
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -47,3 +55,20 @@
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in "/usr/share/common-licenses/LGPL-2".
 
+License: LGPL-2.1+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2.1".
+

=== modified file 'debian/libnm-glib4.symbols'
--- debian/libnm-glib4.symbols	2015-08-20 09:47:16 +0000
+++ debian/libnm-glib4.symbols	2016-04-08 14:51:24 +0000
@@ -10,6 +10,7 @@
  nm_access_point_get_flags@Base 0.7.999
  nm_access_point_get_frequency@Base 0.7.999
  nm_access_point_get_hw_address@Base 0.7.999
+ nm_access_point_get_last_seen@Base 1.1.90
  nm_access_point_get_max_bitrate@Base 0.7.999
  nm_access_point_get_mode@Base 0.7.999
  nm_access_point_get_rsn_flags@Base 0.7.999
@@ -45,6 +46,7 @@
  nm_client_error_quark@Base 0.9.10.0
  nm_client_get_activating_connection@Base 0.9.8.8
  nm_client_get_active_connections@Base 0.7.999
+ nm_client_get_all_devices@Base 1.1.90
  nm_client_get_connectivity@Base 0.9.8.8
  nm_client_get_device_by_iface@Base 0.9.0
  nm_client_get_device_by_path@Base 0.7.999
@@ -156,6 +158,7 @@
  nm_device_infiniband_get_hw_address@Base 0.9.4.0
  nm_device_infiniband_get_type@Base 0.9.4.0
  nm_device_infiniband_new@Base 0.9.4.0
+ nm_device_is_real@Base 1.1.90
  nm_device_is_software@Base 1.0.0
  nm_device_modem_error_get_type@Base 0.9.4.0
  nm_device_modem_error_quark@Base 0.9.4.0
@@ -171,6 +174,7 @@
  nm_device_olpc_mesh_get_type@Base 0.9.4.0
  nm_device_olpc_mesh_new@Base 0.9.4.0
  nm_device_set_autoconnect@Base 0.9.5.95
+ nm_device_set_managed@Base 1.1.90
  nm_device_team_error_get_type@Base 0.9.10.0
  nm_device_team_error_quark@Base 0.9.10.0
  nm_device_team_get_carrier@Base 0.9.10.0

=== modified file 'debian/libnm-util2.symbols'
--- debian/libnm-util2.symbols	2015-08-20 09:47:16 +0000
+++ debian/libnm-util2.symbols	2016-04-08 14:51:24 +0000
@@ -1,4 +1,6 @@
 libnm-util.so.2 libnm-util2 #MINVER#
+ _nm_connection_new_from_hash@Base 1.1.93
+ _nm_connection_replace_settings@Base 1.1.93
  nm_connection_add_setting@Base 0.7.0
  nm_connection_clear_secrets@Base 0.7.0
  nm_connection_clear_secrets_with_flags@Base 0.9.1.95
@@ -354,6 +356,7 @@
  nm_setting_ip4_config_get_dhcp_client_id@Base 0.7.0
  nm_setting_ip4_config_get_dhcp_hostname@Base 0.7.0
  nm_setting_ip4_config_get_dhcp_send_hostname@Base 0.7.999
+ nm_setting_ip4_config_get_dhcp_timeout@Base 1.1.90
  nm_setting_ip4_config_get_dns@Base 0.7.0
  nm_setting_ip4_config_get_dns_search@Base 0.7.0
  nm_setting_ip4_config_get_ignore_auto_dns@Base 0.7.0
@@ -561,6 +564,7 @@
  nm_setting_wireless_get_mtu@Base 0.7.0
  nm_setting_wireless_get_num_mac_blacklist_items@Base 0.9.10.0
  nm_setting_wireless_get_num_seen_bssids@Base 0.7.0
+ nm_setting_wireless_get_powersave@Base 1.1.90
  nm_setting_wireless_get_rate@Base 0.7.0
  nm_setting_wireless_get_security@Base 0.7.0
  nm_setting_wireless_get_seen_bssid@Base 0.7.0

=== modified file 'debian/libnm0.symbols'
--- debian/libnm0.symbols	2015-08-20 09:47:16 +0000
+++ debian/libnm0.symbols	2016-04-08 14:51:24 +0000
@@ -1,6 +1,8 @@
 libnm.so.0 libnm0 #MINVER#
  libnm_1_0_0@libnm_1_0_0 1.0.0
  libnm_1_0_4@libnm_1_0_4 1.0.4
+ libnm_1_0_6@libnm_1_0_6 1.0.6
+ libnm_1_2_0@libnm_1_2_0 1.1.90
  nm_802_11_ap_flags_get_type@libnm_1_0_0 1.0.0
  nm_802_11_ap_security_flags_get_type@libnm_1_0_0 1.0.0
  nm_802_11_mode_get_type@libnm_1_0_0 1.0.0
@@ -9,6 +11,8 @@
  nm_access_point_get_bssid@libnm_1_0_0 1.0.0
  nm_access_point_get_flags@libnm_1_0_0 1.0.0
  nm_access_point_get_frequency@libnm_1_0_0 1.0.0
+ nm_access_point_get_last_seen@libnm_1_0_6 1.1.90
+ nm_access_point_get_last_seen@libnm_1_2_0 1.1.90
  nm_access_point_get_max_bitrate@libnm_1_0_0 1.0.0
  nm_access_point_get_mode@libnm_1_0_0 1.0.0
  nm_access_point_get_rsn_flags@libnm_1_0_0 1.0.0
@@ -52,6 +56,7 @@
  nm_client_error_quark@libnm_1_0_0 1.0.0
  nm_client_get_activating_connection@libnm_1_0_0 1.0.0
  nm_client_get_active_connections@libnm_1_0_0 1.0.0
+ nm_client_get_all_devices@libnm_1_2_0 1.1.90
  nm_client_get_connection_by_id@libnm_1_0_0 1.0.0
  nm_client_get_connection_by_path@libnm_1_0_0 1.0.0
  nm_client_get_connection_by_uuid@libnm_1_0_0 1.0.0
@@ -124,6 +129,8 @@
  nm_connection_get_setting_infiniband@libnm_1_0_0 1.0.0
  nm_connection_get_setting_ip4_config@libnm_1_0_0 1.0.0
  nm_connection_get_setting_ip6_config@libnm_1_0_0 1.0.0
+ nm_connection_get_setting_ip_tunnel@libnm_1_2_0 1.1.90
+ nm_connection_get_setting_macvlan@libnm_1_2_0 1.1.90
  nm_connection_get_setting_olpc_mesh@libnm_1_0_0 1.0.0
  nm_connection_get_setting_ppp@libnm_1_0_0 1.0.0
  nm_connection_get_setting_pppoe@libnm_1_0_0 1.0.0
@@ -132,6 +139,7 @@
  nm_connection_get_setting_team_port@libnm_1_0_0 1.0.0
  nm_connection_get_setting_vlan@libnm_1_0_0 1.0.0
  nm_connection_get_setting_vpn@libnm_1_0_0 1.0.0
+ nm_connection_get_setting_vxlan@libnm_1_2_0 1.1.90
  nm_connection_get_setting_wimax@libnm_1_0_0 1.0.0
  nm_connection_get_setting_wired@libnm_1_0_0 1.0.0
  nm_connection_get_setting_wireless@libnm_1_0_0 1.0.0
@@ -151,6 +159,7 @@
  nm_connection_to_dbus@libnm_1_0_0 1.0.0
  nm_connection_update_secrets@libnm_1_0_0 1.0.0
  nm_connection_verify@libnm_1_0_0 1.0.0
+ nm_connection_verify_secrets@libnm_1_2_0 1.1.90
  nm_connectivity_state_get_type@libnm_1_0_0 1.0.0
  nm_crypto_error_get_type@libnm_1_0_0 1.0.0
  nm_crypto_error_quark@libnm_1_0_0 1.0.0
@@ -183,12 +192,16 @@
  nm_device_ethernet_get_carrier@libnm_1_0_0 1.0.0
  nm_device_ethernet_get_hw_address@libnm_1_0_0 1.0.0
  nm_device_ethernet_get_permanent_hw_address@libnm_1_0_0 1.0.0
+ nm_device_ethernet_get_s390_subchannels@libnm_1_2_0 1.1.90
  nm_device_ethernet_get_speed@libnm_1_0_0 1.0.0
  nm_device_ethernet_get_type@libnm_1_0_0 1.0.0
  nm_device_filter_connections@libnm_1_0_0 1.0.0
  nm_device_generic_get_hw_address@libnm_1_0_0 1.0.0
  nm_device_generic_get_type@libnm_1_0_0 1.0.0
  nm_device_get_active_connection@libnm_1_0_0 1.0.0
+ nm_device_get_applied_connection@libnm_1_2_0 1.1.91
+ nm_device_get_applied_connection_async@libnm_1_2_0 1.1.91
+ nm_device_get_applied_connection_finish@libnm_1_2_0 1.1.91
  nm_device_get_autoconnect@libnm_1_0_0 1.0.0
  nm_device_get_available_connections@libnm_1_0_0 1.0.0
  nm_device_get_capabilities@libnm_1_0_0 1.0.0
@@ -205,8 +218,12 @@
  nm_device_get_ip4_config@libnm_1_0_0 1.0.0
  nm_device_get_ip6_config@libnm_1_0_0 1.0.0
  nm_device_get_ip_iface@libnm_1_0_0 1.0.0
+ nm_device_get_lldp_neighbors@libnm_1_2_0 1.1.90
  nm_device_get_managed@libnm_1_0_0 1.0.0
+ nm_device_get_metered@libnm_1_0_6 1.1.90
+ nm_device_get_metered@libnm_1_2_0 1.1.90
  nm_device_get_mtu@libnm_1_0_0 1.0.0
+ nm_device_get_nm_plugin_missing@libnm_1_2_0 1.1.90
  nm_device_get_physical_port_id@libnm_1_0_0 1.0.0
  nm_device_get_product@libnm_1_0_0 1.0.0
  nm_device_get_setting_type@libnm_1_0_0 1.0.0
@@ -219,7 +236,26 @@
  nm_device_infiniband_get_carrier@libnm_1_0_0 1.0.0
  nm_device_infiniband_get_hw_address@libnm_1_0_0 1.0.0
  nm_device_infiniband_get_type@libnm_1_0_0 1.0.0
+ nm_device_ip_tunnel_get_encapsulation_limit@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_flow_label@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_input_key@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_local@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_mode@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_output_key@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_parent@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_path_mtu_discovery@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_remote@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_tos@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_ttl@libnm_1_2_0 1.1.90
+ nm_device_ip_tunnel_get_type@libnm_1_2_0 1.1.90
+ nm_device_is_real@libnm_1_2_0 1.1.90
  nm_device_is_software@libnm_1_0_0 1.0.0
+ nm_device_macvlan_get_hw_address@libnm_1_2_0 1.1.90
+ nm_device_macvlan_get_mode@libnm_1_2_0 1.1.90
+ nm_device_macvlan_get_no_promisc@libnm_1_2_0 1.1.90
+ nm_device_macvlan_get_parent@libnm_1_2_0 1.1.90
+ nm_device_macvlan_get_tap@libnm_1_2_0 1.1.90
+ nm_device_macvlan_get_type@libnm_1_2_0 1.1.90
  nm_device_modem_capabilities_get_type@libnm_1_0_0 1.0.0
  nm_device_modem_get_current_capabilities@libnm_1_0_0 1.0.0
  nm_device_modem_get_modem_capabilities@libnm_1_0_0 1.0.0
@@ -228,19 +264,48 @@
  nm_device_olpc_mesh_get_companion@libnm_1_0_0 1.0.0
  nm_device_olpc_mesh_get_hw_address@libnm_1_0_0 1.0.0
  nm_device_olpc_mesh_get_type@libnm_1_0_0 1.0.0
+ nm_device_reapply@libnm_1_2_0 1.1.90
+ nm_device_reapply_async@libnm_1_2_0 1.1.90
+ nm_device_reapply_finish@libnm_1_2_0 1.1.90
  nm_device_set_autoconnect@libnm_1_0_0 1.0.0
+ nm_device_set_managed@libnm_1_2_0 1.1.90
  nm_device_state_get_type@libnm_1_0_0 1.0.0
  nm_device_state_reason_get_type@libnm_1_0_0 1.0.0
  nm_device_team_get_carrier@libnm_1_0_0 1.0.0
  nm_device_team_get_hw_address@libnm_1_0_0 1.0.0
  nm_device_team_get_slaves@libnm_1_0_0 1.0.0
  nm_device_team_get_type@libnm_1_0_0 1.0.0
+ nm_device_tun_get_group@libnm_1_2_0 1.1.90
+ nm_device_tun_get_hw_address@libnm_1_2_0 1.1.90
+ nm_device_tun_get_mode@libnm_1_2_0 1.1.90
+ nm_device_tun_get_multi_queue@libnm_1_2_0 1.1.90
+ nm_device_tun_get_no_pi@libnm_1_2_0 1.1.90
+ nm_device_tun_get_owner@libnm_1_2_0 1.1.90
+ nm_device_tun_get_type@libnm_1_2_0 1.1.90
+ nm_device_tun_get_vnet_hdr@libnm_1_2_0 1.1.90
  nm_device_type_get_type@libnm_1_0_0 1.0.0
  nm_device_vlan_get_carrier@libnm_1_0_0 1.0.0
  nm_device_vlan_get_hw_address@libnm_1_0_0 1.0.0
  nm_device_vlan_get_parent@libnm_1_0_0 1.0.0
  nm_device_vlan_get_type@libnm_1_0_0 1.0.0
  nm_device_vlan_get_vlan_id@libnm_1_0_0 1.0.0
+ nm_device_vxlan_get_ageing@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_dst_port@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_group@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_hw_address@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_id@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_l2miss@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_l3miss@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_learning@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_limit@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_local@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_parent@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_proxy@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_src_port_max@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_src_port_min@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_tos@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_ttl@libnm_1_2_0 1.1.90
+ nm_device_vxlan_get_type@libnm_1_2_0 1.1.90
  nm_device_wifi_capabilities_get_type@libnm_1_0_0 1.0.0
  nm_device_wifi_get_access_point_by_path@libnm_1_0_0 1.0.0
  nm_device_wifi_get_access_points@libnm_1_0_0 1.0.0
@@ -254,6 +319,10 @@
  nm_device_wifi_request_scan@libnm_1_0_0 1.0.0
  nm_device_wifi_request_scan_async@libnm_1_0_0 1.0.0
  nm_device_wifi_request_scan_finish@libnm_1_0_0 1.0.0
+ nm_device_wifi_request_scan_options@libnm_1_0_6 1.1.90
+ nm_device_wifi_request_scan_options@libnm_1_2_0 1.1.90
+ nm_device_wifi_request_scan_options_async@libnm_1_0_6 1.1.90
+ nm_device_wifi_request_scan_options_async@libnm_1_2_0 1.1.90
  nm_device_wimax_get_active_nsp@libnm_1_0_0 1.0.0
  nm_device_wimax_get_bsid@libnm_1_0_0 1.0.0
  nm_device_wimax_get_center_frequency@libnm_1_0_0 1.0.0
@@ -315,8 +384,19 @@
  nm_ip_route_set_next_hop_binary@libnm_1_0_0 1.0.0
  nm_ip_route_set_prefix@libnm_1_0_0 1.0.0
  nm_ip_route_unref@libnm_1_0_0 1.0.0
+ nm_ip_tunnel_mode_get_type@libnm_1_2_0 1.1.90
+ nm_lldp_neighbor_get_attr_names@libnm_1_2_0 1.1.90
+ nm_lldp_neighbor_get_attr_string_value@libnm_1_2_0 1.1.90
+ nm_lldp_neighbor_get_attr_type@libnm_1_2_0 1.1.90
+ nm_lldp_neighbor_get_attr_uint_value@libnm_1_2_0 1.1.90
+ nm_lldp_neighbor_get_type@libnm_1_2_0 1.1.90
+ nm_lldp_neighbor_new@libnm_1_2_0 1.1.90
+ nm_lldp_neighbor_ref@libnm_1_2_0 1.1.90
+ nm_lldp_neighbor_unref@libnm_1_2_0 1.1.90
  nm_manager_error_get_type@libnm_1_0_0 1.0.0
  nm_manager_error_quark@libnm_1_0_0 1.0.0
+ nm_metered_get_type@libnm_1_0_6 1.1.90
+ nm_metered_get_type@libnm_1_2_0 1.1.90
  nm_object_get_path@libnm_1_0_0 1.0.0
  nm_object_get_type@libnm_1_0_0 1.0.0
  nm_remote_connection_commit_changes@libnm_1_0_0 1.0.0
@@ -352,6 +432,7 @@
  nm_setting_802_1x_add_altsubject_match@libnm_1_0_0 1.0.0
  nm_setting_802_1x_add_eap_method@libnm_1_0_0 1.0.0
  nm_setting_802_1x_add_phase2_altsubject_match@libnm_1_0_0 1.0.0
+ nm_setting_802_1x_check_cert_scheme@libnm_1_2_0 1.1.90
  nm_setting_802_1x_ck_format_get_type@libnm_1_0_0 1.0.0
  nm_setting_802_1x_ck_scheme_get_type@libnm_1_0_0 1.0.0
  nm_setting_802_1x_clear_altsubject_matches@libnm_1_0_0 1.0.0
@@ -366,6 +447,7 @@
  nm_setting_802_1x_get_client_cert_blob@libnm_1_0_0 1.0.0
  nm_setting_802_1x_get_client_cert_path@libnm_1_0_0 1.0.0
  nm_setting_802_1x_get_client_cert_scheme@libnm_1_0_0 1.0.0
+ nm_setting_802_1x_get_domain_suffix_match@libnm_1_2_0 1.1.93
  nm_setting_802_1x_get_eap_method@libnm_1_0_0 1.0.0
  nm_setting_802_1x_get_identity@libnm_1_0_0 1.0.0
  nm_setting_802_1x_get_num_altsubject_matches@libnm_1_0_0 1.0.0
@@ -389,6 +471,7 @@
  nm_setting_802_1x_get_phase2_client_cert_blob@libnm_1_0_0 1.0.0
  nm_setting_802_1x_get_phase2_client_cert_path@libnm_1_0_0 1.0.0
  nm_setting_802_1x_get_phase2_client_cert_scheme@libnm_1_0_0 1.0.0
+ nm_setting_802_1x_get_phase2_domain_suffix_match@libnm_1_2_0 1.1.93
  nm_setting_802_1x_get_phase2_private_key_blob@libnm_1_0_0 1.0.0
  nm_setting_802_1x_get_phase2_private_key_format@libnm_1_0_0 1.0.0
  nm_setting_802_1x_get_phase2_private_key_password@libnm_1_0_0 1.0.0
@@ -448,6 +531,7 @@
  nm_setting_bridge_get_hello_time@libnm_1_0_0 1.0.0
  nm_setting_bridge_get_mac_address@libnm_1_0_0 1.0.0
  nm_setting_bridge_get_max_age@libnm_1_0_0 1.0.0
+ nm_setting_bridge_get_multicast_snooping@libnm_1_2_0 1.1.90
  nm_setting_bridge_get_priority@libnm_1_0_0 1.0.0
  nm_setting_bridge_get_stp@libnm_1_0_0 1.0.0
  nm_setting_bridge_get_type@libnm_1_0_0 1.0.0
@@ -468,14 +552,19 @@
  nm_setting_connection_add_permission@libnm_1_0_0 1.0.0
  nm_setting_connection_add_secondary@libnm_1_0_0 1.0.0
  nm_setting_connection_autoconnect_slaves_get_type@libnm_1_0_4 1.0.4
+ nm_setting_connection_autoconnect_slaves_get_type@libnm_1_2_0 1.1.90
  nm_setting_connection_get_autoconnect@libnm_1_0_0 1.0.0
  nm_setting_connection_get_autoconnect_priority@libnm_1_0_0 1.0.0
  nm_setting_connection_get_autoconnect_slaves@libnm_1_0_4 1.0.4
+ nm_setting_connection_get_autoconnect_slaves@libnm_1_2_0 1.1.90
  nm_setting_connection_get_connection_type@libnm_1_0_0 1.0.0
  nm_setting_connection_get_gateway_ping_timeout@libnm_1_0_0 1.0.0
  nm_setting_connection_get_id@libnm_1_0_0 1.0.0
  nm_setting_connection_get_interface_name@libnm_1_0_0 1.0.0
+ nm_setting_connection_get_lldp@libnm_1_2_0 1.1.90
  nm_setting_connection_get_master@libnm_1_0_0 1.0.0
+ nm_setting_connection_get_metered@libnm_1_0_6 1.1.90
+ nm_setting_connection_get_metered@libnm_1_2_0 1.1.90
  nm_setting_connection_get_num_permissions@libnm_1_0_0 1.0.0
  nm_setting_connection_get_num_secondaries@libnm_1_0_0 1.0.0
  nm_setting_connection_get_permission@libnm_1_0_0 1.0.0
@@ -487,6 +576,7 @@
  nm_setting_connection_get_uuid@libnm_1_0_0 1.0.0
  nm_setting_connection_get_zone@libnm_1_0_0 1.0.0
  nm_setting_connection_is_slave_type@libnm_1_0_0 1.0.0
+ nm_setting_connection_lldp_get_type@libnm_1_2_0 1.1.90
  nm_setting_connection_new@libnm_1_0_0 1.0.0
  nm_setting_connection_permissions_user_allowed@libnm_1_0_0 1.0.0
  nm_setting_connection_remove_permission@libnm_1_0_0 1.0.0
@@ -528,6 +618,7 @@
  nm_setting_get_secret_flags@libnm_1_0_0 1.0.0
  nm_setting_get_type@libnm_1_0_0 1.0.0
  nm_setting_gsm_get_apn@libnm_1_0_0 1.0.0
+ nm_setting_gsm_get_device_id@libnm_1_2_0 1.1.90
  nm_setting_gsm_get_home_only@libnm_1_0_0 1.0.0
  nm_setting_gsm_get_network_id@libnm_1_0_0 1.0.0
  nm_setting_gsm_get_number@libnm_1_0_0 1.0.0
@@ -535,6 +626,8 @@
  nm_setting_gsm_get_password_flags@libnm_1_0_0 1.0.0
  nm_setting_gsm_get_pin@libnm_1_0_0 1.0.0
  nm_setting_gsm_get_pin_flags@libnm_1_0_0 1.0.0
+ nm_setting_gsm_get_sim_id@libnm_1_2_0 1.1.90
+ nm_setting_gsm_get_sim_operator_id@libnm_1_2_0 1.1.90
  nm_setting_gsm_get_type@libnm_1_0_0 1.0.0
  nm_setting_gsm_get_username@libnm_1_0_0 1.0.0
  nm_setting_gsm_new@libnm_1_0_0 1.0.0
@@ -547,24 +640,32 @@
  nm_setting_infiniband_get_virtual_interface_name@libnm_1_0_0 1.0.0
  nm_setting_infiniband_new@libnm_1_0_0 1.0.0
  nm_setting_ip4_config_get_dhcp_client_id@libnm_1_0_0 1.0.0
+ nm_setting_ip4_config_get_dhcp_fqdn@libnm_1_2_0 1.1.90
  nm_setting_ip4_config_get_type@libnm_1_0_0 1.0.0
  nm_setting_ip4_config_new@libnm_1_0_0 1.0.0
+ nm_setting_ip6_config_addr_gen_mode_get_type@libnm_1_2_0 1.1.90
+ nm_setting_ip6_config_get_addr_gen_mode@libnm_1_2_0 1.1.90
  nm_setting_ip6_config_get_ip6_privacy@libnm_1_0_0 1.0.0
  nm_setting_ip6_config_get_type@libnm_1_0_0 1.0.0
  nm_setting_ip6_config_new@libnm_1_0_0 1.0.0
  nm_setting_ip6_config_privacy_get_type@libnm_1_0_0 1.0.0
  nm_setting_ip_config_add_address@libnm_1_0_0 1.0.0
  nm_setting_ip_config_add_dns@libnm_1_0_0 1.0.0
+ nm_setting_ip_config_add_dns_option@libnm_1_2_0 1.1.90
  nm_setting_ip_config_add_dns_search@libnm_1_0_0 1.0.0
  nm_setting_ip_config_add_route@libnm_1_0_0 1.0.0
  nm_setting_ip_config_clear_addresses@libnm_1_0_0 1.0.0
  nm_setting_ip_config_clear_dns@libnm_1_0_0 1.0.0
+ nm_setting_ip_config_clear_dns_options@libnm_1_2_0 1.1.90
  nm_setting_ip_config_clear_dns_searches@libnm_1_0_0 1.0.0
  nm_setting_ip_config_clear_routes@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_address@libnm_1_0_0 1.0.0
+ nm_setting_ip_config_get_dad_timeout@libnm_1_2_0 1.1.91
  nm_setting_ip_config_get_dhcp_hostname@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_dhcp_send_hostname@libnm_1_0_0 1.0.0
+ nm_setting_ip_config_get_dhcp_timeout@libnm_1_2_0 1.1.91
  nm_setting_ip_config_get_dns@libnm_1_0_0 1.0.0
+ nm_setting_ip_config_get_dns_option@libnm_1_2_0 1.1.90
  nm_setting_ip_config_get_dns_search@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_gateway@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_ignore_auto_dns@libnm_1_0_0 1.0.0
@@ -574,20 +675,44 @@
  nm_setting_ip_config_get_never_default@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_num_addresses@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_num_dns@libnm_1_0_0 1.0.0
+ nm_setting_ip_config_get_num_dns_options@libnm_1_2_0 1.1.90
  nm_setting_ip_config_get_num_dns_searches@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_num_routes@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_route@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_route_metric@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_type@libnm_1_0_0 1.0.0
+ nm_setting_ip_config_has_dns_options@libnm_1_2_0 1.1.90
  nm_setting_ip_config_remove_address@libnm_1_0_0 1.0.0
  nm_setting_ip_config_remove_address_by_value@libnm_1_0_0 1.0.0
  nm_setting_ip_config_remove_dns@libnm_1_0_0 1.0.0
  nm_setting_ip_config_remove_dns_by_value@libnm_1_0_0 1.0.0
+ nm_setting_ip_config_remove_dns_option@libnm_1_2_0 1.1.90
+ nm_setting_ip_config_remove_dns_option_by_value@libnm_1_2_0 1.1.93
  nm_setting_ip_config_remove_dns_search@libnm_1_0_0 1.0.0
  nm_setting_ip_config_remove_dns_search_by_value@libnm_1_0_0 1.0.0
  nm_setting_ip_config_remove_route@libnm_1_0_0 1.0.0
  nm_setting_ip_config_remove_route_by_value@libnm_1_0_0 1.0.0
+ nm_setting_ip_tunnel_get_input_key@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_get_local@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_get_mode@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_get_mtu@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_get_output_key@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_get_parent@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_get_path_mtu_discovery@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_get_remote@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_get_tos@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_get_ttl@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_get_type@libnm_1_2_0 1.1.90
+ nm_setting_ip_tunnel_new@libnm_1_2_0 1.1.90
  nm_setting_lookup_type@libnm_1_0_0 1.0.0
+ nm_setting_mac_randomization_get_type@libnm_1_2_0 1.1.90
+ nm_setting_macvlan_get_mode@libnm_1_2_0 1.1.90
+ nm_setting_macvlan_get_parent@libnm_1_2_0 1.1.90
+ nm_setting_macvlan_get_promiscuous@libnm_1_2_0 1.1.90
+ nm_setting_macvlan_get_tap@libnm_1_2_0 1.1.90
+ nm_setting_macvlan_get_type@libnm_1_2_0 1.1.90
+ nm_setting_macvlan_mode_get_type@libnm_1_2_0 1.1.90
+ nm_setting_macvlan_new@libnm_1_2_0 1.1.90
  nm_setting_olpc_mesh_get_channel@libnm_1_0_0 1.0.0
  nm_setting_olpc_mesh_get_dhcp_anycast_address@libnm_1_0_0 1.0.0
  nm_setting_olpc_mesh_get_ssid@libnm_1_0_0 1.0.0
@@ -636,7 +761,17 @@
  nm_setting_team_port_get_type@libnm_1_0_0 1.0.0
  nm_setting_team_port_new@libnm_1_0_0 1.0.0
  nm_setting_to_string@libnm_1_0_0 1.0.0
+ nm_setting_tun_get_group@libnm_1_2_0 1.1.90
+ nm_setting_tun_get_mode@libnm_1_2_0 1.1.90
+ nm_setting_tun_get_multi_queue@libnm_1_2_0 1.1.90
+ nm_setting_tun_get_owner@libnm_1_2_0 1.1.90
+ nm_setting_tun_get_pi@libnm_1_2_0 1.1.90
+ nm_setting_tun_get_type@libnm_1_2_0 1.1.90
+ nm_setting_tun_get_vnet_hdr@libnm_1_2_0 1.1.90
+ nm_setting_tun_mode_get_type@libnm_1_2_0 1.1.90
+ nm_setting_tun_new@libnm_1_2_0 1.1.90
  nm_setting_verify@libnm_1_0_0 1.0.0
+ nm_setting_verify_secrets@libnm_1_2_0 1.1.90
  nm_setting_vlan_add_priority@libnm_1_0_0 1.0.0
  nm_setting_vlan_add_priority_str@libnm_1_0_0 1.0.0
  nm_setting_vlan_clear_priorities@libnm_1_0_0 1.0.0
@@ -659,11 +794,30 @@
  nm_setting_vpn_get_num_secrets@libnm_1_0_0 1.0.0
  nm_setting_vpn_get_secret@libnm_1_0_0 1.0.0
  nm_setting_vpn_get_service_type@libnm_1_0_0 1.0.0
+ nm_setting_vpn_get_timeout@libnm_1_2_0 1.1.90
  nm_setting_vpn_get_type@libnm_1_0_0 1.0.0
  nm_setting_vpn_get_user_name@libnm_1_0_0 1.0.0
  nm_setting_vpn_new@libnm_1_0_0 1.0.0
  nm_setting_vpn_remove_data_item@libnm_1_0_0 1.0.0
  nm_setting_vpn_remove_secret@libnm_1_0_0 1.0.0
+ nm_setting_vxlan_get_ageing@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_destination_port@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_id@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_l2_miss@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_l3_miss@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_learning@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_limit@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_local@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_parent@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_proxy@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_remote@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_rsc@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_source_port_max@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_source_port_min@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_tos@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_ttl@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_get_type@libnm_1_2_0 1.1.90
+ nm_setting_vxlan_new@libnm_1_2_0 1.1.90
  nm_setting_wimax_get_mac_address@libnm_1_0_0 1.0.0
  nm_setting_wimax_get_network_name@libnm_1_0_0 1.0.0
  nm_setting_wimax_get_type@libnm_1_0_0 1.0.0
@@ -688,10 +842,16 @@
  nm_setting_wired_get_speed@libnm_1_0_0 1.0.0
  nm_setting_wired_get_type@libnm_1_0_0 1.0.0
  nm_setting_wired_get_valid_s390_options@libnm_1_0_0 1.0.0
+ nm_setting_wired_get_wake_on_lan@libnm_1_0_6 1.1.90
+ nm_setting_wired_get_wake_on_lan@libnm_1_2_0 1.1.90
+ nm_setting_wired_get_wake_on_lan_password@libnm_1_0_6 1.1.90
+ nm_setting_wired_get_wake_on_lan_password@libnm_1_2_0 1.1.90
  nm_setting_wired_new@libnm_1_0_0 1.0.0
  nm_setting_wired_remove_mac_blacklist_item@libnm_1_0_0 1.0.0
  nm_setting_wired_remove_mac_blacklist_item_by_value@libnm_1_0_0 1.0.0
  nm_setting_wired_remove_s390_option@libnm_1_0_0 1.0.0
+ nm_setting_wired_wake_on_lan_get_type@libnm_1_0_6 1.1.90
+ nm_setting_wired_wake_on_lan_get_type@libnm_1_2_0 1.1.90
  nm_setting_wireless_add_mac_blacklist_item@libnm_1_0_0 1.0.0
  nm_setting_wireless_add_seen_bssid@libnm_1_0_0 1.0.0
  nm_setting_wireless_ap_security_compatible@libnm_1_0_0 1.0.0
@@ -703,17 +863,20 @@
  nm_setting_wireless_get_hidden@libnm_1_0_0 1.0.0
  nm_setting_wireless_get_mac_address@libnm_1_0_0 1.0.0
  nm_setting_wireless_get_mac_address_blacklist@libnm_1_0_0 1.0.0
+ nm_setting_wireless_get_mac_address_randomization@libnm_1_2_0 1.1.90
  nm_setting_wireless_get_mac_blacklist_item@libnm_1_0_0 1.0.0
  nm_setting_wireless_get_mode@libnm_1_0_0 1.0.0
  nm_setting_wireless_get_mtu@libnm_1_0_0 1.0.0
  nm_setting_wireless_get_num_mac_blacklist_items@libnm_1_0_0 1.0.0
  nm_setting_wireless_get_num_seen_bssids@libnm_1_0_0 1.0.0
+ nm_setting_wireless_get_powersave@libnm_1_2_0 1.1.90
  nm_setting_wireless_get_rate@libnm_1_0_0 1.0.0
  nm_setting_wireless_get_seen_bssid@libnm_1_0_0 1.0.0
  nm_setting_wireless_get_ssid@libnm_1_0_0 1.0.0
  nm_setting_wireless_get_tx_power@libnm_1_0_0 1.0.0
  nm_setting_wireless_get_type@libnm_1_0_0 1.0.0
  nm_setting_wireless_new@libnm_1_0_0 1.0.0
+ nm_setting_wireless_powersave_get_type@libnm_1_2_0 1.1.91
  nm_setting_wireless_remove_mac_blacklist_item@libnm_1_0_0 1.0.0
  nm_setting_wireless_remove_mac_blacklist_item_by_value@libnm_1_0_0 1.0.0
  nm_setting_wireless_security_add_group@libnm_1_0_0 1.0.0
@@ -757,7 +920,14 @@
  nm_state_get_type@libnm_1_0_0 1.0.0
  nm_utils_ap_mode_security_valid@libnm_1_0_0 1.0.0
  nm_utils_bin2hexstr@libnm_1_0_0 1.0.0
+ nm_utils_bond_mode_int_to_string@libnm_1_2_0 1.1.90
+ nm_utils_bond_mode_string_to_int@libnm_1_2_0 1.1.90
  nm_utils_check_virtual_device_compatibility@libnm_1_0_0 1.0.0
+ nm_utils_enum_from_str@libnm_1_0_6 1.1.90
+ nm_utils_enum_from_str@libnm_1_2_0 1.1.90
+ nm_utils_enum_get_values@libnm_1_2_0 1.1.90
+ nm_utils_enum_to_str@libnm_1_0_6 1.1.90
+ nm_utils_enum_to_str@libnm_1_2_0 1.1.90
  nm_utils_escape_ssid@libnm_1_0_0 1.0.0
  nm_utils_file_is_certificate@libnm_1_0_0 1.0.0
  nm_utils_file_is_pkcs12@libnm_1_0_0 1.0.0
@@ -798,6 +968,10 @@
  nm_utils_ssid_to_utf8@libnm_1_0_0 1.0.0
  nm_utils_uuid_generate@libnm_1_0_0 1.0.0
  nm_utils_wep_key_valid@libnm_1_0_0 1.0.0
+ nm_utils_wifi_2ghz_freqs@libnm_1_0_6 1.1.90
+ nm_utils_wifi_2ghz_freqs@libnm_1_2_0 1.1.90
+ nm_utils_wifi_5ghz_freqs@libnm_1_0_6 1.1.90
+ nm_utils_wifi_5ghz_freqs@libnm_1_2_0 1.1.90
  nm_utils_wifi_channel_to_freq@libnm_1_0_0 1.0.0
  nm_utils_wifi_find_next_channel@libnm_1_0_0 1.0.0
  nm_utils_wifi_freq_to_channel@libnm_1_0_0 1.0.0
@@ -820,21 +994,51 @@
  nm_vpn_editor_plugin_get_suggested_filename@libnm_1_0_0 1.0.0
  nm_vpn_editor_plugin_get_type@libnm_1_0_0 1.0.0
  nm_vpn_editor_plugin_import@libnm_1_0_0 1.0.0
+ nm_vpn_editor_plugin_load_from_file@libnm_1_2_0 1.1.90
  nm_vpn_editor_update_connection@libnm_1_0_0 1.0.0
  nm_vpn_plugin_error_get_type@libnm_1_0_0 1.0.0
  nm_vpn_plugin_error_quark@libnm_1_0_0 1.0.0
  nm_vpn_plugin_failure_get_type@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_disconnect@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_failure@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_get_connection@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_get_secret_flags@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_get_state@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_get_type@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_read_vpn_details@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_secrets_required@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_set_ip4_config@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_set_login_banner@libnm_1_0_0 1.0.0
- nm_vpn_plugin_old_set_state@libnm_1_0_0 1.0.0
+ nm_vpn_plugin_info_get_editor_plugin@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_get_filename@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_get_name@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_get_plugin@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_get_program@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_get_type@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_list_add@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_list_find_by_filename@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_list_find_by_name@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_list_find_by_service@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_list_load@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_list_remove@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_load_editor_plugin@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_lookup_property@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_new_from_file@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_new_with_data@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_set_editor_plugin@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_info_validate_filename@libnm_1_2_0 1.1.90
+ nm_vpn_plugin_old_disconnect@libnm_1_0_0 1.1.91
+ nm_vpn_plugin_old_failure@libnm_1_0_0 1.1.91
+ nm_vpn_plugin_old_get_connection@libnm_1_0_0 1.1.91
+ nm_vpn_plugin_old_get_secret_flags@libnm_1_0_0 1.1.91
+ nm_vpn_plugin_old_get_state@libnm_1_0_0 1.1.91
+ nm_vpn_plugin_old_get_type@libnm_1_0_0 1.1.91
+ nm_vpn_plugin_old_read_vpn_details@libnm_1_0_0 1.1.91
+ nm_vpn_plugin_old_secrets_required@libnm_1_0_0 1.1.91
+ nm_vpn_plugin_old_set_ip4_config@libnm_1_0_0 1.1.91
+ nm_vpn_plugin_old_set_login_banner@libnm_1_0_0 1.1.91
+ nm_vpn_plugin_old_set_state@libnm_1_0_0 1.1.91
+ nm_vpn_service_plugin_disconnect@libnm_1_2_0 1.1.90
+ nm_vpn_service_plugin_failure@libnm_1_2_0 1.1.90
+ nm_vpn_service_plugin_get_connection@libnm_1_2_0 1.1.90
+ nm_vpn_service_plugin_get_secret_flags@libnm_1_2_0 1.1.90
+ nm_vpn_service_plugin_get_type@libnm_1_2_0 1.1.90
+ nm_vpn_service_plugin_read_vpn_details@libnm_1_2_0 1.1.90
+ nm_vpn_service_plugin_secrets_required@libnm_1_2_0 1.1.90
+ nm_vpn_service_plugin_set_config@libnm_1_2_0 1.1.90
+ nm_vpn_service_plugin_set_ip4_config@libnm_1_2_0 1.1.90
+ nm_vpn_service_plugin_set_ip6_config@libnm_1_2_0 1.1.90
+ nm_vpn_service_plugin_set_login_banner@libnm_1_2_0 1.1.90
  nm_vpn_service_state_get_type@libnm_1_0_0 1.0.0
  nm_wep_key_type_get_type@libnm_1_0_0 1.0.0
  nm_wimax_nsp_connection_valid@libnm_1_0_0 1.0.0

=== modified file 'debian/network-manager-dev.install'
--- debian/network-manager-dev.install	2014-11-05 05:47:49 +0000
+++ debian/network-manager-dev.install	2016-04-08 14:51:24 +0000
@@ -2,4 +2,5 @@
 usr/include/NetworkManager/NetworkManager.h
 usr/include/NetworkManager/NetworkManagerVPN.h
 usr/include/NetworkManager/nm-version.h
+usr/include/NetworkManager/nm-version-macros.h
 usr/share/gtk-doc/html/NetworkManager/

=== modified file 'debian/network-manager.dirs'
--- debian/network-manager.dirs	2014-11-05 05:47:49 +0000
+++ debian/network-manager.dirs	2016-04-08 14:51:24 +0000
@@ -1,5 +1,6 @@
 var/lib/NetworkManager/
 etc/NetworkManager/conf.d/
+etc/NetworkManager/dnsmasq.d/
+etc/NetworkManager/dnsmasq-shared.d/
 etc/NetworkManager/system-connections/
 etc/NetworkManager/VPN/
-etc/NetworkManager/dnsmasq.d/

=== modified file 'debian/network-manager.install'
--- debian/network-manager.install	2015-09-25 20:29:52 +0000
+++ debian/network-manager.install	2016-04-08 14:51:24 +0000
@@ -5,13 +5,13 @@
 usr/lib/NetworkManager/nm-dhcp-helper
 usr/lib/NetworkManager/nm-iface-helper
 usr/lib/NetworkManager/nm-dispatcher
-usr/lib/NetworkManager/nm-avahi-autoipd.action
 usr/lib/*/NetworkManager/libnm-settings-plugin-ifupdown.so
 usr/lib/*/NetworkManager/libnm-settings-plugin-ibft.so
 usr/lib/*/NetworkManager/libnm-settings-plugin-ofono.so
 usr/lib/*/NetworkManager/libnm-device-plugin-*.so
 usr/lib/*/NetworkManager/libnm-wwan.so
 usr/lib/pppd/*/*.so
+usr/share/doc/NetworkManager/examples/
 usr/share/locale/
 usr/share/man/
 usr/share/dbus-1/system-services/
@@ -19,7 +19,6 @@
 usr/share/bash-completion/
 etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
 etc/dbus-1/system.d/nm-dispatcher.conf
-etc/dbus-1/system.d/nm-avahi-autoipd.conf
 etc/NetworkManager/dispatcher.d/
 lib/udev/rules.d/*.rules
 lib/systemd/system/NetworkManager.service

=== modified file 'debian/network-manager.maintscript'
--- debian/network-manager.maintscript	2014-11-05 05:47:49 +0000
+++ debian/network-manager.maintscript	2016-04-08 14:51:24 +0000
@@ -1,4 +1,5 @@
-mv_conffile /etc/dbus-1/system.d/NetworkManager.conf /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 0.9.4.0-1~ network-manager
-rm_conffile /etc/polkit-1/localauthority/10-vendor.d/org.freedesktop.NetworkManager.pkla 0.9.8.8-4~ network-manager
-rm_conffile /etc/polkit-1/rules.d/60-network-manager.rules 0.9.8.8-4~ network-manager
-rm_conffile /etc/dbus-1/system.d/nm-dhcp-client.conf 0.9.10.0-1~ network-manager
+mv_conffile /etc/dbus-1/system.d/NetworkManager.conf /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 0.9.4.0-1~
+rm_conffile /etc/polkit-1/localauthority/10-vendor.d/org.freedesktop.NetworkManager.pkla 0.9.8.8-4~
+rm_conffile /etc/polkit-1/rules.d/60-network-manager.rules 0.9.8.8-4~
+rm_conffile /etc/dbus-1/system.d/nm-dhcp-client.conf 0.9.10.0-1~
+rm_conffile /etc/dbus-1/system.d/nm-avahi-autoipd.conf 1.1.90-2~

=== removed file 'debian/network-manager.upstart'
--- debian/network-manager.upstart	2012-05-22 22:09:44 +0000
+++ debian/network-manager.upstart	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# network-manager - network connection manager
-#
-# The Network Manager daemon manages the system's network connections,
-# automatically switching between the best available.
-
-description	"network connection manager"
-
-start on (local-filesystems
-	  and started dbus
-	  and static-network-up)
-stop on stopping dbus
-
-expect fork
-respawn
-
-script
-	# set $LANG so that messages appearing on the GUI will be translated. See LP: 875017
-	if [ -r /etc/default/locale ]; then
-		. /etc/default/locale
-		export LANG LANGUAGE LC_MESSAGES LC_ALL
-	fi
-
-	exec NetworkManager
-end script

=== removed file 'debian/patches/0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch'
--- debian/patches/0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch	2014-11-05 05:47:49 +0000
+++ debian/patches/0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-From: Michael Biebl <[e-mail]>
-Date: Wed, 2 Apr 2014 03:15:53 +0200
-Subject: Debian specific tweaks for NetworkManager systemd service file
-
-This patch is needed to avoid a dependency loop which is generated
-by early boot (rcS) SysV init scripts depending on the $network LSB
-system facility (either directly or indirectly via $remote_fs).
-
-The $network LSB system facility is mapped to network.target.
-
-Those rcS SysV init scripts are started in sysinit.target,
-NetworkManager.service is started via multi-user.target, which depends
-on sysinit.target.
-
-As long as we have rcS SysV init scripts which such a dependency on
-$remote_fs or $network we can not make NetworkManager.service a provider
-for network.target.
----
- data/NetworkManager.service.in | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
-index 84a9c95..2fb510f 100644
---- a/data/NetworkManager.service.in
-+++ b/data/NetworkManager.service.in
-@@ -1,7 +1,5 @@
- [Unit]
- Description=Network Manager
--Wants=network.target
--Before=network.target @DISTRO_NETWORK_SERVICE@
- 
- [Service]
- Type=dbus

=== modified file 'debian/patches/0001-dns-use-DBus-to-make-dnsmasq-nameserver-changes.patch'
--- debian/patches/0001-dns-use-DBus-to-make-dnsmasq-nameserver-changes.patch	2015-08-20 01:07:00 +0000
+++ debian/patches/0001-dns-use-DBus-to-make-dnsmasq-nameserver-changes.patch	2016-04-08 14:51:24 +0000
@@ -8,488 +8,522 @@
 
 Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
 ---
- src/dns-manager/nm-dns-dnsmasq.c        |  310 ++++++++++++++++++++++----------
- src/dns-manager/nm-dns-manager.c        |   22 ++
- src/dns-manager/nm-dns-plugin.c         |   16 +
+ src/dns-manager/nm-dns-dnsmasq.c        |  344 +++++++++++++++++++++++---------
+ src/dns-manager/nm-dns-manager.c        |   19 +
+ src/dns-manager/nm-dns-plugin.c         |   18 +
  src/dns-manager/nm-dns-plugin.h         |    1 
- src/org.freedesktop.NetworkManager.conf |   10 +
- 5 files changed, 271 insertions(+), 88 deletions(-)
+ src/org.freedesktop.NetworkManager.conf |   10 
+ 5 files changed, 304 insertions(+), 88 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
-@@ -27,6 +27,10 @@
- #include <arpa/inet.h>
- #include <sys/stat.h>
- 
-+#include <dbus/dbus.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- 
-@@ -37,6 +41,7 @@
+@@ -32,6 +32,7 @@
+ #include "nm-ip4-config.h"
  #include "nm-ip6-config.h"
  #include "nm-dns-utils.h"
++#include "nm-bus-manager.h"
  #include "NetworkManagerUtils.h"
-+#include "nm-dbus-manager.h"
  
  G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsmasq, NM_TYPE_DNS_PLUGIN)
+@@ -39,11 +40,17 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
+ #define NM_DNS_DNSMASQ_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasqPrivate))
  
-@@ -46,14 +51,19 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
- #define CONFFILE NMRUNDIR "/dnsmasq.conf"
+ #define PIDFILE NMRUNDIR "/dnsmasq.pid"
+-#define CONFFILE NMRUNDIR "/dnsmasq.conf"
  #define CONFDIR NMCONFDIR "/dnsmasq.d"
  
 +#define DNSMASQ_DBUS_SERVICE "org.freedesktop.NetworkManager.dnsmasq"
 +#define DNSMASQ_DBUS_PATH "/uk/org/thekelleys/dnsmasq"
-+#define DNSMASQ_DBUS_INTERFACE "uk.org.thekelleys.dnsmasq"
 +
  typedef struct {
 -	guint32 foo;
-+	NMDBusManager *dbus_mgr;
-+	guint name_owner_id;
++	GDBusProxy *dnsmasq;
++	GCancellable *dnsmasq_cancellable;
++	gboolean running;
++
++	GVariant *set_servers_ex_args;
  } NMDnsDnsmasqPrivate;
  
- /*******************************************/
- 
+ /*****************************************************************************/
+@@ -61,8 +68,28 @@ typedef struct {
+ 
+ /*****************************************************************************/
+ 
++static void
++add_dnsmasq_nameserver (NMDnsDnsmasq *self,
++                        GVariantBuilder *servers,
++                        const char *ip,
++                        const char *domain)
++{
++	g_return_if_fail (ip);
++
++	_LOGD ("adding nameserver '%s' for domain '%s'",
++	       ip, domain);
++
++	g_variant_builder_open (servers, G_VARIANT_TYPE ("as"));
++
++	g_variant_builder_add (servers, "s", ip);
++	if (domain)
++		g_variant_builder_add (servers, "s", domain);
++
++	g_variant_builder_close (servers);
++}
++
  static gboolean
 -add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split)
-+add_ip4_config (DBusMessage *message, NMIP4Config *ip4, gboolean split)
++add_ip4_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP4Config *ip4, gboolean split)
  {
  	char buf[INET_ADDRSTRLEN];
  	in_addr_t addr;
-@@ -69,15 +79,18 @@ add_ip4_config (GString *str, NMIP4Confi
- 			return FALSE;
- 
- 		for (i_nameserver = 0; i_nameserver < nnameservers; i_nameserver++) {
--			addr = nm_ip4_config_get_nameserver (ip4, i_nameserver);
--			nm_utils_inet4_ntop (addr, buf);
-+			addr = g_htonl(nm_ip4_config_get_nameserver (ip4, i_nameserver));
-+			dbus_message_append_args (message,
-+			                          DBUS_TYPE_UINT32, &addr,
-+			                          DBUS_TYPE_INVALID);
- 
+@@ -84,9 +111,10 @@ add_ip4_config (GString *str, NMIP4Confi
  			/* searches are preferred over domains */
  			n = nm_ip4_config_get_num_searches (ip4);
  			for (i = 0; i < n; i++) {
 -				g_string_append_printf (str, "server=/%s/%s\n",
 -				                        nm_ip4_config_get_search (ip4, i),
 -				                        buf);
-+				char *search = nm_ip4_config_get_search (ip4, i);
-+				dbus_message_append_args (message,
-+				                          DBUS_TYPE_STRING, &search,
-+				                          DBUS_TYPE_INVALID);
++				add_dnsmasq_nameserver (self,
++				                        servers,
++				                        buf,
++				                        nm_ip4_config_get_search (ip4, i));
  				added = TRUE;
  			}
  
-@@ -85,9 +98,10 @@ add_ip4_config (GString *str, NMIP4Confi
+@@ -94,9 +122,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++) {
 -					g_string_append_printf (str, "server=/%s/%s\n",
 -					                        nm_ip4_config_get_domain (ip4, i),
 -					                        buf);
-+					char *domain = nm_ip4_config_get_domain (ip4, i);
-+					dbus_message_append_args (message,
-+					                          DBUS_TYPE_STRING, &domain,
-+					                          DBUS_TYPE_INVALID);
++					add_dnsmasq_nameserver (self,
++					                        servers,
++					                        buf,
++					                        nm_ip4_config_get_domain (ip4, i));
  					added = TRUE;
  				}
  			}
-@@ -98,7 +112,9 @@ add_ip4_config (GString *str, NMIP4Confi
+@@ -107,7 +136,7 @@ add_ip4_config (GString *str, NMIP4Confi
  			domains = nm_dns_utils_get_ip4_rdns_domains (ip4);
  			if (domains) {
  				for (iter = domains; iter && *iter; iter++)
 -					g_string_append_printf (str, "server=/%s/%s\n", *iter, buf);
-+					dbus_message_append_args (message,
-+					                          DBUS_TYPE_STRING, &(*iter),
-+					                          DBUS_TYPE_INVALID);
++					add_dnsmasq_nameserver (self, servers, buf, *iter);
  				g_strfreev (domains);
  				added = TRUE;
  			}
-@@ -108,41 +124,20 @@ add_ip4_config (GString *str, NMIP4Confi
- 	/* If no searches or domains, just add the namservers */
+@@ -118,7 +147,8 @@ add_ip4_config (GString *str, NMIP4Confi
  	if (!added) {
  		for (i = 0; i < nnameservers; i++) {
--			addr = nm_ip4_config_get_nameserver (ip4, i);
+ 			addr = nm_ip4_config_get_nameserver (ip4, i);
 -			g_string_append_printf (str, "server=%s\n", nm_utils_inet4_ntop (addr, NULL));
-+			addr = g_htonl (nm_ip4_config_get_nameserver (ip4, i));
-+			dbus_message_append_args (message,
-+			                          DBUS_TYPE_UINT32, &addr,
-+			                          DBUS_TYPE_INVALID);
- 		}
- 	}
- 
- 	return TRUE;
- }
- 
--static char *
--ip6_addr_to_string (const struct in6_addr *addr, const char *iface)
--{
--	char *buf;
--
--	if (IN6_IS_ADDR_V4MAPPED (addr)) {
--		/* inet_ntop is probably supposed to do this for us, but it doesn't */
--		buf = g_malloc (INET_ADDRSTRLEN);
--		nm_utils_inet4_ntop (addr->s6_addr32[3], buf);
--	} else if (!iface || !iface[0] || !IN6_IS_ADDR_LINKLOCAL (addr)) {
--		buf = g_malloc (INET6_ADDRSTRLEN);
--		nm_utils_inet6_ntop (addr, buf);
--	} else {
--		/* If we got a scope identifier, we need use '%' instead of
--		 * '@', since dnsmasq supports '%' in server= addresses
--		 * only since version 2.58 and up
--		 */
--		buf = g_strconcat (nm_utils_inet6_ntop (addr, NULL), "@", iface, NULL);
--	}
--	return buf;
--}
--
++			add_dnsmasq_nameserver (self, servers,
++			                        nm_utils_inet4_ntop (addr, NULL), NULL);
+ 		}
+ 	}
+ 
+@@ -148,7 +178,7 @@ ip6_addr_to_string (const struct in6_add
+ }
+ 
+ static void
+-add_global_config (GString *str, const NMGlobalDnsConfig *config)
++add_global_config (NMDnsDnsmasq *self, GVariantBuilder *dnsmasq_servers, const NMGlobalDnsConfig *config)
+ {
+ 	guint i, j;
+ 
+@@ -163,16 +193,16 @@ add_global_config (GString *str, const N
+ 
+ 		for (j = 0; servers && servers[j]; j++) {
+ 			if (!strcmp (name, "*"))
+-				g_string_append_printf (str, "server=%s\n", servers[j]);
++				add_dnsmasq_nameserver (self, dnsmasq_servers, servers[j], NULL);
+ 			else
+-				g_string_append_printf (str, "server=/%s/%s\n", name, servers[j]);
++				add_dnsmasq_nameserver (self, dnsmasq_servers, servers[j], name);
+ 		}
+ 
+ 	}
+ }
+ 
  static gboolean
 -add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
-+add_ip6_config (DBusMessage *message, NMIP6Config *ip6, gboolean split)
++add_ip6_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP6Config *ip6, gboolean split)
  {
  	const struct in6_addr *addr;
--	char *buf = NULL;
- 	int nnameservers, i_nameserver, n, i;
- 	gboolean added = FALSE;
- 	const char *iface;
-@@ -158,14 +153,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);
--			buf = ip6_addr_to_string (addr, iface);
-+			dbus_message_append_args (message,
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[0],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[1],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[2],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[3],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[4],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[5],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[6],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[7],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[8],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[9],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[10],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[11],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[12],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[13],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[14],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[15],
-+			                          DBUS_TYPE_INVALID);
- 
+ 	char *buf = NULL;
+@@ -196,9 +226,10 @@ add_ip6_config (GString *str, NMIP6Confi
  			/* searches are preferred over domains */
  			n = nm_ip6_config_get_num_searches (ip6);
  			for (i = 0; i < n; i++) {
 -				g_string_append_printf (str, "server=/%s/%s\n",
 -				                        nm_ip6_config_get_search (ip6, i),
 -				                        buf);
-+				char *search = nm_ip6_config_get_search (ip6, i);
-+				dbus_message_append_args (message,
-+				                          DBUS_TYPE_STRING, &search,
-+				                          DBUS_TYPE_INVALID);
++				add_dnsmasq_nameserver (self,
++				                        servers,
++				                        buf,
++				                        nm_ip6_config_get_search (ip6, i));
  				added = TRUE;
  			}
  
-@@ -173,14 +186,13 @@ add_ip6_config (GString *str, NMIP6Confi
+@@ -206,9 +237,10 @@ 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++) {
 -					g_string_append_printf (str, "server=/%s/%s\n",
 -					                        nm_ip6_config_get_domain (ip6, i),
 -					                        buf);
-+					char *domain = nm_ip6_config_get_domain (ip6, i);
-+					dbus_message_append_args (message,
-+					                          DBUS_TYPE_STRING, &domain,
-+					                          DBUS_TYPE_INVALID);
++					add_dnsmasq_nameserver (self,
++					                        servers,
++					                        buf,
++					                        nm_ip6_config_get_domain (ip6, i));
  					added = TRUE;
  				}
  			}
--
--			g_free (buf);
- 		}
- 	}
- 
-@@ -188,11 +200,24 @@ add_ip6_config (GString *str, NMIP6Confi
- 	if (!added) {
- 		for (i = 0; i < nnameservers; i++) {
+@@ -223,7 +255,7 @@ add_ip6_config (GString *str, NMIP6Confi
  			addr = nm_ip6_config_get_nameserver (ip6, i);
--			buf = ip6_addr_to_string (addr, iface);
--			if (buf) {
+ 			buf = ip6_addr_to_string (addr, iface);
+ 			if (buf) {
 -				g_string_append_printf (str, "server=%s\n", buf);
--				g_free (buf);
--			}
-+			dbus_message_append_args (message,
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[0],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[1],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[2],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[3],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[4],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[5],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[6],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[7],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[8],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[9],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[10],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[11],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[12],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[13],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[14],
-+			                          DBUS_TYPE_BYTE, &addr->s6_addr[15],
-+			                          DBUS_TYPE_INVALID);
++				add_dnsmasq_nameserver (self, servers, buf, NULL);
+ 				g_free (buf);
+ 			}
  		}
- 	}
- 
-@@ -200,28 +225,26 @@ add_ip6_config (GString *str, NMIP6Confi
+@@ -232,6 +264,176 @@ add_ip6_config (GString *str, NMIP6Confi
+ 	return TRUE;
  }
  
- static gboolean
--update (NMDnsPlugin *plugin,
--        const GSList *vpn_configs,
--        const GSList *dev_configs,
--        const GSList *other_configs,
--        const char *hostname)
++static void
++dnsmasq_update_done (GObject *source, GAsyncResult *res, gpointer user_data)
++{
++	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (user_data);
++	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
++	gs_free_error GError *error = NULL;
++	gs_unref_variant GVariant *response;
++
++	response = g_dbus_proxy_call_finish (priv->dnsmasq, res, &error);
++	if (!response)
++		_LOGW ("dnsmasq update failed: %s", error->message);
++}
++
++static gboolean
++send_dnsmasq_update (NMDnsDnsmasq *self)
++{
++	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
++
++	g_return_val_if_fail (priv->set_servers_ex_args, FALSE);
++
++	if (priv->running) {
++		_LOGD ("trying to update dnsmasq nameservers");
++
++		g_dbus_proxy_call (priv->dnsmasq,
++		                   "SetServersEx",
++		                   priv->set_servers_ex_args,
++		                   G_DBUS_CALL_FLAGS_NONE,
++		                   -1,
++		                   NULL,
++		                   (GAsyncReadyCallback) dnsmasq_update_done,
++		                   self);
++		g_clear_pointer (&priv->set_servers_ex_args, g_variant_unref);
++	} else
++		_LOGW ("dnsmasq not found on the bus. The nameserver update will be sent when dnsmasq appears");
++
++	return TRUE;
++}
++
++static void
++name_owner_changed (GObject    *object,
++                    GParamSpec *pspec,
++                    gpointer    user_data)
++{
++	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (user_data);
++	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
++	gs_free char *owner = NULL;
++
++	owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (object));
++	if (owner) {
++		_LOGI ("dnsmasq appeared as %s", owner);
++		priv->running = TRUE;
++		g_signal_emit_by_name (self, NM_DNS_PLUGIN_APPEARED);
++	} else {
++		_LOGI ("dnsmasq disappeared");
++		priv->running = FALSE;
++		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
++	}
++}
++
++static void
++dnsmasq_proxy_cb (GObject *source, GAsyncResult *res, gpointer user_data)
++{
++	NMDnsDnsmasq *self;
++	NMDnsDnsmasqPrivate *priv;
++	gs_free_error GError *error = NULL;
++	gs_free char *owner = NULL;
++	GDBusProxy *proxy;
++
++	proxy = g_dbus_proxy_new_finish (res, &error);
++	if (   !proxy
++	    && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
++		return;
++
++	self = NM_DNS_DNSMASQ (user_data);
++
++	if (!proxy) {
++		_LOGW ("failed to connect to dnsmasq via DBus: %s", error->message);
++		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
++		return;
++	}
++
++	priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
++
++	priv->dnsmasq = proxy;
++	nm_clear_g_cancellable (&priv->dnsmasq_cancellable);
++
++	_LOGD ("dnsmasq proxy creation successful");
++
++	g_signal_connect (priv->dnsmasq, "notify::g-name-owner",
++			  G_CALLBACK (name_owner_changed), self);
++	owner = g_dbus_proxy_get_name_owner (priv->dnsmasq);
++	priv->running = (owner != NULL);
++
++	if (priv->running && priv->set_servers_ex_args)
++		send_dnsmasq_update (self);
++}
++
++static gboolean
 +start_dnsmasq (NMDnsDnsmasq *self)
++{
++	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
++ 	const char *dm_binary;
++ 	const char *argv[15];
++ 	GPid pid = 0;
++ 	guint idx = 0;
++
++	/* dnsmasq is probably already started; if it's the case, don't do
++	 * anything more.
++	 */
++	if (priv->running) {
++		_LOGD ("dnsmasq is already running");
++		return TRUE;
++	}
++
++	/* Start dnsmasq */
++
++ 	dm_binary = nm_utils_find_helper ("dnsmasq", DNSMASQ_PATH, NULL);
++ 	if (!dm_binary) {
++		_LOGW ("could not find dnsmasq binary");
++ 		return FALSE;
++ 	}
++
++	argv[idx++] = dm_binary;
++	argv[idx++] = "--no-resolv";  /* Use only commandline */
++	argv[idx++] = "--keep-in-foreground";
++	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
++	argv[idx++] = "--bind-interfaces";
++	argv[idx++] = "--pid-file=" PIDFILE;
++	argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
++	argv[idx++] = "--cache-size=400";
++	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
++	argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;
++
++	/* dnsmasq exits if the conf dir is not present */
++	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
++		argv[idx++] = "--conf-dir=" CONFDIR;
++
++	argv[idx++] = NULL;
++	nm_assert (idx <= G_N_ELEMENTS (argv));
++
++	/* And finally spawn dnsmasq */
++	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq");
++	if (!pid)
++		return FALSE;
++
++	if (!priv->dnsmasq && !priv->dnsmasq_cancellable) {
++		NMBusManager *dbus_mgr;
++		GDBusConnection *connection;
++
++		dbus_mgr = nm_bus_manager_get ();
++		g_return_val_if_fail (dbus_mgr, FALSE);
++
++		connection = nm_bus_manager_get_connection (dbus_mgr);
++		g_return_val_if_fail (connection, FALSE);
++
++		priv->dnsmasq_cancellable = g_cancellable_new ();
++		g_dbus_proxy_new (connection,
++		                  G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
++		                  NULL,
++		                  DNSMASQ_DBUS_SERVICE,
++		                  DNSMASQ_DBUS_PATH,
++		                  DNSMASQ_DBUS_SERVICE,
++		                  priv->dnsmasq_cancellable,
++		                  dnsmasq_proxy_cb,
++		                  self);
++	}
++
++	return TRUE;
++}
++
+ static gboolean
+ update (NMDnsPlugin *plugin,
+         const GSList *vpn_configs,
+@@ -241,96 +443,59 @@ update (NMDnsPlugin *plugin,
+         const char *hostname)
  {
--	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
-+	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
- 	const char *dm_binary;
+ 	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
+-	const char *dm_binary;
 -	GString *conf;
--	GSList *iter;
- 	const char *argv[15];
- 	GError *error = NULL;
- 	int ignored;
- 	GPid pid = 0;
- 	guint idx = 0;
-+	char *dnsmasq_owner;
-+	GString *conf;
- 
++	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
+ 	GSList *iter;
+-	const char *argv[15];
+-	GError *error = NULL;
+-	int ignored;
+-	GPid pid = 0;
+-	guint idx = 0;
+-
 -	/* 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
 -	 * here when restarting dnsmasq when DNS requests could go to the upstream
 -	 * servers instead of to dnsmasq.
-+	/* dnsmasq is probably already started; if it's the case, don't do
-+	 * anything more.
- 	 */
+-	 */
 -	nm_dns_plugin_child_kill (plugin);
-+	dnsmasq_owner = nm_dbus_manager_get_name_owner (priv->dbus_mgr, DNSMASQ_DBUS_SERVICE, NULL);
-+	if (dnsmasq_owner != NULL)
-+		return TRUE;
-+
-+	/* Start dnsmasq */
- 
- 	dm_binary = nm_utils_find_helper ("dnsmasq", DNSMASQ_PATH, NULL);
- 	if (!dm_binary) {
-@@ -232,30 +255,6 @@ update (NMDnsPlugin *plugin,
- 	/* Build up the new dnsmasq config file */
- 	conf = g_string_sized_new (150);
- 
--	/* Use split DNS for VPN configs */
--	for (iter = (GSList *) vpn_configs; iter; iter = g_slist_next (iter)) {
--		if (NM_IS_IP4_CONFIG (iter->data))
--			add_ip4_config (conf, NM_IP4_CONFIG (iter->data), TRUE);
--		else if (NM_IS_IP6_CONFIG (iter->data))
--			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), TRUE);
--	}
--
--	/* Now add interface configs without split DNS */
--	for (iter = (GSList *) dev_configs; iter; iter = g_slist_next (iter)) {
--		if (NM_IS_IP4_CONFIG (iter->data))
--			add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
--		else if (NM_IS_IP6_CONFIG (iter->data))
--			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE);
--	}
--
--	/* And any other random configs */
--	for (iter = (GSList *) other_configs; iter; iter = g_slist_next (iter)) {
--		if (NM_IS_IP4_CONFIG (iter->data))
--			add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
--		else if (NM_IS_IP6_CONFIG (iter->data))
--			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE);
--	}
--
- 	/* Write out the config file */
- 	if (!g_file_set_contents (CONFFILE, conf->str, -1, &error)) {
- 		nm_log_warn (LOGD_DNS, "Failed to write dnsmasq config file %s: (%d) %s",
-@@ -280,6 +279,7 @@ update (NMDnsPlugin *plugin,
- 	argv[idx++] = "--conf-file=" CONFFILE;
- 	argv[idx++] = "--cache-size=400";
- 	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
-+	argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;
- 
- 	/* dnsmasq exits if the conf dir is not present */
- 	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
-@@ -296,8 +296,124 @@ out:
- 	return pid ? TRUE : FALSE;
- }
- 
-+static gboolean
-+update (NMDnsPlugin *plugin,
-+        const GSList *vpn_configs,
-+        const GSList *dev_configs,
-+        const GSList *other_configs,
-+        const char *hostname)
-+{
-+	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
-+	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-+	DBusConnection *connection;
-+	DBusMessage *message;
-+	GSList *iter;
-+	GError *error = NULL;
-+	gboolean have_dnsmasq = FALSE;
 +	gboolean ret = FALSE;
-+	dbus_bool_t result;
-+
-+	have_dnsmasq = start_dnsmasq (self);
-+	if (!have_dnsmasq)
-+		goto out;
-+
-+	connection = nm_dbus_manager_get_dbus_connection (priv->dbus_mgr);
-+	if (!connection) {
-+		nm_log_warn (LOGD_DNS, "Could not get the system bus to speak to dnsmasq.");
-+		goto out;
-+	}
-+
-+	message = dbus_message_new_method_call (DNSMASQ_DBUS_SERVICE, DNSMASQ_DBUS_PATH,
-+	                                        DNSMASQ_DBUS_INTERFACE, "SetServers");
-+
-+	/* Use split DNS for VPN configs */
-+	for (iter = (GSList *) vpn_configs; iter; iter = g_slist_next (iter)) {
-+		if (NM_IS_IP4_CONFIG (iter->data))
-+			add_ip4_config (message, NM_IP4_CONFIG (iter->data), TRUE);
-+		else if (NM_IS_IP6_CONFIG (iter->data))
-+			add_ip6_config (message, NM_IP6_CONFIG (iter->data), TRUE);
-+	}
-+
-+	/* Now add interface configs without split DNS */
-+	for (iter = (GSList *) dev_configs; iter; iter = g_slist_next (iter)) {
-+		if (NM_IS_IP4_CONFIG (iter->data))
-+			add_ip4_config (message, NM_IP4_CONFIG (iter->data), FALSE);
-+		else if (NM_IS_IP6_CONFIG (iter->data))
-+			add_ip6_config (message, NM_IP6_CONFIG (iter->data), FALSE);
-+	}
-+
-+	/* And any other random configs */
-+	for (iter = (GSList *) other_configs; iter; iter = g_slist_next (iter)) {
-+		if (NM_IS_IP4_CONFIG (iter->data))
-+			add_ip4_config (message, NM_IP4_CONFIG (iter->data), FALSE);
-+		else if (NM_IS_IP6_CONFIG (iter->data))
-+			add_ip6_config (message, NM_IP6_CONFIG (iter->data), FALSE);
-+	}
-+
-+	if (!nm_dbus_manager_get_name_owner (priv->dbus_mgr, DNSMASQ_DBUS_SERVICE, &error)) {
-+		nm_log_warn (LOGD_DNS, "dnsmasq not available on the bus, can't update servers.");
-+		if (error)
-+			nm_log_err (LOGD_DNS, "dnsmasq owner not found on bus: %s", error->message);
-+		goto out;
-+	}
-+
-+	dbus_message_set_no_reply (message, TRUE);
-+
-+	result = dbus_connection_send (connection, message, NULL);
-+	if (!result) {
-+		nm_log_err (LOGD_DNS, "Could not send dnsmasq SetServers method.");
-+		goto out;
-+	}
-+
-+	ret = TRUE;
-+
++	GVariantBuilder servers;
+ 
+-	dm_binary = nm_utils_find_helper ("dnsmasq", DNSMASQ_PATH, NULL);
+-	if (!dm_binary) {
+-		_LOGW ("could not find dnsmasq binary");
+-		return FALSE;
+-	}
++	if (!priv->running)
++		start_dnsmasq (self);
+ 
+-	/* Build up the new dnsmasq config file */
+-	conf = g_string_sized_new (150);
++	g_variant_builder_init (&servers, G_VARIANT_TYPE ("aas"));
+ 
++	/* Build up the new dnsmasq config file */
+ 	if (global_config)
+-		add_global_config (conf, global_config);
++		add_global_config (self, &servers, global_config);
+ 	else {
+ 		/* Use split DNS for VPN configs */
+ 		for (iter = (GSList *) vpn_configs; iter; iter = g_slist_next (iter)) {
+ 			if (NM_IS_IP4_CONFIG (iter->data))
+-				add_ip4_config (conf, NM_IP4_CONFIG (iter->data), TRUE);
++				add_ip4_config (self, &servers, iter->data, TRUE);
+ 			else if (NM_IS_IP6_CONFIG (iter->data))
+-				add_ip6_config (conf, NM_IP6_CONFIG (iter->data), TRUE);
++				add_ip6_config (self, &servers, iter->data, TRUE);
+ 		}
+ 
+ 		/* Now add interface configs without split DNS */
+ 		for (iter = (GSList *) dev_configs; iter; iter = g_slist_next (iter)) {
+ 			if (NM_IS_IP4_CONFIG (iter->data))
+-				add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
++				add_ip4_config (self, &servers, iter->data, FALSE);
+ 			else if (NM_IS_IP6_CONFIG (iter->data))
+-				add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE);
++				add_ip6_config (self, &servers, iter->data, FALSE);
+ 		}
+ 
+ 		/* And any other random configs */
+ 		for (iter = (GSList *) other_configs; iter; iter = g_slist_next (iter)) {
+ 			if (NM_IS_IP4_CONFIG (iter->data))
+-				add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
++				add_ip4_config (self, &servers, iter->data, FALSE);
+ 			else if (NM_IS_IP6_CONFIG (iter->data))
+-				add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE);
++				add_ip6_config (self, &servers, iter->data, FALSE);
+ 		}
+ 	}
++	g_clear_pointer (&priv->set_servers_ex_args, g_variant_unref);
++	priv->set_servers_ex_args = g_variant_ref_sink (g_variant_new ("(aas)", &servers));
+ 
+-	/* Write out the config file */
+-	if (!g_file_set_contents (CONFFILE, conf->str, -1, &error)) {
+-		_LOGW ("failed to write dnsmasq config file %s: %s",
+-		       CONFFILE,
+-		       error->message);
+-		g_clear_error (&error);
+-		goto out;
+-	}
+-	ignored = chmod (CONFFILE, 0644);
+-
+-	_LOGD ("dnsmasq local caching DNS configuration:");
+-	_LOGD ("%s", conf->str);
+-
+-	argv[idx++] = dm_binary;
+-	argv[idx++] = "--no-resolv";  /* Use only commandline */
+-	argv[idx++] = "--keep-in-foreground";
+-	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
+-	argv[idx++] = "--bind-interfaces";
+-	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;
+-	argv[idx++] = "--cache-size=400";
+-	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
+-
+-	/* dnsmasq exits if the conf dir is not present */
+-	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
+-		argv[idx++] = "--conf-dir=" CONFDIR;
+-
+-	argv[idx++] = NULL;
+-	g_warn_if_fail (idx <= G_N_ELEMENTS (argv));
++	ret = send_dnsmasq_update (self);
+ 
+-	/* And finally spawn dnsmasq */
+-	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq");
 +	/* 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
 +	 * that we don't write 127.0.0.1 to resolv.conf.
 +	 */
-+	if (((vpn_configs && g_slist_length (vpn_configs) < 1) || !vpn_configs) &&
-+	    ((dev_configs && g_slist_length (dev_configs) < 1) || !dev_configs) &&
-+	    ((other_configs && g_slist_length (other_configs) < 1) || !other_configs))
++	if (((vpn_configs && g_slist_length ((GSList *) vpn_configs) < 1) || !vpn_configs) &&
++	    ((dev_configs && g_slist_length ((GSList *) dev_configs) < 1) || !dev_configs) &&
++	    ((other_configs && g_slist_length ((GSList *) other_configs) < 1) || !other_configs))
 +		ret = FALSE;
-+
-+out:
-+	if (message)
-+		dbus_message_unref (message);
-+
+ 
+-out:
+-	g_string_free (conf, TRUE);
+-	return pid ? TRUE : FALSE;
 +	return ret;
-+}
-+
+ }
+ 
  /****************************************************************/
- 
-+static void
-+name_owner_changed_cb (NMDBusManager *dbus_mgr,
-+                       const char *name,
-+                       const char *old_owner,
-+                       const char *new_owner,
-+                       gpointer user_data)
-+{
-+	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (user_data);
-+	gboolean old_owner_good = (old_owner && strlen (old_owner));
-+	gboolean new_owner_good = (new_owner && strlen (new_owner));
-+
-+	/* Can't handle the signal if its not from dnsmasq */
-+	if (strcmp (DNSMASQ_DBUS_SERVICE, name))
-+		return;
-+
-+	if (!old_owner_good && new_owner_good) {
-+		nm_log_warn (LOGD_DNS, "dnsmasq appeared on DBus: %s",
-+		             new_owner);
-+		g_signal_emit_by_name (self, NM_DNS_PLUGIN_APPEARED);
-+	} else if (old_owner_good && new_owner_good) {
-+		nm_log_dbg (LOGD_DNS, "DBus name owner for dnsmasq changed: %s -> %s",
-+		             old_owner, new_owner);
-+		g_signal_emit_by_name (self, NM_DNS_PLUGIN_APPEARED);
-+	} else {
-+		nm_log_warn (LOGD_DNS, "dnsmasq disappeared from the bus.");
-+		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
-+	}
-+}
-+
- static const char *
- dm_exit_code_to_msg (int status)
- {
-@@ -369,13 +485,31 @@ nm_dns_dnsmasq_new (void)
- static void
- nm_dns_dnsmasq_init (NMDnsDnsmasq *self)
- {
-+	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-+
-+	priv->dbus_mgr = nm_dbus_manager_get ();
-+
-+	g_assert (priv->dbus_mgr);
-+
-+	priv->name_owner_id = g_signal_connect (priv->dbus_mgr,
-+	                                        NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
-+	                                        G_CALLBACK (name_owner_changed_cb),
-+	                                        self);
- }
- 
+@@ -374,7 +539,6 @@ child_quit (NMDnsPlugin *plugin, gint st
+ 		_LOGW ("dnsmasq died with signal %d", WTERMSIG (status));
+ 	else
+ 		_LOGW ("dnsmasq died from an unknown cause");
+-	unlink (CONFFILE);
+ 
+ 	if (failed)
+ 		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
+@@ -410,7 +574,13 @@ nm_dns_dnsmasq_init (NMDnsDnsmasq *self)
  static void
  dispose (GObject *object)
  {
+-	unlink (CONFFILE);
 +	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (object);
 +
- 	unlink (CONFFILE);
++	nm_clear_g_cancellable (&priv->dnsmasq_cancellable);
++
++	g_clear_object (&priv->dnsmasq);
++
++	g_clear_pointer (&priv->set_servers_ex_args, g_variant_builder_unref);
  
-+	if (priv->dbus_mgr) {
-+		if (priv->name_owner_id)
-+			g_signal_handler_disconnect (priv->dbus_mgr, priv->name_owner_id);
-+		g_object_unref (priv->dbus_mgr);
-+	}
-+
  	G_OBJECT_CLASS (nm_dns_dnsmasq_parent_class)->dispose (object);
  }
- 
 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
-@@ -800,6 +800,27 @@ update_dns (NMDnsManager *self,
+@@ -1065,6 +1065,24 @@ update_dns (NMDnsManager *self,
  }
  
  static void
 +plugin_appeared (NMDnsPlugin *plugin, gpointer user_data)
 +{
 +	NMDnsManager *self = NM_DNS_MANAGER (user_data);
-+	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
 +	GError *error = NULL;
 +
 +	/* Not applicable to non-caching plugins */
@@ -499,9 +533,7 @@
 +	/* Try to update DNS again; since it's now available on the bus this
 +	 * might work. */
 +	if (!update_dns (self, FALSE, &error)) {
-+		nm_log_warn (LOGD_DNS, "could not commit DNS changes: (%d) %s",
-+		             error ? error->code : -1,
-+		             error && error->message ? error->message : "(unknown)");
++		_LOGW ("could not commit DNS changes: %s", error->message);
 +		g_clear_error (&error);
 +	}
 +}
@@ -510,19 +542,19 @@
  plugin_failed (NMDnsPlugin *plugin, gpointer user_data)
  {
  	NMDnsManager *self = NM_DNS_MANAGER (user_data);
-@@ -1129,6 +1150,7 @@ init_resolv_conf_mode (NMDnsManager *sel
- 		nm_log_info (LOGD_DNS, "DNS: loaded plugin %s", nm_dns_plugin_get_name (priv->plugin));
+@@ -1432,6 +1450,7 @@ init_resolv_conf_mode (NMDnsManager *sel
+ 
  		g_signal_connect (priv->plugin, NM_DNS_PLUGIN_FAILED, G_CALLBACK (plugin_failed), self);
  		g_signal_connect (priv->plugin, NM_DNS_PLUGIN_CHILD_QUIT, G_CALLBACK (plugin_child_quit), self);
 +		g_signal_connect (priv->plugin, NM_DNS_PLUGIN_APPEARED, G_CALLBACK (plugin_appeared), self);
- 	}
- }
  
+ 		_NMLOG (immutable ? LOGL_WARN : LOGL_INFO,
+ 		        "%s%s%s%s%s%s",
 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
-@@ -45,6 +45,7 @@ G_DEFINE_TYPE_EXTENDED (NMDnsPlugin, nm_
+@@ -43,6 +43,7 @@ G_DEFINE_TYPE_EXTENDED (NMDnsPlugin, nm_
  
  enum {
  	FAILED,
@@ -530,9 +562,9 @@
  	CHILD_QUIT,
  	LAST_SIGNAL
  };
-@@ -132,6 +133,12 @@ watch_cb (GPid pid, gint status, gpointe
- 	g_free (priv->progname);
- 	priv->progname = NULL;
+@@ -159,6 +160,12 @@ watch_cb (GPid pid, gint status, gpointe
+ 
+ 	_clear_pidfile (self);
  
 +	if (priv->pidfile) {
 +		unlink (priv->pidfile);
@@ -543,10 +575,11 @@
  	g_signal_emit (self, signals[CHILD_QUIT], 0, status);
  }
  
-@@ -261,6 +268,15 @@ nm_dns_plugin_class_init (NMDnsPluginCla
- 					  G_OBJECT_CLASS_TYPE (object_class),
- 					  G_SIGNAL_RUN_FIRST,
- 					  G_STRUCT_OFFSET (NMDnsPluginClass, failed),
+@@ -273,7 +280,16 @@ nm_dns_plugin_class_init (NMDnsPluginCla
+ 	                  G_OBJECT_CLASS_TYPE (object_class),
+ 	                  G_SIGNAL_RUN_FIRST,
+ 	                  G_STRUCT_OFFSET (NMDnsPluginClass, failed),
+-	                  NULL, NULL,
 +					  NULL, NULL,
 +					  g_cclosure_marshal_VOID__VOID,
 +					  G_TYPE_NONE, 0);
@@ -556,14 +589,15 @@
 +					  G_OBJECT_CLASS_TYPE (object_class),
 +					  G_SIGNAL_RUN_FIRST,
 +					  G_STRUCT_OFFSET (NMDnsPluginClass, failed),
- 					  NULL, NULL,
- 					  g_cclosure_marshal_VOID__VOID,
- 					  G_TYPE_NONE, 0);
++					  NULL, NULL,
+ 	                  g_cclosure_marshal_VOID__VOID,
+ 	                  G_TYPE_NONE, 0);
+ 
 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 @@
+@@ -31,6 +31,7 @@
  #define NM_DNS_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_PLUGIN, NMDnsPluginClass))
  
  #define NM_DNS_PLUGIN_FAILED "failed"
@@ -575,10 +609,10 @@
 ===================================================================
 --- a/src/org.freedesktop.NetworkManager.conf
 +++ b/src/org.freedesktop.NetworkManager.conf
-@@ -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"/>
+@@ -26,6 +26,13 @@
+                 <allow send_destination="org.freedesktop.NetworkManager.fortisslvpn"/>
+                 <allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
+                 <allow send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
 +
 +                <!-- Allow the custom name for the dnsmasq instance spawned by NM
 +                     from the dns dnsmasq plugin to own it's dbus name, and for
@@ -589,10 +623,10 @@
          </policy>
          <policy user="whoopsie">
                  <allow send_destination="org.freedesktop.NetworkManager"/>
-@@ -137,6 +144,9 @@
-                 <deny send_interface="org.freedesktop.NetworkManager.Settings" send_member="ReloadConnections"/>
-                 <deny send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
-                 <deny send_interface="org.freedesktop.NetworkManager.PPP"/>
+@@ -145,6 +152,9 @@
+                 <deny send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Settings"
+                       send_member="ReloadConnections"/>
 +
 +                <deny own="org.freedesktop.NetworkManager.dnsmasq"/>
 +                <deny send_destination="org.freedesktop.NetworkManager.dnsmasq"/>

=== removed file 'debian/patches/0001-libnm-libnm-util-add-Wi-Fi-powersave-property.patch'
--- debian/patches/0001-libnm-libnm-util-add-Wi-Fi-powersave-property.patch	2015-08-20 01:07:00 +0000
+++ debian/patches/0001-libnm-libnm-util-add-Wi-Fi-powersave-property.patch	1970-01-01 00:00:00 +0000
@@ -1,253 +0,0 @@
-From ba09d590a6fe4601291ca4ae426ed7af98535b17 Mon Sep 17 00:00:00 2001
-From: Dan Williams <[e-mail]>
-Date: Thu, 30 Oct 2014 09:49:38 -0500
-Subject: [PATCH 1/5] libnm/libnm-util: add Wi-Fi 'powersave' property
-
----
- libnm-core/nm-setting-wireless.c |   34 ++++++++++++++++++++++++++++++
- libnm-core/nm-setting-wireless.h |    2 +
- libnm-util/libnm-util.ver        |    1 
- libnm-util/nm-setting-wireless.c |   44 +++++++++++++++++++++++++++++++++++++++
- libnm-util/nm-setting-wireless.h |    2 +
- libnm/libnm.ver                  |    1 
- 6 files changed, 84 insertions(+)
-
-Index: b/libnm-util/libnm-util.ver
-===================================================================
---- a/libnm-util/libnm-util.ver
-+++ b/libnm-util/libnm-util.ver
-@@ -562,6 +562,7 @@ global:
- 	nm_setting_wireless_get_mtu;
- 	nm_setting_wireless_get_num_mac_blacklist_items;
- 	nm_setting_wireless_get_num_seen_bssids;
-+	nm_setting_wireless_get_powersave;
- 	nm_setting_wireless_get_rate;
- 	nm_setting_wireless_get_security;
- 	nm_setting_wireless_get_seen_bssid;
-Index: b/libnm-util/nm-setting-wireless.c
-===================================================================
---- a/libnm-util/nm-setting-wireless.c
-+++ b/libnm-util/nm-setting-wireless.c
-@@ -87,6 +87,7 @@ typedef struct {
- 	GSList *seen_bssids;
- 	char *security;
- 	gboolean hidden;
-+	guint32 powersave;
- } NMSettingWirelessPrivate;
- 
- enum {
-@@ -105,6 +106,7 @@ enum {
- 	PROP_SEEN_BSSIDS,
- 	PROP_SEC,
- 	PROP_HIDDEN,
-+	PROP_POWERSAVE,
- 
- 	LAST_PROP
- };
-@@ -662,6 +664,20 @@ nm_setting_wireless_get_hidden (NMSettin
- }
- 
- /**
-+ * nm_setting_wireless_get_powersave:
-+ * @setting: the #NMSettingWireless
-+ *
-+ * Returns: the #NMSettingWireless:powersave property of the setting
-+ **/
-+guint32
-+nm_setting_wireless_get_powersave (NMSettingWireless *setting)
-+{
-+	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 0);
-+
-+	return NM_SETTING_WIRELESS_GET_PRIVATE (setting)->powersave;
-+}
-+
-+/**
-  * nm_setting_wireless_add_seen_bssid:
-  * @setting: the #NMSettingWireless
-  * @bssid: the new BSSID to add to the list
-@@ -860,6 +876,16 @@ verify (NMSetting *setting, GSList *all_
- 		}
- 	}
- 
-+	if (priv->powersave > 1) {
-+		g_set_error (error,
-+		             NM_SETTING_WIRELESS_ERROR,
-+		             NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
-+		             _("'%u' is not a valid powersave value"),
-+		             priv->powersave);
-+		g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_POWERSAVE);
-+		return FALSE;
-+	}
-+
- 	return TRUE;
- }
- 
-@@ -953,6 +979,9 @@ set_property (GObject *object, guint pro
- 	case PROP_HIDDEN:
- 		priv->hidden = g_value_get_boolean (value);
- 		break;
-+	case PROP_POWERSAVE:
-+		priv->powersave = g_value_get_uint (value);
-+		break;
- 	default:
- 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- 		break;
-@@ -1008,6 +1037,9 @@ get_property (GObject *object, guint pro
- 	case PROP_HIDDEN:
- 		g_value_set_boolean (value, nm_setting_wireless_get_hidden (setting));
- 		break;
-+	case PROP_POWERSAVE:
-+		g_value_set_uint (value, nm_setting_wireless_get_powersave (setting));
-+		break;
- 	default:
- 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- 		break;
-@@ -1244,4 +1276,16 @@ nm_setting_wireless_class_init (NMSettin
- 		                       FALSE,
- 		                       G_PARAM_READWRITE |
- 		                       G_PARAM_STATIC_STRINGS));
-+
-+	/**
-+	 * NMSettingWireless:powersave:
-+	 *
-+	 * If set to 0, Wi-Fi power saving behavior is disabled.  If set to 1,
-+	 * Wi-Fi power saving behavior is enabled.  All other values are reserved.
-+	 **/
-+	g_object_class_install_property
-+		(object_class, PROP_POWERSAVE,
-+		 g_param_spec_uint (NM_SETTING_WIRELESS_POWERSAVE, "", "",
-+		                    0, G_MAXUINT32, 0,
-+		                    G_PARAM_READWRITE));
- }
-Index: b/libnm-util/nm-setting-wireless.h
-===================================================================
---- a/libnm-util/nm-setting-wireless.h
-+++ b/libnm-util/nm-setting-wireless.h
-@@ -73,6 +73,7 @@ GQuark nm_setting_wireless_error_quark (
- #define NM_SETTING_WIRELESS_MTU         "mtu"
- #define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
- #define NM_SETTING_WIRELESS_HIDDEN      "hidden"
-+#define NM_SETTING_WIRELESS_POWERSAVE   "powersave"
- 
- /* Deprecated */
- #define NM_SETTING_WIRELESS_SEC         "security"
-@@ -150,6 +151,7 @@ void              nm_setting_wireless_cl
- 
- guint32           nm_setting_wireless_get_mtu                (NMSettingWireless *setting);
- gboolean          nm_setting_wireless_get_hidden             (NMSettingWireless *setting);
-+guint32           nm_setting_wireless_get_powersave          (NMSettingWireless *setting);
- 
- gboolean          nm_setting_wireless_add_seen_bssid         (NMSettingWireless *setting,
-                                                               const char *bssid);
-Index: b/libnm-core/nm-setting-wireless.c
-===================================================================
---- a/libnm-core/nm-setting-wireless.c
-+++ b/libnm-core/nm-setting-wireless.c
-@@ -60,6 +60,7 @@ typedef struct {
- 	guint32 mtu;
- 	GSList *seen_bssids;
- 	gboolean hidden;
-+	guint32 powersave;
- } NMSettingWirelessPrivate;
- 
- enum {
-@@ -77,6 +78,7 @@ enum {
- 	PROP_MTU,
- 	PROP_SEEN_BSSIDS,
- 	PROP_HIDDEN,
-+	PROP_POWERSAVE,
- 
- 	LAST_PROP
- };
-@@ -602,6 +604,20 @@ nm_setting_wireless_get_hidden (NMSettin
- }
- 
- /**
-+ * nm_setting_wireless_get_powersave:
-+ * @setting: the #NMSettingWireless
-+ *
-+ * Returns: the #NMSettingWireless:powersave property of the setting
-+ **/
-+guint32
-+nm_setting_wireless_get_powersave (NMSettingWireless *setting)
-+{
-+	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 0);
-+
-+	return NM_SETTING_WIRELESS_GET_PRIVATE (setting)->powersave;
-+}
-+
-+/**
-  * nm_setting_wireless_add_seen_bssid:
-  * @setting: the #NMSettingWireless
-  * @bssid: the new BSSID to add to the list
-@@ -916,6 +932,9 @@ set_property (GObject *object, guint pro
- 	case PROP_HIDDEN:
- 		priv->hidden = g_value_get_boolean (value);
- 		break;
-+	case PROP_POWERSAVE:
-+		priv->powersave = g_value_get_uint (value);
-+		break;
- 	default:
- 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- 		break;
-@@ -969,6 +988,9 @@ get_property (GObject *object, guint pro
- 	case PROP_HIDDEN:
- 		g_value_set_boolean (value, nm_setting_wireless_get_hidden (setting));
- 		break;
-+	case PROP_POWERSAVE:
-+		g_value_set_uint (value, nm_setting_wireless_get_powersave (setting));
-+		break;
- 	default:
- 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- 		break;
-@@ -1315,6 +1337,18 @@ nm_setting_wireless_class_init (NMSettin
- 		                       G_PARAM_READWRITE |
- 		                       G_PARAM_STATIC_STRINGS));
- 
-+	/**
-+	 * NMSettingWireless:powersave:
-+	 *
-+	 * If set to 0, Wi-Fi power saving behavior is disabled.  If set to 1,
-+	 * Wi-Fi power saving behavior is enabled.  All other values are reserved.
-+	 **/
-+	g_object_class_install_property
-+		(object_class, PROP_POWERSAVE,
-+		 g_param_spec_uint (NM_SETTING_WIRELESS_POWERSAVE, "", "",
-+		                    0, G_MAXUINT32, 0,
-+		                    G_PARAM_READWRITE));
-+
- 	/* Compatibility for deprecated property */
- 	/* ---ifcfg-rh---
- 	 * property: security
-Index: b/libnm-core/nm-setting-wireless.h
-===================================================================
---- a/libnm-core/nm-setting-wireless.h
-+++ b/libnm-core/nm-setting-wireless.h
-@@ -55,6 +55,7 @@ G_BEGIN_DECLS
- #define NM_SETTING_WIRELESS_MTU         "mtu"
- #define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
- #define NM_SETTING_WIRELESS_HIDDEN      "hidden"
-+#define NM_SETTING_WIRELESS_POWERSAVE   "powersave"
- 
- /**
-  * NM_SETTING_WIRELESS_MODE_ADHOC:
-@@ -118,6 +119,7 @@ void              nm_setting_wireless_cl
- 
- guint32           nm_setting_wireless_get_mtu                (NMSettingWireless *setting);
- gboolean          nm_setting_wireless_get_hidden             (NMSettingWireless *setting);
-+guint32           nm_setting_wireless_get_powersave          (NMSettingWireless *setting);
- 
- gboolean          nm_setting_wireless_add_seen_bssid         (NMSettingWireless *setting,
-                                                               const char *bssid);
-Index: b/libnm/libnm.ver
-===================================================================
---- a/libnm/libnm.ver
-+++ b/libnm/libnm.ver
-@@ -705,6 +705,7 @@ global:
- 	nm_setting_wireless_get_mtu;
- 	nm_setting_wireless_get_num_mac_blacklist_items;
- 	nm_setting_wireless_get_num_seen_bssids;
-+	nm_setting_wireless_get_powersave;
- 	nm_setting_wireless_get_rate;
- 	nm_setting_wireless_get_seen_bssid;
- 	nm_setting_wireless_get_ssid;

=== removed file 'debian/patches/0001-wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch'
--- debian/patches/0001-wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch	2015-08-20 01:07:00 +0000
+++ debian/patches/0001-wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-From dfb178d6597099fc0c85e70e727601a1c5542c79 Mon Sep 17 00:00:00 2001
-From: Mathieu Trudel-Lapierre <[e-mail]>
-Date: Tue, 11 Nov 2014 12:00:48 -0500
-Subject: [PATCH 1/2] wifi: Signal on the wifi device when its supplicant is
- done scanning.
-
-This makes it possible for applications outside NetworkManager to listen for
-that signal, and use it along with RequestScan to get very up-to-date scan
-results.
-
-Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
----
- introspection/nm-device-wifi.xml                 |    6 ++++++
- src/devices/wifi/nm-device-wifi.c                |   11 +++++++++++
- src/devices/wifi/nm-device-wifi.h                |    1 +
- src/supplicant-manager/nm-supplicant-interface.c |    6 ++++--
- 4 files changed, 22 insertions(+), 2 deletions(-)
-
-Index: b/introspection/nm-device-wifi.xml
-===================================================================
---- a/introspection/nm-device-wifi.xml
-+++ b/introspection/nm-device-wifi.xml
-@@ -120,6 +120,12 @@
-         </tp:docstring>
-     </signal>
- 
-+    <signal name="ScanDone">
-+        <tp:docstring>
-+            Emitted when the device has finished scanning for new APs.
-+        </tp:docstring>
-+    </signal>
-+
-     <tp:flags name="NM_802_11_DEVICE_CAP" type="u">
-       <tp:docstring>
-         Flags describing the capabilities of a wireless device.
-Index: b/src/devices/wifi/nm-device-wifi.c
-===================================================================
---- a/src/devices/wifi/nm-device-wifi.c
-+++ b/src/devices/wifi/nm-device-wifi.c
-@@ -103,6 +103,7 @@ enum {
- 	ACCESS_POINT_ADDED,
- 	ACCESS_POINT_REMOVED,
- 	SCANNING_ALLOWED,
-+	SCAN_DONE,
- 
- 	LAST_SIGNAL
- };
-@@ -1606,6 +1607,8 @@ supplicant_iface_scan_done_cb (NMSupplic
- 
- 	_LOGD (LOGD_WIFI_SCAN, "scan %s", success ? "successful" : "failed");
- 
-+	g_signal_emit (self, signals[SCAN_DONE], 0, NULL);
-+
- 	schedule_scan (self, success);
- 
- 	/* Ensure that old APs get removed, which otherwise only
-@@ -3361,6 +3364,14 @@ nm_device_wifi_class_init (NMDeviceWifiC
- 		              scanning_allowed_accumulator, NULL, NULL,
- 		              G_TYPE_BOOLEAN, 0);
- 
-+	signals[SCAN_DONE] =
-+		g_signal_new ("scan-done",
-+		              G_OBJECT_CLASS_TYPE (object_class),
-+		              G_SIGNAL_RUN_FIRST,
-+		              G_STRUCT_OFFSET (NMDeviceWifiClass, scan_done),
-+		              NULL, NULL, NULL,
-+		              G_TYPE_NONE, 0);
-+
- 	nm_dbus_manager_register_exported_type (nm_dbus_manager_get (),
- 	                                        G_TYPE_FROM_CLASS (klass),
- 	                                        &dbus_glib_nm_device_wifi_object_info);
-Index: b/src/devices/wifi/nm-device-wifi.h
-===================================================================
---- a/src/devices/wifi/nm-device-wifi.h
-+++ b/src/devices/wifi/nm-device-wifi.h
-@@ -70,6 +70,7 @@ struct _NMDeviceWifiClass
- 	void (*access_point_added)   (NMDeviceWifi *device, NMAccessPoint *ap);
- 	void (*access_point_removed) (NMDeviceWifi *device, NMAccessPoint *ap);
- 	gboolean (*scanning_allowed) (NMDeviceWifi *device);
-+	void (*scan_done) (NMDeviceWifi *device);
- };
- 
- 
-Index: b/src/supplicant-manager/nm-supplicant-interface.c
-===================================================================
---- a/src/supplicant-manager/nm-supplicant-interface.c
-+++ b/src/supplicant-manager/nm-supplicant-interface.c
-@@ -1086,6 +1086,7 @@ nm_supplicant_interface_set_config (NMSu
- static void
- scan_request_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data)
- {
-+	NMSupplicantInterface *self = NM_SUPPLICANT_INTERFACE (user_data);
- 	gs_unref_variant GVariant *reply = NULL;
- 	gs_free_error GError *error = NULL;
- 
-@@ -1093,9 +1094,10 @@ scan_request_cb (GDBusProxy *proxy, GAsy
- 	if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- 		return;
- 
--	if (error)
-+	if (error) {
- 		nm_log_warn (LOGD_SUPPLICANT, "Could not get scan request result: %s", error->message);
--	g_signal_emit (NM_SUPPLICANT_INTERFACE (user_data), signals[SCAN_DONE], 0, error ? FALSE : TRUE);
-+		g_signal_emit (self, signals[SCAN_DONE], 0, FALSE);
-+	}
- }
- 
- gboolean

=== removed file 'debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch'
--- debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch	2015-09-26 02:33:57 +0000
+++ debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch	1970-01-01 00:00:00 +0000
@@ -1,1653 +0,0 @@
-From 7469d3c11789a6c42f020c64214b813a925b5417 Mon Sep 17 00:00:00 2001
-From: Mathieu Trudel-Lapierre <[e-mail]>
-Date: Tue, 11 Nov 2014 22:20:30 -0500
-Subject: [PATCH] wwan: add support for using oFono as a modem manager
-
-Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
----
- configure.ac                        |    9 
- src/NetworkManagerUtils.c           |   20 
- src/devices/wwan/Makefile.am        |    7 
- src/devices/wwan/nm-device-modem.c  |   18 
- src/devices/wwan/nm-modem-manager.c |  219 ++++++
- src/devices/wwan/nm-modem-ofono.c   | 1172 ++++++++++++++++++++++++++++++++++++
- src/devices/wwan/nm-modem-ofono.h   |   64 +
- 7 files changed, 1500 insertions(+), 9 deletions(-)
- create mode 100644 src/devices/wwan/nm-modem-ofono.c
- create mode 100644 src/devices/wwan/nm-modem-ofono.h
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -686,6 +686,15 @@ else
- fi
- AM_CONDITIONAL(WITH_BLUEZ5_DUN, test "${enable_bluez5_dun}" = "yes")
- 
-+# OFONO
-+AC_ARG_WITH(ofono, AS_HELP_STRING([--with-ofono], [Enable oFono support]),,[with_ofono=yes])
-+if (test "${with_ofono}" = "yes"); then
-+    AC_DEFINE(WITH_OFONO, 1, [Define if you have oFono support])
-+else
-+    AC_DEFINE(WITH_OFONO, 0, [Define if you have oFono support])
-+fi
-+AM_CONDITIONAL(WITH_OFONO, test "${with_ofono}" = "yes")
-+
- # DHCP client support
- AC_ARG_WITH([dhclient], AS_HELP_STRING([--with-dhclient=yes|no|path], [Enable dhclient 4.x support]))
- AC_ARG_WITH([dhcpcd], AS_HELP_STRING([--with-dhcpcd=yes|no|path], [Enable dhcpcd 4.x support]))
-Index: b/src/devices/wwan/Makefile.am
-===================================================================
---- a/src/devices/wwan/Makefile.am
-+++ b/src/devices/wwan/Makefile.am
-@@ -40,6 +40,13 @@ libnm_wwan_la_SOURCES = \
- 	\
- 	$(GLIB_GENERATED)
- 
-+if WITH_OFONO
-+libnm_wwan_la_SOURCES += \
-+	nm-modem-ofono.c \
-+	nm-modem-ofono.h \
-+	$(NULL)
-+endif
-+
- WWAN_SYMBOL_VIS_FILE=$(srcdir)/wwan-exports.ver
- 
- libnm_wwan_la_LDFLAGS = \
-Index: b/src/devices/wwan/nm-modem-manager.c
-===================================================================
---- a/src/devices/wwan/nm-modem-manager.c
-+++ b/src/devices/wwan/nm-modem-manager.c
-@@ -17,7 +17,7 @@
-  *
-  * Copyright (C) 2009 - 2014 Red Hat, Inc.
-  * Copyright (C) 2009 Novell, Inc.
-- * Copyright (C) 2009 Canonical Ltd.
-+ * Copyright (C) 2009 - 2013 Canonical Ltd.
-  */
- 
- #include "config.h"
-@@ -31,6 +31,11 @@
- #include "nm-modem.h"
- #include "nm-modem-broadband.h"
- 
-+#if WITH_OFONO
-+#include "nm-dbus-manager.h"
-+#include "nm-modem-ofono.h"
-+#endif
-+
- #define MODEM_POKE_INTERVAL 120
- 
- G_DEFINE_TYPE (NMModemManager, nm_modem_manager, G_TYPE_OBJECT)
-@@ -43,6 +48,12 @@ struct _NMModemManagerPrivate {
- 	guint mm_object_added_id;
- 	guint mm_object_removed_id;
- 
-+#if WITH_OFONO
-+	GDBusProxy *ofono_proxy;
-+
-+	guint ofono_name_owner_changed_id;
-+#endif
-+
- 	/* Common */
- 	GHashTable *modems;
- };
-@@ -226,6 +237,179 @@ modem_manager_name_owner_changed (MMMana
- 	 */
- }
- 
-+#if WITH_OFONO
-+static void
-+ofono_clear_signals (NMModemManager *self)
-+{
-+	if (!self->priv->ofono_proxy)
-+		return;
-+
-+	if (self->priv->ofono_name_owner_changed_id) {
-+		if (g_signal_handler_is_connected (self->priv->ofono_proxy,
-+		                                   self->priv->ofono_name_owner_changed_id))
-+			g_signal_handler_disconnect (self->priv->ofono_proxy,
-+			                             self->priv->ofono_name_owner_changed_id);
-+		self->priv->ofono_name_owner_changed_id = 0;
-+	}
-+}
-+
-+static void
-+ofono_create_modem (NMModemManager *self, const char *path)
-+{
-+	NMModem *modem = NULL;
-+
-+	if (g_hash_table_lookup (self->priv->modems, path)) {
-+		nm_log_warn (LOGD_MB, "modem with path %s already exists, ignoring", path);
-+		return;
-+	}
-+
-+	/* Create modem instance */
-+	modem = nm_modem_ofono_new (path);
-+	if (modem)
-+		handle_new_modem (self, modem);
-+	else
-+		nm_log_warn (LOGD_MB, "Failed to create oFono modem for %s", path);
-+}
-+
-+static void
-+ofono_signal_cb (GDBusProxy *proxy,
-+                 gchar *sender_name,
-+                 gchar *signal_name,
-+                 GVariant *parameters,
-+                 gpointer user_data)
-+{
-+	NMModemManager *self = NM_MODEM_MANAGER (user_data);
-+	gchar *object_path;
-+	NMModem *modem;
-+
-+	if (g_strcmp0 (signal_name, "ModemAdded") == 0) {
-+		g_variant_get (parameters, "(oa{sv})", &object_path, NULL);
-+		nm_log_info (LOGD_MB, "oFono modem appeared: %s", object_path);
-+
-+		ofono_create_modem (NM_MODEM_MANAGER (user_data), object_path);
-+		g_free (object_path);
-+	} else if (g_strcmp0 (signal_name, "ModemRemoved") == 0) {
-+		g_variant_get (parameters, "(o)", &object_path);
-+		nm_log_info (LOGD_MB, "oFono modem removed: %s", object_path);
-+
-+		modem = (NMModem *) g_hash_table_lookup (self->priv->modems, object_path);
-+		if (modem) {
-+			nm_modem_emit_removed (modem);
-+			g_hash_table_remove (self->priv->modems, object_path);
-+		} else {
-+			nm_log_warn (LOGD_MB, "could not remove modem %s, not found in table",
-+			             object_path);
-+		}
-+		g_free (object_path);
-+	}
-+}
-+
-+#define OFONO_DBUS_MODEM_ENTRY (dbus_g_type_get_struct ("GValueArray", DBUS_TYPE_G_OBJECT_PATH, DBUS_TYPE_G_MAP_OF_VARIANT, G_TYPE_INVALID))
-+#define OFONO_DBUS_MODEM_ENTRIES (dbus_g_type_get_collection ("GPtrArray", OFONO_DBUS_MODEM_ENTRY))
-+
-+static void
-+ofono_enumerate_devices_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
-+{
-+	NMModemManager *manager = NM_MODEM_MANAGER (user_data);
-+	GPtrArray *modems;
-+	GError *error = NULL;
-+	GVariant *results;
-+	GVariantIter *iter;
-+	const char *path;
-+
-+	results = g_dbus_proxy_call_finish (proxy, res, &error);
-+	if (results) {
-+		g_variant_get (results, "(a(oa{sv}))", &iter);
-+		while (g_variant_iter_loop (iter, "(&oa{sv})", &path, NULL)) {
-+			ofono_create_modem (manager, path);
-+		}
-+		g_variant_iter_free (iter);
-+		g_variant_unref (results);
-+	}
-+
-+	if (error)
-+		nm_log_warn (LOGD_MB, "failed to enumerate oFono devices: %s",
-+		             error->message ? error->message : "(unknown)");
-+}
-+
-+static void ofono_appeared (NMModemManager *self);
-+
-+static void
-+ofono_check_name_owner (NMModemManager *self)
-+{
-+	gchar *name_owner;
-+
-+	name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->ofono_proxy));
-+	if (name_owner) {
-+		/* Available! */
-+		ofono_appeared (self);
-+		goto free;
-+	}
-+
-+	nm_log_info (LOGD_MB, "oFono disappeared from bus");
-+
-+	ofono_clear_signals (self);
-+	g_clear_object (&self->priv->ofono_proxy);
-+	ensure_client (self);
-+
-+free:
-+	g_free (name_owner);
-+	return;
-+}
-+
-+static void
-+ofono_name_owner_changed (GDBusProxy *ofono_proxy,
-+                          GParamSpec *pspec,
-+                          NMModemManager *self)
-+{
-+	ofono_check_name_owner (self);
-+}
-+
-+static void
-+ofono_appeared (NMModemManager *self)
-+{
-+	nm_log_info (LOGD_MB, "ofono is now available");
-+
-+	self->priv->ofono_name_owner_changed_id =
-+		g_signal_connect (self->priv->ofono_proxy,
-+		                  "notify::name-owner",
-+		                  G_CALLBACK (ofono_name_owner_changed),
-+		                  self);
-+	g_dbus_proxy_call (self->priv->ofono_proxy,
-+	                   "GetModems",
-+	                   NULL,
-+	                   G_DBUS_CALL_FLAGS_NONE,
-+	                   -1,
-+	                   NULL,
-+	                   (GAsyncReadyCallback) ofono_enumerate_devices_done,
-+	                   g_object_ref (self));
-+
-+	g_signal_connect (self->priv->ofono_proxy,
-+	                  "g-signal",
-+	                  G_CALLBACK (ofono_signal_cb),
-+	                  self);
-+}
-+
-+static void
-+ofono_proxy_new_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
-+{
-+	NMModemManager *self = NM_MODEM_MANAGER (user_data);
-+	GError *error = NULL;
-+
-+	self->priv->ofono_proxy = g_dbus_proxy_new_finish (res, &error);
-+
-+	if (error) {
-+		//FIXME: do stuff if there's an error.
-+		return;
-+	}
-+
-+	ofono_appeared (self);
-+
-+	/* Balance refcount */
-+	g_object_unref (self);
-+}
-+#endif
-+
- #if !HAVE_SYSTEMD
- 
- static void
-@@ -344,22 +528,43 @@ manager_new_ready (GObject *source,
- static void
- ensure_client (NMModemManager *self)
- {
--	g_assert (self->priv->dbus_connection);
-+	NMModemManagerPrivate *priv = self->priv;
-+	g_assert (priv->dbus_connection);
-+	gboolean created = FALSE;
- 
- 	/* Create the GDBusObjectManagerClient. We do not request to autostart, as
- 	 * we don't really want the MMManager creation to fail. We can always poke
- 	 * later on if we want to request the autostart */
--	if (!self->priv->modem_manager) {
--		mm_manager_new (self->priv->dbus_connection,
-+	if (!priv->modem_manager) {
-+		mm_manager_new (priv->dbus_connection,
- 		                G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START,
- 		                NULL,
- 		                (GAsyncReadyCallback)manager_new_ready,
- 		                g_object_ref (self));
--		return;
-+		created = TRUE;
- 	}
- 
-+#if WITH_OFONO
-+	if (!priv->ofono_proxy) {
-+		g_dbus_proxy_new (priv->dbus_connection,
-+		                  G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START,
-+		                  NULL,
-+		                  OFONO_DBUS_SERVICE,
-+		                  OFONO_DBUS_PATH,
-+		                  OFONO_DBUS_INTERFACE,
-+		                  NULL,
-+		                  (GAsyncReadyCallback)ofono_proxy_new_cb,
-+		                  g_object_ref (self));
-+		created = TRUE;
-+	}
-+#endif /* WITH_OFONO */
-+
-+	if (created)
-+		return;
-+
- 	/* If already available, recheck name owner! */
- 	modem_manager_check_name_owner (self);
-+	ofono_check_name_owner (self);
- }
- 
- static void
-@@ -441,6 +646,10 @@ dispose (GObject *object)
- 
- 	modem_manager_clear_signals (self);
- 	g_clear_object (&self->priv->modem_manager);
-+#if WITH_OFONO
-+	ofono_clear_signals (self);
-+	g_clear_object (&self->priv->ofono_proxy);
-+#endif
- 	g_clear_object (&self->priv->dbus_connection);
- 
- 	if (self->priv->modems) {
-Index: b/src/devices/wwan/nm-modem-ofono.c
-===================================================================
---- /dev/null
-+++ b/src/devices/wwan/nm-modem-ofono.c
-@@ -0,0 +1,1172 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* NetworkManager -- Network link manager
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Copyright (C) 2013 Canonical Ltd.
-+ */
-+
-+#include "config.h"
-+
-+#include <string.h>
-+#include <glib/gi18n.h>
-+
-+#include "nm-dbus-glib-types.h"
-+#include "nm-modem-ofono.h"
-+#include "nm-device.h"
-+#include "nm-device-private.h"
-+#include "nm-setting-connection.h"
-+#include "nm-setting-gsm.h"
-+#include "nm-settings-connection.h"
-+#include "nm-enum-types.h"
-+#include "nm-logging.h"
-+#include "nm-modem.h"
-+#include "nm-dbus-manager.h"
-+#include "nm-platform.h"
-+#include "nm-utils.h"
-+
-+G_DEFINE_TYPE (NMModemOfono, nm_modem_ofono, NM_TYPE_MODEM)
-+
-+#define NM_MODEM_OFONO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MODEM_OFONO, NMModemOfonoPrivate))
-+
-+typedef struct {
-+	GHashTable *connect_properties;
-+
-+	NMDBusManager *dbus_mgr;
-+
-+	DBusGProxy *modem_proxy;
-+	DBusGProxy *connman_proxy;
-+	DBusGProxy *context_proxy;
-+	DBusGProxy *simmanager_proxy;
-+
-+	GError *property_error;
-+
-+	char **interfaces;
-+	char *context_path;
-+	char *imsi;
-+
-+	gboolean modem_online;
-+	gboolean gprs_attached;
-+
-+	NMIP4Config *ip4_config;
-+
-+} NMModemOfonoPrivate;
-+
-+#define NM_OFONO_ERROR (nm_ofono_error_quark ())
-+
-+static GQuark
-+nm_ofono_error_quark (void)
-+{
-+	static GQuark quark = 0;
-+	if (!quark)
-+		quark = g_quark_from_static_string ("nm-ofono-error");
-+	return quark;
-+}
-+
-+static gboolean
-+ip_string_to_network_address (const gchar *str,
-+                              guint32 *out)
-+{
-+	guint32 addr = 0;
-+	gboolean success = FALSE;
-+
-+	if (!str || inet_pton (AF_INET, str, &addr) != 1)
-+		addr = 0;
-+	else
-+		success = TRUE;
-+
-+	*out = (guint32)addr;
-+	return success;
-+}
-+
-+static void
-+update_modem_state (NMModemOfono *self)
-+{
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	NMModemState state = nm_modem_get_state (NM_MODEM (self));
-+	NMModemState new_state = NM_MODEM_STATE_UNKNOWN;
-+	const char *reason = NULL;
-+
-+	nm_log_info (LOGD_MB, "(%s): %s: 'Attached': %s 'Online': %s 'IMSI': %s",
-+	             nm_modem_get_path (NM_MODEM (self)),
-+	             __func__,
-+	             priv->gprs_attached ? "true" : "false",
-+	             priv->modem_online ? "true" : "false",
-+	             priv->imsi);
-+
-+	if (priv->modem_online == FALSE) {
-+		new_state = NM_MODEM_STATE_DISABLED;
-+		reason = "modem 'Online=false'";
-+	} else if (priv->imsi == NULL && state != NM_MODEM_STATE_ENABLING) {
-+		new_state = NM_MODEM_STATE_DISABLED;
-+		reason = "modem not ready";
-+	} else if (priv->gprs_attached == FALSE) {
-+		if (state >= NM_MODEM_STATE_ENABLING) {
-+			new_state = NM_MODEM_STATE_SEARCHING;
-+			reason = "modem searching";
-+		}
-+	} else {
-+		new_state = NM_MODEM_STATE_REGISTERED;
-+		reason = "modem ready";
-+	}
-+
-+	if (state != new_state)
-+		nm_modem_set_state (NM_MODEM (self), new_state, reason);
-+}
-+
-+/* Disconnect stuff */
-+typedef struct {
-+	NMModemOfono *self;
-+	gboolean warn;
-+} SimpleDisconnectContext;
-+
-+static gboolean
-+disconnect_finish (NMModem *self,
-+                   GAsyncResult *res,
-+                   GError **error)
-+{
-+	/* FIXME: might actually be wrong, copied straight from NMModemBroadband.
-+	 * this is already working using GDBusProxy, so won't be called until the
-+	 * rest of this file is ported: uncomment when everything else is ported.
-+	 */
-+	//return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
-+	return FALSE;
-+}
-+
-+static void
-+simple_disconnect_context_free (SimpleDisconnectContext *ctx)
-+{
-+	g_object_unref (ctx->self);
-+	g_slice_free (SimpleDisconnectContext, ctx);
-+}
-+
-+static void
-+disconnect_done (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
-+{
-+	SimpleDisconnectContext *ctx = (SimpleDisconnectContext*) user_data;
-+	NMModemOfono *self = ctx->self;
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	GError *error = NULL;
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID)) {
-+		if (ctx->warn)
-+			nm_log_warn (LOGD_MB, "(%s) failed to disconnect modem: %s",
-+			             nm_modem_get_uid (NM_MODEM (self)),
-+			             error && error->message ? error->message : "(unknown)");
-+		g_clear_error (&error);
-+	}
-+
-+	update_modem_state (self);
-+
-+	simple_disconnect_context_free (ctx);
-+}
-+
-+static void
-+disconnect (NMModem *self,
-+            gboolean warn,
-+            GCancellable *cancellable,
-+            GAsyncReadyCallback callback,
-+            gpointer user_data)
-+{
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	SimpleDisconnectContext *ctx;
-+	GValue value = G_VALUE_INIT;
-+	NMModemState state = nm_modem_get_state (NM_MODEM (self));
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	if (state != NM_MODEM_STATE_CONNECTED)
-+		return;
-+
-+	ctx = g_slice_new (SimpleDisconnectContext);
-+	ctx->self = g_object_ref (self);
-+	ctx->warn = warn;
-+
-+	nm_modem_set_state (NM_MODEM (self),
-+	                    NM_MODEM_STATE_DISCONNECTING,
-+	                    nm_modem_state_to_string (NM_MODEM_STATE_DISCONNECTING));
-+
-+	g_value_init (&value, G_TYPE_BOOLEAN);
-+	g_value_set_boolean (&value, FALSE);
-+
-+	dbus_g_proxy_begin_call_with_timeout (priv->context_proxy,
-+	                                      "SetProperty", disconnect_done,
-+	                                      ctx, NULL, 20000,
-+	                                      G_TYPE_STRING, "Active",
-+	                                      G_TYPE_VALUE, &value,
-+	                                      G_TYPE_INVALID);
-+}
-+
-+static void
-+deactivate_cleanup (NMModem *_self, NMDevice *device)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (_self);
-+
-+	/* TODO: cancel SimpleConnect() if any */
-+
-+	/* TODO: Cleanup IPv4 addresses and routes */
-+	/*
-+	g_clear_object (&self->priv->ipv4_config);
-+	g_clear_object (&self->priv->ipv6_config);
-+	*/
-+
-+	/*
-+	self->priv->pin_tries = 0;
-+	*/
-+
-+	/* Chain up parent's */
-+	NM_MODEM_CLASS (nm_modem_ofono_parent_class)->deactivate_cleanup (_self, device);
-+}
-+
-+DBusGProxy *
-+get_ofono_proxy (NMModemOfono *self, const char *path, const char *interface)
-+{
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	DBusGConnection *bus;
-+	DBusGProxy *proxy;
-+
-+	bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
-+
-+	proxy = dbus_g_proxy_new_for_name (bus,
-+	                                   OFONO_DBUS_SERVICE,
-+	                                   path,
-+	                                   interface);
-+
-+	return proxy;
-+}
-+static void
-+handle_attached (NMModemOfono *self, GValue *value)
-+{
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	gboolean attached = g_value_get_boolean (value);
-+
-+	if (priv->gprs_attached != attached) {
-+		priv->gprs_attached = attached;
-+
-+		nm_log_info (LOGD_MB, "(%s): %s: new value for 'Attached': %s",
-+		             nm_modem_get_path (NM_MODEM (self)),
-+		             __func__,
-+		             attached ? "true" : "false");
-+
-+		update_modem_state (self);
-+	}
-+}
-+
-+
-+static void
-+get_ofono_conn_manager_properties_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	GError *error = NULL;
-+	GHashTable *properties = NULL;
-+	GValue *value = NULL;
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	if (!dbus_g_proxy_end_call (proxy, call_id, &error,
-+		                        DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
-+		                        G_TYPE_INVALID)) {
-+		nm_log_warn (LOGD_MB, "failed get connection manager properties: (%d) %s",
-+		             error ? error->code : -1,
-+		             error && error->message ? error->message : "(unknown)");
-+		goto done;
-+	}
-+
-+	value = g_hash_table_lookup (properties, "Attached");
-+	if (value) {
-+		handle_attached (self, value);
-+		g_value_unset (value);
-+	} else
-+		nm_log_warn (LOGD_MB, "(%s): %s: no 'Attached' property found",
-+		             nm_modem_get_path (NM_MODEM (self)),
-+		             __func__);
-+
-+done:
-+	g_object_unref (self);
-+}
-+
-+static void
-+ofono_conn_properties_changed (DBusGProxy *proxy,
-+                               const char *key,
-+                               GValue *value,
-+                               gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	if (g_strcmp0 (key, "Attached") == 0 && G_VALUE_HOLDS_BOOLEAN (value))
-+		handle_attached (self, value);
-+}
-+
-+static void
-+handle_subscriber_identity (NMModemOfono *self, GValue *value)
-+{
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	const gchar *value_str = g_value_get_string (value);
-+
-+	/* Check for empty DBus string value */
-+	if (g_strcmp0 (value_str, "(null)") != 0) {
-+
-+		if (g_strcmp0 (value_str, priv->imsi) != 0) {
-+
-+			if (priv->imsi != NULL) {
-+				nm_log_warn (LOGD_MB, "SimManager:'SubscriberIdentity' changed: %s", priv->imsi);
-+				g_free(priv->imsi);
-+			}
-+
-+			nm_log_info (LOGD_MB, "GetPropsDone: 'SubscriberIdentity': %s", priv->imsi);
-+
-+			priv->imsi = g_strdup (value_str);
-+			update_modem_state (self);
-+		}
-+	}
-+}
-+
-+
-+static void
-+get_ofono_sim_properties_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	NMModemState state = nm_modem_get_state (NM_MODEM (self));
-+	GError *error = NULL;
-+	GHashTable *properties = NULL;
-+	GValue *value = NULL;
-+	const gchar *value_str;
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	if (!dbus_g_proxy_end_call (proxy, call_id, &error,
-+		                        DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
-+		                        G_TYPE_INVALID)) {
-+		nm_log_warn (LOGD_MB, "failed to get ofono SimManager properties: (%d) %s",
-+		             error ? error->code : -1,
-+		             error && error->message ? error->message : "(unknown)");
-+		goto done;
-+	}
-+
-+	value = g_hash_table_lookup (properties, "SubscriberIdentity");
-+
-+	if (value) {
-+		handle_subscriber_identity (self, value);
-+		g_value_unset (value);
-+	} else {
-+		nm_log_warn (LOGD_MB, "failed to get SimManager:'SubscriberIdentity'; not found");
-+	}
-+
-+done:
-+	g_object_unref (self);
-+
-+}
-+
-+static void
-+ofono_sim_properties_changed (DBusGProxy *proxy,
-+                              const char *key,
-+                              GValue *value,
-+                              gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+
-+	if (g_strcmp0 (key, "SubscriberIdentity") == 0 && G_VALUE_HOLDS_STRING (value))
-+		handle_subscriber_identity (self, value);
-+}
-+
-+static void
-+ofono_context_added (DBusGProxy *proxy,
-+                     const char *path,
-+                     GValue *prop,
-+                     gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+
-+	nm_log_dbg (LOGD_MB, "context %s added", path);
-+}
-+
-+static void
-+ofono_context_removed (DBusGProxy *proxy, const char *path, gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+
-+	nm_log_dbg (LOGD_MB, "context %s removed", path);
-+}
-+
-+static void
-+ofono_properties_changed (DBusGProxy *proxy,
-+                          const char *key,
-+                          GValue *value,
-+                          gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	gboolean online;
-+
-+	nm_log_dbg (LOGD_MB, "in %s: %s", __func__, key);
-+
-+	if (g_strcmp0 (key, "Online") == 0 && G_VALUE_HOLDS_BOOLEAN (value)) {
-+
-+		online = g_value_get_boolean (value);
-+		if (online != priv->modem_online) {
-+			priv->modem_online = online;
-+
-+			nm_log_info (LOGD_MB, "(%s) modem is now %s",
-+			             nm_modem_get_path (NM_MODEM (self)),
-+			             online ? "Online" : "Offline");
-+
-+			update_modem_state (self);
-+		}
-+
-+	} else if (g_strcmp0 (key, "Interfaces") == 0 && G_VALUE_HOLDS_BOXED (value)) {
-+		gboolean found_simmanager = FALSE;
-+		gboolean found_conn_manager = FALSE;
-+		int i;
-+
-+		priv->interfaces = (char **) g_value_get_boxed (value);
-+		nm_log_info (LOGD_MB, "(%s) updated available interfaces", nm_modem_get_path (NM_MODEM (self)));
-+
-+		for (i = 0; priv->interfaces[i]; i++) {
-+			if (g_strrstr (priv->interfaces[i], "SimManager"))
-+				found_simmanager = TRUE;
-+			if (g_strrstr (priv->interfaces[i], "ConnectionManager"))
-+				found_conn_manager = TRUE;
-+		}
-+
-+		if (found_simmanager) {
-+			if (!priv->simmanager_proxy) {
-+				nm_log_info (LOGD_MB, "(%s): found new SimManager interface",
-+				             nm_modem_get_path (NM_MODEM (self)));
-+				priv->simmanager_proxy = get_ofono_proxy (self,
-+				                                          nm_modem_get_path (NM_MODEM (self)),
-+				                                          OFONO_DBUS_INTERFACE_SIM_MANAGER);
-+				dbus_g_proxy_add_signal (priv->simmanager_proxy, "PropertyChanged",
-+				                         G_TYPE_STRING, G_TYPE_VALUE,
-+				                         G_TYPE_INVALID);
-+				dbus_g_proxy_connect_signal (priv->simmanager_proxy, "PropertyChanged",
-+				                             G_CALLBACK (ofono_sim_properties_changed),
-+				                             self,
-+				                             NULL);
-+
-+				dbus_g_proxy_begin_call_with_timeout (priv->simmanager_proxy,
-+				                                      "GetProperties",
-+				                                      get_ofono_sim_properties_done,
-+				                                      g_object_ref (self), NULL, 20000,
-+				                                      G_TYPE_INVALID);
-+			}
-+		} else if (priv->simmanager_proxy) {
-+				nm_log_info (LOGD_MB, "(%s): SimManager interface disappeared",
-+				             nm_modem_get_path (NM_MODEM (self)));
-+				g_object_unref (priv->simmanager_proxy);
-+				priv->simmanager_proxy = NULL;
-+
-+				g_free (priv->imsi);
-+				priv->imsi = NULL;
-+
-+				update_modem_state (self);
-+		}
-+
-+		if (found_conn_manager) {
-+			if (!priv->connman_proxy) {
-+				nm_log_info (LOGD_MB, "(%s): found new ConnectionManager interface",
-+				             nm_modem_get_path (NM_MODEM (self)));
-+
-+				priv->connman_proxy = get_ofono_proxy (self,
-+				                                       nm_modem_get_path (NM_MODEM (self)),
-+				                                       OFONO_DBUS_INTERFACE_CONNECTION_MANAGER);
-+
-+				if (priv->connman_proxy) {
-+
-+					dbus_g_proxy_begin_call_with_timeout (priv->connman_proxy,
-+					                                      "GetProperties",
-+					                                      get_ofono_conn_manager_properties_done,
-+					                                      g_object_ref (self), NULL, 20000,
-+					                                      G_TYPE_INVALID);
-+
-+					dbus_g_proxy_add_signal (priv->connman_proxy, "PropertyChanged",
-+					                         G_TYPE_STRING, G_TYPE_VALUE,
-+					                         G_TYPE_INVALID);
-+					dbus_g_proxy_connect_signal (priv->connman_proxy, "PropertyChanged",
-+					                             G_CALLBACK (ofono_conn_properties_changed),
-+					                             self,
-+					                             NULL);
-+
-+					dbus_g_proxy_add_signal (priv->connman_proxy, "ContextAdded",
-+					                         DBUS_TYPE_G_OBJECT_PATH, DBUS_TYPE_G_MAP_OF_VARIANT,
-+					                         G_TYPE_INVALID);
-+					dbus_g_proxy_connect_signal (priv->connman_proxy, "ContextAdded",
-+					                             G_CALLBACK (ofono_context_added),
-+					                             self,
-+					                             NULL);
-+					dbus_g_proxy_add_signal (priv->connman_proxy, "ContextRemoved",
-+					                         DBUS_TYPE_G_OBJECT_PATH,
-+					                         G_TYPE_INVALID);
-+					dbus_g_proxy_connect_signal (priv->connman_proxy, "ContextRemoved",
-+					                             G_CALLBACK (ofono_context_removed),
-+					                             self,
-+					                             NULL);
-+				}
-+			}
-+		} else if (priv->connman_proxy) {
-+			nm_log_info (LOGD_MB, "(%s): ConnectionManager interface disappeared",
-+			             nm_modem_get_path (NM_MODEM (self)));
-+			g_object_unref (priv->connman_proxy);
-+			priv->connman_proxy = NULL;
-+
-+			/* The connection manager proxy disappeared, we should
-+			 * consider the modem disabled.
-+			 */
-+			priv->gprs_attached = FALSE;
-+
-+			update_modem_state (self);
-+		}
-+	}
-+}
-+
-+NMModem *
-+nm_modem_ofono_new (const char *path)
-+{
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+	g_return_val_if_fail (path != NULL, NULL);
-+
-+	nm_log_dbg (LOGD_MB, "in %s: path %s", __func__, path);
-+
-+	return (NMModem *) g_object_new (NM_TYPE_MODEM_OFONO,
-+	                                 NM_MODEM_PATH, path,
-+	                                 NM_MODEM_UID, (path + 1),
-+	                                 NM_MODEM_DEVICE_ID, (path + 1),
-+	                                 NM_MODEM_CONTROL_PORT, "ofono", /* mandatory */
-+	                                 NM_MODEM_DRIVER, "ofono",
-+	                                 NM_MODEM_STATE, NM_MODEM_STATE_INITIALIZING,
-+	                                 NULL);
-+}
-+
-+static void
-+stage1_prepare_done (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	GError *error = NULL;
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	if (priv->connect_properties) {
-+		g_hash_table_destroy (priv->connect_properties);
-+		priv->connect_properties = NULL;
-+	}
-+
-+	if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID)) {
-+		nm_log_warn (LOGD_MB, "OFONO connection failed: (%d) %s",
-+		             error ? error->code : -1,
-+		             error && error->message ? error->message : "(unknown)");
-+
-+		g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE,
-+		                       NM_DEVICE_STATE_REASON_MODEM_BUSY);
-+
-+		/*
-+		 * FIXME: add code to check for InProgress so that the
-+		 * connection doesn't continue to try and activate,
-+		 * leading to the connection being disabled, and a 5m
-+		 * timeout...
-+		 */
-+
-+		g_error_free (error);
-+	}
-+}
-+
-+static void
-+ofono_context_get_ip_properties (NMModemOfono *self)
-+{
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	NMPlatformIP4Address addr;
-+	NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE;
-+	GHashTable *properties, *ip_settings;
-+	GError *error = NULL;
-+	GType prop_dict;
-+	const gchar *address_string, *gateway_string, *netmask_string, *iface;
-+	gchar **dns;
-+	const gchar *mms_proxy;
-+	gpointer settings;
-+	gboolean ret = FALSE;
-+	guint32 address_network, gateway_network;
-+	guint i;
-+	guint prefix = 0;
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	prop_dict = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
-+	dbus_g_proxy_call_with_timeout (priv->context_proxy,
-+	                                "GetProperties",
-+	                                20000, &error,
-+	                                G_TYPE_INVALID,
-+	                                prop_dict, &properties,
-+	                                G_TYPE_INVALID);
-+
-+	if (!error) {
-+		settings = g_hash_table_lookup (properties, "Settings");
-+		if (settings && G_VALUE_HOLDS_BOXED (settings)) {
-+			ip_settings = (GHashTable*) g_value_get_boxed (settings);
-+
-+			if (nm_modem_get_state (NM_MODEM (self)) == NM_MODEM_STATE_CONNECTED
-+			    && g_hash_table_size(ip_settings) <= 0) {
-+				g_signal_emit_by_name (self, NM_MODEM_PPP_FAILED, NM_DEVICE_STATE_REASON_PPP_FAILED);
-+				return;
-+			}
-+
-+			nm_log_info (LOGD_MB, "(%s): IPv4 static configuration:",
-+			             nm_modem_get_uid (NM_MODEM (self)));
-+
-+			iface = g_value_get_string (g_hash_table_lookup (ip_settings, "Interface"));
-+			if (iface)
-+				g_object_set (self, NM_MODEM_DATA_PORT, iface,
-+				                    NM_MODEM_IP4_METHOD, NM_MODEM_IP_METHOD_STATIC,
-+				              NULL);
-+
-+			if (priv->ip4_config)
-+				g_object_unref (priv->ip4_config);
-+			priv->ip4_config = nm_ip4_config_new ();
-+			memset (&addr, 0, sizeof (addr));
-+
-+			address_string = g_value_get_string (g_hash_table_lookup (ip_settings, "Address"));
-+			if (address_string) {
-+				if (ip_string_to_network_address (address_string, &address_network)) {
-+					addr.address = address_network;
-+					addr.source = NM_IP_CONFIG_SOURCE_WWAN;
-+				}
-+			} else
-+				goto out;
-+
-+			/* retrieve netmask and convert to prefix value */
-+			netmask_string = g_value_get_string (g_hash_table_lookup (ip_settings, "Netmask"));
-+			if (ip_string_to_network_address (netmask_string, &address_network)) {
-+				prefix = nm_utils_ip4_netmask_to_prefix (address_network);
-+				if (prefix > 0)
-+					addr.plen = prefix;
-+			} else
-+				goto out;
-+
-+			nm_log_info (LOGD_MB, "  address %s/%d", address_string, prefix);
-+			nm_ip4_config_add_address (priv->ip4_config, &addr);
-+
-+			gateway_string = g_value_get_string (g_hash_table_lookup (ip_settings, "Gateway"));
-+			if (gateway_string) {
-+				if (ip_string_to_network_address (gateway_string, &gateway_network)) {
-+					nm_log_info (LOGD_MB, "  gateway %s", gateway_string);
-+					nm_ip4_config_set_gateway (priv->ip4_config, gateway_network);
-+				}
-+			} else
-+				goto out;
-+
-+			/* DNS servers */
-+			dns = (char **) g_value_get_boxed (g_hash_table_lookup (ip_settings, "DomainNameServers"));
-+			for (i = 0; dns[i]; i++) {
-+				if (   ip_string_to_network_address (dns[i], &address_network)
-+				    && address_network > 0) {
-+				    nm_ip4_config_add_nameserver (priv->ip4_config, address_network);
-+				    nm_log_info (LOGD_MB, "  DNS %s", dns[i]);
-+				}
-+			}
-+
-+			/* Handle the case for a shared internet and MMS context */
-+			mms_proxy = g_value_get_string (g_hash_table_lookup (properties, "MessageProxy"));
-+			if (mms_proxy) {
-+				nm_log_info (LOGD_MB, "  mms proxy: %s", mms_proxy);
-+
-+				/* If the value can't be mapped to a guint32, it's probably not
-+				 * an IP address; so we could access it via *any* internet
-+				 * connection anyway, no need for a specific host route.
-+				 */
-+				if (ip_string_to_network_address (mms_proxy, &address_network)) {
-+					NMPlatformIP4Route mms_route;
-+
-+					memset (&mms_route, 0, sizeof (mms_route));
-+					mms_route.network = address_network;
-+					mms_route.plen = 32;
-+					mms_route.gateway = gateway_network;
-+
-+					/* Setting a very low metric as MMS should go through
-+					 * the 3G connection...
-+					 */
-+					mms_route.metric = 1;
-+
-+					nm_ip4_config_add_route (priv->ip4_config, &mms_route);
-+				}
-+			}
-+
-+			ret = TRUE;
-+		}
-+	}
-+
-+out:
-+	if (!ret) {
-+		if (error) {
-+			reason = NM_DEVICE_STATE_REASON_CONFIG_FAILED;
-+			g_clear_error (&error);
-+		} else {
-+			reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
-+		}
-+	}
-+
-+	if (nm_modem_get_state (NM_MODEM (self)) != NM_MODEM_STATE_CONNECTED)
-+		g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, ret, reason);
-+}
-+
-+static void
-+context_properties_changed (DBusGProxy *proxy,
-+                            const char *key,
-+                            GValue *value,
-+                            gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+
-+	if (g_strcmp0("Settings", key) == 0) {
-+		ofono_context_get_ip_properties (self);
-+	}
-+}
-+
-+static void
-+do_context_activate (NMModemOfono *self, char *context_path)
-+{
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	GValue value = G_VALUE_INIT;
-+
-+	g_return_val_if_fail (self != NULL, FALSE);
-+	g_return_val_if_fail (NM_IS_MODEM_OFONO (self), FALSE);
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	g_value_init (&value, G_TYPE_BOOLEAN);
-+	g_value_set_boolean (&value, TRUE);
-+
-+	if (priv->context_proxy)
-+		g_object_unref (priv->context_proxy);
-+
-+	priv->context_proxy = get_ofono_proxy (self,
-+	                                       context_path,
-+	                                       OFONO_DBUS_INTERFACE_CONNECTION_CONTEXT);
-+
-+	if (!priv->context_proxy) {
-+		nm_log_err (LOGD_MB, "could not bring up connection context proxy");
-+		g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE,
-+		                       NM_DEVICE_STATE_REASON_MODEM_BUSY);
-+		return;
-+	}
-+
-+	if (!priv->gprs_attached) {
-+		g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE,
-+		                       NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER);
-+		return;
-+	}
-+
-+	if (priv->ip4_config) {
-+		/* We have an old copy of the settings from a previous activation,
-+		 * clear it so that we can gate getting the IP config from oFono
-+		 * on whether or not we have already received them
-+		 */
-+		g_object_unref (priv->ip4_config);
-+		priv->ip4_config = NULL;
-+	}
-+
-+	dbus_g_proxy_add_signal (priv->context_proxy, "PropertyChanged",
-+	                         G_TYPE_STRING, G_TYPE_VALUE,
-+	                         G_TYPE_INVALID);
-+	dbus_g_proxy_connect_signal (priv->context_proxy, "PropertyChanged",
-+	                             G_CALLBACK (context_properties_changed),
-+	                             self,
-+	                             NULL);
-+
-+	dbus_g_proxy_begin_call_with_timeout (priv->context_proxy,
-+	                                      "SetProperty", stage1_prepare_done,
-+	                                      g_object_ref (self), NULL, 40000,
-+	                                      G_TYPE_STRING, "Active",
-+	                                      G_TYPE_VALUE, &value,
-+	                                      G_TYPE_INVALID);
-+
-+}
-+
-+static void
-+context_set_property (gpointer key, gpointer value, gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	GValue val = G_VALUE_INIT;
-+
-+	nm_log_dbg (LOGD_MB, "%s -- setting context prop: %s == %s",
-+	            __func__,
-+	            (char*)key,
-+	            (char*)value);
-+
-+	g_value_init (&val, G_TYPE_STRING);
-+	g_value_set_string (&val, (char*)value);
-+
-+	if (!priv->property_error) {
-+		dbus_g_proxy_call_with_timeout (priv->context_proxy,
-+		                                "SetProperty",
-+		                                20000,
-+		                                &priv->property_error,
-+		                                G_TYPE_STRING, (char*)key,
-+		                                G_TYPE_VALUE, &val,
-+		                                G_TYPE_INVALID);
-+	} else {
-+		nm_log_warn (LOGD_MB, "could not set context property '%s': %s", (char*)key,
-+		             priv->property_error
-+		             && priv->property_error->message
-+		             ? priv->property_error->message : "(unknown)");
-+	}
-+}
-+
-+static void stage1_enable_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data);
-+
-+static void
-+stage1_enable_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (user_data);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	GError *error = NULL;
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	if (dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) {
-+		if (priv->context_path)
-+			do_context_activate (self, priv->context_path);
-+		else
-+			g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED);
-+	} else {
-+		nm_log_warn (LOGD_MB, "OFONO modem enable failed: (%d) %s",
-+		             error ? error->code : -1,
-+		             error && error->message ? error->message : "(unknown)");
-+
-+		g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED);
-+
-+		g_error_free (error);
-+	}
-+
-+	g_object_unref (self);
-+}
-+
-+static GHashTable *
-+create_connect_properties (NMConnection *connection)
-+{
-+	NMSettingGsm *setting;
-+	GHashTable *properties;
-+	const char *str;
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	setting = nm_connection_get_setting_gsm (connection);
-+	properties = g_hash_table_new (g_str_hash, g_str_equal);
-+
-+	str = nm_setting_gsm_get_apn (setting);
-+	if (str)
-+		g_hash_table_insert (properties, "AccessPointName", g_strdup (str));
-+
-+	str = nm_setting_gsm_get_username (setting);
-+	if (str)
-+		g_hash_table_insert (properties, "Username", g_strdup (str));
-+
-+	str = nm_setting_gsm_get_password (setting);
-+	if (str)
-+		g_hash_table_insert (properties, "Password", g_strdup (str));
-+
-+	return properties;
-+}
-+
-+static NMActStageReturn
-+act_stage1_prepare (NMModem *modem,
-+                    NMConnection *connection,
-+                    NMDeviceStateReason *reason)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (modem);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	const char *context_id;
-+	char *context_path;
-+	char **id = NULL;
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	context_id = nm_connection_get_id (connection);
-+	id = g_strsplit (context_id, "/", 0);
-+	g_assert (id[2]);
-+
-+	nm_log_dbg (LOGD_MB, " trying %s %s", id[1], id[2]);
-+
-+	if (priv->context_path)
-+		g_free (priv->context_path);
-+
-+	priv->context_path = g_strdup_printf ("%s/%s",
-+	                                      nm_modem_get_path (modem),
-+	                                      id[2]);
-+	g_strfreev (id);
-+
-+	if (!priv->context_path) {
-+		*reason = NM_DEVICE_STATE_REASON_GSM_APN_FAILED;
-+		return NM_ACT_STAGE_RETURN_FAILURE;
-+	}
-+
-+	if (priv->connect_properties)
-+		g_hash_table_destroy (priv->connect_properties);
-+	priv->connect_properties = create_connect_properties (connection);
-+
-+	nm_log_info (LOGD_MB, "(%s): activating context %s",
-+	             nm_modem_get_path (modem),
-+	             priv->context_path);
-+
-+	if (nm_modem_get_state (modem) == NM_MODEM_STATE_REGISTERED) {
-+		do_context_activate (self, priv->context_path);
-+	} else {
-+		nm_log_warn (LOGD_MB, "(%s): could not activate context, "
-+		             "modem is not registered.",
-+		             nm_modem_get_path (modem));
-+		*reason = NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER;
-+		return NM_ACT_STAGE_RETURN_FAILURE;
-+	}
-+
-+	return NM_ACT_STAGE_RETURN_POSTPONE;
-+}
-+
-+static NMActStageReturn
-+static_stage3_ip4_config_start (NMModem *_self,
-+                                NMActRequest *req,
-+                                NMDeviceStateReason *reason)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (_self);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
-+	GError *error = NULL;
-+
-+	if (priv->ip4_config) {
-+		g_signal_emit_by_name (self, NM_MODEM_IP4_CONFIG_RESULT, priv->ip4_config, error);
-+		priv->ip4_config = NULL;
-+		nm_modem_set_state (NM_MODEM (self),
-+		                    NM_MODEM_STATE_CONNECTED,
-+		                    nm_modem_state_to_string (NM_MODEM_STATE_CONNECTED));
-+		ret = NM_ACT_STAGE_RETURN_POSTPONE;
-+	}
-+
-+	return ret;
-+}
-+
-+static gboolean
-+check_connection_compatible (NMModem *modem,
-+                             NMConnection *connection)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (modem);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+	NMSettingConnection *s_con;
-+	NMSettingGsm *s_gsm;
-+	const char *uuid;
-+	const char *id;
-+
-+	s_con = nm_connection_get_setting_connection (connection);
-+	g_assert (s_con);
-+
-+	uuid = nm_connection_get_uuid (connection);
-+
-+	if (strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_GSM_SETTING_NAME)) {
-+		nm_log_dbg (LOGD_MB, "%s isn't of the right type, skipping.", uuid);
-+		return FALSE;
-+	}
-+
-+	s_gsm = nm_connection_get_setting_gsm (connection);
-+	if (!s_gsm)
-+		return FALSE;
-+
-+	id = nm_connection_get_id (connection);
-+	if (!g_strrstr (id, "/context")) {
-+		nm_log_dbg (LOGD_MB, "%s (%s) isn't of the right type, skipping.", id, uuid);
-+		return FALSE;
-+	}
-+
-+	if (! g_strrstr (id, priv->imsi)) {
-+		nm_log_dbg (LOGD_MB, "%s (%s) isn't for the right SIM, skipping.", id, uuid);
-+		return FALSE;
-+	}
-+
-+	nm_log_dbg (LOGD_MB, "%s (%s) looks compatible with IMSI %s", id, uuid, priv->imsi);
-+
-+	return TRUE;
-+}
-+
-+static void
-+get_ofono_properties_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-+{
-+	NMModem *self = NM_MODEM (user_data);
-+	GError *error = NULL;
-+	GHashTable *properties = NULL;
-+	GValue *value = NULL;
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	if (!dbus_g_proxy_end_call (proxy, call_id, &error,
-+		                        DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
-+		                        G_TYPE_INVALID)) {
-+		nm_log_warn (LOGD_MB, "failed get modem enabled state: (%d) %s",
-+		             error ? error->code : -1,
-+		             error && error->message ? error->message : "(unknown)");
-+		return;
-+	}
-+
-+	value = g_hash_table_lookup (properties, "Online");
-+	if (value)
-+		ofono_properties_changed (NULL, "Online", value, self);
-+	else
-+		nm_log_warn (LOGD_MB, "failed get modem online state: unexpected reply type");
-+	g_value_unset (value);
-+
-+	value = g_hash_table_lookup (properties, "Interfaces");
-+	if (value)
-+		ofono_properties_changed (NULL, "Interfaces", value, self);
-+	else
-+		nm_log_warn (LOGD_MB, "failed get available oFono interfaces: unexpected reply type");
-+	g_value_unset (value);
-+}
-+
-+static void
-+query_ofono_properties (NMModemOfono *self)
-+{
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+	dbus_g_proxy_begin_call (NM_MODEM_OFONO_GET_PRIVATE (self)->modem_proxy,
-+	                         "GetProperties", get_ofono_properties_done,
-+	                         self, NULL,
-+	                         G_TYPE_INVALID);
-+}
-+
-+static void
-+get_capabilities (NMModem *_self,
-+                  NMDeviceModemCapabilities *modem_caps,
-+                  NMDeviceModemCapabilities *current_caps)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (_self);
-+	NMDeviceModemCapabilities all_ofono_caps = NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS;
-+
-+	*modem_caps = all_ofono_caps;
-+	*current_caps = all_ofono_caps;
-+}
-+
-+static void
-+nm_modem_ofono_init (NMModemOfono *self)
-+{
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	priv->dbus_mgr = nm_dbus_manager_get ();
-+
-+	priv->modem_proxy = NULL;
-+	priv->connman_proxy = NULL;
-+	priv->context_proxy = NULL;
-+	priv->simmanager_proxy = NULL;
-+
-+	priv->modem_online = FALSE;
-+	priv->gprs_attached = FALSE;
-+
-+	priv->ip4_config = NULL;
-+}
-+
-+static GObject*
-+constructor (GType type,
-+             guint n_construct_params,
-+             GObjectConstructParam *construct_params)
-+{
-+	GObject *object;
-+	NMModemOfonoPrivate *priv;
-+	DBusGConnection *bus;
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	object = G_OBJECT_CLASS (nm_modem_ofono_parent_class)->constructor (type, n_construct_params, construct_params);
-+	if (!object)
-+		return NULL;
-+
-+	priv = NM_MODEM_OFONO_GET_PRIVATE (object);
-+	bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
-+	priv->modem_proxy = get_ofono_proxy (NM_MODEM_OFONO (object),
-+	                                     nm_modem_get_path (NM_MODEM (object)),
-+	                                     OFONO_DBUS_INTERFACE_MODEM);
-+
-+	dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
-+	                                   G_TYPE_NONE,
-+	                                   G_TYPE_STRING, G_TYPE_VALUE,
-+	                                   G_TYPE_INVALID);
-+	dbus_g_proxy_add_signal (priv->modem_proxy, "PropertyChanged",
-+	                         G_TYPE_STRING, G_TYPE_VALUE,
-+	                         G_TYPE_INVALID);
-+	dbus_g_proxy_connect_signal (priv->modem_proxy, "PropertyChanged",
-+	                             G_CALLBACK (ofono_properties_changed),
-+	                             object,
-+	                             NULL);
-+
-+	query_ofono_properties (NM_MODEM_OFONO (object));
-+
-+	return object;
-+}
-+
-+static void
-+dispose (GObject *object)
-+{
-+	NMModemOfono *self = NM_MODEM_OFONO (object);
-+	NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	if (priv->connect_properties) {
-+		g_hash_table_destroy (priv->connect_properties);
-+		priv->connect_properties = NULL;
-+	}
-+
-+	if (priv->ip4_config)
-+		g_clear_object (&priv->ip4_config);
-+
-+	if (priv->modem_proxy)
-+		g_clear_object (&priv->modem_proxy);
-+	if (priv->connman_proxy)
-+		g_clear_object (&priv->connman_proxy);
-+	if (priv->context_proxy)
-+		g_clear_object (&priv->context_proxy);
-+
-+	if (priv->imsi) {
-+		g_free (priv->imsi);
-+		priv->imsi = NULL;
-+	}
-+
-+	G_OBJECT_CLASS (nm_modem_ofono_parent_class)->dispose (object);
-+}
-+
-+static void
-+nm_modem_ofono_class_init (NMModemOfonoClass *klass)
-+{
-+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+	NMModemClass *modem_class = NM_MODEM_CLASS (klass);
-+
-+	nm_log_dbg (LOGD_MB, "in %s", __func__);
-+
-+	g_type_class_add_private (object_class, sizeof (NMModemOfonoPrivate));
-+
-+	/* Virtual methods */
-+	object_class->constructor = constructor;
-+	object_class->dispose = dispose;
-+
-+	modem_class->get_capabilities = get_capabilities;
-+	modem_class->disconnect = disconnect;
-+	modem_class->disconnect_finish = disconnect_finish;
-+	modem_class->deactivate_cleanup = deactivate_cleanup;
-+	modem_class->check_connection_compatible = check_connection_compatible;
-+	modem_class->act_stage1_prepare = act_stage1_prepare;
-+	modem_class->static_stage3_ip4_config_start = static_stage3_ip4_config_start;
-+}
-+
-Index: b/src/devices/wwan/nm-modem-ofono.h
-===================================================================
---- /dev/null
-+++ b/src/devices/wwan/nm-modem-ofono.h
-@@ -0,0 +1,64 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* NetworkManager -- Network link manager
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Copyright (C) 2013 - Canonical Ltd.
-+ */
-+
-+#ifndef NM_MODEM_OFONO_H
-+#define NM_MODEM_OFONO_H
-+
-+#include <nm-modem.h>
-+
-+G_BEGIN_DECLS
-+
-+#define NM_TYPE_MODEM_OFONO            (nm_modem_ofono_get_type ())
-+#define NM_MODEM_OFONO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_OFONO, NMModemOfono))
-+#define NM_IS_MODEM_OFONO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_OFONO))
-+#define NM_MODEM_OFONO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_MODEM_OFONO, NMModemOfonoClass))
-+#define NM_IS_MODEM_OFONO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_MODEM_OFONO))
-+#define NM_MODEM_OFONO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_MODEM_OFONO, NMModemOfonoClass))
-+#define NM_MODEM_OFONO_MODEM "modem"
-+
-+#define OFONO_DBUS_SERVICE                      "org.ofono"
-+#define OFONO_DBUS_PATH                         "/"
-+#define OFONO_DBUS_INTERFACE                    "org.ofono.Manager"
-+#define OFONO_DBUS_INTERFACE_MODEM              "org.ofono.Modem"
-+#define OFONO_DBUS_INTERFACE_CONNECTION_MANAGER "org.ofono.ConnectionManager"
-+#define OFONO_DBUS_INTERFACE_CONNECTION_CONTEXT "org.ofono.ConnectionContext"
-+#define OFONO_DBUS_INTERFACE_SIM_MANAGER        "org.ofono.SimManager"
-+
-+typedef enum {
-+        NM_OFONO_ERROR_CONNECTION_NOT_OFONO = 0,  /*< nick=ConnectionNotOfono >*/
-+        NM_OFONO_ERROR_CONNECTION_INVALID,      /*< nick=ConnectionInvalid >*/
-+        NM_OFONO_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/
-+} NMOfonoError;
-+
-+typedef struct {
-+	NMModem parent;
-+} NMModemOfono;
-+
-+typedef struct {
-+	NMModemClass parent;
-+} NMModemOfonoClass;
-+
-+GType nm_modem_ofono_get_type (void);
-+
-+NMModem *nm_modem_ofono_new (const char *path);
-+
-+G_END_DECLS
-+
-+#endif /* NM_MODEM_OFONO_H */
-Index: b/src/NetworkManagerUtils.c
-===================================================================
---- a/src/NetworkManagerUtils.c
-+++ b/src/NetworkManagerUtils.c
-@@ -2650,7 +2650,13 @@ _get_property_path (const char *ifname,
- 	                  ipv6 ? IPV6_PROPERTY_DIR : IPV4_PROPERTY_DIR,
- 	                  ifname,
- 	                  property);
--	g_assert (len < sizeof (path) - 1);
-+
-+	/* Ubuntu: don't assert, but log about the inconsistent size. */
-+	if (len > sizeof (path) - 1)
-+		nm_log_warn (LOGD_CORE,
-+		             "IPv6 property path is too long: '"
-+		             IPV6_PROPERTY_DIR "%s/%s'",
-+	                     ifname, property);
- 
- 	return path;
- }
-@@ -2707,9 +2713,15 @@ ASSERT_VALID_PATH_COMPONENT (const char
- fail:
- 	nm_log_err (LOGD_CORE, "Failed asserting path component: %s%s%s",
- 	            NM_PRINT_FMT_QUOTED (name, "\"", name, "\"", "(null)"));
--	g_error ("FATAL: Failed asserting path component: %s%s%s",
--	         NM_PRINT_FMT_QUOTED (name, "\"", name, "\"", "(null)"));
--	g_assert_not_reached ();
-+
-+	/* Ubuntu: Don't outright fail, just return the name again. It's
-+	 * logged as being invalid, which is enough.
-+	 * There is a use of slashes in paths for oFono modems, which are
-+	 * actually valid paths to refer to an oFono modem, just don't map to
-+	 * anything on the filesystem. The following calls to sysctl paths can
-+	 * (and will) fail, but that's fine.
-+	 */
-+	return name;
- }
- 
- gboolean
-Index: b/src/devices/wwan/nm-device-modem.c
-===================================================================
---- a/src/devices/wwan/nm-device-modem.c
-+++ b/src/devices/wwan/nm-device-modem.c
-@@ -280,6 +280,16 @@ modem_state_cb (NMModem *modem,
- 		}
- 	}
- 
-+	if (dev_state >= NM_DEVICE_STATE_DISCONNECTED &&
-+	    new_state == NM_MODEM_STATE_REGISTERED && old_state < NM_MODEM_STATE_REGISTERED) {
-+
-+		nm_log_info (LOGD_MB, "(%s): modem re-registered; re-checking autoconnect",
-+		             nm_device_get_iface (device));
-+
-+		g_object_set (G_OBJECT (device), NM_DEVICE_AUTOCONNECT, TRUE, NULL);
-+		nm_device_emit_recheck_auto_activate (device);
-+	}
-+
- 	if (new_state < NM_MODEM_STATE_CONNECTING &&
- 	    old_state >= NM_MODEM_STATE_CONNECTING &&
- 	    dev_state >= NM_DEVICE_STATE_NEED_AUTH &&
-@@ -343,6 +353,14 @@ device_state_changed (NMDevice *device,
- 		       nm_modem_state_to_string (nm_modem_get_state (priv->modem)));
- 	}
- 
-+	/* Block autoconnect until the modem is registered again */
-+	if (new_state == NM_DEVICE_STATE_FAILED && nm_modem_get_state (priv->modem) == NM_MODEM_STATE_SEARCHING) {
-+		nm_log_info (LOGD_MB, "(%s): modem searching; disabling autoconnect",
-+		             nm_device_get_iface (device));
-+
-+		g_object_set (G_OBJECT (device), NM_DEVICE_AUTOCONNECT, FALSE, NULL);
-+	}
-+
- 	nm_modem_device_state_changed (priv->modem, new_state, old_state, reason);
- 
- 	switch (reason) {

=== removed file 'debian/patches/0002-Force-online-state-with-unmanaged-devices.patch'
--- debian/patches/0002-Force-online-state-with-unmanaged-devices.patch	2015-08-20 01:07:00 +0000
+++ debian/patches/0002-Force-online-state-with-unmanaged-devices.patch	1970-01-01 00:00:00 +0000
@@ -1,194 +0,0 @@
-From: Michael Biebl <[e-mail]>
-Date: Wed, 2 Apr 2014 03:15:53 +0200
-Subject: Force online state with unmanaged devices
-
-If we have unmanaged devices in /e/n/i, monitor the ifupdown state file
-and in case we find active interfaces besides lo, forcefully set the
-online state to CONNECTED.
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
----
- src/nm-manager.c |  121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 121 insertions(+)
-
-Index: b/src/nm-manager.c
-===================================================================
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -62,6 +62,8 @@
- #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
- #define NM_AUTOIP_DBUS_IFACE   "org.freedesktop.nm_avahi_autoipd"
- 
-+#define IFUPDOWN_STATE_FILE "/run/network/ifstate"
-+
- static gboolean impl_manager_get_devices (NMManager *manager,
-                                           GPtrArray **devices,
-                                           GError **err);
-@@ -191,6 +193,11 @@ typedef struct {
- 	GFileMonitor *fw_monitor;
- 	guint fw_changed_id;
- 
-+	/* ifupdown state file monitor */
-+	GFileMonitor *ifstate_monitor;
-+	guint ifstate_monitor_id;
-+	gboolean ifstate_force_online;
-+
- 	guint timestamp_update_id;
- 
- 	gboolean startup;
-@@ -657,6 +664,29 @@ find_best_device_state (NMManager *manag
- 	return best_state;
- }
- 
-+static NMState
-+find_unmanaged_state (NMManager *manager, NMState current_state)
-+{
-+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
-+	NMState new_state = current_state;
-+	GSList *iter;
-+
-+	for (iter = priv->devices; iter; iter = iter->next) {
-+		NMDevice *dev = NM_DEVICE (iter->data);
-+		NMDeviceState state = nm_device_get_state (dev);
-+
-+
-+		if (state == NM_DEVICE_STATE_UNMANAGED) {
-+			const char *iface = nm_device_get_ip_iface (dev);
-+			if (priv->ifstate_force_online) {
-+				new_state = NM_STATE_CONNECTED_GLOBAL;
-+				nm_log_dbg (LOGD_CORE, "Unmanaged device found: %s; state CONNECTED forced.", iface);
-+			}
-+		}
-+	}
-+	return new_state;
-+}
-+
- static void
- nm_manager_update_state (NMManager *manager)
- {
-@@ -671,6 +701,8 @@ nm_manager_update_state (NMManager *mana
- 		new_state = NM_STATE_ASLEEP;
- 	else
- 		new_state = find_best_device_state (manager);
-+	if (new_state != NM_STATE_CONNECTED_GLOBAL)
-+		new_state = find_unmanaged_state (manager, new_state);
- 
- 	nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL);
- 
-@@ -4128,6 +4160,65 @@ start_factory (NMDeviceFactory *factory,
- 	nm_device_factory_start (factory);
- }
- 
-+static void
-+check_ifstate_file (gpointer user_data)
-+{
-+	NMManager *self = NM_MANAGER (user_data);
-+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-+	GIOChannel *channel;
-+	gchar *line;
-+	gboolean online = FALSE;
-+
-+	channel = g_io_channel_new_file (IFUPDOWN_STATE_FILE, "r", NULL);
-+	if (!channel) {
-+		nm_log_warn (LOGD_CORE, "Error: failed to open %s", IFUPDOWN_STATE_FILE);
-+		return;
-+	}
-+
-+	while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL)
-+	       != G_IO_STATUS_EOF && !online) {
-+		g_strstrip (line);
-+		if (strlen (line) > 0 && g_strcmp0 (line, "lo=lo") != 0) {
-+			online = TRUE;
-+		}
-+		g_free (line);
-+	}
-+
-+	g_io_channel_shutdown (channel, FALSE, NULL);
-+	g_io_channel_unref (channel);
-+
-+	if (priv->ifstate_force_online != online) {
-+		priv->ifstate_force_online = online;
-+		nm_manager_update_state (self);
-+	}
-+}
-+
-+static void
-+ifstate_file_changed (GFileMonitor *monitor,
-+                      GFile *file,
-+                      GFile *other_file,
-+                      GFileMonitorEvent event_type,
-+                      gpointer user_data)
-+{
-+	NMManager *self = NM_MANAGER (user_data);
-+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-+
-+	switch (event_type) {
-+//	case G_FILE_MONITOR_EVENT_CREATED:
-+//#if GLIB_CHECK_VERSION(2,23,4)
-+//	case G_FILE_MONITOR_EVENT_MOVED:
-+//#endif
-+//	case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-+	case G_FILE_MONITOR_EVENT_CHANGED:
-+	case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-+		nm_log_dbg (LOGD_CORE, "ifupdown state file %s was changed", IFUPDOWN_STATE_FILE);
-+		check_ifstate_file (user_data);
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
- void
- nm_manager_start (NMManager *self)
- {
-@@ -4174,6 +4265,9 @@ nm_manager_start (NMManager *self)
- 	system_create_virtual_devices (self);
- 
- 	check_if_startup_complete (self);
-+
-+	/* Trigger ifupdown state file check */
-+	check_ifstate_file (self);
- }
- 
- void
-@@ -4877,6 +4971,22 @@ nm_manager_init (NMManager *manager)
- 		             KERNEL_FIRMWARE_DIR);
- 	}
- 
-+	/* Monitor the ifupdown state file */
-+	file = g_file_new_for_path (IFUPDOWN_STATE_FILE);
-+	priv->ifstate_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL);
-+	g_object_unref (file);
-+
-+	if (priv->ifstate_monitor) {
-+		priv->ifstate_monitor_id = g_signal_connect (priv->ifstate_monitor, "changed",
-+		                                             G_CALLBACK (ifstate_file_changed),
-+		                                             manager);
-+		nm_log_info (LOGD_CORE, "monitoring ifupdown state file '%s'.",
-+		             IFUPDOWN_STATE_FILE);
-+	} else {
-+		nm_log_warn (LOGD_CORE, "failed to monitor ifupdown state file '%s'.",
-+		             IFUPDOWN_STATE_FILE);
-+	}
-+
- 	/* Update timestamps in active connections */
- 	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, manager);
- }
-@@ -5086,6 +5196,17 @@ dispose (GObject *object)
- 		g_clear_object (&priv->fw_monitor);
- 	}
- 
-+	if (priv->ifstate_monitor) {
-+		if (priv->ifstate_monitor_id)
-+			g_signal_handler_disconnect (priv->ifstate_monitor, priv->ifstate_monitor_id);
-+
-+		if (priv->ifstate_force_online)
-+			g_source_remove (priv->ifstate_force_online);
-+
-+		g_file_monitor_cancel (priv->ifstate_monitor);
-+		g_object_unref (priv->ifstate_monitor);
-+	}
-+
- 	nm_device_factory_manager_for_each_factory (_deinit_device_factory, manager);
- 	
- 	if (priv->timestamp_update_id) {

=== removed file 'debian/patches/0002-fixup-libnm-libnm-util-add-Wi-Fi-powersave-property.patch'
--- debian/patches/0002-fixup-libnm-libnm-util-add-Wi-Fi-powersave-property.patch	2015-08-20 01:07:00 +0000
+++ debian/patches/0002-fixup-libnm-libnm-util-add-Wi-Fi-powersave-property.patch	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-From fcd3642ef374927a44ae83a4c385c0bcd35e2f95 Mon Sep 17 00:00:00 2001
-From: Dan Williams <[e-mail]>
-Date: Mon, 17 Nov 2014 09:12:17 -0600
-Subject: [PATCH 2/5] fixup! libnm/libnm-util: add Wi-Fi 'powersave' property
-
----
- libnm-util/nm-setting-wireless.c |   10 ----------
- 1 file changed, 10 deletions(-)
-
-Index: b/libnm-util/nm-setting-wireless.c
-===================================================================
---- a/libnm-util/nm-setting-wireless.c
-+++ b/libnm-util/nm-setting-wireless.c
-@@ -876,16 +876,6 @@ verify (NMSetting *setting, GSList *all_
- 		}
- 	}
- 
--	if (priv->powersave > 1) {
--		g_set_error (error,
--		             NM_SETTING_WIRELESS_ERROR,
--		             NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
--		             _("'%u' is not a valid powersave value"),
--		             priv->powersave);
--		g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_POWERSAVE);
--		return FALSE;
--	}
--
- 	return TRUE;
- }
- 

=== removed file 'debian/patches/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch'
--- debian/patches/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch	2015-09-17 21:39:20 +0000
+++ debian/patches/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch	1970-01-01 00:00:00 +0000
@@ -1,171 +0,0 @@
-From ae6df9e3a98f67c8965d6e62e16abfc3d2550f90 Mon Sep 17 00:00:00 2001
-From: Thomas Voss <[e-mail]>
-Date: Tue, 11 Nov 2014 12:04:42 -0500
-Subject: [PATCH 2/2] wifi: cull the scan list before signalling ScanDone (bug
- 737414)
-
-The scan list should get cleaned up at the end of the scan, but before
-signalling that the scan is done (and before scheduling a new scan), so
-that when SCAN_DONE is received by applications, the scan list properly
-reflects the result of the scan, and don't retain some old APs.
-
-Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
----
- src/devices/wifi/nm-device-wifi.c |   35 +++++++++++++++++++++++++++++------
- 1 file changed, 29 insertions(+), 6 deletions(-)
-
-Index: network-manager-1.0.4/src/devices/wifi/nm-device-wifi.c
-===================================================================
---- network-manager-1.0.4.orig/src/devices/wifi/nm-device-wifi.c
-+++ network-manager-1.0.4/src/devices/wifi/nm-device-wifi.c
-@@ -123,7 +123,6 @@ struct _NMDeviceWifiPrivate {
- 	gint32            scheduled_scan_time;
- 	guint8            scan_interval; /* seconds */
- 	guint             pending_scan_id;
--	guint             scanlist_cull_id;
- 	gboolean          requested_scan;
- 
- 	NMSupplicantManager   *sup_mgr;
-@@ -160,11 +159,6 @@ static void supplicant_iface_new_bss_cb
-                                          GVariant *properties,
-                                          NMDeviceWifi * self);
- 
--static void supplicant_iface_bss_updated_cb (NMSupplicantInterface *iface,
--                                             const char *object_path,
--                                             GHashTable *properties,
--                                             NMDeviceWifi *self);
--
- static void supplicant_iface_bss_removed_cb (NMSupplicantInterface *iface,
-                                              const char *object_path,
-                                              NMDeviceWifi *self);
-@@ -177,7 +171,7 @@ static void supplicant_iface_notify_scan
-                                                  GParamSpec * pspec,
-                                                  NMDeviceWifi * self);
- 
--static void schedule_scanlist_cull (NMDeviceWifi *self);
-+static gboolean cull_scan_list(NMDeviceWifi *self);
- 
- static gboolean request_wireless_scan (gpointer user_data);
- 
-@@ -252,10 +246,6 @@ supplicant_interface_acquire (NMDeviceWi
- 	                  G_CALLBACK (supplicant_iface_new_bss_cb),
- 	                  self);
- 	g_signal_connect (priv->sup_iface,
--	                  NM_SUPPLICANT_INTERFACE_BSS_UPDATED,
--	                  G_CALLBACK (supplicant_iface_bss_updated_cb),
--	                  self);
--	g_signal_connect (priv->sup_iface,
- 	                  NM_SUPPLICANT_INTERFACE_BSS_REMOVED,
- 	                  G_CALLBACK (supplicant_iface_bss_removed_cb),
- 	                  self);
-@@ -287,11 +277,6 @@ supplicant_interface_release (NMDeviceWi
- 	_LOGD (LOGD_WIFI_SCAN, "reset scanning interval to %d seconds",
- 	       priv->scan_interval);
- 
--	if (priv->scanlist_cull_id) {
--		g_source_remove (priv->scanlist_cull_id);
--		priv->scanlist_cull_id = 0;
--	}
--
- 	if (priv->sup_iface) {
- 		remove_supplicant_interface_error_handler (self);
- 
-@@ -1607,14 +1592,17 @@ supplicant_iface_scan_done_cb (NMSupplic
- 
- 	_LOGD (LOGD_WIFI_SCAN, "scan %s", success ? "successful" : "failed");
- 
--	g_signal_emit (self, signals[SCAN_DONE], 0, NULL);
--
--	schedule_scan (self, success);
--
- 	/* Ensure that old APs get removed, which otherwise only
- 	 * happens when there are new BSSes.
- 	 */
--	schedule_scanlist_cull (self);
-+	cull_scan_list (self);
-+
-+	/* And let listeners know that a scan is done, with
-+	 * all last-seen timestamps being updated.
-+	 */
-+	g_signal_emit (self, signals[SCAN_DONE], 0, NULL);
-+
-+	schedule_scan (self, success);
- 
- 	if (priv->requested_scan) {
- 		priv->requested_scan = FALSE;
-@@ -1761,8 +1749,6 @@ cull_scan_list (NMDeviceWifi *self)
- 	GSList *elt;
- 	guint32 removed = 0, total = 0;
- 
--	priv->scanlist_cull_id = 0;
--
- 	_LOGD (LOGD_WIFI_SCAN, "checking scan list for outdated APs");
- 
- 	/* Walk the access point list and remove any access points older than
-@@ -1786,8 +1772,10 @@ cull_scan_list (NMDeviceWifi *self)
- 		 * supplicant in the last scan.
- 		 */
- 		if (   nm_ap_get_supplicant_path (ap)
--		    && g_object_get_data (G_OBJECT (ap), WPAS_REMOVED_TAG) == NULL)
-+		    && g_object_get_data (G_OBJECT (ap), WPAS_REMOVED_TAG) == NULL) {
-+			nm_ap_update_last_seen (ap);
- 			continue;
-+		}
- 
- 		last_seen = nm_ap_get_last_seen (ap);
- 		if (!last_seen || last_seen + prune_interval_s < boottime_now)
-@@ -1824,17 +1812,6 @@ cull_scan_list (NMDeviceWifi *self)
- }
- 
- static void
--schedule_scanlist_cull (NMDeviceWifi *self)
--{
--	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
--
--	/* Cull the scan list after the last request for it has come in */
--	if (priv->scanlist_cull_id)
--		g_source_remove (priv->scanlist_cull_id);
--	priv->scanlist_cull_id = g_timeout_add_seconds (4, (GSourceFunc) cull_scan_list, self);
--}
--
--static void
- supplicant_iface_new_bss_cb (NMSupplicantInterface *iface,
-                              const char *object_path,
-                              GVariant *properties,
-@@ -1863,36 +1840,6 @@ supplicant_iface_new_bss_cb (NMSupplican
- 		g_object_unref (ap);
- 	} else
- 		_LOGW (LOGD_WIFI_SCAN, "invalid AP properties received");
--
--	/* Remove outdated access points */
--	schedule_scanlist_cull (self);
--}
--
--static void
--supplicant_iface_bss_updated_cb (NMSupplicantInterface *iface,
--                                 const char *object_path,
--                                 GHashTable *properties,
--                                 NMDeviceWifi *self)
--{
--	NMDeviceState state;
--	NMAccessPoint *ap;
--
--	g_return_if_fail (self != NULL);
--	g_return_if_fail (object_path != NULL);
--	g_return_if_fail (properties != NULL);
--
--	/* Ignore new APs when unavailable or unamnaged */
--	state = nm_device_get_state (NM_DEVICE (self));
--	if (state <= NM_DEVICE_STATE_UNAVAILABLE)
--		return;
--
--	/* Update the AP's last-seen property */
--	ap = get_ap_by_supplicant_path (self, object_path);
--	if (ap)
--		nm_ap_update_last_seen (ap);
--
--	/* Remove outdated access points */
--	schedule_scanlist_cull (self);
- }
- 
- static void

=== removed file 'debian/patches/0002-wifi-expose-the-last_seen-property-for-a-NMAccessPoi.patch'
--- debian/patches/0002-wifi-expose-the-last_seen-property-for-a-NMAccessPoi.patch	2015-08-20 01:07:00 +0000
+++ debian/patches/0002-wifi-expose-the-last_seen-property-for-a-NMAccessPoi.patch	1970-01-01 00:00:00 +0000
@@ -1,337 +0,0 @@
-From 3c9a463eef6ed777734461e2a98c6d8e620acb39 Mon Sep 17 00:00:00 2001
-From: Mathieu Trudel-Lapierre <[e-mail]>
-Date: Tue, 11 Nov 2014 12:37:04 -0500
-Subject: [PATCH 2/2] wifi: expose the last_seen property for a NMAccessPoint
- over DBus
-
-Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
----
- introspection/nm-access-point.xml |    3 ++
- libnm-glib/libnm-glib.ver         |    1 
- libnm-glib/nm-access-point.c      |   36 +++++++++++++++++++++++++
- libnm-glib/nm-access-point.h      |    2 +
- src/devices/wifi/nm-device-wifi.c |    8 +++--
- src/devices/wifi/nm-wifi-ap.c     |   53 ++++++++++++++++++++++++++++++++------
- src/devices/wifi/nm-wifi-ap.h     |    6 ++--
- 7 files changed, 97 insertions(+), 12 deletions(-)
-
-Index: b/introspection/nm-access-point.xml
-===================================================================
---- a/introspection/nm-access-point.xml
-+++ b/introspection/nm-access-point.xml
-@@ -30,6 +30,9 @@
-     <property name="Strength" type="y" access="read">
-       <tp:docstring>The current signal quality of the access point, in percent.</tp:docstring>
-     </property>
-+    <property name="LastSeen" type="u" access="read">
-+      <tp:docstring>The timestamp for the last time the access point was found in scan results.</tp:docstring>
-+    </property>
- 
-     <signal name="PropertiesChanged">
-         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-Index: b/libnm-glib/libnm-glib.ver
-===================================================================
---- a/libnm-glib/libnm-glib.ver
-+++ b/libnm-glib/libnm-glib.ver
-@@ -11,6 +11,7 @@ global:
- 	nm_access_point_get_flags;
- 	nm_access_point_get_frequency;
- 	nm_access_point_get_hw_address;
-+	nm_access_point_get_last_seen;
- 	nm_access_point_get_max_bitrate;
- 	nm_access_point_get_mode;
- 	nm_access_point_get_rsn_flags;
-Index: b/libnm-glib/nm-access-point.c
-===================================================================
---- a/libnm-glib/nm-access-point.c
-+++ b/libnm-glib/nm-access-point.c
-@@ -53,6 +53,7 @@ typedef struct {
- 	NM80211Mode mode;
- 	guint32 max_bitrate;
- 	guint8 strength;
-+	guint32 last_seen;
- } NMAccessPointPrivate;
- 
- enum {
-@@ -67,6 +68,7 @@ enum {
- 	PROP_MAX_BITRATE,
- 	PROP_STRENGTH,
- 	PROP_BSSID,
-+	PROP_LAST_SEEN,
- 
- 	LAST_PROP
- };
-@@ -266,6 +268,23 @@ nm_access_point_get_strength (NMAccessPo
- }
- 
- /**
-+ * nm_access_point_get_last_seen:
-+ * @ap: a #NMAccessPoint
-+ *
-+ * Gets the last seen timestamp for the access point.
-+ *
-+ * Returns: the last seen time in seconds
-+ **/
-+guint32
-+nm_access_point_get_last_seen (NMAccessPoint *ap)
-+{
-+	g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), 0);
-+
-+	_nm_object_ensure_inited (NM_OBJECT (ap));
-+	return NM_ACCESS_POINT_GET_PRIVATE (ap)->last_seen;
-+}
-+
-+/**
-  * nm_access_point_connection_valid:
-  * @ap: an #NMAccessPoint to validate @connection against
-  * @connection: an #NMConnection to validate against @ap
-@@ -482,6 +501,9 @@ get_property (GObject *object,
- 	case PROP_STRENGTH:
- 		g_value_set_uchar (value, nm_access_point_get_strength (ap));
- 		break;
-+	case PROP_LAST_SEEN:
-+		g_value_set_uint (value, nm_access_point_get_last_seen (ap));
-+		break;
- 	default:
- 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- 		break;
-@@ -512,6 +534,7 @@ register_properties (NMAccessPoint *ap)
- 		{ NM_ACCESS_POINT_MODE,        &priv->mode },
- 		{ NM_ACCESS_POINT_MAX_BITRATE, &priv->max_bitrate },
- 		{ NM_ACCESS_POINT_STRENGTH,    &priv->strength },
-+		{ NM_ACCESS_POINT_LAST_SEEN,   &priv->last_seen },
- 		{ NULL },
- 	};
- 
-@@ -671,4 +694,17 @@ nm_access_point_class_init (NMAccessPoin
- 		                     0, G_MAXUINT8, 0,
- 		                     G_PARAM_READABLE |
- 		                     G_PARAM_STATIC_STRINGS));
-+
-+	/**
-+	 * NMAccessPoint:last-seen:
-+	 *
-+	 * The last seen timestamp of the access point.
-+	 **/
-+	g_object_class_install_property
-+		(object_class, PROP_LAST_SEEN,
-+		 g_param_spec_uint (NM_ACCESS_POINT_LAST_SEEN,
-+						"Last Seen",
-+						"Last Seen",
-+						0, G_MAXUINT32, 0,
-+						G_PARAM_READABLE));
- }
-Index: b/libnm-glib/nm-access-point.h
-===================================================================
---- a/libnm-glib/nm-access-point.h
-+++ b/libnm-glib/nm-access-point.h
-@@ -46,6 +46,7 @@ G_BEGIN_DECLS
- #define NM_ACCESS_POINT_MODE        "mode"
- #define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
- #define NM_ACCESS_POINT_STRENGTH    "strength"
-+#define NM_ACCESS_POINT_LAST_SEEN   "last-seen"
- 
- /* DEPRECATED */
- #define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
-@@ -80,6 +81,7 @@ guint32                nm_access_point_g
- NM80211Mode            nm_access_point_get_mode         (NMAccessPoint *ap);
- guint32                nm_access_point_get_max_bitrate  (NMAccessPoint *ap);
- guint8                 nm_access_point_get_strength     (NMAccessPoint *ap);
-+guint32                nm_access_point_get_last_seen    (NMAccessPoint *ap);
- 
- GSList *               nm_access_point_filter_connections (NMAccessPoint *ap,
-                                                            const GSList *connections);
-Index: b/src/devices/wifi/nm-device-wifi.c
-===================================================================
---- a/src/devices/wifi/nm-device-wifi.c
-+++ b/src/devices/wifi/nm-device-wifi.c
-@@ -1752,6 +1752,8 @@ cull_scan_list (NMDeviceWifi *self)
- {
- 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
- 	gint32 now = nm_utils_get_monotonic_timestamp_s ();
-+	guint32 boottime_now = nm_utils_monotonic_timestamp_as_boottime (now,
-+	                                                                 NM_UTILS_NS_PER_SECOND);
- 	GSList *outdated_list = NULL;
- 	GSList *elt;
- 	guint32 removed = 0, total = 0;
-@@ -1766,7 +1768,7 @@ cull_scan_list (NMDeviceWifi *self)
- 	for (elt = priv->ap_list; elt; elt = g_slist_next (elt), total++) {
- 		NMAccessPoint *ap = elt->data;
- 		const guint prune_interval_s = SCAN_INTERVAL_MAX * 3;
--		gint32 last_seen;
-+		guint32 last_seen;
- 
- 		/* Don't cull the associated AP or manually created APs */
- 		if (ap == priv->current_ap)
-@@ -1785,7 +1787,7 @@ cull_scan_list (NMDeviceWifi *self)
- 			continue;
- 
- 		last_seen = nm_ap_get_last_seen (ap);
--		if (!last_seen || last_seen + prune_interval_s < now)
-+		if (!last_seen || last_seen + prune_interval_s < boottime_now)
- 			outdated_list = g_slist_prepend (outdated_list, ap);
- 	}
- 
-@@ -1884,7 +1886,7 @@ supplicant_iface_bss_updated_cb (NMSuppl
- 	/* Update the AP's last-seen property */
- 	ap = get_ap_by_supplicant_path (self, object_path);
- 	if (ap)
--		nm_ap_set_last_seen (ap, nm_utils_get_monotonic_timestamp_s ());
-+		nm_ap_update_last_seen (ap);
- 
- 	/* Remove outdated access points */
- 	schedule_scanlist_cull (self);
-Index: b/src/devices/wifi/nm-wifi-ap.c
-===================================================================
---- a/src/devices/wifi/nm-wifi-ap.c
-+++ b/src/devices/wifi/nm-wifi-ap.c
-@@ -61,7 +61,7 @@ typedef struct
- 	gboolean			fake;	/* Whether or not the AP is from a scan */
- 	gboolean            hotspot;    /* Whether the AP is a local device's hotspot network */
- 	gboolean			broadcast;	/* Whether or not the AP is broadcasting (hidden) */
--	gint32              last_seen;  /* Timestamp when the AP was seen lastly (obtained via nm_utils_get_monotonic_timestamp_s()) */
-+	guint32			last_seen;  /* Timestamp when the AP was seen lastly (obtained via nm_utils_get_monotonic_timestamp_s()) */
- } NMAccessPointPrivate;
- 
- #define NM_AP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_AP, NMAccessPointPrivate))
-@@ -79,6 +79,7 @@ enum {
- 	PROP_MODE,
- 	PROP_MAX_BITRATE,
- 	PROP_STRENGTH,
-+	PROP_LAST_SEEN,
- 	LAST_PROP
- };
- 
-@@ -92,6 +93,7 @@ nm_ap_init (NMAccessPoint *ap)
- 	priv->flags = NM_802_11_AP_FLAGS_NONE;
- 	priv->wpa_flags = NM_802_11_AP_SEC_NONE;
- 	priv->rsn_flags = NM_802_11_AP_SEC_NONE;
-+	priv->last_seen = 0;
- 	priv->broadcast = TRUE;
- }
- 
-@@ -147,6 +149,9 @@ set_property (GObject *object, guint pro
- 		break;
- 	case PROP_HW_ADDRESS:
- 		break;
-+	case PROP_LAST_SEEN:
-+		nm_ap_set_last_seen (ap, g_value_get_uint (value));
-+		break;
- 	default:
- 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- 		break;
-@@ -195,6 +200,9 @@ get_property (GObject *object, guint pro
- 	case PROP_STRENGTH:
- 		g_value_set_schar (value, priv->strength);
- 		break;
-+	case PROP_LAST_SEEN:
-+		g_value_set_uint (value, priv->last_seen);
-+		break;
- 	default:
- 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- 		break;
-@@ -294,6 +302,14 @@ nm_ap_class_init (NMAccessPointClass *ap
- 		                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
- 		                    G_PARAM_STATIC_STRINGS));
- 
-+	g_object_class_install_property
-+		(object_class, PROP_LAST_SEEN,
-+		 g_param_spec_uint (NM_AP_LAST_SEEN,
-+							"Last Seen",
-+							"Last Seen",
-+							0, G_MAXUINT32, 0,
-+							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-+
- 	nm_dbus_manager_register_exported_type (nm_dbus_manager_get (),
- 	                                        G_TYPE_FROM_CLASS (ap_class),
- 	                                        &dbus_glib_nm_access_point_object_info);
-@@ -470,7 +486,7 @@ nm_ap_new_from_properties (const char *s
- 		return NULL;
- 	}
- 
--	nm_ap_set_last_seen (ap, nm_utils_get_monotonic_timestamp_s ());
-+	nm_ap_update_last_seen (ap);
- 
- 	if (!nm_ap_get_ssid (ap))
- 		nm_ap_set_broadcast (ap, FALSE);
-@@ -707,7 +723,7 @@ nm_ap_dump (NMAccessPoint *ap, const cha
- 	nm_log_dbg (LOGD_WIFI_SCAN, "    quality   %d", priv->strength);
- 	nm_log_dbg (LOGD_WIFI_SCAN, "    frequency %d", priv->freq);
- 	nm_log_dbg (LOGD_WIFI_SCAN, "    max rate  %d", priv->max_bitrate);
--	nm_log_dbg (LOGD_WIFI_SCAN, "    last-seen %d", (int) priv->last_seen);
-+	nm_log_dbg (LOGD_WIFI_SCAN, "    last-seen %d", priv->last_seen);
- }
- 
- const char *
-@@ -1053,20 +1069,43 @@ void nm_ap_set_broadcast (NMAccessPoint
-  * APs older than a certain date are dropped from the list.
-  *
-  */
--gint32
-+guint32
- nm_ap_get_last_seen (const NMAccessPoint *ap)
- {
--	g_return_val_if_fail (NM_IS_AP (ap), FALSE);
-+	g_return_val_if_fail (NM_IS_AP (ap), 0);
- 
- 	return NM_AP_GET_PRIVATE (ap)->last_seen;
- }
- 
- void
--nm_ap_set_last_seen (NMAccessPoint *ap, gint32 last_seen)
-+nm_ap_set_last_seen (NMAccessPoint *ap, guint32 last_seen)
-+{
-+	NMAccessPointPrivate *priv;
-+
-+	g_return_if_fail (NM_IS_AP (ap));
-+
-+	priv = NM_AP_GET_PRIVATE (ap);
-+
-+	if (priv->last_seen != last_seen) {
-+		priv->last_seen = last_seen;
-+		g_object_notify (G_OBJECT (ap), NM_AP_LAST_SEEN);
-+	}
-+}
-+
-+void
-+nm_ap_update_last_seen (NMAccessPoint *ap)
- {
-+	gint64 timestamp;
-+
- 	g_return_if_fail (NM_IS_AP (ap));
- 
--	NM_AP_GET_PRIVATE (ap)->last_seen = last_seen;
-+	timestamp = nm_utils_get_monotonic_timestamp_s();
-+	timestamp = nm_utils_monotonic_timestamp_as_boottime (timestamp,
-+	                                                      NM_UTILS_NS_PER_SECOND);
-+	g_return_if_fail (timestamp >= 0);
-+	g_return_if_fail (timestamp <= G_MAXUINT32);
-+
-+	nm_ap_set_last_seen (ap, (guint32) timestamp);
- }
- 
- gboolean
-Index: b/src/devices/wifi/nm-wifi-ap.h
-===================================================================
---- a/src/devices/wifi/nm-wifi-ap.h
-+++ b/src/devices/wifi/nm-wifi-ap.h
-@@ -43,6 +43,7 @@
- #define NM_AP_MODE "mode"
- #define NM_AP_MAX_BITRATE "max-bitrate"
- #define NM_AP_STRENGTH "strength"
-+#define NM_AP_LAST_SEEN "last-seen"
- 
- typedef struct {
- 	GObject parent;
-@@ -101,8 +102,9 @@ void     nm_ap_set_fake (NMAccessPoint *
- gboolean nm_ap_get_broadcast (NMAccessPoint *ap);
- void     nm_ap_set_broadcast (NMAccessPoint *ap, gboolean broadcast);
- 
--gint32   nm_ap_get_last_seen (const NMAccessPoint *ap);
--void     nm_ap_set_last_seen (NMAccessPoint *ap, gint32 last_seen);
-+guint32	nm_ap_get_last_seen	(const NMAccessPoint *ap);
-+void	nm_ap_set_last_seen	(NMAccessPoint *ap, guint32 last_seen);
-+void	nm_ap_update_last_seen	(NMAccessPoint *ap);
- 
- gboolean nm_ap_check_compatible (NMAccessPoint *self,
-                                  NMConnection *connection);

=== removed file 'debian/patches/0003-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch'
--- debian/patches/0003-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch	2015-08-20 01:07:00 +0000
+++ debian/patches/0003-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-From: Michael Biebl <[e-mail]>
-Date: Sat, 12 Apr 2014 12:38:09 +0200
-Subject: Don't setup Sleep Monitor if not booted with systemd
-
-NetworkManager uses systemd for suspend/resume support. It listens for
-the PrepareForSleep and Resume D-Bus signal sent by logind/systemd and
-deactivates the interfaces on sleep and reactivates them on resume.
-With a standalone logind we don't get a Resume signal and
-NetworkManager remains in sleep mode where the devices are unmanaged.
-As a workaround, skip the Sleep Monitor setup if not booted with
-systemd.
-
-Closes: #742933
----
- src/Makefile.am                |    2 ++
- src/nm-sleep-monitor-systemd.c |    5 +++++
- 2 files changed, 7 insertions(+)
-
-Index: b/src/Makefile.am
-===================================================================
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -422,6 +422,7 @@ AM_CPPFLAGS += \
- 	$(LIBSOUP_CFLAGS) \
- 	$(SYSTEMD_LOGIN_CFLAGS) \
- 	$(SYSTEMD_DHCP_CFLAGS) \
-+	$(SYSTEMD_INHIBIT_CFLAGS) \
- 	\
- 	-DBINDIR=\"$(bindir)\" \
- 	-DDATADIR=\"$(datadir)\" \
-@@ -459,6 +460,7 @@ libNetworkManager_la_LIBADD = \
- 	$(GUDEV_LIBS) \
- 	$(LIBNL_LIBS) \
- 	$(SYSTEMD_LOGIN_LIBS) \
-+	$(SYSTEMD_INHIBIT_LIBS) \
- 	$(LIBNDP_LIBS) \
- 	$(LIBDL) \
- 	$(LIBM)
-Index: b/src/nm-sleep-monitor-systemd.c
-===================================================================
---- a/src/nm-sleep-monitor-systemd.c
-+++ b/src/nm-sleep-monitor-systemd.c
-@@ -25,6 +25,7 @@
- #include <glib/gi18n.h>
- #include <gio/gio.h>
- #include <gio/gunixfdlist.h>
-+#include <systemd/sd-daemon.h>
- 
- #include "nm-logging.h"
- #include "nm-dbus-manager.h"
-@@ -193,6 +194,10 @@ on_proxy_acquired (GObject *object,
- static void
- nm_sleep_monitor_init (NMSleepMonitor *self)
- {
-+	if (!sd_booted()) {
-+		nm_log_warn (LOGD_SUSPEND, "Skipping Sleep Monitor setup, system not booted with systemd");
-+		return;
-+	}
- 	self->inhibit_fd = -1;
- 	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
- 	                          G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |

=== removed file 'debian/patches/0003-cli-add-support-for-wifi.powersave-setting.patch'
--- debian/patches/0003-cli-add-support-for-wifi.powersave-setting.patch	2015-08-20 01:07:00 +0000
+++ debian/patches/0003-cli-add-support-for-wifi.powersave-setting.patch	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-From 6d45410be3b4b7b01905046e1ba5115d86ba797a Mon Sep 17 00:00:00 2001
-From: Dan Williams <[e-mail]>
-Date: Mon, 17 Nov 2014 09:18:08 -0600
-Subject: [PATCH 3/5] cli: add support for wifi.powersave setting
-
----
- clients/cli/settings.c |   41 ++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 40 insertions(+), 1 deletion(-)
-
-Index: b/clients/cli/settings.c
-===================================================================
---- a/clients/cli/settings.c
-+++ b/clients/cli/settings.c
-@@ -198,6 +198,7 @@ NmcOutputField nmc_fields_setting_wirele
- 	SETTING_FIELD (NM_SETTING_WIRELESS_MTU, 6),                        /* 11 */
- 	SETTING_FIELD (NM_SETTING_WIRELESS_SEEN_BSSIDS, 35),               /* 12 */
- 	SETTING_FIELD (NM_SETTING_WIRELESS_HIDDEN, 10),                    /* 13 */
-+	SETTING_FIELD (NM_SETTING_WIRELESS_POWERSAVE, 10),                 /* 14 */
- 	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
- };
- #define NMC_FIELDS_SETTING_WIRELESS_ALL     "name"","\
-@@ -213,7 +214,8 @@ NmcOutputField nmc_fields_setting_wirele
-                                             NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST","\
-                                             NM_SETTING_WIRELESS_MTU","\
-                                             NM_SETTING_WIRELESS_SEEN_BSSIDS","\
--                                            NM_SETTING_WIRELESS_HIDDEN
-+                                            NM_SETTING_WIRELESS_HIDDEN"," \
-+                                            NM_SETTING_WIRELESS_POWERSAVE
- #define NMC_FIELDS_SETTING_WIRELESS_COMMON  NMC_FIELDS_SETTING_WIRELESS_ALL
- 
- /* Available fields for NM_SETTING_WIRELESS_SECURITY_SETTING_NAME */
-@@ -1553,6 +1555,15 @@ nmc_property_wireless_get_mtu (NMSetting
- 		return g_strdup_printf ("%d", mtu);
- }
- 
-+static char *
-+nmc_property_wifi_get_powersave (NMSetting *setting)
-+{
-+	NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting);
-+
-+	return nm_setting_wireless_get_powersave (s_wireless) ?
-+	    g_strdup (_("yes")) : g_strdup (_("no"));
-+}
-+
- /* --- NM_SETTING_WIRELESS_SECURITY_SETTING_NAME property get functions --- */
- DEFINE_GETTER (nmc_property_wifi_sec_get_key_mgmt, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT)
- DEFINE_GETTER (nmc_property_wifi_sec_get_wep_tx_keyidx, NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX)
-@@ -4195,6 +4206,27 @@ DEFINE_REMOVER_INDEX_OR_VALUE (nmc_prope
-                                nm_setting_wireless_remove_mac_blacklist_item,
-                                _validate_and_remove_wifi_mac_blacklist_item)
- 
-+/* 'powersave' */
-+static gboolean
-+nmc_property_wifi_set_powersave (NMSetting *setting, const char *prop, const char *val, GError **error)
-+{
-+	unsigned long powersave_int;
-+	gboolean val_bool = FALSE;
-+
-+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-+
-+	if (!nmc_string_to_uint (val, TRUE, 0, G_MAXUINT32, &powersave_int)) {
-+		if (!nmc_string_to_bool (val, &val_bool, NULL)) {
-+			g_set_error (error, 1, 0, _("'%s' is not a valid powersave value"), val);
-+			return FALSE;
-+		}
-+		powersave_int = val_bool ? 1 : 0;
-+	}
-+
-+	g_object_set (setting, prop, (guint32) powersave_int, NULL);
-+	return TRUE;
-+}
-+
- /* --- NM_SETTING_WIRELESS_SECURITY_SETTING_NAME property setter functions --- */
- /* 'key-mgmt' */
- static const char *wifi_sec_valid_key_mgmts[] = { "none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap", NULL };
-@@ -6174,6 +6206,13 @@ nmc_properties_init (void)
- 	                    NULL,
- 	                    NULL,
- 	                    NULL,
-+	                    NULL);
-+	nmc_add_prop_funcs (GLUE (WIRELESS, POWERSAVE),
-+	                    nmc_property_wifi_get_powersave,
-+	                    nmc_property_wifi_set_powersave,
-+	                    NULL,
-+	                    NULL,
-+	                    NULL,
- 	                    NULL);
- 
- 	/* Add editable properties for NM_SETTING_WIRELESS_SECURITY_SETTING_NAME */

=== removed file 'debian/patches/0004-Use-symlinks-for-nmtui.patch'
--- debian/patches/0004-Use-symlinks-for-nmtui.patch	2015-08-20 01:07:00 +0000
+++ debian/patches/0004-Use-symlinks-for-nmtui.patch	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-From: Michael Biebl <[e-mail]>
-Date: Thu, 10 Jul 2014 03:33:18 +0200
-Subject: Use symlinks for nmtui
-
-Make /usr/bin/nmtui-* symbolic links to /usr/bin/nmtui.
----
- configure.ac |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,6 +33,8 @@ AM_PROG_CC_C_O
- # C++ only required if --enable-qt=yes
- AC_PROG_CXX
- 
-+AC_PROG_LN_S
-+
- dnl Initialize libtool
- LT_PREREQ([2.2])
- LT_INIT([disable-static])
-diff --git a/clients/tui/Makefile.am b/clients/tui/Makefile.am
-index ad9335d..09f2700 100644
---- a/clients/tui/Makefile.am
-+++ b/clients/tui/Makefile.am
-@@ -24,7 +24,7 @@ links = nmtui-edit nmtui-connect nmtui-hostname
- 
- install-exec-hook:
- 	for link in $(links); do \
--		ln -f $(DESTDIR)$(bindir)/nmtui $(DESTDIR)$(bindir)/$$link; \
-+		cd $(DESTDIR)$(bindir) && $(LN_S) -f nmtui $$link; \
- 	done
- 
- uninstall-hook:

=== removed file 'debian/patches/0004-wifi-set-wireless-power-save-for-nl80211-devices-whe.patch'
--- debian/patches/0004-wifi-set-wireless-power-save-for-nl80211-devices-whe.patch	2015-08-20 01:07:00 +0000
+++ debian/patches/0004-wifi-set-wireless-power-save-for-nl80211-devices-whe.patch	1970-01-01 00:00:00 +0000
@@ -1,242 +0,0 @@
-From e5491d11b33ba90a611cb46651e724309d3b2d9e Mon Sep 17 00:00:00 2001
-From: Mathieu Trudel-Lapierre <[e-mail]>
-Date: Thu, 23 Oct 2014 14:19:59 -0400
-Subject: [PATCH 4/5] wifi: set wireless power-save for nl80211 devices when
- activated
-
-Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
-
-(fixups and WEXT implementation by dcbw)
----
- src/devices/wifi/nm-device-wifi.c      |    8 ++++++++
- src/platform/nm-linux-platform.c       |   10 ++++++++++
- src/platform/nm-platform.c             |   10 ++++++++++
- src/platform/nm-platform.h             |    2 ++
- src/platform/wifi/wifi-utils-nl80211.c |   19 +++++++++++++++++++
- src/platform/wifi/wifi-utils-private.h |    3 +++
- src/platform/wifi/wifi-utils-wext.c    |   25 +++++++++++++++++++++++++
- src/platform/wifi/wifi-utils.c         |    8 ++++++++
- src/platform/wifi/wifi-utils.h         |    2 ++
- 9 files changed, 87 insertions(+)
-
-Index: b/src/devices/wifi/nm-device-wifi.c
-===================================================================
---- a/src/devices/wifi/nm-device-wifi.c
-+++ b/src/devices/wifi/nm-device-wifi.c
-@@ -741,6 +741,8 @@ deactivate (NMDevice *device)
- 	if (nm_device_get_initial_hw_address (device))
- 		nm_device_set_hw_addr (device, nm_device_get_initial_hw_address (device), "reset", LOGD_WIFI);
- 
-+	nm_platform_wifi_set_powersave (NM_PLATFORM_GET, ifindex, 0);
-+
- 	/* Ensure we're in infrastructure mode after deactivation; some devices
- 	 * (usually older ones) don't scan well in adhoc mode.
- 	 */
-@@ -2724,6 +2726,12 @@ act_stage2_config (NMDevice *device, NMD
- 	if ((nm_ap_get_mode (ap) == NM_802_11_MODE_ADHOC) || nm_ap_is_hotspot (ap))
- 		ensure_hotspot_frequency (self, s_wireless, ap);
- 
-+	if (nm_ap_get_mode (ap) == NM_802_11_MODE_INFRA) {
-+		nm_platform_wifi_set_powersave (NM_PLATFORM_GET,
-+		                                nm_device_get_ifindex (device),
-+		                                nm_setting_wireless_get_powersave (s_wireless));
-+	}
-+
- 	/* Build up the supplicant configuration */
- 	config = build_supplicant_config (self, connection, nm_ap_get_freq (ap));
- 	if (config == NULL) {
-Index: b/src/platform/nm-linux-platform.c
-===================================================================
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -3857,6 +3857,15 @@ wifi_set_mode (NMPlatform *platform, int
- 		wifi_utils_set_mode (wifi_data, mode);
- }
- 
-+static void
-+wifi_set_powersave (NMPlatform *platform, int ifindex, guint32 powersave)
-+{
-+	WifiData *wifi_data = wifi_get_wifi_data (platform, ifindex);
-+
-+	if (wifi_data)
-+		wifi_utils_set_powersave (wifi_data, powersave);
-+}
-+
- static guint32
- wifi_find_frequency (NMPlatform *platform, int ifindex, const guint32 *freqs)
- {
-@@ -4995,6 +5004,7 @@ nm_linux_platform_class_init (NMLinuxPla
- 	platform_class->wifi_get_rate = wifi_get_rate;
- 	platform_class->wifi_get_mode = wifi_get_mode;
- 	platform_class->wifi_set_mode = wifi_set_mode;
-+	platform_class->wifi_set_powersave = wifi_set_powersave;
- 	platform_class->wifi_find_frequency = wifi_find_frequency;
- 	platform_class->wifi_indicate_addressing_running = wifi_indicate_addressing_running;
- 
-Index: b/src/platform/nm-platform.c
-===================================================================
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -1704,6 +1704,16 @@ nm_platform_wifi_get_ssid (NMPlatform *s
- 	return klass->wifi_get_ssid (self, ifindex);
- }
- 
-+void
-+nm_platform_wifi_set_powersave (NMPlatform *self, int ifindex, guint32 powersave)
-+{
-+	_CHECK_SELF_VOID (self, klass);
-+
-+	g_return_if_fail (ifindex > 0);
-+
-+	klass->wifi_set_powersave (self, ifindex, powersave);
-+}
-+
- guint32
- nm_platform_wifi_get_frequency (NMPlatform *self, int ifindex)
- {
-Index: b/src/platform/nm-platform.h
-===================================================================
---- a/src/platform/nm-platform.h
-+++ b/src/platform/nm-platform.h
-@@ -499,6 +499,7 @@ typedef struct {
- 	guint32     (*wifi_get_rate)         (NMPlatform *, int ifindex);
- 	NM80211Mode (*wifi_get_mode)         (NMPlatform *, int ifindex);
- 	void        (*wifi_set_mode)         (NMPlatform *, int ifindex, NM80211Mode mode);
-+	void        (*wifi_set_powersave)    (NMPlatform *, int ifindex, guint32 powersave);
- 	guint32     (*wifi_find_frequency)   (NMPlatform *, int ifindex, const guint32 *freqs);
- 	void        (*wifi_indicate_addressing_running) (NMPlatform *, int ifindex, gboolean running);
- 
-@@ -684,6 +685,7 @@ int         nm_platform_wifi_get_quality
- guint32     nm_platform_wifi_get_rate         (NMPlatform *self, int ifindex);
- NM80211Mode nm_platform_wifi_get_mode         (NMPlatform *self, int ifindex);
- void        nm_platform_wifi_set_mode         (NMPlatform *self, int ifindex, NM80211Mode mode);
-+void        nm_platform_wifi_set_powersave    (NMPlatform *self, int ifindex, guint32 powersave);
- guint32     nm_platform_wifi_find_frequency   (NMPlatform *self, int ifindex, const guint32 *freqs);
- void        nm_platform_wifi_indicate_addressing_running (NMPlatform *self, int ifindex, gboolean running);
- 
-Index: b/src/platform/wifi/wifi-utils-nl80211.c