bump version to 2.2.4-pve1

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

.gitignore

@@ -0,0 +1,7 @@
+/*.build
+/*.buildinfo
+/*.changes
+/*.deb
+/*.dsc
+/*.tar*
+/zfs-utils-*.*/

Makefile

@@ -1,82 +1,93 @@
+include /usr/share/dpkg/default.mk
 # source form https://github.com/zfsonlinux/
 
-ZFSPKG=debian
-ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
-ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
-ZFSDIR=zfs-linux_${ZFSVER}
-ZFSSRC=upstream
+PACKAGE = zfs-linux
 
-ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
+SRCDIR = upstream
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
+ORIG_SRC_TAR = $(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
+
+ZFS_DEB1= libnvpair3linux_$(DEB_VERSION)_amd64.deb
 
 ZFS_DEB_BINARY =				\
-libpam-zfs_${ZFSPKGVER}_amd64.deb		\
-libuutil3linux_${ZFSPKGVER}_amd64.deb		\
-libzfs4linux_${ZFSPKGVER}_amd64.deb		\
-libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb	\
-libzpool4linux_${ZFSPKGVER}_amd64.deb		\
-zfs-test_${ZFSPKGVER}_amd64.deb			\
-zfsutils-linux_${ZFSPKGVER}_amd64.deb		\
-zfs-zed_${ZFSPKGVER}_amd64.deb
+libpam-zfs_$(DEB_VERSION)_amd64.deb		\
+libuutil3linux_$(DEB_VERSION)_amd64.deb		\
+libzfs4linux_$(DEB_VERSION)_amd64.deb		\
+libzfsbootenv1linux_$(DEB_VERSION)_amd64.deb	\
+libzpool5linux_$(DEB_VERSION)_amd64.deb		\
+zfs-test_$(DEB_VERSION)_amd64.deb			\
+zfsutils-linux_$(DEB_VERSION)_amd64.deb		\
+zfs-zed_$(DEB_VERSION)_amd64.deb
 
-ZFS_DBG_DEBS = $(patsubst %_${ZFSPKGVER}_amd64.deb, %-dbgsym_${ZFSPKGVER}_amd64.deb, ${ZFS_DEB1} ${ZFS_DEB_BINARY})
+ZFS_DBG_DEBS = $(patsubst %_$(DEB_VERSION)_amd64.deb, %-dbgsym_$(DEB_VERSION)_amd64.deb, $(ZFS_DEB1) $(ZFS_DEB_BINARY))
 
-ZFS_DEB2= ${ZFS_DEB_BINARY}			\
-libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-python3-pyzfs_${ZFSPKGVER}_amd64.deb		\
-pyzfs-doc_${ZFSPKGVER}_all.deb			\
-spl_${ZFSPKGVER}_all.deb			\
-zfs-initramfs_${ZFSPKGVER}_all.deb
-ZFS_DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
+ZFS_DEB2= $(ZFS_DEB_BINARY)			\
+libzfslinux-dev_$(DEB_VERSION)_amd64.deb		\
+python3-pyzfs_$(DEB_VERSION)_amd64.deb		\
+pyzfs-doc_$(DEB_VERSION)_all.deb			\
+spl_$(DEB_VERSION)_all.deb			\
+zfs-initramfs_$(DEB_VERSION)_all.deb
+DEBS= $(ZFS_DEB1) $(ZFS_DEB2) $(ZFS_DBG_DEBS)
 
-ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
+ZFS_DSC = zfs-linux_$(DEB_VERSION).dsc
 
 all: deb
-.PHONY: deb
-deb: ${ZFS_DEBS}
-.PHONY: dsc
-dsc: ${ZFS_DSC}
+
+.PHONY: deb dsc
+deb: $(DEBS)
+
+dsc:
+	rm -rf *.dsc $(BUILDDIR)
+	$(MAKE) $(ZFS_DSC)
+	lintian $(ZFS_DSC)
 
 # called from pve-kernel's Makefile to get patched sources
 .PHONY: kernel
-kernel: dsc
-	dpkg-source -x ${ZFS_DSC} ../pkg-zfs
-	${MAKE} -C ../pkg-zfs -f debian/rules adapt_meta_file
+kernel: $(ZFS_DSC)
+	dpkg-source -x $(ZFS_DSC) ../pkg-zfs
+	$(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
 
 .PHONY: dinstall
-dinstall: ${DEBS}
-	dpkg -i ${DEBS}
+dinstall: $(DEBS)
+	dpkg -i $(DEBS)
 
 .PHONY: submodule
 submodule:
-	test -f "${ZFSSRC}/README.md" || git submodule update --init
-${ZFSSRC}/README.md: submodule
+	test -f "$(SRCDIR)/README.md" || git submodule update --init
+
+$(SRCDIR)/README.md: submodule
 
 .PHONY: zfs
-zfs: ${ZFS_DEBS}
-${ZFS_DEB2}: ${ZFS_DEB1}
-${ZFS_DEB1}: ${ZFSDIR}
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
-	lintian ${ZFS_DEBS}
+zfs: $(DEBS)
+$(ZFS_DEB2) $(ZFS_DBG_DEBS): $(ZFS_DEB1)
+$(ZFS_DEB1): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
+	lintian $(DEBS)
 
-${ZFS_DSC}: ${ZFSDIR}
-	tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
-	cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
-	lintian $@
+$(ORIG_SRC_TAR): $(BUILDDIR)
+	tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
 
-${ZFSDIR}: ${ZFSSRC}/README.md ${ZFSSRC} ${ZFSPKG}
-	rm -rf ${ZFSDIR} ${ZFSDIR}.tmp
-	cp -a ${ZFSSRC} ${ZFSDIR}.tmp
-	cp -a ${ZFSPKG} ${ZFSDIR}.tmp/debian
-	mv ${ZFSDIR}.tmp ${ZFSDIR}
+$(ZFS_DSC): $(BUILDDIR) $(ORIG_SRC_TAR)
+	cd $(BUILDDIR); dpkg-buildpackage -S -uc -us -d
 
+sbuild: $(ZFS_DSC)
+	sbuild $(ZFS_DSC)
+
+$(BUILDDIR): $(SRCDIR)/README.md $(SRCDIR) debian
+	rm -rf $@ $@.tmp
+	cp -a $(SRCDIR) $@.tmp
+	cp -a debian $@.tmp/debian
+	mv $@.tmp $@
 
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR}
+	rm -rf $(PACKAGE)-[0-9]*/
+	rm -f *~ *.deb *.changes *.buildinfo *.build *.dsc *.orig.tar.* *.debian.tar.*
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: upload
-upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch amd64
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: $(DEBS)
+	tar -cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist $(UPLOAD_DIST) --arch $(DEB_HOST_ARCH)

debian/changelog

@@ -1,3 +1,188 @@
+zfs-linux (2.2.4-pve1) bookworm; urgency=medium
+
+  * update to new ZFS upstream 2.2.4 release
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 04 Jun 2024 11:11:48 +0200
+
+zfs-linux (2.2.3-pve2) bookworm; urgency=medium
+
+  * fix #4835: order zfs-import@ before -cache/-scan
+
+  * backport (module) patches from the 2.2.4 staging tree for better Linux 6.8
+    support
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 08 Apr 2024 17:43:35 +0200
+
+zfs-linux (2.2.3-pve1) bookworm; urgency=medium
+
+  * update to new ZFS upstream 2.2.3 release
+
+  * fix #5288: correctly handle zvols with more than 15 partitions in udev
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 11 Mar 2024 13:42:50 +0100
+
+zfs-linux (2.2.2-pve2) bookworm; urgency=medium
+
+  * fix #5101: ensure datasets that have sharenfs enabled are not unexported
+    after a `zfs mount -a` call.
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 19 Feb 2024 16:56:37 +0100
+
+zfs-linux (2.2.2-pve1) bookworm; urgency=medium
+
+  * update to new ZFS upstream 2.2.2 release, as we have all important fixes
+    for recent discovered data integrity issues backported to previous
+    versions, there should be no visible change in that regard.
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 04 Dec 2023 16:50:25 +0100
+
+zfs-linux (2.2.0-pve4) bookworm; urgency=medium
+
+  * pick bug-fix staged for 2.2.2:
+    - fix (rare) corruption caused by dirty dnode being treated as clean
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 29 Nov 2023 09:21:26 +0100
+
+zfs-linux (2.2.0-pve3) bookworm; urgency=medium
+
+  * pick bug-fixes staged for 2.2.1:
+    - add a tunable to disable BRT support and disable it by default
+    - fix block cloning between unencrypted and encrypted datasets
+    - disable block cloning by default
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 17 Nov 2023 17:32:58 +0100
+
+zfs-linux (2.2.0-pve2) bookworm; urgency=medium
+
+  * avoid error from zfs-mount when /etc/exports.d does not exist (yet)
+
+  * ensure vdev_stat struct layout compat between 2.1 and 2.2, avoiding
+    false-positive detection of the non-allocating feature from 2.2 when the
+    kernel still used the 2.1 module.
+
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Nov 2023 16:02:02 +0100
+
+zfs-linux (2.2.0-pve1) bookworm; urgency=medium
+
+  * update ZFS to 2.2.0
+
+  * zfsutils-linux:
+    - install new systemd units to trim a pool periodically
+    - ship new `zilstat` binary
+    - and new man pages for zfs lock, zfs unlock and vdev properties
+    - remove man pages for zfs jail and zfs unjail, those are for FreeBSD only
+      and the respective commands where never exposed for Linux
+
+  * fix #5014: re-enable blk-mq optimization
+
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Oct 2023 12:09:24 +0200
+
+zfs-linux (2.1.13-pve1) bookworm; urgency=medium
+
+  * update ZFS to 2.1.13
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 28 Sep 2023 12:22:28 +0200
+
+zfs-linux (2.1.12-pve1) bookworm; urgency=medium
+
+  * update ZFS to 2.1.12
+
+  * zfs trim: avoid exit-failure if last pool isn't nvme-only
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 13 Jun 2023 15:25:16 +0200
+
+zfs-linux (2.1.11-pve2) bookworm; urgency=medium
+
+  * re-build for Debian 12 Bookworm based releases
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 20 May 2023 19:32:04 +0200
+
+zfs-linux (2.1.11-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.11
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 20 Apr 2023 09:30:53 +0200
+
+zfs-linux (2.1.9-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.9
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Jan 2023 15:03:22 +0100
+
+zfs-linux (2.1.7-pve3) bullseye; urgency=medium
+
+  * backport a fix for as potentially hanging pipe when resizing it on recv
+
+  * backport a fix for setting extended attributes (xattr)
+
+  * adapt to 6.1 changes for open syscall with TMPFILE option
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 07 Jan 2023 13:21:57 +0100
+
+zfs-linux (2.1.7-pve2) bullseye; urgency=medium
+
+  * backport fix for initramfs script when detecting rootfs legacy mountpoints
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 02 Jan 2023 17:07:18 +0100
+
+zfs-linux (2.1.7-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.7
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 06 Dec 2022 16:41:31 +0100
+
+zfs-linux (2.1.6-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.6
+
+  * symlink zpool_influxdb to /bin
+
+  * symlink zfs, zpool to /bin/ for non-root usage
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 04 Oct 2022 16:09:17 +0200
+
+zfs-linux (2.1.5-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.5
+
+  * Build with libcurl for new keylocation=https://
+
+  * d/control: add new zfs-dracut package
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2022 16:13:24 +0200
+
+zfs-linux (2.1.4-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Mar 2022 09:28:50 +0100
+
+zfs-linux (2.1.3-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 11 Mar 2022 16:36:22 +0100
+
+zfs-linux (2.1.2-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.2
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 11 Jan 2022 11:31:34 +0100
+
+zfs-linux (2.1.1-pve3) bullseye; urgency=medium
+
+  * zfs-utils: arc stat/summary: guard access to l2arc MFU/MRU stats to avoid
+    bogus exception when checking the ARC stats/summary on a older, 2.0 based
+    ZFS kernel module with the newer, 2.1 based, user space tools.
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 10 Nov 2021 09:58:31 +0100
+
+zfs-linux (2.1.1-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.1
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 06:16:14 +0200
+
 zfs-linux (2.0.5-pve1) bullseye; urgency=medium
 
   * update ZFS to 2.0.5

debian/control

@@ -5,11 +5,14 @@ Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: abigail-tools,
                debhelper-compat (= 12),
                dh-python,
+               libaio-dev,
                libblkid-dev,
+               libcurl4-openssl-dev | libcurl4-gnutls-dev,
                libelf-dev,
                libpam0g-dev,
                libssl-dev | libssl1.0-dev,
                libtool,
+               libudev-dev,
                lsb-release,
                python3-cffi,
                python3-setuptools,
@@ -70,7 +73,7 @@ Depends: libssl-dev | libssl1.0-dev,
          libuutil3linux (= ${binary:Version}),
          libzfs4linux (= ${binary:Version}),
          libzfsbootenv1linux (= ${binary:Version}),
-         libzpool4linux (= ${binary:Version}),
+         libzpool5linux (= ${binary:Version}),
          ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
 Description: OpenZFS filesystem development files for Linux
@@ -78,15 +81,18 @@ Description: OpenZFS filesystem development files for Linux
  libraries of OpenZFS filesystem.
  .
  This package includes the development files of libnvpair3, libuutil3,
- libzpool4 and libzfs4.
+ libzpool5 and libzfs4, libzfsbootenv1.
 
 Package: libzfs4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+# The libcurl4 is loaded through dlopen("libcurl.so.4").
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
+Recommends: libcurl4
 Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4
 Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4
-Description: OpenZFS filesystem library for Linux
+Description: OpenZFS filesystem library for Linux - general support
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
  compression, encryption, snapshots, and more.
@@ -106,7 +112,7 @@ Description: OpenZFS filesystem library for Linux
  .
  The zfsbootenv library provides support for modifying ZFS label information.
 
-Package: libzpool4linux
+Package: libzpool5linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -145,6 +151,7 @@ Section: contrib/doc
 Architecture: all
 Depends:
  ${sphinxdoc:Depends},
+ ${sphinxdoc:Built-Using},
  ${misc:Depends}
 Recommends:
  python3-pyzfs
@@ -180,11 +187,24 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
  This package adds OpenZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
 
+Package: zfs-dracut
+Architecture: all
+Depends: dracut,
+         zfsutils-linux (>= ${source:Version}),
+         ${misc:Depends}
+Description: OpenZFS root filesystem capabilities for Linux - dracut
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
+ .
+ This package adds OpenZFS to the system initramfs with a hook
+ for the dracut infrastructure.
+
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
-Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
-Recommends: lsb-base, zfs-zed
+Depends: python3, ${misc:Depends}, ${shlibs:Depends}
+Recommends: zfs-zed
 Suggests: nfs-kernel-server,
           samba-common-bin (>= 3.0.23),
           zfs-initramfs
@@ -204,6 +224,7 @@ Architecture: linux-any
 Depends: zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Recommends: bsd-mailx | mailutils
 Description: OpenZFS Event Daemon
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -265,17 +286,3 @@ Description: Solaris Porting Layer user-space utilities for Linux (dummy)
  to Linux primitives.
  .
  This is a transitional dummy package. It can safely be removed.
-
-Package: zfs-dbg
-Section: contrib/metapackages
-Architecture: all
-Suggests: libnvpair3linux-dbgsym,
-         libpam-zfs-dbgsym,
-         libuutil3linux-dbgsym,
-         libzfs4linux-dbgsym,
-         libzfsbootenv1linux-dbgsym,
-         libzpool4linux-dbgsym,
-         zfs-test-dbgsym,
-         zfsutils-linux-dbgsym,
-         zfs-zed-dbgsym,
-Description: Transitional package. It can be safely removed.

debian/copyright

@@ -37,25 +37,26 @@ Copyright: 2011, 2013, Nexenta Systems, Inc.
            2007, 2009, Sun Microsystems, Inc.
 License: CDDL-1.0
 
-Files: cmd/arc_summary/*
+Files: cmd/arc_summary
 Copyright:
   2010, 2011, Jason J. Hellenthal <jhell@DataIX.net>
   2010, Martin Matuska <mm@FreeBSD.org>
   2008, Ben Rockwood <benr@cuddletech.com>
+  2017, Scot W. Stevenson <scot.stevenson@gmail.com>
 License: BSD-2-clause
 
-Files: cmd/arcstat/*
+Files: cmd/arcstat.in
 Source: http://github.com/mharsch/arcstat
 Copyright:
   2007, Oracle and/or its affiliates.
   2010-2015, Mike Harsch
 License: CDDL-1.0
 
-Files: cmd/dbufstat/*
+Files: cmd/dbufstat.in
 Copyright: 2013, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 
-Files: cmd/mount_zfs/*
+Files: cmd/mount_zfs.c
 Copyright: 2011, Lawrence Livermore National Security, LLC
            2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
@@ -64,7 +65,7 @@ Files: cmd/raidz_test/*
 Copyright: 2016 Gvozden Nešković.
 License: CDDL-1.0
 
-Files: cmd/vdev_id/*
+Files: udev/vdev_id
 Copyright: 2011, 2013, Nexenta Systems, Inc.
            2007, 2009, Sun Microsystems, Inc.
 License: CDDL-1.0
@@ -106,7 +107,7 @@ Copyright:
   2018 Datto Inc.
 License: CDDL-1.0
 
-Files: cmd/zhack/*
+Files: cmd/zhack.c
 Copyright: 2013, Steven Hartland.
            2011, 2012, 2014, Delphix.
 License: CDDL-1.0
@@ -132,14 +133,14 @@ Copyright:
  2017, Intel Corporation.
 License: CDDL-1.0
 
-Files: cmd/zstreamdump/*
+Files: cmd/zstream/*
 Copyright:
-  2013, Delphix.
+  2013, 2015 Delphix.
   2012, Martin Matuska <martin@matuska.org>
   2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 
-Files: cmd/ztest/*
+Files: cmd/ztest.c
 Copyright:
   2005, 2010, Oracle and/or its affiliates.
   2011, 2018 by Delphix.
@@ -150,7 +151,7 @@ Copyright:
   2017, Intel Corporation.
 License: CDDL-1.0
 
-Files: cmd/zvol_id/*
+Files: udev/zvol_id.c
 Copyright: 2011, Fajar A. Nugraha.
 License: CDDL-1.0
 
@@ -158,27 +159,6 @@ Files: config/*
 Copyright: 1996-2012, Free Software Foundation, Inc.
 License: GPL-2+ with autoconf exception
 
-Files: config/ltoptions.m4
-       config/lt~obsolete.m4
-       config/ltversion.m4
-       config/libtool.m4
-       config/ltsugar.m4
-Copyright: 1996-2012, Free Software Foundation, Inc.
-License: PERMISSIVE
- This file is free software; the Free Software Foundation gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
-Files: config/install-sh
-Copyright: 1994, X Consortium
-License: Expat
-
-Files: configure
-Copyright: 1992-1996, 1998-2010, Free Software
-License: PERMISSIVE2
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
 Files: contrib/bash_completion.d/*
 Copyright: 2010, 2013, Aneurin Price <aneurin.price@gmail.com>
 License: Expat
@@ -201,14 +181,8 @@ Copyright:
  2011-2013, Darik Horn <dajhorn@vanadac.com>
  2018-2019, Mo Zhou <cdluminate@gmail.com>
  2018-2020, Mo Zhou <lumin@debian.org>
- 2015-2021 Proxmox Server Solutions GmbH <support@proxmox.com>
 License: GPL-2+
 
-Files: debian/po/*
-Copyright:
- 2013, The Debian po file translators.
-License: CDDL-1.0
-
 Files: etc/init.d/zfs-*.in
 Copyright:
   2016, Carlo Landmeter <clandmeter@gmail.com>
@@ -399,12 +373,7 @@ Copyright: 2009, Oracle and/or its affiliates.
   2009, Michael Gebetsroither <michael.geb@gmx.at>
 License: CDDL-1.0
 
-Files: man/man5/zfs-events.5
-       man/man5/zfs-module-parameters.5
-Copyright: 2013, Turbo Fredriksson <turbo@bayour.com>
-License: CDDL-1.0
-
-Files: man/man5/zpool-features.5
+Files: man/man7/zpool-features.7
 Copyright:
   2013, Delphix
   2013, Saso Kiselkov
@@ -427,16 +396,12 @@ Copyright: 2007, Sun Microsystems, Inc.
   2013, Delphix
 License: CDDL-1.0
 
-Files: man/man8/zstreamdump.8
-Copyright: 2009, Sun Microsystems, Inc.
-License: CDDL-1.0
-
 Files: module/*
 Copyright: 2011-2014, Delphix.
   2007, 2009, 2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 
-Files: module/lua
+Files: module/lua/*
 Copyright: 1994-2015 Lua.org, PUC-Rio.
 License: Expat
 
@@ -483,7 +448,7 @@ Copyright: 2013, Saso Kiselkov.
   2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 
-Files: module/zcommon/zfs_uio.c
+Files: module/os/linux/zfs/zfs_uio.c
 Copyright: 2007, 2009, 2010, Sun Microsystems, Inc.
   1983-1989, AT&T
   1982, 1986, 1988, The Regents of the University of California
@@ -583,7 +548,6 @@ Files: module/zfs/dmu_zfetch.c
   module/zfs/rrwlock.c
   module/zfs/space_map.c
   module/zfs/space_reftree.c
-  module/zfs/vdev_cache.c
   module/zfs/vdev_mirror.c
   module/zfs/vdev_missing.c
   module/zfs/vdev_queue.c
@@ -651,14 +615,16 @@ Copyright: 2013, Steven Hartland.
 License: CDDL-1.0
 
 Files: module/zfs/gzip.c
-  module/zfs/sha256.c
-  module/zfs/spa_boot.c
   module/zfs/unique.c
   module/zfs/zfs_byteswap.c
   module/zfs/zle.c
 Copyright: 2005-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 
+Files: module/icp/algs/sha2/*
+Copyright: 2022, Tino Reichardt <milky-zfs@mcmilk.de>
+License: CDDL-1.0
+
 Files: module/zfs/lz4.c
 Copyright: 2011-2013, Yann Collet
 License: BSD-2-clause
@@ -697,13 +663,14 @@ Copyright: 2011, 2014, Nexenta Systems, Inc.
   2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 
-Files: module/zfs/vdev_disk.c
+Files: module/os/linux/zfs/vdev_disk.c
 Copyright: 2012, 2014, Delphix.
   2008-2010, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 
-Files: module/zfs/zfs_ctldir.c
-Copyright: 2013, Delphix.
+Files: module/os/freebsd/zfs/zfs_ctldir.c
+  module/os/linux/zfs/zfs_ctldir.c
+Copyright: 2013, 2015 Delphix.
   2011, Lawrence Livermore National Security, LLC
   2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
@@ -726,7 +693,8 @@ Copyright: 2013, Delphix.
   2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 
-Files: module/zfs/zfs_vfsops.c
+Files: module/os/freebsd/zfs/zfs_vfsops.c
+  module/os/linux/zfs/zfs_vfsops.c
   module/zfs/zil.c
 Copyright: 2011-2014, Delphix.
   2010, Robert Milkowski
@@ -741,8 +709,9 @@ Copyright: 2015, Chunwei Chen.
   2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 
-Files: module/zfs/zfs_znode.c
-Copyright: 2013, Delphix.
+Files: module/os/freebsd/zfs/zfs_znode.c
+  module/os/linux/zfs/zfs_znode.c
+Copyright: 2013, 2015 Delphix.
   2007, Jeremy Teo
   2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
@@ -753,20 +722,20 @@ Copyright: 2013, Saso Kiselkov.
   2009, Sun Microsystems, Inc.
 License: CDDL-1.0
 
-Files: module/zfs/zpl_ctldir.c
-  module/zfs/zpl_super.c
-  module/zfs/zpl_xattr.c
+Files: module/os/linux/zfs/zpl_ctldir.c
+  module/os/linux/zfs/zpl_super.c
+  module/os/linux/zfs/zpl_xattr.c
   module/zfs/zvol.c
 Copyright: 2008-2011, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 
-Files: module/zfs/zpl_export.c
+Files: module/os/linux/zfs/zpl_export.c
 Copyright: 2012, Cyril Plisko.
   2011, Gunnar Beutner
 License: CDDL-1.0
 
-Files: module/zfs/zpl_file.c
-  module/zfs/zpl_inode.c
+Files: module/os/linux/zfs/zpl_file.c
+  module/os/linux/zfs/zpl_inode.c
 Copyright: 2015, Chunwei Chen.
   2011, Lawrence Livermore National Security, LLC
 License: CDDL-1.0

debian/libzfsbootenv1linux.lintian-overrides

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

debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch

@@ -10,7 +10,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 29 insertions(+), 5 deletions(-)
 
 diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
-index b3c1befaa..660d8ccb9 100644
+index 20064a0fb..4d5f545ad 100644
 --- a/config/zfs-meta.m4
 +++ b/config/zfs-meta.m4
 @@ -1,9 +1,10 @@
@@ -67,4 +67,4 @@ index b3c1befaa..660d8ccb9 100644
 +		elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
  			_match="${ZFS_META_NAME}-${ZFS_META_VERSION}"
  			_alias=$(git describe --match=${_match} 2>/dev/null)
- 			_release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')
+ 			_release=$(echo ${_alias}|sed "s/${ZFS_META_NAME}//"|cut -f3- -d'-'|tr - _)

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

@@ -13,15 +13,15 @@ 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 008075138..570e27707 100644
+index be2fc6734..7606604ec 100644
 --- a/etc/systemd/system/zfs-zed.service.in
 +++ b/etc/systemd/system/zfs-zed.service.in
-@@ -4,7 +4,7 @@ Documentation=man:zed(8)
- ConditionPathIsDirectory=/sys/module/zfs
+@@ -5,7 +5,7 @@ ConditionPathIsDirectory=/sys/module/zfs
  
  [Service]
+ EnvironmentFile=-@initconfdir@/zfs
 -ExecStart=@sbindir@/zed -F
 +ExecStart=/usr/sbin/zed -F
- Restart=on-abort
+ Restart=always
  
  [Install]

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

@@ -14,15 +14,15 @@ 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 f0317e23e..9a5e9cb17 100644
+index c5dd45d87..1c792edf0 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
- [Service]
+@@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs
  Type=oneshot
  RemainAfterExit=yes
--ExecStart=@sbindir@/zpool import -aN -o cachefile=none
-+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
+ EnvironmentFile=-@initconfdir@/zfs
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS
  
  [Install]
  WantedBy=zfs-import.target

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

@@ -9,23 +9,14 @@ behavior of mdadm.
 
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- cmd/zed/zed.d/zed.rc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ cmd/zed/zed.d/zed.rc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index df560f921..4ce7af744 100644
+index bc269b155..e6d4b1703 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
-@@ -15,7 +15,7 @@
- # Email will only be sent if ZED_EMAIL_ADDR is defined.
- # Disabled by default; uncomment to enable.
- #
--#ZED_EMAIL_ADDR="root"
-+ZED_EMAIL_ADDR="root"
- 
- ##
- # Name or path of executable responsible for sending notifications via email;
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root"
  ##
  # Minimum number of seconds between notifications for a similar event.
  #

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

@@ -3,27 +3,44 @@ From: Antonio Russo <antonio.e.russo@gmail.com>
 Date: Fri, 20 Mar 2020 17:28:43 +0100
 Subject: [PATCH] dont symlink zed scripts
 
-(cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0])
+Of the zedlet scripts shipped by upstream, a subset are enabled by
+default, by creating symlinks in /etc/zfs/zed.d.  These symlinks are
+shipped in the zfs-zed package.  dpkg, however, does not support
+conffile handling of symlinks, and therefore any changes (removals) to
+the symlinks are not preserved on package upgrade.
 
-[0] https://salsa.debian.org/zfsonlinux-team/zfs.git
+To address this policy violation, we:
 
-Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+ 1. During package build, create a list of enabled-by-default zedlets,
+    instead of creating symlinks.
+ 2. On package removal, identify all enabled-by-default zedlets whose
+    symlinks do not exist (i.e., were removed by the user). This is done
+    by creating "whiteout" links to /dev/null in their place).
+ 3. On package installation, create links to enabled-by-default zedlets
+    UNLESS there is already a file there (i.e., abort if there is a
+    whiteout link).
+ 4. We also clean up broken symlinks to removed zedlets at package
+    postinst.
 
 Description: track default symlinks, instead of symlinking
 Forwarded: no need
+(cherry picked from https://salsa.debian.org/zfsonlinux-team/zfs/-/commit/5cee380324d7)
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  cmd/zed/zed.d/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
-index 8b2d0c200..118c96547 100644
+index 812558cf6..f802cf140 100644
 --- a/cmd/zed/zed.d/Makefile.am
 +++ b/cmd/zed/zed.d/Makefile.am
-@@ -48,6 +48,6 @@ install-data-hook:
- 	for f in $(zedconfdefaults); do \
- 	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
- 	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
--	    ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
+@@ -48,7 +48,7 @@ zed-install-data-hook:
+ 	set -x; for f in $(zedconfdefaults); do \
+ 	  [ -f "$(DESTDIR)$(zedconfdir)/$${f}" ] ||\
+ 	    [ -L "$(DESTDIR)$(zedconfdir)/$${f}" ] || \
+-	    $(LN_S) "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
 +	    echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
  	done
- 	chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
+ 
+ SHELLCHECKSCRIPTS += $(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)

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

@@ -10,18 +10,34 @@ by scanning /dev/disk/by-id, irrespective of the existence and content of
 the instance name is used unescaped (see systemd.unit(5)), since zpool names
 can contain characters which will be escaped by systemd.
 
+Its instances are ordered before the other two "big" import services to avoid
+races and spurious (cosmetic!) service failures.
+
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- etc/systemd/system/50-zfs.preset.in       |  1 +
- etc/systemd/system/Makefile.am            |  1 +
- etc/systemd/system/zfs-import@.service.in | 16 ++++++++++++++++
- 3 files changed, 18 insertions(+)
+ etc/Makefile.am                           |  1 +
+ etc/systemd/system/50-zfs.preset          |  1 +
+ etc/systemd/system/zfs-import@.service.in | 18 ++++++++++++++++++
+ 3 files changed, 20 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
+diff --git a/etc/Makefile.am b/etc/Makefile.am
+index 7187762d3..de131dc87 100644
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -54,6 +54,7 @@ dist_systemdpreset_DATA = \
+ systemdunit_DATA = \
+ 	%D%/systemd/system/zfs-import-cache.service \
+ 	%D%/systemd/system/zfs-import-scan.service \
++	%D%/systemd/system/zfs-import@.service \
+ 	%D%/systemd/system/zfs-import.target \
+ 	%D%/systemd/system/zfs-mount.service \
+ 	%D%/systemd/system/zfs-scrub-monthly@.timer \
+diff --git a/etc/systemd/system/50-zfs.preset b/etc/systemd/system/50-zfs.preset
 index e4056a92c..030611419 100644
---- a/etc/systemd/system/50-zfs.preset.in
-+++ b/etc/systemd/system/50-zfs.preset.in
+--- a/etc/systemd/system/50-zfs.preset
++++ b/etc/systemd/system/50-zfs.preset
 @@ -1,6 +1,7 @@
  # ZFS is enabled by default
  enable zfs-import-cache.service
@@ -30,24 +46,12 @@ index e4056a92c..030611419 100644
  enable zfs-import.target
  enable zfs-mount.service
  enable zfs-share.service
-diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
-index c374a52ac..25d1b99d7 100644
---- a/etc/systemd/system/Makefile.am
-+++ b/etc/systemd/system/Makefile.am
-@@ -7,6 +7,7 @@ systemdunit_DATA = \
- 	zfs-zed.service \
- 	zfs-import-cache.service \
- 	zfs-import-scan.service \
-+	zfs-import@.service \
- 	zfs-mount.service \
- 	zfs-share.service \
- 	zfs-volume-wait.service \
 diff --git a/etc/systemd/system/zfs-import@.service.in b/etc/systemd/system/zfs-import@.service.in
 new file mode 100644
-index 000000000..9b4ee9371
+index 000000000..5bd19fb79
 --- /dev/null
 +++ b/etc/systemd/system/zfs-import@.service.in
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,18 @@
 +[Unit]
 +Description=Import ZFS pool %i
 +Documentation=man:zpool(8)
@@ -56,6 +60,8 @@ index 000000000..9b4ee9371
 +After=cryptsetup.target
 +After=multipathd.target
 +Before=zfs-import.target
++Before=zfs-import-scan.service
++Before=zfs-import-cache.service
 +
 +[Service]
 +Type=oneshot

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

@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Russo <antonio.e.russo@gmail.com>
-Date: Tue, 5 May 2020 22:15:16 -0600
-Subject: [PATCH] Use installed python3
-
----
- .../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 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-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
-+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
-@@ -100,10 +100,10 @@ typeset -a pos_cmds_out=(
- # the same as the input and the --sort-keys option was added.  Detect when
- # --sort-keys is supported and apply the option to ensure the expected order.
- #
--if python -m json.tool --sort-keys <<< "{}"; then
--	JSON_TOOL_CMD="python -m json.tool --sort-keys"
-+if python3 -m json.tool --sort-keys <<< "{}"; then
-+	JSON_TOOL_CMD="python3 -m json.tool --sort-keys"
- else
--	JSON_TOOL_CMD="python -m json.tool"
-+	JSON_TOOL_CMD="python3 -m json.tool"
- fi
- 
- 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 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
- # ZoL issue #7432
- log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2
- log_must touch /$TESTPOOL/$TESTFS2/attrs
--log_must eval "python -c 'print \"a\" * 4096' | \
-+log_must eval "python3 -c 'print \"a\" * 4096' | \
- 	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 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' |
-+log_must eval "python3 -c 'print \"a\" * 512' |
-     set_xattr_stdin bigval /$POOL/fs/attrs"
- log_must zfs snapshot $POOL/fs@d
- 

debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stoiko Ivanov <s.ivanov@proxmox.com>
+Date: Thu, 4 Feb 2021 19:01:12 +0100
+Subject: [PATCH] Patch: move manpage arcstat(1) to arcstat(8).
+
+Originally-By: Mo Zhou <cdluminate@gmail.com>
+Originally-By: Antonio Russo <aerusso@aerusso.net>
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ man/Makefile.am                        | 2 +-
+ man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 43bb014dd..a9293468a 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -2,7 +2,6 @@ dist_noinst_man_MANS = \
+ 	%D%/man1/cstyle.1
+ 
+ dist_man_MANS = \
+-	%D%/man1/arcstat.1 \
+ 	%D%/man1/raidz_test.1 \
+ 	%D%/man1/test-runner.1 \
+ 	%D%/man1/zhack.1 \
+@@ -22,6 +21,7 @@ dist_man_MANS = \
+ 	%D%/man7/zpoolconcepts.7 \
+ 	%D%/man7/zpoolprops.7 \
+ 	\
++	%D%/man8/arcstat.8 \
+ 	%D%/man8/fsck.zfs.8 \
+ 	%D%/man8/mount.zfs.8 \
+ 	%D%/man8/vdev_id.8 \
+diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
+similarity index 99%
+rename from man/man1/arcstat.1
+rename to man/man8/arcstat.8
+index 82358fa68..a8fb55498 100644
+--- a/man/man1/arcstat.1
++++ b/man/man8/arcstat.8
+@@ -13,7 +13,7 @@
+ .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
+ .\"
+ .Dd December 23, 2022
+-.Dt ARCSTAT 1
++.Dt ARCSTAT 8
+ .Os
+ .
+ .Sh NAME

debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch

@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Stoiko Ivanov <s.ivanov@proxmox.com>
-Date: Thu, 4 Feb 2021 19:01:12 +0100
-Subject: [PATCH] Patch: move manpage arcstat(1) to arcstat(8).
-
-Originally-By: Mo Zhou <cdluminate@gmail.com>
-Originally-By: Antonio Russo <aerusso@aerusso.net>
-
-Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
----
- man/man1/Makefile.am                   | 2 +-
- man/man8/Makefile.am                   | 1 +
- man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
- rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
-
-diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
-index 8d7457a3e..101af7b6c 100644
---- a/man/man1/Makefile.am
-+++ b/man/man1/Makefile.am
-@@ -1,4 +1,4 @@
--dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
-+dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1
- EXTRA_DIST = cstyle.1
- 
- if BUILD_LINUX
-diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
-index 07f6aefa6..a757b1c62 100644
---- a/man/man8/Makefile.am
-+++ b/man/man8/Makefile.am
-@@ -1,6 +1,7 @@
- include $(top_srcdir)/config/Substfiles.am
- 
- dist_man_MANS = \
-+	arcstat.8 \
- 	fsck.zfs.8 \
- 	mount.zfs.8 \
- 	vdev_id.8 \
-diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
-similarity index 99%
-rename from man/man1/arcstat.1
-rename to man/man8/arcstat.8
-index ca508b49c..0aa81849a 100644
---- a/man/man1/arcstat.1
-+++ b/man/man8/arcstat.8
-@@ -13,7 +13,7 @@
- .\" Copyright (c) 2015 by Delphix. All rights reserved.
- .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
- .\"
--.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS
-+.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS
- .SH NAME
- arcstat \- report ZFS ARC and L2ARC statistics
- .SH SYNOPSIS

debian/patches/0009-arc-stat-summary-guard-access-to-freshly-introduced-.patch

@@ -0,0 +1,438 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Wed, 10 Nov 2021 09:29:47 +0100
+Subject: [PATCH] arc stat/summary: guard access to freshly introduced stats
+
+l2arc MFU/MRU and zfetch past future and stride stats were introduced
+in 2.1 and 2.2.4 respectively:
+
+commit 085321621e79a75bea41c2b6511da6ebfbf2ba0a added printing MFU
+and MRU stats for 2.1 user space tools, but those keys are not
+available in the 2.0 module. That means it may break the arcstat and
+arc_summary tools after upgrade to 2.1 (user space), before a reboot
+to the new 2.1 ZFS kernel-module happened, due to python raising a
+KeyError on the dict access then.
+
+Move those two keys to a .get accessor with `0` as fallback, as it
+should be better to show some possible wrong data for new stat-keys
+than throwing an exception.
+
+also move l2_mfu_asize  l2_mru_asize l2_prefetch_asize
+l2_bufc_data_asize l2_bufc_metadata_asize to .get accessor
+(these are only present with a cache device in the pool)
+
+guard access to iohits and uncached state introduced in
+792a6ee462efc15a7614f27e13f0f8aaa9414a08
+
+guard access to zfetch past future stride stats introduced in
+026fe796465e3da7b27d06ef5338634ee6dd30d8
+
+These are present in the current kernel, but lead to an exception, if
+running the new user-space with an old kernel module.
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ cmd/arc_summary | 132 ++++++++++++++++++++++++------------------------
+ cmd/arcstat.in  |  48 +++++++++---------
+ 2 files changed, 90 insertions(+), 90 deletions(-)
+
+diff --git a/cmd/arc_summary b/cmd/arc_summary
+index 100fb1987..30f5d23e9 100755
+--- a/cmd/arc_summary
++++ b/cmd/arc_summary
+@@ -551,21 +551,21 @@ def section_arc(kstats_dict):
+     arc_target_size = arc_stats['c']
+     arc_max = arc_stats['c_max']
+     arc_min = arc_stats['c_min']
+-    meta = arc_stats['meta']
+-    pd = arc_stats['pd']
+-    pm = arc_stats['pm']
+-    anon_data = arc_stats['anon_data']
+-    anon_metadata = arc_stats['anon_metadata']
+-    mfu_data = arc_stats['mfu_data']
+-    mfu_metadata = arc_stats['mfu_metadata']
+-    mru_data = arc_stats['mru_data']
+-    mru_metadata = arc_stats['mru_metadata']
+-    mfug_data = arc_stats['mfu_ghost_data']
+-    mfug_metadata = arc_stats['mfu_ghost_metadata']
+-    mrug_data = arc_stats['mru_ghost_data']
+-    mrug_metadata = arc_stats['mru_ghost_metadata']
+-    unc_data = arc_stats['uncached_data']
+-    unc_metadata = arc_stats['uncached_metadata']
++    meta = arc_stats.get('meta', 0)
++    pd = arc_stats.get('pd', 0)
++    pm = arc_stats.get('pm', 0)
++    anon_data = arc_stats.get('anon_data', 0)
++    anon_metadata = arc_stats.get('anon_metadata', 0)
++    mfu_data = arc_stats.get('mfu_data', 0)
++    mfu_metadata = arc_stats.get('mfu_metadata', 0)
++    mru_data = arc_stats.get('mru_data', 0)
++    mru_metadata = arc_stats.get('mru_metadata', 0)
++    mfug_data = arc_stats.get('mfu_ghost_data', 0)
++    mfug_metadata = arc_stats.get('mfu_ghost_metadata', 0)
++    mrug_data = arc_stats.get('mru_ghost_data', 0)
++    mrug_metadata = arc_stats.get('mru_ghost_metadata', 0)
++    unc_data = arc_stats.get('uncached_data', 0)
++    unc_metadata = arc_stats.get('uncached_metadata', 0)
+     bonus_size = arc_stats['bonus_size']
+     dnode_limit = arc_stats['arc_dnode_limit']
+     dnode_size = arc_stats['dnode_size']
+@@ -655,13 +655,13 @@ def section_arc(kstats_dict):
+     prt_i1('L2 cached evictions:', f_bytes(arc_stats['evict_l2_cached']))
+     prt_i1('L2 eligible evictions:', f_bytes(arc_stats['evict_l2_eligible']))
+     prt_i2('L2 eligible MFU evictions:',
+-           f_perc(arc_stats['evict_l2_eligible_mfu'],
++           f_perc(arc_stats.get('evict_l2_eligible_mfu', 0), # 2.0 module compat
+            arc_stats['evict_l2_eligible']),
+-           f_bytes(arc_stats['evict_l2_eligible_mfu']))
++           f_bytes(arc_stats.get('evict_l2_eligible_mfu', 0)))
+     prt_i2('L2 eligible MRU evictions:',
+-           f_perc(arc_stats['evict_l2_eligible_mru'],
++           f_perc(arc_stats.get('evict_l2_eligible_mru', 0), # 2.0 module compat
+            arc_stats['evict_l2_eligible']),
+-           f_bytes(arc_stats['evict_l2_eligible_mru']))
++           f_bytes(arc_stats.get('evict_l2_eligible_mru', 0)))
+     prt_i1('L2 ineligible evictions:',
+            f_bytes(arc_stats['evict_l2_ineligible']))
+     print()
+@@ -672,106 +672,106 @@ def section_archits(kstats_dict):
+     """
+ 
+     arc_stats = isolate_section('arcstats', kstats_dict)
+-    all_accesses = int(arc_stats['hits'])+int(arc_stats['iohits'])+\
++    all_accesses = int(arc_stats['hits'])+int(arc_stats.get('iohits', 0))+\
+         int(arc_stats['misses'])
+ 
+     prt_1('ARC total accesses:', f_hits(all_accesses))
+     ta_todo = (('Total hits:', arc_stats['hits']),
+-               ('Total I/O hits:', arc_stats['iohits']),
++               ('Total I/O hits:', arc_stats.get('iohits', 0)),
+                ('Total misses:', arc_stats['misses']))
+     for title, value in ta_todo:
+         prt_i2(title, f_perc(value, all_accesses), f_hits(value))
+     print()
+ 
+     dd_total = int(arc_stats['demand_data_hits']) +\
+-        int(arc_stats['demand_data_iohits']) +\
++        int(arc_stats.get('demand_data_iohits', 0)) +\
+         int(arc_stats['demand_data_misses'])
+     prt_2('ARC demand data accesses:', f_perc(dd_total, all_accesses),
+          f_hits(dd_total))
+     dd_todo = (('Demand data hits:', arc_stats['demand_data_hits']),
+-               ('Demand data I/O hits:', arc_stats['demand_data_iohits']),
++               ('Demand data I/O hits:', arc_stats.get('demand_data_iohits', 0)),
+                ('Demand data misses:', arc_stats['demand_data_misses']))
+     for title, value in dd_todo:
+         prt_i2(title, f_perc(value, dd_total), f_hits(value))
+     print()
+ 
+     dm_total = int(arc_stats['demand_metadata_hits']) +\
+-        int(arc_stats['demand_metadata_iohits']) +\
++        int(arc_stats.get('demand_metadata_iohits', 0)) +\
+         int(arc_stats['demand_metadata_misses'])
+     prt_2('ARC demand metadata accesses:', f_perc(dm_total, all_accesses),
+           f_hits(dm_total))
+     dm_todo = (('Demand metadata hits:', arc_stats['demand_metadata_hits']),
+                ('Demand metadata I/O hits:',
+-                arc_stats['demand_metadata_iohits']),
++                arc_stats.get('demand_metadata_iohits', 0)),
+                ('Demand metadata misses:', arc_stats['demand_metadata_misses']))
+     for title, value in dm_todo:
+         prt_i2(title, f_perc(value, dm_total), f_hits(value))
+     print()
+ 
+     pd_total = int(arc_stats['prefetch_data_hits']) +\
+-        int(arc_stats['prefetch_data_iohits']) +\
++        int(arc_stats.get('prefetch_data_iohits', 0)) +\
+         int(arc_stats['prefetch_data_misses'])
+     prt_2('ARC prefetch data accesses:', f_perc(pd_total, all_accesses),
+           f_hits(pd_total))
+     pd_todo = (('Prefetch data hits:', arc_stats['prefetch_data_hits']),
+-               ('Prefetch data I/O hits:', arc_stats['prefetch_data_iohits']),
++               ('Prefetch data I/O hits:', arc_stats.get('prefetch_data_iohits', 0)),
+                ('Prefetch data misses:', arc_stats['prefetch_data_misses']))
+     for title, value in pd_todo:
+         prt_i2(title, f_perc(value, pd_total), f_hits(value))
+     print()
+ 
+     pm_total = int(arc_stats['prefetch_metadata_hits']) +\
+-        int(arc_stats['prefetch_metadata_iohits']) +\
++        int(arc_stats.get('prefetch_metadata_iohits', 0)) +\
+         int(arc_stats['prefetch_metadata_misses'])
+     prt_2('ARC prefetch metadata accesses:', f_perc(pm_total, all_accesses),
+           f_hits(pm_total))
+     pm_todo = (('Prefetch metadata hits:',
+                 arc_stats['prefetch_metadata_hits']),
+                ('Prefetch metadata I/O hits:',
+-                arc_stats['prefetch_metadata_iohits']),
++                arc_stats.get('prefetch_metadata_iohits', 0)),
+                ('Prefetch metadata misses:',
+                 arc_stats['prefetch_metadata_misses']))
+     for title, value in pm_todo:
+         prt_i2(title, f_perc(value, pm_total), f_hits(value))
+     print()
+ 
+-    all_prefetches = int(arc_stats['predictive_prefetch'])+\
+-        int(arc_stats['prescient_prefetch'])
++    all_prefetches = int(arc_stats.get('predictive_prefetch', 0))+\
++        int(arc_stats.get('prescient_prefetch', 0))
+     prt_2('ARC predictive prefetches:',
+-           f_perc(arc_stats['predictive_prefetch'], all_prefetches),
+-           f_hits(arc_stats['predictive_prefetch']))
++           f_perc(arc_stats.get('predictive_prefetch', 0), all_prefetches),
++           f_hits(arc_stats.get('predictive_prefetch', 0)))
+     prt_i2('Demand hits after predictive:',
+            f_perc(arc_stats['demand_hit_predictive_prefetch'],
+-                  arc_stats['predictive_prefetch']),
++                  arc_stats.get('predictive_prefetch', 0)),
+            f_hits(arc_stats['demand_hit_predictive_prefetch']))
+     prt_i2('Demand I/O hits after predictive:',
+-           f_perc(arc_stats['demand_iohit_predictive_prefetch'],
+-                  arc_stats['predictive_prefetch']),
+-           f_hits(arc_stats['demand_iohit_predictive_prefetch']))
+-    never = int(arc_stats['predictive_prefetch']) -\
++           f_perc(arc_stats.get('demand_iohit_predictive_prefetch', 0),
++                  arc_stats.get('predictive_prefetch', 0)),
++           f_hits(arc_stats.get('demand_iohit_predictive_prefetch', 0)))
++    never = int(arc_stats.get('predictive_prefetch', 0)) -\
+         int(arc_stats['demand_hit_predictive_prefetch']) -\
+-        int(arc_stats['demand_iohit_predictive_prefetch'])
++        int(arc_stats.get('demand_iohit_predictive_prefetch', 0))
+     prt_i2('Never demanded after predictive:',
+-           f_perc(never, arc_stats['predictive_prefetch']),
++           f_perc(never, arc_stats.get('predictive_prefetch', 0)),
+            f_hits(never))
+     print()
+ 
+     prt_2('ARC prescient prefetches:',
+-           f_perc(arc_stats['prescient_prefetch'], all_prefetches),
+-           f_hits(arc_stats['prescient_prefetch']))
++           f_perc(arc_stats.get('prescient_prefetch', 0), all_prefetches),
++           f_hits(arc_stats.get('prescient_prefetch', 0)))
+     prt_i2('Demand hits after prescient:',
+            f_perc(arc_stats['demand_hit_prescient_prefetch'],
+-                  arc_stats['prescient_prefetch']),
++                  arc_stats.get('prescient_prefetch', 0)),
+            f_hits(arc_stats['demand_hit_prescient_prefetch']))
+     prt_i2('Demand I/O hits after prescient:',
+-           f_perc(arc_stats['demand_iohit_prescient_prefetch'],
+-                  arc_stats['prescient_prefetch']),
+-           f_hits(arc_stats['demand_iohit_prescient_prefetch']))
+-    never = int(arc_stats['prescient_prefetch'])-\
++           f_perc(arc_stats.get('demand_iohit_prescient_prefetch', 0),
++                  arc_stats.get('prescient_prefetch', 0)),
++           f_hits(arc_stats.get('demand_iohit_prescient_prefetch', 0)))
++    never = int(arc_stats.get('prescient_prefetch', 0))-\
+         int(arc_stats['demand_hit_prescient_prefetch'])-\
+-        int(arc_stats['demand_iohit_prescient_prefetch'])
++        int(arc_stats.get('demand_iohit_prescient_prefetch', 0))
+     prt_i2('Never demanded after prescient:',
+-           f_perc(never, arc_stats['prescient_prefetch']),
++           f_perc(never, arc_stats.get('prescient_prefetch', 0)),
+            f_hits(never))
+     print()
+ 
+@@ -782,7 +782,7 @@ def section_archits(kstats_dict):
+                 arc_stats['mfu_ghost_hits']),
+                ('Most recently used (MRU) ghost:',
+                 arc_stats['mru_ghost_hits']),
+-               ('Uncached:', arc_stats['uncached_hits']))
++               ('Uncached:', arc_stats.get('uncached_hits', 0)))
+     for title, value in cl_todo:
+         prt_i2(title, f_perc(value, all_accesses), f_hits(value))
+     print()
+@@ -794,26 +794,26 @@ def section_dmu(kstats_dict):
+     zfetch_stats = isolate_section('zfetchstats', kstats_dict)
+ 
+     zfetch_access_total = int(zfetch_stats['hits']) +\
+-        int(zfetch_stats['future']) + int(zfetch_stats['stride']) +\
+-        int(zfetch_stats['past']) + int(zfetch_stats['misses'])
++        int(zfetch_stats.get('future', 0)) + int(zfetch_stats.get('stride', 0)) +\
++        int(zfetch_stats.get('past', 0)) + int(zfetch_stats['misses'])
+ 
+     prt_1('DMU predictive prefetcher calls:', f_hits(zfetch_access_total))
+     prt_i2('Stream hits:',
+            f_perc(zfetch_stats['hits'], zfetch_access_total),
+            f_hits(zfetch_stats['hits']))
+-    future = int(zfetch_stats['future']) + int(zfetch_stats['stride'])
++    future = int(zfetch_stats.get('future', 0)) + int(zfetch_stats.get('stride', 0))
+     prt_i2('Hits ahead of stream:', f_perc(future, zfetch_access_total),
+            f_hits(future))
+     prt_i2('Hits behind stream:',
+-           f_perc(zfetch_stats['past'], zfetch_access_total),
+-           f_hits(zfetch_stats['past']))
++           f_perc(zfetch_stats.get('past', 0), zfetch_access_total),
++           f_hits(zfetch_stats.get('past', 0)))
+     prt_i2('Stream misses:',
+            f_perc(zfetch_stats['misses'], zfetch_access_total),
+            f_hits(zfetch_stats['misses']))
+     prt_i2('Streams limit reached:',
+            f_perc(zfetch_stats['max_streams'], zfetch_stats['misses']),
+            f_hits(zfetch_stats['max_streams']))
+-    prt_i1('Stream strides:', f_hits(zfetch_stats['stride']))
++    prt_i1('Stream strides:', f_hits(zfetch_stats.get('stride', 0)))
+     prt_i1('Prefetches issued', f_hits(zfetch_stats['io_issued']))
+     print()
+ 
+@@ -860,20 +860,20 @@ def section_l2arc(kstats_dict):
+            f_perc(arc_stats['l2_hdr_size'], arc_stats['l2_size']),
+            f_bytes(arc_stats['l2_hdr_size']))
+     prt_i2('MFU allocated size:',
+-           f_perc(arc_stats['l2_mfu_asize'], arc_stats['l2_asize']),
+-           f_bytes(arc_stats['l2_mfu_asize']))
++           f_perc(arc_stats.get('l2_mfu_asize', 0), arc_stats['l2_asize']),
++           f_bytes(arc_stats.get('l2_mfu_asize', 0))) # 2.0 module compat
+     prt_i2('MRU allocated size:',
+-           f_perc(arc_stats['l2_mru_asize'], arc_stats['l2_asize']),
+-           f_bytes(arc_stats['l2_mru_asize']))
++           f_perc(arc_stats.get('l2_mru_asize', 0), arc_stats['l2_asize']),
++           f_bytes(arc_stats.get('l2_mru_asize', 0))) # 2.0 module compat
+     prt_i2('Prefetch allocated size:',
+-           f_perc(arc_stats['l2_prefetch_asize'], arc_stats['l2_asize']),
+-           f_bytes(arc_stats['l2_prefetch_asize']))
++           f_perc(arc_stats.get('l2_prefetch_asize', 0), arc_stats['l2_asize']),
++           f_bytes(arc_stats.get('l2_prefetch_asize',0))) # 2.0 module compat
+     prt_i2('Data (buffer content) allocated size:',
+-           f_perc(arc_stats['l2_bufc_data_asize'], arc_stats['l2_asize']),
+-           f_bytes(arc_stats['l2_bufc_data_asize']))
++           f_perc(arc_stats.get('l2_bufc_data_asize', 0), arc_stats['l2_asize']),
++           f_bytes(arc_stats.get('l2_bufc_data_asize', 0))) # 2.0 module compat
+     prt_i2('Metadata (buffer content) allocated size:',
+-           f_perc(arc_stats['l2_bufc_metadata_asize'], arc_stats['l2_asize']),
+-           f_bytes(arc_stats['l2_bufc_metadata_asize']))
++           f_perc(arc_stats.get('l2_bufc_metadata_asize', 0), arc_stats['l2_asize']),
++           f_bytes(arc_stats.get('l2_bufc_metadata_asize', 0))) # 2.0 module compat
+ 
+     print()
+     prt_1('L2ARC breakdown:', f_hits(l2_access_total))
+diff --git a/cmd/arcstat.in b/cmd/arcstat.in
+index c4f10a1d6..bf47ec90e 100755
+--- a/cmd/arcstat.in
++++ b/cmd/arcstat.in
+@@ -510,7 +510,7 @@ def calculate():
+     v = dict()
+     v["time"] = time.strftime("%H:%M:%S", time.localtime())
+     v["hits"] = d["hits"] // sint
+-    v["iohs"] = d["iohits"] // sint
++    v["iohs"] = d.get("iohits", 0) // sint
+     v["miss"] = d["misses"] // sint
+     v["read"] = v["hits"] + v["iohs"] + v["miss"]
+     v["hit%"] = 100 * v["hits"] // v["read"] if v["read"] > 0 else 0
+@@ -518,7 +518,7 @@ def calculate():
+     v["miss%"] = 100 - v["hit%"] - v["ioh%"] if v["read"] > 0 else 0
+ 
+     v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) // sint
+-    v["dioh"] = (d["demand_data_iohits"] + d["demand_metadata_iohits"]) // sint
++    v["dioh"] = (d.get("demand_data_iohits", 0) + d.get("demand_metadata_iohits", 0)) // sint
+     v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) // sint
+ 
+     v["dread"] = v["dhit"] + v["dioh"] + v["dmis"]
+@@ -527,7 +527,7 @@ def calculate():
+     v["dm%"] = 100 - v["dh%"] - v["di%"] if v["dread"] > 0 else 0
+ 
+     v["ddhit"] = d["demand_data_hits"] // sint
+-    v["ddioh"] = d["demand_data_iohits"] // sint
++    v["ddioh"] = d.get("demand_data_iohits", 0) // sint
+     v["ddmis"] = d["demand_data_misses"] // sint
+ 
+     v["ddread"] = v["ddhit"] + v["ddioh"] + v["ddmis"]
+@@ -536,7 +536,7 @@ def calculate():
+     v["ddm%"] = 100 - v["ddh%"] - v["ddi%"] if v["ddread"] > 0 else 0
+ 
+     v["dmhit"] = d["demand_metadata_hits"] // sint
+-    v["dmioh"] = d["demand_metadata_iohits"] // sint
++    v["dmioh"] = d.get("demand_metadata_iohits", 0) // sint
+     v["dmmis"] = d["demand_metadata_misses"] // sint
+ 
+     v["dmread"] = v["dmhit"] + v["dmioh"] + v["dmmis"]
+@@ -545,8 +545,8 @@ def calculate():
+     v["dmm%"] = 100 - v["dmh%"] - v["dmi%"] if v["dmread"] > 0 else 0
+ 
+     v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) // sint
+-    v["pioh"] = (d["prefetch_data_iohits"] +
+-                 d["prefetch_metadata_iohits"]) // sint
++    v["pioh"] = (d.get("prefetch_data_iohits", 0) +
++                 d.get("prefetch_metadata_iohits", 0)) // sint
+     v["pmis"] = (d["prefetch_data_misses"] +
+                  d["prefetch_metadata_misses"]) // sint
+ 
+@@ -556,7 +556,7 @@ def calculate():
+     v["pm%"] = 100 - v["ph%"] - v["pi%"] if v["pread"] > 0 else 0
+ 
+     v["pdhit"] = d["prefetch_data_hits"] // sint
+-    v["pdioh"] = d["prefetch_data_iohits"] // sint
++    v["pdioh"] = d.get("prefetch_data_iohits", 0) // sint
+     v["pdmis"] = d["prefetch_data_misses"] // sint
+ 
+     v["pdread"] = v["pdhit"] + v["pdioh"] + v["pdmis"]
+@@ -565,7 +565,7 @@ def calculate():
+     v["pdm%"] = 100 - v["pdh%"] - v["pdi%"] if v["pdread"] > 0 else 0
+ 
+     v["pmhit"] = d["prefetch_metadata_hits"] // sint
+-    v["pmioh"] = d["prefetch_metadata_iohits"] // sint
++    v["pmioh"] = d.get("prefetch_metadata_iohits", 0) // sint
+     v["pmmis"] = d["prefetch_metadata_misses"] // sint
+ 
+     v["pmread"] = v["pmhit"] + v["pmioh"] + v["pmmis"]
+@@ -575,8 +575,8 @@ def calculate():
+ 
+     v["mhit"] = (d["prefetch_metadata_hits"] +
+                  d["demand_metadata_hits"]) // sint
+-    v["mioh"] = (d["prefetch_metadata_iohits"] +
+-                 d["demand_metadata_iohits"]) // sint
++    v["mioh"] = (d.get("prefetch_metadata_iohits", 0) +
++                 d.get("demand_metadata_iohits", 0)) // sint
+     v["mmis"] = (d["prefetch_metadata_misses"] +
+                  d["demand_metadata_misses"]) // sint
+ 
+@@ -592,24 +592,24 @@ def calculate():
+     v["mru"] = d["mru_hits"] // sint
+     v["mrug"] = d["mru_ghost_hits"] // sint
+     v["mfug"] = d["mfu_ghost_hits"] // sint
+-    v["unc"] = d["uncached_hits"] // sint
++    v["unc"] = d.get("uncached_hits", 0) // sint
+     v["eskip"] = d["evict_skip"] // sint
+     v["el2skip"] = d["evict_l2_skip"] // sint
+     v["el2cach"] = d["evict_l2_cached"] // sint
+     v["el2el"] = d["evict_l2_eligible"] // sint
+-    v["el2mfu"] = d["evict_l2_eligible_mfu"] // sint
+-    v["el2mru"] = d["evict_l2_eligible_mru"] // sint
++    v["el2mfu"] = d.get("evict_l2_eligible_mfu", 0) // sint
++    v["el2mru"] = d.get("evict_l2_eligible_mru", 0) // sint
+     v["el2inel"] = d["evict_l2_ineligible"] // sint
+     v["mtxmis"] = d["mutex_miss"] // sint
+-    v["ztotal"] = (d["zfetch_hits"] + d["zfetch_future"] + d["zfetch_stride"] +
+-                   d["zfetch_past"] + d["zfetch_misses"]) // sint
++    v["ztotal"] = (d["zfetch_hits"] + d.get("zfetch_future", 0) + d.get("zfetch_stride", 0) +
++                   d.get("zfetch_past", 0) + d["zfetch_misses"]) // sint
+     v["zhits"] = d["zfetch_hits"] // sint
+-    v["zahead"] = (d["zfetch_future"] + d["zfetch_stride"]) // sint
+-    v["zpast"] = d["zfetch_past"] // sint
++    v["zahead"] = (d.get("zfetch_future", 0) + d.get("zfetch_stride", 0)) // sint
++    v["zpast"] = d.get("zfetch_past", 0) // sint
+     v["zmisses"] = d["zfetch_misses"] // sint
+     v["zmax"] = d["zfetch_max_streams"] // sint
+-    v["zfuture"] = d["zfetch_future"] // sint
+-    v["zstride"] = d["zfetch_stride"] // sint
++    v["zfuture"] = d.get("zfetch_future", 0) // sint
++    v["zstride"] = d.get("zfetch_stride", 0) // sint
+     v["zissued"] = d["zfetch_io_issued"] // sint
+     v["zactive"] = d["zfetch_io_active"] // sint
+ 
+@@ -624,11 +624,11 @@ def calculate():
+         v["l2size"] = cur["l2_size"]
+         v["l2bytes"] = d["l2_read_bytes"] // sint
+ 
+-        v["l2pref"] = cur["l2_prefetch_asize"]
+-        v["l2mfu"] = cur["l2_mfu_asize"]
+-        v["l2mru"] = cur["l2_mru_asize"]
+-        v["l2data"] = cur["l2_bufc_data_asize"]
+-        v["l2meta"] = cur["l2_bufc_metadata_asize"]
++        v["l2pref"] = cur.get("l2_prefetch_asize", 0)
++        v["l2mfu"] = cur.get("l2_mfu_asize", 0)
++        v["l2mru"] = cur.get("l2_mru_asize", 0)
++        v["l2data"] = cur.get("l2_bufc_data_asize", 0)
++        v["l2meta"] = cur.get("l2_bufc_metadata_asize", 0)
+         v["l2pref%"] = 100 * v["l2pref"] // v["l2asize"]
+         v["l2mfu%"] = 100 * v["l2mfu"] // v["l2asize"]
+         v["l2mru%"] = 100 * v["l2mru"] // v["l2asize"]

debian/patches/0010-Fix-nfs_truncate_shares-without-etc-exports.d.patch

@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: siv0 <github@nomore.at>
+Date: Tue, 31 Oct 2023 21:57:54 +0100
+Subject: [PATCH] Fix nfs_truncate_shares without /etc/exports.d
+
+Calling nfs_reset_shares on Linux prints a warning:
+`failed to lock /etc/exports.d/zfs.exports.lock: No such file or
+directory`
+when /etc/exports.d does not exist. The directory gets created, when a
+filesystem is actually exported through nfs_toggle_share and
+nfs_init_share. The truncation of /etc/exports.d/zfs.exports happens
+unconditionally when calling `zfs mount -a` (via zfs_do_mount and
+share_mount in `cmd/zfs/zfs_main.c`).
+
+Fixing the issue only in the Linux part, since the exports file on
+freebsd is in `/etc/zfs/`, which seems present on 2 FreeBSD systems I
+have access to (through `/etc/zfs/compatibility.d/`), while a Debian
+box does not have the directory even if `/usr/sbin/exportfs` is
+present through the `nfs-kernel-server` package.
+
+The code for exports_available is copied from nfs_available above.
+
+Fixes: ede037cda73675f42b1452187e8dd3438fafc220
+("Make zfs-share service resilient to stale exports")
+
+Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Closes #15369
+Closes #15468
+(cherry picked from commit 41e55b476bcfc90f1ad81c02c5375367fdace9e9)
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ lib/libshare/os/linux/nfs.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/lib/libshare/os/linux/nfs.c b/lib/libshare/os/linux/nfs.c
+index 004946b0c..3dce81840 100644
+--- a/lib/libshare/os/linux/nfs.c
++++ b/lib/libshare/os/linux/nfs.c
+@@ -47,6 +47,7 @@
+ 
+ 
+ static boolean_t nfs_available(void);
++static boolean_t exports_available(void);
+ 
+ typedef int (*nfs_shareopt_callback_t)(const char *opt, const char *value,
+     void *cookie);
+@@ -539,6 +540,8 @@ nfs_commit_shares(void)
+ static void
+ nfs_truncate_shares(void)
+ {
++	if (!exports_available())
++		return;
+ 	nfs_reset_shares(ZFS_EXPORTS_LOCK, ZFS_EXPORTS_FILE);
+ }
+ 
+@@ -566,3 +569,18 @@ nfs_available(void)
+ 
+ 	return (avail == 1);
+ }
++
++static boolean_t
++exports_available(void)
++{
++	static int avail;
++
++	if (!avail) {
++		if (access(ZFS_EXPORTS_DIR, F_OK) != 0)
++			avail = -1;
++		else
++			avail = 1;
++	}
++
++	return (avail == 1);
++}

debian/patches/0011-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch

@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Sun, 12 Nov 2023 15:52:25 +0100
+Subject: [PATCH] zpool status: tighten bounds for noalloc stat availabillity
+
+When running zfs 2.2.0 userspace utilities with a kernel that still
+has 2.1.13 modules zpool status adds `(non-allocating)` next to the
+disk name of a single-disk pool.
+
+The reason for this seems to be that the patch adding the `vs_pspace` field was
+backported, but the one adding `vs_noalloc` was not.
+
+Itself that is not a problem, but in 2.2 `noalloc` was added before `psspace`,
+so the struct layout between 2.1.13 and 2.2.0 do NOT match anymore...
+
+I.e., the struct looks like the following at the end for ZFS 2.1.x:
+
+```
+typedef struct vdev_stat {
+    hrtime_t        vs_timestamp;           /* time since vdev load */
+    // snip
+    uint64_t        vs_logical_ashift;      /* vdev_logical_ashift  */
+    uint64_t        vs_physical_ashift;     /* vdev_physical_ashift */
+    uint64_t        vs_pspace;              /* physical capacity */
+} vdev_stat_t;
+```
+
+And like the following on ZFS 2.2.x:
+```
+typedef struct vdev_stat {
+    hrtime_t        vs_timestamp;           /* time since vdev load */
+    // snip
+    uint64_t        vs_logical_ashift;      /* vdev_logical_ashift  */
+    uint64_t        vs_physical_ashift;     /* vdev_physical_ashift */
+    uint64_t        vs_noalloc;             /* allocations halted?  */
+    uint64_t        vs_pspace;              /* physical capacity */
+} vdev_stat_t;
+```
+
+Resulting in 2.2.x user-space tooling interpreting the `vs_pspace` field from
+the 2.1.x kernel module as `vs_noalloc` field.
+
+For now, work-around that discrepancy by coupling the availability of
+the vs_noalloc field with the one of the vs_pspace one, as when both
+are returned from the module we can be sure that our struct layout
+matches again.
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ cmd/zpool/zpool_main.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
+index ed0b8d7a1..f3acc49d0 100644
+--- a/cmd/zpool/zpool_main.c
++++ b/cmd/zpool/zpool_main.c
+@@ -2663,7 +2663,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
+ 
+ 	if (vs->vs_scan_removing != 0) {
+ 		(void) printf(gettext("  (removing)"));
+-	} else if (VDEV_STAT_VALID(vs_noalloc, vsc) && vs->vs_noalloc != 0) {
++	} else if (VDEV_STAT_VALID(vs_pspace, vsc)
++		       && VDEV_STAT_VALID(vs_noalloc, vsc) && vs->vs_noalloc != 0) {
+ 		(void) printf(gettext("  (non-allocating)"));
+ 	}
+ 

debian/patches/series

@@ -4,6 +4,8 @@
 0004-import-with-d-dev-disk-by-id-in-scan-service.patch
 0005-Enable-zed-emails.patch
 0006-dont-symlink-zed-scripts.patch
-0007-Use-installed-python3.patch
-0008-Add-systemd-unit-for-importing-specific-pools.patch
-0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
+0007-Add-systemd-unit-for-importing-specific-pools.patch
+0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
+0009-arc-stat-summary-guard-access-to-freshly-introduced-.patch
+0010-Fix-nfs_truncate_shares-without-etc-exports.d.patch
+0011-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch

debian/rules

@@ -10,7 +10,7 @@ SPHINX_BUILD = $(shell dpkg -L python3-sphinx | grep -m 1 "/sphinx-build$$")
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autoreconf,python3,sphinxdoc --parallel
+	dh $@ --with autoreconf,python3,sphinxdoc
 
 adapt_meta_file:
 	@# Embed the downstream version in the module.
@@ -50,7 +50,7 @@ override_dh_auto_test:
 override_dh_auto_test:
 ifeq (amd64,$(DEB_HOST_ARCH))
 	# Upstream provides an ABI guarantee that we validate here
-	$(MAKE) checkabi
+	-$(MAKE) checkabi
 endif
 
 	# The dh_auto_test rule is disabled because
@@ -60,10 +60,6 @@ override_dh_auto_install:
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 
-	# Use upstream's bash completion
-	install -D -t '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/' \
-		'$(CURDIR)/contrib/bash_completion.d/zfs'
-
 	# Move from bin_dir to /usr/sbin
 	# Remove suffix (.py) as per policy 10.4 - Scripts
 	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
@@ -83,7 +79,6 @@ override_dh_auto_install:
 
 	chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
 	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
-	chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
 
 override_dh_python3:
 	dh_python3 -p python3-pyzfs
@@ -91,9 +86,6 @@ override_dh_python3:
 override_dh_makeshlibs:
 	dh_makeshlibs -a -V
 
-override_dh_strip:
-	dh_strip --dbgsym-migration='zfs-dbg (<< 2.0.4~)'
-
 override_dh_auto_clean:
 	find . -name .gitignore -delete
 	rm -rf zfs-$(DEB_VERSION_UPSTREAM)
@@ -101,7 +93,7 @@ override_dh_auto_clean:
 	@if test -e META.orig; then mv META.orig META; fi
 
 override_dh_install:
-	find debian/tmp/lib -name *.la -delete
+	find debian/tmp/lib -name '*.la' -delete
 	dh_install
 
 override_dh_missing:

debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim

@@ -1,4 +1,4 @@
-#!/bin/sh -eu
+#!/bin/sh -u
 
 # directly exit successfully when zfs module is not loaded
 if ! [ -d /sys/module/zfs ]; then
@@ -14,47 +14,56 @@ get_property () {
 	# since they're not available on pools https://github.com/openzfs/zfs/pull/11680
 	# TODO: use zpool user-defined property when such feature is available.
 	pool="$1"
-	zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null || return 1
+	zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null
 }
 
 trim_if_not_already_trimming () {
 	pool="$1"
 	if ! zpool status "${pool}" | grep -q "trimming"; then
-		# Ignore errors (i.e. HDD pools),
-		# and continue with trimming other pools.
-		zpool trim "${pool}" || true
+		# This will error on HDD-only pools: doesn't matter
+		zpool trim "${pool}"
 	fi
 }
 
-zpool_is_nvme_only () {
-	zpool=$1
-	# get a list of devices attached to the specified zpool
-	zpool list -vHPL "${zpool}" |
-		awk -F'\t' '$2 ~ /^\/dev\// {
-			if($2 !~ /^\/dev\/nvme/)
-				exit 1
-		}'
+# Walk up the kernel parent names:
+# this will catch devices from LVM &a.
+get_transp () {
+	dev="$1"
+	while pd="$(lsblk -dnr -o PKNAME "$dev")"; do
+		if [ -z "$pd" ]; then
+			break
+		else
+			dev="/dev/$pd"
+		fi
+	done
+	lsblk -dnr -o TRAN "$dev"
+}
+
+pool_is_nvme_only () {
+	pool="$1"
+	# get a list of devices attached to the specified pool
+	zpool list -vHP "${pool}" | \
+		awk -F'\t' '$2 ~ "^/dev/" {print $2}' | \
+	while read -r dev
+	do
+		[ "$(get_transp "$dev")" = "nvme" ] || return
+	done
 }
 
 # TRIM all healthy pools that are not already trimming as per their configs.
 zpool list -H -o health,name 2>&1 | \
 	awk -F'\t' '$1 == "ONLINE" {print $2}' | \
-while read pool
+while read -r pool
 do
 	# read user-defined config
-	ret=$(get_property "${pool}")
-	if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
-		:
-	elif [ "enable" = "${ret}" ]; then
-		trim_if_not_already_trimming "${pool}"
-	elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ]; then
-		if zpool_is_nvme_only "${pool}"; then
-			trim_if_not_already_trimming "${pool}"
-		fi
-	else
-		cat > /dev/stderr <<EOF
+	ret=$(get_property "${pool}") || continue
+	case "${ret}" in
+		disable);;
+		enable)	trim_if_not_already_trimming "${pool}" ;;
+		-|auto)	if pool_is_nvme_only "${pool}"; then trim_if_not_already_trimming "${pool}"; fi ;;
+		*)	cat > /dev/stderr <<EOF
 $0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
 $0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
 EOF
-	fi
+	esac
 done

debian/zfs-dracut.install

@@ -0,0 +1,2 @@
+usr/lib/dracut
+usr/share/man/man7/dracut.zfs.7

debian/zfs-initramfs.lintian-overrides

@@ -0,0 +1 @@
+executable-not-elf-or-script *usr/share/initramfs-tools/scripts/zfs*

debian/zfs-test.lintian-overrides

@@ -1,13 +1,10 @@
 arch-dependent-file-in-usr-share
-script-not-executable usr/share/zfs/common.sh
 command-in-sbin-has-manpage-in-incorrect-section
 arch-dep-package-has-big-usr-share
 manpage-without-executable
-national-encoding usr/share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.lib_table.lua
-executable-not-elf-or-script usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/jail.conf
-script-not-executable usr/share/zfs/zfs-tests/include/default.cfg
-script-not-executable usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait.kshlib
-script-not-executable usr/share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
-script-not-executable usr/share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc.cfg
-script-not-executable usr/share/zfs/zfs-tests/tests/functional/redacted_send/redacted.kshlib
-package-contains-documentation-outside-usr-share-doc usr/share/zfs/zfs-tests/*
+national-encoding *usr/share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.lib_table.lua*
+executable-not-elf-or-script *usr/share/zfs/zfs-tests/tests/functional/cli_root/*
+package-contains-documentation-outside-usr-share-doc *usr/share/zfs/zfs-tests/*
+script-not-executable [usr/share/zfs/common.sh]
+script-not-executable [usr/share/zfs/zfs-tests/include/default.cfg]
+script-not-executable [usr/share/zfs/zfs-tests/tests/functional/*]

debian/zfsutils-linux.install

@@ -8,8 +8,15 @@ lib/systemd/system/zfs-import-scan.service
 lib/systemd/system/zfs-import@.service
 lib/systemd/system/zfs-import.target
 lib/systemd/system/zfs-import.service
+lib/systemd/system/zfs-load-key.service
 lib/systemd/system/zfs-mount.service
+lib/systemd/system/zfs-scrub-monthly@.timer
+lib/systemd/system/zfs-scrub-weekly@.timer
+lib/systemd/system/zfs-scrub@.service
 lib/systemd/system/zfs-share.service
+lib/systemd/system/zfs-trim-monthly@.timer
+lib/systemd/system/zfs-trim-weekly@.timer
+lib/systemd/system/zfs-trim@.service
 lib/systemd/system/zfs-volume-wait.service
 lib/systemd/system/zfs-volumes.target
 lib/systemd/system/zfs.target
@@ -26,8 +33,11 @@ sbin/zpool
 sbin/zstream
 sbin/zstreamdump
 usr/bin/zvol_wait
+usr/bin/zilstat
 usr/lib/modules-load.d/ lib/
+usr/lib/zfs-linux/zfs_prepare_disk
 usr/lib/zfs-linux/zpool.d/
+usr/lib/zfs-linux/zpool_influxdb
 usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
@@ -35,7 +45,15 @@ usr/share/bash-completion/completions
 usr/share/man/man8/arcstat.8
 usr/share/man/man1/zhack.1
 usr/share/man/man1/zvol_wait.1
+usr/share/man/man4/zfs.4
+usr/share/man/man4/spl.4
 usr/share/man/man5/
+usr/share/man/man7/vdevprops.7
+usr/share/man/man7/zfsconcepts.7
+usr/share/man/man7/zfsprops.7
+usr/share/man/man7/zpoolconcepts.7
+usr/share/man/man7/zpoolprops.7
+usr/share/man/man7/zpool-features.7
 usr/share/man/man8/fsck.zfs.8
 usr/share/man/man8/mount.zfs.8
 usr/share/man/man8/vdev_id.8
@@ -51,11 +69,11 @@ 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_prepare_disk.8
 usr/share/man/man8/zfs-program.8
 usr/share/man/man8/zfs-project.8
 usr/share/man/man8/zfs-projectspace.8
@@ -71,16 +89,14 @@ 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-unzone.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
@@ -94,6 +110,7 @@ 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_influxdb.8
 usr/share/man/man8/zpool-initialize.8
 usr/share/man/man8/zpool-iostat.8
 usr/share/man/man8/zpool-labelclear.8
@@ -113,8 +130,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/zfs-zone.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/zfs/compatibility.d/

debian/zfsutils-linux.links

@@ -0,0 +1,3 @@
+sbin/zfs      bin/zfs
+sbin/zpool    bin/zpool
+usr/lib/zfs-linux/zpool_influxdb  bin/zpool_influxdb

debian/zfsutils-linux.lintian-overrides

@@ -1,14 +1,13 @@
 spare-manual-page
 systemd-service-file-refers-to-unusual-wantedby-target
-binary-without-manpage usr/sbin/dbufstat
-binary-without-manpage usr/sbin/arc_summary
+binary-without-manpage *usr/sbin/dbufstat*
+binary-without-manpage *usr/sbin/arc_summary*
 manpage-has-errors-from-man
 appstream-metadata-missing-modalias-provide
 command-in-sbin-has-manpage-in-incorrect-section
-package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-import-cache.service
-package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-import-scan.service
+package-supports-alternative-init-but-no-init.d-script *lib/systemd/system/zfs-import-cache.service*
+package-supports-alternative-init-but-no-init.d-script *lib/systemd/system/zfs-import-scan.service*
 spelling-error-in-manpage
-package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-volume-wait.service
-systemd-service-file-missing-documentation-key lib/systemd/system/zfs-volume-wait.service
-extra-license-file usr/share/doc/zfsutils-linux/LICENSE.gz
-package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-load-module.service
+package-supports-alternative-init-but-no-init.d-script *lib/systemd/system/zfs-volume-wait.service*
+systemd-service-file-missing-documentation-key *lib/systemd/system/zfs-volume-wait.service*
+extra-license-file *usr/share/doc/zfsutils-linux/LICENSE.gz*

upstream

@@ -1 +1 @@
-Subproject commit e9353bc2ef27c300281574453e0cf5189a375680
+Subproject commit 2566592045780e7be7afc899c2496b1ae3af4f4d