diff --git a/srcpkgs/zfs/patches/0003-fix-tests-musl.patch b/srcpkgs/zfs/patches/0003-fix-tests-musl.patch deleted file mode 100644 index 51374a9e3b7..00000000000 --- a/srcpkgs/zfs/patches/0003-fix-tests-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8e9fcdac6f7bbc4ec92e89b8cdce1dcc404f1999 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= - -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 ---- - 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 187976ed7f3..eccfcbde03a 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -1,6 +1,6 @@ # Template file for 'zfs' pkgname=zfs -version=2.3.2 +version=2.3.3 revision=1 build_style=gnu-configure configure_args="--with-config=user --with-mounthelperdir=/usr/bin @@ -16,7 +16,7 @@ maintainer="Toyam Cox " 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=80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a +checksum=844122118f0ea81205a01753bbcb1315330f8967c1f866dcd10155273131f071 # dkms must be before initramfs-regenerate to build modules before images triggers="dkms initramfs-regenerate" dkms_modules="zfs ${version}"