fuse-curlftpfs: Update to 0.9.2

- new helper function cancel_previous_multi() which checks for errors.
- patch by Miklos Szeredi: fixes 'du' for files >= 4GB.
- remove buffered writes completely and handle O_RDWR
- Fix "hang" when curl_easy_perform(fh->write_conn) in the write thread fails; Detect write errors in the write thread; Synchronize writing with the new semaphore "data_written" to be able to report write errors earlier; Fix that ftpfs_truncate created empty files with no permissions set (caused problems with gedit and others)
- Patch from Miklos Szeredi to support streaming writes (includes changes from Robson Braga Araujo)
- Added option to use a custom command to list files.
- Add ftp_method option to make it faster to browse directories.
- Fix broken header dependencies.
- Put the FTP server name in fsname by default. Upgraded FUSE_USE_VERSION to 26.
- Disable EPSV by default because it can cause the program to hang.

6 files changed, 42 insertions, 35 deletions

diff --git a/filesystems/fuse-curlftpfs/Makefile b/filesystems/fuse-curlftpfs/Makefile
index 62366879f5c..c7f68f067b0 100644
--- a/filesystems/fuse-curlftpfs/Makefile
+++ b/filesystems/fuse-curlftpfs/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.32 2020/03/20 11:57:37 nia Exp $
+# $NetBSD: Makefile,v 1.33 2020/04/21 13:56:25 nia Exp $
 #
 
-DISTNAME=	curlftpfs-0.9.1
+DISTNAME=	curlftpfs-0.9.2
 PKGNAME=	fuse-${DISTNAME}
-PKGREVISION=	23
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=curlftpfs/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://curlftpfs.sourceforge.net/
 COMMENT=	FUSE filesystem for acessing FTP hosts
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -18,6 +18,8 @@ USE_TOOLS+=	gmake pkg-config
 CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 CFLAGS.SunOS+=	--std=c99 -D__EXTENSIONS__
 
+CONFIGURE_ENV+=	ac_cv_func_working_mktime=yes
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/fuse.buildlink3.mk"
diff --git a/filesystems/fuse-curlftpfs/distinfo b/filesystems/fuse-curlftpfs/distinfo
index f17a2e42399..9c206c757b2 100644
--- a/filesystems/fuse-curlftpfs/distinfo
+++ b/filesystems/fuse-curlftpfs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 00:15:00 agc Exp $
+$NetBSD: distinfo,v 1.8 2020/04/21 13:56:25 nia Exp $
 
-SHA1 (curlftpfs-0.9.1.tar.gz) = 768385f68f7e128ec9e852bbf7860a632e8e3c46
-RMD160 (curlftpfs-0.9.1.tar.gz) = bb1a156160ff4bd517410f872f68ba77c8085b11
-SHA512 (curlftpfs-0.9.1.tar.gz) = 4714860e18707b04e96c9fc934ec348977ade8c41ab9804ab27433a3fc763d7f0638fbe7720cb043742c292764e7170a44a2d832884366d3e1d832e38bbeae94
-Size (curlftpfs-0.9.1.tar.gz) = 362542 bytes
-SHA1 (patch-aa) = bfa05b8930560ffe25c3a2b12ff9497c0c5d37c4
-SHA1 (patch-ab) = 32f21df67c043bd8fb60f9a217fc00767ad36b10
+SHA1 (curlftpfs-0.9.2.tar.gz) = 83f148afe6bd4d44c9790790f1c30986c8b9ea56
+RMD160 (curlftpfs-0.9.2.tar.gz) = 16740731fc75b4249a8fddcae355ad1a9d408061
+SHA512 (curlftpfs-0.9.2.tar.gz) = df07c418d175f766c89525017fc56e79726061eee0c3a6607ded0e1bf24f64f1475ba0e546157b65892194e3c4414c120822bf8fb175437e68366f82de216067
+Size (curlftpfs-0.9.2.tar.gz) = 365503 bytes
+SHA1 (patch-ftpfs.h) = e658fe0e9fffa47e69fe35c9f1a8f465aa5c45e6
+SHA1 (patch-tests_run__tests.sh) = 2b7b20f3490b8fc0026c148b2a9d7dbac2a33362
diff --git a/filesystems/fuse-curlftpfs/patches/patch-aa b/filesystems/fuse-curlftpfs/patches/patch-aa
deleted file mode 100644
index 57ef056fa69..00000000000
--- a/filesystems/fuse-curlftpfs/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/02/20 23:02:03 xtraeme Exp $
-
---- tests/run_tests.sh.orig	2007-02-18 20:15:08.000000000 +0100
-+++ tests/run_tests.sh	2007-02-18 20:15:18.000000000 +0100
-@@ -6,7 +6,7 @@
- for i in *_unittest; do
-   echo -n "$i... "
-   `./$i > /dev/null 2>&1`
--  if [ $? == 0 ]; then
-+  if [ $? -eq 0 ]; then
-     echo "PASS"
-   else
-     echo "FAILED"
diff --git a/filesystems/fuse-curlftpfs/patches/patch-ab b/filesystems/fuse-curlftpfs/patches/patch-ab
deleted file mode 100644
index ffe3083c79c..00000000000
--- a/filesystems/fuse-curlftpfs/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2011/04/14 19:01:27 hans Exp $
-
---- ftpfs.h.orig	2007-03-02 00:47:07.000000000 +0100
-+++ ftpfs.h	2010-01-08 22:36:58.256798187 +0100
-@@ -14,6 +14,7 @@
- #include <pthread.h>
- #include <glib.h>
- #include <pthread.h>
-+#include <limits.h>
- 
- struct ftpfs {
-   char* host;
diff --git a/filesystems/fuse-curlftpfs/patches/patch-ftpfs.h b/filesystems/fuse-curlftpfs/patches/patch-ftpfs.h
new file mode 100644
index 00000000000..5a7d7e63175
--- /dev/null
+++ b/filesystems/fuse-curlftpfs/patches/patch-ftpfs.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-ftpfs.h,v 1.1 2020/04/21 13:56:26 nia Exp $
+
+Include limits.h for PATH_MAX.
+
+--- ftpfs.h.orig	2008-04-25 10:32:30.000000000 +0000
++++ ftpfs.h
+@@ -12,7 +12,7 @@
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+ #include <pthread.h>
+-#include <pthread.h>
++#include <limits.h>
+ 
+ struct ftpfs {
+   char* host;
diff --git a/filesystems/fuse-curlftpfs/patches/patch-tests_run__tests.sh b/filesystems/fuse-curlftpfs/patches/patch-tests_run__tests.sh
new file mode 100644
index 00000000000..dd7a7fa3e78
--- /dev/null
+++ b/filesystems/fuse-curlftpfs/patches/patch-tests_run__tests.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_run__tests.sh,v 1.1 2020/04/21 13:56:26 nia Exp $
+
+Shell portability.
+
+--- tests/run_tests.sh.orig	2007-11-20 19:27:57.000000000 +0000
++++ tests/run_tests.sh
+@@ -6,7 +6,7 @@ failed=0
+ for i in *_unittest; do
+   echo -n "$i... "
+   `./$i > /dev/null 2>&1`
+-  if [ $? == 0 ]; then
++  if [ $? = 0 ]; then
+     echo "PASS"
+   else
+     echo "FAILED"