diff options
| author | Michael Forney <mforney@mforney.org> | 2017-09-16 15:13:41 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-09-25 19:23:06 -0700 |
| commit | 08c431b66b23a36bb253ac6e8b6ebeb43543325b (patch) | |
| tree | 50ed673d190d37323e051ed9bddfb95b4247307a /pkg/libfuse/patch | |
| parent | 86595977d761baa67c1462efd59a6404b56205ad (diff) | |
libfuse: Update to 3.2.0
Diffstat (limited to 'pkg/libfuse/patch')
| -rw-r--r-- | pkg/libfuse/patch/0001-Only-enable-FUSE_SYMVER-on-glibc.patch | 25 | ||||
| -rw-r--r-- | pkg/libfuse/patch/0002-Disable-iconv-module.patch | 43 |
2 files changed, 0 insertions, 68 deletions
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 deleted file mode 100644 index fb8d78a5..00000000 --- a/pkg/libfuse/patch/0001-Only-enable-FUSE_SYMVER-on-glibc.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 3047f574..00000000 --- a/pkg/libfuse/patch/0002-Disable-iconv-module.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 - |