FreeBSD/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2026-06-02 11:08:52 +00:00
Code Issues Projects Releases Wiki Activity

filesystems/mergerfs: Update to 2.42.0

Browse Source
This commit is contained in:
Emanuel Haupt
2026-05-10 08:50:30 +02:00
parent 6bee4dcee0
commit 7c4842f10b
5 changed files with 4 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filesystems/mergerfs/Makefile
+1 -2
View File
@@ -1,6 +1,5 @@
PORTNAME= mergerfs
DISTVERSION= 2.41.1
PORTREVISION= 2
DISTVERSION= 2.42.0
CATEGORIES= filesystems
PKGNAMEPREFIX= fusefs-
filesystems/mergerfs/distinfo
+3 -3
View File
@@ -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
filesystems/mergerfs/files/patch-libfuse_include_fmt_format.h
-10
View File
@@ -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
filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp
-17
View File
@@ -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) :
filesystems/mergerfs/files/patch-tools_preload.c
-14
View File
@@ -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];