pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/filesystems/fuse
Module Name: pkgsrc
Committed By: vins
Date: Wed May 6 17:08:49 UTC 2026
Modified Files:
pkgsrc/filesystems/fuse: DESCR Makefile PLIST.common buildlink3.mk
builtin.mk distinfo
Added Files:
pkgsrc/filesystems/fuse/patches: patch-example_cuse__client.c
patch-example_meson.build patch-test_meson.build
Removed Files:
pkgsrc/filesystems/fuse: MESSAGE.Linux
pkgsrc/filesystems/fuse/files: config.rpath
pkgsrc/filesystems/fuse/patches: patch-configure.ac
patch-doc_Makefile.am patch-lib_fuse.c patch-lib_mount__bsd.c
patch-util_Makefile.am patch-util_ulockmgr__server.c
Log Message:
filesystems/fuse: update to 3.18.2
Changelog too long. Refer to
https://github.com/libfuse/libfuse/blob/master/ChangeLog.rst
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/fuse/DESCR
cvs rdiff -u -r1.1 -r0 pkgsrc/filesystems/fuse/MESSAGE.Linux
cvs rdiff -u -r1.16 -r1.17 pkgsrc/filesystems/fuse/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/filesystems/fuse/PLIST.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/filesystems/fuse/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/filesystems/fuse/builtin.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/filesystems/fuse/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/filesystems/fuse/files/config.rpath
cvs rdiff -u -r1.1 -r0 pkgsrc/filesystems/fuse/patches/patch-configure.ac \
pkgsrc/filesystems/fuse/patches/patch-doc_Makefile.am \
pkgsrc/filesystems/fuse/patches/patch-lib_fuse.c \
pkgsrc/filesystems/fuse/patches/patch-lib_mount__bsd.c \
pkgsrc/filesystems/fuse/patches/patch-util_ulockmgr__server.c
cvs rdiff -u -r0 -r1.1 \
pkgsrc/filesystems/fuse/patches/patch-example_cuse__client.c \
pkgsrc/filesystems/fuse/patches/patch-example_meson.build \
pkgsrc/filesystems/fuse/patches/patch-test_meson.build
cvs rdiff -u -r1.2 -r0 pkgsrc/filesystems/fuse/patches/patch-util_Makefile.am
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/DESCR
diff -u pkgsrc/filesystems/fuse/DESCR:1.2 pkgsrc/filesystems/fuse/DESCR:1.3
--- pkgsrc/filesystems/fuse/DESCR:1.2 Wed Feb 21 06:08:30 2007
+++ pkgsrc/filesystems/fuse/DESCR Wed May 6 17:08:48 2026
@@ -6,5 +6,4 @@ userspace program. Features include:
* Secure implementation
* Userspace - kernel interface is very efficient
* Usable by non privileged users
-* Runs on Linux kernels 2.4.X and 2.6.X
* Has proven very stable over time
Index: pkgsrc/filesystems/fuse/Makefile
diff -u pkgsrc/filesystems/fuse/Makefile:1.16 pkgsrc/filesystems/fuse/Makefile:1.17
--- pkgsrc/filesystems/fuse/Makefile:1.16 Sat Sep 9 10:23:00 2023
+++ pkgsrc/filesystems/fuse/Makefile Wed May 6 17:08:48 2026
@@ -1,20 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2023/09/09 10:23:00 vins Exp $
+# $NetBSD: Makefile,v 1.17 2026/05/06 17:08:48 vins Exp $
#
-DISTNAME= fuse-2.9.9
-PKGREVISION= 1
+DISTNAME= fuse-3.18.2
CATEGORIES= filesystems
MASTER_SITES= ${MASTER_SITE_GITHUB:=libfuse/}
GITHUB_PROJECT= libfuse
-GITHUB_TAG= refs/tags/${DISTNAME}
+GITHUB_RELEASE= ${PKGBASE}-${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/libfuse/libfuse
COMMENT= Filesystem in Userspace
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
-GNU_CONFIGURE= yes
-
# FUSE the implementation only builds on Linux and FreeBSD.
ONLY_FOR_PLATFORM= Linux-*-* FreeBSD-*-* NetBSD-*-*
# On NetBSD 4.99 after 2007-02, /usr/lib/librefuse provides the FUSE
@@ -22,56 +19,55 @@ ONLY_FOR_PLATFORM= Linux-*-* FreeBSD-*-*
# implementation is not needed. This FUSE implementation can also be
# used with the perfuse package on NetBSD.
-USE_TOOLS+= gmake pkg-config gettext
-USE_TOOLS+= autoconf automake autoreconf
-USE_LIBTOOL= yes
-
-TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
+USE_LANGUAGES+= c c++
+USE_TOOLS+= pkg-config
-CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ARGS+= --with-pkgconfigdir=${PREFIX}/lib/pkgconfig
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-CONFIGURE_ENV+= MOUNT_FUSE_PATH=${PREFIX}/sbin
-CONFIGURE_ENV+= UDEV_RULES_PATH=${PREFIX}/${EGDIR}
-CONFIGURE_ENV+= INIT_D_PATH=${PREFIX}/${EGDIR}
-.endif
+SUBST_CLASSES+= conf
+SUBST_STAGE.conf= pre-configure
+SUBST_FILES.conf= doc/mount.fuse3.8 util/fuse.conf
+SUBST_SED.conf+= -e "s:/etc/fuse.conf:${PKG_SYSCONFDIR}/fuse.conf:g"
+SUBST_MESSAGE.conf= Setting default configuration file path for FUSE
-PKG_DOCS= doc/how-fuse-works doc/kernel.txt
+PKG_DOCS= doc/README.* doc/*.txt
DOCDIR= share/doc/${PKGBASE}
EGDIR= share/examples/${PKGBASE}
-INSTALL_TARGET= install-strip
-INSTALLATION_DIRS+= ${DOCDIR}
+.include "../../mk/bsd.prefs.mk"
+
+MESON_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
+ -Dexamples=true \
+ -Dtests=true \
+ -Dutils=true
.if ${OPSYS} == "Linux"
-INSTALLATION_DIRS+= sbin ${EGDIR}
+MESON_ARGS+= -Dinitscriptdir=${PREFIX}/${EGDIR} \
+ -Dudevrulesdir=${PREFIX}/${EGDIR} \
+ -Denable-io-uring=true
.endif
-WRKSRC= ${WRKDIR}/libfuse-${DISTNAME}
-pre-configure:
- ${RUN}${CP} ${FILESDIR}/config.rpath ${WRKSRC}
- ${RUN}cd ${WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} ${SH} ./makeconf.sh
+PKGCONFIG_OVERRIDE_STAGE= pre-install
+PKGCONFIG_OVERRIDE+= output/meson-private/fuse3.pc
+
+CONF_FILES+= ${EGDIR}/fuse.conf ${PKG_SYSCONFDIR}/fuse.conf
+AUTO_MKDIRS= yes
post-install:
${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h \
${DESTDIR}${PREFIX}/include/fuse
${INSTALL_DATA} ${PKG_DOCS:S|^|${WRKSRC}/|} \
${DESTDIR}${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/util/fuse.conf \
+ ${DESTDIR}${PREFIX}/${EGDIR}
.if ${OPSYS} == "Linux"
+. include "../../devel/liburing/buildlink3.mk"
${RUN}${CHMOD} -w ${DESTDIR}${PREFIX}/bin/fusermount
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-.include "../../filesystems/perfuse/buildlink3.mk"
+.elif ${OPSYS} == "NetBSD"
+. include "../../filesystems/perfuse/buildlink3.mk"
.endif
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/meson/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/filesystems/fuse/PLIST.common
diff -u pkgsrc/filesystems/fuse/PLIST.common:1.3 pkgsrc/filesystems/fuse/PLIST.common:1.4
--- pkgsrc/filesystems/fuse/PLIST.common:1.3 Thu Sep 7 19:38:14 2023
+++ pkgsrc/filesystems/fuse/PLIST.common Wed May 6 17:08:48 2026
@@ -1,17 +1,20 @@
-@comment $NetBSD: PLIST.common,v 1.3 2023/09/07 19:38:14 vins Exp $
-include/fuse.h
-include/fuse/cuse_lowlevel.h
-include/fuse/fuse.h
-include/fuse/fuse_common.h
-include/fuse/fuse_common_compat.h
-include/fuse/fuse_compat.h
+@comment $NetBSD: PLIST.common,v 1.4 2026/05/06 17:08:48 vins Exp $
include/fuse/fuse_kernel.h
-include/fuse/fuse_lowlevel.h
-include/fuse/fuse_lowlevel_compat.h
-include/fuse/fuse_opt.h
-include/ulockmgr.h
-lib/libfuse.la
-lib/libulockmgr.la
-lib/pkgconfig/fuse.pc
-share/doc/fuse/how-fuse-works
+include/fuse3/cuse_lowlevel.h
+include/fuse3/fuse.h
+include/fuse3/fuse_common.h
+include/fuse3/fuse_log.h
+include/fuse3/fuse_lowlevel.h
+include/fuse3/fuse_opt.h
+include/fuse3/libfuse_config.h
+lib/libfuse3.so
+lib/libfuse3.so.${PKGVERSION}
+lib/libfuse3.so.4
+lib/pkgconfig/fuse3.pc
+share/doc/fuse/README.NFS
+share/doc/fuse/README.fuse-io-uring
+share/doc/fuse/README.fuse_reply_errors
+share/doc/fuse/README.notifications
share/doc/fuse/kernel.txt
+share/doc/fuse/libfuse-operations.txt
+share/examples/fuse/fuse.conf
Index: pkgsrc/filesystems/fuse/buildlink3.mk
diff -u pkgsrc/filesystems/fuse/buildlink3.mk:1.7 pkgsrc/filesystems/fuse/buildlink3.mk:1.8
--- pkgsrc/filesystems/fuse/buildlink3.mk:1.7 Fri Sep 8 06:01:04 2023
+++ pkgsrc/filesystems/fuse/buildlink3.mk Wed May 6 17:08:48 2026
@@ -1,19 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.7 2023/09/08 06:01:04 vins Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2026/05/06 17:08:48 vins Exp $
BUILDLINK_TREE+= fuse
.if !defined(FUSE_BUILDLINK3_MK)
FUSE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.fuse+= fuse>=2.5.2
-BUILDLINK_ABI_DEPENDS.fuse+= fuse>=2.9.9nb1
+BUILDLINK_API_DEPENDS.fuse+= fuse>=3.10
+BUILDLINK_API_DEPENDS.fuse+= fuse>=3.18.2
BUILDLINK_PKGSRCDIR.fuse?= ../../filesystems/fuse
.include "../../mk/bsd.fast.prefs.mk"
.if ${OPSYS} == "NetBSD"
-.include "../../filesystems/perfuse/buildlink3.mk"
+. include "../../filesystems/perfuse/buildlink3.mk"
+.elif ${OPSYS} == "Linux"
+. include "../../devel/liburing/buildlink3.mk"
.endif
+
.endif # FUSE_BUILDLINK3_MK
BUILDLINK_TREE+= -fuse
Index: pkgsrc/filesystems/fuse/builtin.mk
diff -u pkgsrc/filesystems/fuse/builtin.mk:1.6 pkgsrc/filesystems/fuse/builtin.mk:1.7
--- pkgsrc/filesystems/fuse/builtin.mk:1.6 Thu Sep 7 19:38:14 2023
+++ pkgsrc/filesystems/fuse/builtin.mk Wed May 6 17:08:48 2026
@@ -1,13 +1,13 @@
-# $NetBSD: builtin.mk,v 1.6 2023/09/07 19:38:14 vins Exp $
+# $NetBSD: builtin.mk,v 1.7 2026/05/06 17:08:48 vins Exp $
BUILTIN_PKG:= fuse
PKGCONFIG_BASE.fuse= /usr
-PKGCONFIG_FILE.fuse= /usr/lib/pkgconfig/fuse.pc
-PKGCONFIG_FILE.fuse+= /usr/lib${LIBABISUFFIX}/pkgconfig/fuse.pc
+PKGCONFIG_FILE.fuse= /usr/lib/pkgconfig/fuse3.pc
+PKGCONFIG_FILE.fuse+= /usr/lib${LIBABISUFFIX}/pkgconfig/fuse3.pc
.include "../../mk/buildlink3/pkgconfig-builtin.mk"
.if ${USE_BUILTIN.fuse:tl} == yes
-BUILDLINK_FILES.fuse+= lib/pkgconfig/fuse.pc
-BUILDLINK_FILES.fuse+= lib${LIBABISUFFIX}/pkgconfig/fuse.pc
+BUILDLINK_FILES.fuse+= lib/pkgconfig/fuse3.pc
+BUILDLINK_FILES.fuse+= lib${LIBABISUFFIX}/pkgconfig/fuse3.pc
.endif
Index: pkgsrc/filesystems/fuse/distinfo
diff -u pkgsrc/filesystems/fuse/distinfo:1.10 pkgsrc/filesystems/fuse/distinfo:1.11
--- pkgsrc/filesystems/fuse/distinfo:1.10 Fri Sep 8 06:01:04 2023
+++ pkgsrc/filesystems/fuse/distinfo Wed May 6 17:08:48 2026
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.10 2023/09/08 06:01:04 vins Exp $
+$NetBSD: distinfo,v 1.11 2026/05/06 17:08:48 vins Exp $
-BLAKE2s (fuse-2.9.9.tar.gz) = 5b851aa97441a9e13a4718a0775e01cbfff8020d7f4a0656adfca439f8d42d95
-SHA512 (fuse-2.9.9.tar.gz) = 1acd51a647ec3dbf9eaafb80cec92bd8542bcbb2cf4510fc8b079b4f8aaa8f4b301e469ddefe4f1cc4ae2bf941e028077601c20d97f187cc618cea8710cbe331
-Size (fuse-2.9.9.tar.gz) = 212017 bytes
-SHA1 (patch-configure.ac) = 1e8d0081c8dc48e126d1cde856178c39f358ee37
-SHA1 (patch-doc_Makefile.am) = ffe16fc87e03772ca2e1124549177e999806dbd9
-SHA1 (patch-lib_fuse.c) = af4b7c90b43ddba66b7ae25f4b11cc9a4bbfc58e
-SHA1 (patch-lib_mount__bsd.c) = 6b00d0950e0146321a575a2f90c83d8aa7d3cc07
-SHA1 (patch-util_Makefile.am) = b3c79ad1e7390ba313476efb5ba3b67a214a8006
-SHA1 (patch-util_ulockmgr__server.c) = 2ec86dc8eca5e24952738171eb0937d822b8c657
+BLAKE2s (fuse-3.18.2.tar.gz) = 8b88c248fb97b0977c38bb4502ffa66749bb0fad1e218bb10f62a82a2a3f265b
+SHA512 (fuse-3.18.2.tar.gz) = b2ca702b74788230981d05dc85458ee3582970dcb1526e7eda8f46e23d0373b361ef1438874a7caa46aaf02a5b84f7e5341fbe61e856cfbce849d1209b4aabbe
+Size (fuse-3.18.2.tar.gz) = 4933779 bytes
+SHA1 (patch-example_cuse__client.c) = 9afb374114362b7b0875dde56aa9f0bbb1c96ef8
+SHA1 (patch-example_meson.build) = 41ef502dca57649fb90bbde25721e03514d8527d
+SHA1 (patch-test_meson.build) = bf0cf20007b753cb295514aa349f879ca2df6661
Added files:
Index: pkgsrc/filesystems/fuse/patches/patch-example_cuse__client.c
diff -u /dev/null pkgsrc/filesystems/fuse/patches/patch-example_cuse__client.c:1.1
--- /dev/null Wed May 6 17:08:49 2026
+++ pkgsrc/filesystems/fuse/patches/patch-example_cuse__client.c Wed May 6 17:08:48 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-example_cuse__client.c,v 1.1 2026/05/06 17:08:48 vins Exp $
+
+Fix ctype warning.
+
+--- example/cuse_client.c.orig 2026-05-06 16:55:14.227070883 +0000
++++ example/cuse_client.c
+@@ -106,7 +106,7 @@ int main(int argc, char **argv)
+ return 1;
+ }
+
+- cmd = tolower(argv[2][0]);
++ cmd = tolower((unsigned char)argv[2][0]);
+ argc -= 3;
+ argv += 3;
+
Index: pkgsrc/filesystems/fuse/patches/patch-example_meson.build
diff -u /dev/null pkgsrc/filesystems/fuse/patches/patch-example_meson.build:1.1
--- /dev/null Wed May 6 17:08:49 2026
+++ pkgsrc/filesystems/fuse/patches/patch-example_meson.build Wed May 6 17:08:49 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-example_meson.build,v 1.1 2026/05/06 17:08:49 vins Exp $
+
+Requires O_PATH and other Linuxisms.
+
+--- example/meson.build.orig 2026-05-06 16:42:00.707753842 +0000
++++ example/meson.build
+@@ -31,7 +31,7 @@ foreach ex : threaded_examples
+ install: false)
+ endforeach
+
+-if platform != 'dragonfly' and add_languages('cpp', required : false)
++if platform == 'linux' and add_languages('cpp', required : false)
+ executable('passthrough_hp', 'passthrough_hp.cc',
+ dependencies: [ thread_dep, libfuse_dep ],
+ install: false)
Index: pkgsrc/filesystems/fuse/patches/patch-test_meson.build
diff -u /dev/null pkgsrc/filesystems/fuse/patches/patch-test_meson.build:1.1
--- /dev/null Wed May 6 17:08:49 2026
+++ pkgsrc/filesystems/fuse/patches/patch-test_meson.build Wed May 6 17:08:49 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-test_meson.build,v 1.1 2026/05/06 17:08:49 vins Exp $
+
+Requires O_PATH and other Linuxisms.
+
+--- test/meson.build.orig 2026-05-06 15:59:19.869945743 +0000
++++ test/meson.build
+@@ -7,9 +7,11 @@ foreach prog: [ 'test_write_cache', 'tes
+ dependencies: thread_dep,
+ install: false)
+ endforeach
+-td += executable('test_syscalls', 'test_syscalls.c',
+- include_directories: include_dirs,
+- install: false)
++if platform == 'linux'
++ td += executable('test_syscalls', 'test_syscalls.c',
++ include_directories: include_dirs,
++ install: false)
++endif
+ td += executable('readdir_inode', 'readdir_inode.c',
+ include_directories: include_dirs,
+ install: false)
Home |
Main Index |
Thread Index |
Old Index