oasis

commit: 512a71fb66d4834a3d7eede30e945eaacd72a8fb
parent 54fa63de93c4ac91053d78cec95b06c614e69c78
Author: Michael Forney <mforney@mforney.org>
Date:   Mon,  1 Jul 2019 22:51:11 -0700

fuse: Fix a few more portability issues

Diffstat:
A
pkg/fuse/patch/0005-Use-__typeof__-instead-of-typeof.patch
26
++++++++++++++++++++++++++
A
pkg/fuse/patch/0006-Fix-build-without-symbol-versioning.patch
29
+++++++++++++++++++++++++++++
M
pkg/fuse/ver
2
+-

3 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/pkg/fuse/patch/0005-Use-__typeof__-instead-of-typeof.patch b/pkg/fuse/patch/0005-Use-__typeof__-instead-of-typeof.patch
@@ -0,0 +1,26 @@
+From ad82739adeaa66a401f055a308c8d786f5b011a2 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Mon, 1 Jul 2019 22:45:12 -0700
+Subject: [PATCH] Use __typeof__ instead of typeof
+
+typeof might not be available if built with ISO C mode.
+---
+ util/fusermount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/fusermount.c b/util/fusermount.c
+index 56da6ec..a09b91d 100644
+--- a/util/fusermount.c
++++ b/util/fusermount.c
+@@ -1013,7 +1013,7 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
+ 	 * (https://bazaar.launchpad.net/~ecryptfs/ecryptfs/trunk/view/head:/src/utils/mount.ecryptfs_private.c#L225)
+ 	 * but got expanded as we found more filesystems that needed to be
+ 	 * overlayed. */
+-	typeof(fs_buf.f_type) f_type_whitelist[] = {
++	__typeof__(fs_buf.f_type) f_type_whitelist[] = {
+ 		0x61756673 /* AUFS_SUPER_MAGIC */,
+ 		0x00000187 /* AUTOFS_SUPER_MAGIC */,
+ 		0xCA451A4E /* BCACHEFS_STATFS_MAGIC */,
+-- 
+2.22.0
+
diff --git a/pkg/fuse/patch/0006-Fix-build-without-symbol-versioning.patch b/pkg/fuse/patch/0006-Fix-build-without-symbol-versioning.patch
@@ -0,0 +1,29 @@
+From 549e21e31f4fa482d5e5db244848bb1ae7b69549 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Wed, 3 Jul 2019 00:52:16 -0700
+Subject: [PATCH] Fix build without symbol versioning
+
+---
+ include/fuse.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/include/fuse.h b/include/fuse.h
+index 2d2291c..7fd0348 100644
+--- a/include/fuse.h
++++ b/include/fuse.h
+@@ -908,7 +908,11 @@ void fuse_lib_help(struct fuse_args *args);
+  *            `struct fuse_operations.init` handler.
+  * @return the created FUSE handle
+  */
+-#if FUSE_USE_VERSION == 30
++#if FUSE_USE_VERSION == 31
++struct fuse *fuse_new_31(struct fuse_args *args, const struct fuse_operations *op,
++			 size_t op_size, void *private_data);
++#define fuse_new(args, op, size, data) fuse_new_31(args, op, size, data)
++#elif FUSE_USE_VERSION == 30
+ struct fuse *fuse_new_30(struct fuse_args *args, const struct fuse_operations *op,
+ 			 size_t op_size, void *private_data);
+ #define fuse_new(args, op, size, data) fuse_new_30(args, op, size, data)
+-- 
+2.22.0
+
diff --git a/pkg/fuse/ver b/pkg/fuse/ver
@@ -1 +1 @@
-3.6.1 r1
+3.6.1 r2