summaryrefslogtreecommitdiff
path: root/filesystems
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2025-05-05 00:32:43 +0200
committerMartin Matuska <mm@FreeBSD.org>2025-05-05 00:34:04 +0200
commitfa82763ceed2ab29fccae144b153c88f3ec91ee6 (patch)
treeb8fb6095e88d192d75d88df826662a48d1b2d6af /filesystems
parentgames/simutrans: update 124.3 → 124.3.1 (diff)
filesystems/openzfs-kmod: update to 2.3.2
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.2
Diffstat (limited to 'filesystems')
-rw-r--r--filesystems/openzfs-kmod/Makefile3
-rw-r--r--filesystems/openzfs-kmod/distinfo6
-rw-r--r--filesystems/openzfs-kmod/files/patch-Makefile.bsd69
3 files changed, 4 insertions, 74 deletions
diff --git a/filesystems/openzfs-kmod/Makefile b/filesystems/openzfs-kmod/Makefile
index bda6240d01bd..ab7dc7c854b0 100644
--- a/filesystems/openzfs-kmod/Makefile
+++ b/filesystems/openzfs-kmod/Makefile
@@ -1,6 +1,5 @@
PORTNAME= openzfs
-PORTVERSION= 2.3.1
-PORTREVISION= 1
+PORTVERSION= 2.3.2
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 2a6804bb1826..85cc41a1f8f4 100644
--- a/filesystems/openzfs-kmod/distinfo
+++ b/filesystems/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743064954
-SHA256 (zfs-2.3.1.tar.gz) = 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
-SIZE (zfs-2.3.1.tar.gz) = 34048716
+TIMESTAMP = 1746395184
+SHA256 (zfs-2.3.2.tar.gz) = 80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a
+SIZE (zfs-2.3.2.tar.gz) = 34344259
diff --git a/filesystems/openzfs-kmod/files/patch-Makefile.bsd b/filesystems/openzfs-kmod/files/patch-Makefile.bsd
deleted file mode 100644
index 4b4d727ff7e4..000000000000
--- a/filesystems/openzfs-kmod/files/patch-Makefile.bsd
+++ /dev/null
@@ -1,69 +0,0 @@
---- Makefile.bsd.orig 2025-03-10 22:54:55 UTC
-+++ Makefile.bsd
-@@ -90,19 +90,25 @@ SRCS+= blake3.c \
- blake3_generic.c \
- blake3_impl.c
-
-+.if ${MACHINE_ARCH} == "aarch64"
- #icp/asm-aarch64/blake3
- SRCS+= b3_aarch64_sse2.S \
- b3_aarch64_sse41.S
-+.endif
-
-+.if ${MACHINE_ARCH} == "powerpc64le"
- #icp/asm-ppc64/blake3
- SRCS+= b3_ppc64le_sse2.S \
- b3_ppc64le_sse41.S
-+.endif
-
-+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
- #icp/asm-x86_64/blake3
- SRCS+= blake3_avx2.S \
- blake3_avx512.S \
- blake3_sse2.S \
- blake3_sse41.S
-+.endif
-
- #icp/algs/edonr
- SRCS+= edonr.c
-@@ -112,23 +118,31 @@ SRCS+= sha256_impl.c \
- sha2_generic.c \
- sha512_impl.c
-
-+.if ${MACHINE_ARCH} == "armv7"
- #icp/asm-arm/sha2
- SRCS+= sha256-armv7.S \
- sha512-armv7.S
-+.endif
-
-+.if ${MACHINE_ARCH} == "aarch64"
- #icp/asm-aarch64/sha2
- SRCS+= sha256-armv8.S \
- sha512-armv8.S
-+.endif
-
-+.if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le"
- #icp/asm-ppc64/sha2
- SRCS+= sha256-p8.S \
- sha256-ppc.S \
- sha512-p8.S \
- sha512-ppc.S
-+.endif
-
-+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
- #icp/asm-x86_64/sha2
- SRCS+= sha256-x86_64.S \
- sha512-x86_64.S
-+.endif
-
- #lua
- SRCS+= lapi.c \
-@@ -506,7 +520,7 @@ CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_
- CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
- CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-
--.if ${MACHINE_CPUARCH} == "aarch64"
-+.if ${MACHINE_ARCH} == "aarch64"
- __ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h
- CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
- CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}