[PR PATCH] zfs: update to 2.2.3.

[PR PATCH] zfs: update to 2.2.3.

[zdykstra]

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

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

https://github.com/zdykstra/void-packages zfs-2.2.3
https://github.com/void-linux/void-packages/pull/48886

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

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

- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (cross)
  - x86_64-musl (cross)

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

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

From 7737eef2ac7a76abae69596d776267a372aa550a Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Thu, 22 Feb 2024 16:38:32 -0600
Subject: [PATCH] zfs: update to 2.2.3.

---
 .../zfs/patches/0002-fix-seektest-musl.patch  | 30 +++++++++++++++++++
 srcpkgs/zfs/template                          |  4 +--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/zfs/patches/0002-fix-seektest-musl.patch

diff --git a/srcpkgs/zfs/patches/0002-fix-seektest-musl.patch b/srcpkgs/zfs/patches/0002-fix-seektest-musl.patch
new file mode 100644
index 0000000000000..805a7a570c9ae
--- /dev/null
+++ b/srcpkgs/zfs/patches/0002-fix-seektest-musl.patch
@@ -0,0 +1,30 @@
+From 4c2cd2ce45caf8374733fb97643f2f0060cacec2 Mon Sep 17 00:00:00 2001
+From: Zach Dykstra <dykstra.zachary@gmail.com>
+Date: Thu, 22 Feb 2024 16:31:02 -0600
+Subject: [PATCH] zfs-tests: fix seekflood.c on MUSL
+
+---
+ tests/zfs-tests/tests/functional/cp_files/seekflood.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/tests/zfs-tests/tests/functional/cp_files/seekflood.c b/tests/zfs-tests/tests/functional/cp_files/seekflood.c
+index 02c2c8e6e..d3116d9fd 100644
+--- a/tests/zfs-tests/tests/functional/cp_files/seekflood.c
++++ b/tests/zfs-tests/tests/functional/cp_files/seekflood.c
+@@ -27,6 +27,15 @@
+ #define        _GNU_SOURCE
+ #endif
+ 
++#ifndef SEEK_DATA
++#define SEEK_DATA 3
++#endif
++
++#ifndef SEEK_HOLE
++#define SEEK_HOLE 4
++#endif
++
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdio.h>
+-- 
+2.43.2
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 62671dd2396f6..9c3186717bdc7 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.2.2
+version=2.2.3
 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=76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9
+checksum=30a512f34ec5c841b8b2b32cc9c1a03fd49391b26c9164d3fb30573fb5d81ac3
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

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

[zdykstra]

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

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

https://github.com/zdykstra/void-packages zfs-2.2.3
https://github.com/void-linux/void-packages/pull/48886

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

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

- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (cross)
  - x86_64-musl (cross)

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

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

From 5dd2e9e6613a686bc96043adbb488f5c62ca58fc Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Thu, 22 Feb 2024 16:38:32 -0600
Subject: [PATCH] zfs: update to 2.2.3.

---
 .../zfs/patches/0002-fix-seektest-musl.patch  | 30 +++++++++++++++++++
 srcpkgs/zfs/template                          |  4 +--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/zfs/patches/0002-fix-seektest-musl.patch

diff --git a/srcpkgs/zfs/patches/0002-fix-seektest-musl.patch b/srcpkgs/zfs/patches/0002-fix-seektest-musl.patch
new file mode 100644
index 00000000000000..f233eec790119f
--- /dev/null
+++ b/srcpkgs/zfs/patches/0002-fix-seektest-musl.patch
@@ -0,0 +1,30 @@
+From 4c2cd2ce45caf8374733fb97643f2f0060cacec2 Mon Sep 17 00:00:00 2001
+From: Zach Dykstra <dykstra.zachary@gmail.com>
+Date: Thu, 22 Feb 2024 16:31:02 -0600
+Subject: [PATCH] zfs-tests: fix seekflood.c on MUSL
+
+---
+ tests/zfs-tests/tests/functional/cp_files/seekflood.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/tests/zfs-tests/tests/functional/cp_files/seekflood.c b/tests/zfs-tests/tests/functional/cp_files/seekflood.c
+index 02c2c8e6e..d3116d9fd 100644
+--- a/tests/zfs-tests/tests/functional/cp_files/seekflood.c
++++ b/tests/zfs-tests/tests/functional/cp_files/seekflood.c
+@@ -27,6 +27,14 @@
+ #define        _GNU_SOURCE
+ #endif
+ 
++#ifndef SEEK_DATA
++#define SEEK_DATA 3
++#endif
++
++#ifndef SEEK_HOLE
++#define SEEK_HOLE 4
++#endif
++
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdio.h>
+-- 
+2.43.2
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 62671dd2396f60..9c3186717bdc77 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.2.2
+version=2.2.3
 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=76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9
+checksum=30a512f34ec5c841b8b2b32cc9c1a03fd49391b26c9164d3fb30573fb5d81ac3
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

Re: zfs: update to 2.2.3.

[zdykstra]

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

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/48886#issuecomment-1960491720

Comment:
@Vaelatern I directly patched the test, since we're (currently) just discarding them.

Re: [PR PATCH] [Merged]: zfs: update to 2.2.3.

[Vaelatern]

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

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

zfs: update to 2.2.3.
https://github.com/void-linux/void-packages/pull/48886

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

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

- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (cross)
  - x86_64-musl (cross)

Re: zfs: update to 2.2.3.

[Vaelatern]

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

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/48886#issuecomment-1961856700

Comment:
Thanks!