zfs: update to 2.3.2.

This commit is contained in:
Andrew J. Hesford 2025-05-05 10:11:16 -04:00
parent e5fc089caa
commit 418d39359e
2 changed files with 38 additions and 3 deletions

View file

@ -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;

View file

@ -1,7 +1,7 @@
# Template file for 'zfs'
pkgname=zfs
version=2.3.1
revision=2
version=2.3.2
revision=1
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
--with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
@ -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}"