Rebase patches

6 files changed, 15 insertions, 126 deletions

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 5f8fc953..d84649ea 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 5c49eab..698162c 100644
+index cda851a..8b1d8bb 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3515,11 +3515,6 @@ endif
+@@ -3686,11 +3686,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@
  
@@ -26,7 +26,7 @@ index 5c49eab..698162c 100644
  
  examples_DATA += data/server.conf
 diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
-index a9e8731..e6cd392 100644
+index 95d58f9..1502b89 100644
 --- a/data/NetworkManager.service.in
 +++ b/data/NetworkManager.service.in
 @@ -24,6 +24,5 @@ ProtectHome=read-only
diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch
index a439dc1b..286e2099 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 c9069dc..9dcf7dc 100644
+index 9b1f5cc..8cc1313 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 18c4401e..238f3de2 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,10 +12,10 @@ 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 7662c2e..413ec0b 100644
+index 3b2b486..5188806 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -60,6 +60,8 @@
+@@ -62,6 +62,8 @@
  #include "introspection/org.freedesktop.NetworkManager.h"
  #include "introspection/org.freedesktop.NetworkManager.Device.h"
  
@@ -24,7 +24,7 @@ index 7662c2e..413ec0b 100644
  static gboolean add_device (NMManager *self, NMDevice *device, GError **error);
  
  static NMActiveConnection *_new_active_connection (NMManager *self,
-@@ -148,6 +150,10 @@ typedef struct {
+@@ -157,6 +159,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,7 +35,7 @@ index 7662c2e..413ec0b 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -860,6 +866,29 @@ find_best_device_state (NMManager *manager)
+@@ -870,6 +876,29 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -65,7 +65,7 @@ index 7662c2e..413ec0b 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -898,6 +927,9 @@ nm_manager_update_state (NMManager *manager)
+@@ -908,6 +937,9 @@ nm_manager_update_state (NMManager *manager)
  	else
  		new_state = find_best_device_state (manager);
  
@@ -75,7 +75,7 @@ index 7662c2e..413ec0b 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5061,6 +5093,62 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -5114,6 +5146,62 @@ impl_manager_check_connectivity (NMManager *self,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -138,7 +138,7 @@ index 7662c2e..413ec0b 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -5203,6 +5291,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -5256,6 +5344,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 7662c2e..413ec0b 100644
  	return TRUE;
  }
  
-@@ -6188,6 +6279,22 @@ nm_manager_init (NMManager *self)
+@@ -6252,6 +6343,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -171,12 +171,12 @@ index 7662c2e..413ec0b 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -6425,6 +6532,16 @@ dispose (GObject *object)
+@@ -6513,6 +6620,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
 +	if (priv->ifstate_monitor) {
-+		g_signal_handlers_disconnect_by_func (priv->ifstate_monitor, ifstate_file_changed, manager);
++		g_signal_handlers_disconnect_by_func (priv->ifstate_monitor, ifstate_file_changed, self);
 +
 +		if (priv->ifstate_force_online)
 +			g_source_remove (priv->ifstate_force_online);
@@ -186,5 +186,5 @@ index 7662c2e..413ec0b 100644
 +	}
 +
  	if (priv->rfkill_mgr) {
- 		g_signal_handlers_disconnect_by_func (priv->rfkill_mgr, rfkill_manager_rfkill_changed_cb, manager);
+ 		g_signal_handlers_disconnect_by_func (priv->rfkill_mgr, rfkill_manager_rfkill_changed_cb, self);
  		g_clear_object (&priv->rfkill_mgr);
diff --git a/debian/patches/manager-Disconnect-from-signals-on-the-proxy-when-we-re-d.patch b/debian/patches/manager-Disconnect-from-signals-on-the-proxy-when-we-re-d.patch
deleted file mode 100644
index a8fa4d81..00000000
--- a/debian/patches/manager-Disconnect-from-signals-on-the-proxy-when-we-re-d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Iain Lane <iain@orangesquash.org.uk>
-Date: Wed, 20 Sep 2017 15:01:41 +0100
-Subject: manager: Disconnect from signals on the proxy when we're disposed
-
-We're calling a callback on a proxy after it has been disposed. We
-should make sure to disconnect from it when we go away.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=787897
----
- libnm/nm-manager.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
-index d3df733..294b9de 100644
---- a/libnm/nm-manager.c
-+++ b/libnm/nm-manager.c
-@@ -192,8 +192,8 @@ init_dbus (NMObject *object)
- 	                                property_info);
- 
- 	/* Permissions */
--	g_signal_connect (priv->proxy, "check-permissions",
--	                  G_CALLBACK (manager_recheck_permissions), object);
-+	g_signal_connect_object (priv->proxy, "check-permissions",
-+				 G_CALLBACK (manager_recheck_permissions), object, 0);
- }
- 
- static NMClientPermission
diff --git a/debian/patches/series b/debian/patches/series
index 5ce19bfc..af39d871 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@ 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
-manager-Disconnect-from-signals-on-the-proxy-when-we-re-d.patch
-vpn-remote-connection-disconnect-signal-handlers-whe.patch
diff --git a/debian/patches/vpn-remote-connection-disconnect-signal-handlers-whe.patch b/debian/patches/vpn-remote-connection-disconnect-signal-handlers-whe.patch
deleted file mode 100644
index d0f5d0e1..00000000
--- a/debian/patches/vpn-remote-connection-disconnect-signal-handlers-whe.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b363a6cfad5996b5436b6f7c1d9337068fcb4c99 Mon Sep 17 00:00:00 2001
-From: Iain Lane <iain@orangesquash.org.uk>
-Date: Fri, 22 Sep 2017 11:48:05 +0100
-Subject: [PATCH 2/2] {vpn,remote}-connection: disconnect signal handlers when
- disposed
-
-GNOME Settings 3.26 is crashing every time a VPN connection changed its
-state. After some digging, a debug message was put on dispose, and this
-issue was found:
-
-libnm-Message: Object 0x55555633c070 disposed
-libnm-Message: Object 0x55555633c730 disposed
-libnm-Message: Object 0x55555633eae0 disposed
-libnm-Message: Object 0x555556340a80 disposed
-
-Thread 1 "gnome-control-c" received signal SIGSEGV, Segmentation fault.
-g_type_check_instance_cast (type_instance=type_instance@entry=0x55555633c070, iface_type=93825006537856) at /.../glib/gobject/gtype.c:4057
-4057		  node = lookup_type_node_I (type_instance->g_class->g_type);
-(gdb) bt
-
-NetworkManager is calling callbacks on disposed objects, which leads to
-crashes in clients (e.g. GNOME Settings).
-
-Fix this issue by disconnecting signal handlers when the objects are
-disposed.
-
-Patch originally by Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=787893
-(cherry picked from commit b18896f77048399e7a8b6ddd4fa0961e603836fa)
-
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1718006
-Origin: upstream
-Applied-Upstream: 1.8.5
-
----
- libnm/nm-remote-connection.c | 6 +++---
- libnm/nm-vpn-connection.c    | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
-index 0f7ea58ef..5cd42555f 100644
---- a/libnm/nm-remote-connection.c
-+++ b/libnm/nm-remote-connection.c
-@@ -641,7 +641,7 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
- 	GVariant *settings;
- 
- 	priv->proxy = NMDBUS_SETTINGS_CONNECTION (_nm_object_get_proxy (NM_OBJECT (initable), NM_DBUS_INTERFACE_SETTINGS_CONNECTION));
--	g_signal_connect (priv->proxy, "updated", G_CALLBACK (updated_cb), initable);
-+	g_signal_connect_object (priv->proxy, "updated", G_CALLBACK (updated_cb), initable, 0);
- 
- 	if (nmdbus_settings_connection_call_get_settings_sync (priv->proxy,
- 	                                                       &settings,
-@@ -730,8 +730,8 @@ init_async (GAsyncInitable *initable, int io_priority,
- 	priv->proxy = NMDBUS_SETTINGS_CONNECTION (_nm_object_get_proxy (NM_OBJECT (initable),
- 	                                          NM_DBUS_INTERFACE_SETTINGS_CONNECTION));
- 
--	g_signal_connect (priv->proxy, "updated",
--	                  G_CALLBACK (updated_cb), initable);
-+	g_signal_connect_object (priv->proxy, "updated",
-+	                         G_CALLBACK (updated_cb), initable, 0);
- 
- 	nmdbus_settings_connection_call_get_settings (NM_REMOTE_CONNECTION_GET_PRIVATE (init_data->initable)->proxy,
- 	                                              init_data->cancellable,
-diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c
-index 814f45f0f..636c39507 100644
---- a/libnm/nm-vpn-connection.c
-+++ b/libnm/nm-vpn-connection.c
-@@ -144,8 +144,8 @@ init_dbus (NMObject *object)
- 	                                property_info);
- 
- 	proxy = _nm_object_get_proxy (object, NM_DBUS_INTERFACE_VPN_CONNECTION);
--	g_signal_connect (proxy, "vpn-state-changed",
--	                  G_CALLBACK (vpn_state_changed_proxy), object);
-+	g_signal_connect_object (proxy, "vpn-state-changed",
-+	                         G_CALLBACK (vpn_state_changed_proxy), object, 0);
- 	g_object_unref (proxy);
- }
- 
--- 
-2.14.1
-