fix net write problems on 64bit architectures. Patch found by Semen Maryasin <marsoft AT ya DOT ru> and reported in bug 294960

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 57 insertions, 6 deletions

diff --git a/net-fs/curlftpfs/ChangeLog b/net-fs/curlftpfs/ChangeLog
index f5b4660ee69a..be9b6981f4db 100644
--- a/net-fs/curlftpfs/ChangeLog
+++ b/net-fs/curlftpfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/curlftpfs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/curlftpfs/ChangeLog,v 1.15 2009/03/07 09:13:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/curlftpfs/ChangeLog,v 1.16 2009/12/10 22:07:32 fauli Exp $
+
+*curlftpfs-0.9.2-r1 (10 Dec 2009)
+
+  10 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  +curlftpfs-0.9.2-r1.ebuild, +files/curlftpfs-0.9.2-64bit_filesize.patch:
+  fix net write problems on 64bit architectures. Patch found by Semen
+  Maryasin <marsoft AT ya DOT ru> and reported in bug 294960
 
   07 Mar 2009; Christian Faulhammer <fauli@gentoo.org>
   -curlftpfs-0.9.1.ebuild:
diff --git a/net-fs/curlftpfs/Manifest b/net-fs/curlftpfs/Manifest
index 7fcda4f780db..679d50f733e4 100644
--- a/net-fs/curlftpfs/Manifest
+++ b/net-fs/curlftpfs/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX curlftpfs-0.9.2-64bit_filesize.patch 626 RMD160 39bb2a834693ac5e8bd04711acee88302d560d6f SHA1 562240d3e0fd2e167dc00a5f786283d0b47c7886 SHA256 95d880b3a43387f5ae6e5b3ed9309060bbdc3757fb7631af50edf386c7a6805c
 DIST curlftpfs-0.9.2.tar.gz 365503 RMD160 16740731fc75b4249a8fddcae355ad1a9d408061 SHA1 83f148afe6bd4d44c9790790f1c30986c8b9ea56 SHA256 4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958
+EBUILD curlftpfs-0.9.2-r1.ebuild 722 RMD160 82b1e2df43f624453c98382b8aa5567dcb76df09 SHA1 e81d100f50e005bc020b1e6e55e153600af0283b SHA256 5e565ebdf90a532277a287b7af5a4617c7724d655cc2c134153b96698718553c
 EBUILD curlftpfs-0.9.2.ebuild 627 RMD160 bf7034123d0db609cbbeeff56fd59e93663760be SHA1 d4d995dba0c307a3e5411ed63199e336e5345a3a SHA256 a8c2417022d8da1d5da4d2d8165f2d6eff307abe30178e69c68030de14e8b6ce
-MISC ChangeLog 2266 RMD160 b1787e3e98139121d93a3b8bfbfd55111419e4fc SHA1 b66480dee32bfbfa6c1f055ad4178b645de7a445 SHA256 fce6c14a1896b60d13d470ece487c55c67ce050a0ffba0e0ccc8ec1dce58d6bf
+MISC ChangeLog 2563 RMD160 79b74d155cb421c52dfccba61d659c1e3d681369 SHA1 347ecf94b696515028042da207cdf96e82ef7003 SHA256 828e5069685d614034cfb2ef255d486165fc93ce2bd4c958228e1a016f7b0774
 MISC metadata.xml 369 RMD160 28e3214182a45fde979648e72c25b2b973a8cda6 SHA1 e0c6057c33b748900581a9217928be865f48b2de SHA256 9b2ae36ce461071ac5f8d386a0c0912dcf8cee37a39432ddfaa1ca6fb45de69a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmyOt4ACgkQNQqtfCuFneN9IQCfZsA5s2YzDK+goTq/M4dETHD7
-aAAAoIhQLj7YzSUhEPTq3E9stgnrJSLN
-=gJLt
+iEYEARECAAYFAkshcSoACgkQNQqtfCuFneNhegCggGdDWcHV2gZwBqwyhUoDXJ/j
+FeMAnRfTNpJ1bG0a0UCcf6ulhF0jbGub
+=9hwy
 -----END PGP SIGNATURE-----
diff --git a/net-fs/curlftpfs/curlftpfs-0.9.2-r1.ebuild b/net-fs/curlftpfs/curlftpfs-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..5fcf4266e787
--- /dev/null
+++ b/net-fs/curlftpfs/curlftpfs-0.9.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/curlftpfs/curlftpfs-0.9.2-r1.ebuild,v 1.1 2009/12/10 22:07:32 fauli Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="File system for accessing ftp hosts based on FUSE"
+HOMEPAGE="http://curlftpfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test" # bug 258460
+
+DEPEND=">=net-misc/curl-7.17.0
+	>=sys-fs/fuse-2.2
+	>=dev-libs/glib-2.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-64bit_filesize.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README
+}
diff --git a/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch b/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch
new file mode 100644
index 000000000000..38b6f33a2ba5
--- /dev/null
+++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch
@@ -0,0 +1,11 @@
+--- ftpfs.c.old	2009-11-28 14:28:05.000000000 +0300
++++ ftpfs.c	2009-11-28 14:28:19.000000000 +0300
+@@ -503,7 +503,7 @@
+   
+   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, (curl_off_t)-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);