--- a/ChangeLog	Fri Jun 25 13:25:36 2004 +0000
+++ b/ChangeLog	Fri Jun 25 14:09:37 2004 +0000
@@ -1,3 +1,10 @@
+2004-06-25  Narayana Pattipati <[email protected]>
+
+	* gnome-vfs.spec:
+	* patches/gnome-vfs-27-sftp-exit-fix.diff:
+	Fix nautilus exit when using sftp:// method. Fixes bugtraq
+	bug:5067878.
+
 2004-06-25  Stephen Browne  <[email protected]>
  
         * nautilus.spec: added patch

--- a/gnome-vfs.spec	Fri Jun 25 13:25:36 2004 +0000
+++ b/gnome-vfs.spec	Fri Jun 25 14:09:37 2004 +0000
@@ -2,7 +2,7 @@
 License:      LGPL
 Group:        System/Libraries/GNOME
 Version:      2.6.0
-Release:      26
+Release:      27
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 Summary:      Virtual File System Library for GNOME
@@ -35,6 +35,7 @@
 Patch24:      gnome-vfs-24-ftp-crash.diff
 Patch25:      gnome-vfs-25-g11n-i18n-ui.diff
 Patch26:      gnome-vfs-26-ftp-hostname-crash.diff
+Patch27:      gnome-vfs-27-sftp-exit-fix.diff
 
 URL:          http://www.gnome.org/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -117,6 +118,7 @@
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 bzcat %SOURCE1 | tar xvf -
 
@@ -192,6 +194,11 @@
 
 %changelog
 * Fri Jun 25 2004 - [email protected]
+- Added patch gnome-vfs-27-sftp-exit-fix.diff to fix nautilus exit when
+  using sftp:// method. Fixes bugtraq bug:5067878. The patch is a backport
+  from community CVS HEAD.
+
+* Fri Jun 25 2004 - [email protected]
 - Added patch gnome-vfs-26-ftp-hostname-crash.diff to fix nautilus crash
   while using ftp:// method without specifying host name in the URL.
   Fixes bugtraq bug:5067212.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-vfs-27-sftp-exit-fix.diff	Fri Jun 25 14:09:37 2004 +0000
@@ -0,0 +1,18 @@
+--- gnome-vfs-2.6.0/modules/sftp-method.c	2004-06-25 15:14:42.584191000 +0100
++++ gnome-vfs-2.6.0-new/modules/sftp-method.c	2004-06-25 15:14:33.532809000 +0100
+@@ -180,11 +180,14 @@ atomic_io (read_write_fn f, gint fd, gpo
+ {
+ 	gsize pos = 0, res;
+ 	guchar *buffer;
++	long int __result;
+ 
+ 	buffer = buffer_in;
+ 
+ 	while (pos < size) {
+-		res = TEMP_FAILURE_RETRY (f (fd, buffer, size - pos));
++		do __result = (long int) (f (fd, buffer, size - pos));
++		while (__result == -1L && errno == EINTR);
++		res = __result;
+ 
+ 		if (res < 0)
+ 			return -1;