From nobody Sat Nov 29 10:17:52 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dJR1y19cTz6HVpZ for ; Sat, 29 Nov 2025 10:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dJR1y0Zp1z42xc for ; Sat, 29 Nov 2025 10:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764411478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i28mzP2FY0BqD6+sJ0motkyoCNzEEjxrI0bMpmwh05k=; b=DxCHLZOSnqfMzJfiwLSDYrF2bbbNBHvu1si8mlNoc69LIulLaTX6sTGxNtssqwcYfkNQcj L7Q+R0MF6aewOZP9aeFHTHrjcNMSNY3Jbjr6k1+xSomyZLlz3824OXhjRrKyV8ilUJt8KQ UuB9dTs1pPTsDbuxSF3WUsARYNGx5jjwKq1AjIH3T/IlJnc+9JW6YArgbEiKnVZdByGSAz ZSo6a7vpK1y7awkb4uyo2C4WcTaBmriTRHVkmxoOu5uClRmd5YP1SSj5vRe1pc00g6F9jx 3+fOHXbeqJYcTK2X4TSA0wGj1y70TZgiA2oJyX079DO0WIXR5006CrWkFcPQsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764411478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i28mzP2FY0BqD6+sJ0motkyoCNzEEjxrI0bMpmwh05k=; b=YtnejVk7FuBAE4EMGR3i4wttI1feXK2NadhqkQDgg9Q/z+rlQOhuhgYSskNMOf7GikTFFJ XXcljPe3HbE5iDW7U9XYsqULXA5Mc1ayn5veziME37fagTlzw8o0nrk26bmeRQkT9aylqm LHdSul38EbWlNiQNLaPwCR3NAhwWkDBVHQGl4IUVtZsGj/9WcXrQcf7f3Tg2EgjUzAo9ZL 3NTlA8aA3EOMbeU0g+CZzXkuhMQvF7dRdcnlAADRaGjMUWp46yNP4hfWL51TE2eXAmLzaN K4vdPFerkSZ6K2UPAdDZKx1s3Sb4G3PXTW3Xn+XgVojwsZwgj5UQZD5zm2aVDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764411478; a=rsa-sha256; cv=none; b=Q8Mg49gDEbaBBdMMDDGym7hEjHZ6rXOMC5gJ6EWO2VmvDd9PLmjmhQYbPMFFxEcrNVlUJv Xmtgg40dXowNBAmqk0w/CGwRfO30jaau49dEpKBIHvcReVd6xOAsq7CMBY1ho6UtGiTWUR mMeNHl495tvw9iVF+2C3m1d5+/N1YisYjxD2hwfVjm5sUSog5xvD2px0I+D6do6KPt59/n r8Qa+P6jpsSz5uVmBJkcKqbAYP6TkpZ4foSNd3EmAPH8lhNsLpBQ9JtL1o46nYsgqH7ZcQ 1CrzRCIOqoOvvbsiWvo8rocM0sw4ljLAxB7aZszGOsvEuZ12nlT1Ml7DpDzS5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dJR1x6kp4zkgM for ; Sat, 29 Nov 2025 10:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39f24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 29 Nov 2025 10:17:52 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 1f0b5bb8af6d - main - filesystems/mergerfs: fix build on i386 due to C++17 narrowing List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f0b5bb8af6d2a1b2df2bb26048ef0253a99bfe5 Auto-Submitted: auto-generated Date: Sat, 29 Nov 2025 10:17:52 +0000 Message-Id: <692ac850.39f24.6a28e798@gitrepo.freebsd.org> The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f0b5bb8af6d2a1b2df2bb26048ef0253a99bfe5 commit 1f0b5bb8af6d2a1b2df2bb26048ef0253a99bfe5 Author: Emanuel Haupt AuthorDate: 2025-11-29 10:17:34 +0000 Commit: Emanuel Haupt CommitDate: 2025-11-29 10:17:34 +0000 filesystems/mergerfs: fix build on i386 due to C++17 narrowing Reported by: pkg-fallout --- filesystems/mergerfs/Makefile | 1 + filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/filesystems/mergerfs/Makefile b/filesystems/mergerfs/Makefile index 95afcfdda00d..14705422cba4 100644 --- a/filesystems/mergerfs/Makefile +++ b/filesystems/mergerfs/Makefile @@ -1,5 +1,6 @@ PORTNAME= mergerfs DISTVERSION= 2.41.1 +PORTREVISION= 1 CATEGORIES= filesystems PKGNAMEPREFIX= fusefs- 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) :