Rebase patches

7 files changed, 26 insertions, 118 deletions

diff --git a/debian/changelog b/debian/changelog
index 04d86a9a..1af0b015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 network-manager (1.2.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Rebase patches.
 
  -- Michael Biebl <biebl@debian.org>  Wed, 03 Aug 2016 23:01:13 +0200
 
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 967d247a..4ef2fc47 100644
--- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
+++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
@@ -28,10 +28,10 @@ index ce059fc..4ab4106 100644
  	install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
  	ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
 diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
-index 7946ac1..eaab677 100644
+index 95128a6..7a4cede 100644
 --- a/data/NetworkManager.service.in
 +++ b/data/NetworkManager.service.in
-@@ -18,6 +18,5 @@ ProtectHome=read-only
+@@ -20,6 +20,5 @@ ProtectHome=read-only
  
  [Install]
  WantedBy=multi-user.target
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 971b042a..f190e327 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
@@ -12,13 +12,13 @@ systemd.
 
 Closes: #742933
 ---
- configure.ac                   | 3 ++-
- src/Makefile.am                | 2 ++
- src/nm-sleep-monitor-systemd.c | 5 +++++
+ configure.ac           | 3 ++-
+ src/Makefile.am        | 2 ++
+ src/nm-sleep-monitor.c | 5 +++++
  3 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 7bb3779..93adf26 100644
+index 4c56e14..a47f09e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -474,8 +474,9 @@ fi
@@ -33,10 +33,10 @@ index 7bb3779..93adf26 100644
          ;;
      consolekit)
 diff --git a/src/Makefile.am b/src/Makefile.am
-index aa35eef..2495bbc 100644
+index 48af5a0..b4fc16d 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -482,6 +482,7 @@ AM_CPPFLAGS += \
+@@ -474,6 +474,7 @@ AM_CPPFLAGS += \
  	$(SELINUX_CFLAGS) \
  	$(LIBAUDIT_CFLAGS) \
  	$(SYSTEMD_LOGIN_CFLAGS) \
@@ -44,7 +44,7 @@ index aa35eef..2495bbc 100644
  	$(SYSTEMD_JOURNAL_CFLAGS) \
  	$(SYSTEMD_NM_CFLAGS_PATHS) \
  	\
-@@ -515,6 +516,7 @@ libNetworkManager_la_LIBADD = \
+@@ -507,6 +508,7 @@ libNetworkManager_la_LIBADD = \
  	$(GUDEV_LIBS) \
  	$(LIBNL_LIBS) \
  	$(SYSTEMD_LOGIN_LIBS) \
@@ -52,11 +52,11 @@ index aa35eef..2495bbc 100644
  	$(SYSTEMD_JOURNAL_LIBS) \
  	$(LIBNDP_LIBS) \
  	$(LIBDL) \
-diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
-index 064a703..d42c0fe 100644
---- a/src/nm-sleep-monitor-systemd.c
-+++ b/src/nm-sleep-monitor-systemd.c
-@@ -23,6 +23,7 @@
+diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
+index 13ce1be..561e503 100644
+--- a/src/nm-sleep-monitor.c
++++ b/src/nm-sleep-monitor.c
+@@ -25,6 +25,7 @@
  #include <string.h>
  #include <sys/stat.h>
  #include <gio/gunixfdlist.h>
@@ -64,7 +64,7 @@ index 064a703..d42c0fe 100644
  
  #include "nm-core-internal.h"
  #include "NetworkManagerUtils.h"
-@@ -203,6 +204,10 @@ on_proxy_acquired (GObject *object,
+@@ -340,6 +341,10 @@ on_proxy_acquired (GObject *object,
  static void
  nm_sleep_monitor_init (NMSleepMonitor *self)
  {
@@ -73,5 +73,5 @@ index 064a703..d42c0fe 100644
 +		return;
 +	}
  	self->inhibit_fd = -1;
+ 	self->cancellable = g_cancellable_new ();
  	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
- 	                          G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index d7f445a5..66cce389 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, 120 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index e64c68a..10aa3d7 100644
+index 8277f6b..9ab54b3 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
-@@ -57,6 +57,8 @@
+@@ -58,6 +58,8 @@
  #include "nmdbus-manager.h"
  #include "nmdbus-device.h"
  
@@ -24,7 +24,7 @@ index e64c68a..10aa3d7 100644
  static gboolean add_device (NMManager *self, NMDevice *device, GError **error);
  
  static NMActiveConnection *_new_active_connection (NMManager *self,
-@@ -137,6 +139,10 @@ typedef struct {
+@@ -139,6 +141,10 @@ typedef struct {
  	GFileMonitor *fw_monitor;
  	guint fw_changed_id;
  
@@ -35,7 +35,7 @@ index e64c68a..10aa3d7 100644
  	guint timestamp_update_id;
  
  	gboolean startup;
-@@ -687,6 +693,29 @@ find_best_device_state (NMManager *manager)
+@@ -787,6 +793,29 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -65,7 +65,7 @@ index e64c68a..10aa3d7 100644
  static void
  nm_manager_update_metered (NMManager *self)
  {
-@@ -727,6 +756,9 @@ nm_manager_update_state (NMManager *manager)
+@@ -827,6 +856,9 @@ nm_manager_update_state (NMManager *manager)
  
  	nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL);
  
@@ -75,7 +75,7 @@ index e64c68a..10aa3d7 100644
  	if (new_state == NM_STATE_CONNECTED_SITE) {
  		nm_connectivity_check_async (priv->connectivity,
  		                             checked_connectivity,
-@@ -4410,6 +4442,65 @@ impl_manager_check_connectivity (NMManager *self,
+@@ -4632,6 +4664,65 @@ impl_manager_check_connectivity (NMManager *self,
  }
  
  static void
@@ -141,7 +141,7 @@ index e64c68a..10aa3d7 100644
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
  	nm_device_factory_start (factory);
-@@ -4480,6 +4571,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -4702,6 +4793,9 @@ nm_manager_start (NMManager *self, GError **error)
  
  	check_if_startup_complete (self);
  
@@ -151,7 +151,7 @@ index e64c68a..10aa3d7 100644
  	return TRUE;
  }
  
-@@ -5280,6 +5374,22 @@ nm_manager_init (NMManager *self)
+@@ -5503,6 +5597,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -174,7 +174,7 @@ index e64c68a..10aa3d7 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -5522,6 +5632,16 @@ dispose (GObject *object)
+@@ -5748,6 +5858,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/series b/debian/patches/series
index 842debff..e74194c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,3 @@ Check-at-runtime-whether-to-start-ModemManager.patch
 Don-t-make-NetworkManager-D-Bus-activatable.patch
 systemd-Don-t-enable-NetworkManager-wait-online.service-s.patch
 Fix-iscsiadm-path.patch
-systemd-Add-Documentation-to-service-files.patch
-systemd-Use-RemainAfterExit-yes-for-NetworkManager-wait-o.patch
diff --git a/debian/patches/systemd-Add-Documentation-to-service-files.patch b/debian/patches/systemd-Add-Documentation-to-service-files.patch
deleted file mode 100644
index 41460def..00000000
--- a/debian/patches/systemd-Add-Documentation-to-service-files.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Thu, 2 Jun 2016 17:41:29 +0200
-Subject: systemd: Add Documentation to service files
-
-Reference the nm-online and NetworkManager man page in the corresponding
-service files.
-
-https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Documentation=
-
-https://bugzilla.gnome.org/show_bug.cgi?id=767168
----
- data/NetworkManager-wait-online-systemd-pre200.service.in | 1 +
- data/NetworkManager-wait-online.service.in                | 1 +
- data/NetworkManager.service.in                            | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/data/NetworkManager-wait-online-systemd-pre200.service.in b/data/NetworkManager-wait-online-systemd-pre200.service.in
-index d145a79..8b54f48 100644
---- a/data/NetworkManager-wait-online-systemd-pre200.service.in
-+++ b/data/NetworkManager-wait-online-systemd-pre200.service.in
-@@ -1,5 +1,6 @@
- [Unit]
- Description=Network Manager Wait Online
-+Documentation=man:nm-online(1)
- Requisite=NetworkManager.service
- After=NetworkManager.service
- Wants=network.target
-diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in
-index 8c4fa67..4df854c 100644
---- a/data/NetworkManager-wait-online.service.in
-+++ b/data/NetworkManager-wait-online.service.in
-@@ -1,5 +1,6 @@
- [Unit]
- Description=Network Manager Wait Online
-+Documentation=man:nm-online(1)
- Requisite=NetworkManager.service
- After=NetworkManager.service
- Before=network-online.target
-diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
-index eaab677..4f07180 100644
---- a/data/NetworkManager.service.in
-+++ b/data/NetworkManager.service.in
-@@ -1,5 +1,6 @@
- [Unit]
- Description=Network Manager
-+Documentation=man:NetworkManager(8)
- Wants=network.target
- After=network-pre.target dbus.service
- Before=network.target @DISTRO_NETWORK_SERVICE@
diff --git a/debian/patches/systemd-Use-RemainAfterExit-yes-for-NetworkManager-wait-o.patch b/debian/patches/systemd-Use-RemainAfterExit-yes-for-NetworkManager-wait-o.patch
deleted file mode 100644
index 39c28b7c..00000000
--- a/debian/patches/systemd-Use-RemainAfterExit-yes-for-NetworkManager-wait-o.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Thu, 2 Jun 2016 17:58:35 +0200
-Subject: systemd: Use RemainAfterExit=yes for
- NetworkManager-wait-online.service
-
-RemainAfterExit=yes is typically used for Type=oneshot services.
-systemd-networkd-wait-online.service uses it, so we should as well.
-
-See
-https://www.freedesktop.org/software/systemd/man/systemd.service.html#RemainAfterExit=
-https://www.freedesktop.org/software/systemd/man/systemd.service.html#Type=
-
-https://bugzilla.gnome.org/show_bug.cgi?id=767170
----
- data/NetworkManager-wait-online-systemd-pre200.service.in | 1 +
- data/NetworkManager-wait-online.service.in                | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/data/NetworkManager-wait-online-systemd-pre200.service.in b/data/NetworkManager-wait-online-systemd-pre200.service.in
-index 8b54f48..55e4508 100644
---- a/data/NetworkManager-wait-online-systemd-pre200.service.in
-+++ b/data/NetworkManager-wait-online-systemd-pre200.service.in
-@@ -9,6 +9,7 @@ Before=network.target
- [Service]
- Type=oneshot
- ExecStart=@bindir@/nm-online -s -q --timeout=30
-+RemainAfterExit=yes
- 
- [Install]
- WantedBy=network.target
-diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in
-index 4df854c..1753d20 100644
---- a/data/NetworkManager-wait-online.service.in
-+++ b/data/NetworkManager-wait-online.service.in
-@@ -8,6 +8,7 @@ Before=network-online.target
- [Service]
- Type=oneshot
- ExecStart=@bindir@/nm-online -s -q --timeout=30
-+RemainAfterExit=yes
- 
- [Install]
- WantedBy=network-online.target