From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] zfs: update to 2.3.2.
Date: Mon, 05 May 2025 16:13:08 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-55249@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
There is a new pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages zfs-2.3.2
https://github.com/void-linux/void-packages/pull/55249
zfs: update to 2.3.2.
Taking up the baton from #55227
A patch file from https://github.com/void-linux/void-packages/pull/55249.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zfs-2.3.2-55249.patch --]
[-- Type: text/x-diff, Size: 2764 bytes --]
From 21223cf1a51fd065abd44156ea3325c4490a8002 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 5 May 2025 10:11:16 -0400
Subject: [PATCH] zfs: update to 2.3.2.
---
srcpkgs/zfs/patches/0003-fix-tests-musl.patch | 35 +++++++++++++++++++
srcpkgs/zfs/template | 4 +--
2 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/zfs/patches/0003-fix-tests-musl.patch
diff --git a/srcpkgs/zfs/patches/0003-fix-tests-musl.patch b/srcpkgs/zfs/patches/0003-fix-tests-musl.patch
new file mode 100644
index 00000000000000..51374a9e3b7164
--- /dev/null
+++ b/srcpkgs/zfs/patches/0003-fix-tests-musl.patch
@@ -0,0 +1,35 @@
+From 8e9fcdac6f7bbc4ec92e89b8cdce1dcc404f1999 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?=
+ <salvador.joseluis@gmail.com>
+Date: Fri, 2 May 2025 08:10:08 +0200
+Subject: [PATCH] tests: fix `S_IFMT` undeclared at `statx.c`
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+`S_IFMT` is declared in `sys/stat.h`, but we cannot include this header
+because it redeclares the `statx` function with different argument
+types. Therefore, we define `S_IFMT` ourselves, in the same way as the
+other definitions.
+
+Closes: #17293
+
+Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
+---
+ tests/zfs-tests/cmd/statx.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/zfs-tests/cmd/statx.c b/tests/zfs-tests/cmd/statx.c
+index 89939f6efb40..1acc7e58c5ce 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}"
next reply other threads:[~2025-05-05 14:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-05 14:13 ahesford [this message]
2025-05-15 9:59 ` zfs: update to 2.3.2 heppu
2025-05-17 18:02 ` [PR PATCH] [Closed]: " ahesford
2025-05-17 18:03 ` ahesford
-- strict thread matches above, loose matches on Subject: below --
2025-05-01 20:55 [PR PATCH] " zdykstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-55249@inbox.vuxu.org \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).