bump version to 2.0.1-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

Makefile

@@ -6,12 +6,12 @@ ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
 ZFSDIR=zfs-linux_${ZFSVER}
 ZFSSRC=upstream
 
-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB1= libnvpair2linux_${ZFSPKGVER}_amd64.deb
 ZFS_DEB2= 					\
-libuutil1linux_${ZFSPKGVER}_amd64.deb		\
-libzfs2linux_${ZFSPKGVER}_amd64.deb		\
+libuutil2linux_${ZFSPKGVER}_amd64.deb		\
+libzfs3linux_${ZFSPKGVER}_amd64.deb		\
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool2linux_${ZFSPKGVER}_amd64.deb		\
+libzpool3linux_${ZFSPKGVER}_amd64.deb		\
 zfs-dbg_${ZFSPKGVER}_amd64.deb			\
 zfs-zed_${ZFSPKGVER}_amd64.deb			\
 zfs-initramfs_${ZFSPKGVER}_all.deb		\

debian/changelog

@@ -1,3 +1,9 @@
+zfs-linux (2.0.1-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 2.0.1
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 13 Jan 2021 14:16:02 +0100
+
 zfs-linux (0.8.5-pve1) pve pmg; urgency=medium
 
   * update ZFS to 0.8.5

debian/control

@@ -19,23 +19,23 @@ Homepage: https://www.zfsonlinux.org/
 Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
 Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
 
-Package: libnvpair1linux
+Package: libnvpair2linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libnvpair1
-Replaces: libnvpair1
+Breaks: libnvpair1, libnvpair1linux
+Replaces: libnvpair1, libnvpair1linux
 Description: Solaris name-value library for Linux
  This library provides routines for packing and unpacking nv pairs for
  transporting data across process boundaries, transporting between
  kernel and userland, and possibly saving onto disk files.
 
-Package: libuutil1linux
+Package: libuutil2linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libuutil1
-Replaces: libuutil1
+Breaks: libuutil1, libuutil1linux
+Replaces: libuutil1, libuutil1linux
 Description: Solaris userland utility library for Linux
  This library provides a variety of glue functions for ZFS on Linux:
   * libspl: The Solaris Porting Layer userland library, which provides APIs
@@ -50,25 +50,26 @@ Description: Solaris userland utility library for Linux
 Package: libzfslinux-dev
 Section: contrib/libdevel
 Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
-         libuutil1linux (= ${binary:Version}),
-         libzfs2linux (= ${binary:Version}),
-         libzpool2linux (= ${binary:Version}),
+Depends: libnvpair2linux (= ${binary:Version}),
+         libuutil2linux (= ${binary:Version}),
+         libzfs3linux (= ${binary:Version}),
+         libzfsbootenv1linux (= ${binary:Version}),
+         libzpool3linux (= ${binary:Version}),
          ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
 Description: OpenZFS filesystem development files for Linux
  Header files and static libraries for compiling software against
  libraries of OpenZFS filesystem.
  .
- This package includes the development files of libnvpair1, libuutil1,
- libzpool2 and libzfs2.
+ This package includes the development files of libnvpair2, libuutil2,
+ libzpool3 and libzfs3.
 
-Package: libzfs2linux
+Package: libzfs3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzfs2
-Replaces: libzfs2
+Breaks: libzfs2, libzfs2linux
+Replaces: libzfs2, libzfs2linux
 Description: OpenZFS filesystem library for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -76,12 +77,23 @@ Description: OpenZFS filesystem library for Linux
  .
  The OpenZFS library provides support for managing OpenZFS filesystems.
 
-Package: libzpool2linux
+Package: libzfsbootenv1linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzpool2
-Replaces: libzpool2
+Description: OpenZFS filesystem library for Linux
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
+ .
+ The zfsbootenv library provides support for modifying ZFS label information.
+
+Package: libzpool3linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libzpool2, libzpool2linux
+Replaces: libzpool2, libzpool2linux
 Description: OpenZFS pool library for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -216,10 +228,10 @@ Package: zfs-dbg
 Section: contrib/debug
 Priority: optional
 Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
-         libuutil1linux (= ${binary:Version}),
-         libzfs2linux (= ${binary:Version}),
-         libzpool2linux (= ${binary:Version}),
+Depends: libnvpair2linux (= ${binary:Version}),
+         libuutil2linux (= ${binary:Version}),
+         libzfs3linux (= ${binary:Version}),
+         libzpool3linux (= ${binary:Version}),
          zfs-zed (= ${binary:Version}),
          zfsutils-linux (= ${binary:Version}),
          ${misc:Depends}
@@ -228,8 +240,8 @@ Description: Debugging symbols for OpenZFS userland libraries and tools
  traditional filesystems and volume managers. It supports data checksums,
  compression, encryption, snapshots, and more.
  .
- This package contains the debugging symbols for libzpool2linux, libzfs2linux,
- libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
+ This package contains the debugging symbols for libzpool3linux, libzfs3linux,
+ libnvpair2linux, libuutil2linux, zfs-zed and zfsutils-linux.
 
 Package: spl
 Section: contrib/metapackages

debian/libnvpair1linux.install

@@ -1 +0,0 @@
-lib/libnvpair.so.*

debian/libnvpair1linux.lintian-overrides

@@ -1 +0,0 @@
-libnvpair1linux: package-name-doesnt-match-sonames

debian/libnvpair2linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*

debian/libnvpair2linux.lintian-overrides

@@ -0,0 +1 @@
+libnvpair2linux: package-name-doesnt-match-sonames

debian/libuutil1linux.install

@@ -1 +0,0 @@
-lib/libuutil.so.*

debian/libuutil1linux.lintian-overrides

@@ -1 +0,0 @@
-libuutil1linux: package-name-doesnt-match-sonames

debian/libuutil2linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libuutil.so.*

debian/libuutil2linux.lintian-overrides

@@ -0,0 +1 @@
+libuutil2linux: package-name-doesnt-match-sonames

debian/libzfs2linux.install

@@ -1,2 +0,0 @@
-lib/libzfs.so.*
-lib/libzfs_core.so.*

debian/libzfs2linux.lintian-overrides

@@ -1 +0,0 @@
-libzfs2linux: package-name-doesnt-match-sonames

debian/libzfs3linux.install.in

@@ -0,0 +1,2 @@
+lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
+lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*

debian/libzfs3linux.lintian-overrides

@@ -0,0 +1 @@
+libzfs3linux: package-name-doesnt-match-sonames

debian/libzfsbootenv1linux.install

@@ -0,0 +1 @@
+lib/libzfsbootenv.so.*

debian/libzfsbootenv1linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*

debian/libzfsbootenv1linux.lintian-overrides

@@ -0,0 +1,2 @@
+libzfsbootenv1linux: package-name-doesnt-match-sonames
+libzfsbootenv1linux: extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz

debian/libzfslinux-dev.install

@@ -1,4 +0,0 @@
-lib/*.a usr/lib/
-usr/include
-usr/lib/*.so
-lib/pkgconfig/*.pc usr/lib/pkgconfig/

debian/libzfslinux-dev.install.in

@@ -0,0 +1,4 @@
+lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/
+usr/include
+usr/lib/@DEB_HOST_MULTIARCH@/*.so
+/usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc

debian/libzpool2linux.install

@@ -1 +0,0 @@
-lib/libzpool.so.*

debian/libzpool2linux.lintian-overrides

@@ -1 +0,0 @@
-libzpool2linux: package-name-doesnt-match-sonames

debian/libzpool3linux.docs

@@ -0,0 +1,2 @@
+COPYRIGHT
+LICENSE

debian/libzpool3linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libzpool.so.*

debian/libzpool3linux.lintian-overrides

@@ -0,0 +1 @@
+libzpool3linux: package-name-doesnt-match-sonames

debian/patches/0002-always-load-ZFS-module-on-boot.patch

@@ -15,13 +15,13 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- etc/modules-load.d/zfs.conf.in | 2 +-
+ etc/modules-load.d/zfs.conf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf.in
+diff --git a/etc/modules-load.d/zfs.conf b/etc/modules-load.d/zfs.conf
 index 44e1bb3ed..7509b03cb 100644
---- a/etc/modules-load.d/zfs.conf.in
-+++ b/etc/modules-load.d/zfs.conf.in
+--- a/etc/modules-load.d/zfs.conf
++++ b/etc/modules-load.d/zfs.conf
 @@ -1,3 +1,3 @@
  # The default behavior is to allow udev to load the kernel modules on demand.
  # Uncomment the following line to unconditionally load them at boot.

debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch

@@ -13,11 +13,11 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
-index f4313625e..444e776fd 100644
+index 008075138..570e27707 100644
 --- a/etc/systemd/system/zfs-zed.service.in
 +++ b/etc/systemd/system/zfs-zed.service.in
-@@ -3,7 +3,7 @@ Description=ZFS Event Daemon (zed)
- Documentation=man:zed(8)
+@@ -4,7 +4,7 @@ Documentation=man:zed(8)
+ ConditionPathIsDirectory=/sys/module/zfs
  
  [Service]
 -ExecStart=@sbindir@/zed -F

debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch

@@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
-index 278f937fe..e8c502a33 100644
+index 6520f3246..1718f98a2 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
  [Service]
  Type=oneshot
  RemainAfterExit=yes

debian/patches/0005-Enable-zed-emails.patch

@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index 0ef706849..50632bfcb 100644
+index df560f921..4ce7af744 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
 @@ -15,7 +15,7 @@

debian/patches/0006-dont-symlink-zed-scripts.patch

@@ -16,10 +16,10 @@ Forwarded: no need
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
-index 716db2b2f..57fed7fdf 100644
+index 8b2d0c200..118c96547 100644
 --- a/cmd/zed/zed.d/Makefile.am
 +++ b/cmd/zed/zed.d/Makefile.am
-@@ -52,6 +52,6 @@ install-data-hook:
+@@ -48,6 +48,6 @@ install-data-hook:
  	for f in $(zedconfdefaults); do \
  	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
  	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \

debian/patches/0007-Use-installed-python3.patch

@@ -4,16 +4,11 @@ Date: Tue, 5 May 2020 22:15:16 -0600
 Subject: [PATCH] Use installed python3
 
 ---
- debian/patches/0004-prefer-python3-tests.patch              | 0
  .../functional/cli_root/zfs_program/zfs_program_json.ksh    | 6 +++---
  .../tests/functional/rsend/send_encrypted_files.ksh         | 2 +-
  .../tests/functional/rsend/send_realloc_dnode_size.ksh      | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
- create mode 100644 debian/patches/0004-prefer-python3-tests.patch
+ 3 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/debian/patches/0004-prefer-python3-tests.patch b/debian/patches/0004-prefer-python3-tests.patch
-new file mode 100644
-index 000000000..e69de29bb
 diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
 index 3788543b0..c7ee4ae9a 100755
 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
@@ -33,7 +28,7 @@ index 3788543b0..c7ee4ae9a 100755
  
  typeset -i cnt=0
 diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
-index 6288178f8..d4475b369 100755
+index f89cb3b31..375d483f7 100755
 --- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
 +++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
 @@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
@@ -42,19 +37,19 @@ index 6288178f8..d4475b369 100755
  log_must touch /$TESTPOOL/$TESTFS2/attrs
 -log_must eval "python -c 'print \"a\" * 4096' | \
 +log_must eval "python3 -c 'print \"a\" * 4096' | \
- 	attr -s bigval /$TESTPOOL/$TESTFS2/attrs"
+ 	set_xattr_stdin bigval /$TESTPOOL/$TESTFS2/attrs"
  log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2
  
 diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
-index 12a72fa09..aceec7880 100755
+index 394fe95bb..43560aac5 100755
 --- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
 +++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
 @@ -93,7 +93,7 @@ log_must zfs snapshot $POOL/fs@c
  # 4. Create an empty file and add xattrs to it to exercise reclaiming a
  #    dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
  log_must zfs set compression=on xattr=sa $POOL/fs
--log_must eval "python -c 'print \"a\" * 512' | attr -s bigval /$POOL/fs/attrs"
-+log_must eval "python3 -c 'print \"a\" * 512' | attr -s bigval /$POOL/fs/attrs"
+-log_must eval "python -c 'print \"a\" * 512' |
++log_must eval "python3 -c 'print \"a\" * 512' |
+     set_xattr_stdin bigval /$POOL/fs/attrs"
  log_must zfs snapshot $POOL/fs@d
  
- # 5. Generate initial and incremental streams

debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch

@@ -13,9 +13,9 @@ can contain characters which will be escaped by systemd.
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
  etc/systemd/system/50-zfs.preset.in       |  1 +
- etc/systemd/system/Makefile.am            |  2 ++
- etc/systemd/system/zfs-import@.service.in | 17 +++++++++++++++++
- 3 files changed, 20 insertions(+)
+ etc/systemd/system/Makefile.am            |  1 +
+ etc/systemd/system/zfs-import@.service.in | 16 ++++++++++++++++
+ 3 files changed, 18 insertions(+)
  create mode 100644 etc/systemd/system/zfs-import@.service.in
 
 diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in
@@ -31,10 +31,10 @@ index e4056a92c..030611419 100644
  enable zfs-mount.service
  enable zfs-share.service
 diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
-index 4e14467a0..ae72102af 100644
+index c374a52ac..25d1b99d7 100644
 --- a/etc/systemd/system/Makefile.am
 +++ b/etc/systemd/system/Makefile.am
-@@ -5,6 +5,7 @@ systemdunit_DATA = \
+@@ -7,6 +7,7 @@ systemdunit_DATA = \
  	zfs-zed.service \
  	zfs-import-cache.service \
  	zfs-import-scan.service \
@@ -42,17 +42,9 @@ index 4e14467a0..ae72102af 100644
  	zfs-mount.service \
  	zfs-share.service \
  	zfs-volume-wait.service \
-@@ -16,6 +17,7 @@ EXTRA_DIST = \
- 	$(top_srcdir)/etc/systemd/system/zfs-zed.service.in \
- 	$(top_srcdir)/etc/systemd/system/zfs-import-cache.service.in \
- 	$(top_srcdir)/etc/systemd/system/zfs-import-scan.service.in \
-+	$(top_srcdir)/etc/systemd/system/zfs-import@.service.in \
- 	$(top_srcdir)/etc/systemd/system/zfs-mount.service.in \
- 	$(top_srcdir)/etc/systemd/system/zfs-share.service.in \
- 	$(top_srcdir)/etc/systemd/system/zfs-import.target.in \
 diff --git a/etc/systemd/system/zfs-import@.service.in b/etc/systemd/system/zfs-import@.service.in
 new file mode 100644
-index 000000000..2db9fdaab
+index 000000000..9b4ee9371
 --- /dev/null
 +++ b/etc/systemd/system/zfs-import@.service.in
 @@ -0,0 +1,16 @@

debian/rules

@@ -28,17 +28,24 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 	  --bindir=/usr/bin \
 	  --sbindir=/sbin \
-	  --libdir=/lib \
+	  --libdir=/lib/"$(DEB_HOST_MULTIARCH)" \
+	  --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
 	  --with-udevdir=/lib/udev \
 	  --with-zfsexecdir=/usr/lib/zfs-linux \
 	  --enable-systemd \
 	  --enable-pyzfs \
 	  --with-python=python3 \
+	  --with-pammoduledir='/lib/$(DEB_HOST_MULTIARCH)/security' \
 	  --with-systemdunitdir=/lib/systemd/system \
 	  --with-systemdpresetdir=/lib/systemd/system-preset \
 	  --with-systemdgeneratordir=/lib/systemd/system-generators \
 	  --with-config=user
 
+	for i in $(wildcard $(CURDIR)/debian/*.install.in) ; do \
+		basename "$$i" | grep _KVERS_ && continue ; \
+		sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' "$$i" > "$${i%%.in}" ; \
+	done
+
 override_dh_auto_test:
 	# The dh_auto_test rule is disabled because
 	# `make check` cannot run in an unprivileged build environment.
@@ -62,9 +69,9 @@ override_dh_auto_install:
 	@# Zed has dependencies outside of the system root.
 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
 
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib
-	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
-		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	for i in `ls $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*.so`; do \
+		ln -s /lib/$(DEB_HOST_MULTIARCH)/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $${i}`; \
 		rm $${i}; \
 	done
 
@@ -96,6 +103,7 @@ override_dh_auto_clean:
 
 override_dh_missing:
 	find . -name lib*.la -delete
+	rm debian/tmp/lib/$(DEB_HOST_MULTIARCH)/security/pam_zfs_key.la
 	dh_missing --fail-missing
 
 override_dh_installdocs:

debian/zfsutils-linux.install

@@ -2,6 +2,7 @@
 etc/default/zfs
 etc/zfs/zfs-functions
 etc/zfs/zpool.d/
+lib/*/security/pam_zfs_key.so
 lib/systemd/system-preset/
 lib/systemd/system/zfs-import-cache.service
 lib/systemd/system/zfs-import-scan.service
@@ -19,8 +20,10 @@ sbin/fsck.zfs
 sbin/mount.zfs
 sbin/zdb
 sbin/zfs
+sbin/zfs_ids_to_path
 sbin/zhack
 sbin/zpool
+sbin/zstream
 sbin/zstreamdump
 usr/bin/zgenhostid
 usr/bin/zvol_wait
@@ -30,6 +33,7 @@ usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
 usr/share/bash-completion/completions
+usr/share/man/man1/arcstat.1
 usr/share/man/man1/zhack.1
 usr/share/man/man1/zvol_wait.1
 usr/share/man/man5/
@@ -37,9 +41,82 @@ usr/share/man/man8/fsck.zfs.8
 usr/share/man/man8/mount.zfs.8
 usr/share/man/man8/vdev_id.8
 usr/share/man/man8/zdb.8
-usr/share/man/man8/zfs.8
+usr/share/man/man8/zfs-allow.8
+usr/share/man/man8/zfs-bookmark.8
+usr/share/man/man8/zfs-change-key.8
+usr/share/man/man8/zfs-clone.8
+usr/share/man/man8/zfs-create.8
+usr/share/man/man8/zfs-destroy.8
+usr/share/man/man8/zfs-diff.8
+usr/share/man/man8/zfs-get.8
+usr/share/man/man8/zfs-groupspace.8
+usr/share/man/man8/zfs-hold.8
+usr/share/man/man8/zfs-inherit.8
+usr/share/man/man8/zfs-jail.8
+usr/share/man/man8/zfs-list.8
+usr/share/man/man8/zfs-load-key.8
 usr/share/man/man8/zfs-mount-generator.8
+usr/share/man/man8/zfs-mount.8
 usr/share/man/man8/zfs-program.8
+usr/share/man/man8/zfs-project.8
+usr/share/man/man8/zfs-projectspace.8
+usr/share/man/man8/zfs-promote.8
+usr/share/man/man8/zfs-receive.8
+usr/share/man/man8/zfs-recv.8
+usr/share/man/man8/zfs-redact.8
+usr/share/man/man8/zfs-release.8
+usr/share/man/man8/zfs-rename.8
+usr/share/man/man8/zfs-rollback.8
+usr/share/man/man8/zfs-send.8
+usr/share/man/man8/zfs-set.8
+usr/share/man/man8/zfs-share.8
+usr/share/man/man8/zfs-snapshot.8
+usr/share/man/man8/zfs-unallow.8
+usr/share/man/man8/zfs-unjail.8
+usr/share/man/man8/zfs-unload-key.8
+usr/share/man/man8/zfs-unmount.8
+usr/share/man/man8/zfs-upgrade.8
+usr/share/man/man8/zfs-userspace.8
+usr/share/man/man8/zfs-wait.8
+usr/share/man/man8/zfs.8
+usr/share/man/man8/zfs_ids_to_path.8
+usr/share/man/man8/zfsconcepts.8
+usr/share/man/man8/zfsprops.8
 usr/share/man/man8/zgenhostid.8
+usr/share/man/man8/zpool-add.8
+usr/share/man/man8/zpool-attach.8
+usr/share/man/man8/zpool-checkpoint.8
+usr/share/man/man8/zpool-clear.8
+usr/share/man/man8/zpool-create.8
+usr/share/man/man8/zpool-destroy.8
+usr/share/man/man8/zpool-detach.8
+usr/share/man/man8/zpool-events.8
+usr/share/man/man8/zpool-export.8
+usr/share/man/man8/zpool-get.8
+usr/share/man/man8/zpool-history.8
+usr/share/man/man8/zpool-import.8
+usr/share/man/man8/zpool-initialize.8
+usr/share/man/man8/zpool-iostat.8
+usr/share/man/man8/zpool-labelclear.8
+usr/share/man/man8/zpool-list.8
+usr/share/man/man8/zpool-offline.8
+usr/share/man/man8/zpool-online.8
+usr/share/man/man8/zpool-reguid.8
+usr/share/man/man8/zpool-remove.8
+usr/share/man/man8/zpool-reopen.8
+usr/share/man/man8/zpool-replace.8
+usr/share/man/man8/zpool-resilver.8
+usr/share/man/man8/zpool-scrub.8
+usr/share/man/man8/zpool-set.8
+usr/share/man/man8/zpool-split.8
+usr/share/man/man8/zpool-status.8
+usr/share/man/man8/zpool-sync.8
+usr/share/man/man8/zpool-trim.8
+usr/share/man/man8/zpool-upgrade.8
+usr/share/man/man8/zpool-wait.8
 usr/share/man/man8/zpool.8
+usr/share/man/man8/zpoolconcepts.8
+usr/share/man/man8/zpoolprops.8
+usr/share/man/man8/zstream.8
 usr/share/man/man8/zstreamdump.8
+usr/share/pam-configs/zfs_key