From 8ee86dabefb74e267bc7a1ffec764b97eccdbe93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Fri, 19 Dec 2025 00:45:27 +0100 Subject: [PATCH] package/zfs: bump version to 2.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed backported patch: - 0001-use-sys_stath-instead-of-linux_stath.patch Merged upstream in: https://github.com/openzfs/zfs/commit/ccf5a8a6fcfdfbdaa2f0fdca5d787958224bf06d For release note, see: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0 Signed-off-by: José Luis Salvador Rufo Signed-off-by: Julien Olivain --- ...use-sys_stath-instead-of-linux_stath.patch | 82 ------------------- package/zfs/zfs.hash | 4 +- package/zfs/zfs.mk | 2 +- support/testing/tests/package/test_zfs.py | 2 +- 4 files changed, 4 insertions(+), 86 deletions(-) delete mode 100644 package/zfs/0001-use-sys_stath-instead-of-linux_stath.patch diff --git a/package/zfs/0001-use-sys_stath-instead-of-linux_stath.patch b/package/zfs/0001-use-sys_stath-instead-of-linux_stath.patch deleted file mode 100644 index 5e5d21ec52..0000000000 --- a/package/zfs/0001-use-sys_stath-instead-of-linux_stath.patch +++ /dev/null @@ -1,82 +0,0 @@ -From ccf5a8a6fcfdfbdaa2f0fdca5d787958224bf06d Mon Sep 17 00:00:00 2001 -From: classabbyamp <5366828+classabbyamp@users.noreply.github.com> -Date: Wed, 27 Aug 2025 17:42:32 -0400 -Subject: [PATCH] linux: use sys/stat.h instead of linux/stat.h - -glibc includes linux/stat.h for statx, but musl defines its own statx -struct and associated constants, which does not include STATX_MNT_ID -yet. Thus, including linux/stat.h directly should be avoided for -maximum libc compatibility. - -Tested on: - - glibc: x86_64, i686, aarch64, armv7l, armv6l - - musl: x86_64, aarch64, armv7l, armv6l - -Reviewed-by: Brian Behlendorf -Tested-By: Achill Gilgenast -Signed-off-by: classabbyamp -Closes #17675 - -Upstream: https://github.com/openzfs/zfs/commit/ccf5a8a6fcfdfbdaa2f0fdca5d787958224bf06d -Signed-off-by: José Luis Salvador Rufo ---- - config/user-statx.m4 | 6 +++--- - include/os/linux/spl/sys/stat.h | 2 +- - lib/libspl/include/os/linux/sys/stat.h | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/config/user-statx.m4 b/config/user-statx.m4 -index 0315f93e0c20..1ba74a40e9b8 100644 ---- a/config/user-statx.m4 -+++ b/config/user-statx.m4 -@@ -2,7 +2,7 @@ dnl # - dnl # Check for statx() function and STATX_MNT_ID availability - dnl # - AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [ -- AC_CHECK_HEADERS([linux/stat.h], -+ AC_CHECK_HEADERS([sys/stat.h], - [have_stat_headers=yes], - [have_stat_headers=no]) - -@@ -14,7 +14,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [ - AC_MSG_CHECKING([for STATX_MNT_ID]) - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -- #include -+ #include - ]], [[ - struct statx stx; - int mask = STATX_MNT_ID; -@@ -29,6 +29,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [ - ]) - ]) - ], [ -- AC_MSG_WARN([linux/stat.h not found; skipping statx support]) -+ AC_MSG_WARN([sys/stat.h not found; skipping statx support]) - ]) - ]) dnl end AC_DEFUN -diff --git a/include/os/linux/spl/sys/stat.h b/include/os/linux/spl/sys/stat.h -index 087389b57b34..ad2815e46394 100644 ---- a/include/os/linux/spl/sys/stat.h -+++ b/include/os/linux/spl/sys/stat.h -@@ -25,6 +25,6 @@ - #ifndef _SPL_STAT_H - #define _SPL_STAT_H - --#include -+#include - - #endif /* SPL_STAT_H */ -diff --git a/lib/libspl/include/os/linux/sys/stat.h b/lib/libspl/include/os/linux/sys/stat.h -index a605af962a6d..13cc0b46ac93 100644 ---- a/lib/libspl/include/os/linux/sys/stat.h -+++ b/lib/libspl/include/os/linux/sys/stat.h -@@ -33,7 +33,7 @@ - - #ifdef HAVE_STATX - #include --#include -+#include - #endif - - /* diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 6ebcfb7a3d..87f4e462f1 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.3.5/zfs-2.3.5.sha256.asc -sha256 326ae0cba8a615afa42c6891640e76acc4bd230f6d6ddec120c11e30b1392067 zfs-2.3.5.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.4.0/zfs-2.4.0.sha256.asc +sha256 7bdf13de0a71d95554c0e3e47d5e8f50786c30d4f4b63b7c593b1d11af75c9ee zfs-2.4.0.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 712f2afb54..30207f7cf7 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.3.5 +ZFS_VERSION = 2.4.0 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL diff --git a/support/testing/tests/package/test_zfs.py b/support/testing/tests/package/test_zfs.py index 698d8d8bbd..384fad7e33 100644 --- a/support/testing/tests/package/test_zfs.py +++ b/support/testing/tests/package/test_zfs.py @@ -57,7 +57,7 @@ class TestZfsBase(infra.basetest.BRTest): "sha256sum -c /tmp/urandom.sha256", "zpool status -v", # Check PyZFS - "arc_summary", + "zarcsummary", ] for cmd in cmds: self.assertRunOk(cmd, timeout=self.timeout)