fuse: update to 3.16.2

3 files changed, 48 insertions, 15 deletions

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index d1bf72e2a..179ad1947 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -4,18 +4,18 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		fuse
-PKG_VERSION:=		2.9.4
+PKG_VERSION:=		3.16.2
 PKG_RELEASE:=		1
-PKG_HASH:=		6be9c0bff6af8c677414935f31699ea5a7f8f5f791cfa5205be02ea186b97ce1
+PKG_HASH:=		1bc306be1a1f4f6c8965fbdd79c9ccca021fdc4b277d501483a711cbd7dbcd6c
 PKG_DESCR:=		filesystem in userspace utility
 PKG_SECTION:=		sys/fs
 PKG_DEPENDS:=		libfuse
-PKG_URL:=		http://fuse.sourceforge.net/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
+PKG_SITES:=		https://github.com/libfuse/libfuse/archive/refs/tags/
 PKG_LIBNAME:=		libfuse
 PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+WRKDIST=		$(WRKDIR)/libfuse-$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SUBPKGS:=		FUSE_UTILS LIBFUSE
 PKGSD_LIBFUSE:=		filesystem in userspace library
@@ -26,23 +26,22 @@ include ${ADK_TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBFUSE,libfuse,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE},${PKGSC_LIBFUSE},${PKG_OPTS}))
 
-CONFIGURE_ARGS+=	--enable-lib \
-			--enable-util \
-			--with-libiconv-prefix="${STAGING_TARGET_DIR}/usr" \
-			--disable-example \
-			--disable-auto-modprobe \
-			--disable-mtab \
-			--disable-kernel-module
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
+
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
+
+MESON_FLAGS+=		-Dinitscriptdir="" \
+			-Dudevrulesdir=""
 
 fuse-utils-install:
 	${INSTALL_DIR} ${IDIR_FUSE_UTILS}/usr/bin
-	${CP} ${WRKINST}/usr/bin/fusermount ${IDIR_FUSE_UTILS}/usr/bin
+	${CP} ${WRKINST}/usr/bin/fusermount3 ${IDIR_FUSE_UTILS}/usr/bin
 
 libfuse-install:
 	${INSTALL_DIR} ${IDIR_LIBFUSE}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libfuse.so* \
-		${IDIR_LIBFUSE}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libulockmgr.so* \
+	${CP} ${WRKINST}/usr/lib/libfuse3.so* \
 		${IDIR_LIBFUSE}/usr/lib
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fuse/patches/patch-util_install_helper_sh b/package/fuse/patches/patch-util_install_helper_sh
new file mode 100644
index 000000000..02aa038fc
--- /dev/null
+++ b/package/fuse/patches/patch-util_install_helper_sh
@@ -0,0 +1,22 @@
+--- libfuse-fuse-3.16.2.orig/util/install_helper.sh	2023-10-10 09:38:49.000000000 +0200
++++ libfuse-fuse-3.16.2/util/install_helper.sh	2024-02-11 19:19:21.423803542 +0100
+@@ -37,19 +37,3 @@ if $useroot; then
+     fi
+ fi
+ 
+-if [ "${udevrulesdir}" != "" ]; then
+-    install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
+-        "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
+-fi
+-
+-if [ "$initscriptdir" != "" ]; then
+-    install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
+-            "${DESTDIR}${initscriptdir}/fuse3"
+-
+-    if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
+-        /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
+-    else
+-        echo "== FURTHER ACTION REQUIRED =="
+-        echo "Make sure that your init system will start the ${DESTDIR}${initscriptdir}/init.d/fuse3 init script"
+-    fi
+-fi
diff --git a/package/fuse/patches/patch-util_meson_build b/package/fuse/patches/patch-util_meson_build
new file mode 100644
index 000000000..6b8f915f8
--- /dev/null
+++ b/package/fuse/patches/patch-util_meson_build
@@ -0,0 +1,12 @@
+--- libfuse-fuse-3.16.2.orig/util/meson.build	2023-10-10 09:38:49.000000000 +0200
++++ libfuse-fuse-3.16.2/util/meson.build	2024-02-11 19:25:24.107798622 +0100
+@@ -26,9 +26,3 @@ if udevrulesdir == ''
+   warning('could not determine udevdir, udev.rules will not be installed')
+ endif
+ 
+-meson.add_install_script('install_helper.sh',
+-                         join_paths(get_option('prefix'), get_option('sysconfdir')),
+-                         join_paths(get_option('prefix'), get_option('bindir')),
+-                         udevrulesdir,
+-                         '@0@'.format(get_option('useroot')),
+-                         get_option('initscriptdir'))