Import Debian changes 1.12.2-0ubuntu3

network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium

  * debian/rules:
    - use --with-libnm-glib, the default reversed since that's a legacy
      library but we still need it for unity-control-center

network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium

  * debian/patches/git-newglib-test.patch:
    - backport upstream commit to fix the tests with the new glib 

network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium

  * New upstream version
  * d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
    d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
    d/p/git_thunderbolt_connect.patch:
    - removed, those changes are in the new version
  * Backport Debian changes
  * Update symbols file for libnm0
  * Enable iwd support
  * Drop version requirements when oldstable ships a newer version
  * Drop dh_strip override, the dbgsym migration is done
  * Rebase patches
  * Make sure the example server.conf is actually installed
  * Update install path for plugins, it now includes a version number
  * Drop libnl3 build dependency.
    Upstream has copied the code directly from libnl3 for the few functions it
    needs with a few small modifications.
  * Drop libiw build dependency.
    Hasn't been needed for a long time and was simply a left over from older
    releases.
  * Bump Standards-Version to 4.1.5
  * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)

19 files changed, 202 insertions, 580 deletions

diff --git a/debian/changelog b/debian/changelog
index 7d3af099..d2b54cbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium
+
+  * debian/rules:
+    - use --with-libnm-glib, the default reversed since that's a legacy
+      library but we still need it for unity-control-center
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 24 Aug 2018 11:00:09 +0200
+
+network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium
+
+  * debian/patches/git-newglib-test.patch:
+    - backport upstream commit to fix the tests with the new glib 
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 24 Aug 2018 10:44:12 +0200
+
+network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium
+
+  * New upstream version
+  * d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
+    d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
+    d/p/git_thunderbolt_connect.patch:
+    - removed, those changes are in the new version
+  * Backport Debian changes
+  * Update symbols file for libnm0
+  * Enable iwd support
+  * Drop version requirements when oldstable ships a newer version
+  * Drop dh_strip override, the dbgsym migration is done
+  * Rebase patches
+  * Make sure the example server.conf is actually installed
+  * Update install path for plugins, it now includes a version number
+  * Drop libnl3 build dependency.
+    Upstream has copied the code directly from libnl3 for the few functions it
+    needs with a few small modifications.
+  * Drop libiw build dependency.
+    Hasn't been needed for a long time and was simply a left over from older
+    releases.
+  * Bump Standards-Version to 4.1.5
+  * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 24 Aug 2018 09:27:39 +0200
+
 network-manager (1.10.8-1ubuntu4) cosmic; urgency=medium
 
   * debian/10-globally-managed-devices.conf: adjust exception for wwan to
diff --git a/debian/control b/debian/control
index 1ed109bf..8c56baea 100644
--- a/debian/control
+++ b/debian/control
@@ -13,11 +13,7 @@ Build-Depends: debhelper (>= 10.3),
                intltool,
                libdbus-glib-1-dev (>= 0.100),
                libdbus-1-dev (>= 1.1),
-               libiw-dev(>= 27+28pre9),
                libglib2.0-dev (>= 2.32),
-               libnl-3-dev (>= 3.2.8),
-               libnl-route-3-dev (>= 3.2.8),
-               libnl-genl-3-dev (>= 3.2.8),
                ppp-dev (>= 2.4.7-1+1),
                libpolkit-gobject-1-dev,
                libpolkit-agent-1-dev (>= 0.97),
@@ -47,7 +43,7 @@ Build-Depends: debhelper (>= 10.3),
                valac (>= 0.17.1.24),
                dbus <!nocheck>,
                python-dbus <!nocheck>
-Standards-Version: 4.1.3
+Standards-Version: 4.1.5
 Rules-Requires-Root: no
 Vcs-Git: https://code.launchpad.net/~network-manager/network-manager/+git/ubuntu
 Vcs-Browser: https://git.launchpad.net/network-manager?h=cosmic
@@ -58,12 +54,12 @@ Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         lsb-base (>= 3.2-14),
-         wpasupplicant (>= 0.7.3-1),
-         dbus (>= 1.1.2),
+         lsb-base,
+         wpasupplicant,
+         dbus,
          udev,
          adduser,
-         isc-dhcp-client (>= 4.1.1-P1-4),
+         isc-dhcp-client,
          libpam-systemd,
          policykit-1
 Recommends: ppp,
@@ -72,7 +68,6 @@ Recommends: ppp,
             modemmanager,
             network-manager-pptp,
             crda,
-            iputils-arping
 Suggests: avahi-autoipd, libteam-utils
 Breaks: ${misc:Breaks}
 Description: network management framework (daemon and userspace tools)
diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols
index 3da4fb3a..3e7c9ed1 100644
--- a/debian/libnm0.symbols
+++ b/debian/libnm0.symbols
@@ -4,6 +4,8 @@ libnm.so.0 libnm0 #MINVER#
  libnm_1_0_6@libnm_1_0_6 1.0.6
  libnm_1_10_0@libnm_1_10_0 1.9.90
  libnm_1_10_2@libnm_1_10_2 1.10.2
+ libnm_1_12_0@libnm_1_12_0 1.11.3
+ libnm_1_12_2@libnm_1_12_2 1.12.2
  libnm_1_2_0@libnm_1_2_0 1.1.90
  libnm_1_2_4@libnm_1_2_4 1.2.4
  libnm_1_4_0@libnm_1_4_0 1.4.0
@@ -51,6 +53,11 @@ libnm.so.0 libnm0 #MINVER#
  nm_agent_manager_error_quark@libnm_1_0_0 1.0.0
  nm_bluetooth_capabilities_get_type@libnm_1_0_0 1.0.0
  nm_capability_get_type@libnm_1_6_0 1.5.90
+ nm_checkpoint_create_flags_get_type@libnm_1_12_0 1.11.3
+ nm_checkpoint_get_created@libnm_1_12_0 1.11.3
+ nm_checkpoint_get_devices@libnm_1_12_0 1.11.3
+ nm_checkpoint_get_rollback_timeout@libnm_1_12_0 1.11.3
+ nm_checkpoint_get_type@libnm_1_12_0 1.11.3
  nm_client_activate_connection_async@libnm_1_0_0 1.0.0
  nm_client_activate_connection_finish@libnm_1_0_0 1.0.0
  nm_client_add_and_activate_connection_async@libnm_1_0_0 1.0.0
@@ -60,6 +67,14 @@ libnm.so.0 libnm0 #MINVER#
  nm_client_check_connectivity@libnm_1_0_0 1.0.0
  nm_client_check_connectivity_async@libnm_1_0_0 1.0.0
  nm_client_check_connectivity_finish@libnm_1_0_0 1.0.0
+ nm_client_checkpoint_adjust_rollback_timeout@libnm_1_12_0 1.11.3
+ nm_client_checkpoint_adjust_rollback_timeout_finish@libnm_1_12_0 1.11.3
+ nm_client_checkpoint_create@libnm_1_12_0 1.11.3
+ nm_client_checkpoint_create_finish@libnm_1_12_0 1.11.3
+ nm_client_checkpoint_destroy@libnm_1_12_0 1.11.3
+ nm_client_checkpoint_destroy_finish@libnm_1_12_0 1.11.3
+ nm_client_checkpoint_rollback@libnm_1_12_0 1.11.3
+ nm_client_checkpoint_rollback_finish@libnm_1_12_0 1.11.3
  nm_client_connectivity_check_get_available@libnm_1_10_0 1.9.90
  nm_client_connectivity_check_get_enabled@libnm_1_10_0 1.9.90
  nm_client_connectivity_check_set_enabled@libnm_1_10_0 1.9.90
@@ -71,6 +86,7 @@ libnm.so.0 libnm0 #MINVER#
  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_checkpoints@libnm_1_12_0 1.11.3
  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
@@ -151,12 +167,18 @@ libnm.so.0 libnm0 #MINVER#
  nm_connection_get_setting_macsec@libnm_1_6_0 1.5.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_ovs_bridge@libnm_1_12_2 1.12.2
+ nm_connection_get_setting_ovs_interface@libnm_1_12_2 1.12.2
+ nm_connection_get_setting_ovs_patch@libnm_1_12_2 1.12.2
+ nm_connection_get_setting_ovs_port@libnm_1_12_2 1.12.2
  nm_connection_get_setting_ppp@libnm_1_0_0 1.0.0
  nm_connection_get_setting_pppoe@libnm_1_0_0 1.0.0
  nm_connection_get_setting_proxy@libnm_1_6_0 1.5.90
  nm_connection_get_setting_serial@libnm_1_0_0 1.0.0
+ nm_connection_get_setting_tc_config@libnm_1_12_0 1.11.4
  nm_connection_get_setting_team@libnm_1_0_0 1.0.0
  nm_connection_get_setting_team_port@libnm_1_0_0 1.0.0
+ nm_connection_get_setting_tun@libnm_1_12_2 1.12.2
  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
@@ -260,6 +282,7 @@ libnm.so.0 libnm0 #MINVER#
  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_flags@libnm_1_12_0 1.11.3
  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
@@ -301,8 +324,10 @@ libnm.so.0 libnm0 #MINVER#
  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_ovs_bridge_get_slaves@libnm_1_12_2 1.12.2
  nm_device_ovs_bridge_get_type@libnm_1_10_0 1.9.90
  nm_device_ovs_interface_get_type@libnm_1_10_0 1.9.90
+ nm_device_ovs_port_get_slaves@libnm_1_12_2 1.12.2
  nm_device_ovs_port_get_type@libnm_1_10_0 1.9.90
  nm_device_ppp_get_type@libnm_1_10_0 1.9.90
  nm_device_reapply@libnm_1_2_0 1.1.90
@@ -355,6 +380,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_device_wifi_get_bitrate@libnm_1_0_0 1.0.0
  nm_device_wifi_get_capabilities@libnm_1_0_0 1.0.0
  nm_device_wifi_get_hw_address@libnm_1_0_0 1.0.0
+ nm_device_wifi_get_last_scan@libnm_1_12_0 1.11.90
  nm_device_wifi_get_mode@libnm_1_0_0 1.0.0
  nm_device_wifi_get_permanent_hw_address@libnm_1_0_0 1.0.0
  nm_device_wifi_get_type@libnm_1_0_0 1.0.0
@@ -436,6 +462,7 @@ libnm.so.0 libnm0 #MINVER#
  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_flags_get_type@libnm_1_12_0 1.11.3
  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
@@ -457,6 +484,8 @@ libnm.so.0 libnm0 #MINVER#
  nm_remote_connection_delete@libnm_1_0_0 1.0.0
  nm_remote_connection_delete_async@libnm_1_0_0 1.0.0
  nm_remote_connection_delete_finish@libnm_1_0_0 1.0.0
+ nm_remote_connection_get_filename@libnm_1_12_0 1.11.90
+ nm_remote_connection_get_flags@libnm_1_12_0 1.11.3
  nm_remote_connection_get_secrets@libnm_1_0_0 1.0.0
  nm_remote_connection_get_secrets_async@libnm_1_0_0 1.0.0
  nm_remote_connection_get_secrets_finish@libnm_1_0_0 1.0.0
@@ -638,6 +667,7 @@ libnm.so.0 libnm0 #MINVER#
  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_mdns@libnm_1_12_0 1.11.3
  nm_setting_connection_get_metered@libnm_1_0_6 1.0.6
  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
@@ -653,6 +683,7 @@ libnm.so.0 libnm0 #MINVER#
  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_mdns_get_type@libnm_1_12_0 1.11.3
  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
@@ -724,6 +755,7 @@ libnm.so.0 libnm0 #MINVER#
  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_dhcp_duid@libnm_1_12_0 1.11.90
  nm_setting_ip6_config_get_ip6_privacy@libnm_1_0_0 1.0.0
  nm_setting_ip6_config_get_token@libnm_1_4_0 1.4.0
  nm_setting_ip6_config_get_type@libnm_1_0_0 1.0.0
@@ -775,6 +807,7 @@ libnm.so.0 libnm0 #MINVER#
  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_flags@libnm_1_12_0 1.11.3
  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
@@ -796,6 +829,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_macsec_get_mode@libnm_1_6_0 1.5.90
  nm_setting_macsec_get_parent@libnm_1_6_0 1.5.90
  nm_setting_macsec_get_port@libnm_1_6_0 1.5.90
+ nm_setting_macsec_get_send_sci@libnm_1_12_0 1.11.90
  nm_setting_macsec_get_type@libnm_1_6_0 1.5.90
  nm_setting_macsec_get_validation@libnm_1_6_0 1.5.90
  nm_setting_macsec_mode_get_type@libnm_1_6_0 1.5.90
@@ -969,9 +1003,11 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_vpn_foreach_data_item@libnm_1_0_0 1.0.0
  nm_setting_vpn_foreach_secret@libnm_1_0_0 1.0.0
  nm_setting_vpn_get_data_item@libnm_1_0_0 1.0.0
+ nm_setting_vpn_get_data_keys@libnm_1_12_0 1.11.3
  nm_setting_vpn_get_num_data_items@libnm_1_0_0 1.0.0
  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_secret_keys@libnm_1_12_0 1.11.3
  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
@@ -1056,6 +1092,7 @@ libnm.so.0 libnm0 #MINVER#
  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_get_wake_on_wlan@libnm_1_12_0 1.11.90
  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
@@ -1066,7 +1103,9 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_wireless_security_clear_groups@libnm_1_0_0 1.0.0
  nm_setting_wireless_security_clear_pairwise@libnm_1_0_0 1.0.0
  nm_setting_wireless_security_clear_protos@libnm_1_0_0 1.0.0
+ nm_setting_wireless_security_fils_get_type@libnm_1_12_0 1.11.3
  nm_setting_wireless_security_get_auth_alg@libnm_1_0_0 1.0.0
+ nm_setting_wireless_security_get_fils@libnm_1_12_0 1.11.3
  nm_setting_wireless_security_get_group@libnm_1_0_0 1.0.0
  nm_setting_wireless_security_get_key_mgmt@libnm_1_0_0 1.0.0
  nm_setting_wireless_security_get_leap_password@libnm_1_0_0 1.0.0
@@ -1096,6 +1135,8 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_wireless_security_remove_proto_by_value@libnm_1_0_0 1.0.0
  nm_setting_wireless_security_set_wep_key@libnm_1_0_0 1.0.0
  nm_setting_wireless_security_wps_method_get_type@libnm_1_10_0 1.9.90
+ nm_setting_wireless_wake_on_wlan_get_type@libnm_1_12_0 1.11.90
+ nm_settings_connection_flags_get_type@libnm_1_12_0 1.11.3
  nm_settings_error_get_type@libnm_1_0_0 1.0.0
  nm_settings_error_quark@libnm_1_0_0 1.0.0
  nm_settings_update2_flags_get_type@libnm_1_10_2 1.10.2
@@ -1168,6 +1209,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_utils_file_is_private_key@libnm_1_0_0 1.0.0
  nm_utils_file_search_in_paths@libnm_1_0_0 1.0.0
  nm_utils_format_variant_attributes@libnm_1_8_0 1.8.0
+ nm_utils_get_timestamp_msec@libnm_1_12_0 1.11.90
  nm_utils_hexstr2bin@libnm_1_0_0 1.0.0
  nm_utils_hwaddr_atoba@libnm_1_0_0 1.0.0
  nm_utils_hwaddr_aton@libnm_1_0_0 1.0.0
@@ -1295,6 +1337,7 @@ libnm.so.0 libnm0 #MINVER#
  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_plugin_shutdown@libnm_1_12_0 1.11.3
  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
diff --git a/debian/network-manager.install b/debian/network-manager.install
index 5bb4a1f2..4568e8fd 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -5,11 +5,11 @@ usr/bin/nmtui*
 usr/lib/NetworkManager/nm-dhcp-helper
 usr/lib/NetworkManager/nm-iface-helper
 usr/lib/NetworkManager/nm-dispatcher
-usr/lib/*/NetworkManager/libnm-settings-plugin-ifupdown.so
-usr/lib/*/NetworkManager/libnm-settings-plugin-ibft.so
-usr/lib/*/NetworkManager/libnm-device-plugin-*.so
-usr/lib/*/NetworkManager/libnm-ppp-plugin.so
-usr/lib/*/NetworkManager/libnm-wwan.so
+usr/lib/*/NetworkManager/*/libnm-settings-plugin-ifupdown.so
+usr/lib/*/NetworkManager/*/libnm-settings-plugin-ibft.so
+usr/lib/*/NetworkManager/*/libnm-device-plugin-*.so
+usr/lib/*/NetworkManager/*/libnm-ppp-plugin.so
+usr/lib/*/NetworkManager/*/libnm-wwan.so
 usr/lib/pppd/*/*.so
 usr/share/locale/
 usr/share/man/
diff --git a/debian/patches/Disable-general-with-expect.patch b/debian/patches/Disable-general-with-expect.patch
index fd96d4fd..c053fe1e 100644
--- a/debian/patches/Disable-general-with-expect.patch
+++ b/debian/patches/Disable-general-with-expect.patch
@@ -7,11 +7,11 @@ which tends to fail on ppc64el and arm64
  Makefile.am | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index 698e3e3..4979f2b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3073,7 +3073,6 @@ src_tests_ldadd = \
+Index: network-manager-1.12.2/Makefile.am
+===================================================================
+--- network-manager-1.12.2.orig/Makefile.am
++++ network-manager-1.12.2/Makefile.am
+@@ -3180,7 +3180,6 @@ src_tests_ldadd = \
  
  check_programs += \
  	src/tests/test-general \
diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
index 694b05b5..51d0a0b2 100644
--- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
+++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
@@ -10,10 +10,10 @@ to be autostarted by a client request.
  2 files changed, 6 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 639921d..2ddc7bc 100644
+index b1a2e69..b168008 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3689,11 +3689,6 @@ endif
+@@ -3894,11 +3894,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@
  
@@ -26,13 +26,14 @@ index 639921d..2ddc7bc 100644
  
  examples_DATA += data/server.conf
 diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
-index 95d58f9..1502b89 100644
+index 2692935..ff90456 100644
 --- a/data/NetworkManager.service.in
 +++ b/data/NetworkManager.service.in
-@@ -24,6 +24,5 @@ ProtectHome=read-only
+@@ -24,7 +24,6 @@ ProtectHome=read-only
  
  [Install]
  WantedBy=multi-user.target
 -Alias=dbus-org.freedesktop.NetworkManager.service
  Also=NetworkManager-dispatcher.service
  
+ # We want to enable NetworkManager-wait-online.service whenever this service
diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
index eb6fbd17..e2516d62 100644
--- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
+++ b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
@@ -16,7 +16,7 @@ Closes: #742933
  1 file changed, 5 insertions(+)
 
 diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
-index 7a37387..867e0d8 100644
+index a7e3a7c..9931f12 100644
 --- a/src/nm-sleep-monitor.c
 +++ b/src/nm-sleep-monitor.c
 @@ -25,6 +25,7 @@
@@ -27,7 +27,7 @@ index 7a37387..867e0d8 100644
  
  #include "nm-core-internal.h"
  #include "NetworkManagerUtils.h"
-@@ -345,6 +346,10 @@ on_proxy_acquired (GObject *object,
+@@ -344,6 +345,10 @@ on_proxy_acquired (GObject *object,
  static void
  nm_sleep_monitor_init (NMSleepMonitor *self)
  {
diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch
index c6ca5f72..7af98133 100644
--- a/debian/patches/Fix-iscsiadm-path.patch
+++ b/debian/patches/Fix-iscsiadm-path.patch
@@ -12,7 +12,7 @@ binary as /sbin/iscsiadm (and /usr/bin/iscsiadm is a compat symlink).
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c
-index ea4d152..09a4579 100644
+index 77ce208..f84276d 100644
 --- a/src/settings/plugins/ibft/nms-ibft-plugin.c
 +++ b/src/settings/plugins/ibft/nms-ibft-plugin.c
 @@ -74,7 +74,7 @@ read_connections (NMSIbftPlugin *self)
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 649b8bd0..094c39be 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -8,23 +8,23 @@ online state to CONNECTED.
 
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
 ---
- src/nm-manager.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 117 insertions(+)
+ src/nm-manager.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 115 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index f3bbebd..1c24c6f 100644
+index 289dcf8..1b657fe 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -62,6 +62,8 @@
- #include "introspection/org.freedesktop.NetworkManager.h"
- #include "introspection/org.freedesktop.NetworkManager.Device.h"
+ #include "nm-dispatcher.h"
+ #include "NetworkManagerUtils.h"
  
 +#define IFUPDOWN_STATE_FILE "/run/network/ifstate"
 +
  /*****************************************************************************/
  
  typedef struct {
-@@ -169,6 +171,10 @@ typedef struct {
+@@ -192,6 +194,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,24 +35,22 @@ index f3bbebd..1c24c6f 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -1125,6 +1131,29 @@ find_best_device_state (NMManager *manager)
+@@ -1387,6 +1393,27 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
 +static NMState
-+find_unmanaged_state (NMManager *manager, NMState current_state)
++find_unmanaged_state (NMManager *self, NMState current_state)
 +{
-+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
++	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
 +	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);
++	NMDevice *device;
 +
++	c_list_for_each_entry (device, &priv->devices_lst_head, devices_lst) {
++		NMDeviceState state = nm_device_get_state (device);
 +
 +		if (state == NM_DEVICE_STATE_UNMANAGED) {
-+			const char *iface = nm_device_get_ip_iface (dev);
++			const char *iface = nm_device_get_ip_iface (device);
 +			if (priv->ifstate_force_online) {
 +				new_state = NM_STATE_CONNECTED_GLOBAL;
 +				nm_log_dbg (LOGD_CORE, "Unmanaged device found: %s; state CONNECTED forced.", iface);
@@ -65,17 +63,17 @@ index f3bbebd..1c24c6f 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -1163,6 +1192,9 @@ nm_manager_update_state (NMManager *manager)
+@@ -1425,6 +1452,9 @@ nm_manager_update_state (NMManager *self)
  	else
- 		new_state = find_best_device_state (manager);
+ 		new_state = find_best_device_state (self);
  
 +	if (new_state != NM_STATE_CONNECTED_GLOBAL)
-+		new_state = find_unmanaged_state (manager, new_state);
++		new_state = find_unmanaged_state (self, new_state);
 +
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5464,6 +5496,62 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -5872,6 +5902,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -138,7 +136,7 @@ index f3bbebd..1c24c6f 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -5615,6 +5703,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -6022,6 +6108,9 @@ nm_manager_start (NMManager *self, GError **error)
  	nm_clear_g_source (&priv->devices_inited_id);
  	priv->devices_inited_id = g_idle_add_full (G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL);
  
@@ -148,7 +146,7 @@ index f3bbebd..1c24c6f 100644
  	return TRUE;
  }
  
-@@ -6610,6 +6701,22 @@ nm_manager_init (NMManager *self)
+@@ -6885,6 +6974,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -171,7 +169,7 @@ index f3bbebd..1c24c6f 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -6892,6 +6999,16 @@ dispose (GObject *object)
+@@ -7160,6 +7265,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/Read-system-connections-from-run.patch b/debian/patches/Read-system-connections-from-run.patch
index f64fb40c..69790014 100644
--- a/debian/patches/Read-system-connections-from-run.patch
+++ b/debian/patches/Read-system-connections-from-run.patch
@@ -8,11 +8,11 @@ Bug-Ubuntu: https://launchpad.net/bugs/1594551
  src/settings/plugins/keyfile/nms-keyfile-plugin.c | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
-diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
-index 4af8014..297ac3d 100644
---- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
-+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
-@@ -410,6 +410,8 @@ _sort_paths (const char **f1, const char **f2, GHashTable *paths)
+Index: network-manager-1.12.2/src/settings/plugins/keyfile/nms-keyfile-plugin.c
+===================================================================
+--- network-manager-1.12.2.orig/src/settings/plugins/keyfile/nms-keyfile-plugin.c
++++ network-manager-1.12.2/src/settings/plugins/keyfile/nms-keyfile-plugin.c
+@@ -411,6 +411,8 @@ _sort_paths (const char **f1, const char
  	return strcmp (*f1, *f2);
  }
  
@@ -21,7 +21,7 @@ index 4af8014..297ac3d 100644
  static void
  read_connections (NMSettingsPlugin *config)
  {
-@@ -445,6 +447,22 @@ read_connections (NMSettingsPlugin *config)
+@@ -446,6 +448,22 @@ read_connections (NMSettingsPlugin *conf
  	}
  	g_dir_close (dir);
  
diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch
index 3c1acc31..d80cf672 100644
--- a/debian/patches/Update-dnsmasq-parameters.patch
+++ b/debian/patches/Update-dnsmasq-parameters.patch
@@ -10,11 +10,11 @@ See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolv
  src/dns/nm-dns-manager.c | 6 +++---
  2 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
-index e6436c7..09a968c 100644
---- a/src/dns/nm-dns-dnsmasq.c
-+++ b/src/dns/nm-dns-dnsmasq.c
-@@ -504,8 +504,8 @@ start_dnsmasq (NMDnsDnsmasq *self)
+Index: network-manager-1.12.2/src/dns/nm-dns-dnsmasq.c
+===================================================================
+--- network-manager-1.12.2.orig/src/dns/nm-dns-dnsmasq.c
++++ network-manager-1.12.2/src/dns/nm-dns-dnsmasq.c
+@@ -330,8 +330,8 @@ start_dnsmasq (NMDnsDnsmasq *self)
  	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
  	argv[idx++] = "--bind-interfaces";
  	argv[idx++] = "--pid-file=" PIDFILE;
@@ -25,11 +25,11 @@ index e6436c7..09a968c 100644
  	argv[idx++] = "--clear-on-reload"; /* clear cache when dns server changes */
  	argv[idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */
  	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
-diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
-index dc54547..b3ded33 100644
---- a/src/dns/nm-dns-manager.c
-+++ b/src/dns/nm-dns-manager.c
-@@ -1082,12 +1082,12 @@ update_dns (NMDnsManager *self,
+Index: network-manager-1.12.2/src/dns/nm-dns-manager.c
+===================================================================
+--- network-manager-1.12.2.orig/src/dns/nm-dns-manager.c
++++ network-manager-1.12.2/src/dns/nm-dns-manager.c
+@@ -1426,12 +1426,12 @@ update_dns (NMDnsManager *self,
  		;
  	}
  
@@ -44,7 +44,7 @@ index dc54547..b3ded33 100644
  
  		if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) {
  			/* systemd-resolved uses a different link-local address */
-@@ -1448,7 +1448,7 @@ nm_dns_manager_stop (NMDnsManager *self)
+@@ -1756,7 +1756,7 @@ nm_dns_manager_stop (NMDnsManager *self)
  	_LOGT ("stopping...");
  
  	/* If we're quitting, leave a valid resolv.conf in place, not one
diff --git a/debian/patches/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch b/debian/patches/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch
deleted file mode 100644
index 2f918bbe..00000000
--- a/debian/patches/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From e91f1a7d2a6b8400b6b331d5b72287dcb5164a39 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 10 Jan 2018 11:23:33 +0100
-Subject: [PATCH] dns: introduce routing domains
-
-Similarly to what systemd-resolved does, introduce the concept of
-"routing" domain, which is a domain in the search list that is used
-only to decide the interface over which a query must be forwarded, but
-is not used to complete unqualified host names. Routing domains are
-those starting with a tilde ('~') before the actual domain name.
-
-Domains without the initial tilde are used both for completing
-unqualified names and for the routing decision.
----
- clients/common/settings-docs.h.in |  4 ++--
- libnm-core/nm-setting-ip-config.c |  5 ++++-
- src/dns/nm-dns-dnsmasq.c          |  8 +++++---
- src/dns/nm-dns-manager.c          | 36 ++++++++++++++++++++++++++----------
- src/dns/nm-dns-systemd-resolved.c | 21 ++++++++++-----------
- src/nm-core-utils.c               | 15 +++++++++++++++
- src/nm-core-utils.h               |  2 ++
- 7 files changed, 64 insertions(+), 27 deletions(-)
-
---- a/src/dns/nm-dns-systemd-resolved.c
-+++ b/src/dns/nm-dns-systemd-resolved.c
-@@ -144,7 +144,8 @@
- 	int addr_family;
- 	gsize addr_size;
- 	guint i, n;
--	gboolean route_only;
-+	gboolean is_routing;
-+	const char *domain;
- 
- 	if (NM_IS_IP4_CONFIG (config))
- 		addr_family = AF_INET;
-@@ -178,33 +179,31 @@
- 		g_variant_builder_close (dns);
- 	}
- 
--	/* If this link is never the default (e.g. only used for resources on this
--	 * network) add a routing domain. */
--	route_only =   addr_family == AF_INET
--	             ? !nm_ip4_config_best_default_route_get (config)
--	             : !nm_ip6_config_best_default_route_get (config);
--
- 	n =   addr_family == AF_INET
- 	    ? nm_ip4_config_get_num_searches (config)
- 	    : nm_ip6_config_get_num_searches (config);
- 	if (n  > 0) {
- 		for (i = 0; i < n; i++) {
-+			domain = nm_utils_parse_dns_domain (addr_family == AF_INET
-+			                                    ? nm_ip4_config_get_search (config, i)
-+			                                    : nm_ip6_config_get_search (config, i),
-+			                                    &is_routing);
- 			g_variant_builder_add (domains, "(sb)",
--			                       addr_family == AF_INET
--			                         ? nm_ip4_config_get_search (config, i)
--			                         : nm_ip6_config_get_search (config, i),
--			                       route_only);
-+			                       domain,
-+			                       is_routing);
- 		}
- 	} else {
- 		n =   addr_family == AF_INET
- 		    ? nm_ip4_config_get_num_domains (config)
- 		    : nm_ip6_config_get_num_domains (config);
- 		for (i = 0; i < n; i++) {
-+			domain = nm_utils_parse_dns_domain (addr_family == AF_INET
-+			                                    ? nm_ip4_config_get_domain (config, i)
-+			                                    : nm_ip6_config_get_domain (config, i),
-+			                                    &is_routing);
- 			g_variant_builder_add (domains, "(sb)",
--			                       addr_family == AF_INET
--			                         ? nm_ip4_config_get_domain (config, i)
--			                         : nm_ip6_config_get_domain (config, i),
--			                       route_only);
-+			                       domain,
-+			                       is_routing);
- 		}
- 	}
- }
---- a/src/nm-core-utils.c
-+++ b/src/nm-core-utils.c
-@@ -4329,6 +4329,21 @@
- 	return g_string_free (str, FALSE);
- }
- 
-+const char *
-+nm_utils_parse_dns_domain (const char *domain, gboolean *is_routing)
-+{
-+	g_return_val_if_fail (domain, NULL);
-+	g_return_val_if_fail (domain[0], NULL);
-+
-+	if (domain[0] == '~') {
-+		domain++;
-+		NM_SET_OUT (is_routing, TRUE);
-+	} else
-+		NM_SET_OUT (is_routing, FALSE);
-+
-+	return domain;
-+}
-+
- /*****************************************************************************/
- 
- NM_UTILS_ENUM2STR_DEFINE (nm_icmpv6_router_pref_to_string, NMIcmpv6RouterPref,
---- a/src/nm-core-utils.h
-+++ b/src/nm-core-utils.h
-@@ -450,4 +450,6 @@
- 
- /*****************************************************************************/
- 
-+const char *nm_utils_parse_dns_domain (const char *domain, gboolean *is_routing);
-+
- #endif /* __NM_CORE_UTILS_H__ */
diff --git a/debian/patches/git-newglib-test.patch b/debian/patches/git-newglib-test.patch
new file mode 100644
index 00000000..eec6aafb
--- /dev/null
+++ b/debian/patches/git-newglib-test.patch
@@ -0,0 +1,24 @@
+From 3e8eef538987c909e87b871a6b8c74aee08661a3 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Sat, 11 Aug 2018 11:08:42 +0200
+Subject: [PATCH] utils/test: don't assert on debug level messages
+
+They come and go in GLib core for all sorts of purposes. Don't let that
+break our tests.
+---
+ shared/nm-utils/nm-test-utils.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
+index 246357f8a..b575382e4 100644
+--- a/shared/nm-utils/nm-test-utils.h
++++ b/shared/nm-utils/nm-test-utils.h
+@@ -574,7 +574,7 @@ __nmtst_init (int *argc, char ***argv, g
+ 	} else {
+ 		/* We were called not to set logging levels. This means, that the user
+ 		 * expects to assert against (all) messages. Any uncought message is fatal. */
+-		g_log_set_always_fatal (G_LOG_LEVEL_MASK);
++		g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG);
+ 	}
+ 
+ 	if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) &&
diff --git a/debian/patches/git_thunderbolt_connect.patch b/debian/patches/git_thunderbolt_connect.patch
deleted file mode 100644
index f4d31e15..00000000
--- a/debian/patches/git_thunderbolt_connect.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 89af7fbfa6cc4f43446b2f38c3ddd885b5be79f1 Mon Sep 17 00:00:00 2001
-From: Christian Kellner <christian@kellner.me>
-Date: Thu, 19 Apr 2018 14:05:52 +0200
-Subject: [PATCH] all: add support for thunderbolt networking
-
-Load the thunderbolt-net module if we see a host-to-host connection
-and configure the resulting ethernet connection automatically to be
-a link-local only one. The latter is done by setting a new udev
-property "NM_AUTO_DEFAULT_LINK_LOCAL_ONLY" which is picked up when
-we configure the connection for the device.
-
-https://github.com/NetworkManager/NetworkManager/pull/97
----
- Makefile.am                      |  4 +++-
- data/90-nm-thunderbolt.rules     | 13 +++++++++++++
- src/devices/nm-device-ethernet.c | 23 +++++++++++++++++++++++
- 4 files changed, 41 insertions(+), 2 deletions(-)
- create mode 100644 data/90-nm-thunderbolt.rules
-
-Index: network-manager-1.10.8/Makefile.am
-===================================================================
---- network-manager-1.10.8.orig/Makefile.am
-+++ network-manager-1.10.8/Makefile.am
-@@ -3714,7 +3714,8 @@ if WITH_UDEV_DIR
- udevrulesdir = $(UDEV_DIR)/rules.d
- udevrules_DATA = \
- 	data/84-nm-drivers.rules \
--	data/85-nm-unmanaged.rules
-+	data/85-nm-unmanaged.rules \
-+	data/90-nm-thunderbolt.rules
- endif
- 
- data/server.conf: $(srcdir)/data/server.conf.in
-@@ -3729,6 +3730,7 @@ EXTRA_DIST += \
- 	data/org.freedesktop.NetworkManager.service.in \
- 	data/84-nm-drivers.rules \
- 	data/85-nm-unmanaged.rules \
-+	data/90-nm-thunderbolt.rules \
- 	data/server.conf.in
- 
- CLEANFILES += \
-Index: network-manager-1.10.8/data/90-nm-thunderbolt.rules
-===================================================================
---- /dev/null
-+++ network-manager-1.10.8/data/90-nm-thunderbolt.rules
-@@ -0,0 +1,13 @@
-+# Do not modify this file, it will get overwritten on updates.
-+# To override or extend the rules place a file in /etc/udev/rules.d
-+
-+ACTION!="add", GOTO="nm_thunderbolt_end"
-+
-+# Load he thunderbolt-net driver if we a device of type thunderbolt_xdomain
-+# is added.
-+SUBSYSTEM=="thunderbolt", ENV{DEVTYPE}=="thunderbolt_xdomain", RUN{builtin}+="kmod load thunderbolt-net"
-+
-+# For all thunderbolt network devices, we want to enable link-local configuration
-+SUBSYSTEM=="net", ENV{ID_NET_DRIVER}=="thunderbolt-net", ENV{NM_AUTO_DEFAULT_LINK_LOCAL_ONLY}="1"
-+
-+LABEL="nm_thunderbolt_end"
-Index: network-manager-1.10.8/src/devices/nm-device-ethernet.c
-===================================================================
---- network-manager-1.10.8.orig/src/devices/nm-device-ethernet.c
-+++ network-manager-1.10.8/src/devices/nm-device-ethernet.c
-@@ -51,6 +51,7 @@
- #include "nm-device-factory.h"
- #include "nm-core-internal.h"
- #include "NetworkManagerUtils.h"
-+#include "nm-utils/nm-udev-utils.h"
- 
- #include "introspection/org.freedesktop.NetworkManager.Device.Wired.h"
- 
-@@ -1425,7 +1426,9 @@ new_default_connection (NMDevice *self)
- 	NMConnection *connection;
- 	NMSettingsConnection *const*connections;
- 	NMSetting *setting;
-+	struct udev_device *dev;
- 	const char *perm_hw_addr;
-+	const char *uprop = "0";
- 	gs_free char *defname = NULL;
- 	gs_free char *uuid = NULL;
- 	gs_free char *machine_id = NULL;
-@@ -1470,6 +1473,26 @@ new_default_connection (NMDevice *self)
- 	g_object_set (setting, NM_SETTING_WIRED_MAC_ADDRESS, perm_hw_addr, NULL);
- 	nm_connection_add_setting (connection, setting);
- 
-+	/* Check if we should create a Link-Local only connection */
-+	dev = nm_platform_link_get_udev_device (nm_device_get_platform (NM_DEVICE (self)), nm_device_get_ip_ifindex (self));
-+	if (dev)
-+		uprop = udev_device_get_property_value (dev, "NM_AUTO_DEFAULT_LINK_LOCAL_ONLY");
-+
-+	if (nm_udev_utils_property_as_boolean (uprop)) {
-+		setting = nm_setting_ip4_config_new ();
-+		g_object_set (setting,
-+		              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
-+		              NULL);
-+		nm_connection_add_setting (connection, setting);
-+
-+		setting = nm_setting_ip6_config_new ();
-+		g_object_set (setting,
-+		              NM_SETTING_IP_CONFIG_METHOD,  NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL,
-+		              NM_SETTING_IP_CONFIG_MAY_FAIL, TRUE,
-+		              NULL);
-+		nm_connection_add_setting (connection, setting);
-+	}
-+
- 	return connection;
- }
- 
diff --git a/debian/patches/libnm-Check-self-still-NMManager-or-not.patch b/debian/patches/libnm-Check-self-still-NMManager-or-not.patch
index 94cd7a01..0dfbfebb 100644
--- a/debian/patches/libnm-Check-self-still-NMManager-or-not.patch
+++ b/debian/patches/libnm-Check-self-still-NMManager-or-not.patch
@@ -7,11 +7,11 @@ Return if self is not NMManager or it will crash.
  libnm/nm-manager.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
-index e664b71..f8e2be2 100644
---- a/libnm/nm-manager.c
-+++ b/libnm/nm-manager.c
-@@ -839,7 +839,7 @@ find_active_connection_by_path (NMManager *self, const char *ac_path)
+Index: network-manager-1.12.2/libnm/nm-manager.c
+===================================================================
+--- network-manager-1.12.2.orig/libnm/nm-manager.c
++++ network-manager-1.12.2/libnm/nm-manager.c
+@@ -924,7 +924,7 @@ find_active_connection_by_path (NMManage
  static void
  recheck_pending_activations (NMManager *self)
  {
@@ -20,7 +20,7 @@ index e664b71..f8e2be2 100644
  	CList *iter, *safe;
  	NMActiveConnection *candidate;
  	const GPtrArray *devices;
-@@ -849,6 +849,10 @@ recheck_pending_activations (NMManager *self)
+@@ -934,6 +934,10 @@ recheck_pending_activations (NMManager *
  
  	object_manager = _nm_object_get_dbus_object_manager (NM_OBJECT (self));
  
diff --git a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
deleted file mode 100644
index 357d427a..00000000
--- a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Sat, 4 Nov 2017 20:41:45 +0100
-Subject: libnm: register empty NMClient and NetworkManager when loading libnm
- with GIR
-
-Register empty "NMClient" and "NetworkManager" GIR modules as soon as libnm is
-loaded witch gnome-introspection. This prevents the real modules from being
-loaded because they would in turn load libnm-glib and abort() and crash.
-
-In particular this prevents the GNOME shell from crashing with
-libnm-glib abort and allows gracefully disabling the extensions which
-use the obsolete library.
-
-Test:
-
-  $ cat test.js
-  const NM = imports.gi.NM;
-  print (NM.SecretAgentGetSecretsFlags.ALLOW_INTERACTION);
-
-  const NMClient = imports.gi.NMClient;
-  print (NMClient.SecretAgentGetSecretsFlags.ALLOW_INTERACTION);
-
-Before:
-
-  $ gjs test.js
-  1
-
-  (gjs:16253): libnm-util-ERROR **: libnm symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported
-  Trace/breakpoint trap (core dumped)
-  $
-
-After:
-
-  $ gjs test.js
-  1
-  Gjs-Message: JS WARNING: [test.js 5]: reference to undefined property "SecretAgentGetSecretsFlags"
-
-  (gjs:16228): Gjs-WARNING **: JS ERROR: TypeError: NMClient.SecretAgentGetSecretsFlags is undefined
-  @test.js:5:1
-
-  JS_EvaluateScript() failed
-
-(cherry picked from commit 4d1f090aedf05c0e2955d431638e311d1e18a52f)
----
- Makefile.am                               | 18 +++++++
- configure.ac                              | 20 ++++++--
- libnm/fake-typelib/NMClient.gir           |  9 ++++
- libnm/fake-typelib/NetworkManager.gir     | 10 ++++
- libnm/fake-typelib/typelibs.gresource.xml |  7 +++
- libnm/nm-libnm-utils.c                    | 82 +++++++++++++++++++++++++++++++
- 6 files changed, 143 insertions(+), 3 deletions(-)
- create mode 100644 libnm/fake-typelib/NMClient.gir
- create mode 100644 libnm/fake-typelib/NetworkManager.gir
- create mode 100644 libnm/fake-typelib/typelibs.gresource.xml
-
-diff --git a/Makefile.am b/Makefile.am
-index 2ddc7bc..a741c6e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -858,6 +858,7 @@ nodist_libnminclude_HEADERS += \
- noinst_LTLIBRARIES += libnm/libnm-utils.la
- 
- libnm_libnm_utils_la_CPPFLAGS = \
-+	$(INTROSPECTION_CFLAGS) \
- 	$(libnm_lib_cppflags)
- 
- libnm_libnm_utils_la_SOURCES = \
-@@ -956,6 +957,23 @@ libnm/libnm.typelib: libnm/libnm.gir
- 	$(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@
- 
- INTROSPECTION_GIRS += libnm/NM-1.0.gir
-+
-+if WITH_FAKE_TYPELIBS
-+
-+libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir
-+	$(AM_V_GEN)  $(INTROSPECTION_COMPILER) $< -o $@
-+
-+libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir
-+	$(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
-+
-+libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib
-+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/libnm/fake-typelib --generate-source --manual-register --internal
-+
-+libnm_libnm_utils_la_SOURCES += \
-+	libnm/fake-typelib/typelibs.c
-+
-+endif
-+
- endif
- 
- if HAVE_INTROSPECTION
-diff --git a/configure.ac b/configure.ac
-index 86ce219..a9fb1db 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -322,9 +322,12 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_V
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- 
-+GOBJECT_INTROSPECTION_CHECK([0.9.6])
-+
- AC_ARG_WITH(libnm-glib,
-             AS_HELP_STRING([--without-libnm-glib],
--                           [don't build legacy libraries]))
-+                           [don"'"t build legacy libraries]))
-+fake_typelibs=no
- if test "$with_libnm_glib" != "no"; then
- 	PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.94, :,
- 	                  [AC_MSG_FAILURE([$DBUS_PKG_ERRORS
-@@ -333,13 +336,24 @@ Configure with --without-libnm-glib if you do not need the legacy libraries])
- 	                  ])
- 
- 	with_libnm_glib=yes
-+
-+	if test "${found_introspection}" = "yes"; then
-+		AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
-+		if ! test x"$GLIB_COMPILE_RESOURCES" = x""; then
-+			fake_typelibs=yes
-+		fi
-+	fi
- fi
- AM_CONDITIONAL(WITH_LEGACY_LIBRARIES, test "$with_libnm_glib" != "no")
-+if test "$fake_typelibs" = "yes"; then
-+	AC_DEFINE(WITH_FAKE_TYPELIBS, 1, [Define for libnm to prevent GIR from loading libnm-glib])
-+else
-+	AC_DEFINE(WITH_FAKE_TYPELIBS, 0, [Define for libnm to prevent GIR from loading libnm-glib])
-+fi
-+AM_CONDITIONAL(WITH_FAKE_TYPELIBS, test "${fake_typelibs}" = "yes")
- 
- PKG_CHECK_MODULES([LIBUDEV], [libudev >= 175])
- 
--GOBJECT_INTROSPECTION_CHECK([0.9.6])
--
- # Qt4
- PKG_CHECK_MODULES(QT, [QtCore >= 4 QtDBus QtNetwork], [have_qt=yes],[have_qt=no])
- AC_ARG_ENABLE(qt,
-diff --git a/libnm/fake-typelib/NMClient.gir b/libnm/fake-typelib/NMClient.gir
-new file mode 100644
-index 0000000..3002f8d
---- /dev/null
-+++ b/libnm/fake-typelib/NMClient.gir
-@@ -0,0 +1,9 @@
-+<?xml version="1.0"?>
-+<!-- A lame duck typelib which prevents GIR from loading the
-+     real one (which would crash due to conflict with libnm) -->
-+<repository version="1.2"
-+            xmlns="http://www.gtk.org/introspection/core/1.0"
-+            xmlns:c="http://www.gtk.org/introspection/c/1.0"
-+            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-+	<namespace name="NMClient" version="0.0" />
-+</repository>
-diff --git a/libnm/fake-typelib/NetworkManager.gir b/libnm/fake-typelib/NetworkManager.gir
-new file mode 100644
-index 0000000..d15d29a
---- /dev/null
-+++ b/libnm/fake-typelib/NetworkManager.gir
-@@ -0,0 +1,10 @@
-+<?xml version="1.0"?>
-+<!-- A lame duck typelib which prevents GIR from loading the
-+     real one (which would crash due to conflict with libnm) -->
-+<repository version="1.2"
-+            xmlns="http://www.gtk.org/introspection/core/1.0"
-+            xmlns:c="http://www.gtk.org/introspection/c/1.0"
-+            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-+	<namespace name="NetworkManager" version="0.0">
-+	</namespace>
-+</repository>
-diff --git a/libnm/fake-typelib/typelibs.gresource.xml b/libnm/fake-typelib/typelibs.gresource.xml
-new file mode 100644
-index 0000000..9a71d97
---- /dev/null
-+++ b/libnm/fake-typelib/typelibs.gresource.xml
-@@ -0,0 +1,7 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<gresources>
-+	<gresource prefix="/org/freedesktop/libnm/fake-typelib">
-+		<file>NetworkManager.typelib</file>
-+		<file>NMClient.typelib</file>
-+	</gresource>
-+</gresources>
-diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c
-index fbbfe2c..a01228d 100644
---- a/libnm/nm-libnm-utils.c
-+++ b/libnm/nm-libnm-utils.c
-@@ -23,6 +23,8 @@
- 
- #include "nm-libnm-utils.h"
- 
-+#include <girepository.h>
-+
- /*****************************************************************************/
- 
- char *
-@@ -160,3 +162,83 @@ next:
- 	nm_assert (g_utf8_validate (desc_full, -1, NULL));
- 	return desc_full;
- }
-+
-+#if WITH_FAKE_TYPELIBS
-+
-+/*
-+ * Here we register empty "NMClient" and "NetworkManager" GIR modules as soon
-+ * as we are loaded (if gnome-introspection is being used). This prevents the
-+ * real modules from being loaded because they would in turn load libnm-glib
-+ * and abort() and crash.
-+ *
-+ * For the high level languages that utilize GIR the crash is highly inconvenient
-+ * while the inability to resolve any methods and attributes is potentially
-+ * recoverable.
-+ */
-+
-+GResource *typelibs_get_resource (void);
-+void typelibs_register_resource (void);
-+
-+static void __attribute__((constructor))
-+_nm_libnm_utils_init (void)
-+{
-+	GITypelib *typelib;
-+	GBytes *data;
-+	const char *namespace;
-+	GModule *self;
-+	GITypelib *(*_g_typelib_new_from_const_memory) (const guint8 *memory,
-+	                                                gsize len,
-+	                                                GError **error) = NULL;
-+	const char *(*_g_irepository_load_typelib) (GIRepository *repository,
-+	                                            GITypelib *typelib,
-+	                                            GIRepositoryLoadFlags flags,
-+	                                            GError **error) = NULL;
-+	const char *names[] = { "/org/freedesktop/libnm/fake-typelib/NetworkManager.typelib",
-+	                        "/org/freedesktop/libnm/fake-typelib/NMClient.typelib" };
-+	int i;
-+
-+	self = g_module_open (NULL, 0);
-+	if (!self)
-+		return;
-+	g_module_symbol (self, "g_typelib_new_from_const_memory",
-+	                 (gpointer *) &_g_typelib_new_from_const_memory);
-+	if (_g_typelib_new_from_const_memory) {
-+		g_module_symbol (self, "g_irepository_load_typelib",
-+		                 (gpointer *) &_g_irepository_load_typelib);
-+	}
-+	g_module_close (self);
-+
-+	if (!_g_typelib_new_from_const_memory || !_g_irepository_load_typelib)
-+		return;
-+
-+	typelibs_register_resource ();
-+
-+	for (i = 0; i < 2; i++) {
-+		gs_free_error GError *error = NULL;
-+
-+		data = g_resource_lookup_data (typelibs_get_resource (),
-+		                               names[i],
-+		                               G_RESOURCE_LOOKUP_FLAGS_NONE,
-+		                               &error);
-+		if (!data) {
-+			g_warning ("Fake typelib %s could not be loaded: %s", names[i], error->message);
-+			return;
-+		}
-+
-+		typelib = _g_typelib_new_from_const_memory (g_bytes_get_data (data, NULL),
-+		                                            g_bytes_get_size (data),
-+		                                            &error);
-+		if (!typelib) {
-+			g_warning ("Could not create fake typelib instance %s: %s", names[i], error->message);
-+			return;
-+		}
-+
-+		namespace = _g_irepository_load_typelib (NULL, typelib, 0, &error);
-+		if (!namespace) {
-+			g_warning ("Could not load fake typelib %s: %s", names[i], error->message);
-+			return;
-+		}
-+	}
-+}
-+
-+#endif /* WITH_FAKE_TYPELIBS */
diff --git a/debian/patches/series b/debian/patches/series
index 27c82a36..cc2d17a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,11 @@
 Force-online-state-with-unmanaged-devices.patch
 Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
-Fix-arping-path.patch
 Don-t-make-NetworkManager-D-Bus-activatable.patch
 Fix-iscsiadm-path.patch
-libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
 Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
 Update-dnsmasq-parameters.patch
 Disable-general-with-expect.patch
 libnm-Check-self-still-NMManager-or-not.patch
 #dns-manager-don-t-merge-split-DNS-search-domains.patch
 Read-system-connections-from-run.patch
-e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch
-#upstream backport
-git_thunderbolt_connect.patch
+git-newglib-test.patch
diff --git a/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch b/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch
new file mode 100644
index 00000000..2783890f
--- /dev/null
+++ b/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch
@@ -0,0 +1,25 @@
+From: Thomas Haller <thaller@redhat.com>
+Date: Tue, 31 Jul 2018 14:13:57 +0200
+Subject: version: fix compile error due to NM_AVAILABLE_IN_1_12_2 macro
+
+Fixes: 8d09660481e1ff8b513aa60b2c40a4982ccc57cd
+
+https://mail.gnome.org/archives/networkmanager-list/2018-July/msg00023.html
+(cherry picked from commit 0a3755c1799d3a4dc1875d4c59c7c568a64c8456)
+---
+ libnm-core/nm-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
+index ee6dbc0..c240489 100644
+--- a/libnm-core/nm-version.h
++++ b/libnm-core/nm-version.h
+@@ -161,7 +161,7 @@
+ #endif
+ 
+ #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2
+-# define NM_AVAILABLE_IN_1_12_2          G_UNAVAILABLE(1,12,2)
++# define NM_AVAILABLE_IN_1_12_2          G_UNAVAILABLE(1,12.2)
+ #else
+ # define NM_AVAILABLE_IN_1_12_2
+ #endif
diff --git a/debian/rules b/debian/rules
index 119c2946..bc6331c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,8 @@ override_dh_auto_configure:
 		--with-selinux \
 		--with-tests \
 		--with-libaudit \
+		--with-iwd \
+		--with-libnm-glib \
 		--without-dhcpcanon \
 		--enable-polkit \
 		--enable-polkit-agent \
@@ -56,7 +58,6 @@ override_dh_auto_configure:
 
 override_dh_install:
 	find debian/tmp -name '*.la' -print -delete
-	rm debian/tmp/usr/share/doc/NetworkManager/examples/server.conf
 	rm -vf $(CURDIR)/debian/tmp/etc/init.d/NetworkManager
 	dh_install
 
@@ -73,9 +74,6 @@ override_dh_installinit:
 override_dh_makeshlibs:
 	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/
 
-override_dh_strip:
-	dh_strip --dbgsym-migration='network-manager-dbg (<< 1.1.91-2~)'
-
 override_dh_systemd_start:
 	dh_link -pnetwork-manager \
 		lib/systemd/system/NetworkManager.service \