Revision bump to fix timeouts with sftp due bug #339695 (reported by onip) using upstream patch. Remove broken version.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 48 insertions, 7 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 26538724c612..8cd04f6050fa 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.113 2010/09/27 21:54:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.114 2010/10/05 08:49:12 pacho Exp $
+
+*gvfs-1.6.4-r1 (05 Oct 2010)
+
+  05 Oct 2010; Pacho Ramos <pacho@gentoo.org> -gvfs-1.6.4.ebuild,
+  +gvfs-1.6.4-r1.ebuild, +files/gvfs-1.6.4-sftp-timeout.patch:
+  Revision bump to fix timeouts with sftp due bug #339695 (reported by onip)
+  using upstream patch. Remove broken version.
 
 *gvfs-1.6.4 (27 Sep 2010)
 
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index d37fb87eb60e..cf69d2f97af3 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
+AUX gvfs-1.6.4-sftp-timeout.patch 978 RMD160 01baba58c316fddda48cae2abf8ffee3942ac7fb SHA1 8f36224495e845db734de15c3478b9a5499d8713 SHA256 9b66f6e711dd70172204fa40a2a0e77f47253720532f831d5e571ec8021c98f6
 DIST gvfs-1.2.3.tar.bz2 1041079 RMD160 ea8469449073b9a0e50fde4301fa5bc4ff5bbe56 SHA1 c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4 SHA256 395d480c1b64504ba75a8deb70ef6790f2ff07538fca73ef1d26a996223e5879
 DIST gvfs-1.4.3.tar.bz2 1263024 RMD160 da1458101257f5496b4469acb7bc7c646fd9c652 SHA1 3c28516893d6829b3bbae1768fb44e8a405c44e7 SHA256 3ca9ccab2efb2699b72a1f346d3533fc727b5ea2692af6c86adfd9532d6ba15d
 DIST gvfs-1.6.3.tar.bz2 1347090 RMD160 3ab75851966d1edecb11de42f4a581953c8ffa8f SHA1 152d84a605465fb8065ae6796a6a28112c5e8847 SHA256 4e3fe2dd80e5baaf4c1844560f6a787b144a917de1cb457b41efcb338477e760
@@ -10,13 +11,13 @@ DIST gvfs-1.6.4.tar.bz2 1385999 RMD160 b5aeb97260534f16c565a36ef87150823fb05283
 EBUILD gvfs-1.2.3.ebuild 2187 RMD160 b5e44f554f9bd10a4e266d1f5ec2729559c62a26 SHA1 258c9246869191e4b1ce98e7cf4eaa7aa5cbb3db SHA256 95296e907ff34b79988e030fadc89c963ccde4e405ed00b49eb2dadbc1bd74a6
 EBUILD gvfs-1.4.3-r1.ebuild 3029 RMD160 18ceb9ada9bc797d3690b6ed791c75f0651610ce SHA1 8d95e2d89d5c4bf15fbae8af3337838a37428dd1 SHA256 057b5ec65c4a34c5dc3d8e576d9ee1a9d6a34be4008b3c42e4dab3e48a659fd7
 EBUILD gvfs-1.6.3.ebuild 3027 RMD160 75ffb81db9a1d2b99b4b2adaf1440177a4dede32 SHA1 8112405f620d2017d306a523347da4ff86fceaac SHA256 52c57f3c274d452b31ce4b77041637c8fe6982e38e8c6185d38c70ff4cc3ea46
-EBUILD gvfs-1.6.4.ebuild 3027 RMD160 79d6e2616e6ffcb07088671dd3d877290db2d629 SHA1 962ceb9214eedead7aeb92d534195b414bedbf71 SHA256 6b3bb98a115a73ccffae9123d5b7ad3048b649f6c1802aee1c249890f3a9844b
-MISC ChangeLog 16106 RMD160 b592540ecabe19ae56d4581ce783a5cb3076cb0b SHA1 9695afff49f081e9f1ccd29a8ca966286e21f5dc SHA256 de7a32567514a70db1ee199c07a89b178bdf2ec4ca15337e685276386e89e0ef
+EBUILD gvfs-1.6.4-r1.ebuild 3120 RMD160 d4b070221217a085a8eb635747b901c72e360b51 SHA1 487e8412d56ae3d6e8d163814e337b3e2b2f280f SHA256 5609e452fe6fb3322b6a156f932b803cb05ffa94e233407b8c6b7d686dba39f5
+MISC ChangeLog 16392 RMD160 e68248d6a3765d718851e6d5ff739b1629ca0f73 SHA1 5a3fd0f191c18972b66bbbdf841fab4fc97cd844 SHA256 3a0a3d5ca885c0a07ff25dd6b49023d0fd299369c9781f53473c24a26f244580
 MISC metadata.xml 1100 RMD160 2d3714eb866d2d48d35e2b69fd5f2228b414793c SHA1 79ac2d6f91caecd4be3202ebb71489d7ff7dee98 SHA256 9b2f7554d979873b4a6900725cba341517bab4980cb63625704cbd62e8bbbb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyhEpEACgkQ1fmVwcYIWAb07ACeIupMbOSeS2Ue7yK0w4eVvWFZ
-VmwAnRAT3UmaQ8xkmBGzE5975fLnus0N
-=lK5X
+iEYEARECAAYFAkyq5o8ACgkQCaWpQKGI+9SMCwCfcxbmupPJt07mtsSlbHSt/Rpp
+fqcAn11NFX+ENVOf1wsvBnX9dklEZDb6
+=x6MM
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch b/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch
new file mode 100644
index 000000000000..a236dd2c8d89
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch
@@ -0,0 +1,30 @@
+From 4033907045abcf498686c1b34be7b0160260088d Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Sat, 02 Oct 2010 12:51:54 +0000
+Subject: 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
+---
+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)
+         {
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gvfs/gvfs-1.6.4.ebuild b/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild
index 0f171640f86e..6463db4a1184 100644
--- a/gnome-base/gvfs/gvfs-1.6.4.ebuild
+++ b/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4.ebuild,v 1.1 2010/09/27 21:54:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild,v 1.1 2010/10/05 08:49:12 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -80,6 +80,9 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	# sftp: fix poll() timeout, bug #339695
+	epatch "${FILESDIR}/${P}-sftp-timeout.patch"
+
 	# Conditional patching purely to avoid eautoreconf
 	use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.patch"