rpms/gvfs/F-11 gvfs-1.2.3-ftp-filesize.patch, NONE, 1.1 gvfs.spec, 1.129, 1.130

Tomas Bzatek tbzatek at fedoraproject.org
Wed May 6 16:15:04 UTC 2009


Author: tbzatek

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

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.2.2-7
- 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 ---
diff -up gvfs-1.2.2/daemon/gvfsbackendftp.c.orig gvfs-1.2.2/daemon/gvfsbackendftp.c
--- gvfs-1.2.2/daemon/gvfsbackendftp.c.orig	2009-04-11 20:46:38.000000000 +0200
+++ gvfs-1.2.2/daemon/gvfsbackendftp.c	2009-05-06 17:09:42.000000000 +0200
@@ -1236,7 +1236,7 @@ dir_default_iter_process (gpointer      
   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 :
@@ -2228,7 +2228,7 @@ create_file_info (GVfsBackendFtp *ftp, F
 
           gvfs_file_info_populate_default (info, filename, G_FILE_TYPE_REGULAR);
 
-          g_file_info_set_size (info, strtoul (conn->read_buffer+4, NULL, 0));
+          g_file_info_set_size (info, g_ascii_strtoull (conn->read_buffer+4, NULL, 0));
 
           g_file_info_set_is_hidden (info, TRUE);
         }


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- gvfs.spec	6 May 2009 13:02:23 -0000	1.129
+++ gvfs.spec	6 May 2009 16:14:33 -0000	1.130
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -36,6 +36,8 @@ Patch2: gvfs-1.1.7-gdu-computer-expose-d
 Patch3: gvfs-bash-completion.patch
 # From svn:
 Patch4: gvfs-1.2.2-ssh-auth-sock.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=499286
+Patch5: gvfs-1.2.3-ftp-filesize.patch
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -72,6 +74,7 @@ Patch114: 0014-gvfs-use-device-media-det
 # https://bugzilla.redhat.com/show_bug.cgi?id=498649
 Patch115: 0015-gvfs-respect-presentation-hide-for-drives.patch
 
+
 %description
 The gvfs package provides backend implementations for the gio
 framework in GLib. It includes ftp, sftp, cifs.
@@ -156,6 +159,7 @@ media players (Media Transfer Protocol) 
 %patch2 -p1 -b .computer-expose-devices
 %patch3 -p1 -b .bash-completion
 %patch4 -p0 -b .ssh-auth-sock
+%patch5 -p1 -b .ftp-size
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -315,6 +319,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Wed May 06 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.2-7
+- FTP: fix 32-bit file size string conversion (#499286)
+
 * Wed May 06 2009 David Zeuthen <davidz at redhat.com> - 1.2.2-6
 - Rebuild
 




More information about the fedora-extras-commits mailing list