Date: Sun, 10 May 2026 06:50:50 +0000 From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7c4842f10b74 - main - filesystems/mergerfs: Update to 2.42.0 Message-ID: <6a002aca.1a642.657e6c44@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c4842f10b743dc2ab31995879e2a34c39636818 commit 7c4842f10b743dc2ab31995879e2a34c39636818 Author: Emanuel Haupt <ehaupt@FreeBSD.org> AuthorDate: 2026-05-10 06:50:30 +0000 Commit: Emanuel Haupt <ehaupt@FreeBSD.org> CommitDate: 2026-05-10 06:50:42 +0000 filesystems/mergerfs: Update to 2.42.0 --- filesystems/mergerfs/Makefile | 3 +-- filesystems/mergerfs/distinfo | 6 +++--- .../mergerfs/files/patch-libfuse_include_fmt_format.h | 10 ---------- filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp | 17 ----------------- filesystems/mergerfs/files/patch-tools_preload.c | 14 -------------- 5 files changed, 4 insertions(+), 46 deletions(-) diff --git a/filesystems/mergerfs/Makefile b/filesystems/mergerfs/Makefile index e50f1ad98c84..c1e22ccd41d0 100644 --- a/filesystems/mergerfs/Makefile +++ b/filesystems/mergerfs/Makefile @@ -1,6 +1,5 @@ PORTNAME= mergerfs -DISTVERSION= 2.41.1 -PORTREVISION= 2 +DISTVERSION= 2.42.0 CATEGORIES= filesystems PKGNAMEPREFIX= fusefs- diff --git a/filesystems/mergerfs/distinfo b/filesystems/mergerfs/distinfo index f0e16a0b6d37..53936f75cc2d 100644 --- a/filesystems/mergerfs/distinfo +++ b/filesystems/mergerfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1764093165 -SHA256 (trapexit-mergerfs-2.41.1_GH0.tar.gz) = 033dd23bef6c87dd7be8776a2ece6f20120cd3ece1feb1fbad6ba54785854aba -SIZE (trapexit-mergerfs-2.41.1_GH0.tar.gz) = 1220643 +TIMESTAMP = 1778394053 +SHA256 (trapexit-mergerfs-2.42.0_GH0.tar.gz) = b805ddcb9dbee66f6bdfc3901ef3e1d978b4fd2973d5b2c9907c9aed937ef705 +SIZE (trapexit-mergerfs-2.42.0_GH0.tar.gz) = 1272499 diff --git a/filesystems/mergerfs/files/patch-libfuse_include_fmt_format.h b/filesystems/mergerfs/files/patch-libfuse_include_fmt_format.h deleted file mode 100644 index 8c0702b57e66..000000000000 --- a/filesystems/mergerfs/files/patch-libfuse_include_fmt_format.h +++ /dev/null @@ -1,10 +0,0 @@ ---- libfuse/include/fmt/format.h.orig 2025-11-18 14:35:27 UTC -+++ libfuse/include/fmt/format.h -@@ -42,6 +42,7 @@ - - #ifndef FMT_MODULE - # include <cmath> // std::signbit -+# include <cstdlib> // std::malloc, std::free - # include <cstddef> // std::byte - # include <cstdint> // uint32_t - # include <cstring> // std::memcpy diff --git a/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp deleted file mode 100644 index 18fd8b482400..000000000000 --- a/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- libfuse/lib/fuse.cpp.orig 2025-11-18 14:35:27 UTC -+++ libfuse/lib/fuse.cpp -@@ -1636,12 +1636,12 @@ fuse_lib_setattr(fuse_req_t *req_, - if(arg->valid & FATTR_ATIME_NOW) - tv[0].tv_nsec = UTIME_NOW; - else if(arg->valid & FATTR_ATIME) -- tv[0] = (struct timespec){ static_cast<time_t>(arg->atime), arg->atimensec }; -+ tv[0] = (struct timespec){ static_cast<time_t>(arg->atime), static_cast<long>(arg->atimensec) }; - - if(arg->valid & FATTR_MTIME_NOW) - tv[1].tv_nsec = UTIME_NOW; - else if(arg->valid & FATTR_MTIME) -- tv[1] = (struct timespec){ static_cast<time_t>(arg->mtime), arg->mtimensec }; -+ tv[1] = (struct timespec){ static_cast<time_t>(arg->mtime), static_cast<long>(arg->mtimensec) }; - - err = ((fusepath != NULL) ? - f.ops.utimens(&req_->ctx,&fusepath[1],tv) : diff --git a/filesystems/mergerfs/files/patch-tools_preload.c b/filesystems/mergerfs/files/patch-tools_preload.c deleted file mode 100644 index 28580071c50d..000000000000 --- a/filesystems/mergerfs/files/patch-tools_preload.c +++ /dev/null @@ -1,14 +0,0 @@ ---- tools/preload.c.orig 2025-11-18 14:35:27 UTC -+++ tools/preload.c -@@ -33,7 +33,11 @@ - #include <sys/ioctl.h> - #include <sys/stat.h> - #include <sys/types.h> -+#ifdef __FreeBSD__ -+#include <sys/extattr.h> -+#else - #include <sys/xattr.h> -+#endif - #include <unistd.h> - - typedef char IOCTL_BUF[4096];home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a002aca.1a642.657e6c44>