fuse: Update to 3.10.0

8 files changed, 3 insertions, 116 deletions

diff --git a/pkg/fuse/config.h b/pkg/fuse/config.h
index 79e313b1..e35b3298 100644
--- a/pkg/fuse/config.h
+++ b/pkg/fuse/config.h
@@ -17,6 +17,7 @@
 #define HAVE_SPLICE
 #define HAVE_STRUCT_STAT_ST_ATIM
 #undef HAVE_STRUCT_STAT_ST_ATIMESPEC
+#define HAVE_SYMVER_ATTRIBUTE 1
 #define HAVE_UTIMENSAT
 #define HAVE_VMSPLICE
-#define PACKAGE_VERSION "3.9.4"
+#define PACKAGE_VERSION "3.10.0"
diff --git a/pkg/fuse/patch/0003-Avoid-statement-expressions-in-container_of-macro.patch b/pkg/fuse/patch/0001-Avoid-statement-expressions-in-container_of-macro.patch
index 2d8aaa87..2d8aaa87 100644
--- a/pkg/fuse/patch/0003-Avoid-statement-expressions-in-container_of-macro.patch
+++ b/pkg/fuse/patch/0001-Avoid-statement-expressions-in-container_of-macro.patch
diff --git a/pkg/fuse/patch/0001-Only-use-versioned-symbols-on-GNU-compatible-compile.patch b/pkg/fuse/patch/0001-Only-use-versioned-symbols-on-GNU-compatible-compile.patch
deleted file mode 100644
index 61b485f9..00000000
--- a/pkg/fuse/patch/0001-Only-use-versioned-symbols-on-GNU-compatible-compile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f065c341a270233b563d54c75dc13ecd7c430938 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 17 Jun 2019 23:15:08 -0700
-Subject: [PATCH] Only use versioned symbols on GNU-compatible compilers
-
----
- 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..d4b82e6 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__))
-+#if (!defined(__UCLIBC__) && !defined(__APPLE__)) && defined(__GNUC__)
- #define FUSE_SYMVER(x) __asm__(x)
- #else
- #define FUSE_SYMVER(x)
--- 
-2.20.1
-
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
deleted file mode 100644
index 6f04bda3..00000000
--- a/pkg/fuse/patch/0002-Remove-extra-when-symbol-versions-are-disabled.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 11cb1a9823885dbf8b3393d0480cac1762a9f37c 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
-
----
- lib/fuse.c         | 8 ++++----
- lib/fuse_loop_mt.c | 4 ++--
- lib/fuse_misc.h    | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/lib/fuse.c b/lib/fuse.c
-index b0f5b30..f496fc1 100755
---- a/lib/fuse.c
-+++ b/lib/fuse.c
-@@ -4569,7 +4569,7 @@ int fuse_loop(struct fuse *f)
- 	return fuse_session_loop(f->se);
- }
- 
--FUSE_SYMVER(".symver fuse_loop_mt_32,fuse_loop_mt@@FUSE_3.2");
-+FUSE_SYMVER(".symver fuse_loop_mt_32,fuse_loop_mt@@FUSE_3.2")
- int fuse_loop_mt_32(struct fuse *f, struct fuse_loop_config *config)
- {
- 	if (f == NULL)
-@@ -4585,7 +4585,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);
--FUSE_SYMVER(".symver fuse_loop_mt_31,fuse_loop_mt@FUSE_3.0");
-+FUSE_SYMVER(".symver fuse_loop_mt_31,fuse_loop_mt@FUSE_3.0")
- int fuse_loop_mt_31(struct fuse *f, int clone_fd)
- {
- 	struct fuse_loop_config config;
-@@ -4870,7 +4870,7 @@ void fuse_stop_cleanup_thread(struct fuse *f)
- }
- 
- 
--FUSE_SYMVER(".symver fuse_new_31,fuse_new@@FUSE_3.1");
-+FUSE_SYMVER(".symver fuse_new_31,fuse_new@@FUSE_3.1")
- struct fuse *fuse_new_31(struct fuse_args *args,
- 		      const struct fuse_operations *op,
- 		      size_t op_size, void *user_data)
-@@ -5024,7 +5024,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);
--FUSE_SYMVER(".symver fuse_new_30,fuse_new@FUSE_3.0");
-+FUSE_SYMVER(".symver fuse_new_30,fuse_new@FUSE_3.0")
- struct fuse *fuse_new_30(struct fuse_args *args,
- 			 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 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)
- 	free(w);
- }
- 
--FUSE_SYMVER(".symver fuse_session_loop_mt_32,fuse_session_loop_mt@@FUSE_3.2");
-+FUSE_SYMVER(".symver fuse_session_loop_mt_32,fuse_session_loop_mt@@FUSE_3.2")
- int fuse_session_loop_mt_32(struct fuse_session *se, struct fuse_loop_config *config)
- {
- 	int err;
-@@ -352,7 +352,7 @@ int fuse_session_loop_mt_32(struct fuse_session *se, struct fuse_loop_config *co
- }
- 
- int fuse_session_loop_mt_31(struct fuse_session *se, int clone_fd);
--FUSE_SYMVER(".symver fuse_session_loop_mt_31,fuse_session_loop_mt@FUSE_3.0");
-+FUSE_SYMVER(".symver fuse_session_loop_mt_31,fuse_session_loop_mt@FUSE_3.0")
- int fuse_session_loop_mt_31(struct fuse_session *se, int clone_fd)
- {
- 	struct fuse_loop_config config;
-diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h
-index d4b82e6..cdb1850 100644
---- a/lib/fuse_misc.h
-+++ b/lib/fuse_misc.h
-@@ -14,7 +14,7 @@
-     - not supported on MacOSX (in MachO binary format)
- */
- #if (!defined(__UCLIBC__) && !defined(__APPLE__)) && defined(__GNUC__)
--#define FUSE_SYMVER(x) __asm__(x)
-+#define FUSE_SYMVER(x) __asm__(x);
- #else
- #define FUSE_SYMVER(x)
- #endif
--- 
-2.24.0
-
diff --git a/pkg/fuse/patch/0004-Use-__typeof__-instead-of-typeof.patch b/pkg/fuse/patch/0002-Use-__typeof__-instead-of-typeof.patch
index 86b95634..86b95634 100644
--- a/pkg/fuse/patch/0004-Use-__typeof__-instead-of-typeof.patch
+++ b/pkg/fuse/patch/0002-Use-__typeof__-instead-of-typeof.patch
diff --git a/pkg/fuse/patch/0005-Fix-build-without-symbol-versioning.patch b/pkg/fuse/patch/0003-Fix-build-without-symbol-versioning.patch
index 997e31da..997e31da 100644
--- a/pkg/fuse/patch/0005-Fix-build-without-symbol-versioning.patch
+++ b/pkg/fuse/patch/0003-Fix-build-without-symbol-versioning.patch
diff --git a/pkg/fuse/src b/pkg/fuse/src
-Subproject db9b4fa148e6c22c0d4b4c567fa65d1cd536815
+Subproject 0105e061b97a97d9836128aea5bcdfc9593c9b8
diff --git a/pkg/fuse/ver b/pkg/fuse/ver
index 3d4d3089..1b9fd27f 100644
--- a/pkg/fuse/ver
+++ b/pkg/fuse/ver
@@ -1 +1 @@
-3.9.4 r0
+3.10.0 r0