commit: 8bb86237036b5dabaebd7c7039131bc0022b6481
parent 3e94f81843c7a0fc6ac585ebce2a6635eb92638e
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 10 Aug 2017 20:02:17 -0700
libfuse: Update to 3.1.1
Diffstat:
8 files changed, 71 insertions(+), 95 deletions(-)
diff --git a/pkg/libfuse/config.h b/pkg/libfuse/config.h
@@ -9,4 +9,4 @@
#define HAVE_STRUCT_STAT_ST_ATIM
#undef HAVE_STRUCT_STAT_ST_ATIMESPEC
#define HAVE_VMSPLICE
-#define PACKAGE_VERSION "3.1.0"
+#define PACKAGE_VERSION "3.1.1"
diff --git a/pkg/libfuse/gen.rc b/pkg/libfuse/gen.rc
@@ -1,5 +1,6 @@
cflags\
-D 'FUSE_USE_VERSION=31' \
+ -D 'fuse_new_31=fuse_new' \
-I include\
-I '$dir' \
-I '$srcdir'/include\
diff --git a/pkg/libfuse/patch/0001-Fix-poll.h-include.patch b/pkg/libfuse/patch/0001-Fix-poll.h-include.patch
@@ -1,25 +0,0 @@
-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
-
----
- lib/mount.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/mount.c b/lib/mount.c
-index 2150189..7a18c11 100644
---- a/lib/mount.c
-+++ b/lib/mount.c
-@@ -21,7 +21,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <errno.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <sys/wait.h>
---
-2.13.2
-
diff --git a/pkg/libfuse/patch/0001-Only-enable-FUSE_SYMVER-on-glibc.patch b/pkg/libfuse/patch/0001-Only-enable-FUSE_SYMVER-on-glibc.patch
@@ -0,0 +1,25 @@
+From 3ebf1956536d0becda1267bb465010d919bca0ed 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.14.1
+
diff --git a/pkg/libfuse/patch/0002-Disable-iconv-module.patch b/pkg/libfuse/patch/0002-Disable-iconv-module.patch
@@ -0,0 +1,43 @@
+From 9e9c7141aceb6e144bd132fa44f605213125d15a 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 75f13d7..42b0cec 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 */
+@@ -4662,7 +4660,6 @@ struct fuse *fuse_new_31(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.14.1
+
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
@@ -1,25 +0,0 @@
-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
@@ -1,43 +0,0 @@
-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
@@ -1 +1 @@
-3
+4
