Merge remote-tracking branch 'salsa/master'

6 files changed, 43 insertions, 40 deletions

diff --git a/debian/patches/Disable-general-with-expect.patch b/debian/patches/Disable-core-with-expect.patch
index 77d88b41..b30319f6 100644
--- a/debian/patches/Disable-general-with-expect.patch
+++ b/debian/patches/Disable-core-with-expect.patch
@@ -1,6 +1,6 @@
 From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
 Date: Fri, 13 May 2016 11:13:20 +0800
-Subject: Disable general-with-expect
+Subject: Disable core-with-expect
 
 which tends to fail on ppc64el and arm64
 ---
@@ -11,11 +11,12 @@ Index: network-manager-1.18.0/Makefile.am
 ===================================================================
 --- network-manager-1.18.0.orig/Makefile.am
 +++ network-manager-1.18.0/Makefile.am
-@@ -3776,7 +3776,6 @@ src_tests_ldadd = \
+@@ -3785,7 +3785,6 @@
  
  check_programs += \
- 	src/tests/test-general \
--	src/tests/test-general-with-expect \
+ 	src/tests/test-core \
+-	src/tests/test-core-with-expect \
  	src/tests/test-ip4-config \
  	src/tests/test-ip6-config \
  	src/tests/test-dcb \
+
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 78453721..7252cb85 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
@@ -15,11 +15,11 @@ Closes: #742933
  src/nm-sleep-monitor.c | 5 +++++
  1 file changed, 5 insertions(+)
 
-Index: network-manager-1.15.91/src/nm-sleep-monitor.c
-===================================================================
---- network-manager-1.15.91.orig/src/nm-sleep-monitor.c
-+++ network-manager-1.15.91/src/nm-sleep-monitor.c
-@@ -23,6 +23,7 @@
+diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
+index c97f6f7..5ea0a64 100644
+--- a/src/nm-sleep-monitor.c
++++ b/src/nm-sleep-monitor.c
+@@ -22,6 +22,7 @@
  
  #include <sys/stat.h>
  #include <gio/gunixfdlist.h>
@@ -27,7 +27,7 @@ Index: network-manager-1.15.91/src/nm-sleep-monitor.c
  
  #include "nm-core-internal.h"
  #include "NetworkManagerUtils.h"
-@@ -342,6 +343,10 @@ on_proxy_acquired (GObject *object,
+@@ -341,6 +342,10 @@ on_proxy_acquired (GObject *object,
  static void
  nm_sleep_monitor_init (NMSleepMonitor *self)
  {
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 78650e05..5ea83b6e 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -11,11 +11,11 @@ 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.18.0/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 @@
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index 64cdb9a..b08af29 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -60,6 +60,8 @@
  #include "nm-dispatcher.h"
  #include "NetworkManagerUtils.h"
  
@@ -24,7 +24,7 @@ Index: network-manager-1.18.0/src/nm-manager.c
  /*****************************************************************************/
  
  typedef struct {
-@@ -193,6 +195,10 @@ typedef struct {
+@@ -198,6 +200,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,7 +35,7 @@ Index: network-manager-1.18.0/src/nm-manager.c
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -1432,6 +1438,27 @@ find_best_device_state (NMManager *manag
+@@ -1436,6 +1442,27 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -63,7 +63,7 @@ Index: network-manager-1.18.0/src/nm-manager.c
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -1478,6 +1505,9 @@ nm_manager_update_state (NMManager *self
+@@ -1482,6 +1509,9 @@ nm_manager_update_state (NMManager *self)
  	else
  		new_state = find_best_device_state (self);
  
@@ -73,10 +73,11 @@ Index: network-manager-1.18.0/src/nm-manager.c
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -6499,6 +6529,62 @@ impl_manager_check_connectivity (NMDBusO
+@@ -6486,6 +6516,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
+ 	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
- static void
++static void
 +check_ifstate_file (gpointer user_data)
 +{
 +	NMManager *self = NM_MANAGER (user_data);
@@ -132,11 +133,10 @@ Index: network-manager-1.18.0/src/nm-manager.c
 +	}
 +}
 +
-+static void
+ static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
- 	nm_device_factory_start (factory);
-@@ -6666,6 +6752,9 @@ nm_manager_start (NMManager *self, GErro
+@@ -6659,6 +6745,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);
  
@@ -146,7 +146,7 @@ Index: network-manager-1.18.0/src/nm-manager.c
  	return TRUE;
  }
  
-@@ -7525,6 +7614,22 @@ nm_manager_init (NMManager *self)
+@@ -7507,6 +7596,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ Index: network-manager-1.18.0/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);
  
-@@ -7800,6 +7905,16 @@ dispose (GObject *object)
+@@ -7789,6 +7894,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 d7385bb1..d22d0a28 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(-)
 
-Index: network-manager-1.18.0/src/dns/nm-dns-dnsmasq.c
+Index: network-manager-1.20.0/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)
+--- network-manager-1.20.0.orig/src/dns/nm-dns-dnsmasq.c
++++ network-manager-1.20.0/src/dns/nm-dns-dnsmasq.c
+@@ -336,8 +336,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: network-manager-1.18.0/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.18.0/src/dns/nm-dns-manager.c
+Index: network-manager-1.20.0/src/dns/nm-dns-manager.c
 ===================================================================
---- 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,
+--- network-manager-1.20.0.orig/src/dns/nm-dns-manager.c
++++ network-manager-1.20.0/src/dns/nm-dns-manager.c
+@@ -1485,12 +1485,12 @@ update_dns (NMDnsManager *self,
  	                            NM_CAST_STRV_CC (nameservers),
  	                            NM_CAST_STRV_CC (options));
  
@@ -44,7 +44,7 @@ Index: network-manager-1.18.0/src/dns/nm-dns-manager.c
  
  		if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) {
  			/* systemd-resolved uses a different link-local address */
-@@ -1833,7 +1833,7 @@ nm_dns_manager_stop (NMDnsManager *self)
+@@ -1832,7 +1832,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/libnm-Check-self-still-NMManager-or-not.patch b/debian/patches/libnm-Check-self-still-NMManager-or-not.patch
index ea8eb0fc..061a8a7f 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(-)
 
-Index: network-manager-1.15.91/libnm/nm-manager.c
+Index: network-manager-1.20.0/libnm/nm-manager.c
 ===================================================================
---- network-manager-1.15.91.orig/libnm/nm-manager.c
-+++ network-manager-1.15.91/libnm/nm-manager.c
-@@ -962,7 +962,7 @@ find_active_connection_by_path (NMManage
+--- network-manager-1.20.0.orig/libnm/nm-manager.c
++++ network-manager-1.20.0/libnm/nm-manager.c
+@@ -967,7 +967,7 @@ find_active_connection_by_path (NMManage
  static void
  recheck_pending_activations (NMManager *self)
  {
@@ -20,7 +20,7 @@ Index: network-manager-1.15.91/libnm/nm-manager.c
  	CList *iter, *safe;
  	NMActiveConnection *candidate;
  	const GPtrArray *devices;
-@@ -972,6 +972,10 @@ recheck_pending_activations (NMManager *
+@@ -977,6 +977,10 @@ recheck_pending_activations (NMManager *
  
  	object_manager = _nm_object_get_dbus_object_manager (NM_OBJECT (self));
  
diff --git a/debian/patches/series b/debian/patches/series
index f3f8df16..0a749301 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,9 @@
 Force-online-state-with-unmanaged-devices.patch
 Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
+
 # Ubuntu patches
 Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
 Update-dnsmasq-parameters.patch
-Disable-general-with-expect.patch
+Disable-core-with-expect.patch
 libnm-Check-self-still-NMManager-or-not.patch
+