Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master

2 files changed, 21 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index c54df3ab..85e01043 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,16 @@
-network-manager (1.22.8-1ubuntu1) focal; urgency=medium
+network-manager (1.22.10-1ubuntu1) UNRELEASED; urgency=medium
 
   * Update to the current stable version, merging from Debian
-  * debian/patches/gitlab_connection_ready.patch:
-    - removed, the change is in the new version
-  * debian/patches/Disable-core-with-expect.patch
-    - remove this old patch, it has no bug reference and build is working
-      correctly on the described architectures in Debian.
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 26 Feb 2020 16:35:27 +0100
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 13 Mar 2020 16:27:29 +0100
+
+network-manager (1.22.10-1) unstable; urgency=medium
+
+  * New upstream version 1.22.10
+  * Mark network-manager-dev as Architecture: all and Multi-Arch: foreign
+  * Rebase patches
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 13 Mar 2020 00:58:03 +0100
 
 network-manager (1.22.8-1) unstable; urgency=medium
 
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 1eb08e28..c16fee62 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,19 +12,19 @@ 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 6d3a5dd..f804918 100644
+index d7b2211..a89a8b7 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -50,6 +50,8 @@
- #include "nm-dispatcher.h"
- #include "NetworkManagerUtils.h"
+@@ -52,6 +52,8 @@
+ 
+ #define DEVICE_STATE_PRUNE_RATELIMIT_MAX 100u
  
 +#define IFUPDOWN_STATE_FILE "/run/network/ifstate"
 +
  /*****************************************************************************/
  
  typedef struct {
-@@ -188,6 +190,10 @@ typedef struct {
+@@ -187,6 +189,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,7 +35,7 @@ index 6d3a5dd..f804918 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -1426,6 +1432,27 @@ find_best_device_state (NMManager *manager)
+@@ -1427,6 +1433,27 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -63,7 +63,7 @@ index 6d3a5dd..f804918 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -1472,6 +1499,9 @@ nm_manager_update_state (NMManager *self)
+@@ -1473,6 +1500,9 @@ nm_manager_update_state (NMManager *self)
  	else
  		new_state = find_best_device_state (self);
  
@@ -73,7 +73,7 @@ index 6d3a5dd..f804918 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -6550,6 +6580,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
+@@ -6525,6 +6555,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -136,7 +136,7 @@ index 6d3a5dd..f804918 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -6723,6 +6809,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -6706,6 +6792,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 6d3a5dd..f804918 100644
  	return TRUE;
  }
  
-@@ -7571,6 +7660,22 @@ nm_manager_init (NMManager *self)
+@@ -7553,6 +7642,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ index 6d3a5dd..f804918 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -7853,6 +7958,16 @@ dispose (GObject *object)
+@@ -7832,6 +7937,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}