fuse3: update to 3.18.2

Drop two patches that have been applied upstream:
- 100-fuse_signals.c-fix-build-warning-when-HAVE_BACKTRACE.patch
- 101-mount_util.c-check-if-utab-exists-before-update.patch

Changelog: https://github.com/libfuse/libfuse/releases/tag/fuse-3.18.2

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/utils/fuse3/Makefile b/utils/fuse3/Makefile
index 98acc15a8a389e33a5acd39d8a7774836ccabf4f..5a4a1daa8290e5cc36367a67c969c4c2d440df1d 100644 (file)
--- a/utils/fuse3/Makefile
+++ b/utils/fuse3/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse3
-PKG_VERSION:=3.17.3
+PKG_VERSION:=3.18.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=fuse-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/libfuse/libfuse/releases/download/fuse-$(PKG_VERSION)
-PKG_HASH:=de8190448909aa97a222d435bc130aae98331bed4215e9f4519b4b5b285a1d63
+PKG_HASH:=f01de85717e20adf5f98aff324acd85dd73d61a5ca3834d573dcf0bd6e54a298
 PKG_BUILD_DIR:=$(BUILD_DIR)/fuse-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>

diff --git a/utils/fuse3/patches/100-fuse_signals.c-fix-build-warning-when-HAVE_BACKTRACE.patch b/utils/fuse3/patches/100-fuse_signals.c-fix-build-warning-when-HAVE_BACKTRACE.patch
deleted file mode 100644 (file)
index 0fbc7ab..0000000
--- a/utils/fuse3/patches/100-fuse_signals.c-fix-build-warning-when-HAVE_BACKTRACE.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Georgi Valkov <gvalkov@gmail.com>
-Date: Thu, 12 Jun 2025 07:36:14 +0300
-Subject: [PATCH] fuse_signals.c: fix build warning when HAVE_BACKTRACE is
- undefined
-
-BT_STACK_SZ and backtrace_buffer are not used when
-HAVE_BACKTRACE is undefined. Wrap them in #ifdef
-to avoid a build warning:
-
-../lib/fuse_signals.c:31:14: warning: 'backtrace_buffer' defined but not used [-Wunused-variable]
-   31 | static void *backtrace_buffer[BT_STACK_SZ];
-      |              ^~~~~~~~~~~~~~~~
-
-Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
----
- lib/fuse_signals.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/lib/fuse_signals.c
-+++ b/lib/fuse_signals.c
-@@ -27,8 +27,10 @@ static int ignore_sigs[] = { SIGPIPE};
- static int fail_sigs[] = { SIGILL, SIGTRAP, SIGABRT, SIGBUS, SIGFPE, SIGSEGV };
- static struct fuse_session *fuse_instance;
- 
-+#ifdef HAVE_BACKTRACE
- #define BT_STACK_SZ (1024 * 1024)
- static void *backtrace_buffer[BT_STACK_SZ];
-+#endif
- 
- static void dump_stack(void)
- {

diff --git a/utils/fuse3/patches/101-mount_util.c-check-if-utab-exists-before-update.patch b/utils/fuse3/patches/101-mount_util.c-check-if-utab-exists-before-update.patch
deleted file mode 100644 (file)
index 0514cc2..0000000
--- a/utils/fuse3/patches/101-mount_util.c-check-if-utab-exists-before-update.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3793b1748ad151c8043dee1db198fffa3dbb5a67 Mon Sep 17 00:00:00 2001
-From: Georgi Valkov <gvalkov@gmail.com>
-Date: Sun, 15 Jun 2025 15:34:57 +0300
-Subject: [PATCH] mount_util.c: check if utab exists before update
-
-Do not attempt to update /run/mount/utab if it doesn't exist.
-Note: if this path ever changes, utab updates will break.
-
-Fixes the following error when mounting iPhone using ifuse:
-ifuse /mnt --container com.httpstorm.httpstorm
-mount: mounting ifuse on /mnt failed: Invalid argument
-
-On OpenWRT by default mount-utils is not installed and utab
-does not exist. /bin/mount is a symlink to /bin/busybox and
-does not support updating of utab. If mount-utils is installed:
-/run/mount/ exists, but does not contain utab.
-The mount-utils instance is under /usr/bin/mount, so a hard-coded
-call to /bin/mount will still fail. Using /usr/bin/mount succeeds
-but does not create utab.
-
-[1] https://github.com/libfuse/libfuse/pull/1247
-
-Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
----
- lib/mount_util.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/lib/mount_util.c
-+++ b/lib/mount_util.c
-@@ -75,6 +75,10 @@ static int mtab_needs_update(const char
- 
-               if (err == EROFS)
-                       return 0;
-+
-+              res = access("/run/mount/utab", F_OK);
-+              if (res == -1)
-+                      return 0;
-       }
- 
-       return 1;

diff --git a/utils/fuse3/test.sh b/utils/fuse3/test.sh
new file mode 100644 (file)
index 0000000..3e1cec0
--- /dev/null
+++ b/utils/fuse3/test.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+case "$1" in
+       fuse3-utils)
+               [ -x /usr/sbin/mount.fuse3 ]
+               ;;
+       libfuse3)
+               ls /usr/lib/libfuse3.so.* > /dev/null
+               ;;
+esac