git: 26e680dffa8a - main - sysutils/openzfs*: Sync up to fix the build

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Ryan Moeller <freqlabs_at_FreeBSD.org>
Date: Wed, 15 Dec 2021 19:12:58 UTC
The branch main has been updated by freqlabs (src committer):

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

commit 26e680dffa8a355be0095c0b6e1d76ec1a84f155
Author:     Ryan Moeller <freqlabs@FreeBSD.org>
AuthorDate: 2021-12-15 19:12:40 +0000
Commit:     Ryan Moeller <freqlabs@FreeBSD.org>
CommitDate: 2021-12-15 19:12:40 +0000

    sysutils/openzfs*: Sync up to fix the build
    
    Bump to openzfs/zfs@bb6c2b1e2
    
    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     | 4 ++++
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
index 1b668a4a19e8..a1beef842e47 100644
--- a/sysutils/openzfs-kmod/Makefile
+++ b/sysutils/openzfs-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2021111100
+PORTVERSION=	2021121500
 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=	637771a06
+GH_TAGNAME=	f291fa658
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
diff --git a/sysutils/openzfs-kmod/distinfo b/sysutils/openzfs-kmod/distinfo
index 8e5933506bea..381c4d26222d 100644
--- a/sysutils/openzfs-kmod/distinfo
+++ b/sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636651691
-SHA256 (openzfs-zfs-v2021111100-637771a06_GH0.tar.gz) = bb2609b1ca2d12969914c7e09a50f0c6b46164adfb77efdd8c3f51c9f1a2262d
-SIZE (openzfs-zfs-v2021111100-637771a06_GH0.tar.gz) = 32658437
+TIMESTAMP = 1639585454
+SHA256 (openzfs-zfs-v2021121500-f291fa658_GH0.tar.gz) = 528386ceeb5d24f48f7da8f610469649ccf395acb5ebdb47dd37351e3a7820d9
+SIZE (openzfs-zfs-v2021121500-f291fa658_GH0.tar.gz) = 32679719
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 66ae6e481324..ea3b0e2d3f6d 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2021111100
+PORTVERSION=	2021121500
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -25,7 +25,7 @@ OPTIONS_SUB=	yes
 
 USE_GITHUB=	yes
 GH_PROJECT=	zfs
-GH_TAGNAME=	637771a06
+GH_TAGNAME=	f291fa658
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
index aa795e0046d3..278d5dd1cefd 100644
--- a/sysutils/openzfs/distinfo
+++ b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636652402
-SHA256 (openzfs-zfs-v2021111100-637771a06_GH0.tar.gz) = bb2609b1ca2d12969914c7e09a50f0c6b46164adfb77efdd8c3f51c9f1a2262d
-SIZE (openzfs-zfs-v2021111100-637771a06_GH0.tar.gz) = 32658437
+TIMESTAMP = 1639585631
+SHA256 (openzfs-zfs-v2021121500-f291fa658_GH0.tar.gz) = 528386ceeb5d24f48f7da8f610469649ccf395acb5ebdb47dd37351e3a7820d9
+SIZE (openzfs-zfs-v2021121500-f291fa658_GH0.tar.gz) = 32679719
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
index c7567aa1840a..772141666070 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/sysutils/openzfs/pkg-plist
@@ -792,6 +792,7 @@ 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
@@ -926,6 +927,7 @@ share/pam-configs/zfs_key
 %%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
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_diff/zfs_diff_mangle.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_diff/zfs_diff_timestamp.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_diff/zfs_diff_types.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_get/cleanup.ksh
@@ -1203,6 +1205,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/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
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh
@@ -1982,6 +1985,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/pam_basic.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/pam_nounmount.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/pam/pam_short_password.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/utilities.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pool_checkpoint/checkpoint_after_rewind.ksh