r25264 - in /desktop/unstable/gvfs/debian: changelog patches/06_sftp_timeout.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Oct 2 22:53:09 UTC 2010


Author: joss
Date: Sat Oct  2 22:53:07 2010
New Revision: 25264

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25264
Log:
06_sftp_timeout.patch: patch from Andreas Henriksson to fix 
incorrect timeout introduced by the openssh 5.6 portability change.

Added:
    desktop/unstable/gvfs/debian/patches/06_sftp_timeout.patch
Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/patches/series

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=25264&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Sat Oct  2 22:53:07 2010
@@ -1,3 +1,10 @@
+gvfs (1.6.4-2) unstable; urgency=low
+
+  * 06_sftp_timeout.patch: patch from Andreas Henriksson to fix 
+    incorrect timeout introduced by the openssh 5.6 portability change.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 03 Oct 2010 00:44:17 +0200
+
 gvfs (1.6.4-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gvfs/debian/patches/06_sftp_timeout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/06_sftp_timeout.patch?rev=25264&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/06_sftp_timeout.patch (added)
+++ desktop/unstable/gvfs/debian/patches/06_sftp_timeout.patch [utf-8] Sat Oct  2 22:53:07 2010
@@ -1,0 +1,33 @@
+From 2b779633f48f3099205a81737cf601939289fa73 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Sat, 2 Oct 2010 14:51:54 +0200
+Subject: [PATCH] sftp: fix poll() timeout.
+
+When switching from select() to poll() in commit
+"sftp: Use poll() to cope with openssh-5.6 changes" (c6be45c8934)
+the difference in seconds vs milliseconds for select/poll timeout
+argument was missed.
+
+SFTP_READ_TIMEOUT is defined in seconds, so multiply it with 1000
+when using it with poll().
+
+https://bugzilla.gnome.org/show_bug.cgi?id=631169
+---
+ daemon/gvfsbackendsftp.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
+index 9fecf6a..f6b7785 100644
+--- a/daemon/gvfsbackendsftp.c
++++ b/daemon/gvfsbackendsftp.c
+@@ -869,7 +869,7 @@ handle_login (GVfsBackend *backend,
+       fds[1].fd = prompt_fd;
+       fds[1].events = POLLIN;
+       
+-      ret = poll(fds, 2, SFTP_READ_TIMEOUT);
++      ret = poll(fds, 2, SFTP_READ_TIMEOUT * 1000);
+       
+       if (ret <= 0)
+         {
+-- 
+1.7.1

Modified: desktop/unstable/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/series?rev=25264&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/series [utf-8] Sat Oct  2 22:53:07 2010
@@ -3,5 +3,6 @@
 03_xdg-mount.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
+06_sftp_timeout.patch
 90_relibtoolize.patch
 99_ltmain_as-needed.patch




More information about the pkg-gnome-commits mailing list