sysutils/openzfs: update snapshot

Update sysutils/openzfs to a more recent snapshot [0]
Unbreak when NLS is unset. [1]

PR:		247827 [1]
Submitted by:	freqlabs
Reported by:	Tomohiro Hosaka [1]

3 files changed, 39 insertions, 16 deletions

diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index b72c86b102fa..62811cbc8379 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020061900
+PORTVERSION=	2020071100
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -14,7 +14,7 @@ BROKEN_aarch64=	invokes x86 assembler
 
 RUN_DEPENDS=	openzfs-kmod>=0:sysutils/openzfs-kmod
 
-USES+=		autoreconf:build libtool gmake gettext-runtime:run python:3.3+,build shebangfix
+USES+=		autoreconf:build libtool gmake gettext-runtime python:3.3+,build shebangfix
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-config="user"
@@ -28,7 +28,7 @@ OPTIONS_SUB=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	1c08fa8b5
+GH_TAGNAME=	6f1db5f37
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
index 0f39e3baa29d..b719fee3efed 100644
--- a/sysutils/openzfs/distinfo
+++ b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592606924
-SHA256 (openzfs-zfs-v2020061900-1c08fa8b5_GH0.tar.gz) = 38a67886181d32c66926b6f95ef66da486599f444c1044d71b1badd163e43b87
-SIZE (openzfs-zfs-v2020061900-1c08fa8b5_GH0.tar.gz) = 9179450
+TIMESTAMP = 1594480039
+SHA256 (openzfs-zfs-v2020071100-6f1db5f37_GH0.tar.gz) = 62c3112ee4ae5a5b8e1d67fedb7f224e413b997e3b8fc95076c5bb2dcbfd6faa
+SIZE (openzfs-zfs-v2020071100-6f1db5f37_GH0.tar.gz) = 9207535
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
index 5db4fb22a07c..b684bbfcc9c6 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/sysutils/openzfs/pkg-plist
@@ -235,6 +235,7 @@ include/libzfs/sys/vdev_indirect_mapping.h
 include/libzfs/sys/vdev_initialize.h
 include/libzfs/sys/vdev_raidz.h
 include/libzfs/sys/vdev_raidz_impl.h
+include/libzfs/sys/vdev_rebuild.h
 include/libzfs/sys/vdev_removal.h
 include/libzfs/sys/vdev_trim.h
 include/libzfs/sys/xvattr.h
@@ -330,6 +331,9 @@ lib/libzpool.so.4.0.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-0.8.0-py%%PYTHON_VER%%.egg-info/not-zip-safe
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-0.8.0-py%%PYTHON_VER%%.egg-info/requires.txt
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-0.8.0-py%%PYTHON_VER%%.egg-info/top_level.txt
+lib/security/pam_zfs_key.so
+libdata/pkgconfig/libzfs.pc
+libdata/pkgconfig/libzfs_core.pc
 libexec/zfs/zpool.d/ata_err
 libexec/zfs/zpool.d/cmd_to
 libexec/zfs/zpool.d/defect
@@ -476,8 +480,6 @@ sbin/zpool
 sbin/zstream
 sbin/zstreamdump
 sbin/ztest
-share/pkgconfig/libzfs.pc
-share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/common.sh
 %%TESTS%%share/zfs/runfiles/common.run
 %%TESTS%%share/zfs/runfiles/freebsd.run
@@ -740,6 +742,7 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_006_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_args_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_args_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_block_size_histogram.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_decompress.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_display_block.ksh
@@ -778,6 +781,7 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_deeply_nested.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_encrypted.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_rm_nested.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_copies/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_copies/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies.cfg
@@ -988,6 +992,7 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_006_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted_unloaded.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_raw.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_sparse.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_set/cache_001_pos.ksh
@@ -1436,6 +1441,7 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/scan/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/scan/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/scan/zpool_wait_rebuild.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/scan/zpool_wait_replace.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/scan/zpool_wait_replace_cancel.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/scan/zpool_wait_resilver.ksh
@@ -1654,6 +1660,8 @@ share/pkgconfig/libzfs_core.pc
 %%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
 %%TESTS%%share/zfs/zfs-tests/tests/functional/inheritance/config001.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/inheritance/config002.cfg
@@ -1822,6 +1830,11 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/online_offline/online_offline_002_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/online_offline/online_offline_003_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/online_offline/setup.ksh
+%%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/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/pam/utilities.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_001_pos.ksh
@@ -1992,11 +2005,22 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rename_dirs/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rename_dirs/rename_dirs_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rename_dirs/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/attach_import.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/attach_multiple.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/attach_rebuild.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/attach_resilver.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/detach.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/rebuild_disabled_feature.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/rebuild_multiple.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/rebuild_raidz.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/replace_import.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/replace_rebuild.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/replace_resilver.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/replacement.cfg
-%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/replacement_001_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/replacement_002_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/replacement_003_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/resilver_restart_001.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/resilver_restart_002.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/scrub_cancel.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/replacement/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/reservation/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/reservation/reservation.cfg
@@ -2024,11 +2048,6 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/reservation/reservation_021_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/reservation/reservation_022_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/reservation/setup.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/resilver/cleanup.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/resilver/resilver.cfg
-%%TESTS%%share/zfs/zfs-tests/tests/functional/resilver/resilver_restart_001.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/resilver/resilver_restart_002.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/resilver/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rootpool/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rootpool/rootpool_002_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rootpool/rootpool_003_neg.ksh
@@ -2057,6 +2076,7 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_013_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_014_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_016_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_019_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_020_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_021_pos.ksh
@@ -2291,6 +2311,7 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs-tests/tests/perf/fio/random_readwrite_fixed.fio
 %%TESTS%%share/zfs/zfs-tests/tests/perf/fio/random_writes.fio
 %%TESTS%%share/zfs/zfs-tests/tests/perf/fio/sequential_reads.fio
+%%TESTS%%share/zfs/zfs-tests/tests/perf/fio/sequential_readwrite.fio
 %%TESTS%%share/zfs/zfs-tests/tests/perf/fio/sequential_writes.fio
 %%TESTS%%share/zfs/zfs-tests/tests/perf/nfs-sample.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/perf/perf.shlib
@@ -2309,3 +2330,5 @@ share/pkgconfig/libzfs_core.pc
 %%TESTS%%share/zfs/zfs.sh
 %%TESTS%%share/zfs/zimport.sh
 %%TESTS%%share/zfs/zloop.sh
+/usr/share/pam-configs/zfs_key
+@dir /usr/share/pam-configs