rpms/gvfs/devel gvfs-smb-short-read.patch, NONE, 1.1 gvfs.spec, 1.16, 1.17

[Alexander Larsson (alexl)]

Author: alexl

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28221

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-smb-short-read.patch 
Log Message:
* Thu Feb 14 2008 Alexander Larsson <alexl at redhat.com> - 0.1.7-2
- Add patch that fixes a smb bug that can cause short reads when copying files



gvfs-smb-short-read.patch:

--- NEW FILE gvfs-smb-short-read.patch ---
Index: daemon/gvfschannel.c
===================================================================
--- daemon/gvfschannel.c	(revision 1269)
+++ daemon/gvfschannel.c	(working copy)
@@ -343,7 +343,8 @@
 
   if (command == G_VFS_DAEMON_SOCKET_PROTOCOL_REQUEST_CANCEL)
     {
-      if (arg1 == channel->priv->current_job_seq_nr)
+      if (arg1 == channel->priv->current_job_seq_nr &&
+	  channel->priv->current_job != NULL)
 	g_vfs_job_cancel (channel->priv->current_job);
       else
 	{


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gvfs.spec	12 Feb 2008 14:33:44 -0000	1.16
+++ gvfs.spec	14 Feb 2008 12:53:56 -0000	1.17
@@ -7,6 +7,7 @@
 URL: http://www.gtk.org
 Source: http://download.gnome.org/sources/gvfs/0.1/gvfs-%{version}.tar.bz2
 Patch1: gvfs-double-free.patch
+Patch2: gvfs-smb-short-read.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig
 BuildRequires: glib2-devel >= 2.15.5
@@ -39,6 +40,7 @@
 %setup -q 
 
 %patch1 -p0 -b .double-free
+%patch2 -p0 -b .smb-short-read
 
 %build
 %configure 
@@ -121,6 +123,9 @@
 %{_libdir}/libgvfscommon.so
 
 %changelog
+* Thu Feb 14 2008 Alexander Larsson <alexl at redhat.com> - 0.1.7-2
+- Add patch that fixes a smb bug that can cause short reads when copying files
+
 * Tue Feb 12 2008 Alexander Larsson <alexl at redhat.com> - 0.1.7-2
 - Fix double free in hal volume monitor
 - Ensure gconf module is built by adding build dep