sysutils/openzfs*: Bump to fix build on main

Approved by:	lwhsu (implicit)
Sponsored by:	iXsystems, Inc.

5 files changed, 36 insertions, 27 deletions

diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
index ab91e91fcfa1..4f42e0baaf62 100644
--- a/sysutils/openzfs-kmod/Makefile
+++ b/sysutils/openzfs-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2022021400
+PORTVERSION=	2022040400
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
@@ -14,7 +14,7 @@ BROKEN_i386=	build fails
 USES=		cpe kmod
 USE_GITHUB=	yes
 GH_PROJECT=	zfs
-GH_TAGNAME=	9f734e81f
+GH_TAGNAME=	b61507ec1
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
diff --git a/sysutils/openzfs-kmod/distinfo b/sysutils/openzfs-kmod/distinfo
index a7b3a1783e5e..8435a7c9b762 100644
--- a/sysutils/openzfs-kmod/distinfo
+++ b/sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644858233
-SHA256 (openzfs-zfs-v2022021400-9f734e81f_GH0.tar.gz) = 2f26260c6a3e45390a935373e01abd051a80075989cb50391cc3d6b6f68ca5d5
-SIZE (openzfs-zfs-v2022021400-9f734e81f_GH0.tar.gz) = 32660581
+TIMESTAMP = 1649086302
+SHA256 (openzfs-zfs-v2022040400-b61507ec1_GH0.tar.gz) = 7aaeed6ab3af430cdff44788f4c19f56d068abccb3c24362bd9cb97cdd307847
+SIZE (openzfs-zfs-v2022040400-b61507ec1_GH0.tar.gz) = 32561476
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 8bb3f1e80227..3813fecfce06 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2022021400
+PORTVERSION=	2022040400
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
@@ -32,7 +32,7 @@ OPTIONS_SUB=	yes
 
 USE_GITHUB=	yes
 GH_PROJECT=	zfs
-GH_TAGNAME=	9f734e81f
+GH_TAGNAME=	b61507ec1
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
index 08dfa5931190..b3efca1eaf83 100644
--- a/sysutils/openzfs/distinfo
+++ b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644858412
-SHA256 (openzfs-zfs-v2022021400-9f734e81f_GH0.tar.gz) = 2f26260c6a3e45390a935373e01abd051a80075989cb50391cc3d6b6f68ca5d5
-SIZE (openzfs-zfs-v2022021400-9f734e81f_GH0.tar.gz) = 32660581
+TIMESTAMP = 1649086481
+SHA256 (openzfs-zfs-v2022040400-b61507ec1_GH0.tar.gz) = 7aaeed6ab3af430cdff44788f4c19f56d068abccb3c24362bd9cb97cdd307847
+SIZE (openzfs-zfs-v2022040400-b61507ec1_GH0.tar.gz) = 32561476
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
index a0fcc049a89b..b485ed5ca174 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/sysutils/openzfs/pkg-plist
@@ -101,7 +101,7 @@ include/libspl/sys/simd.h
 include/libspl/sys/stack.h
 include/libspl/sys/stat.h
 include/libspl/sys/stdtypes.h
-include/libspl/sys/strings.h
+include/libspl/sys/string.h
 include/libspl/sys/stropts.h
 include/libspl/sys/sunddi.h
 include/libspl/sys/sysmacros.h
@@ -117,7 +117,6 @@ include/libspl/sys/va_list.h
 include/libspl/sys/varargs.h
 include/libspl/sys/vfs.h
 include/libspl/sys/vnode.h
-include/libspl/sys/vtoc.h
 include/libspl/sys/wmsum.h
 include/libspl/sys/zfs_context_os.h
 include/libspl/sys/zone.h
@@ -543,14 +542,18 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/test-runner/bin/test-runner.py
 %%TESTS%%share/zfs/test-runner/bin/zts-report.py
 %%TESTS%%share/zfs/test-runner/include/logapi.shlib
-%%TESTS%%share/zfs/test-runner/include/stf.shlib
 %%TESTS%%share/zfs/zfs-helpers.sh
 %%TESTS%%share/zfs/zfs-tests.sh
 %%TESTS%%share/zfs/zfs-tests/bin/badsend
 %%TESTS%%share/zfs/zfs-tests/bin/btree_test
 %%TESTS%%share/zfs/zfs-tests/bin/chg_usr_exec
+%%TESTS%%share/zfs/zfs-tests/bin/cp_files
+%%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
 %%TESTS%%share/zfs/zfs-tests/bin/draid
+%%TESTS%%share/zfs/zfs-tests/bin/edonr_test
+%%TESTS%%share/zfs/zfs-tests/bin/ereports
 %%TESTS%%share/zfs/zfs-tests/bin/file_check
 %%TESTS%%share/zfs/zfs-tests/bin/file_trunc
 %%TESTS%%share/zfs/zfs-tests/bin/file_write
@@ -570,8 +573,13 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/bin/rename_dir
 %%TESTS%%share/zfs/zfs-tests/bin/rm_lnkcnt_zero_file
 %%TESTS%%share/zfs/zfs-tests/bin/send_doall
+%%TESTS%%share/zfs/zfs-tests/bin/sha2_test
+%%TESTS%%share/zfs/zfs-tests/bin/skein_test
 %%TESTS%%share/zfs/zfs-tests/bin/stride_dd
+%%TESTS%%share/zfs/zfs-tests/bin/suid_write_to_file
 %%TESTS%%share/zfs/zfs-tests/bin/threadsappend
+%%TESTS%%share/zfs/zfs-tests/bin/truncate_test
+%%TESTS%%share/zfs/zfs-tests/bin/zfs_diff-socket
 %%TESTS%%share/zfs/zfs-tests/callbacks/zfs_dbgmsg.ksh
 %%TESTS%%share/zfs/zfs-tests/callbacks/zfs_dmesg.ksh
 %%TESTS%%share/zfs/zfs-tests/callbacks/zfs_failsafe.ksh
@@ -588,7 +596,6 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/acl_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/dosmode.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/dosmode_readonly_write
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/posixmode.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/posix-sa/cleanup.ksh
@@ -791,15 +798,12 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/chattr/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/default.cfg
-%%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/edonr_test
 %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/filetest_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/filetest_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/run_edonr_test.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/run_sha2_test.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/run_skein_test.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/setup.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/sha2_test
-%%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/skein_test
 %%TESTS%%share/zfs/zfs-tests/tests/functional/clean_mirror/clean_mirror_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/clean_mirror/clean_mirror_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/clean_mirror/clean_mirror_003_pos.ksh
@@ -922,7 +926,6 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_dev_removal_condense.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_diff/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_diff/setup.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_diff/socket
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_diff/zfs_diff_changes.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_diff/zfs_diff_cliargs.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_diff/zfs_diff_encrypted.ksh
@@ -1205,6 +1208,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait_deleteq.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait_getsubopt.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zhack/zhack_label_checksum.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool/setup.ksh
@@ -1295,7 +1299,6 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_detach/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_detach/zpool_detach_001_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_events/cleanup.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_events/ereports
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_events/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.kshlib
@@ -1645,6 +1648,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_003_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_004_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_005_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_007_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_008_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_user/zpool_iostat/cleanup.ksh
@@ -1681,14 +1685,12 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/compression/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/compression/testpool_zstd.tar.gz
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/cleanup.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/cp_files
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/cp_files_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/setup.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
 %%TESTS%%share/zfs/zfs-tests/tests/functional/ctime/cleanup.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/ctime/ctime
 %%TESTS%%share/zfs/zfs-tests/tests/functional/ctime/ctime_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/ctime/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/deadman/deadman.cfg
@@ -1726,13 +1728,16 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/devices/devices_003_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/devices/devices_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/devices/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dos_attributes/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dos_attributes/read_dos_attrs_001.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dos_attributes/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dos_attributes/write_dos_attrs_001.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/events.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/events_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/events_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/events_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/setup.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_fd_spill-zedlet
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_fd_spill.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_rc_filter.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/exec/cleanup.ksh
@@ -1795,10 +1800,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/history/sparc.migratedpool.DAT.Z
 %%TESTS%%share/zfs/zfs-tests/tests/functional/history/sparc.orig_history.txt
 %%TESTS%%share/zfs/zfs-tests/tests/functional/history/zfs-pool-v4.dat.Z
-%%TESTS%%share/zfs/zfs-tests/tests/functional/hkdf/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/hkdf/hkdf_test
-%%TESTS%%share/zfs/zfs-tests/tests/functional/hkdf/run_hkdf_test.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/hkdf/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/inheritance/README.config
 %%TESTS%%share/zfs/zfs-tests/tests/functional/inheritance/README.state
 %%TESTS%%share/zfs/zfs-tests/tests/functional/inheritance/cleanup.ksh
@@ -1964,6 +1966,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/enospc_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/enospc_003_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/enospc_df.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/enospc_rm.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/nopwrite/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/nopwrite/nopwrite.shlib
@@ -2238,6 +2241,11 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_021_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_022_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_024_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_025_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_026_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_027_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_028_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_029_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-L_toggle.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-c_embedded_blocks.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-c_incremental.ksh
@@ -2265,6 +2273,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_invalid.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_mixed_raw.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_partial_dataset.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_raw_ashift.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_raw_spill_block.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_realloc_encrypted_files.ksh
@@ -2298,6 +2307,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/slog/slog_013_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/slog/slog_014_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/slog/slog_015_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/slog/slog_016_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/slog/slog_replay_fs_001.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/slog/slog_replay_fs_002.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/slog/slog_replay_volume.ksh
@@ -2342,7 +2352,6 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/stat/stat_001_pos.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_file
 %%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_to_none.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_to_sgid.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_to_suid.ksh
@@ -2366,7 +2375,6 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/truncate/truncate.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/truncate/truncate_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/truncate/truncate_002_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/truncate/truncate_test
 %%TESTS%%share/zfs/zfs-tests/tests/functional/truncate/truncate_timestamps.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/upgrade/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/upgrade/setup.ksh
@@ -2435,6 +2443,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/xattr/xattr_012_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/xattr/xattr_013_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/xattr/xattr_common.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/xattr/xattr_compat.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/zpool_influxdb/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/zpool_influxdb/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/zpool_influxdb/zpool_influxdb.ksh