summaryrefslogtreecommitdiff
path: root/package/fuse/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2024-02-13 17:15:07 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2024-02-13 17:53:53 +0100
commit42cc5a7110c5b2fe1491d316cdc1714832c73152 (patch)
treed82570007c9bb0c0f7e5dd863964f5265c3bffeb /package/fuse/patches
parent4f7aa52a61b5f34542e0ad57bcc8ae976a470933 (diff)
fuse: use latest 2.x version
Diffstat (limited to 'package/fuse/patches')
-rw-r--r--package/fuse/patches/patch-configure_ac10
-rw-r--r--package/fuse/patches/patch-include_fuse_kernel_h16
-rw-r--r--package/fuse/patches/patch-util_ulockmgr_server_c29
3 files changed, 55 insertions, 0 deletions
diff --git a/package/fuse/patches/patch-configure_ac b/package/fuse/patches/patch-configure_ac
new file mode 100644
index 000000000..10c093358
--- /dev/null
+++ b/package/fuse/patches/patch-configure_ac
@@ -0,0 +1,10 @@
+--- fuse-2.9.9.orig/configure.ac 2019-01-04 14:37:03.000000000 +0100
++++ fuse-2.9.9/configure.ac 2024-02-12 17:14:14.790450294 +0100
+@@ -55,6 +55,7 @@ fi
+
+ AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
+ AC_CHECK_FUNCS([posix_fallocate])
++AC_CHECK_FUNCS([closefrom])
+ AC_CHECK_MEMBERS([struct stat.st_atim])
+ AC_CHECK_MEMBERS([struct stat.st_atimespec])
+
diff --git a/package/fuse/patches/patch-include_fuse_kernel_h b/package/fuse/patches/patch-include_fuse_kernel_h
new file mode 100644
index 000000000..41a1e7c7d
--- /dev/null
+++ b/package/fuse/patches/patch-include_fuse_kernel_h
@@ -0,0 +1,16 @@
+--- fuse-2.9.9.orig/include/fuse_kernel.h 2019-01-04 14:33:33.000000000 +0100
++++ fuse-2.9.9/include/fuse_kernel.h 2024-02-12 17:14:08.594450378 +0100
+@@ -88,12 +88,7 @@
+ #ifndef _LINUX_FUSE_H
+ #define _LINUX_FUSE_H
+
+-#include <sys/types.h>
+-#define __u64 uint64_t
+-#define __s64 int64_t
+-#define __u32 uint32_t
+-#define __s32 int32_t
+-#define __u16 uint16_t
++#include <linux/types.h>
+
+ /*
+ * Version negotiation:
diff --git a/package/fuse/patches/patch-util_ulockmgr_server_c b/package/fuse/patches/patch-util_ulockmgr_server_c
new file mode 100644
index 000000000..ddf0472e1
--- /dev/null
+++ b/package/fuse/patches/patch-util_ulockmgr_server_c
@@ -0,0 +1,29 @@
+--- fuse-2.9.9.orig/util/ulockmgr_server.c 2019-01-04 14:33:33.000000000 +0100
++++ fuse-2.9.9/util/ulockmgr_server.c 2024-02-12 17:14:14.798450294 +0100
+@@ -22,6 +22,10 @@
+ #include <sys/socket.h>
+ #include <sys/wait.h>
+
++#ifdef HAVE_CONFIG_H
++ #include "config.h"
++#endif
++
+ struct message {
+ unsigned intr : 1;
+ unsigned nofd : 1;
+@@ -124,6 +128,7 @@ static int receive_message(int sock, voi
+ return res;
+ }
+
++#if !defined(HAVE_CLOSEFROM)
+ static int closefrom(int minfd)
+ {
+ DIR *dir = opendir("/proc/self/fd");
+@@ -141,6 +146,7 @@ static int closefrom(int minfd)
+ }
+ return 0;
+ }
++#endif
+
+ static void send_reply(int cfd, struct message *msg)
+ {