summaryrefslogtreecommitdiff
path: root/pkg/libfuse
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2018-11-07 14:30:46 -0800
committerMichael Forney <mforney@mforney.org>2018-11-07 14:57:31 -0800
commitfe8a1f1a495b70a20e3ee39639c2675c57f40443 (patch)
treed5f7f8e0b931e04af8c946303820149fc7cc8c37 /pkg/libfuse
parentbeda3b13d3be4799a9f6e9eefb7aa7b23c0b8b2c (diff)
libfuse: Update to 3.3.0
Diffstat (limited to 'pkg/libfuse')
-rw-r--r--pkg/libfuse/config.h2
-rw-r--r--pkg/libfuse/gen.lua2
-rw-r--r--pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch32
-rw-r--r--pkg/libfuse/rev2
m---------pkg/libfuse/src0
5 files changed, 35 insertions, 3 deletions
diff --git a/pkg/libfuse/config.h b/pkg/libfuse/config.h
index d12e2706..aece8f61 100644
--- a/pkg/libfuse/config.h
+++ b/pkg/libfuse/config.h
@@ -16,4 +16,4 @@
#undef HAVE_STRUCT_STAT_ST_ATIMESPEC
#define HAVE_UTIMENSAT
#define HAVE_VMSPLICE
-#define PACKAGE_VERSION "3.2.6"
+#define PACKAGE_VERSION "3.3.0"
diff --git a/pkg/libfuse/gen.lua b/pkg/libfuse/gen.lua
index 55714fad..8554009a 100644
--- a/pkg/libfuse/gen.lua
+++ b/pkg/libfuse/gen.lua
@@ -1,5 +1,5 @@
cflags{
- '-D FUSE_USE_VERSION=32',
+ '-D FUSE_USE_VERSION=33',
'-I $dir',
'-I $srcdir/include',
'-I $srcdir/lib',
diff --git a/pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch b/pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch
new file mode 100644
index 00000000..d5fbf9c5
--- /dev/null
+++ b/pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch
@@ -0,0 +1,32 @@
+From 0030a024f2dbc438a19e9410e95e02156d1c78db Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Wed, 7 Nov 2018 14:29:38 -0800
+Subject: [PATCH] Fix build with IGNORE_MTAB
+
+---
+ util/fusermount.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/util/fusermount.c b/util/fusermount.c
+index 8eb0fdc..2d02a65 100644
+--- a/util/fusermount.c
++++ b/util/fusermount.c
+@@ -208,6 +208,7 @@ static int may_unmount(const char *mnt, int quiet)
+
+ return 0;
+ }
++#endif /* IGNORE_MTAB */
+
+ /*
+ * Check whether the file specified in "fusermount3 -u" is really a
+@@ -395,6 +396,7 @@ static int chdir_to_parent(char *copy, const char **lastp)
+ return 0;
+ }
+
++#ifndef IGNORE_MTAB
+ /* Check whether the kernel supports UMOUNT_NOFOLLOW flag */
+ static int umount_nofollow_support(void)
+ {
+--
+2.19.1
+
diff --git a/pkg/libfuse/rev b/pkg/libfuse/rev
index ec635144..f599e28b 100644
--- a/pkg/libfuse/rev
+++ b/pkg/libfuse/rev
@@ -1 +1 @@
-9
+10
diff --git a/pkg/libfuse/src b/pkg/libfuse/src
-Subproject 67e4914f938259182fa84e1e941c724a14d605c
+Subproject 3e2fcf3a630e575bc420df254525834504dc01b