CVS commit: pkgsrc/filesystems/fuse

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Wed May  6 19:19:39 UTC 2026

Modified Files:
        pkgsrc/filesystems/fuse: Makefile PLIST.Linux distinfo
Added Files:
        pkgsrc/filesystems/fuse: MESSAGE.Linux
        pkgsrc/filesystems/fuse/patches: patch-util_install__helper.sh

Log Message:
filesystems/fuse: fix build on Linux.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 pkgsrc/filesystems/fuse/MESSAGE.Linux
cvs rdiff -u -r1.17 -r1.18 pkgsrc/filesystems/fuse/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/filesystems/fuse/PLIST.Linux
cvs rdiff -u -r1.11 -r1.12 pkgsrc/filesystems/fuse/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/filesystems/fuse/patches/patch-util_install__helper.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/fuse/Makefile
diff -u pkgsrc/filesystems/fuse/Makefile:1.17 pkgsrc/filesystems/fuse/Makefile:1.18
--- pkgsrc/filesystems/fuse/Makefile:1.17       Wed May  6 17:08:48 2026
+++ pkgsrc/filesystems/fuse/Makefile    Wed May  6 19:19:39 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2026/05/06 17:08:48 vins Exp $
+# $NetBSD: Makefile,v 1.18 2026/05/06 19:19:39 vins Exp $
 #
 
 DISTNAME=      fuse-3.18.2
+PKGREVISION=   1
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libfuse/}
 GITHUB_PROJECT=        libfuse
@@ -31,6 +32,7 @@ SUBST_MESSAGE.conf=   Setting default conf
 PKG_DOCS=      doc/README.* doc/*.txt
 DOCDIR=                share/doc/${PKGBASE}
 EGDIR=         share/examples/${PKGBASE}
+INCLUDEDIR=    include/fuse
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -51,7 +53,10 @@ PKGCONFIG_OVERRIDE+=         output/meson-priva
 
 CONF_FILES+=           ${EGDIR}/fuse.conf ${PKG_SYSCONFDIR}/fuse.conf
 
-AUTO_MKDIRS=   yes
+INSTALLATION_DIRS+=    ${DOCDIR} ${INCLUDEDIR}
+
+SPECIAL_PERMS+=                bin/fusermount3 ${SETUID_ROOT_PERMS}
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h \
                ${DESTDIR}${PREFIX}/include/fuse
@@ -62,7 +67,6 @@ post-install:
 
 .if ${OPSYS} == "Linux"
 .  include "../../devel/liburing/buildlink3.mk"
-       ${RUN}${CHMOD} -w       ${DESTDIR}${PREFIX}/bin/fusermount
 .elif ${OPSYS} == "NetBSD"
 .  include "../../filesystems/perfuse/buildlink3.mk"
 .endif

Index: pkgsrc/filesystems/fuse/PLIST.Linux
diff -u pkgsrc/filesystems/fuse/PLIST.Linux:1.4 pkgsrc/filesystems/fuse/PLIST.Linux:1.5
--- pkgsrc/filesystems/fuse/PLIST.Linux:1.4     Thu Sep  7 20:56:05 2023
+++ pkgsrc/filesystems/fuse/PLIST.Linux Wed May  6 19:19:39 2026
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST.Linux,v 1.4 2023/09/07 20:56:05 vins Exp $
-bin/fusermount
-bin/ulockmgr_server
-man/man1/fusermount.1
-man/man1/ulockmgr_server.1
-man/man8/mount.fuse.8
-sbin/mount.fuse
-share/examples/fuse/99-fuse.rules
-share/examples/fuse/init.d.fuse
+@comment $NetBSD: PLIST.Linux,v 1.5 2026/05/06 19:19:39 vins Exp $
+bin/fusermount3
+man/man1/fusermount3.1
+man/man8/mount.fuse3.8
+sbin/mount.fuse3
+share/examples/fuse/99-fuse3.rules
+share/examples/fuse/init.d.fuse3

Index: pkgsrc/filesystems/fuse/distinfo
diff -u pkgsrc/filesystems/fuse/distinfo:1.11 pkgsrc/filesystems/fuse/distinfo:1.12
--- pkgsrc/filesystems/fuse/distinfo:1.11       Wed May  6 17:08:48 2026
+++ pkgsrc/filesystems/fuse/distinfo    Wed May  6 19:19:39 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2026/05/06 17:08:48 vins Exp $
+$NetBSD: distinfo,v 1.12 2026/05/06 19:19:39 vins Exp $
 
 BLAKE2s (fuse-3.18.2.tar.gz) = 8b88c248fb97b0977c38bb4502ffa66749bb0fad1e218bb10f62a82a2a3f265b
 SHA512 (fuse-3.18.2.tar.gz) = b2ca702b74788230981d05dc85458ee3582970dcb1526e7eda8f46e23d0373b361ef1438874a7caa46aaf02a5b84f7e5341fbe61e856cfbce849d1209b4aabbe
@@ -6,3 +6,4 @@ Size (fuse-3.18.2.tar.gz) = 4933779 byte
 SHA1 (patch-example_cuse__client.c) = 9afb374114362b7b0875dde56aa9f0bbb1c96ef8
 SHA1 (patch-example_meson.build) = 41ef502dca57649fb90bbde25721e03514d8527d
 SHA1 (patch-test_meson.build) = bf0cf20007b753cb295514aa349f879ca2df6661
+SHA1 (patch-util_install__helper.sh) = 63b6e4480020dee8d51bcf4c9e4586f3ab20467e

Added files:

Index: pkgsrc/filesystems/fuse/MESSAGE.Linux
diff -u /dev/null pkgsrc/filesystems/fuse/MESSAGE.Linux:1.3
--- /dev/null   Wed May  6 19:19:39 2026
+++ pkgsrc/filesystems/fuse/MESSAGE.Linux       Wed May  6 19:19:39 2026
@@ -0,0 +1,8 @@
+===========================================================================
+$NetBSD: MESSAGE.Linux,v 1.3 2026/05/06 19:19:39 vins Exp $
+
+Linux users must create the device node by typing:
+
+  $ [ -e "/dev/fuse" ] || mknod "/dev/fuse" -m 0666 c 10 229
+
+===========================================================================

Index: pkgsrc/filesystems/fuse/patches/patch-util_install__helper.sh
diff -u /dev/null pkgsrc/filesystems/fuse/patches/patch-util_install__helper.sh:1.1
--- /dev/null   Wed May  6 19:19:39 2026
+++ pkgsrc/filesystems/fuse/patches/patch-util_install__helper.sh       Wed May  6 19:19:39 2026
@@ -0,0 +1,40 @@
+$NetBSD: patch-util_install__helper.sh,v 1.1 2026/05/06 19:19:39 vins Exp $
+
+Keep only the required bits from the install script.
+
+--- util/install_helper.sh.orig        2026-03-18 21:18:34.000000000 +0000
++++ util/install_helper.sh
+@@ -24,19 +24,6 @@ else
+     DESTDIR="${DESTDIR%/}"
+ fi
+ 
+-install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
+-      "${DESTDIR}${sysconfdir}/fuse.conf"
+-
+-if $useroot; then
+-    chown root:root "${DESTDIR}${bindir}/fusermount3"
+-    chmod u+s "${DESTDIR}${bindir}/fusermount3"
+-
+-    if test ! -e "${DESTDIR}/dev/fuse"; then
+-        mkdir -p "${DESTDIR}/dev"
+-        mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229
+-    fi
+-fi
+-
+ if [ "${udevrulesdir}" != "" ]; then
+     install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
+         "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
+@@ -44,12 +31,5 @@ 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
++            "${DESTDIR}${initscriptdir}/init.d.fuse3"
+ fi