diff --git a/filesystems/mergerfs/Makefile b/filesystems/mergerfs/Makefile index 95afcfdda00d..14705422cba4 100644 --- a/filesystems/mergerfs/Makefile +++ b/filesystems/mergerfs/Makefile @@ -1,27 +1,28 @@ PORTNAME= mergerfs DISTVERSION= 2.41.1 +PORTREVISION= 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/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/files/patch-libfuse_lib_fuse.cpp b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp new file mode 100644 index 000000000000..18fd8b482400 --- /dev/null +++ b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp @@ -0,0 +1,17 @@ +--- 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(arg->atime), arg->atimensec }; ++ tv[0] = (struct timespec){ static_cast(arg->atime), static_cast(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(arg->mtime), arg->mtimensec }; ++ tv[1] = (struct timespec){ static_cast(arg->mtime), static_cast(arg->mtimensec) }; + + err = ((fusepath != NULL) ? + f.ops.utimens(&req_->ctx,&fusepath[1],tv) :