From e9d9a0a236c92ab257ee8d217f038ba9f75cae4f Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 8 May 2007 08:37:47 +0000 Subject: [PATCH] - Fix ftp symlink crash (#435823) --- gnome-vfs-2.18.1-ftp-symlink.patch | 20 ++++++++++++++++++++ gnome-vfs2.spec | 9 ++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gnome-vfs-2.18.1-ftp-symlink.patch diff --git a/gnome-vfs-2.18.1-ftp-symlink.patch b/gnome-vfs-2.18.1-ftp-symlink.patch new file mode 100644 index 0000000..33f4b89 --- /dev/null +++ b/gnome-vfs-2.18.1-ftp-symlink.patch @@ -0,0 +1,20 @@ +--- gnome-vfs-2.18.1/modules/ftp-method.c.symlink 2007-05-07 23:27:49.000000000 -0400 ++++ gnome-vfs-2.18.1/modules/ftp-method.c 2007-05-07 23:29:20.000000000 -0400 +@@ -2229,7 +2229,7 @@ unix_ls_to_file_info (gchar *ls, GnomeVF + + if(linkname) { + file_info->symlink_name = linkname; +- file_info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_SYMLINK_NAME; ++ file_info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_SYMLINK_NAME | GNOME_VFS_FILE_INFO_FIELDS_FLAGS; + file_info->flags |= GNOME_VFS_FILE_FLAGS_SYMLINK; + } + +@@ -2716,7 +2716,7 @@ do_read_directory (GnomeVFSMethod *metho + gnome_vfs_file_info_copy (file_info, symlink_info); + + GNOME_VFS_FILE_INFO_SET_SYMLINK (file_info, TRUE); +- file_info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_SYMLINK_NAME; ++ file_info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_SYMLINK_NAME | GNOME_VFS_FILE_INFO_FIELDS_FLAGS; + file_info->symlink_name = gnome_vfs_unescape_string (uri->text != NULL ? uri->text : "/", "/"); + + g_free (file_info->name); diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index 33f8dc3..fc1d2cb 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -14,7 +14,7 @@ Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 Version: 2.18.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries Source0: http://ftp.gnome.org/pub/gnome/source/gnome-vfs/2.17/gnome-vfs-%{version}.tar.bz2 @@ -72,6 +72,8 @@ Patch8: gnome-vfs-2.16.0-no-dbus.patch # We broke network: on link-local ipv6 addresses (#212565) Patch9: gnome-vfs-2.16.2-ipv6-link-local.patch +#Fix ftp symlink crash (#435823) +Patch10: gnome-vfs-2.18.1-ftp-symlink.patch %description GNOME VFS is the GNOME virtual file system. It is the foundation of @@ -127,6 +129,8 @@ shares (SMB) to applications using GNOME VFS. %patch9 -p1 -b .ipv6 +%patch10 -p1 -b .ftp_symlink + %build if pkg-config openssl ; then @@ -229,6 +233,9 @@ fi %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Tue May 8 2007 Alexander Larsson - 2.18.1-3 +- Fix ftp symlink crash (#435823) + * Wed Apr 11 2007 Alexander Larsson - 2.18.1-2 - Require libsmbclient, not samba-common