[PR PATCH] zfs: update to 2.3.2.

[PR PATCH] zfs: update to 2.3.2.

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

There is a new pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages zfs-2.3.2
https://github.com/void-linux/void-packages/pull/55227

zfs: update to 2.3.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

A patch file from https://github.com/void-linux/void-packages/pull/55227.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zfs-2.3.2-55227.patch --]
[-- Type: text/x-diff, Size: 1159 bytes --]

From 05f9980677bd31c0c1beaeed2ed89325d6ccdd58 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Thu, 1 May 2025 15:54:39 -0500
Subject: [PATCH] zfs: update to 2.3.2.

---
 srcpkgs/zfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index ace0239da409e6..187976ed7f3595 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -16,7 +16,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
+checksum=80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

Re: zfs: update to 2.3.2.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 255 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#issuecomment-2846583940

Comment:
The error suggests a missing `sys/stat.h` include (glibc also defines `S_IFMT` in `fnctl.h`, which musl does not)

Re: zfs: update to 2.3.2.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 361 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#issuecomment-2846583940

Comment:
The error suggests a missing `sys/stat.h` include (glibc also defines `S_IFMT` in `fnctl.h`, which musl does not)
https://github.com/openzfs/zfs/blob/13ec35ce3b52c392de4ff22bb5b2856e782b453d/tests/zfs-tests/cmd/statx.c

Re: zfs: update to 2.3.2.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#issuecomment-2846583940

Comment:
The build failure suggests a missing `sys/stat.h` include (glibc also defines `S_IFMT` in `fnctl.h`, which musl does not)
https://github.com/openzfs/zfs/blob/13ec35ce3b52c392de4ff22bb5b2856e782b453d/tests/zfs-tests/cmd/statx.c

Re: zfs: update to 2.3.2.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#issuecomment-2846590467

Comment:
Seems there is a PR for this upstream: https://github.com/openzfs/zfs/pull/17294

Re: zfs: update to 2.3.2.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#issuecomment-2846590467

Comment:
Regarding the build failure, seems there is a PR upstream: https://github.com/openzfs/zfs/pull/17294

Re: zfs: update to 2.3.2.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#issuecomment-2846583940

Comment:
The build failure suggests a missing `sys/stat.h` include (glibc also defines `S_IFMT` in `fnctl.h`, which musl does not)
https://github.com/openzfs/zfs/blob/13ec35ce3b52c392de4ff22bb5b2856e782b453d/tests/zfs-tests/cmd/statx.c

Re: zfs: update to 2.3.2.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#issuecomment-2846590467

Comment:
Regarding the build failure, seems there is an open PR upstream: https://github.com/openzfs/zfs/pull/17294

Re: zfs: update to 2.3.2.

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 147 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#issuecomment-2846864241

Comment:
Yup.

Re: zfs: update to 2.3.2.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#issuecomment-2847126775

Comment:
Boots my aarch64 system with Linux 6.14. I didn't test a dwm musl build.

Re: [PR PATCH] [Updated] zfs: update to 2.3.2.

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 467 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages zfs-2.3.2
https://github.com/void-linux/void-packages/pull/55227

zfs: update to 2.3.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

A patch file from https://github.com/void-linux/void-packages/pull/55227.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zfs-2.3.2-55227.patch --]
[-- Type: text/x-diff, Size: 2034 bytes --]

From 53418e15159cacdd5b07fe1ccda29946858f436b Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Thu, 1 May 2025 15:54:39 -0500
Subject: [PATCH] zfs: update to 2.3.2.

---
 .../zfs/patches/0003-patch-statx-for-musl.patch    | 14 ++++++++++++++
 srcpkgs/zfs/template                               |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/zfs/patches/0003-patch-statx-for-musl.patch

diff --git a/srcpkgs/zfs/patches/0003-patch-statx-for-musl.patch b/srcpkgs/zfs/patches/0003-patch-statx-for-musl.patch
new file mode 100644
index 00000000000000..b56d8fdd7bbdf8
--- /dev/null
+++ b/srcpkgs/zfs/patches/0003-patch-statx-for-musl.patch
@@ -0,0 +1,14 @@
+diff --git a/tests/zfs-tests/cmd/statx.c b/tests/zfs-tests/cmd/statx.c
+index 89939f6ef..1acc7e58c 100644
+--- a/tests/zfs-tests/cmd/statx.c
++++ b/tests/zfs-tests/cmd/statx.c
+@@ -109,6 +109,9 @@ _statx(int fd, const char *path, int flags, unsigned int mask, void *stx)
+ #ifndef STATX_DIOALIGN
+ #define	STATX_DIOALIGN	(1<<13)
+ #endif
++#ifndef S_IFMT
++#define	S_IFMT 0170000
++#endif
+ 
+ typedef struct {
+ 	int64_t		tv_sec;
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index ace0239da409e6..187976ed7f3595 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -16,7 +16,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
+checksum=80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

Re: [PR REVIEW] zfs: update to 2.3.2.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

New review comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#discussion_r2072282247

Comment:
Include the patch header as well: https://github.com/openzfs/zfs/commit/8e9fcdac6f7bbc4ec92e89b8cdce1dcc404f1999.patch

Re: [PR PATCH] [Closed]: zfs: update to 2.3.2.

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

There's a closed pull request on the void-packages repository

zfs: update to 2.3.2.
https://github.com/void-linux/void-packages/pull/55227

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Re: [PR REVIEW] zfs: update to 2.3.2.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

New review comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/55227#discussion_r2072282247

Comment:
Can you include the patch header as well: https://github.com/openzfs/zfs/commit/8e9fcdac6f7bbc4ec92e89b8cdce1dcc404f1999.patch