Rebase patches

6 files changed, 13 insertions, 153 deletions

diff --git a/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch b/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch
deleted file mode 100644
index 9525cc2a..00000000
--- a/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Andrei Dziahel <develop7@develop7.info>
-Date: Mon, 17 Sep 2018 10:03:15 +0000
-Subject: Do not manage Docker bridge interfaces
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/15
-(cherry picked from commit 0ce73275506e8d3156b8d3cd9ca7a1105c5dc4fb)
----
- data/85-nm-unmanaged.rules | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/data/85-nm-unmanaged.rules b/data/85-nm-unmanaged.rules
-index edc4ddb..20f4d29 100644
---- a/data/85-nm-unmanaged.rules
-+++ b/data/85-nm-unmanaged.rules
-@@ -26,6 +26,9 @@ ATTR{address}=="00:1c:42:*", ENV{INTERFACE}=="vnic[0-9]*", ENV{NM_UNMANAGED}="1"
- # in another net namespace and managed by libvirt, Docker or the like.
- ENV{ID_NET_DRIVER}=="veth", ENV{NM_UNMANAGED}="1"
- 
-+# Docker bridge. Managed by docker daemon.
-+ATTR{address}=="02:42:*", ENV{INTERFACE}=="docker[0-9]*", ENV{NM_UNMANAGED}="1"
-+
- # USB gadget device. Unmanage by default, since whatever created it
- # might want to set it up itself (e.g. activate an ipv4.method=shared
- # connection).
diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
deleted file mode 100644
index 99543a19..00000000
--- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Sun, 29 Mar 2015 22:57:50 +0200
-Subject: Don't make NetworkManager D-Bus activatable
-
-If the NetworkManager daemon has been stopped manually we don't want it
-to be autostarted by a client request.
----
- Makefile.am                    | 5 -----
- data/NetworkManager.service.in | 1 -
- 2 files changed, 6 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e1b442e..8428816 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4105,11 +4105,6 @@ endif
- data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
- 	$(AM_V_GEN) $(data_edit) $< >$@
- 
--data/org.freedesktop.NetworkManager.service: $(srcdir)/data/org.freedesktop.NetworkManager.service.in
--	$(AM_V_GEN) $(data_edit) $< >$@
--
--service_DATA += data/org.freedesktop.NetworkManager.service
--
- endif
- 
- examples_DATA += data/server.conf
-diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
-index 2692935..ff90456 100644
---- a/data/NetworkManager.service.in
-+++ b/data/NetworkManager.service.in
-@@ -24,7 +24,6 @@ ProtectHome=read-only
- 
- [Install]
- WantedBy=multi-user.target
--Alias=dbus-org.freedesktop.NetworkManager.service
- Also=NetworkManager-dispatcher.service
- 
- # We want to enable NetworkManager-wait-online.service whenever this service
diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
index 5ab7a01d..7d869e6f 100644
--- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
+++ b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
@@ -16,18 +16,18 @@ Closes: #742933
  1 file changed, 5 insertions(+)
 
 diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
-index 54d7577..a4bb43f 100644
+index 7e0ebe6..aa694d5 100644
 --- a/src/nm-sleep-monitor.c
 +++ b/src/nm-sleep-monitor.c
-@@ -25,6 +25,7 @@
- #include <string.h>
+@@ -23,6 +23,7 @@
+ 
  #include <sys/stat.h>
  #include <gio/gunixfdlist.h>
 +#include <systemd/sd-daemon.h>
  
  #include "nm-core-internal.h"
  #include "NetworkManagerUtils.h"
-@@ -344,6 +345,10 @@ on_proxy_acquired (GObject *object,
+@@ -342,6 +343,10 @@ on_proxy_acquired (GObject *object,
  static void
  nm_sleep_monitor_init (NMSleepMonitor *self)
  {
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 80d3158a..dc3c2ba7 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, 115 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 3ddc3b9..ada30d9 100644
+index 0bf6a75..46ced5b 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -62,6 +62,8 @@
+@@ -61,6 +61,8 @@
  #include "nm-dispatcher.h"
  #include "NetworkManagerUtils.h"
  
@@ -24,7 +24,7 @@ index 3ddc3b9..ada30d9 100644
  /*****************************************************************************/
  
  typedef struct {
-@@ -192,6 +194,10 @@ typedef struct {
+@@ -193,6 +195,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,7 +35,7 @@ index 3ddc3b9..ada30d9 100644
  	guint timestamp_update_id;
  
  	guint devices_inited_id;
-@@ -1417,6 +1423,27 @@ find_best_device_state (NMManager *manager)
+@@ -1430,6 +1436,27 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -63,7 +63,7 @@ index 3ddc3b9..ada30d9 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -1455,6 +1482,9 @@ nm_manager_update_state (NMManager *self)
+@@ -1476,6 +1503,9 @@ nm_manager_update_state (NMManager *self)
  	else
  		new_state = find_best_device_state (self);
  
@@ -73,7 +73,7 @@ index 3ddc3b9..ada30d9 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -6217,6 +6247,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
+@@ -6481,6 +6511,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -136,7 +136,7 @@ index 3ddc3b9..ada30d9 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -6385,6 +6471,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -6649,6 +6735,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 3ddc3b9..ada30d9 100644
  	return TRUE;
  }
  
-@@ -7239,6 +7328,22 @@ nm_manager_init (NMManager *self)
+@@ -7508,6 +7597,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ index 3ddc3b9..ada30d9 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -7514,6 +7619,16 @@ dispose (GObject *object)
+@@ -7783,6 +7888,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/series b/debian/patches/series
index b21e8a16..9a20acf2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-Do-not-manage-Docker-bridge-interfaces.patch
-supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch
 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
diff --git a/debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch b/debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch
deleted file mode 100644
index 38930c48..00000000
--- a/debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Mon, 25 Feb 2019 08:38:22 +0100
-Subject: supplicant: fix setting pmf when the supplicant doesn't advertise
- support
-
-wpa_supplicant only advertises pmf support since commit [1], which is
-after 2.6. When using a version without that commit (for example,
-plain 2.6), we would unconditionally set the global Pmf property to 1
-(optional) and then skip setting the per-network property. The result
-was that pmf was enabled without the possibility to disable it by
-user. The correct behavior is instead to disable pmf on such versions.
-
-[1] https://w1.fi/cgit/hostap/commit/?id=3cdb4ac074f76accf24a51d143db545afad2c90b
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/129
-(cherry picked from commit 560a35dd433cd6bf2268aaf757fda798f35712fe)
-(cherry picked from commit b837561bb6fc09d4134ac8c5c6dc5ac1885ebf62)
-(cherry picked from commit 353743b99520ba481d08b52b31af16dcfc80d39f)
----
- src/supplicant/nm-supplicant-interface.c | 33 +++++++++++++++++---------------
- 1 file changed, 18 insertions(+), 15 deletions(-)
-
-diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
-index 0af9ebd..b2a89ce 100644
---- a/src/supplicant/nm-supplicant-interface.c
-+++ b/src/supplicant/nm-supplicant-interface.c
-@@ -568,9 +568,8 @@ iface_set_pmf_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data)
- 
- 	self = NM_SUPPLICANT_INTERFACE (user_data);
- 
--	/* This can fail if the supplicant doesn't support PMF */
- 	if (error)
--		_LOGD ("failed to set Pmf=1: %s", error->message);
-+		_LOGW ("failed to set Pmf=1: %s", error->message);
- 
- 	iface_check_ready (self);
- }
-@@ -1175,19 +1174,23 @@ on_iface_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_
- 	                   NULL,
- 	                   NULL);
- 
--	/* Initialize global PMF setting to 'optional' */
--	priv->ready_count = 1;
--	g_dbus_proxy_call (priv->iface_proxy,
--	                   DBUS_INTERFACE_PROPERTIES ".Set",
--	                   g_variant_new ("(ssv)",
--	                                  WPAS_DBUS_IFACE_INTERFACE,
--	                                  "Pmf",
--	                                  g_variant_new_string ("1")),
--	                   G_DBUS_CALL_FLAGS_NONE,
--	                   -1,
--	                   priv->init_cancellable,
--	                   (GAsyncReadyCallback) iface_set_pmf_cb,
--	                   self);
-+	priv->ready_count = 0;
-+
-+	if (priv->pmf_support == NM_SUPPLICANT_FEATURE_YES) {
-+		/* Initialize global PMF setting to 'optional' */
-+		priv->ready_count++;
-+		g_dbus_proxy_call (priv->iface_proxy,
-+		                   DBUS_INTERFACE_PROPERTIES ".Set",
-+		                   g_variant_new ("(ssv)",
-+		                                  WPAS_DBUS_IFACE_INTERFACE,
-+		                                  "Pmf",
-+		                                  g_variant_new_string ("1")),
-+		                   G_DBUS_CALL_FLAGS_NONE,
-+		                   -1,
-+		                   priv->init_cancellable,
-+		                   (GAsyncReadyCallback) iface_set_pmf_cb,
-+		                   self);
-+	}
- 
- 	/* Check whether NetworkReply and AP mode are supported */
- 	priv->ready_count++;