Hello community,
here is the log from the commit of package gnome-vfs2
checked in at Sun May 7 16:08:28 CEST 2006.
--------
--- GNOME/gnome-vfs2/gnome-vfs2.changes 2006-04-26 18:53:42.000000000 +0200
+++ STABLE/gnome-vfs2/gnome-vfs2.changes 2006-05-05 19:29:16.000000000 +0200
@@ -1,0 +2,16 @@
+Fri May 5 19:28:46 CEST 2006 - federico@novell.com
+
+- Added gnome-vfs2-149355-novfs-is-not-local.diff to fix
+ https://bugzilla.novell.com/show_bug.cgi?id=149355. This adds
+ "novfs" to the list of file system types that are not local: those
+ are Novell Client for Linux (i.e. Netware) mounts.
+
+-------------------------------------------------------------------
+Wed May 3 03:12:37 CEST 2006 - federico@novell.com
+
+- Added gnome-vfs2-171156-ftp-large-files.diff to fix
+ https://bugzilla.novell.com/show_bug.cgi?id=171156. This will make
+ the FTP method parse 64-bit file sizes correctly, and also generate
+ block sizes correctly.
+
+-------------------------------------------------------------------
New:
----
gnome-vfs2-149355-novfs-is-not-local.diff
gnome-vfs2-171156-ftp-large-files.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-vfs2.spec ++++++
--- /var/tmp/diff_new_pack.F4mmDv/_old 2006-05-07 16:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.F4mmDv/_new 2006-05-07 16:07:23.000000000 +0200
@@ -19,7 +19,7 @@
Requires: gnome-mime-data
Autoreqprov: on
Version: 2.12.2
-Release: 54
+Release: 57
Summary: The GNOME 2.x Desktop Virtual File System Libraries
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -47,6 +47,8 @@
Patch28: gnome-vfs2-sftp-password-parse.patch
Patch29: gnome-vfs2-inotify.patch
Patch30: gnome-vfs2-155010-media-check-user-visible-drives.diff
+Patch31: gnome-vfs2-171156-ftp-large-files.diff
+Patch32: gnome-vfs2-149355-novfs-is-not-local.diff
Obsoletes: gnome-vfs-extras
Provides: gnome-vfs-extras
@@ -153,6 +155,8 @@
%patch28 -p0
%patch29 -p0
%patch30 -p1
+%patch31 -p1
+%patch32 -p1
gnome-patch-translation-update
# These patches have it's own translation management:
%patch20
@@ -260,6 +264,16 @@
%{prefix}/share/gtk-doc/html/gnome-vfs-2.0
%changelog -n gnome-vfs2
+* Fri May 05 2006 - federico@novell.com
+- Added gnome-vfs2-149355-novfs-is-not-local.diff to fix
+ https://bugzilla.novell.com/show_bug.cgi?id=149355. This adds
+ "novfs" to the list of file system types that are not local: those
+ are Novell Client for Linux (i.e. Netware) mounts.
+* Wed May 03 2006 - federico@novell.com
+- Added gnome-vfs2-171156-ftp-large-files.diff to fix
+ https://bugzilla.novell.com/show_bug.cgi?id=171156. This will make
+ the FTP method parse 64-bit file sizes correctly, and also generate
+ block sizes correctly.
* Wed Apr 26 2006 - sbrabec@suse.cz
- Explicitly require /etc/profile.d/xdg-enviroment.sh (#166270).
* Thu Apr 13 2006 - federico@novell.com
++++++ gnome-vfs2-149355-novfs-is-not-local.diff ++++++
2006-05-05 Federico Mena Quintero
Fix https://bugzilla.novell.com/show_bug.cgi?id=149355
* modules/file-method.c (do_is_local): Add "novfs" to the list of
file systems that are not local. Those mounts come from Novell
Client for Linux, i.e. they are remote Netware mounts.
--- gnome-vfs2/modules/file-method.c.orig 2006-05-05 12:08:57.000000000 -0500
+++ gnome-vfs2/modules/file-method.c 2006-05-05 12:16:22.000000000 -0500
@@ -1186,6 +1186,7 @@ do_is_local (GnomeVFSMethod *method,
(strcmp (type, "afs") != 0) &&
(strcmp (type, "autofs") != 0) &&
(strcmp (type, "unknown") != 0) &&
+ (strcmp (type, "novfs") != 0) &&
(strcmp (type, "ncpfs") != 0));
local = GINT_TO_POINTER (is_local ? 1 : -1);
g_hash_table_insert (fstype_hash, path, local);
++++++ gnome-vfs2-171156-ftp-large-files.diff ++++++
https://bugzilla.novell.com/show_bug.cgi?id=171156
2006-05-02 Federico Mena Quintero
Fix http://bugzilla.gnome.org/show_bug.cgi?id=338893: file size is
reported wrong in the FTP method for files larger than 2 GB.
* configure.in.orig: Check for atoll() to AC_CHECK_FUNCS().
Check for stat.st_blksize stat.st_rdev, and AC_STRUCT_ST_BLOCKS
(without these, we were never entering the corresponding #ifdef
blocks in gnome-vfs-parse-ls.c, and thus not filling in certain
fields of struct stat).
* libgnomevfs/gnome-vfs-parse-ls.c (gnome_vfs_parse_ls_lga): Use
atoll() when available for stat.st_size, or atof() if it's not
available. Use HAVE_STRUCT_STAT_ST_RDEV,
HAVE_STRUCT_STAT_ST_BLOCKS, and HAVE_STRUCT_STAT_ST_BLKSIZE instead of
HAVE_ST_RDEV, HAVE_ST_BLOCKS, and HAVE_ST_BLKSIZE, respectively.
* programs/gnomevfs-ls.c (show_data): Use
GNOME_VFS_SIZE_FORMAT_STR for info->size, not "%ld".
--- gnome-vfs/configure.in.orig 2006-05-02 19:21:49.000000000 -0500
+++ gnome-vfs/configure.in 2006-05-02 19:22:02.000000000 -0500
@@ -159,7 +159,9 @@ AC_SEARCH_LIBS(gethostent, nsl)
AC_SEARCH_LIBS(setsockopt, socket)
AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod)
+AC_CHECK_FUNCS(getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll)
+AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_rdev])
+AC_STRUCT_ST_BLOCKS
dnl Volume monitor stuff
AC_CHECK_FUNCS(setmntent endmntent hasmntopt getmntinfo)
--- gnome-vfs/libgnomevfs/gnome-vfs-parse-ls.c.orig 2006-05-02 15:10:20.000000000 -0500
+++ gnome-vfs/libgnomevfs/gnome-vfs-parse-ls.c 2006-05-02 15:18:11.000000000 -0500
@@ -595,7 +595,7 @@ gnome_vfs_parse_ls_lga (const char *p,
|| sscanf (columns [idx2], " %d", &min) != 1)
goto error;
-#ifdef HAVE_ST_RDEV
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
/* Starting from linux 2.6, minor number is split between bits
* 0-7 and 20-31 of dev_t. This calculation is also valid
* on older kernel with 8 bit minor and major numbers
@@ -611,9 +611,13 @@ gnome_vfs_parse_ls_lga (const char *p,
/* Common file size */
if (!is_num (columns[idx2]))
goto error;
-
- s->st_size = (gsize) atol (columns [idx2]);
-#ifdef HAVE_ST_RDEV
+
+#ifdef HAVE_ATOLL
+ s->st_size = (off_t) atoll (columns [idx2]);
+#else
+ s->st_size = (off_t) atof (columns [idx2]);
+#endif
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
s->st_rdev = 0;
#endif
}
@@ -625,10 +629,10 @@ gnome_vfs_parse_ls_lga (const char *p,
s->st_atime = s->st_ctime = s->st_mtime;
s->st_dev = 0;
s->st_ino = 0;
-#ifdef HAVE_ST_BLKSIZE
+#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
s->st_blksize = 512;
#endif
-#ifdef HAVE_ST_BLOCKS
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
s->st_blocks = (s->st_size + 511) / 512;
#endif
--- gnome-vfs/programs/gnomevfs-ls.c.orig 2006-05-02 15:45:56.000000000 -0500
+++ gnome-vfs/programs/gnomevfs-ls.c 2006-05-02 19:11:07.000000000 -0500
@@ -63,7 +63,7 @@ show_data (gpointer item, gpointer no_it
path = g_strconcat (directory, "/", info->name, NULL);
- g_print ("%s\t%s%s%s\t(%s, %s)\tsize %ld\tmode %04o\n",
+ g_print ("%s\t%s%s%s\t(%s, %s)\tsize %" GNOME_VFS_SIZE_FORMAT_STR "\tmode %04o\n",
info->name,
GNOME_VFS_FILE_INFO_SYMLINK (info) ? " [link: " : "",
GNOME_VFS_FILE_INFO_SYMLINK (info) ? info->symlink_name
@@ -71,7 +71,7 @@ show_data (gpointer item, gpointer no_it
GNOME_VFS_FILE_INFO_SYMLINK (info) ? " ]" : "",
type_to_string (info->type),
info->mime_type,
- (glong) info->size,
+ info->size,
info->permissions);
g_free (path);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...