From 76f496ffc24183aaeacb44ec03fc148749fa18c2 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 14 Feb 2008 12:53:56 +0000 Subject: [PATCH] - Add patch that fixes a smb bug that can cause short reads when copying files --- gvfs-smb-short-read.patch | 14 ++++++++++++++ gvfs.spec | 5 +++++ 2 files changed, 19 insertions(+) create mode 100644 gvfs-smb-short-read.patch diff --git a/gvfs-smb-short-read.patch b/gvfs-smb-short-read.patch new file mode 100644 index 0000000..7f9cf06 --- /dev/null +++ b/gvfs-smb-short-read.patch @@ -0,0 +1,14 @@ +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 + { diff --git a/gvfs.spec b/gvfs.spec index 1a3a30c..03a7014 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -7,6 +7,7 @@ Group: System Environment/Libraries 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 @@ required to develop applications using gvfs. %setup -q %patch1 -p0 -b .double-free +%patch2 -p0 -b .smb-short-read %build %configure @@ -121,6 +123,9 @@ killall -USR1 gvfsd > /dev/null || : %{_libdir}/libgvfscommon.so %changelog +* Thu Feb 14 2008 Alexander Larsson - 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 - 0.1.7-2 - Fix double free in hal volume monitor - Ensure gconf module is built by adding build dep