fuse: Update to 3.7.0

5 files changed, 11 insertions, 10 deletions

diff --git a/pkg/fuse/config.h b/pkg/fuse/config.h
index c341f46e..a87ed954 100644
--- a/pkg/fuse/config.h
+++ b/pkg/fuse/config.h
@@ -19,4 +19,4 @@
 #undef HAVE_STRUCT_STAT_ST_ATIMESPEC
 #define HAVE_UTIMENSAT
 #define HAVE_VMSPLICE
-#define PACKAGE_VERSION "3.6.2"
+#define PACKAGE_VERSION "3.7.0"
diff --git a/pkg/fuse/gen.lua b/pkg/fuse/gen.lua
index 27e8604a..f2319078 100644
--- a/pkg/fuse/gen.lua
+++ b/pkg/fuse/gen.lua
@@ -15,6 +15,7 @@ lib('libfuse.a', [[lib/(
 	fuse_lowlevel.c fuse_opt.c
 	fuse_signals.c buffer.c cuse_lowlevel.c
 	helper.c modules/subdir.c mount_util.c.o
+	fuse_log.c
 	mount.c
 )]])
 
diff --git a/pkg/fuse/patch/0002-Remove-extra-when-symbol-versions-are-disabled.patch b/pkg/fuse/patch/0002-Remove-extra-when-symbol-versions-are-disabled.patch
index daedab31..83de8465 100644
--- a/pkg/fuse/patch/0002-Remove-extra-when-symbol-versions-are-disabled.patch
+++ b/pkg/fuse/patch/0002-Remove-extra-when-symbol-versions-are-disabled.patch
@@ -1,4 +1,4 @@
-From e23b765a6419159a50d70eab4f4df6a940af699c Mon Sep 17 00:00:00 2001
+From 7bd30736765189bac13c4de5f9376c24bf5a3b33 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 17 Jun 2019 23:17:13 -0700
 Subject: [PATCH] Remove extra ';' when symbol versions are disabled
@@ -10,10 +10,10 @@ Subject: [PATCH] Remove extra ';' when symbol versions are disabled
  3 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/lib/fuse.c b/lib/fuse.c
-index ec6cc59..e75efcd 100755
+index 229e139..a22fab1 100755
 --- a/lib/fuse.c
 +++ b/lib/fuse.c
-@@ -4525,7 +4525,7 @@ int fuse_loop(struct fuse *f)
+@@ -4526,7 +4526,7 @@ int fuse_loop(struct fuse *f)
  	return fuse_session_loop(f->se);
  }
  
@@ -22,7 +22,7 @@ index ec6cc59..e75efcd 100755
  int fuse_loop_mt_32(struct fuse *f, struct fuse_loop_config *config)
  {
  	if (f == NULL)
-@@ -4541,7 +4541,7 @@ int fuse_loop_mt_32(struct fuse *f, struct fuse_loop_config *config)
+@@ -4542,7 +4542,7 @@ int fuse_loop_mt_32(struct fuse *f, struct fuse_loop_config *config)
  }
  
  int fuse_loop_mt_31(struct fuse *f, int clone_fd);
@@ -31,7 +31,7 @@ index ec6cc59..e75efcd 100755
  int fuse_loop_mt_31(struct fuse *f, int clone_fd)
  {
  	struct fuse_loop_config config;
-@@ -4826,7 +4826,7 @@ void fuse_stop_cleanup_thread(struct fuse *f)
+@@ -4827,7 +4827,7 @@ void fuse_stop_cleanup_thread(struct fuse *f)
  }
  
  
@@ -40,7 +40,7 @@ index ec6cc59..e75efcd 100755
  struct fuse *fuse_new_31(struct fuse_args *args,
  		      const struct fuse_operations *op,
  		      size_t op_size, void *user_data)
-@@ -4980,7 +4980,7 @@ out:
+@@ -4981,7 +4981,7 @@ out:
  /* Emulates 3.0-style fuse_new(), which processes --help */
  struct fuse *fuse_new_30(struct fuse_args *args, const struct fuse_operations *op,
  			 size_t op_size, void *private_data);
@@ -50,7 +50,7 @@ index ec6cc59..e75efcd 100755
  			 const struct fuse_operations *op,
  			 size_t op_size, void *user_data)
 diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c
-index 83f1641..753a6e9 100644
+index 445e9a0..97f56db 100644
 --- a/lib/fuse_loop_mt.c
 +++ b/lib/fuse_loop_mt.c
 @@ -304,7 +304,7 @@ static void fuse_join_worker(struct fuse_mt *mt, struct fuse_worker *w)
@@ -85,5 +85,5 @@ index d4b82e6..cdb1850 100644
  #define FUSE_SYMVER(x)
  #endif
 -- 
-2.20.1
+2.23.0
 
diff --git a/pkg/fuse/src b/pkg/fuse/src
-Subproject 82e10e576e6c11eeaa13ad45421578401b14f18
+Subproject 62c1941cc846aeeae04b090d5d24252ba7365a4
diff --git a/pkg/fuse/ver b/pkg/fuse/ver
index 744f05ca..2b6d73fa 100644
--- a/pkg/fuse/ver
+++ b/pkg/fuse/ver
@@ -1 +1 @@
-3.6.2 r0
+3.7.0 r0