Merge tag 'debian/1.10.6-2' into bionic

network-manager Debian release 1.10.6-2

3 files changed, 65 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 5cd53f31..9757f4e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,60 @@
+network-manager (1.10.6-2ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with Debian (LP: #1758331). Remaining changes:
+    - Use systemd-resolved instead of dnsmasq
+    - debian/control:
+      + Depend on isc-dhcp-client instead of recommends
+      + Recommend network-manager-pptp
+      + Suggest avahi-autoipd for IPv4LL support
+    - debian/rules, debian/network-manager.postinst:
+      + Don't restart NetworkManager on upgrade but recommend restarting
+        the computer
+    - debian/rules, debian/network-manager.postinst:
+      + Don't install sysvinit scripts or migrate from sysvinit
+    - debian/network-manager.postinst:
+      + Don't add the netdev group.
+      + drop in an empty override file for NetworkManager to manage all
+        devices for upgrade from any version, as long as there is no
+        netplan configuration yet. (LP: #1676547)
+    - debian/network-manager.maintscript
+      + Remove /etc/dbus-1/system.d/nm-ofono.conf
+    - debian/default-wifi-powersave-on.conf, debian/rules:
+      + Install a config file to enable WiFi powersave
+    - Enable build tests
+    - Add autopkgtests
+    - debian/source_network-manager.py, debian/network-manager.install,
+      debian/network-manager.links: Add apport hook
+    - Add network-manager-config-connectivity-ubuntu package
+    - NetworkManager.conf: disable MAC randomization feature. There is no
+      easy way for desktop users to disable this feature yet. And there are
+      reports that it doesn't work well with some systems. (LP: #1681513)
+    - Update Vcs links to point to Ubuntu branch
+    - Add patches. See patch descriptions for more details:
+      + 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
+      + dns-manager-don-t-merge-split-DNS-search-domains.patch (but disabled)
+    - debian/tests/urfkill-integration - don't stop/start network manager
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 26 Mar 2018 08:34:34 -0400
+
+network-manager (1.10.6-2) unstable; urgency=medium
+
+  * Update Vcs-* to point to https://salsa.debian.org
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 13 Mar 2018 01:57:32 +0100
+
+network-manager (1.10.6-1) unstable; urgency=medium
+
+  * New upstream version 1.10.6
+  * Rebase patches
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 13 Mar 2018 01:47:52 +0100
+
 network-manager (1.10.4-1ubuntu3) bionic; urgency=medium
 
   * Cherry-pick a partial patch from 1.11 branch, to stop agressively
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 6ef9bf54..508afede 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  1 file changed, 117 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 001fae5..38e8a8f 100644
+index 8391dbf..e60b6c6 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -62,6 +62,8 @@
@@ -35,7 +35,7 @@ index 001fae5..38e8a8f 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -1122,6 +1128,29 @@ find_best_device_state (NMManager *manager)
+@@ -1124,6 +1130,29 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -65,7 +65,7 @@ index 001fae5..38e8a8f 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -1160,6 +1189,9 @@ nm_manager_update_state (NMManager *manager)
+@@ -1162,6 +1191,9 @@ nm_manager_update_state (NMManager *manager)
  	else
  		new_state = find_best_device_state (manager);
  
@@ -75,7 +75,7 @@ index 001fae5..38e8a8f 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5419,6 +5451,62 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -5421,6 +5453,62 @@ impl_manager_check_connectivity (NMManager *self,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -138,7 +138,7 @@ index 001fae5..38e8a8f 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -5570,6 +5658,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -5572,6 +5660,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 +148,7 @@ index 001fae5..38e8a8f 100644
  	return TRUE;
  }
  
-@@ -6565,6 +6656,22 @@ nm_manager_init (NMManager *self)
+@@ -6567,6 +6658,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -171,7 +171,7 @@ index 001fae5..38e8a8f 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -6847,6 +6954,16 @@ dispose (GObject *object)
+@@ -6849,6 +6956,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
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
index e742ffe6..7e520d91 100644
--- a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
+++ b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
@@ -90,7 +90,7 @@ index 2ddc7bc..a741c6e 100644
  
  if HAVE_INTROSPECTION
 diff --git a/configure.ac b/configure.ac
-index c1ce21e..11948ac 100644
+index 8a066ad..6f561e2 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