rpms/gnome-vfs2/devel gnome-vfs-2.18.1-ftp-symlink.patch, NONE, 1.1 gnome-vfs2.spec, 1.155, 1.156

[Alexander Larsson (alexl)]

Author: alexl

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21320

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.18.1-ftp-symlink.patch 
Log Message:
* Tue May  8 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-3
- Fix ftp symlink crash (#435823)


gnome-vfs-2.18.1-ftp-symlink.patch:

--- NEW FILE gnome-vfs-2.18.1-ftp-symlink.patch ---
--- 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);


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gnome-vfs2.spec	11 Apr 2007 16:00:16 -0000	1.155
+++ gnome-vfs2.spec	8 May 2007 08:37:47 -0000	1.156
@@ -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 @@
 # 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 @@
 
 %patch9 -p1 -b .ipv6
 
+%patch10 -p1 -b .ftp_symlink
+
 %build
 
 if pkg-config openssl ; then
@@ -229,6 +233,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue May  8 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-3
+- Fix ftp symlink crash (#435823)
+
 * Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-2
 - Require libsmbclient, not samba-common