Refresh the packaging for the new version, upload to disco

10 files changed, 42 insertions, 164 deletions

diff --git a/debian/changelog b/debian/changelog
index d38de119..be019b64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+network-manager (1.15.91-0Ubuntu1) disco; urgency=medium
+
+  * New upstream version
+  * remove patches included in the new version
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 12 Mar 2019 15:23:26 +0100
+
 network-manager (1.15.2-0ubuntu2) disco; urgency=medium
 
   * debian/patches/git_ifupdown_segfault.patch:
diff --git a/debian/patches/Disable-general-with-expect.patch b/debian/patches/Disable-general-with-expect.patch
index 7b5a0dfd..317e67b5 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.2/Makefile.am
+Index: network-manager-1.15.91/Makefile.am
 ===================================================================
---- network-manager-1.15.2.orig/Makefile.am
-+++ network-manager-1.15.2/Makefile.am
-@@ -3622,7 +3622,6 @@ src_tests_ldadd = \
+--- network-manager-1.15.91.orig/Makefile.am
++++ network-manager-1.15.91/Makefile.am
+@@ -3651,7 +3651,6 @@ src_tests_ldadd = \
  
  check_programs += \
  	src/tests/test-general \
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 5ab7a01d..78453721 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,19 +15,19 @@ Closes: #742933
  src/nm-sleep-monitor.c | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
-index 54d7577..a4bb43f 100644
---- a/src/nm-sleep-monitor.c
-+++ b/src/nm-sleep-monitor.c
-@@ -25,6 +25,7 @@
- #include <string.h>
+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 @@
+ 
  #include <sys/stat.h>
  #include <gio/gunixfdlist.h>
 +#include <systemd/sd-daemon.h>
  
  #include "nm-core-internal.h"
  #include "NetworkManagerUtils.h"
-@@ -344,6 +345,10 @@ on_proxy_acquired (GObject *object,
+@@ -342,6 +343,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 d8ac99c8..a9e0b2cd 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.15.2/src/nm-manager.c
+Index: network-manager-1.15.91/src/nm-manager.c
 ===================================================================
---- network-manager-1.15.2.orig/src/nm-manager.c
-+++ network-manager-1.15.2/src/nm-manager.c
-@@ -63,6 +63,8 @@
+--- network-manager-1.15.91.orig/src/nm-manager.c
++++ network-manager-1.15.91/src/nm-manager.c
+@@ -61,6 +61,8 @@
  #include "nm-dispatcher.h"
  #include "NetworkManagerUtils.h"
  
@@ -24,7 +24,7 @@ Index: network-manager-1.15.2/src/nm-manager.c
  /*****************************************************************************/
  
  typedef struct {
-@@ -195,6 +197,10 @@ typedef struct {
+@@ -193,6 +195,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,7 +35,7 @@ Index: network-manager-1.15.2/src/nm-manager.c
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -1432,6 +1438,27 @@ find_best_device_state (NMManager *manag
+@@ -1430,6 +1436,27 @@ find_best_device_state (NMManager *manag
  	return best_state;
  }
  
@@ -63,7 +63,7 @@ Index: network-manager-1.15.2/src/nm-manager.c
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -1478,6 +1505,9 @@ nm_manager_update_state (NMManager *self
+@@ -1476,6 +1503,9 @@ nm_manager_update_state (NMManager *self
  	else
  		new_state = find_best_device_state (self);
  
@@ -73,7 +73,7 @@ Index: network-manager-1.15.2/src/nm-manager.c
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -6479,6 +6509,62 @@ impl_manager_check_connectivity (NMDBusO
+@@ -6482,6 +6512,62 @@ impl_manager_check_connectivity (NMDBusO
  }
  
  static void
@@ -136,7 +136,7 @@ Index: network-manager-1.15.2/src/nm-manager.c
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
  	nm_device_factory_start (factory);
-@@ -6646,6 +6732,9 @@ nm_manager_start (NMManager *self, GErro
+@@ -6649,6 +6735,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.2/src/nm-manager.c
  	return TRUE;
  }
  
-@@ -7504,6 +7593,22 @@ nm_manager_init (NMManager *self)
+@@ -7508,6 +7597,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ Index: network-manager-1.15.2/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);
  
-@@ -7779,6 +7884,16 @@ dispose (GObject *object)
+@@ -7783,6 +7888,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 1ad1117f..f7426077 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.2/src/dns/nm-dns-dnsmasq.c
+Index: network-manager-1.15.91/src/dns/nm-dns-dnsmasq.c
 ===================================================================
---- network-manager-1.15.2.orig/src/dns/nm-dns-dnsmasq.c
-+++ network-manager-1.15.2/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
 @@ -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.2/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.2/src/dns/nm-dns-manager.c
+Index: network-manager-1.15.91/src/dns/nm-dns-manager.c
 ===================================================================
---- network-manager-1.15.2.orig/src/dns/nm-dns-manager.c
-+++ network-manager-1.15.2/src/dns/nm-dns-manager.c
-@@ -1478,12 +1478,12 @@ update_dns (NMDnsManager *self,
+--- 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,
  	                            NM_CAST_STRV_CC (nameservers),
  	                            NM_CAST_STRV_CC (options));
  
@@ -44,7 +44,7 @@ Index: network-manager-1.15.2/src/dns/nm-dns-manager.c
  
  		if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) {
  			/* systemd-resolved uses a different link-local address */
-@@ -1825,7 +1825,7 @@ nm_dns_manager_stop (NMDnsManager *self)
+@@ -1826,7 +1826,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-mac-change.patch b/debian/patches/git-mac-change.patch
deleted file mode 100644
index efa01d6d..00000000
--- a/debian/patches/git-mac-change.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0624814af17fb66826fda0e901c3d73a292ff37e Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Thu, 6 Dec 2018 16:56:47 +0100
-Subject: device: always take device down when changing MAC for wifi devices
-
-If the device is not taken down wpa_supplicant does not detect that
-the MAC changed and the authentication can fail due to wrong key
-derivation.
-
-Fixes: e206a3473249be4c92c5d71214a33e90db301127
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1656157
-(cherry picked from commit 29e8f6d5a17c3dbfd11655338cd0ffc61e1fc91b)
-(cherry picked from commit b2686110ef9cfcd87470d65872abf4adb9dab37c)
----
- src/devices/nm-device.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 76c80bd..3df5b28 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -14775,7 +14775,7 @@ _hw_addr_set (NMDevice *self,
- 	NMPlatformError plerr;
- 	guint8 addr_bytes[NM_UTILS_HWADDR_LEN_MAX];
- 	gsize addr_len;
--	gboolean was_taken_down;
-+	gboolean was_taken_down = FALSE;
- 	gboolean retry_down;
- 
- 	nm_assert (NM_IS_DEVICE (self));
-@@ -14799,7 +14799,14 @@ _hw_addr_set (NMDevice *self,
- 
- 	_LOGT (LOGD_DEVICE, "set-hw-addr: setting MAC address to '%s' (%s, %s)...", addr, operation, detail);
- 
--	was_taken_down = FALSE;
-+	if (nm_device_get_device_type (self) == NM_DEVICE_TYPE_WIFI) {
-+		/* Always take the device down for Wi-Fi because
-+		 * wpa_supplicant needs it to properly detect the MAC
-+		 * change. */
-+		retry_down = FALSE;
-+		was_taken_down = TRUE;
-+		nm_device_take_down (self, FALSE);
-+	}
- 
- again:
- 	plerr = nm_platform_link_set_address (nm_device_get_platform (self), nm_device_get_ip_ifindex (self), addr_bytes, addr_len);
--- 
-cgit v1.1
-
diff --git a/debian/patches/git_ifupdown_segfault.patch b/debian/patches/git_ifupdown_segfault.patch
deleted file mode 100644
index 35097a9b..00000000
--- a/debian/patches/git_ifupdown_segfault.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b24e169ded4bc4c6f41b0ae42a150cb86d9d0c84 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Fri, 15 Feb 2019 15:59:32 +0100
-Subject: [PATCH] settings/ifupdown: fix ifupdown plugin after merging
- eni_ifaces and connections hashes
-
-The @eni_ifaces hash may now contain %NULL elements. They are only markers
-for interface names, but are not actual connections.
-
-They must be skipped.
-
-Fixes: 6aa66426a4168b3db115646f410bcb5deea6847b
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/124
-(cherry picked from commit 5923a30c43f9e79e368f7595d96c73797d24dd46)
----
- src/settings/plugins/ifupdown/nms-ifupdown-plugin.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
-index b66eedc70..f0e64d1de 100644
---- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
-+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
-@@ -282,8 +282,10 @@ initialize (NMSettingsPlugin *plugin)
- 
- 		g_hash_table_iter_init (&iter, priv->eni_ifaces);
- 		while (g_hash_table_iter_next (&iter, NULL, (gpointer *) conn)) {
--			_nm_settings_plugin_emit_signal_connection_added (NM_SETTINGS_PLUGIN (self),
--			                                                  NM_SETTINGS_CONNECTION (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/git_team_structure.patch b/debian/patches/git_team_structure.patch
deleted file mode 100644
index 32495ebf..00000000
--- a/debian/patches/git_team_structure.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 63b90f0dd175c7b38aecb3b8e9bad3fb8bad2265 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Sat, 26 Jan 2019 18:37:12 +0100
-Subject: [PATCH] libnm-core: fix team link-watcher struct layout
-
-As the comment above the union says, structs in the union must have
-the same layout of arp_ping. 'vlanid' is in the wrong place and breaks
-that.
-
-Fixes: f44c793f6cd89c3e84e83872478daf286821ed64
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/110
----
- libnm-core/nm-setting-team.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c
-index 3161c05f4..867db5227 100644
---- a/libnm-core/nm-setting-team.c
-+++ b/libnm-core/nm-setting-team.c
-@@ -84,10 +84,10 @@ struct NMTeamLinkWatcher {
- 			int init_wait;
- 			int interval;
- 			int missed_max;
--			int vlanid;
- 			char *target_host;
- 			char *source_host;
- 			NMTeamLinkWatcherArpPingFlags flags;
-+			int vlanid;
- 		} arp_ping;
- 	};
- };
--- 
-2.18.1
-
-
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 a4b13b10..ea8eb0fc 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.2/libnm/nm-manager.c
+Index: network-manager-1.15.91/libnm/nm-manager.c
 ===================================================================
---- network-manager-1.15.2.orig/libnm/nm-manager.c
-+++ network-manager-1.15.2/libnm/nm-manager.c
-@@ -960,7 +960,7 @@ find_active_connection_by_path (NMManage
+--- 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
  static void
  recheck_pending_activations (NMManager *self)
  {
@@ -20,7 +20,7 @@ Index: network-manager-1.15.2/libnm/nm-manager.c
  	CList *iter, *safe;
  	NMActiveConnection *candidate;
  	const GPtrArray *devices;
-@@ -970,6 +970,10 @@ recheck_pending_activations (NMManager *
+@@ -972,6 +972,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 809542fa..f3f8df16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,3 @@ 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
-# Upstream backport
-git_team_structure.patch
-git_ifupdown_segfault.patch