[curlftpfs] Fix 64 bit offset another patch. Bz#831417

[Pavel Alexeev]

commit 7d21ea90e362d6df391a41bb1aabb10e1eb1782b
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Mon Aug 6 22:21:56 2012 +0400

    Fix 64 bit offset another patch. Bz#831417

 curlftpfs-0.9.2-offset_64_another.patch |   23 +++++++++++++++++++++++
 curlftpfs.spec                          |   10 +++++++---
 sources                                 |    1 -
 3 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/curlftpfs-0.9.2-offset_64_another.patch b/curlftpfs-0.9.2-offset_64_another.patch
new file mode 100644
index 0000000..6a26931
--- /dev/null
+++ b/curlftpfs-0.9.2-offset_64_another.patch
@@ -0,0 +1,23 @@
+@@ -, +, @@ 
+ ftpfs.c |    4 	2 +	2 -	0 !
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+--- b/ftpfs.c	
++++ b/ftpfs.c	
+@@ -503,7 +503,7 @@ static void *ftpfs_write_thread(void *da
+   
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1);
+-  curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1);
++  curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE_LARGE, -1);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1);
+@@ -645,7 +645,7 @@ static int create_empty_file(const char 
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_INFILESIZE, 0);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_INFILESIZE_LARGE, 0);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_UPLOAD, 1);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_READDATA, NULL);
+   CURLcode curl_res = curl_easy_perform(ftpfs.connection);
diff --git a/curlftpfs.spec b/curlftpfs.spec
index c226c90..c864a9b 100644
--- a/curlftpfs.spec
+++ b/curlftpfs.spec
@@ -1,6 +1,6 @@
 Name: curlftpfs
 Version: 0.9.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE and libcurl
 URL: http://curlftpfs.sourceforge.net/
 # Code does not specify a version of the license.
@@ -10,7 +10,8 @@ Requires: fuse
 Source: http://downloads.sourceforge.net/curlftpfs/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: curl-devel >= 7.15.2 fuse-devel glib2-devel
-Patch0: curlftpfs-0.9.2-offset_64.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=831417
+Patch1: curlftpfs-0.9.2-offset_64_another.patch
 
 %description
 CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE and
@@ -19,7 +20,7 @@ proxies, and automatically reconnecting if the server times out.
 
 %prep
 %setup -q
-%patch0 -p1 -b .offset
+%patch1 -p1 -b .offset
 
 %build
 %configure
@@ -41,6 +42,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %doc COPYING
 
 %changelog
+* Mon Aug 6 2012 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.2-11
+- Replace patch0 (offset 64 fix) by more correct (bz#831417).
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index b61d511..78322ac 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 b452123f755114cd4461d56c648d9f12  curlftpfs-0.9.2.tar.gz
-7a8db686293463ba3148c7032871c883  curlftpfs-0.9.2-offset_64.patch