rpms/gvfs/F-10 gvfs-1.2.3-ftp-filesize.patch, NONE, 1.1 gvfs.spec, 1.98, 1.99

Tomas Bzatek tbzatek at fedoraproject.org
Wed May 6 16:40:57 UTC 2009


Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11263

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.2.3-ftp-filesize.patch 
Log Message:
* Wed May 06 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-8
- FTP: fix 32-bit file size string conversion (#499286)


gvfs-1.2.3-ftp-filesize.patch:

--- NEW FILE gvfs-1.2.3-ftp-filesize.patch ---
>From 138d1f85f2bebd2b96b9d538a578cd4d98eeceb4 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Wed, 6 May 2009 16:41:50 +0200
Subject: [PATCH] FTP: fix 32-bit file size string conversion

---
 daemon/gvfsbackendftp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c
index 4076053..7109607 100644
--- a/daemon/gvfsbackendftp.c
+++ b/daemon/gvfsbackendftp.c
@@ -1239,7 +1239,7 @@ dir_default_iter_process (gpointer        iter,
   else if (symlink)
     *symlink = NULL;
 
-  g_file_info_set_size (info, strtoul (result.fe_size, NULL, 10));
+  g_file_info_set_size (info, g_ascii_strtoull (result.fe_size, NULL, 10));
 
   gvfs_file_info_populate_default (info, s,
 				   type == 'f' ? G_FILE_TYPE_REGULAR :
-- 
1.6.2.2



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-10/gvfs.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- gvfs.spec	11 Mar 2009 14:25:37 -0000	1.98
+++ gvfs.spec	6 May 2009 16:40:26 -0000	1.99
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.0.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -67,6 +67,9 @@ Patch13: gvfs-1.1.8-sftp-handle-keys.pat
 # SFTP: 100% cpu usage when connecting to a ssh key and denying key access
 Patch14: gvfs-1.1.8-sftp-eating-cpu.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=499286
+Patch15: gvfs-1.2.3-ftp-filesize.patch
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -161,6 +164,7 @@ popd
 %patch12 -p0 -b .sftp-user
 %patch13 -p0 -b .sftp-keys
 %patch14 -p0 -b .sftp-cpu
+%patch15 -p1 -b .ftp-size
 
 
 %build
@@ -299,6 +303,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Wed May 06 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-8
+- FTP: fix 32-bit file size string conversion (#499286)
+
 * Wed Mar 11 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-7
 - SFTP: Don't specify user unless requested explicitly by the uri
 - SFTP: Don't ask for username when getting ssh key passphrase




More information about the scm-commits mailing list