Rebase patches

8 files changed, 10 insertions, 43 deletions

diff --git a/debian/changelog b/debian/changelog
index c2f8c7af..a046e717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ network-manager (1.0.10-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Bump Build-Depend on libsoup2.4-dev to (>= 2.40) as per configure.ac.
+  * Rebase patches.
 
  -- Michael Biebl <biebl@debian.org>  Thu, 24 Dec 2015 00:23:58 +0100
 
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 8f6b1aa2..d1c392fd 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
@@ -18,7 +18,7 @@ Closes: #742933
  3 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9c461ab..847ddc3 100644
+index 1ed6935..1e9c63d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -384,8 +384,9 @@ fi
@@ -53,7 +53,7 @@ index e8279e7..ecde266 100644
  	$(LIBDL) \
  	$(LIBM)
 diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
-index c0bc65e..0c97335 100644
+index 44523a4..5ad0715 100644
 --- a/src/nm-sleep-monitor-systemd.c
 +++ b/src/nm-sleep-monitor-systemd.c
 @@ -25,6 +25,7 @@
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index d7dcfb27..28f41ff7 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, 120 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index cc52ea7..f81c269 100644
+index a1e4fb4..7f78984 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -62,6 +62,8 @@
@@ -174,7 +174,7 @@ index cc52ea7..f81c269 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, manager);
  
-@@ -5156,6 +5266,16 @@ dispose (GObject *object)
+@@ -5160,6 +5270,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/Use-symlinks-for-nmtui.patch b/debian/patches/Use-symlinks-for-nmtui.patch
index 1614d9de..2cc07a89 100644
--- a/debian/patches/Use-symlinks-for-nmtui.patch
+++ b/debian/patches/Use-symlinks-for-nmtui.patch
@@ -9,10 +9,10 @@ Make /usr/bin/nmtui-* symbolic links to /usr/bin/nmtui.
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/clients/tui/Makefile.am b/clients/tui/Makefile.am
-index f6d93be..5108cc4 100644
+index a84fcdf..3eb1756 100644
 --- a/clients/tui/Makefile.am
 +++ b/clients/tui/Makefile.am
-@@ -25,7 +25,7 @@ links = nmtui-edit nmtui-connect nmtui-hostname
+@@ -27,7 +27,7 @@ links = nmtui-edit nmtui-connect nmtui-hostname
  
  install-exec-hook:
  	for link in $(links); do \
@@ -22,7 +22,7 @@ index f6d93be..5108cc4 100644
  
  uninstall-hook:
 diff --git a/configure.ac b/configure.ac
-index 847ddc3..49fdc2d 100644
+index 1e9c63d..3274fd9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -33,6 +33,8 @@ AM_PROG_CC_C_O
diff --git a/debian/patches/clients-check-errors-of-polkit_unix_session_new_for_proce.patch b/debian/patches/clients-check-errors-of-polkit_unix_session_new_for_proce.patch
deleted file mode 100644
index 6ff93f14..00000000
--- a/debian/patches/clients-check-errors-of-polkit_unix_session_new_for_proce.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: =?utf-8?q?Ji=C5=99=C3=AD_Klime=C5=A1?= <jklimes@redhat.com>
-Date: Wed, 25 Nov 2015 10:51:44 +0100
-Subject: clients: check errors of polkit_unix_session_new_for_process_sync()
-
-polkit_unix_session_new_for_process_sync() can fail. And calling
-polkit_agent_listener_register() with NULL PolkitSubject results in errors.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758625
-
-(cherry picked from commit 542200f5393ae0923ce4693085cfe77902622778)
----
- clients/common/nm-polkit-listener.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
-index 82df1b2..c1c7c90 100644
---- a/clients/common/nm-polkit-listener.c
-+++ b/clients/common/nm-polkit-listener.c
-@@ -323,9 +323,11 @@ nm_polkit_listener_new (gboolean for_session, GError **error)
- 	listener = g_object_new (NM_TYPE_POLKIT_LISTENER, NULL);
- 	priv = NM_POLKIT_LISTENER_GET_PRIVATE (listener);
- 
--	if (for_session)
--		session = polkit_unix_session_new_for_process_sync (getpid (), NULL, NULL);
--	else
-+	if (for_session) {
-+		session = polkit_unix_session_new_for_process_sync (getpid (), NULL, error);
-+		if (!session)
-+			return NULL;
-+	} else
- 		session = polkit_unix_process_new_for_owner (getpid (), 0, getuid ());
- 
- 	priv->reg_handle = polkit_agent_listener_register (listener, POLKIT_AGENT_REGISTER_FLAGS_NONE,
diff --git a/debian/patches/crypto-only-use-gnutls-crypto-API-remove-libgcrypt-d.patch b/debian/patches/crypto-only-use-gnutls-crypto-API-remove-libgcrypt-d.patch
index 117c45a2..00ba5401 100644
--- a/debian/patches/crypto-only-use-gnutls-crypto-API-remove-libgcrypt-d.patch
+++ b/debian/patches/crypto-only-use-gnutls-crypto-API-remove-libgcrypt-d.patch
@@ -18,7 +18,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=730294
  5 files changed, 112 insertions(+), 162 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 49fdc2d..aa83a7c 100644
+index 3274fd9..8ca1278 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -566,18 +566,11 @@ if test x"$ac_crypto" = xnss; then
diff --git a/debian/patches/fix-arping-path.patch b/debian/patches/fix-arping-path.patch
index 286943a7..458a554a 100644
--- a/debian/patches/fix-arping-path.patch
+++ b/debian/patches/fix-arping-path.patch
@@ -15,7 +15,7 @@ Closes: #755039
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 9b69d5a..48caf04 100644
+index bb39ca5..c7c4ddd 100644
 --- a/src/devices/nm-device.c
 +++ b/src/devices/nm-device.c
 @@ -5748,7 +5748,7 @@ send_arps (NMDevice *self, const char *mode_arg)
diff --git a/debian/patches/series b/debian/patches/series
index 1d8690ee..df1d3cc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ Don-t-make-NetworkManager-D-Bus-activatable.patch
 Don-t-block-network.target-on-NetworkManager-wait-on.patch
 Fix-iscsiadm-path.patch
 crypto-only-use-gnutls-crypto-API-remove-libgcrypt-d.patch
-clients-check-errors-of-polkit_unix_session_new_for_proce.patch