Rebase patches.

14 files changed, 38 insertions, 60 deletions

diff --git a/debian/changelog b/debian/changelog
index 98343cd0d..1dcfa3f53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ network-manager (1.0.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Make no-patch-numbers the default for gbp pq to avoid unnecessary noise.
+  * Rebase patches.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 05 May 2015 17:49:16 +0200
 
diff --git a/debian/patches/0008-Fix-dependencies-in-libnm.pc.patch b/debian/patches/0008-Fix-dependencies-in-libnm.pc.patch
deleted file mode 100644
index 8c7b0aa7e..000000000
--- a/debian/patches/0008-Fix-dependencies-in-libnm.pc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Fri, 23 Jan 2015 21:19:55 +0100
-Subject: Fix dependencies in libnm.pc
-
-The new libnm library doesn't use libdbus-glib, so drop that from
-Requires.
----
- libnm/libnm.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libnm/libnm.pc.in b/libnm/libnm.pc.in
-index 6392799..5fe26b6 100644
---- a/libnm/libnm.pc.in
-+++ b/libnm/libnm.pc.in
-@@ -6,7 +6,7 @@ includedir=@includedir@
- Name: libnm
- Description: Convenience library for clients of NetworkManager
- Version: @VERSION@
--Requires: gio-2.0 dbus-glib-1
-+Requires: gio-2.0
- Cflags: -I${includedir}/libnm
- Libs: -L${libdir} -lnm
- 
diff --git a/debian/patches/0009-Check-at-runtime-whether-to-start-ModemManager.patch b/debian/patches/Check-at-runtime-whether-to-start-ModemManager.patch
index 2b77012ed..2b77012ed 100644
--- a/debian/patches/0009-Check-at-runtime-whether-to-start-ModemManager.patch
+++ b/debian/patches/Check-at-runtime-whether-to-start-ModemManager.patch
diff --git a/debian/patches/0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch b/debian/patches/Debian-specific-tweaks-for-NetworkManager-systemd-se.patch
index 546d20e18..546d20e18 100644
--- a/debian/patches/0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch
+++ b/debian/patches/Debian-specific-tweaks-for-NetworkManager-systemd-se.patch
diff --git a/debian/patches/0012-Don-t-block-network.target-on-NetworkManager-wait-on.patch b/debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch
index 1ddb666db..1ddb666db 100644
--- a/debian/patches/0012-Don-t-block-network.target-on-NetworkManager-wait-on.patch
+++ b/debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch
diff --git a/debian/patches/0011-Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
index ce0283677..ce0283677 100644
--- a/debian/patches/0011-Don-t-make-NetworkManager-D-Bus-activatable.patch
+++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
diff --git a/debian/patches/0003-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 f8bc42f63..5da036721 100644
--- a/debian/patches/0003-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
@@ -18,7 +18,7 @@ Closes: #742933
  3 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index b6bf38e..c21cb9d 100644
+index 68dff7a..f6c79ea 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -373,8 +373,9 @@ fi
@@ -33,10 +33,10 @@ index b6bf38e..c21cb9d 100644
      *)
  	AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd])
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 808e59e..84ece6c 100644
+index a24ac6c..6339cb7 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -411,6 +411,7 @@ AM_CPPFLAGS += \
+@@ -412,6 +412,7 @@ AM_CPPFLAGS += \
  	$(LIBNDP_CFLAGS) \
  	$(LIBSOUP_CFLAGS) \
  	$(SYSTEMD_LOGIN_CFLAGS) \
@@ -44,7 +44,7 @@ index 808e59e..84ece6c 100644
  	$(SYSTEMD_DHCP_CFLAGS) \
  	\
  	-DBINDIR=\"$(bindir)\" \
-@@ -449,6 +450,7 @@ libNetworkManager_la_LIBADD = \
+@@ -450,6 +451,7 @@ libNetworkManager_la_LIBADD = \
  	$(GUDEV_LIBS) \
  	$(LIBNL_LIBS) \
  	$(SYSTEMD_LOGIN_LIBS) \
diff --git a/debian/patches/0002-Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 23fdaf9c8..27f668b12 100644
--- a/debian/patches/0002-Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -8,11 +8,11 @@ online state to CONNECTED.
 
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
 ---
- src/nm-manager.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 121 insertions(+)
+ src/nm-manager.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 122 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 7e81afa..1fac0d7 100644
+index 0fa88d1..0a39dfb 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -64,6 +64,8 @@
@@ -36,7 +36,7 @@ index 7e81afa..1fac0d7 100644
  	guint timestamp_update_id;
  
  	gboolean startup;
-@@ -625,6 +632,29 @@ find_best_device_state (NMManager *manager, gboolean *want_connectivity_check)
+@@ -621,6 +628,29 @@ find_best_device_state (NMManager *manager)
  	return best_state;
  }
  
@@ -46,7 +46,7 @@ index 7e81afa..1fac0d7 100644
 +	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
 +	NMState new_state = current_state;
 +	GSList *iter;
-+	
++
 +	for (iter = priv->devices; iter; iter = iter->next) {
 +		NMDevice *dev = NM_DEVICE (iter->data);
 +		NMDeviceState state = nm_device_get_state (dev);
@@ -66,16 +66,17 @@ index 7e81afa..1fac0d7 100644
  static void
  nm_manager_update_state (NMManager *manager)
  {
-@@ -640,6 +670,8 @@ nm_manager_update_state (NMManager *manager)
- 		new_state = NM_STATE_ASLEEP;
- 	else
- 		new_state = find_best_device_state (manager, &want_connectivity_check);
+@@ -638,6 +668,9 @@ nm_manager_update_state (NMManager *manager)
+ 
+ 	nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL);
+ 
 +	if (new_state != NM_STATE_CONNECTED_GLOBAL)
 +		new_state = find_unmanaged_state (manager, new_state);
- 
- 	if (new_state == NM_STATE_CONNECTING && want_connectivity_check) {
++
+ 	if (new_state == NM_STATE_CONNECTED_SITE) {
  		nm_connectivity_check_async (priv->connectivity,
-@@ -4131,6 +4163,65 @@ impl_manager_check_connectivity (NMManager *manager,
+ 		                             checked_connectivity,
+@@ -4172,6 +4205,65 @@ impl_manager_check_connectivity (NMManager *manager,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -141,7 +142,7 @@ index 7e81afa..1fac0d7 100644
  void
  nm_manager_start (NMManager *self)
  {
-@@ -4179,6 +4270,9 @@ nm_manager_start (NMManager *self)
+@@ -4220,6 +4312,9 @@ nm_manager_start (NMManager *self)
  	system_create_virtual_devices (self);
  
  	check_if_startup_complete (self);
@@ -151,7 +152,7 @@ index 7e81afa..1fac0d7 100644
  }
  
  void
-@@ -4873,6 +4967,22 @@ nm_manager_init (NMManager *manager)
+@@ -4916,6 +5011,22 @@ nm_manager_init (NMManager *manager)
  		             KERNEL_FIRMWARE_DIR);
  	}
  
@@ -174,7 +175,7 @@ index 7e81afa..1fac0d7 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, manager);
  }
-@@ -5069,6 +5179,17 @@ dispose (GObject *object)
+@@ -5113,6 +5224,17 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch b/debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch
index fbfd7eff3..fbfd7eff3 100644
--- a/debian/patches/0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch
+++ b/debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch
diff --git a/debian/patches/0004-Use-symlinks-for-nmtui.patch b/debian/patches/Use-symlinks-for-nmtui.patch
index f9d582757..aacb4700a 100644
--- a/debian/patches/0004-Use-symlinks-for-nmtui.patch
+++ b/debian/patches/Use-symlinks-for-nmtui.patch
@@ -22,7 +22,7 @@ index ad9335d..09f2700 100644
  
  uninstall-hook:
 diff --git a/configure.ac b/configure.ac
-index c21cb9d..ae2ec6d 100644
+index f6c79ea..ffcca3d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -45,6 +45,8 @@ AM_PROG_CC_C_O
diff --git a/debian/patches/0006-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch b/debian/patches/Use-the-correct-path-when-calling-dnssec-trigger-scr.patch
index 9385e97fb..b52415937 100644
--- a/debian/patches/0006-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch
+++ b/debian/patches/Use-the-correct-path-when-calling-dnssec-trigger-scr.patch
@@ -9,15 +9,15 @@ a different path.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns-manager/nm-dns-unbound.c
-index 533290c..b5452bf 100644
+index 5723bf8..2dcc220 100644
 --- a/src/dns-manager/nm-dns-unbound.c
 +++ b/src/dns-manager/nm-dns-unbound.c
 @@ -42,7 +42,7 @@ update (NMDnsPlugin *plugin,
  	 * without calling custom scripts. The dnssec-trigger functionality
  	 * may be eventually merged into NetworkManager.
  	 */
--	return nm_spawn_process ("/usr/libexec/dnssec-trigger-script --async --update") == 0;
-+	return nm_spawn_process ("/usr/lib/dnssec-trigger/dnssec-trigger-script --async --update") == 0;
+-	return nm_spawn_process ("/usr/libexec/dnssec-trigger-script --async --update", NULL) == 0;
++	return nm_spawn_process ("/usr/lib/dnssec-trigger/dnssec-trigger-script --async --update", NULL) == 0;
  }
  
  static gboolean
diff --git a/debian/patches/0010-build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch b/debian/patches/build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch
index faf28e14d..faf28e14d 100644
--- a/debian/patches/0010-build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch
+++ b/debian/patches/build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch
diff --git a/debian/patches/0007-fix-arping-path.patch b/debian/patches/fix-arping-path.patch
index 6e7afd4c6..d23762f3c 100644
--- a/debian/patches/0007-fix-arping-path.patch
+++ b/debian/patches/fix-arping-path.patch
@@ -15,10 +15,10 @@ Closes: #755039
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index a989953..abe99d4 100644
+index 4752628..25b17b3 100644
 --- a/src/devices/nm-device.c
 +++ b/src/devices/nm-device.c
-@@ -5095,7 +5095,7 @@ send_arps (NMDevice *self, const char *mode_arg)
+@@ -5137,7 +5137,7 @@ send_arps (NMDevice *self, const char *mode_arg)
  	if (num == 0)
  		return;
  
diff --git a/debian/patches/series b/debian/patches/series
index eed36928b..a6227112c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,11 @@
-0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch
-0002-Force-online-state-with-unmanaged-devices.patch
-0003-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
-0004-Use-symlinks-for-nmtui.patch
-0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch
-0006-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch
-0007-fix-arping-path.patch
-0008-Fix-dependencies-in-libnm.pc.patch
-0009-Check-at-runtime-whether-to-start-ModemManager.patch
-0010-build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch
-0011-Don-t-make-NetworkManager-D-Bus-activatable.patch
-0012-Don-t-block-network.target-on-NetworkManager-wait-on.patch
+Debian-specific-tweaks-for-NetworkManager-systemd-se.patch
+Force-online-state-with-unmanaged-devices.patch
+Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
+Use-symlinks-for-nmtui.patch
+Mark-virtual-ethernet-interfaces-as-unmanaged.patch
+Use-the-correct-path-when-calling-dnssec-trigger-scr.patch
+fix-arping-path.patch
+Check-at-runtime-whether-to-start-ModemManager.patch
+build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch
+Don-t-make-NetworkManager-D-Bus-activatable.patch
+Don-t-block-network.target-on-NetworkManager-wait-on.patch