sysutils/openzfs*: Bump, fix kmod on 13-CURRENT

When the kernel is built with INVARIANTS we also need to build ZFS
with INVARIANTS.  Additionally, the knob for this has been broken out
from WITH_DEBUG=true to WITH_INVARIANTS=true in the OpenZFS build
system.  We add an INVARIANTS option to the port for this, and enable
the DEBUG and INVARIANTS options by default on 13-CURRENT to ensure
that a default configuration builds openzfs-kmod with the correct
options.

Users building their 13-CURRENT kernel without INVARIANTS will need to
disable the INVARIANTS option in the port manually.  I'm not aware of a
better way to implement this decision at the moment.

Reviewed by:	wg
Approved by:	wg (ports)
Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D27442

3 files changed, 33 insertions, 12 deletions

diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 28aa690c4586..ec286b733e8f 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020110200
+PORTVERSION=	2020120100
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -20,15 +20,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-config="user"
 
 OPTIONS_DEFINE=	DEBUG PYTHON TESTS
-DEBUG_DESC=	Build a debug configuration
-PYTHON_DESC=	Build the pyzfs library, arc_summary and arcstat utilities
+PYTHON_DESC=	Build the pyzfs library, arc_summary, arcstat, and dbufstat utilities
 TESTS_DESC=	Install the ZFS Test Suite
 OPTIONS_SUB=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	8583540c6
+GH_TAGNAME=	aa2778d10
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
index c102cbc58442..f142afff46b2 100644
--- a/sysutils/openzfs/distinfo
+++ b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604336019
-SHA256 (openzfs-zfs-v2020110200-8583540c6_GH0.tar.gz) = 41b097e017ab6a9003291e1422769315ddf2ef510848819a37fd35713458c5e9
-SIZE (openzfs-zfs-v2020110200-8583540c6_GH0.tar.gz) = 9559144
+TIMESTAMP = 1606856244
+SHA256 (openzfs-zfs-v2020120100-aa2778d10_GH0.tar.gz) = d32390f0628966b406774cacc1ecf271e285aef6c7dfa55fdc73800e7c624344
+SIZE (openzfs-zfs-v2020120100-aa2778d10_GH0.tar.gz) = 31293387
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
index 38b4208b6f52..bc21adde8c90 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/sysutils/openzfs/pkg-plist
@@ -2,7 +2,6 @@
 %%PYTHON%%bin/arcstat
 %%PYTHON%%bin/dbufstat
 %%TESTS%%bin/raidz_test
-bin/zpool_influxdb
 etc/sudoers.d/zfs
 etc/zfs/vdev_id.conf.alias.example
 etc/zfs/vdev_id.conf.multipath.example
@@ -229,6 +228,7 @@ include/libzfs/sys/unique.h
 include/libzfs/sys/uuid.h
 include/libzfs/sys/vdev.h
 include/libzfs/sys/vdev_disk.h
+include/libzfs/sys/vdev_draid.h
 include/libzfs/sys/vdev_file.h
 include/libzfs/sys/vdev_impl.h
 include/libzfs/sys/vdev_indirect_births.h
@@ -387,6 +387,7 @@ libexec/zfs/zpool.d/upath
 libexec/zfs/zpool.d/vendor
 libexec/zfs/zpool.d/w_proc
 libexec/zfs/zpool.d/w_ucor
+libexec/zfs/zpool_influxdb
 man/man1/arcstat.1.gz
 %%TESTS%%man/man1/raidz_test.1.gz
 %%TESTS%%man/man1/test-runner.1.gz
@@ -510,6 +511,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/bin/btree_test
 %%TESTS%%share/zfs/zfs-tests/bin/chg_usr_exec
 %%TESTS%%share/zfs/zfs-tests/bin/dir_rd_update
+%%TESTS%%share/zfs/zfs-tests/bin/draid
 %%TESTS%%share/zfs/zfs-tests/bin/file_check
 %%TESTS%%share/zfs/zfs-tests/bin/file_trunc
 %%TESTS%%share/zfs/zfs-tests/bin/file_write
@@ -744,6 +746,7 @@ share/pam-configs/zfs_key
 %%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/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
@@ -926,6 +929,8 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_010_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_011_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_012_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_013_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_014_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_fail.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_mountpoints.ksh
@@ -1175,6 +1180,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_readonly.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/create-o_ashift.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/draidcfg.gz
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
@@ -1202,6 +1208,10 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_023_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_024_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_crypt_combos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_draid_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_draid_002_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_draid_003_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_draid_004_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_encrypted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_002_pos.ksh
@@ -1287,6 +1297,8 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_013_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_014_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_015_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_016_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_017_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_all_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_encrypted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_encrypted_load.ksh
@@ -1966,6 +1978,8 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_001_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_002_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_003_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_004_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted.cfg
@@ -1991,10 +2005,17 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy.kshlib
-%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_001_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_002_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_003_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_004_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid1.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid2.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid3.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid_spare1.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid_spare2.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid_spare3.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_mirror.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_raidz1.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_raidz2.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_raidz3.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_stripe.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/refquota/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/refquota/refquota_001_pos.ksh
@@ -2285,6 +2306,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_001_pos.ksh
 %%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/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