git: f3f4f5e80565 - main - sysutils/openzfs*: Bump to current upstream master

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Ryan Moeller <freqlabs_at_FreeBSD.org>
Date: Mon, 14 Feb 2022 17:59:10 UTC
The branch main has been updated by freqlabs (src committer):

URL: https://cgit.FreeBSD.org/ports/commit/?id=f3f4f5e8056548472ce8a30d3aba97fdac205b1e

commit f3f4f5e8056548472ce8a30d3aba97fdac205b1e
Author:     Ryan Moeller <freqlabs@FreeBSD.org>
AuthorDate: 2022-02-14 17:58:12 +0000
Commit:     Ryan Moeller <freqlabs@FreeBSD.org>
CommitDate: 2022-02-14 17:59:02 +0000

    sysutils/openzfs*: Bump to current upstream master
    
    Approved by:    lwhsu (implicit)
    Sponsored by:   iXsystems, Inc.
---
 sysutils/openzfs-kmod/Makefile | 4 ++--
 sysutils/openzfs-kmod/distinfo | 6 +++---
 sysutils/openzfs/Makefile      | 4 ++--
 sysutils/openzfs/distinfo      | 6 +++---
 sysutils/openzfs/pkg-plist     | 9 +++++++--
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
index a1beef842e47..ab91e91fcfa1 100644
--- a/sysutils/openzfs-kmod/Makefile
+++ b/sysutils/openzfs-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2021121500
+PORTVERSION=	2022021400
 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=	f291fa658
+GH_TAGNAME=	9f734e81f
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
diff --git a/sysutils/openzfs-kmod/distinfo b/sysutils/openzfs-kmod/distinfo
index 381c4d26222d..a7b3a1783e5e 100644
--- a/sysutils/openzfs-kmod/distinfo
+++ b/sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639585454
-SHA256 (openzfs-zfs-v2021121500-f291fa658_GH0.tar.gz) = 528386ceeb5d24f48f7da8f610469649ccf395acb5ebdb47dd37351e3a7820d9
-SIZE (openzfs-zfs-v2021121500-f291fa658_GH0.tar.gz) = 32679719
+TIMESTAMP = 1644858233
+SHA256 (openzfs-zfs-v2022021400-9f734e81f_GH0.tar.gz) = 2f26260c6a3e45390a935373e01abd051a80075989cb50391cc3d6b6f68ca5d5
+SIZE (openzfs-zfs-v2022021400-9f734e81f_GH0.tar.gz) = 32660581
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 5e8d6435e261..8bb3f1e80227 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2021121500
+PORTVERSION=	2022021400
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
@@ -32,7 +32,7 @@ OPTIONS_SUB=	yes
 
 USE_GITHUB=	yes
 GH_PROJECT=	zfs
-GH_TAGNAME=	f291fa658
+GH_TAGNAME=	9f734e81f
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
index 278d5dd1cefd..08dfa5931190 100644
--- a/sysutils/openzfs/distinfo
+++ b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639585631
-SHA256 (openzfs-zfs-v2021121500-f291fa658_GH0.tar.gz) = 528386ceeb5d24f48f7da8f610469649ccf395acb5ebdb47dd37351e3a7820d9
-SIZE (openzfs-zfs-v2021121500-f291fa658_GH0.tar.gz) = 32679719
+TIMESTAMP = 1644858412
+SHA256 (openzfs-zfs-v2022021400-9f734e81f_GH0.tar.gz) = 2f26260c6a3e45390a935373e01abd051a80075989cb50391cc3d6b6f68ca5d5
+SIZE (openzfs-zfs-v2022021400-9f734e81f_GH0.tar.gz) = 32660581
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
index 105495a264a2..a0fcc049a89b 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/sysutils/openzfs/pkg-plist
@@ -54,7 +54,6 @@ etc/zfs/zpool.d/w_ucor
 include/libspl/assert.h
 include/libspl/atomic.h
 include/libspl/fcntl.h
-include/libspl/ia32/sys/asm_linkage.h
 include/libspl/libdevinfo.h
 include/libspl/libgen.h
 include/libspl/libshare.h
@@ -448,7 +447,6 @@ man/man8/zfs-userspace.8.gz
 man/man8/zfs-wait.8.gz
 man/man8/zfs.8.gz
 man/man8/zfs_ids_to_path.8.gz
-man/man8/zgenhostid.8.gz
 man/man8/zinject.8.gz
 man/man8/zpool-add.8.gz
 man/man8/zpool-attach.8.gz
@@ -1020,6 +1018,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_override.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_-e.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_-wR-encrypted-mix.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_003_pos.ksh
@@ -2266,6 +2265,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_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
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_realloc_files.ksh
@@ -2337,6 +2337,9 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/sparse/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/sparse/sparse.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/sparse/sparse_001_pos.ksh
+%%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/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
@@ -2344,6 +2347,7 @@ share/pam-configs/zfs_key
 %%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
 %%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_to_suid_sgid.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_zil_replay.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/threadsappend/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/threadsappend/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/threadsappend/threadsappend_001_pos.ksh
@@ -2399,6 +2403,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_003_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_encrypted.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_send_encrypted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/vdev_zaps/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/vdev_zaps/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/vdev_zaps/vdev_zaps.kshlib