git: dafad102ac96 - main - filesystems/openzfs: update to 2.3.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 04 May 2025 22:34:31 UTC
The branch main has been updated by mm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=dafad102ac96348182cfb2bd9155aac946b92397
commit dafad102ac96348182cfb2bd9155aac946b92397
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2025-05-04 22:33:26 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2025-05-04 22:34:04 +0000
filesystems/openzfs: update to 2.3.2
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.2
---
filesystems/openzfs/Makefile | 3 +-
filesystems/openzfs/distinfo | 6 ++--
.../openzfs/files/patch-cmd_zinject_zinject.c | 32 ------------------
.../files/patch-tests_zfs-tests_cmd_clonefile.c | 39 ----------------------
...s_tests_functional_vdev__disk_page__alignment.c | 29 ----------------
filesystems/openzfs/pkg-plist | 11 ++++++
6 files changed, 15 insertions(+), 105 deletions(-)
diff --git a/filesystems/openzfs/Makefile b/filesystems/openzfs/Makefile
index 455a9cdd076b..f2fbe1fa8194 100644
--- a/filesystems/openzfs/Makefile
+++ b/filesystems/openzfs/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/distinfo b/filesystems/openzfs/distinfo
index 98479a288312..b2d849cea4b8 100644
--- a/filesystems/openzfs/distinfo
+++ b/filesystems/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743065095
-SHA256 (zfs-2.3.1.tar.gz) = 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
-SIZE (zfs-2.3.1.tar.gz) = 34048716
+TIMESTAMP = 1746395334
+SHA256 (zfs-2.3.2.tar.gz) = 80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a
+SIZE (zfs-2.3.2.tar.gz) = 34344259
diff --git a/filesystems/openzfs/files/patch-cmd_zinject_zinject.c b/filesystems/openzfs/files/patch-cmd_zinject_zinject.c
deleted file mode 100644
index a817c794e5b7..000000000000
--- a/filesystems/openzfs/files/patch-cmd_zinject_zinject.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- cmd/zinject/zinject.c.orig 2025-03-29 23:43:40 UTC
-+++ cmd/zinject/zinject.c
-@@ -453,7 +453,8 @@ print_data_handler(int id, const char *pool, zinject_r
-
-
- (void) printf("%3d %-15s %-6llu %-6llu %-8s %-3d 0x%02x %-15s "
-- "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_objset,
-+ "%6" PRIu64 " %6" PRIu64 "\n", id, pool,
-+ (u_longlong_t)record->zi_objset,
- (u_longlong_t)record->zi_object, type_to_name(record->zi_type),
- record->zi_level, record->zi_dvas, rangebuf,
- record->zi_match_count, record->zi_inject_count);
-@@ -490,7 +491,8 @@ print_device_handler(int id, const char *pool, zinject
- (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;
-
- (void) printf("%3d %-15s %llx %-5s %-10s %8.4f%% "
-- "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
-+ "%6" PRIu64 " %6" PRIu64 "\n", id, pool,
-+ (u_longlong_t)record->zi_guid,
- iotype_to_str(record->zi_iotype), err_to_str(record->zi_error),
- freq, record->zi_match_count, record->zi_inject_count);
-
-@@ -525,7 +527,8 @@ print_delay_handler(int id, const char *pool, zinject_
- (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;
-
- (void) printf("%3d %-15s %llx %10llu %5llu %8.4f%% "
-- "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
-+ "%6" PRIu64 " %6" PRIu64 "\n", id, pool,
-+ (u_longlong_t)record->zi_guid,
- (u_longlong_t)NSEC2MSEC(record->zi_timer),
- (u_longlong_t)record->zi_nlanes,
- freq, record->zi_match_count, record->zi_inject_count);
diff --git a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_clonefile.c b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_clonefile.c
deleted file mode 100644
index 5448993d1e7f..000000000000
--- a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_clonefile.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- tests/zfs-tests/cmd/clonefile.c.orig 2025-03-10 22:42:59 UTC
-+++ tests/zfs-tests/cmd/clonefile.c
-@@ -205,6 +205,7 @@ main(int argc, char **argv)
-
- loff_t soff = 0, doff = 0;
- size_t len = SSIZE_MAX;
-+ unsigned long long len2;
- if ((argc-optind) == 5) {
- soff = strtoull(argv[optind+2], NULL, 10);
- if (soff == ULLONG_MAX) {
-@@ -220,8 +221,8 @@ main(int argc, char **argv)
- strcmp(argv[optind+4], "all") == 0) {
- len = SSIZE_MAX;
- } else {
-- len = strtoull(argv[optind+4], NULL, 10);
-- if (len == ULLONG_MAX) {
-+ len2 = strtoull(argv[optind+4], NULL, 10);
-+ if (len2 == ULLONG_MAX) {
- fprintf(stderr, "invalid length");
- return (1);
- }
-@@ -268,7 +269,7 @@ main(int argc, char **argv)
- off_t dpos = lseek(dfd, 0, SEEK_CUR);
- off_t dlen = lseek(dfd, 0, SEEK_END);
-
-- fprintf(stderr, "file offsets: src=%lu/%lu; dst=%lu/%lu\n",
-+ fprintf(stderr, "file offsets: src=%jd/%jd; dst=%jd/%jd\n",
- spos, slen, dpos, dlen);
- }
-
-@@ -331,7 +332,7 @@ do_copyfilerange(int sfd, int dfd, loff_t soff, loff_t
- }
- if (copied != len) {
- fprintf(stderr, "copy_file_range: copied less than requested: "
-- "requested=%lu; copied=%lu\n", len, copied);
-+ "requested=%zu; copied=%zd\n", len, copied);
- return (1);
- }
- return (0);
diff --git a/filesystems/openzfs/files/patch-tests_zfs-tests_tests_functional_vdev__disk_page__alignment.c b/filesystems/openzfs/files/patch-tests_zfs-tests_tests_functional_vdev__disk_page__alignment.c
deleted file mode 100644
index 3a78abbb89d2..000000000000
--- a/filesystems/openzfs/files/patch-tests_zfs-tests_tests_functional_vdev__disk_page__alignment.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c.orig 2025-03-30 00:02:54 UTC
-+++ tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c
-@@ -420,14 +420,14 @@ run_test(const page_test_t *test, bool verbose)
- size_t take = MIN(rem, len);
-
- if (verbose)
-- printf(" page %d [off %lx len %lx], "
-- "rem %lx, take %lx\n",
-+ printf(" page %d [off %zx len %zx], "
-+ "rem %zx, take %zx\n",
- i, off, len, rem, take);
-
- if (vdev_disk_check_alignment_cb(NULL, off, take, &s)) {
- if (verbose)
- printf(" ABORT: misalignment detected, "
-- "rem %lx\n", rem);
-+ "rem %zx\n", rem);
- return (false);
- }
-
-@@ -438,7 +438,7 @@ run_test(const page_test_t *test, bool verbose)
-
- if (rem > 0) {
- if (verbose)
-- printf(" ABORT: ran out of pages, rem %lx\n", rem);
-+ printf(" ABORT: ran out of pages, rem %zx\n", rem);
- return (false);
- }
-
diff --git a/filesystems/openzfs/pkg-plist b/filesystems/openzfs/pkg-plist
index c61f6ba63967..ca56ba618f7d 100644
--- a/filesystems/openzfs/pkg-plist
+++ b/filesystems/openzfs/pkg-plist
@@ -576,6 +576,7 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/bin/clone_mmap_write
%%TESTS%%share/zfs/zfs-tests/bin/clonefile
%%TESTS%%share/zfs/zfs-tests/bin/cp_files
+%%TESTS%%share/zfs/zfs-tests/bin/crypto_test
%%TESTS%%share/zfs/zfs-tests/bin/ctime
%%TESTS%%share/zfs/zfs-tests/bin/dir_rd_update
%%TESTS%%share/zfs/zfs-tests/bin/dosmode_readonly_write
@@ -1591,6 +1592,7 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_002_neg.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_003_neg.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_ashift.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_clear_userprop.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_common.kshlib
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_features.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_split/cleanup.ksh
@@ -1831,6 +1833,12 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/cp_stress.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/seekflood
%%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_ccm_test.json
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_ccm_test.txt
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_gcm_test.json
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_gcm_test.txt
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/icp_aes_ccm.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/icp_aes_gcm.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/cleanup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/crtime_001_pos.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/setup.ksh
@@ -1848,7 +1856,9 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_fdt_mixed.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_fdt_upgrade.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_import.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_prune.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_quota.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_zap_shrink.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/setup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/cleanup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/delegate.cfg
@@ -2586,6 +2596,7 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/stat/cleanup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/stat/setup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/stat/stat_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/stat/statx_dioalign.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/suid/cleanup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/suid/setup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_to_none.ksh