Rebase patches

5 files changed, 7 insertions, 63 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 51d0a0b2..b8a4c486 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 b1a2e69..b168008 100644
+index 0b8becd..1803e1a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3894,11 +3894,6 @@ endif
+@@ -3895,11 +3895,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 094c39be..022154c6 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, 115 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 289dcf8..1b657fe 100644
+index ad90616..d5f0f95 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -62,6 +62,8 @@
@@ -73,7 +73,7 @@ index 289dcf8..1b657fe 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5872,6 +5902,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
+@@ -5884,6 +5914,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -136,7 +136,7 @@ index 289dcf8..1b657fe 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -6022,6 +6108,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -6034,6 +6120,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 289dcf8..1b657fe 100644
  	return TRUE;
  }
  
-@@ -6885,6 +6974,22 @@ nm_manager_init (NMManager *self)
+@@ -6897,6 +6986,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ index 289dcf8..1b657fe 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -7160,6 +7265,16 @@ dispose (GObject *object)
+@@ -7172,6 +7277,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/series b/debian/patches/series
index 7918af1b..0adf0cf1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@ Force-online-state-with-unmanaged-devices.patch
 Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
 Don-t-make-NetworkManager-D-Bus-activatable.patch
 Fix-iscsiadm-path.patch
-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch
-utils-test-don-t-assert-on-debug-level-messages.patch
diff --git a/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch b/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch
deleted file mode 100644
index 0a1273a5..00000000
--- a/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Sat, 11 Aug 2018 11:08:42 +0200
-Subject: utils/test: don't assert on debug level messages
-
-They come and go in GLib core for all sorts of purposes. Don't let that
-break our tests.
-
-(cherry picked from commit 3e8eef538987c909e87b871a6b8c74aee08661a3)
-Origin: upstream, 1.12.4, commit:5810c46b118447567e52199ca139c7a5e9be6ab4
----
- shared/nm-utils/nm-test-utils.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
-index 743893f..d29e9ae 100644
---- a/shared/nm-utils/nm-test-utils.h
-+++ b/shared/nm-utils/nm-test-utils.h
-@@ -573,8 +573,9 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
- #endif
- 	} else {
- 		/* We were called not to set logging levels. This means, that the user
--		 * expects to assert against (all) messages. Any uncought message is fatal. */
--		g_log_set_always_fatal (G_LOG_LEVEL_MASK);
-+		 * expects to assert against (all) messages.
-+		 * Any uncaught message on >debug level is fatal. */
-+		g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG);
- 	}
- 
- 	if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) &&
diff --git a/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch b/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch
deleted file mode 100644
index 2783890f..00000000
--- a/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 31 Jul 2018 14:13:57 +0200
-Subject: version: fix compile error due to NM_AVAILABLE_IN_1_12_2 macro
-
-Fixes: 8d09660481e1ff8b513aa60b2c40a4982ccc57cd
-
-https://mail.gnome.org/archives/networkmanager-list/2018-July/msg00023.html
-(cherry picked from commit 0a3755c1799d3a4dc1875d4c59c7c568a64c8456)
----
- libnm-core/nm-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
-index ee6dbc0..c240489 100644
---- a/libnm-core/nm-version.h
-+++ b/libnm-core/nm-version.h
-@@ -161,7 +161,7 @@
- #endif
- 
- #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2
--# define NM_AVAILABLE_IN_1_12_2          G_UNAVAILABLE(1,12,2)
-+# define NM_AVAILABLE_IN_1_12_2          G_UNAVAILABLE(1,12.2)
- #else
- # define NM_AVAILABLE_IN_1_12_2
- #endif