From nobody Wed Feb 4 00:16:00 2026 X-Original-To: dev-commits-ports-main@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 4f5LVS3W1Qz6Qxsn for ; Wed, 04 Feb 2026 00:16:00 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5LVS2gXbz3GWy for ; Wed, 04 Feb 2026 00:16:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770164160; 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=1tsvgNDldq+y584QHhfVYCgWE40tYuRrpwnvkPpyDMQ=; b=Wbn2ZD7uslmmuPj6mjh+hCiDYpMA7dyubZ4cZ7LLGfpbe2LEr43BYd5503AfCglGFcj7P4 y+qeCr3jhH+rRqse4dNVt4xeEU9gvcvlRkcKQDSafxbFVqT6QdEOyvYmmxDMTIBh97MZz3 wVoGbDB9pGYPN46cNPrd9J9Q8aGyrkW10RgdtsCo6TPHmJ8/Iraqhgx1tzUukXZmz7codi PhDX53Z8z2GJHEgoZ/BZdsMNrWTptCDUQRI9o5h8U2zfkI9L+CBuWPcKEBwZFnjiBVeiyh Zs5DRWtjHkq3KAdk4SSuKX3UzTraQsvlXeS/8QbiLvBHdTDc+jwGeMYsB3U8/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770164160; a=rsa-sha256; cv=none; b=d+X1wobYoJ2IXstMIK5bzm6jDCU7AebrB+/AUbvOP0pM5/OihaFMrPL33aKxqtJw1zrH+o ucwAMdCDKaZ5OycOtWp12AarXTkioapikflVFwqeiukb614Lrii72bMj6dIviQfF9wqFp7 FQtMhfu2k0SFfJ9hBS1xmQhn8Cb2WMYDL/CTvEVB4CQH4ZBqIayJPKz2ssmYFsiVvnvope vmge7i1A4lOZD3tdSDLirZ+PBoHC3VZp1ABvE73rtiwNggKmx++dWy0cyXZNZpA0EhKIYf ZitW4YJF5iElMnfgpf+K17lhOizIelqyXZn1LSixtgc4alBy1JvFmxwsf3a6VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770164160; 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=1tsvgNDldq+y584QHhfVYCgWE40tYuRrpwnvkPpyDMQ=; b=s5zO+0y+Su5uadXVhgf3HOtGNEqLAvOsUWNLk1KRUD9A+sMdvd/AA02LQKE91nI4Fxr5FW Ss489EP9pnoyvHCQTkhxnNAT7R1BxHZRG9ZkDNyRkETNe6hpYu0hMAoOL062hoMBGFQoM8 9oSihD+fKRq51kCeazicXjvwjQw21d1mDdTuf9KEPGw6OQUegkmHFw6NGO/8v43zRkpDA3 Xywf+YwQVk6thN7KV1e6NmlQr656H/9biiMqK4dvWT06w4R6O3TEwm/AUjVVfZbLfIspgH RD6uT2KKCHSnKLdAFwH+OBSkJXnhjIyIfIs1we8DSJVe/R7urm1nFshjyb9ncg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5LVS2DbMzccg for ; Wed, 04 Feb 2026 00:16:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23087 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 00:16:00 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Martin Matuska Subject: git: efcd8ec1aa5f - main - filesystems/openzfs: unbreak compilation on head List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efcd8ec1aa5fadcdff1c395484b21b847ede0b19 Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 00:16:00 +0000 Message-Id: <69828fc0.23087.4d3c5744@gitrepo.freebsd.org> The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/ports/commit/?id=efcd8ec1aa5fadcdff1c395484b21b847ede0b19 commit efcd8ec1aa5fadcdff1c395484b21b847ede0b19 Author: Martin Matuska AuthorDate: 2026-02-04 00:14:25 +0000 Commit: Martin Matuska CommitDate: 2026-02-04 00:15:54 +0000 filesystems/openzfs: unbreak compilation on head Unbreak build on FreeBSD 16 by adding nvpair.c patch from upstream Source: https://github.com/openzfs/zfs/pull/18154 --- filesystems/openzfs/Makefile | 1 + .../openzfs/files/patch-cmd_zfs_zfs__main.c | 6 ++--- .../openzfs/files/patch-module_nvpair_nvpair.c | 30 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/filesystems/openzfs/Makefile b/filesystems/openzfs/Makefile index 0e37ec1de063..f0ff998915bd 100644 --- a/filesystems/openzfs/Makefile +++ b/filesystems/openzfs/Makefile @@ -1,5 +1,6 @@ PORTNAME= openzfs PORTVERSION= 2.4.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= filesystems sysutils MASTER_SITES= https://github.com/openzfs/zfs/releases/download/zfs-${PORTVERSION}/ diff --git a/filesystems/openzfs/files/patch-cmd_zfs_zfs__main.c b/filesystems/openzfs/files/patch-cmd_zfs_zfs__main.c index c0028d254a4d..3a0537b2c44a 100644 --- a/filesystems/openzfs/files/patch-cmd_zfs_zfs__main.c +++ b/filesystems/openzfs/files/patch-cmd_zfs_zfs__main.c @@ -1,6 +1,6 @@ ---- cmd/zfs/zfs_main.c.orig 2025-12-18 18:41:34.311311571 +0100 -+++ cmd/zfs/zfs_main.c 2025-12-29 11:32:45.050147000 +0100 -@@ -6884,17 +6884,28 @@ +--- cmd/zfs/zfs_main.c.orig 2025-12-18 17:41:34 UTC ++++ cmd/zfs/zfs_main.c +@@ -6884,17 +6884,28 @@ print_holds(boolean_t scripted, int nwidth, int tagwid if (scripted) { if (parsable) { diff --git a/filesystems/openzfs/files/patch-module_nvpair_nvpair.c b/filesystems/openzfs/files/patch-module_nvpair_nvpair.c new file mode 100644 index 000000000000..aa86845fe14a --- /dev/null +++ b/filesystems/openzfs/files/patch-module_nvpair_nvpair.c @@ -0,0 +1,30 @@ +--- module/nvpair/nvpair.c.orig 2025-12-18 18:01:01 UTC ++++ module/nvpair/nvpair.c +@@ -3246,7 +3246,8 @@ nvs_xdr_nvl_fini(nvstream_t *nvs) + * xdrproc_t-compatible callbacks for xdr_array() + */ + +-#if defined(_KERNEL) && defined(__linux__) /* Linux kernel */ ++#if (defined(__FreeBSD_version) && __FreeBSD_version >= 1600010) || \ ++ defined(_KERNEL) && defined(__linux__) /* Linux kernel */ + + #define NVS_BUILD_XDRPROC_T(type) \ + static bool_t \ +@@ -3255,7 +3256,7 @@ nvs_xdr_nvp_##type(XDR *xdrs, void *ptr) \ + return (xdr_##type(xdrs, ptr)); \ + } + +-#elif !defined(_KERNEL) && defined(XDR_CONTROL) /* tirpc */ ++#elif !defined(_KERNEL) && defined(XDR_CONTROL) /* tirpc, FreeBSD < 16 */ + + #define NVS_BUILD_XDRPROC_T(type) \ + static bool_t \ +@@ -3271,7 +3272,7 @@ nvs_xdr_nvp_##type(XDR *xdrs, ...) \ + return (xdr_##type(xdrs, ptr)); \ + } + +-#else /* FreeBSD, sunrpc */ ++#else /* FreeBSD kernel < 16, sunrpc */ + + #define NVS_BUILD_XDRPROC_T(type) \ + static bool_t \