libfuse, sshfs: Update to 3.1.0, 3.0.0

7 files changed, 88 insertions, 41 deletions

diff --git a/pkg/libfuse/config.h b/pkg/libfuse/config.h
index a4dfbf5a..7aec5521 100644
--- a/pkg/libfuse/config.h
+++ b/pkg/libfuse/config.h
@@ -3,20 +3,10 @@
 #define FUSERMOUNT_DIR "/bin"
 #define IGNORE_MTAB
 
-#define HAVE_MEMORY_H 1
-#define HAVE_SETXATTR 1
-#define HAVE_SPLICE 1
-#define HAVE_STRUCT_STAT_ST_ATIM 1
-/* #undef HAVE_STRUCT_STAT_ST_ATIMESPEC */
-#define HAVE_VMSPLICE 1
-#define ICONV_CONST
-/* #undef IGNORE_MTAB */
-#define LT_OBJDIR ".libs/"
-#define PACKAGE "fuse"
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME "fuse"
-#define PACKAGE_STRING "fuse 2.9.7"
-#define PACKAGE_TARNAME "fuse"
-#define PACKAGE_URL ""
-#define PACKAGE_VERSION "2.9.7"
-#define VERSION "2.9.7"
+#define HAVE_PIPE2
+#define HAVE_SETXATTR
+#define HAVE_SPLICE
+#define HAVE_STRUCT_STAT_ST_ATIM
+#undef HAVE_STRUCT_STAT_ST_ATIMESPEC
+#define HAVE_VMSPLICE
+#define PACKAGE_VERSION "3.1.0"
diff --git a/pkg/libfuse/gen.rc b/pkg/libfuse/gen.rc
index 472d50a5..4084d78a 100644
--- a/pkg/libfuse/gen.rc
+++ b/pkg/libfuse/gen.rc
@@ -1,6 +1,5 @@
 cflags\
-	-D '_FILE_OFFSET_BITS=64' \
-	-D 'FUSE_USE_VERSION=26' \
+	-D 'FUSE_USE_VERSION=31' \
 	-I include\
 	-I '$dir' \
 	-I '$srcdir'/include\
@@ -8,25 +7,15 @@ cflags\
 
 cc lib/mount_util.c
 
-exe fusermount util/fusermount.c lib/mount_util.c.o
-file bin/fusermount '$outdir'/fusermount 4755
-man -d doc 1 fusermount.1
+exe fusermount3 util/fusermount.c lib/mount_util.c.o
+file bin/fusermount3 '$outdir'/fusermount3 4755
+man -d doc 1 fusermount3.1
 
 lib libfuse.a lib/^(\
-	fuse.c\
-	fuse_kern_chan.c\
-	fuse_loop.c\
-	fuse_loop_mt.c\
-	fuse_lowlevel.c\
-	fuse_mt.c\
-	fuse_opt.c\
-	fuse_session.c\
-	fuse_signals.c\
-	buffer.c\
-	cuse_lowlevel.c\
-	helper.c\
-	modules/subdir.c\
-	\
+	fuse.c fuse_loop.c fuse_loop_mt.c\
+	fuse_lowlevel.c fuse_opt.c\
+	fuse_signals.c buffer.c cuse_lowlevel.c\
+	helper.c modules/subdir.c\
 	mount.c mount_util.c.o\
 )
 
diff --git a/pkg/libfuse/patch/0001-Fix-poll.h-include.patch b/pkg/libfuse/patch/0001-Fix-poll.h-include.patch
index 193a7b12..fde78225 100644
--- a/pkg/libfuse/patch/0001-Fix-poll.h-include.patch
+++ b/pkg/libfuse/patch/0001-Fix-poll.h-include.patch
@@ -1,4 +1,4 @@
-From 8926abd905339e40bf096c904d900caa42e3262f Mon Sep 17 00:00:00 2001
+From e96eee39316e30dfdf965e4894fc77a8bf43e40f Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 15 Jul 2016 19:21:28 -0700
 Subject: [PATCH] Fix poll.h include
@@ -8,10 +8,10 @@ Subject: [PATCH] Fix poll.h include
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/mount.c b/lib/mount.c
-index 227a408..0fc7d15 100644
+index 2150189..7a18c11 100644
 --- a/lib/mount.c
 +++ b/lib/mount.c
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  #include <string.h>
  #include <fcntl.h>
  #include <errno.h>
@@ -21,5 +21,5 @@ index 227a408..0fc7d15 100644
  #include <sys/un.h>
  #include <sys/wait.h>
 -- 
-2.9.1
+2.13.2
 
diff --git a/pkg/libfuse/patch/0002-Only-enable-FUSE_SYMVER-on-glibc.patch b/pkg/libfuse/patch/0002-Only-enable-FUSE_SYMVER-on-glibc.patch
new file mode 100644
index 00000000..302090b0
--- /dev/null
+++ b/pkg/libfuse/patch/0002-Only-enable-FUSE_SYMVER-on-glibc.patch
@@ -0,0 +1,25 @@
+From a414502133306dc4292ba45a43d77bd88b0ded92 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sun, 9 Jul 2017 02:35:33 -0700
+Subject: [PATCH] Only enable FUSE_SYMVER on glibc
+
+---
+ lib/fuse_misc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h
+index 2f6663e..c95ca57 100644
+--- a/lib/fuse_misc.h
++++ b/lib/fuse_misc.h
+@@ -13,7 +13,7 @@
+     - confuse the dynamic linker in uClibc
+     - not supported on MacOSX (in MachO binary format)
+ */
+-#if (!defined(__UCLIBC__) && !defined(__APPLE__))
++#ifdef __GLIBC__
+ #define FUSE_SYMVER(x) __asm__(x)
+ #else
+ #define FUSE_SYMVER(x)
+-- 
+2.13.2
+
diff --git a/pkg/libfuse/patch/0003-Disable-iconv-module.patch b/pkg/libfuse/patch/0003-Disable-iconv-module.patch
new file mode 100644
index 00000000..7a723fd6
--- /dev/null
+++ b/pkg/libfuse/patch/0003-Disable-iconv-module.patch
@@ -0,0 +1,43 @@
+From 3729102830a97d81d7d1ad19c459addd2d2cb6b8 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sun, 9 Jul 2017 02:35:45 -0700
+Subject: [PATCH] Disable iconv module
+
+---
+ lib/fuse.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/lib/fuse.c b/lib/fuse.c
+index ce29819..cdece7f 100644
+--- a/lib/fuse.c
++++ b/lib/fuse.c
+@@ -196,9 +196,8 @@ struct fuse_context_i {
+ 	fuse_req_t req;
+ };
+ 
+-/* Defined by FUSE_REGISTER_MODULE() in lib/modules/subdir.c and iconv.c.  */
++/* Defined by FUSE_REGISTER_MODULE() in lib/modules/subdir.c.  */
+ extern fuse_module_factory_t fuse_module_subdir_factory;
+-extern fuse_module_factory_t fuse_module_iconv_factory;
+ 
+ static pthread_key_t fuse_context_key;
+ static pthread_mutex_t fuse_context_lock = PTHREAD_MUTEX_INITIALIZER;
+@@ -4475,7 +4474,6 @@ void fuse_lib_help(struct fuse_args *args)
+ 
+ 	/* Print help for builtin modules */
+ 	print_module_help("subdir", &fuse_module_subdir_factory);
+-	print_module_help("iconv", &fuse_module_iconv_factory);
+ 
+ 	/* Parse command line options in case we need to
+ 	   activate more modules */
+@@ -4683,7 +4681,6 @@ struct fuse *fuse_new(struct fuse_args *args,
+ 	if (builtin_modules_registered == 0) {
+ 		/* If not, register them. */
+ 		fuse_register_module("subdir", fuse_module_subdir_factory, NULL);
+-		fuse_register_module("iconv", fuse_module_iconv_factory, NULL);
+ 		builtin_modules_registered= 1;
+ 	}
+ 	pthread_mutex_unlock(&fuse_context_lock);
+-- 
+2.13.2
+
diff --git a/pkg/libfuse/rev b/pkg/libfuse/rev
index 0cfbf088..00750edc 100644
--- a/pkg/libfuse/rev
+++ b/pkg/libfuse/rev
@@ -1 +1 @@
-2
+3
diff --git a/pkg/libfuse/src b/pkg/libfuse/src
-Subproject df499bf1ce634f6e67d4d366c4475d32143f00f
+Subproject d2ed5539fc406008816e9c65b44e2f1d0554ffb