diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2026-03-02 15:03:10 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2026-03-02 15:04:53 +0000 |
| commit | 12655dd2f98124ab83a4583ef04b5dca3be4c27e (patch) | |
| tree | ccde5857b770690b70fac4a4a02c1b764d163854 | |
| parent | 6a37bf0c838fe02ea9da71a73d3876d0c13e4267 (diff) | |
filesystems/openzfs-kmod: update to 2.4.1
| -rw-r--r-- | filesystems/openzfs-kmod/Makefile | 3 | ||||
| -rw-r--r-- | filesystems/openzfs-kmod/distinfo | 6 | ||||
| -rw-r--r-- | filesystems/openzfs-kmod/files/patch-nvpair_nvpair.c | 30 |
3 files changed, 4 insertions, 35 deletions
diff --git a/filesystems/openzfs-kmod/Makefile b/filesystems/openzfs-kmod/Makefile index 9d4313e182b1..566007d0c77d 100644 --- a/filesystems/openzfs-kmod/Makefile +++ b/filesystems/openzfs-kmod/Makefile @@ -1,6 +1,5 @@ PORTNAME= openzfs -PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTVERSION= 2.4.1 PORTEPOCH= 1 CATEGORIES= filesystems sysutils MASTER_SITES= https://github.com/openzfs/zfs/releases/download/zfs-${PORTVERSION}/ diff --git a/filesystems/openzfs-kmod/distinfo b/filesystems/openzfs-kmod/distinfo index ba6d0e6259ea..85c3cbea939b 100644 --- a/filesystems/openzfs-kmod/distinfo +++ b/filesystems/openzfs-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1767003762 -SHA256 (zfs-2.4.0.tar.gz) = 7bdf13de0a71d95554c0e3e47d5e8f50786c30d4f4b63b7c593b1d11af75c9ee -SIZE (zfs-2.4.0.tar.gz) = 34476567 +TIMESTAMP = 1772463409 +SHA256 (zfs-2.4.1.tar.gz) = c17b69770f0023154f578eb8c7536a70f07d6a3bb0bd38f04fa0e8811c3c1390 +SIZE (zfs-2.4.1.tar.gz) = 34498270 diff --git a/filesystems/openzfs-kmod/files/patch-nvpair_nvpair.c b/filesystems/openzfs-kmod/files/patch-nvpair_nvpair.c deleted file mode 100644 index efef98f1a904..000000000000 --- a/filesystems/openzfs-kmod/files/patch-nvpair_nvpair.c +++ /dev/null @@ -1,30 +0,0 @@ ---- nvpair/nvpair.c.orig 2025-12-18 18:01:01 UTC -+++ nvpair/nvpair.c -@@ -3246,7 +3246,8 @@ nvs_xdr_nvl_fini(nvstream_t *nvs) - * xdrproc_t-compatible callbacks for xdr_array() - */ - --#if defined(_KERNEL) && defined(__linux__) /* Linux kernel */ -+#if (defined(__FreeBSD_version) && __FreeBSD_version >= 1600010) || \ -+ defined(_KERNEL) && defined(__linux__) /* Linux kernel */ - - #define NVS_BUILD_XDRPROC_T(type) \ - static bool_t \ -@@ -3255,7 +3256,7 @@ nvs_xdr_nvp_##type(XDR *xdrs, void *ptr) \ - return (xdr_##type(xdrs, ptr)); \ - } - --#elif !defined(_KERNEL) && defined(XDR_CONTROL) /* tirpc */ -+#elif !defined(_KERNEL) && defined(XDR_CONTROL) /* tirpc, FreeBSD < 16 */ - - #define NVS_BUILD_XDRPROC_T(type) \ - static bool_t \ -@@ -3271,7 +3272,7 @@ nvs_xdr_nvp_##type(XDR *xdrs, ...) \ - return (xdr_##type(xdrs, ptr)); \ - } - --#else /* FreeBSD, sunrpc */ -+#else /* FreeBSD kernel < 16, sunrpc */ - - #define NVS_BUILD_XDRPROC_T(type) \ - static bool_t \ |