bump version to 2.1.2-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
d/rules: allow abigail to fail
2022-01-11 11:31:36 +01:00 · 2022-01-11 11:30:14 +01:00 · 2022-01-11 11:30:14 +01:00 · 2021-11-11 18:21:16 +01:00 · 2021-11-10 09:59:30 +01:00 · 2021-11-10 09:59:30 +01:00
111 changed files with 1736 additions and 2043 deletions
@@ -1,6 +1,3 @@
 [submodule "zfs/upstream"]
-	path = zfs/upstream
+	path = upstream
 	url = ../mirror_zfs
 [submodule "spl/upstream"]
 	path = spl/upstream
 	url = ../mirror_spl
@@ -1,51 +1,46 @@
 RELEASE=5.1
 # source form https://github.com/zfsonlinux/
-SPLDIR=spl-linux_${ZFSVER}
+ZFSPKG=debian
 SPLSRC=spl/upstream
 SPLPKG=spl/debian
 ZFSDIR=zfs-linux_${ZFSVER}
 ZFSSRC=zfs/upstream
 ZFSPKG=zfs/debian
 ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
 ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
-SPLPKGVER != dpkg-parsechangelog -l ${SPLPKG}/changelog -Sversion
+ZFSDIR=zfs-linux_${ZFSVER}
 ZFSSRC=upstream
-SPL_DEB = 					\
+ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
 spl_${SPLPKGVER}_amd64.deb
 SPL_DSC = spl-linux_${SPLPKGVER}.dsc
-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB_BINARY =				\
-ZFS_DEB2= 					\
+libpam-zfs_${ZFSPKGVER}_amd64.deb		\
-libuutil1linux_${ZFSPKGVER}_amd64.deb		\
+libuutil3linux_${ZFSPKGVER}_amd64.deb		\
-libzfs2linux_${ZFSPKGVER}_amd64.deb		\
+libzfs4linux_${ZFSPKGVER}_amd64.deb		\
 libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb	\
 libzpool5linux_${ZFSPKGVER}_amd64.deb		\
 zfs-test_${ZFSPKGVER}_amd64.deb			\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb		\
 zfs-zed_${ZFSPKGVER}_amd64.deb
 ZFS_DBG_DEBS = $(patsubst %_${ZFSPKGVER}_amd64.deb, %-dbgsym_${ZFSPKGVER}_amd64.deb, ${ZFS_DEB1} ${ZFS_DEB_BINARY})
 ZFS_DEB2= ${ZFS_DEB_BINARY}			\
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool2linux_${ZFSPKGVER}_amd64.deb		\
+python3-pyzfs_${ZFSPKGVER}_amd64.deb		\
-zfs-dbg_${ZFSPKGVER}_amd64.deb			\
+pyzfs-doc_${ZFSPKGVER}_all.deb			\
-zfs-zed_${ZFSPKGVER}_amd64.deb			\
+spl_${ZFSPKGVER}_all.deb			\
-zfs-initramfs_${ZFSPKGVER}_all.deb		\
+zfs-initramfs_${ZFSPKGVER}_all.deb
-zfs-test_${ZFSPKGVER}_amd64.deb		\
+DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
 zfsutils-linux_${ZFSPKGVER}_amd64.deb
 ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
 ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
-DEBS=${SPL_DEB} ${ZFS_DEBS}
+ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
 DSCS=${SPL_DSC} ${ZFS_DSC}
 all: deb
 .PHONY: deb
 deb: ${DEBS}
 .PHONY: dsc
-dsc: ${DSCS}
+dsc: ${ZFS_DSC}
 # called from pve-kernel's Makefile to get patched sources
 .PHONY: kernel
 kernel: dsc
 	dpkg-source -x ${SPL_DSC} ../pkg-spl
 	dpkg-source -x ${ZFS_DSC} ../pkg-zfs
 	${MAKE} -C ../pkg-zfs -f debian/rules adapt_meta_file
 .PHONY: dinstall
 dinstall: ${DEBS}
@@ -53,52 +48,35 @@ dinstall: ${DEBS}
 .PHONY: submodule
 submodule:
-	test -f "${ZFSSRC}/README.markdown" || git submodule update --init
+	test -f "${ZFSSRC}/README.md" || git submodule update --init
-	test -f "${SPLSRC}/README.markdown" || git submodule update --init
+${ZFSSRC}/README.md: submodule
 .PHONY: spl
 spl: ${SPL_DEB}
 ${SPL_DEB}: ${SPLDIR}
 	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
 	lintian ${SPL_DEB}
 ${SPL_DSC}: ${SPLDIR}
 	tar czf spl-linux_${ZFSVER}.orig.tar.gz ${SPLDIR}
 	cd ${SPLDIR}; dpkg-buildpackage -S -uc -us -d
 	lintian $@
 ${SPLDIR}: ${SPLSRC} ${SPLPKG}
 	rm -rf ${SPLDIR}
 	mkdir ${SPLDIR}
 	cp -a ${SPLSRC}/* ${SPLDIR}/
 	cp -a ${SPLPKG} ${SPLDIR}/debian
 .PHONY: zfs
-zfs: $(ZFS_DEBS)
+zfs: ${DEBS}
-$(ZFS_DEB2): $(ZFS_DEB1)
+${ZFS_DEB2}: ${ZFS_DEB1}
-$(ZFS_DEB1): ${ZFSDIR}
+${ZFS_DEB1}: ${ZFSDIR}
 	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
-	lintian ${ZFS_DEBS}
+	lintian ${DEBS}
 ${ZFS_DSC}: ${ZFSDIR}
 	tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
 	cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
 	lintian $@
-${ZFSDIR}: $(ZFSSRC) ${ZFSPKG}
+${ZFSDIR}: ${ZFSSRC}/README.md ${ZFSSRC} ${ZFSPKG}
-	rm -rf ${ZFSDIR}
+	rm -rf ${ZFSDIR} ${ZFSDIR}.tmp
-	mkdir ${ZFSDIR}
+	cp -a ${ZFSSRC} ${ZFSDIR}.tmp
-	cp -a ${ZFSSRC}/* ${ZFSDIR}/
+	cp -a ${ZFSPKG} ${ZFSDIR}.tmp/debian
-	cp -a ${ZFSPKG} ${ZFSDIR}/debian
+	mv ${ZFSDIR}.tmp ${ZFSDIR}
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR}
 .PHONY: distclean
 distclean: clean
 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch amd64
@@ -1,3 +1,144 @@
 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
  * do not restart most services upon upgrade
  * add a script and cronjob for regular trimming of pools
 -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Jul 2021 18:23:58 +0200
 zfs-linux (2.0.4-pve1) pve pmg; urgency=medium
  * update ZFS to 2.0.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 18 Mar 2021 13:31:18 +0100
 zfs-linux (2.0.3-pve2) pve pmg; urgency=medium
  * match package names to the ones used by Debian
 -- Proxmox Support Team <support@proxmox.com>  Thu, 25 Feb 2021 13:06:07 +0100
 zfs-linux (2.0.3-pve1) pve pmg; urgency=medium
  * buildsys: make libpam-zfs a separate package
  * update ZFS to 2.0.3
 -- Proxmox Support Team <support@proxmox.com>  Mon, 15 Feb 2021 15:46:03 +0100
 zfs-linux (2.0.2-pve1) pve pmg; urgency=medium
  * update ZFS to 2.0.2
 -- Proxmox Support Team <support@proxmox.com>  Sat, 06 Feb 2021 10:23:03 +0100
 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
 -- Proxmox Support Team <support@proxmox.com>  Thu, 08 Oct 2020 10:45:28 +0200
 zfs-linux (0.8.4-pve2) pve pmg; urgency=medium
  * add systemd-unit for importing specific pools
 -- Proxmox Support Team <support@proxmox.com>  Tue, 29 Sep 2020 05:31:35 +0200
 zfs-linux (0.8.4-pve1) pve pmg; urgency=medium
  * update ZFS to 0.8.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 14 May 2020 10:39:11 +0200
 zfs-linux (0.8.3-pve1) pve pmg; urgency=medium
  * update ZFS to 0.8.3
 -- Proxmox Support Team <support@proxmox.com>  Fri, 24 Jan 2020 09:10:41 +0100
 zfs-linux (0.8.2-pve2) pve pmg; urgency=medium
  * save and restore the FPU state using ZFS dedicated per-cpu FPU state
    variables.
 -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Oct 2019 17:14:22 +0200
 zfs-linux (0.8.2-pve1) pve pmg; urgency=medium
  * update to new 0.8.2 upstream stable release
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Sep 2019 08:34:53 +0200
 zfs-linux (0.8.1-pve3) pve pmg; urgency=medium
  * [SIMD]: FPU register save/restore is also required on 5.0 kernel.
    strict kernel module release, user space tooling is not touched
 -- Proxmox Support Team <support@proxmox.com>  Fri, 27 Sep 2019 14:37:32 +0200
 zfs-linux (0.8.1-pve2) pve pmg; urgency=medium
  * cherry-pick parallel mount fix
  * cherry-pick SIMD compat patches
 -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Aug 2019 17:10:11 +0200
 zfs-linux (0.8.1-pve1) pve pmg; urgency=medium
  * update ZFS to 0.8.1
 -- Proxmox Support Team <support@proxmox.com>  Fri, 14 Jun 2019 20:43:10 +0200
 zfs-linux (0.8.0-pve1) pve pmg; urgency=medium
  * update ZFS to 0.8.0
  * SPL is now included in upstream ZFS packaging.
    Build dummy spl and spl-dkms packages to ease transition on upgrades.
  * Build pyzfs+documentation package
  * Use arc_summary3.py to provide arc_summary.
  * shipped python scripts now use python3
 -- Proxmox Support Team <support@proxmox.com>  Fri, 24 May 2019 12:05:22 +0200
 zfs-linux (0.7.13-pve2~bpo2) pve pmg; urgency=medium
  * rebuild for PVE 6.0 / Debian Buster
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 May 2019 20:08:45 +0200
 zfs-linux (0.7.13-pve1~bpo2) unstable; urgency=medium
  * remove conflict with insserv  (<< 1.18)
@@ -0,0 +1,281 @@
 Source: zfs-linux
 Section: contrib/kernel
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: abigail-tools,
               debhelper-compat (= 12),
               dh-python,
               libblkid-dev,
               libelf-dev,
               libpam0g-dev,
               libssl-dev | libssl1.0-dev,
               libtool,
               lsb-release,
               python3-cffi,
               python3-setuptools,
               python3-sphinx,
               python3-all-dev,
               uuid-dev,
               zlib1g-dev
 Standards-Version: 4.5.1
 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: libnvpair3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
 Replaces: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
 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: libpam-zfs
 Section: contrib/admin
 Architecture: linux-any
 Depends: libpam-runtime, ${misc:Depends}, ${shlibs:Depends}
 Description: PAM module for managing encryption keys for ZFS
 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 provides a Pluggable Authentication Module (PAM) that automatically
 unlocks encrypted ZFS datasets upon login.
 Package: libuutil3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libuutil1, libuutil1linux, libuutil2linux, libuutil3
 Replaces: libuutil1, libuutil1linux, libuutil2linux, libuutil3
 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
    that make it possible to run Solaris user code in a Linux environment
    with relatively minimal modification.
  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
    library.
  * libefi: The Extensible Firmware Interface library for GUID disk
    partitioning.
  * libshare: NFS, SMB, and iSCSI service integration for ZFS.
 Package: libzfslinux-dev
 Section: contrib/libdevel
 Architecture: linux-any
 Depends: libssl-dev | libssl1.0-dev,
         libnvpair3linux (= ${binary:Version}),
         libuutil3linux (= ${binary:Version}),
         libzfs4linux (= ${binary:Version}),
         libzfsbootenv1linux (= ${binary:Version}),
         libzpool5linux (= ${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 libnvpair3, libuutil3,
 libzpool5 and libzfs4, libzfsbootenv1.
 Package: libzfs4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4
 Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4
 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 OpenZFS library provides support for managing OpenZFS filesystems.
 Package: libzfsbootenv1linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libzfs2, libzfs4
 Replaces: libzfs2, libzfs4
 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: libzpool5linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libzpool2, libzpool2linux, libzpool3linux, libzpool4
 Replaces: libzpool2, libzpool2linux, libzpool3linux, libzpool4
 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,
 compression, encryption, snapshots, and more.
 .
 This zpool library provides support for managing zpools.
 Package: python3-pyzfs
 Section: contrib/python
 Architecture: linux-any
 Depends: ${misc:Depends},
         ${python3:Depends},
         python3-cffi,
         zfsutils-linux (= ${binary:Version})
 Description: wrapper for libzfs_core C library
 libzfs_core is intended to be a stable interface for programmatic
 administration of ZFS. This wrapper provides one-to-one wrappers for
 libzfs_core API functions, but the signatures and types are more natural to
 Python.
 .
 nvlists are wrapped as dictionaries or lists depending on their usage.
 Some parameters have default values depending on typical use for
 increased convenience. Enumerations and bit flags become strings and lists
 of strings in Python. Errors are reported as exceptions rather than integer
 errno-style error codes.  The wrapper takes care to provide one-to-many
 mapping of the error codes to the exceptions by interpreting a context
 in which the error code is produced.
 Package: pyzfs-doc
 Section: contrib/doc
 Architecture: all
 Depends:
 ${sphinxdoc:Depends},
 ${misc:Depends}
 Recommends:
 python3-pyzfs
 Description: wrapper for libzfs_core C library (documentation)
 libzfs_core is intended to be a stable interface for programmatic
 administration of ZFS. This wrapper provides one-to-one wrappers for
 libzfs_core API functions, but the signatures and types are more natural to
 Python.
 .
 nvlists are wrapped as dictionaries or lists depending on their usage.
 Some parameters have default values depending on typical use for
 increased convenience. Enumerations and bit flags become strings and lists
 of strings in Python. Errors are reported as exceptions rather than integer
 errno-style error codes.  The wrapper takes care to provide one-to-many
 mapping of the error codes to the exceptions by interpreting a context
 in which the error code is produced.
 .
 This package contains the documentation.
 Package: zfs-initramfs
 Architecture: all
 Depends: busybox-initramfs | busybox-static | busybox,
         initramfs-tools,
         zfsutils-linux (>= ${binary:Version}),
         ${misc:Depends}
 Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
 Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
 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 initramfs-tools infrastructure.
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
 Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
 Recommends: lsb-base, zfs-zed
 Suggests: nfs-kernel-server,
          samba-common-bin (>= 3.0.23),
          zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
 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 provides the zfs and zpool commands to create and administer
 OpenZFS filesystems.
 Package: zfs-zed
 Section: contrib/admin
 Architecture: linux-any
 Depends: zfsutils-linux (>= ${binary:Version}),
         ${misc:Depends},
         ${shlibs:Depends}
 Description: OpenZFS Event Daemon
 OpenZFS is a storage platform that encompasses the functionality of
 traditional filesystems and volume managers. It supports data checksums,
 compression, encryption, snapshots, and more.
 .
 ZED (ZFS Event Daemon) monitors events generated by the ZFS kernel
 module. When a zevent (ZFS Event) is posted, ZED will run any ZEDLETs
 (ZFS Event Daemon Linkage for Executable Tasks) that have been enabled
 for the corresponding zevent class.
 .
 This package provides the OpenZFS Event Daemon (zed).
 Package: zfs-test
 Section: contrib/admin
 Architecture: linux-any
 Depends: acl,
         attr,
         bc,
         fio,
         ksh,
         lsscsi,
         mdadm,
         parted,
         python3,
         python3-pyzfs,
         sudo,
         sysstat,
         zfsutils-linux (>=${binary:Version}),
         ${misc:Depends},
         ${shlibs:Depends}
 Recommends: nfs-kernel-server
 Breaks: zfsutils-linux (<= 0.7.9-2)
 Replaces: zfsutils-linux (<= 0.7.9-2)
 Conflicts: zutils
 Description: OpenZFS test infrastructure and support scripts
 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 provides the OpenZFS test infrastructure for destructively
 testing and validating a system using OpenZFS. It is entirely optional
 and should only be installed and used in test environments.
 Package: spl
 Section: contrib/metapackages
 Architecture: all
 Depends: ${misc:Depends},
 Suggests: zfs-test
 Description: Solaris Porting Layer user-space utilities for Linux (dummy)
 The Solaris Porting Layer (SPL) is a Linux kernel module which provides
 many of the Solaris kernel APIs. This shim layer makes it possible to
 run Solaris kernel code in the Linux kernel with relatively minimal
 modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
 module which provides a testing harness for the SPL module.
 .
 SPL can be particularly useful when you want to track upstream Illumos
 (or any other OpenSolaris fork) development closely and don't want the
 overhead of maintaining a large patch which converts Solaris primitives
 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,
         libzpool5linux-dbgsym,
         zfs-test-dbgsym,
         zfsutils-linux-dbgsym,
         zfs-zed-dbgsym,
 Description: Transitional package. It can be safely removed.
@@ -154,7 +154,7 @@ Copyright: 2010, 2013, Aneurin Price <aneurin.price@gmail.com>
 License: Expat
 Files: debian/rules
-Copyright: OPENSOLARIS.LICENSE README.markdown
+Copyright: LICENSE README.markdown
 License: UNKNOWN
 Please fill license UNKNOWN from header of debian/rules
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -0,0 +1,2 @@
 lib/*/security/pam_zfs_key.so
 usr/share/pam-configs/zfs_key
@@ -0,0 +1,6 @@
 #!/bin/sh
 set -e
 pam-auth-update --package
 #DEBHELPER#
@@ -0,0 +1,8 @@
 #!/bin/sh
 set -e
 if [ "$1" = remove ] ; then
    pam-auth-update --package --remove zfs_key
 fi
 #DEBHELPER#
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libuutil.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1,2 @@
 lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
 lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1 @@
 lib/libzfsbootenv.so.*
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*
@@ -0,0 +1,2 @@
 package-name-doesnt-match-sonames
 extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -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
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libzpool.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -1,5 +1,6 @@
 usr/share/zfs/enum-extract.pl
 usr/share/zfs/zfs-helpers.sh
 etc/default/zfs
 etc/init.d
 etc/sudoers.d
 etc/zfs/vdev_id.conf.alias.example
@@ -9,3 +10,4 @@ etc/zfs/vdev_id.conf.sas_switch.example
 etc/zfs/vdev_id.conf.scsi.example
 usr/lib/dracut
 usr/share/zfs/enum-extract.pl
 etc/zfs/zfs-functions
@@ -4,12 +4,13 @@ From: Debian ZFS on Linux maintainers
 Date: Wed, 30 Jan 2019 15:12:04 +0100
 Subject: [PATCH] Check-for-META-and-DCH-consistency-in-autoconf
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 config/zfs-meta.m4 | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)
 diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
-index 3e1429d99..b8e26c492 100644
+index b3c1befaa..660d8ccb9 100644
 --- a/config/zfs-meta.m4
 +++ b/config/zfs-meta.m4
@@ -1,9 +1,10 @@
@@ -35,7 +36,7 @@ index 3e1429d99..b8e26c492 100644
 		ZFS_META_NAME=_ZFS_AC_META_GETVAL([(Name|Project|Package)]);
 		if test -n "$ZFS_META_NAME"; then
-@@ -66,8 +68,30 @@ AC_DEFUN([ZFS_AC_META], [
+@@ -69,8 +71,30 @@ AC_DEFUN([ZFS_AC_META], [
 			AC_SUBST([ZFS_META_VERSION])
 		fi
@@ -13,14 +13,15 @@ not actually used.
 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
+--- a/etc/modules-load.d/zfs.conf
-+++ b/etc/modules-load.d/zfs.conf.in
+++ 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.
@@ -6,16 +6,18 @@ Subject: [PATCH] Fix the path to the zed binary on the systemd unit.
 We install zed into /usr/sbin manually meanwhile the upstream default is
 installing it into /sbin. Ubuntu packages also install zed to /usr/sbin, but
 they ship their own zfs-zed unit.
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 etc/systemd/system/zfs-zed.service.in | 2 +-
 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 e3dec3dca..0b85f169a 100644
+index 008075138..570e27707 100644
 --- a/etc/systemd/system/zfs-zed.service.in
 +++ b/etc/systemd/system/zfs-zed.service.in
-@@ -5,7 +5,7 @@ After=zfs-import-cache.service
+@@ -4,7 +4,7 @@ Documentation=man:zed(8)
- After=zfs-import-scan.service
+ ConditionPathIsDirectory=/sys/module/zfs
 [Service]
 -ExecStart=@sbindir@/zed -F
@@ -8,20 +8,21 @@ Content-Transfer-Encoding: 8bit
 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/systemd/system/zfs-import-scan.service.in | 2 +-
 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 e7b1d8862..060540f63 100644
+index d3c083f7e..b1c8c7b9d 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
-ExecStart=@sbindir@/zpool import -aN -o cachefile=none
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
-+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS
 [Install]
 WantedBy=zfs-import.target
@@ -6,12 +6,14 @@ Subject: [PATCH] Enable zed emails
 The OpenZFS event daemon monitors pools. This patch enables the email sending
 function by default (if zed is installed). This is consistent with the default
 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(-)
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index 35a4d1275..c6c106b06 100644
+index 1c278b2ef..41c075c09 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
@@ -15,7 +15,7 @@
@@ -0,0 +1,30 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 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])
 [0] https://salsa.debian.org/zfsonlinux-team/zfs.git
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Description: track default symlinks, instead of symlinking
 Forwarded: no need
 ---
 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 2c8173b3e..ad39292e4 100644
 --- a/cmd/zed/zed.d/Makefile.am
 +++ b/cmd/zed/zed.d/Makefile.am
@@ -49,7 +49,7 @@ install-data-hook:
 	for f in $(zedconfdefaults); do \
 	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
 	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
 -	    ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
 +	    echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
 	done
 	chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
@@ -0,0 +1,55 @@
 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 370f5382e..661fbe85d 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
 # OpenZFS 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 551ed15db..bd30488ea 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
@@ -88,7 +88,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
@@ -0,0 +1,66 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Stoiko Ivanov <s.ivanov@proxmox.com>
 Date: Tue, 15 Sep 2020 19:07:24 +0200
 Subject: [PATCH] Add systemd-unit for importing specific pools
 The unit can be instantiated with a specific poolname, which will get imported
 by scanning /dev/disk/by-id, irrespective of the existence and content of
 /etc/zfs/zpool.cache.
 the instance name is used unescaped (see systemd.unit(5)), since zpool names
 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            |  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
 index e4056a92c..030611419 100644
 --- a/etc/systemd/system/50-zfs.preset.in
 +++ b/etc/systemd/system/50-zfs.preset.in
@@ -1,6 +1,7 @@
 # ZFS is enabled by default
 enable zfs-import-cache.service
 disable zfs-import-scan.service
 +enable zfs-import@.service
 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
 --- /dev/null
 +++ b/etc/systemd/system/zfs-import@.service.in
@@ -0,0 +1,16 @@
 +[Unit]
 +Description=Import ZFS pool %i
 +Documentation=man:zpool(8)
 +DefaultDependencies=no
 +After=systemd-udev-settle.service
 +After=cryptsetup.target
 +After=multipathd.target
 +Before=zfs-import.target
 +
 +[Service]
 +Type=oneshot
 +RemainAfterExit=yes
 +ExecStart=@sbindir@/zpool import -N -d /dev/disk/by-id -o cachefile=none %I
 +
 +[Install]
 +WantedBy=zfs-import.target
@@ -0,0 +1,51 @@
 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/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 8ab1b7572..8b3dbe633 100644
 --- a/man/Makefile.am
 +++ b/man/Makefile.am
@@ -8,7 +8,6 @@ dist_man_MANS = \
 	man1/ztest.1 \
 	man1/raidz_test.1 \
 	man1/zvol_wait.1 \
 -	man1/arcstat.1 \
 	\
 	man5/vdev_id.conf.5 \
 	\
@@ -21,6 +20,7 @@ dist_man_MANS = \
 	man7/zpoolconcepts.7 \
 	man7/zpoolprops.7 \
 	\
 +	man8/arcstat.8 \
 	man8/fsck.zfs.8 \
 	man8/mount.zfs.8 \
 	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 a69cd8937..dfe9c971b 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 May 26, 2021
 -.Dt ARCSTAT 1
 +.Dt ARCSTAT 8
 .Os
 .
 .Sh NAME
@@ -0,0 +1,134 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Valmiky Arquissandas <kayvlim@gmail.com>
 Date: Fri, 8 Oct 2021 16:32:27 +0100
 Subject: [PATCH] arcstat: Fix integer division with python3
 The arcstat script requests compatibility with python2 and python3, but
 PEP 238 modified the / operator and results in erroneous output when
 run under python3.
 This commit replaces instances of / with //, yielding the expected
 result in both versions of Python.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: John Kennedy <john.kennedy@delphix.com>
 Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
 Signed-off-by: Valmiky Arquissandas <foss@kayvlim.com>
 Closes #12603
 (cherry picked from commit 2d02bba23d83ae8fede8d281edc255f01ccd28e9)
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 cmd/arcstat/arcstat.in | 66 +++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 33 deletions(-)
 diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
 index 9e7c52a6c..cd9a803a2 100755
 --- a/cmd/arcstat/arcstat.in
 +++ b/cmd/arcstat/arcstat.in
@@ -441,73 +441,73 @@ def calculate():
     v = dict()
     v["time"] = time.strftime("%H:%M:%S", time.localtime())
 -    v["hits"] = d["hits"] / sint
 -    v["miss"] = d["misses"] / sint
 +    v["hits"] = d["hits"] // sint
 +    v["miss"] = d["misses"] // sint
     v["read"] = v["hits"] + v["miss"]
 -    v["hit%"] = 100 * v["hits"] / v["read"] if v["read"] > 0 else 0
 +    v["hit%"] = 100 * v["hits"] // v["read"] if v["read"] > 0 else 0
     v["miss%"] = 100 - v["hit%"] if v["read"] > 0 else 0
 -    v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) / sint
 -    v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) / sint
 +    v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) // sint
 +    v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) // sint
     v["dread"] = v["dhit"] + v["dmis"]
 -    v["dh%"] = 100 * v["dhit"] / v["dread"] if v["dread"] > 0 else 0
 +    v["dh%"] = 100 * v["dhit"] // v["dread"] if v["dread"] > 0 else 0
     v["dm%"] = 100 - v["dh%"] if v["dread"] > 0 else 0
 -    v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) / sint
 +    v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) // sint
     v["pmis"] = (d["prefetch_data_misses"] +
 -                 d["prefetch_metadata_misses"]) / sint
 +                 d["prefetch_metadata_misses"]) // sint
     v["pread"] = v["phit"] + v["pmis"]
 -    v["ph%"] = 100 * v["phit"] / v["pread"] if v["pread"] > 0 else 0
 +    v["ph%"] = 100 * v["phit"] // v["pread"] if v["pread"] > 0 else 0
     v["pm%"] = 100 - v["ph%"] if v["pread"] > 0 else 0
     v["mhit"] = (d["prefetch_metadata_hits"] +
 -                 d["demand_metadata_hits"]) / sint
 +                 d["demand_metadata_hits"]) // sint
     v["mmis"] = (d["prefetch_metadata_misses"] +
 -                 d["demand_metadata_misses"]) / sint
 +                 d["demand_metadata_misses"]) // sint
     v["mread"] = v["mhit"] + v["mmis"]
 -    v["mh%"] = 100 * v["mhit"] / v["mread"] if v["mread"] > 0 else 0
 +    v["mh%"] = 100 * v["mhit"] // v["mread"] if v["mread"] > 0 else 0
     v["mm%"] = 100 - v["mh%"] if v["mread"] > 0 else 0
     v["arcsz"] = cur["size"]
     v["size"] = cur["size"]
     v["c"] = cur["c"]
 -    v["mfu"] = d["mfu_hits"] / sint
 -    v["mru"] = d["mru_hits"] / sint
 -    v["mrug"] = d["mru_ghost_hits"] / sint
 -    v["mfug"] = d["mfu_ghost_hits"] / 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["el2inel"] = d["evict_l2_ineligible"] / sint
 -    v["mtxmis"] = d["mutex_miss"] / sint
 +    v["mfu"] = d["mfu_hits"] // sint
 +    v["mru"] = d["mru_hits"] // sint
 +    v["mrug"] = d["mru_ghost_hits"] // sint
 +    v["mfug"] = d["mfu_ghost_hits"] // 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["el2inel"] = d["evict_l2_ineligible"] // sint
 +    v["mtxmis"] = d["mutex_miss"] // sint
     if l2exist:
 -        v["l2hits"] = d["l2_hits"] / sint
 -        v["l2miss"] = d["l2_misses"] / sint
 +        v["l2hits"] = d["l2_hits"] // sint
 +        v["l2miss"] = d["l2_misses"] // sint
         v["l2read"] = v["l2hits"] + v["l2miss"]
 -        v["l2hit%"] = 100 * v["l2hits"] / v["l2read"] if v["l2read"] > 0 else 0
 +        v["l2hit%"] = 100 * v["l2hits"] // v["l2read"] if v["l2read"] > 0 else 0
         v["l2miss%"] = 100 - v["l2hit%"] if v["l2read"] > 0 else 0
         v["l2asize"] = cur["l2_asize"]
         v["l2size"] = cur["l2_size"]
 -        v["l2bytes"] = d["l2_read_bytes"] / sint
 +        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%"] = 100 * v["l2pref"] / v["l2asize"]
 -        v["l2mfu%"] = 100 * v["l2mfu"] / v["l2asize"]
 -        v["l2mru%"] = 100 * v["l2mru"] / v["l2asize"]
 -        v["l2data%"] = 100 * v["l2data"] / v["l2asize"]
 -        v["l2meta%"] = 100 * v["l2meta"] / v["l2asize"]
 +        v["l2pref%"] = 100 * v["l2pref"] // v["l2asize"]
 +        v["l2mfu%"] = 100 * v["l2mfu"] // v["l2asize"]
 +        v["l2mru%"] = 100 * v["l2mru"] // v["l2asize"]
 +        v["l2data%"] = 100 * v["l2data"] // v["l2asize"]
 +        v["l2meta%"] = 100 * v["l2meta"] // v["l2asize"]
     v["grow"] = 0 if cur["arc_no_grow"] else 1
     v["need"] = cur["arc_need_free"]
@@ -0,0 +1,112 @@
 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 l2arc MFU/MRU stats
 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.
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 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)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 cmd/arc_summary/arc_summary3 | 28 ++++++++++++++--------------
 cmd/arcstat/arcstat.in       | 14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)
 diff --git a/cmd/arc_summary/arc_summary3 b/cmd/arc_summary/arc_summary3
 index 7b28012ed..fe6a6d9e2 100755
 --- a/cmd/arc_summary/arc_summary3
 +++ b/cmd/arc_summary/arc_summary3
@@ -617,13 +617,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()
@@ -765,20 +765,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/arcstat.in b/cmd/arcstat/arcstat.in
 index cd9a803a2..ea45dc602 100755
 --- a/cmd/arcstat/arcstat.in
 +++ b/cmd/arcstat/arcstat.in
@@ -482,8 +482,8 @@ def calculate():
     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
@@ -498,11 +498,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"]
@@ -0,0 +1,11 @@
 0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
 0002-always-load-ZFS-module-on-boot.patch
 0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
 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
 0010-arcstat-Fix-integer-division-with-python3.patch
 0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
@@ -0,0 +1 @@
 usr/lib/python3*
@@ -0,0 +1,127 @@
 #!/usr/bin/make -f
 include /usr/share/dpkg/default.mk
 VERSION := $(DEB_VERSION_UPSTREAM)
 REVISION := $(shell echo $(DEB_VERSION) | cut -d- -f2)
 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
 adapt_meta_file:
 	@# Embed the downstream version in the module.
 	@sed \
 	  -e 's/^Version:.*/Version:      $(VERSION)/' \
 	  -e 's/^Release:.*/Release:      $(REVISION)/' \
 	  -i.orig META
 override_dh_autoreconf: adapt_meta_file
 	dh_autoreconf
 override_dh_auto_configure:
 	@# Build the userland, but don't build the kernel modules.
 	dh_auto_configure -- \
 	  --bindir=/usr/bin \
 	  --sbindir=/sbin \
 	  --libdir=/lib/"$(DEB_HOST_MULTIARCH)" \
 	  --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-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
 	  --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:
 override_dh_auto_test:
 ifeq (amd64,$(DEB_HOST_ARCH))
 	# Upstream provides an ABI guarantee that we validate here
 	-$(MAKE) checkabi
 endif
 	# The dh_auto_test rule is disabled because
 	# `make check` cannot run in an unprivileged build environment.
 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
 	mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/'
 	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
 	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
 	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
 	@# 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/$(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
 	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
 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)
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
 override_dh_install:
 	find debian/tmp/lib -name *.la -delete
 	dh_install
 override_dh_missing:
 	dh_missing --fail-missing
 override_dh_installsystemd:
 	# these to lines prevent the restarting of all systemd services, except
 	# zfs-zed - they should not be restarted (importing, mounting, creating
 	# links in /dev, and can cause erros in the log
 	# (upon major.minor change)
 	dh_installsystemd --no-stop-on-upgrade -X zfs-zed.service
 	dh_installsystemd --name zfs-zed
 override_dh_installdocs:
 	dh_installdocs
 ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
 	http_proxy='127.0.0.1:9' $(SPHINX_BUILD) -N -bhtml "$(CURDIR)/contrib/pyzfs/docs/source/" debian/pyzfs-doc/usr/share/doc/pyzfs-doc/html/
 endif
 # ------------
 debian-copyright:
 	cme update dpkg-copyright -file debian/copyright.cme
@@ -0,0 +1,45 @@
 #!/bin/sh -eu
 # directly exit successfully when zfs module is not loaded
 if ! [ -d /sys/module/zfs ]; then
 	exit 0
 fi
 # [auto] / enable / disable
 PROPERTY_NAME="org.debian:periodic-scrub"
 get_property () {
 	# Detect the ${PROPERTY_NAME} property on a given pool.
 	# We are abusing user-defined properties on the root dataset,
 	# 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
 }
 scrub_if_not_scrub_in_progress () {
 	pool="$1"
 	if ! zpool status "${pool}" | grep -q "scrub in progress"; then
 		# Ignore errors and continue with scrubbing other pools.
 		zpool scrub "${pool}" || true
 	fi
 }
 # Scrub all healthy pools that are not already scrubbing as per their configs.
 zpool list -H -o health,name 2>&1 | \
 	awk -F'\t' '$1 == "ONLINE" {print $2}' | \
 while read pool
 do
 	# read user-defined config
 	ret=$(get_property "${pool}")
 	if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
 		:
 	elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ] || [ "enable" = "${ret}" ]; then
 		scrub_if_not_scrub_in_progress "${pool}"
 	else
 		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
 done
@@ -0,0 +1,60 @@
 #!/bin/sh -eu
 # directly exit successfully when zfs module is not loaded
 if ! [ -d /sys/module/zfs ]; then
 	exit 0
 fi
 # [auto] / enable / disable
 PROPERTY_NAME="org.debian:periodic-trim"
 get_property () {
 	# Detect the ${PROPERTY_NAME} property on a given pool.
 	# We are abusing user-defined properties on the root dataset,
 	# 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
 }
 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
 	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
 		}'
 }
 # 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
 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
 $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
 done
@@ -1,21 +1,15 @@
 sbin/zinject
 sbin/zpios
 sbin/ztest
 usr/bin/raidz_test
 usr/share/man/man1/raidz_test.1
 usr/share/man/man1/test-runner.1
 usr/share/man/man1/zpios.1
 usr/share/man/man1/ztest.1
 usr/share/man/man8/zinject.8
 usr/share/zfs/common.sh
 usr/share/zfs/runfiles/
 usr/share/zfs/smb.sh
 usr/share/zfs/test-runner
 usr/share/zfs/zfs-tests.sh
 usr/share/zfs/zfs-tests/
 usr/share/zfs/zfs.sh
 usr/share/zfs/zimport.sh
 usr/share/zfs/zloop.sh
 usr/share/zfs/zpios*
 usr/share/zfs/zpool-config/
 usr/share/zfs/zpool-create.sh
@@ -0,0 +1,13 @@
 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/*
@@ -1,5 +1,5 @@
 etc/zfs/zed.d/*
 lib/systemd/system/zfs-zed.service
-usr/lib/*/zfs/zed.d/*
+usr/lib/zfs-linux/zed.d/*
 usr/sbin/zed
 usr/share/man/man8/zed.8
@@ -0,0 +1,4 @@
 script-not-executable
 # https://github.com/zfsonlinux/zfs/issues/8064
 systemd-service-file-refers-to-unusual-wantedby-target
@@ -0,0 +1,20 @@
 #!/bin/sh
 set -e
 zedd="/usr/lib/zfs-linux/zed.d"
 etcd="/etc/zfs/zed.d"
 # enable all default zedlets that are not overridden
 while read -r file ; do
    etcfile="${etcd}/${file}"
    [ -e "${etcfile}" ] && continue
    ln -sfT "${zedd}/${file}" "${etcfile}"
 done < "${zedd}/DEFAULT-ENABLED"
 # remove the overrides created in prerm
 find "${etcd}" -maxdepth 1 -lname '/dev/null' -delete
 # remove any dangling symlinks to old zedlets
 find "${etcd}" -maxdepth 1 -lname "${zedd}/*" -xtype l  -delete
 #DEBHELPER#
@@ -0,0 +1,17 @@
 #!/bin/sh
 set -e
 zedd="/usr/lib/zfs-linux/zed.d"
 etcd="/etc/zfs/zed.d"
 if [ "$1" = "purge" ] && [ -d "$etcd" ] ; then
    # remove the overrides created in prerm
    find "${etcd}" -maxdepth 1 -lname '/dev/null' -delete
    # remove any dangling symlinks to old zedlets
    find "${etcd}" -maxdepth 1 -lname "${zedd}/*" -xtype l  -delete
    # clean up any empty directories
    ( rmdir "$etcd" && rmdir "/etc/zfs" ) || true
 fi
 #DEBHELPER#
@@ -0,0 +1,16 @@
 #!/bin/sh
 set -e
 zedd="/usr/lib/zfs-linux/zed.d"
 etcd="/etc/zfs/zed.d"
 if [ "$1" != "failed-upgrade" ] && [ -d "${etcd}" ] && [ -d "${zedd}" ] ; then
    while read -r file ; do
        etcfile="${etcd}/${file}"
        ( [ -L "${etcfile}" ] || [ -e "${etcfile}" ] ) && continue
        ln -sT /dev/null "${etcfile}"
    done < "${zedd}/DEFAULT-ENABLED"
 fi
 #DEBHELPER#
@@ -0,0 +1,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 # TRIM the first Sunday of every month.
 24 0 1-7 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/trim ]; then /usr/lib/zfs-linux/trim; fi
 # Scrub the second Sunday of every month.
 24 0 8-14 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ]; then /usr/lib/zfs-linux/scrub; fi
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1,126 @@
 ../tree/zfsutils-linux/* /
 etc/default/zfs
 etc/zfs/zfs-functions
 etc/zfs/zpool.d/
 lib/systemd/system-preset/
 lib/systemd/system/zfs-import-cache.service
 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-mount.service
 lib/systemd/system/zfs-share.service
 lib/systemd/system/zfs-volume-wait.service
 lib/systemd/system/zfs-volumes.target
 lib/systemd/system/zfs.target
 lib/systemd/system-generators/zfs-mount-generator
 lib/udev/
 sbin/fsck.zfs
 sbin/mount.zfs
 sbin/zdb
 sbin/zfs
 sbin/zfs_ids_to_path
 sbin/zgenhostid
 sbin/zhack
 sbin/zpool
 sbin/zstream
 sbin/zstreamdump
 usr/bin/zvol_wait
 usr/lib/modules-load.d/ lib/
 usr/lib/zfs-linux/zpool.d/
 usr/lib/zfs-linux/zpool_influxdb
 usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
 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/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
 usr/share/man/man8/zdb.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/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_influxdb.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/zstream.8
 usr/share/man/man8/zstreamdump.8
 usr/share/zfs/compatibility.d/
@@ -0,0 +1,14 @@
 spare-manual-page
 systemd-service-file-refers-to-unusual-wantedby-target
 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
 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
@@ -0,0 +1,19 @@
 #!/bin/sh
 set -e
 # The hostname and hostid of the last system to access a ZFS pool are stored in
 # the ZFS pool itself. A pool is foreign if, during `zpool import`, the
 # current hostname and hostid are different than the stored values thereof.
 #
 # The only way of having a stable hostid is to define it in /etc/hostid.
 # This postinst helper will check if we already have the hostid stabilized by
 # checking the existence of the file /etc/hostid to be 4 bytes at least.
 # If this file don't already exists on our system or has less than 4 bytes, then
 # a new (random) value is generated with zgenhostid (8) and stored in
 # /etc/hostid
 if [ ! -f /etc/hostid ] || [ "$(stat -c %s /etc/hostid)" -lt 4 ] ; then
 	zgenhostid
 fi
 #DEBHELPER#
@@ -1,380 +0,0 @@
 spl-linux (0.7.13-pve1~bpo2) unstable; urgency=medium
  * update SPL to 0.7.13
  * base spl-linux on upstream ZOL instead of debian
 -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Mar 2019 06:53:13 +0100
 spl-linux (0.7.12-pve1~bpo1) unstable; urgency=medium
  * update SPL to 0.7.12
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2018 17:51:59 +0100
 spl-linux (0.7.11-pve2~bpo1) unstable; urgency=medium
  * update SPL to debian/0.7.11
  * Backport deadlock fix between mm_sem and tx assign in zfs_write() and page
    fault
 -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2018 13:47:39 +0100
 spl-linux (0.7.11-pve1~bpo1) unstable; urgency=medium
  * update SPL to 0.7.11
 -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Sep 2018 15:47:06 +0200
 spl-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.9
 -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
 spl-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.8 (no changes)
 -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
 spl-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.7
 -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
 spl-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:47:54 +0100
 spl-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.4
 -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
 spl-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
  * update spl to 0.7.3
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
 spl-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
  * update spl to 0.7.2
  * clean up man pages
 -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:33:04 +0200
 spl-linux (0.6.5.11-pve10~bpo90) unstable; urgency=medium
  * update spl to debian/0.6.5.11-1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
 spl-linux (0.6.5.9-pve9~bpo90) unstable; urgency=medium
  * rebuild for PVE 5.0 / Debian Stretch
 -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
 spl-linux (0.6.5.9-pve8~bpo80) unstable; urgency=medium
  * update spl to debian/0.6.5.9-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:35 +0100
 spl-linux (0.6.5.8-pve7~bpo80) unstable; urgency=medium
  * update spl to debian/0.6.5.8-2
  * switch package upstream sources to Debian (Jessie)
 -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
 spl-linux (0.6.5.7-pve6~bpo80) unstable; urgency=medium
  * update pkg-spl to jessie/0.6.5.7-5
  * change package versioning to allow upgrades from PVE3/wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
 spl-linux (0.6.5-pve5~jessie) unstable; urgency=medium
  * Update pkg-spl to jessie/0.6.5.6-3
 -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Apr 2016 11:11:59 +0200
 spl-linux (0.6.5-pve4~jessie) unstable; urgency=medium
  * update to 0.6.5.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:49:49 +0200
 spl-linux (0.6.5-pve3~jessie) unstable; urgency=medium
  * update to 0.6.5.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 11:00:40 +0100
 spl-linux (0.6.5-pve2~jessie) unstable; urgency=medium
  * update to 0.6.5.3
 -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:40:58 +0100
 spl-linux (0.6.5-pve1~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:04:23 +0200
 spl-linux (0.6.4-pve3~jessie) unstable; urgency=medium
  * update to snapshot/debian/jessie/0.6.4-8-8ac6ff
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:14:12 +0200
 spl-linux (0.6.4-pve2~jessie) unstable; urgency=medium
  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-6-37d7cd)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:02:31 +0200
 spl-linux (0.6.4-pve1~jessie) unstable; urgency=medium
  * update to 0.6.4 (use upstream zol package definitions)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:17:26 +0200
 spl-linux (0.6.3-pve1~jessie) unstable; urgency=medium
  * recompile for jessie
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:03:01 +0100
 spl-linux (0.6.3-pve1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
 spl-linux (0.7.12-1) unstable; urgency=medium
  * New upstream version 0.7.12
  * Bump linux compatibility to 4.19 .
 -- Mo Zhou <cdluminate@gmail.com>  Mon, 19 Nov 2018 11:25:53 +0000
 spl-linux (0.7.11-1) unstable; urgency=medium
  [ Nicolas Braud-Santoni ]
  * control: Use a canonical URI for Vcs-Git
  * copyright: Use HTTPs Format URI in copyright
  * debian/rules: Enable build hardening
  * debian/rules: Use DEB_VERSION* instead of manually parsing.
  [ Mo Zhou ]
  * New upstream version 0.7.11 (Closes: #908483)
  * Append myself to Uploaders.
  * Suggests linux-libc-dev (<< LINUX_NEXT~) instead of (<< LINUX_NEXT).
  * Replace get_next.sh with one-liner awk script in rules.
  * Bump linux_compat to 4.18 .
  * Fix debian-rules-sets-dpkg-architecture-variable.
  * Fix debian-watch-uses-insecure-uri.
 -- Mo Zhou <cdluminate@gmail.com>  Wed, 19 Sep 2018 04:13:01 +0000
 spl-linux (0.7.9-3) unstable; urgency=medium
  * d/control: migrate to alioth-lists (Closes: #899692)
 -- Aron Xu <aron@debian.org>  Mon, 28 May 2018 18:05:37 +0800
 spl-linux (0.7.9-2) unstable; urgency=medium
  [ Aron Xu ]
  * New upstream version 0.7.9
  * Fix lintian obsolete-relation-form-in-source
  * Bump supported linux version to 4.16
  [ Antonio Russo ]
  * Reduce dependency on spl, and move documentation (Closes: #894608)
 -- Aron Xu <aron@debian.org>  Wed, 16 May 2018 21:36:17 +0800
 spl-linux (0.7.6-1) unstable; urgency=medium
  * New upstream release (Closes: #891235)
  * Update VCS-* URL to salsa.debian.org
  * Apply wrap-and-sort to control*
  * Recommends: linux-libc-dev (< ${LINUX_NEXT}):
    Tries to prevent unexpected upgrades of kernel that is not known
    to be supported by the packaged version of ZFS/SPL.
 -- Aron Xu <aron@debian.org>  Mon, 26 Feb 2018 16:29:50 +0800
 spl-linux (0.7.5-1) unstable; urgency=medium
  * Add libelf-dev to Depends (Closes: #886453)
  * New upstream version 0.7.5 (Closes: #886453)
 -- Aron Xu <aron@debian.org>  Fri, 19 Jan 2018 15:23:26 +0800
 spl-linux (0.7.4-1) unstable; urgency=medium
  * New upstream version 0.7.4 (Closes: #883830)
  * Update stdver to 4.1.2, no change required
 -- Aron Xu <aron@debian.org>  Mon, 18 Dec 2017 22:05:32 +0800
 spl-linux (0.7.3-1) unstable; urgency=medium
  * New upstream version 0.7.3
 -- Aron Xu <aron@debian.org>  Tue, 31 Oct 2017 17:29:08 +0800
 spl-linux (0.6.5.11-1) unstable; urgency=medium
  * Imported Upstream version 0.6.5.11
 -- Aron Xu <aron@debian.org>  Fri, 14 Jul 2017 14:39:21 +0800
 spl-linux (0.6.5.10-1) unstable; urgency=medium
  * New upstream version 0.6.5.10
 -- Aron Xu <aron@debian.org>  Wed, 05 Jul 2017 18:00:58 +0800
 spl-linux (0.6.5.9-1) unstable; urgency=medium
  * Imported Upstream version 0.6.5.9
 -- Aron Xu <aron@debian.org>  Mon, 06 Feb 2017 15:52:47 +0800
 spl-linux (0.6.5.8-3) unstable; urgency=medium
  * Fix Linux 4.9 compatibility (Closes: #851352)
    Thanks to Fabian Grünbichler!
 -- Aron Xu <aron@debian.org>  Tue, 17 Jan 2017 20:57:13 +0800
 spl-linux (0.6.5.8-2) unstable; urgency=medium
  [ Petter Reinholdtsen ]
  * Added d/gbp.conf to enforce the use of pristine-tar.
  * Added extra autopkgtest script check.sh from the Ubuntu package.
  [ Aron Xu ]
  * Make use of dh-autoreconf
  * Deal with /etc/hostid in postinst of spl package
  * Add lintian-overrides: extra-license-file
  * Simplify rules by merging Ubuntu one
  * Handle the case /etc/hostid is being wrongly marked as conffile
  * Install man pages for spl
  * Move command-with-path-in-maintainer-script override to spl
 -- Aron Xu <aron@debian.org>  Wed, 28 Sep 2016 05:02:06 +0800
 spl-linux (0.6.5.8-1) unstable; urgency=medium
  [ Petter Reinholdtsen ]
  * Fix invalid command in dkms (Closes: #836578)
  [ Zhou Mo ]
  * control: bump standards version to 3.9.8
  [ Aron Xu ]
  * Imported Upstream version 0.6.5.8 (Closes: #835992)
  * rules: allow parallel building
 -- Aron Xu <aron@debian.org>  Sun, 18 Sep 2016 01:06:04 +0800
 spl-linux (0.6.5.7-1) unstable; urgency=medium
  * Imported Upstream version 0.6.5.7
 -- Aron Xu <aron@debian.org>  Wed, 25 May 2016 12:17:05 +0800
 spl-linux (0.6.5.6-2) unstable; urgency=medium
  * Add license names to entries missing it.
  * Added autopkgtest using code from Ubuntu using dkms >= 2.2.0.3-3~.
 -- Petter Reinholdtsen <pere@hungry.com>  Thu, 28 Apr 2016 20:21:29 +0800
 spl-linux (0.6.5.6-1) unstable; urgency=medium
  * New upstream release
 -- Aron Xu <aron@debian.org>  Thu, 24 Mar 2016 07:14:47 +0800
 spl-linux (0.6.5.5-1) unstable; urgency=medium
  * New upstream release
 -- Aron Xu <aron@debian.org>  Sun, 20 Mar 2016 22:50:26 +0800
 spl-linux (0.6.5.4-1) unstable; urgency=medium
  * New upstream release
 -- Aron Xu <aron@debian.org>  Sun, 10 Jan 2016 20:13:15 +0800
 spl-linux (0.6.5.3-1) unstable; urgency=medium
  * New upstream release
 -- Aron Xu <aron@debian.org>  Thu, 05 Nov 2015 21:08:25 +0800
 spl-linux (0.6.5.2-1) unstable; urgency=medium
  * Imported Upstream version 0.6.5.2
  * Add conflicts to splat (Closes: #769147)
 -- Aron Xu <aron@debian.org>  Tue, 13 Oct 2015 15:26:33 +0100
 spl-linux (0.6.4.2-1) experimental; urgency=medium
  * New upstream release.
 -- Aron Xu <aron@debian.org>  Thu, 13 Aug 2015 19:58:26 +0800
 spl-linux (0.6.4.1-1) experimental; urgency=medium
  * New upstream release.
 -- Aron Xu <aron@debian.org>  Sun, 17 May 2015 05:47:51 +0800
 spl-linux (0.6.2-2) experimental; urgency=low
  * Add file and libc-dev to Depends of spl-dkms (Closes: #717565).
 -- Aron Xu <aron@debian.org>  Sun, 25 Aug 2013 02:02:15 +0800
 spl-linux (0.6.2-1) experimental; urgency=low
  * New upstream release.
 -- Aron Xu <aron@debian.org>  Sat, 24 Aug 2013 14:30:25 +0800
 spl-linux (0.6.1-2) experimental; urgency=low
  * Add license info for scripts/kmodtool
  * Add linux 3.10 compatibility patch from upstream. (Closes: #717565)
  * Add facility to build udeb and binary modules, thanks Turbo Fredriksson
    for the work.
 -- Aron Xu <aron@debian.org>  Mon, 29 Jul 2013 16:04:24 +0800
 spl-linux (0.6.1-1) experimental; urgency=low
  * Initial Release (Closes: #686453)
 -- Aron Xu <aron@debian.org>  Tue, 02 Apr 2013 01:03:05 +0200
@@ -1 +0,0 @@
 10
@@ -1,32 +0,0 @@
 Source: spl-linux
 Section: kernel
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: autogen,
               autotools-dev,
               debhelper (>= 10~),
               dh-autoreconf,
               libtool
 Standards-Version: 4.1.2
 Homepage: http://www.zfsonlinux.org/
 Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
 Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
 Package: spl
 Architecture: linux-any
 Conflicts: spl-dev, splat
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Solaris Porting Layer user-space utilities for Linux
 The Solaris Porting Layer (SPL) is a Linux kernel module which provides
 many of the Solaris kernel APIs. This shim layer makes it possible to
 run Solaris kernel code in the Linux kernel with relatively minimal
 modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
 module which provides a testing harness for the SPL module.
 .
 SPL can be particularly useful when you want to track upstream Illumos
 (or any other OpenSolaris fork) development closely and don't want the
 overhead of maintaining a large patch which converts Solaris primitives
 to Linux primitives.
 .
 This package includes the user space utilities needed to test and debug
 the SPL and SPLAT kernel modules.
@@ -1,189 +0,0 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Solaris Porting Layer for Linux
 Upstream-Contact: Brian Behlendorf <behlendorf1@llnl.gov>
 Source: https://github.com/zfsonlinux/spl/
 Disclaimer:
 This work was produced at the Lawrence Livermore National Laboratory
 (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44) between
 the U.S. Department of Energy (DOE) and Lawrence Livermore National
 Security, LLC (LLNS) for the operation of LLNL.
 .
 This work was prepared as an account of work sponsored by an agency of
 the United States Government.  Neither the United States Government nor
 Lawrence Livermore National Security, LLC nor any of their employees,
 makes any warranty, express or implied, or assumes any liability or
 responsibility for the accuracy, completeness, or usefulness of any
 information, apparatus, product, or process disclosed, or represents
 that its use would not infringe privately-owned rights.
 .
 Reference herein to any specific commercial products, process, or
 services by trade name, trademark, manufacturer or otherwise does
 not necessarily constitute or imply its endorsement, recommendation,
 or favoring by the United States Government or Lawrence Livermore
 National Security, LLC.  The views and opinions of authors expressed
 herein do not necessarily state or reflect those of the Untied States
 Government or Lawrence Livermore National Security, LLC, and shall
 not be used for advertising or product endorsement purposes.
 Files: *
 Copyright: Lawrence Livermore National Security, LLC.
 The Regents of the University of California
 License: GPL-2+
 Files: config/config.guess
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 Files: config/config.sub
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 Files: config/deb.am
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: config/depcomp
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 Files: config/install-sh
 Copyright: 1994 X Consortium
 License: X11-install-sh
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
 deal in the Software without restriction, including without limitation the
 rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 sell copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 .
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 .
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 .
 Except as contained in this notice, the name of the X Consortium shall not
 be used in advertising or otherwise to promote the sale, use or other deal-
 ings in this Software without prior written authorization from the X Consor-
 tium.
 Files: config/ltmain.sh
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 Files: config/missing
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 Files: config/tgz.am
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: debian/*
 Copyright: Darik Horn <dajhorn@vanadac.com>
 Carlos Alberto Lopez Perez <clopez@igalia.com>
 Aron Xu <aron@debian.org>
 License: GPL-2+
 Files: include/linux/zlib_compat.h
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: include/rpc/xdr.h
 Copyright: Sun Microsystems, Inc.
 License: GPL-2+
 Files: include/sys/extdirent.h
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: include/sys/fcntl.h
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: include/sys/idmap.h
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: include/sys/tsd.h
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: include/sys/zmod.h
 Copyright: Jean-loup Gailly
 Mark Adler
 License: zmod
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
 arising from the use of this software.
 .
 Permission is granted to anyone to use this software for any purpose,
 including commercial applications, and to alter it and redistribute it
 freely, subject to the following restrictions:
 .
 1. The origin of this software must not be misrepresented; you must not
 claim that you wrote the original software. If you use this software
 in a product, an acknowledgment in the product documentation would be
 appreciated but is not required.
 .
 2. Altered source versions must be plainly marked as such, and must not be
 misrepresented as being the original software.
 .
 3. This notice may not be removed or altered from any source distribution.
 Files: module/spl/spl-tsd.c
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: module/spl/spl-xdr.c
 Copyright: Sun Microsystems, Inc.
 License: GPL-2+
 Files: module/splat/splat-linux.c
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: scripts/kmodtool
 Copyright: 2003-2012 Ville Skyttä <ville.skytta@iki.fi>
 Thorsten Leemhuis <fedora@leemhuis.info>
 Nicolas Chauvet <kwizart@gmail.com>
 License: BSD-like
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including
 without limitation the rights to use, copy, modify, merge, publish,
 distribute, sublicense, and/or sell copies of the Software, and to
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
 .
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
 .
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 License: GPL-2+
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation; either version 2 of the License, or (at your option) any later
 version.
 .
 This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 .
 You should have received a copy of the GNU General Public License along with
 this package; if not, write to the Free Software Foundation, Inc., 51 Franklin
 St, Fifth Floor, Boston, MA  02110-1301 USA
 .
 On Debian systems, the full text of the GNU General Public License version 2
 can be found in the file /usr/share/common-licenses/GPL-2.
@@ -1,33 +0,0 @@
 #!/usr/bin/make -f
 include /usr/share/dpkg/pkg-info.mk
 VERSION := $(DEB_VERSION_UPSTREAM)
 REVISION := $(shell echo $(DEB_VERSION) | cut -d- -f2)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@ --with autoreconf --parallel
 override_dh_auto_configure:
 	@# Embed the downstream version in the module.
 	@sed \
 	  -e 's/^Version:.*/Version:      $(VERSION)/' \
 	  -e 's/^Release:.*/Release:      $(REVISION)/' \
 	  -i.orig META
 	@# Build the userland, but don't build the kernel modules.
 	dh_auto_configure -- --with-config=user --disable-debug-kmem
 override_dh_auto_test:
 	# scripts/check.sh tries insmod and rmmod, so it cannot
 	# run in an unprivileged build environment.
 override_dh_auto_install:
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 override_dh_auto_clean:
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
@@ -1 +0,0 @@
 extend-diff-ignore='.*'
@@ -1,2 +0,0 @@
 usr/sbin
 usr/share/man/man1/splat.1
@@ -1 +0,0 @@
 spl: command-with-path-in-maintainer-script
@@ -1,49 +0,0 @@
 #!/bin/sh
 set -e
 # The hostname and hostid of the last system to access a ZFS pool are stored in
 # the ZFS pool itself.  A pool is foreign if, during `zpool import`, the
 # current hostname and hostid are different than the stored values thereof.
 #
 # The hostid on Solaris is intrinsic, but is not on Linux (see #595790), so the
 # spl kernel module invokes /usr/bin/hostid from the userland in its initialization
 # routine.
 #
 # /usr/bin/hostid will return the 4 first bytes of the file /etc/hostid.
 # If this file is not present or contains less than 4 bytes, then /usr/bin/hostid
 # will return the bytes of the IP address of $(hostname) flipped, or zero if
 # such IP couldn't be obtained
 #
 # This means that things like a DHCP lease change can affect the hostid.
 #
 # Therefore the only way of having a stable hostid is to define it on /etc/hostid.
 # This postinst helper will check if we already have the hostid stabilized by
 # checking the existence of the file /etc/hostid to be 4 bytes at least.
 # If this file don't already exists on our system or has less than 4 bytes, then
 # we will stabilize our current hostid by writing its value to /etc/hostid
 # Detect if /etc/hostid is a conffile of previous spl package, migrate if yes
 # hostid file should preserve even when package is purged
 if $(dpkg-query --showformat='${Conffiles}\n' --show spl >/dev/null 2>&1); then
 	dpkg-maintscript-helper rm_conffile /etc/hostid -- "$@"
 fi
 if [ ! -f /etc/hostid ] || [ $(stat -c %s /etc/hostid) -lt 4 ] ; then
 	# Write our current hostid to /etc/hostid
 	HOSTID=$(hostid)
 	AA=$(echo $HOSTID | cut -b 1,2)
 	BB=$(echo $HOSTID | cut -b 3,4)
 	CC=$(echo $HOSTID | cut -b 5,6)
 	DD=$(echo $HOSTID | cut -b 7,8)
 	# Big Endian
 	if [ $(echo -n I | od -to2 | awk 'FNR==1{ print substr($2,6,1)}' 2>/dev/null) = 0 ]; then
 		# Invoke the printf from coreutils. shell builtin lacks the byte format.
 		/usr/bin/printf "\x$AA\x$BB\x$CC\x$DD" >/etc/hostid
 	else
 	# Little Endian
 		/usr/bin/printf "\x$DD\x$CC\x$BB\x$AA" >/etc/hostid
 	fi
 fi
 #DEBHELPER#
@@ -1,10 +0,0 @@
 #!/bin/sh
 set -e
 # Detect if /etc/hostid is a conffile of previous spl package, migrate if yes
 # hostid file should preserve even when package is purged
 if $(dpkg-query --showformat='${Conffiles}\n' --show spl >/dev/null 2>&1); then
        dpkg-maintscript-helper rm_conffile /etc/hostid -- "$@"
 fi
 #DEBHELPER#
@@ -1,10 +0,0 @@
 #!/bin/sh
 set -e
 # Detect if /etc/hostid is a conffile of previous spl package, migrate if yes
 # hostid file should preserve even when package is purged
 if $(dpkg-query --showformat='${Conffiles}\n' --show spl >/dev/null 2>&1); then
        dpkg-maintscript-helper rm_conffile /etc/hostid -- "$@"
 fi
 #DEBHELPER#
@@ -1,2 +0,0 @@
 version=3
 https://zfsonlinux.org/ .*spl-([\d\.]+)\.tar\.gz$
@@ -1 +0,0 @@
 10
@@ -1,184 +0,0 @@
 Source: zfs-linux
 Section: contrib/kernel
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: autotools-dev,
               debhelper (>= 10~),
               dh-autoreconf,
               dh-python,
               libattr1-dev,
               libblkid-dev,
               libselinux1-dev,
               libtool,
               lsb-release,
               python3,
               uuid-dev,
               zlib1g-dev
 Standards-Version: 4.1.2
 Homepage: http://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
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libnvpair1
 Replaces: libnvpair1
 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
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libuutil1
 Replaces: libuutil1
 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
    that make it possible to run Solaris user code in a Linux environment
    with relatively minimal modification.
  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
    library.
  * libefi: The Extensible Firmware Interface library for GUID disk
    partitioning.
  * libshare: NFS, SMB, and iSCSI service integration for ZFS.
 Package: libzfslinux-dev
 Section: contrib/libdevel
 Architecture: linux-any
 Depends: libnvpair1linux (= ${binary:Version}),
         libuutil1linux (= ${binary:Version}),
         libzfs2linux (= ${binary:Version}),
         libzpool2linux (= ${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.
 Package: libzfs2linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libzfs2
 Replaces: libzfs2
 Description: OpenZFS filesystem library for Linux
 The Z file system is a pooled filesystem designed for maximum data
 integrity, supporting data snapshots, multiple copies, and data
 checksums.
 .
 The OpenZFS library provides support for managing OpenZFS filesystems.
 Package: libzpool2linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libzpool2
 Replaces: libzpool2
 Description: OpenZFS pool library for Linux
 The Z file system is a pooled filesystem designed for maximum data
 integrity, supporting data snapshots, multiple copies, and data
 checksums.
 .
 This zpool library provides support for managing zpools.
 Package: zfs-initramfs
 Architecture: all
 Depends: busybox-initramfs | busybox-static | busybox,
         initramfs-tools,
         zfsutils-linux (>= ${binary:Version}),
         ${misc:Depends}
 Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
 Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
 The Z file system is a pooled filesystem designed for maximum data
 integrity, supporting data snapshots, multiple copies, and data
 checksums.
 .
 This package adds OpenZFS to the system initramfs with a hook
 for the initramfs-tools infrastructure.
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
 Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
 Recommends: lsb-base, zfs-zed
 Suggests: nfs-kernel-server,
          samba-common-bin (>= 3.0.23),
          zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
 The Z file system is a pooled filesystem designed for maximum data
 integrity, supporting data snapshots, multiple copies, and data
 checksums.
 .
 This package provides the zfs and zpool commands to create and administer
 OpenZFS filesystems.
 Package: zfs-zed
 Section: contrib/admin
 Architecture: linux-any
 Depends: zfsutils-linux (>= ${binary:Version}),
         ${misc:Depends},
         ${shlibs:Depends}
 Description: OpenZFS Event Daemon
 The Z file system is a pooled filesystem designed for maximum data
 integrity, supporting data snapshots, multiple copies, and data
 checksums.
 .
 This package provides the OpenZFS Event Daemon (zed).
 Package: zfs-test
 Section: contrib/admin
 Architecture: linux-any
 Depends: acl,
         bc,
         fio,
         ksh,
         lsscsi,
         mdadm,
         parted,
         python,
         sudo,
         sysstat,
         zfsutils-linux (>=${binary:Version}),
         ${misc:Depends},
         ${shlibs:Depends}
 Breaks: zfsutils-linux (<= 0.7.9-2)
 Replaces: zfsutils-linux (<= 0.7.9-2)
 Conflicts: zutils
 Description: OpenZFS test infrastructure an support scripts
 The Z file system is a pooled filesystem designed for maximum data
 integrity, supporting data snapshots, multiple copies, and data
 checksums.
 .
 This package provides the OpenZFS test infrastructure for destructively
 testing and validating a system using OpenZFS. It is entirely optional
 and should only be installed and used in test environments.
 Package: zfs-dbg
 Section: contrib/debug
 Priority: optional
 Architecture: linux-any
 Depends: libnvpair1linux (= ${binary:Version}),
         libuutil1linux (= ${binary:Version}),
         libzfs2linux (= ${binary:Version}),
         libzpool2linux (= ${binary:Version}),
         zfs-zed (= ${binary:Version}),
         zfsutils-linux (= ${binary:Version}),
         ${misc:Depends}
 Description: Debugging symbols for OpenZFS userland libraries and tools
 The Z file system is a pooled filesystem designed for maximum data
 integrity, supporting data snapshots, multiple copies, and data
 checksums.
 .
 This package contains the debugging symbols for libzpool2linux, libzfs2linux,
 libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
@@ -1,2 +0,0 @@
 COPYRIGHT
 OPENSOLARIS.LICENSE
@@ -1 +0,0 @@
 lib/libnvpair.so.*
@@ -1 +0,0 @@
 libnvpair1linux: package-name-doesnt-match-sonames
@@ -1,2 +0,0 @@
 COPYRIGHT
 OPENSOLARIS.LICENSE
@@ -1 +0,0 @@
 lib/libuutil.so.*
@@ -1 +0,0 @@
 libuutil1linux: package-name-doesnt-match-sonames
@@ -1,2 +0,0 @@
 COPYRIGHT
 OPENSOLARIS.LICENSE
@@ -1,2 +0,0 @@
 lib/libzfs.so.*
 lib/libzfs_core.so.*
@@ -1 +0,0 @@
 libzfs2linux: package-name-doesnt-match-sonames
@@ -1,2 +0,0 @@
 COPYRIGHT
 OPENSOLARIS.LICENSE
@@ -1,4 +0,0 @@
 lib/*.a usr/lib/
 usr/include
 usr/lib/*.so
 usr/share/pkgconfig/*.pc
@@ -1,2 +0,0 @@
 COPYRIGHT
 OPENSOLARIS.LICENSE
@@ -1 +0,0 @@
 lib/libzpool.so.*
@@ -1 +0,0 @@
 libzpool2linux: package-name-doesnt-match-sonames
@@ -1,37 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Debian ZFS on Linux maintainers
 <pkg-zfsonlinux-devel@alioth-lists.debian.net>
 Date: Wed, 30 Jan 2019 15:12:04 +0100
 Subject: [PATCH] Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core
 ---
 lib/libzfs/Makefile.am      | 1 +
 lib/libzfs_core/Makefile.am | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
 index f1260ea71..5b07b9d9d 100644
 --- a/lib/libzfs/Makefile.am
 +++ b/lib/libzfs/Makefile.am
@@ -31,6 +31,7 @@ nodist_libzfs_la_SOURCES = \
 libzfs_la_LIBADD = \
 	$(top_builddir)/lib/libzfs_core/libzfs_core.la \
 +	$(top_builddir)/lib/libuutil/libuutil.la \
 	$(top_builddir)/lib/libshare/libshare.la \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 	$(top_builddir)/lib/libzpool/libzpool.la
 diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am
 index 5eafc25c0..10d6de3d6 100644
 --- a/lib/libzfs_core/Makefile.am
 +++ b/lib/libzfs_core/Makefile.am
@@ -16,7 +16,8 @@ nodist_libzfs_core_la_SOURCES = \
 	$(KERNEL_C)
 libzfs_core_la_LIBADD = \
 -	$(top_builddir)/lib/libnvpair/libnvpair.la
 +	$(top_builddir)/lib/libnvpair/libnvpair.la \
 +	$(top_builddir)/lib/libuutil/libuutil.la
 libzfs_core_la_LDFLAGS = -version-info 1:0:0
@@ -1,60 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Mon, 4 Sep 2017 10:59:32 +0200
 Subject: [PATCH] add man page reference to systemd units
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 etc/systemd/system/zfs-import-cache.service.in | 1 +
 etc/systemd/system/zfs-import-scan.service.in  | 1 +
 etc/systemd/system/zfs-mount.service.in        | 1 +
 etc/systemd/system/zfs-share.service.in        | 1 +
 4 files changed, 4 insertions(+)
 diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in
 index 97808dee7..cb4358fb4 100644
 --- a/etc/systemd/system/zfs-import-cache.service.in
 +++ b/etc/systemd/system/zfs-import-cache.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=Import ZFS pools by cache file
 +Documentation=man:zpool(8)
 DefaultDependencies=no
 Requires=systemd-udev-settle.service
 After=systemd-udev-settle.service
 diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
 index c097e3852..e7b1d8862 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=Import ZFS pools by device scanning
 +Documentation=man:zpool(8)
 DefaultDependencies=no
 Requires=systemd-udev-settle.service
 After=systemd-udev-settle.service
 diff --git a/etc/systemd/system/zfs-mount.service.in b/etc/systemd/system/zfs-mount.service.in
 index 728fc630c..8a73716f5 100644
 --- a/etc/systemd/system/zfs-mount.service.in
 +++ b/etc/systemd/system/zfs-mount.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=Mount ZFS filesystems
 +Documentation=man:zfs(8)
 DefaultDependencies=no
 After=systemd-udev-settle.service
 After=zfs-import.target
 diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in
 index 494f5cbef..d0c93a3e6 100644
 --- a/etc/systemd/system/zfs-share.service.in
 +++ b/etc/systemd/system/zfs-share.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=ZFS file system shares
 +Documentation=man:zfs(8)
 After=nfs-server.service nfs-kernel-server.service
 After=smb.service
 After=zfs-mount.service
@@ -1,38 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Thu, 12 Oct 2017 08:57:48 +0200
 Subject: [PATCH] fix install path of zpool.d scripts
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 cmd/zpool/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
 index d07f8d616..5d26f326e 100644
 --- a/cmd/zpool/Makefile.am
 +++ b/cmd/zpool/Makefile.am
@@ -22,11 +22,11 @@ zpool_LDADD = \
 	-lm $(LIBBLKID)
 zpoolconfdir = $(sysconfdir)/zfs/zpool.d
 -zpoolexecdir = $(libexecdir)/zfs/zpool.d
 +zpoollibdir = /usr/lib/zfs-linux/zpool.d
 EXTRA_DIST = zpool.d/README
 -dist_zpoolexec_SCRIPTS = \
 +dist_zpoollib_SCRIPTS = \
 	zpool.d/enc \
 	zpool.d/encdev \
 	zpool.d/fault_led \
@@ -119,5 +119,5 @@ install-data-hook:
 	for f in $(zpoolconfdefaults); do \
 	  test -f "$(DESTDIR)$(zpoolconfdir)/$${f}" -o \
 	       -L "$(DESTDIR)$(zpoolconfdir)/$${f}" || \
 -	    ln -s "$(zpoolexecdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
 +	    ln -s "$(zpoollibdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
 	done
@@ -1,41 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Colin Ian King <colin.king@canonical.com>
 Date: Mon, 17 Oct 2016 14:30:56 +0800
 Subject: [PATCH] Use python3 for arcstat.py, arc_summary.py & dbufstat.py
 ---
 cmd/arc_summary/arc_summary.py | 2 +-
 cmd/arcstat/arcstat.py         | 2 +-
 cmd/dbufstat/dbufstat.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 diff --git a/cmd/arc_summary/arc_summary.py b/cmd/arc_summary/arc_summary.py
 index f6dbb9bfb..723c2e5a6 100755
 --- a/cmd/arc_summary/arc_summary.py
 +++ b/cmd/arc_summary/arc_summary.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
 #
 # $Id: arc_summary.pl,v 388:e27800740aa2 2011-07-08 02:53:29Z jhell $
 #
 diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py
 index d7d3e9b73..3a7a47d67 100755
 --- a/cmd/arcstat/arcstat.py
 +++ b/cmd/arcstat/arcstat.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
 #
 # Print out ZFS ARC Statistics exported via kstat(1)
 # For a definition of fields, or usage, use arctstat.pl -v
 diff --git a/cmd/dbufstat/dbufstat.py b/cmd/dbufstat/dbufstat.py
 index 42bb0c7c7..73e02ca11 100755
 --- a/cmd/dbufstat/dbufstat.py
 +++ b/cmd/dbufstat/dbufstat.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
 #
 # Print out statistics for all cached dmu buffers.  This information
 # is available through the dbufs kstat and may be post-processed as
@@ -1,75 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Colin Ian King <colin.king@canonical.com>
 Date: Tue, 31 Oct 2017 19:12:42 +0800
 Subject: [PATCH] increase-default-zcmd-allocation-to-256K
 Increase default zcmd allocation to 256K (LP: #567557)
 When creating hundreds of clones (for example using containers with
 LXD) cloning slows down as the number of clones increases over time.
 The reason for this is that the fetching of the clone information
 using a small zcmd buffer requires two ioctl calls, one to determine
 the size and a second to return the data. However, this requires
 gathering the data twice, once to determine the size and again to
 populate the zcmd buffer to return it to userspace.
 These are expensive ioctl() calls, so instead, make the default buffer
 size much larger: 256K. This may sound large, but on 64 bit systems
 running ZFS this is not a huge chunk of memory for the speed
 improvement we gains for large sets of clones:
        16K zcmd        256K zcmd
 Clones	Time    Clones  Time    Clone   % improvement
        (secs) 	per sec (secs)  per sec
 100	7	14.29	5	20.00	28.57
 200	10	20.00	9	22.22	10.00
 300	19	15.79	18	16.67	5.26
 400	22	18.18	22	18.18	0.00
 500	29	17.24	29	17.24	0.00
 600	39	15.38	39	15.38	0.00
 700	46	15.22	45	15.56	2.17
 800	58	13.79	51	15.69	12.07
 900	74	12.16	61	14.75	17.57
 1000	90	11.11	74	13.51	17.78
 1100	98	11.22	87	12.64	11.22
 1200	102	11.76	95	12.63	6.86
 1300	113	11.50	104	12.50	7.96
 1400	143	9.79	109	12.84	23.78
 1500	145	10.34	132	11.36	8.97
 1600	165	9.70	145	11.03	12.12
 1700	187	9.09	156	10.90	16.58
 1800	210	8.57	166	10.84	20.95
 1900	226	8.41	183	10.38	19.03
 2000	256	7.81	198	10.10	22.66
 2200	311	7.07	238	9.24	23.47
 2400	373	6.43	271	8.86	27.35
 2600	487	5.34	316	8.23	35.11
 3000	619	4.85	426	7.04	31.18
 3400	915	3.72	549	6.19	40.00
 4000	1332	3.00	923	4.33	30.71
 As one can see, with > 2000 clones we get 25-40% speed
 improvement.
 This patch was originally suggested by Brian Behlendorf
 (see https://github.com/zfsonlinux/zfs/issues/6372), however
 this fix is a more generic fix to cover all zcmd cases.
 Signed-off-by: Colin Ian King <colin.king@canonical.com>
 ---
 lib/libzfs/libzfs_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
 index 9703f844f..0cfcf9c2f 100644
 --- a/lib/libzfs/libzfs_util.c
 +++ b/lib/libzfs/libzfs_util.c
@@ -1355,7 +1355,7 @@ int
 zcmd_alloc_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, size_t len)
 {
 	if (len == 0)
 -		len = 16 * 1024;
 +		len = 256 * 1024;
 	zc->zc_nvlist_dst_size = len;
 	zc->zc_nvlist_dst =
 	    (uint64_t)(uintptr_t)zfs_alloc(hdl, zc->zc_nvlist_dst_size);
@@ -1,61 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Rohan Puri <rohan.puri15@gmail.com>
 Date: Sat, 28 Jul 2018 18:32:12 +0530
 Subject: [PATCH] Fix deadlock between zfs umount & snapentry_expire
 zfs umount -> zfsctl_destroy() takes the zfs_snapshot_lock as a
 writer and calls zfsctl_snapshot_unmount_cancel(), which waits
 for snapentry_expire() if present (when snap is automounted).
 This snapentry_expire() itself then waits for zfs_snapshot_lock
 as a reader, resulting in a deadlock.
 The fix is to only hold the zfs_snapshot_lock over the tree
 lookup and removal.  After a successful lookup the lock can
 be dropped and zfs_snapentry_t will remain valid until the
 reference taken by the lookup is released.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Rohan Puri <rohan.puri15@gmail.com>
 Closes #7751
 Closes #7752
 (Cherry-picked from fd7265c646f40e364396af5014bbb83e809e124a)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 module/zfs/zfs_ctldir.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
 diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
 index bf5a1d059..2964b65a6 100644
 --- a/module/zfs/zfs_ctldir.c
 +++ b/module/zfs/zfs_ctldir.c
@@ -358,8 +358,6 @@ snapentry_expire(void *data)
 static void
 zfsctl_snapshot_unmount_cancel(zfs_snapentry_t *se)
 {
 -	ASSERT(RW_LOCK_HELD(&zfs_snapshot_lock));
 -
 	if (taskq_cancel_id(system_delay_taskq, se->se_taskqid) == 0) {
 		se->se_taskqid = TASKQID_INVALID;
 		zfsctl_snapshot_rele(se);
@@ -570,13 +568,14 @@ zfsctl_destroy(zfsvfs_t *zfsvfs)
 		uint64_t objsetid = dmu_objset_id(zfsvfs->z_os);
 		rw_enter(&zfs_snapshot_lock, RW_WRITER);
 -		if ((se = zfsctl_snapshot_find_by_objsetid(spa, objsetid))
 -		    != NULL) {
 -			zfsctl_snapshot_unmount_cancel(se);
 +		se = zfsctl_snapshot_find_by_objsetid(spa, objsetid);
 +		if (se != NULL)
 			zfsctl_snapshot_remove(se);
 +		rw_exit(&zfs_snapshot_lock);
 +		if (se != NULL) {
 +			zfsctl_snapshot_unmount_cancel(se);
 			zfsctl_snapshot_rele(se);
 		}
 -		rw_exit(&zfs_snapshot_lock);
 	} else if (zfsvfs->z_ctldir) {
 		iput(zfsvfs->z_ctldir);
 		zfsvfs->z_ctldir = NULL;
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1,2 @@`
							`lib/*/security/pam_zfs_key.so`
							`usr/share/pam-configs/zfs_key`
		`@@ -0,0 +1,2 @@`
							`lib/@DEB_HOST_MULTIARCH@/libzfs.so.*`
							`lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*`
		`@@ -0,0 +1 @@`
							`lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*`
		`@@ -0,0 +1,2 @@`
							`package-name-doesnt-match-sonames`
							`extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz`
		`@@ -1 +0,0 @@`
			`spl: command-with-path-in-maintainer-script`
		`@@ -1,2 +0,0 @@`
			`version=3`
			`https://zfsonlinux.org/ .*spl-([\d\.]+)\.tar\.gz$`
		`@@ -1 +0,0 @@`
			`libnvpair1linux: package-name-doesnt-match-sonames`
		`@@ -1 +0,0 @@`
			`libuutil1linux: package-name-doesnt-match-sonames`
		`@@ -1 +0,0 @@`
			`libzfs2linux: package-name-doesnt-match-sonames`
		`@@ -1 +0,0 @@`
			`libzpool2linux: package-name-doesnt-match-sonames`