Rebase patches

7 files changed, 14 insertions, 157 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 75430954..694b05b5 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 941c1a2..b7c0a5f 100644
+index 639921d..2ddc7bc 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3683,11 +3683,6 @@ endif
+@@ -3689,11 +3689,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 d84f558f..6ef9bf54 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 7f1b9a9..956d11f 100644
+index 001fae5..38e8a8f 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -62,6 +62,8 @@
@@ -24,7 +24,7 @@ index 7f1b9a9..956d11f 100644
  /*****************************************************************************/
  
  typedef struct {
-@@ -167,6 +169,10 @@ typedef struct {
+@@ -169,6 +171,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,7 +35,7 @@ index 7f1b9a9..956d11f 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -876,6 +882,29 @@ find_best_device_state (NMManager *manager)
+@@ -1122,6 +1128,29 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -65,7 +65,7 @@ index 7f1b9a9..956d11f 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -914,6 +943,9 @@ nm_manager_update_state (NMManager *manager)
+@@ -1160,6 +1189,9 @@ nm_manager_update_state (NMManager *manager)
  	else
  		new_state = find_best_device_state (manager);
  
@@ -75,7 +75,7 @@ index 7f1b9a9..956d11f 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5174,6 +5206,62 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -5419,6 +5451,62 @@ impl_manager_check_connectivity (NMManager *self,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -138,7 +138,7 @@ index 7f1b9a9..956d11f 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -5318,6 +5406,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -5570,6 +5658,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 7f1b9a9..956d11f 100644
  	return TRUE;
  }
  
-@@ -6313,6 +6404,22 @@ nm_manager_init (NMManager *self)
+@@ -6565,6 +6656,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -171,7 +171,7 @@ index 7f1b9a9..956d11f 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -6595,6 +6702,16 @@ dispose (GObject *object)
+@@ -6847,6 +6954,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch b/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch
deleted file mode 100644
index 16d5cc62..00000000
--- a/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 18 Dec 2017 08:27:25 +0100
-Subject: libnm-core/tc-config: remove deprecation guards from typedefs
-
-They're triggered by the prototypes in header file inclusion, even
-though no routines or variables that use the type are actually used.
-
-(cherry picked from commit 685cb5c88bf90b285a18a98a6bbeafa559938fee)
-(cherry picked from commit 8d120a6fda1761430241367781c57d302ffc5fe3)
----
- libnm-core/nm-setting-tc-config.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libnm-core/nm-setting-tc-config.h b/libnm-core/nm-setting-tc-config.h
-index 736d5ad..8117d5e 100644
---- a/libnm-core/nm-setting-tc-config.h
-+++ b/libnm-core/nm-setting-tc-config.h
-@@ -28,7 +28,6 @@
- 
- G_BEGIN_DECLS
- 
--NM_AVAILABLE_IN_1_10_2
- typedef struct NMTCQdisc NMTCQdisc;
- 
- NM_AVAILABLE_IN_1_10_2
-@@ -61,7 +60,6 @@ void        nm_tc_qdisc_set_handle           (NMTCQdisc *qdisc,
- NM_AVAILABLE_IN_1_10_2
- guint32     nm_tc_qdisc_get_parent           (NMTCQdisc *qdisc);
- 
--NM_AVAILABLE_IN_1_10_2
- typedef struct NMTCAction NMTCAction;
- 
- NM_AVAILABLE_IN_1_10_2
-@@ -96,7 +94,6 @@ void        nm_tc_action_set_attribute       (NMTCAction *action,
-                                               const char *name,
-                                               GVariant *value);
- 
--NM_AVAILABLE_IN_1_10_2
- typedef struct NMTCTfilter NMTCTfilter;
- 
- NM_AVAILABLE_IN_1_10_2
diff --git a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
index c78f9a45..e742ffe6 100644
--- a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
+++ b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
@@ -54,10 +54,10 @@ After:
  create mode 100644 libnm/fake-typelib/typelibs.gresource.xml
 
 diff --git a/Makefile.am b/Makefile.am
-index b7c0a5f..f4c8e86 100644
+index 2ddc7bc..a741c6e 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -852,6 +852,7 @@ nodist_libnminclude_HEADERS += \
+@@ -858,6 +858,7 @@ nodist_libnminclude_HEADERS += \
  noinst_LTLIBRARIES += libnm/libnm-utils.la
  
  libnm_libnm_utils_la_CPPFLAGS = \
@@ -65,7 +65,7 @@ index b7c0a5f..f4c8e86 100644
  	$(libnm_lib_cppflags)
  
  libnm_libnm_utils_la_SOURCES = \
-@@ -950,6 +951,23 @@ libnm/libnm.typelib: libnm/libnm.gir
+@@ -956,6 +957,23 @@ libnm/libnm.typelib: libnm/libnm.gir
  	$(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@
  
  INTROSPECTION_GIRS += libnm/NM-1.0.gir
@@ -90,7 +90,7 @@ index b7c0a5f..f4c8e86 100644
  
  if HAVE_INTROSPECTION
 diff --git a/configure.ac b/configure.ac
-index a4d7c24..01976bb 100644
+index c1ce21e..11948ac 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -322,9 +322,12 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_V
diff --git a/debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch b/debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch
deleted file mode 100644
index ddf88f7b..00000000
--- a/debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 12 Dec 2017 10:37:59 +0100
-Subject: platform: fix crash hashing NMPlatformTfilter and NMPlatformQdisc
-
-@kind might be NULL. There are 3 forms of the hash-update functions for
-string: str(), str0(), and strarr().
-
-- str0() is when the string might be NULL.
-- str() does not allow the string to be NULL
-- strarr() is like str(), except it adds a G_STATIC_ASSERT()
-  that the argument is a C array.
-
-The reason why a difference between str() and str0() exists, is
-because str0() hashes NULL different from a "" or any other string.
-This has an overhead, because it effectively must hash another bit
-of information that tells whether a string was passed or not.
-
-The reason is, that hashing a tupple of two strings should always
-yield a different hash value, even for "aa",""; "a","a"; "","aa",
-where naive concatentation would yield identical hash values in all
-three cases.
-
-Fixes: e75fc8279becce29e688551930d85e59e1280c89
-(cherry picked from commit 27e8fffdb833748dfeb6648b8768c4ef48822841)
----
- src/platform/nm-platform.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
-index 2ca379e..7067557 100644
---- a/src/platform/nm-platform.c
-+++ b/src/platform/nm-platform.c
-@@ -5320,7 +5320,7 @@ nm_platform_qdisc_to_string (const NMPlatformQdisc *qdisc, char *buf, gsize len)
- void
- nm_platform_qdisc_hash_update (const NMPlatformQdisc *obj, NMHashState *h)
- {
--	nm_hash_update_str (h, obj->kind);
-+	nm_hash_update_str0 (h, obj->kind);
- 	nm_hash_update_vals (h,
- 	                     obj->ifindex,
- 	                     obj->addr_family,
-@@ -5387,17 +5387,17 @@ nm_platform_tfilter_to_string (const NMPlatformTfilter *tfilter, char *buf, gsiz
- void
- nm_platform_tfilter_hash_update (const NMPlatformTfilter *obj, NMHashState *h)
- {
--	nm_hash_update_str (h, obj->kind);
-+	nm_hash_update_str0 (h, obj->kind);
- 	nm_hash_update_vals (h,
- 	                     obj->ifindex,
- 	                     obj->addr_family,
- 	                     obj->handle,
- 	                     obj->parent,
- 	                     obj->info);
--	nm_hash_update_str (h, obj->action.kind);
- 	if (obj->action.kind) {
-+		nm_hash_update_str (h, obj->action.kind);
- 		if (nm_streq (obj->action.kind, NM_PLATFORM_ACTION_KIND_SIMPLE))
--			nm_hash_update_str (h, obj->action.simple.sdata);
-+			nm_hash_update_strarr (h, obj->action.simple.sdata);
- 	}
- }
- 
diff --git a/debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch b/debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch
deleted file mode 100644
index 8e7be6ec..00000000
--- a/debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Thu, 11 Jan 2018 11:11:10 +0100
-Subject: secret-agent: construct the dbus proxy for async agent with the
- correct bus name
-
-The asynchronous secret agent initialization doesn't work at all due to a
-rather silly typo. Oops.
-
-While at it, fix a whitespace error too.
-
-(cherry picked from commit 603daa5b256b8964e0eed8c78a49d445f7944734)
----
- libnm/nm-secret-agent-old.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
-index 76e4238..c9dbb4f 100644
---- a/libnm/nm-secret-agent-old.c
-+++ b/libnm/nm-secret-agent-old.c
-@@ -1118,7 +1118,7 @@ init_async_got_proxy (GObject *object, GAsyncResult *result, gpointer user_data)
- 
- 	if (priv->auto_register) {
- 		nm_secret_agent_old_register_async (init_data->self, init_data->cancellable,
--		                                init_async_registered, init_data);
-+		                                    init_async_registered, init_data);
- 	} else
- 		init_async_complete (init_data, NULL);
- }
-@@ -1139,7 +1139,7 @@ init_async_got_bus (GObject *initable, GAsyncResult *result, gpointer user_data)
- 	nmdbus_agent_manager_proxy_new (priv->bus,
- 	                                  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
- 	                                | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
--	                                NM_DBUS_INTERFACE_AGENT_MANAGER,
-+	                                NM_DBUS_SERVICE,
- 	                                NM_DBUS_PATH_AGENT_MANAGER,
- 	                                init_data->cancellable,
- 	                                init_async_got_proxy, init_data);
diff --git a/debian/patches/series b/debian/patches/series
index 22431a55..e44814db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,3 @@ Fix-arping-path.patch
 Don-t-make-NetworkManager-D-Bus-activatable.patch
 Fix-iscsiadm-path.patch
 libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch
-libnm-core-tc-config-remove-deprecation-guards-from-typed.patch
-secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch
-platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch