Rebase patches

6 files changed, 11 insertions, 103 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 cf9fd11c..4c640507 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 709d79b..1be5d19 100644
+index 9c5b666..fe39131 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3481,11 +3481,6 @@ endif
+@@ -3516,11 +3516,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@
  
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 59cd0b12..27eb8915 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 a740219..019bb0e 100644
+index 7662c2e..413ec0b 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -60,6 +60,8 @@
@@ -35,7 +35,7 @@ index a740219..019bb0e 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -815,6 +821,29 @@ find_best_device_state (NMManager *manager)
+@@ -860,6 +866,29 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -65,7 +65,7 @@ index a740219..019bb0e 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -853,6 +882,9 @@ nm_manager_update_state (NMManager *manager)
+@@ -898,6 +927,9 @@ nm_manager_update_state (NMManager *manager)
  	else
  		new_state = find_best_device_state (manager);
  
@@ -75,7 +75,7 @@ index a740219..019bb0e 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -4979,6 +5011,62 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -5062,6 +5094,62 @@ impl_manager_check_connectivity (NMManager *self,
  }
  
  static void
@@ -138,7 +138,7 @@ index a740219..019bb0e 100644
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
  	nm_device_factory_start (factory);
-@@ -5116,6 +5204,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -5203,6 +5291,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 a740219..019bb0e 100644
  	return TRUE;
  }
  
-@@ -6102,6 +6193,22 @@ nm_manager_init (NMManager *self)
+@@ -6188,6 +6279,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -171,7 +171,7 @@ index a740219..019bb0e 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -6339,6 +6446,16 @@ dispose (GObject *object)
+@@ -6425,6 +6532,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/core-fix-reading-device-state-file.patch b/debian/patches/core-fix-reading-device-state-file.patch
deleted file mode 100644
index b124884a..00000000
--- a/debian/patches/core-fix-reading-device-state-file.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Thomas Haller <thaller@redhat.com>
-Date: Thu, 11 May 2017 19:40:55 +0200
-Subject: core: fix reading device state file
-
-For manged=unknown, we don't write the value to the
-device state keyfile. The results in an empty file,
-or at least, a keyfile that doesn't have device.managed
-set.
-
-On read, we must treat a missing device.managed flag as
-unknown, and not as unmanaged. Otherwise, on restart
-a device becomes marked as explicitly unmanaged.
-
-This was broken by commit 142ebb1 "core: only persist explicit managed
-state in device's state file", where we started conditionally
-to no longer write the managed state.
-
-Reported-by: Michael Biebl <mbiebl@debian.org>
-Fixes: 142ebb10376ec592593f15b0359f38be89c97620
-(cherry picked from commit 348ffdec183ee198499dad1365906e8d16ff4122)
-(cherry picked from commit 33d3ec3b3e5d2e737afc8db6c64850e67db5c12d)
----
- src/nm-config.c | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/src/nm-config.c b/src/nm-config.c
-index 2cdf855..5033d5c 100644
---- a/src/nm-config.c
-+++ b/src/nm-config.c
-@@ -1887,21 +1887,23 @@ _config_device_state_data_new (int ifindex, GKeyFile *kf)
- 	nm_assert (ifindex > 0);
- 
- 	if (kf) {
--		gboolean managed;
--
--		managed = nm_config_keyfile_get_boolean (kf,
--		                                         DEVICE_RUN_STATE_KEYFILE_GROUP_DEVICE,
--		                                         DEVICE_RUN_STATE_KEYFILE_KEY_DEVICE_MANAGED,
--		                                         FALSE);
--		managed_type = managed
--		               ? NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_MANAGED
--		               : NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_UNMANAGED;
--
--		if (managed) {
-+		switch (nm_config_keyfile_get_boolean (kf,
-+		                                       DEVICE_RUN_STATE_KEYFILE_GROUP_DEVICE,
-+		                                       DEVICE_RUN_STATE_KEYFILE_KEY_DEVICE_MANAGED,
-+		                                       -1)) {
-+		case TRUE:
-+			managed_type = NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_MANAGED;
- 			connection_uuid = nm_config_keyfile_get_value (kf,
- 			                                               DEVICE_RUN_STATE_KEYFILE_GROUP_DEVICE,
- 			                                               DEVICE_RUN_STATE_KEYFILE_KEY_DEVICE_CONNECTION_UUID,
- 			                                               NM_CONFIG_GET_VALUE_STRIP | NM_CONFIG_GET_VALUE_NO_EMPTY);
-+			break;
-+		case FALSE:
-+			managed_type = NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_UNMANAGED;
-+			break;
-+		case -1:
-+			/* missing property in keyfile. */
-+			break;
- 		}
- 
- 		perm_hw_addr_fake = nm_config_keyfile_get_value (kf,
diff --git a/debian/patches/device-capture-the-IP6-configuration-on-the-IP-interface.patch b/debian/patches/device-capture-the-IP6-configuration-on-the-IP-interface.patch
deleted file mode 100644
index 684ea67a..00000000
--- a/debian/patches/device-capture-the-IP6-configuration-on-the-IP-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 22 May 2017 17:04:48 +0200
-Subject: device: capture the IP6 configuration on the IP interface
-
-Fixes a crash with Bluetooth devices where the device is the BlueZ
-device and iface stays 0 while the IP interface is the actual BNEP link.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=782545
-(cherry picked from commit 30d06b2253b7277ed1153bcbbc81f9e1ca3e3474)
----
- src/devices/nm-device.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index da581a0..9c46e81 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -7725,7 +7725,7 @@ act_stage3_ip6_config_start (NMDevice *self,
- 	nm_platform_process_events (nm_device_get_platform (self));
- 	g_clear_object (&priv->ext_ip6_config_captured);
- 	priv->ext_ip6_config_captured = nm_ip6_config_capture (nm_device_get_platform (self),
--	                                                       nm_device_get_ifindex (self),
-+	                                                       nm_device_get_ip_ifindex (self),
- 	                                                       FALSE,
- 	                                                       NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN);
- 
diff --git a/debian/patches/series b/debian/patches/series
index d3356ee0..01c14f38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@ Fix-arping-path.patch
 Don-t-make-NetworkManager-D-Bus-activatable.patch
 systemd-Don-t-enable-NetworkManager-wait-online.serv.patch
 Fix-iscsiadm-path.patch
-core-fix-reading-device-state-file.patch
-device-capture-the-IP6-configuration-on-the-IP-interface.patch
diff --git a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch b/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch
index c6510485..e6427435 100644
--- a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch
+++ b/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch
@@ -14,10 +14,10 @@ This way the user can easily disable the service.
  1 file changed, 6 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 1be5d19..1c01f3f 100644
+index fe39131..7e1e26f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3481,12 +3481,6 @@ endif
+@@ -3516,12 +3516,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@