Import Debian changes 1.18.0-1ubuntu1

network-manager (1.18.0-1ubuntu1) eoan; urgency=medium

  * Update to 1.18, merge on Debian, new version includes nwe support for
    policy routing rules and for VLAN filtering for Linux bridge.
  * Remaining Ubuntu 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.
    - 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.
    - 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 (but disabled)
      + Read-system-connections-from-run.patch
    - debian/tests/urfkill-integration - don't stop/start network manager
    - Revert "Add Conflicts to network-manager-dev against deprecated libraries"
      This reverts commit b4acc5e03e2b821e1cccc69529bb70826c741942.  We're still
      building libnm-glib for now, so these packages have a use in Ubuntu.
  * Removed delta, not needed anymore
    - debian/network-manager.maintscript
      + Remove /etc/dbus-1/system.d/nm-ofono.conf

5 files changed, 21 insertions, 52 deletions

diff --git a/debian/patches/Disable-general-with-expect.patch b/debian/patches/Disable-general-with-expect.patch
index 317e67b5..77d88b41 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(-)
 
-Index: network-manager-1.15.91/Makefile.am
+Index: network-manager-1.18.0/Makefile.am
 ===================================================================
---- network-manager-1.15.91.orig/Makefile.am
-+++ network-manager-1.15.91/Makefile.am
-@@ -3651,7 +3651,6 @@ src_tests_ldadd = \
+--- network-manager-1.18.0.orig/Makefile.am
++++ network-manager-1.18.0/Makefile.am
+@@ -3776,7 +3776,6 @@ src_tests_ldadd = \
  
  check_programs += \
  	src/tests/test-general \
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index a9e0b2cd..78650e05 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -11,10 +11,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  src/nm-manager.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 115 insertions(+)
 
-Index: network-manager-1.15.91/src/nm-manager.c
+Index: network-manager-1.18.0/src/nm-manager.c
 ===================================================================
---- network-manager-1.15.91.orig/src/nm-manager.c
-+++ network-manager-1.15.91/src/nm-manager.c
+--- network-manager-1.18.0.orig/src/nm-manager.c
++++ network-manager-1.18.0/src/nm-manager.c
 @@ -61,6 +61,8 @@
  #include "nm-dispatcher.h"
  #include "NetworkManagerUtils.h"
@@ -35,7 +35,7 @@ Index: network-manager-1.15.91/src/nm-manager.c
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -1430,6 +1436,27 @@ find_best_device_state (NMManager *manag
+@@ -1432,6 +1438,27 @@ find_best_device_state (NMManager *manag
  	return best_state;
  }
  
@@ -63,7 +63,7 @@ Index: network-manager-1.15.91/src/nm-manager.c
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -1476,6 +1503,9 @@ nm_manager_update_state (NMManager *self
+@@ -1478,6 +1505,9 @@ nm_manager_update_state (NMManager *self
  	else
  		new_state = find_best_device_state (self);
  
@@ -73,7 +73,7 @@ Index: network-manager-1.15.91/src/nm-manager.c
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -6482,6 +6512,62 @@ impl_manager_check_connectivity (NMDBusO
+@@ -6499,6 +6529,62 @@ impl_manager_check_connectivity (NMDBusO
  }
  
  static void
@@ -136,7 +136,7 @@ Index: network-manager-1.15.91/src/nm-manager.c
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
  	nm_device_factory_start (factory);
-@@ -6649,6 +6735,9 @@ nm_manager_start (NMManager *self, GErro
+@@ -6666,6 +6752,9 @@ nm_manager_start (NMManager *self, GErro
  	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);
  
@@ -146,7 +146,7 @@ Index: network-manager-1.15.91/src/nm-manager.c
  	return TRUE;
  }
  
-@@ -7508,6 +7597,22 @@ nm_manager_init (NMManager *self)
+@@ -7525,6 +7614,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ Index: network-manager-1.15.91/src/nm-manager.c
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -7783,6 +7888,16 @@ dispose (GObject *object)
+@@ -7800,6 +7905,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch
index f7426077..d7385bb1 100644
--- a/debian/patches/Update-dnsmasq-parameters.patch
+++ b/debian/patches/Update-dnsmasq-parameters.patch
@@ -10,10 +10,10 @@ 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(-)
 
-Index: network-manager-1.15.91/src/dns/nm-dns-dnsmasq.c
+Index: network-manager-1.18.0/src/dns/nm-dns-dnsmasq.c
 ===================================================================
---- network-manager-1.15.91.orig/src/dns/nm-dns-dnsmasq.c
-+++ network-manager-1.15.91/src/dns/nm-dns-dnsmasq.c
+--- network-manager-1.18.0.orig/src/dns/nm-dns-dnsmasq.c
++++ network-manager-1.18.0/src/dns/nm-dns-dnsmasq.c
 @@ -337,8 +337,8 @@ start_dnsmasq (NMDnsDnsmasq *self)
  	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
  	argv[idx++] = "--bind-interfaces";
@@ -25,11 +25,11 @@ Index: network-manager-1.15.91/src/dns/nm-dns-dnsmasq.c
  	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 */
-Index: network-manager-1.15.91/src/dns/nm-dns-manager.c
+Index: network-manager-1.18.0/src/dns/nm-dns-manager.c
 ===================================================================
---- network-manager-1.15.91.orig/src/dns/nm-dns-manager.c
-+++ network-manager-1.15.91/src/dns/nm-dns-manager.c
-@@ -1479,12 +1479,12 @@ update_dns (NMDnsManager *self,
+--- network-manager-1.18.0.orig/src/dns/nm-dns-manager.c
++++ network-manager-1.18.0/src/dns/nm-dns-manager.c
+@@ -1486,12 +1486,12 @@ update_dns (NMDnsManager *self,
  	                            NM_CAST_STRV_CC (nameservers),
  	                            NM_CAST_STRV_CC (options));
  
@@ -44,7 +44,7 @@ Index: network-manager-1.15.91/src/dns/nm-dns-manager.c
  
  		if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) {
  			/* systemd-resolved uses a different link-local address */
-@@ -1826,7 +1826,7 @@ nm_dns_manager_stop (NMDnsManager *self)
+@@ -1833,7 +1833,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/git_ifupdown_iterator.patch b/debian/patches/git_ifupdown_iterator.patch
deleted file mode 100644
index 09279eb4..00000000
--- a/debian/patches/git_ifupdown_iterator.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 00858afc4f0512e751f35a56e74dff2d5a4a4c07 Mon Sep 17 00:00:00 2001
-From: Yupeng Chang <changyp6@gmail.com>
-Date: Tue, 2 Apr 2019 11:30:29 +0200
-Subject: [PATCH] ifupdown: fix connection iterator
-
-Fixes: 6aa66426a416 ('settings/ifupdown: merge eni_ifaces and connections hashes in plugin')
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/145
-https://bugzilla.redhat.com/show_bug.cgi?id=1694912
-(cherry picked from commit 1dd67583e3eecba09ee983ef6a443ded64303846)
----
- src/settings/plugins/ifupdown/nms-ifupdown-plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
-index 99a594776..9c9b73f28 100644
---- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
-+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
-@@ -280,7 +280,7 @@ initialize (NMSettingsPlugin *plugin)
- 		GHashTableIter iter;
- 
- 		g_hash_table_iter_init (&iter, priv->eni_ifaces);
--		while (g_hash_table_iter_next (&iter, NULL, (gpointer *) conn)) {
-+		while (g_hash_table_iter_next (&iter, NULL, (gpointer) &conn)) {
- 			if (conn) {
- 				_nm_settings_plugin_emit_signal_connection_added (NM_SETTINGS_PLUGIN (self),
- 				                                                  NM_SETTINGS_CONNECTION (conn));
--- 
-2.18.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 527757da..f3f8df16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 Force-online-state-with-unmanaged-devices.patch
 Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
-git_ifupdown_iterator.patch
 # Ubuntu patches
 Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
 Update-dnsmasq-parameters.patch