oasis

commit: fe8a1f1a495b70a20e3ee39639c2675c57f40443
parent beda3b13d3be4799a9f6e9eefb7aa7b23c0b8b2c
Author: Michael Forney <mforney@mforney.org>
Date:   Wed,  7 Nov 2018 14:30:46 -0800

libfuse: Update to 3.3.0

Diffstat:
M
.gitmodules
1
+
M
pkg/libfuse/config.h
2
+-
M
pkg/libfuse/gen.lua
2
+-
A
pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch
32
++++++++++++++++++++++++++++++++
M
pkg/libfuse/rev
2
+-

5 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -101,6 +101,7 @@
 [submodule "pkg/libfuse/src"]
 	path = pkg/libfuse/src
 	url = https://github.com/libfuse/libfuse
+	ignore = all
 [submodule "pkg/libinput/src"]
 	path = pkg/libinput/src
 	url = https://github.com/michaelforney/libinput
diff --git 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
@@ -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
@@ -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
@@ -1 +1 @@
-9
+10