diff --git a/filesystems/mergerfs/Makefile b/filesystems/mergerfs/Makefile index b774e71a4d12..95afcfdda00d 100644 --- a/filesystems/mergerfs/Makefile +++ b/filesystems/mergerfs/Makefile @@ -1,25 +1,27 @@ PORTNAME= mergerfs -DISTVERSION= 2.40.2 +DISTVERSION= 2.41.1 CATEGORIES= filesystems PKGNAMEPREFIX= fusefs- MAINTAINER= ehaupt@FreeBSD.org COMMENT= Featureful FUSE based union filesystem WWW= https://github.com/trapexit/mergerfs LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE USES= fuse gmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= trapexit -PLIST_FILES= bin/mergerfs \ +PLIST_FILES= bin/fsck.mergerfs \ + bin/mergerfs \ + bin/mergerfs.collect-info \ lib/mergerfs/preload.so \ share/man/man1/mergerfs.1.gz post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mergerfs \ ${STAGEDIR}${PREFIX}/lib/mergerfs/preload.so .include diff --git a/filesystems/mergerfs/distinfo b/filesystems/mergerfs/distinfo index 37bfb871ee16..f0e16a0b6d37 100644 --- a/filesystems/mergerfs/distinfo +++ b/filesystems/mergerfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727772197 -SHA256 (trapexit-mergerfs-2.40.2_GH0.tar.gz) = b4f45e635f29b0a8ba1727e6c1f503356d47943a14af8b4586d3e36350f82464 -SIZE (trapexit-mergerfs-2.40.2_GH0.tar.gz) = 743230 +TIMESTAMP = 1764093165 +SHA256 (trapexit-mergerfs-2.41.1_GH0.tar.gz) = 033dd23bef6c87dd7be8776a2ece6f20120cd3ece1feb1fbad6ba54785854aba +SIZE (trapexit-mergerfs-2.41.1_GH0.tar.gz) = 1220643 diff --git a/filesystems/mergerfs/files/patch-libfuse_lib_cpu.hpp b/filesystems/mergerfs/files/patch-libfuse_lib_cpu.hpp deleted file mode 100644 index 953ff7e2e86b..000000000000 --- a/filesystems/mergerfs/files/patch-libfuse_lib_cpu.hpp +++ /dev/null @@ -1,16 +0,0 @@ ---- libfuse/lib/cpu.hpp.orig 2024-02-29 20:41:22 UTC -+++ libfuse/lib/cpu.hpp -@@ -5,8 +5,12 @@ - #endif - - #include -+#ifdef __FreeBSD__ -+#define sched_getaffinity(pid, size, set) 0 -+#define pthread_setaffinity_np(thread, size, set) 0 -+#else - #include -- -+#endif - #include - #include - #include diff --git a/filesystems/mergerfs/files/patch-libfuse_lib_fuse.c b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.c deleted file mode 100644 index cdbfe55e710c..000000000000 --- a/filesystems/mergerfs/files/patch-libfuse_lib_fuse.c +++ /dev/null @@ -1,14 +0,0 @@ ---- libfuse/lib/fuse.c.orig 2024-02-29 20:41:22 UTC -+++ libfuse/lib/fuse.c -@@ -48,8 +48,10 @@ - #include - #include - --#ifdef HAVE_MALLOC_TRIM -+#ifdef __linux__ - #include -+#else -+#define malloc_trim(x) ((void)(x)) - #endif - - #define FUSE_UNKNOWN_INO UINT64_MAX diff --git a/filesystems/mergerfs/files/patch-libfuse_util_fusermount.c b/filesystems/mergerfs/files/patch-libfuse_util_fusermount.c deleted file mode 100644 index 7657ee4ce378..000000000000 --- a/filesystems/mergerfs/files/patch-libfuse_util_fusermount.c +++ /dev/null @@ -1,15 +0,0 @@ ---- libfuse/util/fusermount.c.orig 2024-02-29 20:41:22 UTC -+++ libfuse/util/fusermount.c -@@ -28,7 +28,12 @@ - #include - #include - #include -+#ifdef __linux__ - #include -+#else -+#define sched_getaffinity(pid, size, set) 0 -+#define pthread_setaffinity_np(thread, size, set) 0 -+#endif - - #define FUSE_COMMFD_ENV "_FUSE_COMMFD" - diff --git a/filesystems/mergerfs/files/patch-src_fs__copy__file__range__unsupported.icpp b/filesystems/mergerfs/files/patch-src_fs__copy__file__range__unsupported.icpp deleted file mode 100644 index 05a307ab97bf..000000000000 --- a/filesystems/mergerfs/files/patch-src_fs__copy__file__range__unsupported.icpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/fs_copy_file_range_unsupported.icpp.orig 2025-08-16 08:24:30 UTC -+++ src/fs_copy_file_range_unsupported.icpp -@@ -31,7 +31,7 @@ namespace fs - int64_t *off_in_, - const int fd_out_, - int64_t *off_out_, -- const size_t len_, -+ const uint64_t len_, - const unsigned int flags_) - { - return (errno=EOPNOTSUPP,-1); diff --git a/filesystems/mergerfs/files/patch-src_fs__readahead.cpp b/filesystems/mergerfs/files/patch-src_fs__readahead.cpp deleted file mode 100644 index 3bb873358455..000000000000 --- a/filesystems/mergerfs/files/patch-src_fs__readahead.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- src/fs_readahead.cpp.orig 2024-02-29 20:41:22 UTC -+++ src/fs_readahead.cpp -@@ -25,7 +25,11 @@ - #include - #include - -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - - namespace l - { diff --git a/filesystems/mergerfs/files/patch-src_fs__umount2.hpp b/filesystems/mergerfs/files/patch-src_fs__umount2.hpp deleted file mode 100644 index ce291a314c01..000000000000 --- a/filesystems/mergerfs/files/patch-src_fs__umount2.hpp +++ /dev/null @@ -1,17 +0,0 @@ ---- src/fs_umount2.hpp.orig 2024-02-29 20:41:22 UTC -+++ src/fs_umount2.hpp -@@ -19,7 +19,14 @@ - #pragma once - - #include -+#ifdef __linux__ - #include -+#else -+#include -+#include -+#define umount2(target, flags) unmount(target, flags) -+#define MNT_DETACH 0 -+#endif - - #include - diff --git a/filesystems/mergerfs/files/patch-tools_preload.c b/filesystems/mergerfs/files/patch-tools_preload.c index a9a3ad06b3c3..28580071c50d 100644 --- a/filesystems/mergerfs/files/patch-tools_preload.c +++ b/filesystems/mergerfs/files/patch-tools_preload.c @@ -1,29 +1,14 @@ ---- tools/preload.c.orig 2024-02-29 20:41:22 UTC +--- tools/preload.c.orig 2025-11-18 14:35:27 UTC +++ tools/preload.c -@@ -25,10 +25,25 @@ - #include +@@ -33,7 +33,11 @@ #include - #include --#include -+#include -+#ifdef __linux__ -+#define S_IFMT S_IFMT -+#define S_IFREG S_IFREG -+#else -+#define S_IFMT 0 -+#define S_IFREG 0 -+#endif + #include #include - #include - #include -+ -+#ifdef __linux__ -+#define O_TMPFILE O_TMPFILE -+#define O_PATH O_PATH ++#ifdef __FreeBSD__ ++#include +#else -+#define O_TMPFILE 0 -+#define O_PATH 0 + #include +#endif + #include typedef char IOCTL_BUF[4096]; - #define IOCTL_APP_TYPE 0xDF