bump version, update changelog

fix make upload target
add make deb target
2016-06-28 15:41:47 +02:00 · 2016-06-28 15:27:06 +02:00 · 2016-06-28 14:35:56 +02:00 · 2016-06-28 14:35:35 +02:00 · 2016-06-28 14:35:23 +02:00 · 2016-06-28 14:35:12 +02:00
85 changed files with 497 additions and 5613 deletions
@@ -1,7 +0,0 @@
 /*.build
 /*.buildinfo
 /*.changes
 /*.deb
 /*.dsc
 /*.tar*
 /zfs-utils-*.*/
@@ -1,3 +0,0 @@
 [submodule "zfs/upstream"]
 	path = upstream
 	url = ../mirror_zfs
@@ -1,93 +1,84 @@
-include /usr/share/dpkg/default.mk
+RELEASE=3.4
 # source form https://github.com/zfsonlinux/
-PACKAGE = zfs-linux
+# also update version in 
 # zfs-changelog.Debian and spl-changelog.Debian
 ZFSVER=0.6.5.7
 ZFSPKGREL=5~bpo70
 SPLPKGREL=5~bpo70
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
-SRCDIR = upstream
+SPLDIR=pkg-spl
-BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
+SPLSRC=pkg-spl.tar.gz
-ORIG_SRC_TAR = $(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
+ZFSDIR=pkg-zfs
 ZFSSRC=pkg-zfs.tar.gz
-ZFS_DEB1= libnvpair3linux_$(DEB_VERSION)_amd64.deb
+SPL_DEBS= 					\
 spl_${SPLPKGVER}_amd64.deb
-ZFS_DEB_BINARY =				\
+ZFS_DEBS= 					\
-libpam-zfs_$(DEB_VERSION)_amd64.deb		\
+libnvpair1_${ZFSPKGVER}_amd64.deb 		\
-libuutil3linux_$(DEB_VERSION)_amd64.deb		\
+libuutil1_${ZFSPKGVER}_amd64.deb		\
-libzfs4linux_$(DEB_VERSION)_amd64.deb		\
+libzfs2_${ZFSPKGVER}_amd64.deb			\
-libzfsbootenv1linux_$(DEB_VERSION)_amd64.deb	\
+libzfs-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool5linux_$(DEB_VERSION)_amd64.deb		\
+libzpool2_${ZFSPKGVER}_amd64.deb		\
-zfs-test_$(DEB_VERSION)_amd64.deb			\
+zfs-dbg_${ZFSPKGVER}_amd64.deb			\
-zfsutils-linux_$(DEB_VERSION)_amd64.deb		\
+zfs-initramfs_${ZFSPKGVER}_amd64.deb		\
-zfs-zed_$(DEB_VERSION)_amd64.deb
+zfsutils_${ZFSPKGVER}_amd64.deb
-ZFS_DBG_DEBS = $(patsubst %_$(DEB_VERSION)_amd64.deb, %-dbgsym_$(DEB_VERSION)_amd64.deb, $(ZFS_DEB1) $(ZFS_DEB_BINARY))
+DEBS=${SPL_DEBS} ${ZFS_DEBS} 
-ZFS_DEB2= $(ZFS_DEB_BINARY)			\
+all: ${DEBS}
 libzfslinux-dev_$(DEB_VERSION)_amd64.deb		\
 python3-pyzfs_$(DEB_VERSION)_amd64.deb		\
 pyzfs-doc_$(DEB_VERSION)_all.deb			\
 spl_$(DEB_VERSION)_all.deb			\
 zfs-initramfs_$(DEB_VERSION)_all.deb
 DEBS= $(ZFS_DEB1) $(ZFS_DEB2) $(ZFS_DBG_DEBS)
-ZFS_DSC = zfs-linux_$(DEB_VERSION).dsc
+.PHONY: deb
-
+deb: ${DEBS}
 all: deb
 .PHONY: deb dsc
 deb: $(DEBS)
 dsc:
 	rm -rf *.dsc $(BUILDDIR)
 	$(MAKE) $(ZFS_DSC)
 	lintian $(ZFS_DSC)
 # called from pve-kernel's Makefile to get patched sources
 .PHONY: kernel
 kernel: $(ZFS_DSC)
 	dpkg-source -x $(ZFS_DSC) ../pkg-zfs
 	$(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
 .PHONY: dinstall
-dinstall: $(DEBS)
+dinstall: ${DEBS}
-	dpkg -i $(DEBS)
+	dpkg -i ${DEBS}
-.PHONY: submodule
+.PHONY: spl
-submodule:
+spl ${SPL_DEBS}: ${SPLSRC}
-	test -f "$(SRCDIR)/README.md" || git submodule update --init
+	rm -rf ${SPLDIR}
-
+	tar xf ${SPLSRC}
-$(SRCDIR)/README.md: submodule
+	mv ${SPLDIR}/debian/changelog ${SPLDIR}/debian/changelog.org
 	cat spl-changelog.Debian ${SPLDIR}/debian/changelog.org > ${SPLDIR}/debian/changelog
 	cd ${SPLDIR}; ln -s ../spl-patches patches
 	cd ${SPLDIR}; quilt push -a
 	cd ${SPLDIR}; rm -rf .pc ./patches
 	cd ${SPLDIR}; ./debian/rules override_dh_prep-base-deb-files
 	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
 .PHONY: zfs
-zfs: $(DEBS)
+zfs ${ZFS_DEBS}: ${ZFSSRC}
-$(ZFS_DEB2) $(ZFS_DBG_DEBS): $(ZFS_DEB1)
+	rm -rf ${ZFSDIR}
-$(ZFS_DEB1): $(BUILDDIR)
+	tar xf ${ZFSSRC}
-	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
+	mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org
-	lintian $(DEBS)
+	cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog
 	cd ${ZFSDIR}; ln -s ../zfs-patches patches
 	cd ${ZFSDIR}; quilt push -a
 	cd ${ZFSDIR}; rm -rf .pc ./patches
 	cd ${ZFSDIR}; ./debian/rules override_dh_prep-base-deb-files
 	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
-$(ORIG_SRC_TAR): $(BUILDDIR)
+.PHONY: download
-	tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
+download:
-
+	rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
-$(ZFS_DSC): $(BUILDDIR) $(ORIG_SRC_TAR)
+	git clone -b master/debian/wheezy/0.6.5.7-3-wheezy https://github.com/zfsonlinux/pkg-spl.git
-	cd $(BUILDDIR); dpkg-buildpackage -S -uc -us -d
+	git clone -b master/debian/wheezy/0.6.5.7-8-wheezy https://github.com/zfsonlinux/pkg-zfs.git
-
+	tar czf ${SPLSRC} pkg-spl
-sbuild: $(ZFS_DSC)
+	tar czf ${ZFSSRC} pkg-zfs
 	sbuild $(ZFS_DSC)
 $(BUILDDIR): $(SRCDIR)/README.md $(SRCDIR) debian
 	rm -rf $@ $@.tmp
 	cp -a $(SRCDIR) $@.tmp
 	cp -a debian $@.tmp/debian
 	mv $@.tmp $@
 .PHONY: clean
 clean: 	
-	rm -rf $(PACKAGE)-[0-9]*/
+	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
 	rm -f *~ *.deb *.changes *.buildinfo *.build *.dsc *.orig.tar.* *.debian.tar.*
 .PHONY: distclean
 distclean: clean
 .PHONY: upload
-upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: ${DEBS}
-upload: $(DEBS)
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --dist wheezy
 	tar -cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist $(UPLOAD_DIST) --arch $(DEB_HOST_ARCH)
@@ -2,12 +2,12 @@ Proxmox VE packaging for ZFS on Linux
 This is based on code from:
-https://salsa.debian.org/zfsonlinux-team/zfs
+https://github.com/zfsonlinux/pkg-spl.git
-https://salsa.debian.org/zfsonlinux-team/spl
+https://github.com/zfsonlinux/pkg-zfs.git
 We removed the dkms/modules related code, because we ship the
 modules with the kernel.
 For licensing questions, see:
-http://open-zfs.org/wiki/Talk:FAQ
+http://open-zfs.org/wiki/Talk:FAQ
@@ -1,952 +0,0 @@
 zfs-linux (2.2.0-pve3) bookworm; urgency=medium
  * pick bug-fixes staged for 2.2.1:
    - add a tunable to disable BRT support and disable it by default
    - fix block cloning between unencrypted and encrypted datasets
    - disable block cloning by default
 -- Proxmox Support Team <support@proxmox.com>  Fri, 17 Nov 2023 17:32:58 +0100
 zfs-linux (2.2.0-pve2) bookworm; urgency=medium
  * avoid error from zfs-mount when /etc/exports.d does not exist (yet)
  * ensure vdev_stat struct layout compat between 2.1 and 2.2, avoiding
    false-positive detection of the non-allocating feature from 2.2 when the
    kernel still used the 2.1 module.
 -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Nov 2023 16:02:02 +0100
 zfs-linux (2.2.0-pve1) bookworm; urgency=medium
  * update ZFS to 2.2.0
  * zfsutils-linux:
    - install new systemd units to trim a pool periodically
    - ship new `zilstat` binary
    - and new man pages for zfs lock, zfs unlock and vdev properties
    - remove man pages for zfs jail and zfs unjail, those are for FreeBSD only
      and the respective commands where never exposed for Linux
  * fix #5014: re-enable blk-mq optimization
 -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Oct 2023 12:09:24 +0200
 zfs-linux (2.1.13-pve1) bookworm; urgency=medium
  * update ZFS to 2.1.13
 -- Proxmox Support Team <support@proxmox.com>  Thu, 28 Sep 2023 12:22:28 +0200
 zfs-linux (2.1.12-pve1) bookworm; urgency=medium
  * update ZFS to 2.1.12
  * zfs trim: avoid exit-failure if last pool isn't nvme-only
 -- Proxmox Support Team <support@proxmox.com>  Tue, 13 Jun 2023 15:25:16 +0200
 zfs-linux (2.1.11-pve2) bookworm; urgency=medium
  * re-build for Debian 12 Bookworm based releases
 -- Proxmox Support Team <support@proxmox.com>  Sat, 20 May 2023 19:32:04 +0200
 zfs-linux (2.1.11-pve1) bullseye; urgency=medium
  * update ZFS to 2.1.11
 -- Proxmox Support Team <support@proxmox.com>  Thu, 20 Apr 2023 09:30:53 +0200
 zfs-linux (2.1.9-pve1) bullseye; urgency=medium
  * update ZFS to 2.1.9
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Jan 2023 15:03:22 +0100
 zfs-linux (2.1.7-pve3) bullseye; urgency=medium
  * backport a fix for as potentially hanging pipe when resizing it on recv
  * backport a fix for setting extended attributes (xattr)
  * adapt to 6.1 changes for open syscall with TMPFILE option
 -- Proxmox Support Team <support@proxmox.com>  Sat, 07 Jan 2023 13:21:57 +0100
 zfs-linux (2.1.7-pve2) bullseye; urgency=medium
  * backport fix for initramfs script when detecting rootfs legacy mountpoints
 -- Proxmox Support Team <support@proxmox.com>  Mon, 02 Jan 2023 17:07:18 +0100
 zfs-linux (2.1.7-pve1) bullseye; urgency=medium
  * update ZFS to 2.1.7
 -- Proxmox Support Team <support@proxmox.com>  Tue, 06 Dec 2022 16:41:31 +0100
 zfs-linux (2.1.6-pve1) bullseye; urgency=medium
  * update ZFS to 2.1.6
  * symlink zpool_influxdb to /bin
  * symlink zfs, zpool to /bin/ for non-root usage
 -- Proxmox Support Team <support@proxmox.com>  Tue, 04 Oct 2022 16:09:17 +0200
 zfs-linux (2.1.5-pve1) bullseye; urgency=medium
  * update ZFS to 2.1.5
  * Build with libcurl for new keylocation=https://
  * d/control: add new zfs-dracut package
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2022 16:13:24 +0200
 zfs-linux (2.1.4-pve1) bullseye; urgency=medium
  * update ZFS to 2.1.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Mar 2022 09:28:50 +0100
 zfs-linux (2.1.3-pve1) bullseye; urgency=medium
  * update ZFS to 2.1.3
 -- Proxmox Support Team <support@proxmox.com>  Fri, 11 Mar 2022 16:36:22 +0100
 zfs-linux (2.1.2-pve1) bullseye; urgency=medium
  * update ZFS to 2.1.2
 -- Proxmox Support Team <support@proxmox.com>  Tue, 11 Jan 2022 11:31:34 +0100
 zfs-linux (2.1.1-pve3) bullseye; urgency=medium
  * zfs-utils: arc stat/summary: guard access to l2arc MFU/MRU stats to avoid
    bogus exception when checking the ARC stats/summary on a older, 2.0 based
    ZFS kernel module with the newer, 2.1 based, user space tools.
 -- Proxmox Support Team <support@proxmox.com>  Wed, 10 Nov 2021 09:58:31 +0100
 zfs-linux (2.1.1-pve1) bullseye; urgency=medium
  * update ZFS to 2.1.1
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 06:16:14 +0200
 zfs-linux (2.0.5-pve1) bullseye; urgency=medium
  * update ZFS to 2.0.5
  * 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)
 -- Proxmox Support Team <support@proxmox.com>  Wed, 27 Mar 2019 09:56:15 +0100
 zfs-linux (0.7.13-pve1~bpo1) unstable; urgency=medium
  * update ZFS to 0.7.13
  * base zfs-linux on upstream ZOL instead of debian
 -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Mar 2019 06:53:00 +0100
 zfs-linux (0.7.12-pve1~bpo1) unstable; urgency=medium
  * update ZFS to 0.7.12
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2018 17:51:59 +0100
 zfs-linux (0.7.11-pve2~bpo1) unstable; urgency=medium
  * update ZFS to debian/0.7.11-3
  * Cherry-pick two fixes planned for 0.7.12
  * Backport deadlock fix between mm_sem and tx assign in zfs_write() and page
    fault
  * Fix missing Breaks/Replaces in zfs-initramfs
 -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2018 13:45:49 +0100
 zfs-linux (0.7.11-pve1~bpo1) unstable; urgency=medium
  * update ZFS to 0.7.11
 -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Sep 2018 15:47:31 +0200
 zfs-linux (0.7.9-pve3~bpo9) unstable; urgency=medium
  *  Cherry-pick fix for deadlock umount/snapentry_expire
 -- Proxmox Support Team <support@proxmox.com>  Fri, 03 Aug 2018 11:41:11 +0200
 zfs-linux (0.7.9-pve2~bpo9) unstable; urgency=medium
  * Cherry-pick fix for zpl_mount deadlock
 -- Proxmox Support Team <support@proxmox.com>  Fri, 12 Jul 2018 12:37:50 +0200
 zfs-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.9
 -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
 zfs-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.8 (no changes)
 -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
 zfs-linux (0.7.7-pve2~bpo9) unstable; urgency=medium
  * (temporarily) revert likely cause of #7401
 -- Proxmox Support Team <support@proxmox.com>  Mon, 9 Apr 2018 09:49:27 +0200
 zfs-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.7
 -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
 zfs-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:48:29 +0100
 zfs-linux (0.7.4-pve2~bpo9) unstable; urgency=medium
  * cherry-pick ARC hit rate fix from 0.7.6
  * always load ZFS modules on boot
 -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Jan 2018 11:31:14 +0100
 zfs-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.4
 -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
 zfs-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.3
  * include fix for user namespace setgid issue (#6800 upstream)
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
 zfs-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
  * update zfs to 0.7.2
  * add PR 6616 - zfs send/recv compatibility with 0.6.5
  * add PR 6695 - zfs recv: don't skip over objects which should be freed
  * various small fixes
  * split test suite into zfs-test package
 -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:34:05 +0200
 zfs-linux (0.6.5.11-pve18~bpo90) unstable; urgency=medium
  * fix #1509: arc_summary error with L2ARC
 -- Proxmox Support Team <support@proxmox.com>  Mon, 2 Oct 2017 09:30:41 +0200
 zfs-linux (0.6.5.11-pve17~bpo90) unstable; urgency=medium
  * update zfs to debian/0.6.5.11-1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
 zfs-linux (0.6.5.9-pve16~bpo90) unstable; urgency=medium
  * drop transitional packages
  * convert python scripts to python 3, drop .py suffix
  * rebuild for PVE 5.0 / Debian Stretch
 -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
 zfs-linux (0.6.5.9-pve15~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.9-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:10 +0100
 zfs-linux (0.6.5.8-pve14~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.8-3
 -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Jan 2017 09:34:58 +0100
 zfs-linux (0.6.5.8-pve13~bpo80) unstable; urgency=medium
  * fix #1184: zfs-share.service has wrong path to 'rm' command
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Oct 2016 11:25:47 +0200
 zfs-linux (0.6.5.8-pve12~bpo80) unstable; urgency=medium
  * import with "-d /dev/disk/by-id" in systemd service
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Oct 2016 13:48:08 +0200
 zfs-linux (0.6.5.8-pve11~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.8-1
  * switch package upstream sources to Debian (Jessie)
  * add transitional packages for upgrades
 -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
 zfs-linux (0.6.5.7-pve10~bpo80) unstable; urgency=medium
  * update to pkg-zfs jessie/0.6.5.7-8
  * change package versioning to allow upgrades from PVE3/wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
 zfs-linux (0.6.5-pve9~jessie) unstable; urgency=medium
  * Update to pkg-zfs jessie/0.6.5.6-3
 -- Proxmox Support Team <support@proxmox.com>  Tue, 12 Apr 2016 09:51:35 +0200
 zfs-linux (0.6.5-pve8~jessie) unstable; urgency=medium
  * update to zfs-0.6.5.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:50:22 +0200
 zfs-linux (0.6.5-pve7~jessie) unstable; urgency=medium
  * update to zfs-0.6.5.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 10:51:17 +0100
 zfs-linux (0.6.5-pve6~jessie) unstable; urgency=medium
  * Prepare to tag zfs-0.6.5.3
 -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Nov 2015 07:21:44 +0100
 zfs-linux (0.6.5-pve5~jessie) unstable; urgency=medium
  * Illumos 6267 - dn_bonus evicted too early
  * Fix use-after-free in vdev_disk_physio_completion
 -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:42:42 +0100
 zfs-linux (0.6.5-pve4~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.2-2
 -- Proxmox Support Team <support@proxmox.com>  Mon, 05 Oct 2015 17:56:45 +0200
 zfs-linux (0.6.5-pve3~jessie) unstable; urgency=medium
  * do not install /etc/init.d/zfs-zed script to avoid double startup
    with systemd
 -- Proxmox Support Team <support@proxmox.com>  Mon, 28 Sep 2015 10:14:40 +0200
 zfs-linux (0.6.5-pve2~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.1-4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Sep 2015 12:45:33 +0200
 zfs-linux (0.6.5-pve1~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.1-2
 -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:02:41 +0200
 zfs-linux (0.6.4-pve3~jessie) unstable; urgency=medium
  * update to snapshot/debian/jessie/0.6.4-24-6bec43
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:13:44 +0200
 zfs-linux (0.6.4-pve2~jessie) unstable; urgency=medium
  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-21-53b1d9)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:03:21 +0200
 zfs-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:19:22 +0200
 zfs-linux (0.6.3-pve3~jessie) unstable; urgency=medium
  * ignore zfs-import-scan errors
 -- Proxmox Support Team <support@proxmox.com>  Tue, 31 Mar 2015 17:52:40 +0200
 zfs-linux (0.6.3-pve2~jessie) unstable; urgency=medium
  * use systemd for service startup
  * install zed configuration file /etc/zfs/zed.d/zed.rc
 -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Mar 2015 15:52:54 +0100
 zfs-linux (0.6.3-pve1~jessie) unstable; urgency=medium
  * recompile on jessie
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:02:08 +0100
 zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
  * use /sbin/modprobe to avoid warning inside initrd
  * fix warning about undefined values inside initrd
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
 zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
 zfs-linux (0.7.12-2) unstable; urgency=medium
  [ Colin Ian King ]
  * Only run autopkgtests for amd64, arm64, ppc64el and s390x (LP#1805627).
  [ Martin Bagge / brother ]
  * [INTL:sv] Swedish strings for zfs-linux debconf (Closes: #918020)
  [ Anders Jonsson ]
  * sv.po: typo fix
  [ Mo Zhou ]
  * Change init script's behaviour to default during postinst.
  * Add ${perl:Depends} to zfs-dkms's Depends.
  * Add autopkgtest script to test zfs-dkms build.
  * autopkgtest: minor fix
  [ Aron Xu ]
  * Add XS-Autobuild: yes to d/control
  * Conflicts with insserv << 1.18 (Closes: #915831)
 -- Aron Xu <aron@debian.org>  Fri, 11 Jan 2019 21:32:06 +0800
 zfs-linux (0.7.12-1) unstable; urgency=medium
  [ Stoiko Ivanov ]
  * Add Breaks/Replaces to zfs-initramfs
  [ Mo Zhou ]
  * New upstream version 0.7.12
  * Drop unnecessary patch init-start-stop-dep-on-local-fs.patch .
  * Override init.d-script-missing-dependency-on-local_fs for zfs-zed.
  * Bump linux compatibility to 4.19 .
 -- Mo Zhou <cdluminate@gmail.com>  Mon, 19 Nov 2018 11:32:44 +0000
 zfs-linux (0.7.11-3) unstable; urgency=medium
  [ Antonio Russo ]
  + https://salsa.debian.org/zfsonlinux-team/zfs/merge_requests/9
  * Break/Replace upstream .deb packages (Closes: #839921)
  * Install upstream bash completion file instead of embedded one.
  * Modify META before autoreconf.
  * Make dkms distdir before build to avoid including build artifacts.
  * Remove ZFS_AC_PACKAGE macros from DKMS sources.
    This removes dpkg-dev dependency from zfs-dkms package.
  * Use upstream's dkms.mkconf script to produce dkms.conf .
  * Ship initramfs zdev hook in zfs-initramfs (Closes: #902052)
  [ Nicolas Braud-Santoni ]
  * Update debian/copyright, removing unused wildcards.
  [ Nicholas D Steeves ]
  * Change -dbg package's priority from extra to optional.
  [ Mo Zhou ]
  * Fix FTBFS on architecture=all due to FileNotFound. (Closes: #911937)
  * Add isolation-machine restriction to autopkgtest because the tests
    needs to interact with the kernel, i.e. loading kernel module.
 -- Mo Zhou <cdluminate@gmail.com>  Sun, 28 Oct 2018 10:28:52 +0000
 zfs-linux (0.7.11-2) unstable; urgency=medium
  * Support Devuan in dkms script. (Closes: #900089)
    Thanks to Chris Dos <chris@chrisdos.com>
  * Install init scripts to support non-systemd setups. (Closes: #826994)
    Thanks to Chris Dos <chris@chrisdos.com>
  * Override init.d-script-does-not-source-init-functions for
    zfsutils-linux and zfs-zed.
  * Patch upstream init scripts to make them work for Debian+OpenRC setup.
  * Patch upstream init script to fix missing dependency on local_fs.
 -- Mo Zhou <cdluminate@gmail.com>  Fri, 26 Oct 2018 09:32:06 +0000
 zfs-linux (0.7.11-1) unstable; urgency=medium
  [ Aron Xu ]
  * Add dpkg-dev to Depends of zfs-dkms (Closes: #900714)
  [ Nicolas Braud-Santoni ]
  * Use canonical HTTPS format URL for Vcs-Git (Closes: #895873)
  [ Mo Zhou ]
  * New upstream version 0.7.11 (Closes: #908290)
  * Bump linux_compat to 4.18 .
  * Replace get_next.sh with one-liner awk script in rules.
  * Append myself to Uploaders and refresh auto-generated control.
  * Use HTTPS format URI in watch file.
  * Recommends linux-libc-dev (<< LINUX_NEXT~) instead of (<< LINUX_NEXT).
 -- Mo Zhou <cdluminate@gmail.com>  Wed, 19 Sep 2018 08:45:18 +0000
 zfs-linux (0.7.9-3) unstable; urgency=medium
  [ Antonio Russo ]
  * Expand zfs-test and add Breaks/Conflicts (Closes: #899047)
  [ Aron Xu ]
  * d/control: migrate to alioth-lists (Closes: #899756)
 -- Aron Xu <aron@debian.org>  Mon, 28 May 2018 18:22:02 +0800
 zfs-linux (0.7.9-2) unstable; urgency=medium
  [ Aron Xu ]
  * Move more zfs test tools to zfs-test package (Closes: #868653)
  * New upstream version 0.7.9
  * d/rules: add --enable-systemd
  * Fix lintian obsolete-relation-form-in-source
  * Bump supported linux version to 4.16
  [ Antonio Russo ]
  * Install enum-extract.pl with dkms
  * Handle /proc/kallsym obfuscation (Closes: #891936)
 -- Aron Xu <aron@debian.org>  Thu, 17 May 2018 23:47:29 +0800
 zfs-linux (0.7.6-1) unstable; urgency=medium
  [ Lev Lamberov ]
  * [INTL:ru] Updated Russian translation of debconf (Closes: #885990)
  [ Aron Xu]
  * New upstream release (Closes: #889795, #890576)
  * 0001-Fix-bug-in-distclean-which-removes-needed-files.patch:
    removed, applied upstream
  * Update VCS-* URL to salsa.debian.org
  * Apply wrap-and-sort
  * 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. (Closes: #849420)
 -- Aron Xu <aron@debian.org>  Mon, 26 Feb 2018 16:32:29 +0800
 zfs-linux (0.7.5-1) unstable; urgency=medium
  [ Aron Xu ]
  * New upstream version 0.7.5 (Closes: #884812)
  [ Antonio Russo ]
  * Add version dependency on zfsutils-linux package (Closes: #880889)
 -- Aron Xu <aron@debian.org>  Fri, 19 Jan 2018 15:39:23 +0800
 zfs-linux (0.7.4-1) unstable; urgency=medium
  * New upstream version 0.7.4 (Closes: #884287, #883832)
  * Require debhelper >= 10.2
  * cherry-pick: fix distclean which removes needed files (Closes: #884706)
  * Refresh patches
  * Update stdver to 4.1.2, no change required
  * Install zfs-import.target
 -- Aron Xu <aron@debian.org>  Mon, 18 Dec 2017 22:48:59 +0800
 zfs-linux (0.7.3-3) unstable; urgency=medium
  [ Antonio Russo ]
  * Add maximum version dependency on spl-dkms (Closes: #883008)
 -- Aron Xu <aron@debian.org>  Thu, 30 Nov 2017 00:34:30 +0800
 zfs-linux (0.7.3-2) unstable; urgency=medium
  [ Fabian Grünbichler ]
  * d/rules: remove obsolete calls to dpkg-architecture (Closes: #882209)
  * zfs-test: add proper Breaks+Replaces (Closes: #880902)
  * build: add implicit version to dh_makeshlibs (Closes: #880709)
  [ Aron Xu ]
  * Depend on matching version of spl-dkms (Closes: ##881013)
 -- Aron Xu <aron@debian.org>  Tue, 28 Nov 2017 16:16:34 +0800
 zfs-linux (0.7.3-1) unstable; urgency=medium
  [ Antonio Russo ]
  * Refresh manual builds DKMS prevention patch
  [ Fabian Grünbichler ]
  * zfs-test package
  * add files to debian/not-installed
  * dh_install: switch to --fail-missing
  * add new files from 0.7 to install
  * dkms: build icp module as well
  [ Antonio Russo ]
  * dracut: make module-setup.sh shebang explicit
  * add man page reference to systemd units
  * Fix install path of zpool.d scripts
  * Incorporate DebianPT.org Portuguese translation
  * Fix typo in debconf templates
  * Drop dependency on dh-systemd
  [ Aron Xu ]
  * Drop merged patches, update remainders
  * Update std-ver to 4.1.1
  * New upstream version 0.7.3
  * Update debconf pot file
  * Update control.in for dh-systemd deprecation
  * Add lintian override for zfs-test
  [ Colin King ]
  * Improve cloning performance for large numbers of clones (LP: #1567557)
    Bump zcmd buffer from 16K to 256K.
 -- Aron Xu <aron@debian.org>  Tue, 31 Oct 2017 18:52:01 +0800
 zfs-linux (0.6.5.11-1) unstable; urgency=medium
  [ Aron Xu ]
  * Imported Upstream version 0.6.5.11
  [ Fabian Grünbichler ]
  * fix rm path in zfs-share.service
 -- Aron Xu <aron@debian.org>  Fri, 14 Jul 2017 16:33:23 +0800
 zfs-linux (0.6.5.10-1) unstable; urgency=medium
  * Add kernel version to depmod cmd (Closes: #860958)
  * New upstream version 0.6.5.10
 -- Aron Xu <aron@debian.org>  Wed, 05 Jul 2017 18:11:39 +0800
 zfs-linux (0.6.5.9-5) unstable; urgency=medium
  * Add zfs initramfs conf for root pool setup
    (Closes: #848157, LP: #1673197)
 -- Aron Xu <aron@debian.org>  Sun, 19 Mar 2017 18:14:57 +0800
 zfs-linux (0.6.5.9-4) unstable; urgency=medium
  * autopkgtest: load zfs module before running tests
 -- Aron Xu <aron@debian.org>  Tue, 14 Mar 2017 11:38:08 +0800
 zfs-linux (0.6.5.9-3) unstable; urgency=medium
  [ Petter Reinholdtsen ]
  * Updated German debconf translation by Helge Kreutzmann. (Closes: #857528)
  * Updated metadata on a few patches.
  [ Aron Xu ]
  * Cherry-pick upstream fix for merged /usr/lib and /lib
  * Manually maintain adt test Depends
 -- Aron Xu <aron@debian.org>  Mon, 13 Mar 2017 12:23:32 +0800
 zfs-linux (0.6.5.9-2) unstable; urgency=medium
  [ Fabian Grünbichler ]
  * fix zed-service-bindir patch
 -- Aron Xu <aron@debian.org>  Tue, 07 Feb 2017 17:22:02 +0800
 zfs-linux (0.6.5.9-1) unstable; urgency=medium
  [ Aron Xu ]
  * Imported Upstream version 0.6.5.9 (Closes: #851513)
  [ Lukas Wunner ]
  * Cherry picks for root zpool with dracut (Closes: #849969)
  * Fix installation path of systemd files
  * Fix build breakage caused by nonstandard umask
  [ Fabian Grünbichler ]
  * fix python script install path (Closes: #842237)
 -- Aron Xu <aron@debian.org>  Mon, 06 Feb 2017 15:57:50 +0800
 zfs-linux (0.6.5.8-3) unstable; urgency=medium
  * Fix the path on the zfs-zed unit file (Closes: #849813)
 -- Carlos Alberto Lopez Perez <clopez@igalia.com>  Thu, 05 Jan 2017 16:23:16 +0100
 zfs-linux (0.6.5.8-2) unstable; urgency=medium
  [ Richard Laager ]
  * Remove .py extension from utilities in /usr/sbin as per policy
    10.4 Scripts (LP: #1628279)
  [ Colin Ian King ]
  * Use python3 for arcstat.py, arc_summary.py & dbufstat.py (LP: #1627909)
  [ Richard Laager ]
  * Set PATH in cron.d job to fix monthly scrubs. (LP: #1548009)
  [ Aron Xu ]
  * Install zed into /usr/sbin
  * Rename zfsutils path to follow the package name
  * Add missing part in python3 move
  * Install zed to /usr/sbin
  [ Petter Reinholdtsen ]
  * Updated Italian debconf translation by Beatrice Torracca.
    (Closes: #846928)
  * Added patch 1003-linux-4.9-compat.patch from upstream to build with
    Linux kernel 4.9. (Closes: #847018)
 -- Aron Xu <aron@debian.org>  Sat, 17 Dec 2016 17:42:21 +0800
 zfs-linux (0.6.5.8-1) unstable; urgency=medium
  [ Carlos Alberto Lopez Perez ]
  * Reflow changelog from last upload to avoid lintian warning.
  [ Aron Xu ]
  * Imported Upstream version 0.6.5.8 (Closes: #838192)
  * Conflicts with zutils (Closes: #836853)
  [ Zhou Mo ]
  * Patch: remove merged patches.
  * Upstream renamed zed.service to zfs-zed.service .
  * Avoid installing zfs-zed.service twice.
 -- Aron Xu <aron@debian.org>  Tue, 20 Sep 2016 15:20:21 +0800
 zfs-linux (0.6.5.7-2) unstable; urgency=medium
  [ Aron Xu ]
  * Add busybox to zfs-initramfs list of dependencies. (Closes: #824976)
  [ Petter Reinholdtsen ]
  * Updated Danish debconf translation by Joe Hansen. (Closes: #830652)
  * Added Dutch (nl) debconf translation by Frans Spiesschaert.
    (Closes: #832280)
  * Norwegian Bokmål (nb) debconf template translation by Petter Reinholdtsen.
  [ Eric Desrochers ]
  * Change utilities path (bindir) to /usr/sbin. (Closes: #832938)
  [ Carlos Alberto Lopez Perez]
  * Add tunable to ignore hole_birth, and enable it by default.
    (Closes: #830824)
 -- Carlos Alberto Lopez Perez <clopez@igalia.com>  Tue, 16 Aug 2016 17:43:48 +0200
 zfs-linux (0.6.5.7-1) unstable; urgency=medium
  [ YunQiang Su ]
  * 1002-fix-mips-build.patch: fix builds on mips* archs
  [ Aron Xu ]
  * New upstream release.
  * 1001-Fix-aarch64-compilation.patch: dropped, not needed anymore
  * Merge patches from Ubuntu:
    - 0002-Check-for-META-and-DCH-consistency-in-autoconf.patch
    - 0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
    - enable-zed.patch
 -- Aron Xu <aron@debian.org>  Tue, 31 May 2016 14:10:49 +0800
 zfs-linux (0.6.5.6-2) unstable; urgency=medium
  [ Aron Xu ]
  * Adding smoke testing scripts from Ubuntu
  * Fix binary module builds
  * Add libblkid-dev, libattr1-dev to build-dep
  * Re-sync source tree
  * Add dh-python to b-d
  * Remove .gitignore files and clean build tree
  * Scrub all healthy pools monthly from Richard Laager
  [ Petter Reinholdtsen ]
  * Copied 1000-ppc64el-endian-support.patch from Ubuntu to fix endian
    build problem on ppc64el
  * Copied 1001-Fix-aarch64-compilation.patch from Ubuntu to fix build
    problem on arm64.
  * Copied 0001-Prevent-manual-builds-in-the-DKMS-source.patch from
    Ubuntu to block manual building in the DKMS source tree.
  * Updated Standards-Version from 3.9.7 to 3.9.8.
  * Bring some files back to the upstream tarball content to get gbp
    buildpackage working.
 -- Petter Reinholdtsen <pere@debian.org>  Thu, 12 May 2016 12:19:55 +0200
 zfs-linux (0.6.5.6-1) unstable; urgency=medium
  [ Aron Xu ]
  * New upstream version 0.6.5.6.
  [ Petter Reinholdtsen ]
  * Generated new copyright.cme file based on version 0.6.5.6.
  * Updated d/copyright file, add missing BSD licensed init.d scripts, and
    new copyright holders in the new upstream version.
  * Updated Standards-Version from 3.9.6 to 3.9.7.
  * Added myself as uploader.
  * Updated debconf po files based on newest pot file.
  * Correct URL to git repo in d/control.
 -- Petter Reinholdtsen <pere@debian.org>  Sat, 26 Mar 2016 07:08:11 +0000
 zfs-linux (0.6.5.5-1) unstable; urgency=medium
  * Initial Release (Closes: #686447)
 -- Aron Xu <aron@debian.org>  Sun, 20 Mar 2016 22:57:06 +0800
@@ -1,288 +0,0 @@
 Source: zfs-linux
 Section: contrib/kernel
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: abigail-tools,
               debhelper-compat (= 12),
               dh-python,
               libaio-dev,
               libblkid-dev,
               libcurl4-openssl-dev | libcurl4-gnutls-dev,
               libelf-dev,
               libpam0g-dev,
               libssl-dev | libssl1.0-dev,
               libtool,
               libudev-dev,
               lsb-release,
               python3-cffi,
               python3-setuptools,
               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}
 # The libcurl4 is loaded through dlopen("libcurl.so.4").
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
 Recommends: libcurl4
 Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4
 Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4
 Description: OpenZFS filesystem library for Linux - general support
 OpenZFS is a storage platform that encompasses the functionality of
 traditional filesystems and volume managers. It supports data checksums,
 compression, encryption, snapshots, and more.
 .
 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},
 ${sphinxdoc:Built-Using},
 ${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: zfs-dracut
 Architecture: all
 Depends: dracut,
         zfsutils-linux (>= ${source:Version}),
         ${misc:Depends}
 Description: OpenZFS root filesystem capabilities for Linux - dracut
 OpenZFS is a storage platform that encompasses the functionality of
 traditional filesystems and volume managers. It supports data checksums,
 compression, encryption, snapshots, and more.
 .
 This package adds OpenZFS to the system initramfs with a hook
 for the dracut infrastructure.
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
 Depends: python3, ${misc:Depends}, ${shlibs:Depends}
 Recommends: 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}
 Recommends: bsd-mailx | mailutils
 Description: OpenZFS Event Daemon
 OpenZFS is a storage platform that encompasses the functionality of
 traditional filesystems and volume managers. It supports data checksums,
 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.
@@ -1,2 +0,0 @@
 COPYRIGHT
 LICENSE
@@ -1 +0,0 @@
 lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*
@@ -1 +0,0 @@
 package-name-doesnt-match-sonames
@@ -1,2 +0,0 @@
 lib/*/security/pam_zfs_key.so
 usr/share/pam-configs/zfs_key
@@ -1,6 +0,0 @@
 #!/bin/sh
 set -e
 pam-auth-update --package
 #DEBHELPER#
@@ -1,8 +0,0 @@
 #!/bin/sh
 set -e
 if [ "$1" = remove ] ; then
    pam-auth-update --package --remove zfs_key
 fi
 #DEBHELPER#
@@ -1,2 +0,0 @@
 COPYRIGHT
 LICENSE
@@ -1 +0,0 @@
 lib/@DEB_HOST_MULTIARCH@/libuutil.so.*
@@ -1 +0,0 @@
 package-name-doesnt-match-sonames
@@ -1,2 +0,0 @@
 COPYRIGHT
 LICENSE
@@ -1,2 +0,0 @@
 lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
 lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*
@@ -1 +0,0 @@
 package-name-doesnt-match-sonames
@@ -1,2 +0,0 @@
 COPYRIGHT
 LICENSE
@@ -1 +0,0 @@
 lib/libzfsbootenv.so.*
@@ -1 +0,0 @@
 lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*
@@ -1,2 +0,0 @@
 package-name-doesnt-match-sonames
 extra-license-file *usr/share/doc/libzfsbootenv1linux/LICENSE.gz*
@@ -1,2 +0,0 @@
 COPYRIGHT
 LICENSE
@@ -1,4 +0,0 @@
 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
@@ -1,2 +0,0 @@
 COPYRIGHT
 LICENSE
@@ -1 +0,0 @@
 lib/@DEB_HOST_MULTIARCH@/libzpool.so.*
@@ -1 +0,0 @@
 package-name-doesnt-match-sonames
@@ -1,13 +0,0 @@
 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
 etc/zfs/vdev_id.conf.multipath.example
 etc/zfs/vdev_id.conf.sas_direct.example
 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
@@ -1,70 +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] 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 20064a0fb..4d5f545ad 100644
 --- a/config/zfs-meta.m4
 +++ b/config/zfs-meta.m4
@@ -1,9 +1,10 @@
 dnl #
 dnl # DESCRIPTION:
 -dnl # Read meta data from the META file.  When building from a git repository
 -dnl # the ZFS_META_RELEASE field will be overwritten if there is an annotated
 -dnl # tag matching the form ZFS_META_NAME-ZFS_META_VERSION-*.  This allows
 -dnl # for working builds to be uniquely identified using the git commit hash.
 +dnl # Read meta data from the META file or the debian/changelog file if it
 +dnl # exists.  When building from a git repository the ZFS_META_RELEASE field
 +dnl # will be overwritten if there is an annotated tag matching the form
 +dnl # ZFS_META_NAME-ZFS_META_VERSION-*.  This allows for working builds to be
 +dnl # uniquely identified using the git commit hash.
 dnl #
 dnl #    The META file format is as follows:
 dnl #      ^[ ]*KEY:[ \t]+VALUE$
@@ -49,6 +50,7 @@ AC_DEFUN([ZFS_AC_META], [
 	_zfs_ac_meta_type="none"
 	if test -f "$META"; then
 		_zfs_ac_meta_type="META file"
 +		_dpkg_parsechangelog=$(dpkg-parsechangelog 2>/dev/null)
 		ZFS_META_NAME=_ZFS_AC_META_GETVAL([(Name|Project|Package)]);
 		if test -n "$ZFS_META_NAME"; then
@@ -69,8 +71,30 @@ AC_DEFUN([ZFS_AC_META], [
 			AC_SUBST([ZFS_META_VERSION])
 		fi
 +		if test -n "${_dpkg_parsechangelog}"; then
 +			_dpkg_version=$(echo "${_dpkg_parsechangelog}" \
 +				| $AWK '$[]1 == "Version:" { print $[]2; }' \
 +				| cut -d- -f1)
 +			if test "${_dpkg_version}" != "$ZFS_META_VERSION"; then
 +				AC_MSG_ERROR([
 +	*** Version $ZFS_META_VERSION in the META file is different than
 +	*** version $_dpkg_version in the debian/changelog file. DKMS and DEB
 +	*** packaging require that these files have the same version.
 +				])
 +			fi
 +		fi
 +
 		ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([Release]);
 -		if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
 +
 +		if test -n "${_dpkg_parsechangelog}"; then
 +			_dpkg_release=$(echo "${_dpkg_parsechangelog}" \
 +				| $AWK '$[]1 == "Version:" { print $[]2; }' \
 +				| cut -d- -f2-)
 +			if test -n "${_dpkg_release}"; then
 +				ZFS_META_RELEASE=${_dpkg_release}
 +				_zfs_ac_meta_type="dpkg-parsechangelog"
 +			fi
 +		elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
 			_match="${ZFS_META_NAME}-${ZFS_META_VERSION}"
 			_alias=$(git describe --match=${_match} 2>/dev/null)
 			_release=$(echo ${_alias}|sed "s/${ZFS_META_NAME}//"|cut -f3- -d'-'|tr - _)
@@ -1,29 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Fri, 19 Jan 2018 12:13:46 +0100
 Subject: [PATCH] always load ZFS module on boot
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 since zfs-import-scan.service is disabled by default, and
 zfs-import-cache.service only gets started if a cache file exists, this
 is needed for zfs-mount, zfs-share and zfs-zed services in case ZFS is
 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 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
 +++ 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.
 -#zfs
 +zfs
@@ -1,27 +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, 6 Feb 2017 12:04:35 +0100
 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 be2fc6734..7606604ec 100644
 --- a/etc/systemd/system/zfs-zed.service.in
 +++ b/etc/systemd/system/zfs-zed.service.in
@@ -5,7 +5,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 [Service]
 EnvironmentFile=-@initconfdir@/zfs
 -ExecStart=@sbindir@/zed -F
 +ExecStart=/usr/sbin/zed -F
 Restart=always
 [Install]
@@ -1,28 +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, 24 Oct 2016 13:47:06 +0200
 Subject: [PATCH] import with -d /dev/disk/by-id in scan service
 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>
 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 c5dd45d87..1c792edf0 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-@initconfdir@/zfs
 -ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
 +ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS
 [Install]
 WantedBy=zfs-import.target
@@ -1,27 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Richard Laager <rlaager@wiktel.com>
 Date: Wed, 30 Jan 2019 15:12:04 +0100
 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
 index 78dc1afc7..41d5539ea 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root"
 ##
 # Minimum number of seconds between notifications for a similar event.
 #
 -#ZED_NOTIFY_INTERVAL_SECS=3600
 +ZED_NOTIFY_INTERVAL_SECS=3600
 ##
 # Notification verbosity.
@@ -1,46 +0,0 @@
 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
 Of the zedlet scripts shipped by upstream, a subset are enabled by
 default, by creating symlinks in /etc/zfs/zed.d.  These symlinks are
 shipped in the zfs-zed package.  dpkg, however, does not support
 conffile handling of symlinks, and therefore any changes (removals) to
 the symlinks are not preserved on package upgrade.
 To address this policy violation, we:
 1. During package build, create a list of enabled-by-default zedlets,
    instead of creating symlinks.
 2. On package removal, identify all enabled-by-default zedlets whose
    symlinks do not exist (i.e., were removed by the user). This is done
    by creating "whiteout" links to /dev/null in their place).
 3. On package installation, create links to enabled-by-default zedlets
    UNLESS there is already a file there (i.e., abort if there is a
    whiteout link).
 4. We also clean up broken symlinks to removed zedlets at package
    postinst.
 Description: track default symlinks, instead of symlinking
 Forwarded: no need
 (cherry picked from https://salsa.debian.org/zfsonlinux-team/zfs/-/commit/5cee380324d7)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 cmd/zed/zed.d/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
 index 812558cf6..f802cf140 100644
 --- a/cmd/zed/zed.d/Makefile.am
 +++ b/cmd/zed/zed.d/Makefile.am
@@ -48,7 +48,7 @@ zed-install-data-hook:
 	set -x; for f in $(zedconfdefaults); do \
 	  [ -f "$(DESTDIR)$(zedconfdir)/$${f}" ] ||\
 	    [ -L "$(DESTDIR)$(zedconfdir)/$${f}" ] || \
 -	    $(LN_S) "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
 +	    echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
 	done
 SHELLCHECKSCRIPTS += $(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)
@@ -1,67 +0,0 @@
 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>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 etc/Makefile.am                           |  1 +
 etc/systemd/system/50-zfs.preset          |  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/Makefile.am b/etc/Makefile.am
 index 7187762d3..de131dc87 100644
 --- a/etc/Makefile.am
 +++ b/etc/Makefile.am
@@ -54,6 +54,7 @@ dist_systemdpreset_DATA = \
 systemdunit_DATA = \
 	%D%/systemd/system/zfs-import-cache.service \
 	%D%/systemd/system/zfs-import-scan.service \
 +	%D%/systemd/system/zfs-import@.service \
 	%D%/systemd/system/zfs-import.target \
 	%D%/systemd/system/zfs-mount.service \
 	%D%/systemd/system/zfs-scrub-monthly@.timer \
 diff --git a/etc/systemd/system/50-zfs.preset b/etc/systemd/system/50-zfs.preset
 index e4056a92c..030611419 100644
 --- a/etc/systemd/system/50-zfs.preset
 +++ b/etc/systemd/system/50-zfs.preset
@@ -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/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
@@ -1,52 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Stoiko Ivanov <s.ivanov@proxmox.com>
 Date: Thu, 4 Feb 2021 19:01:12 +0100
 Subject: [PATCH] Patch: move manpage arcstat(1) to arcstat(8).
 Originally-By: Mo Zhou <cdluminate@gmail.com>
 Originally-By: Antonio Russo <aerusso@aerusso.net>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 man/Makefile.am                        | 2 +-
 man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
 diff --git a/man/Makefile.am b/man/Makefile.am
 index 36c1aede1..94fd96e58 100644
 --- a/man/Makefile.am
 +++ b/man/Makefile.am
@@ -2,7 +2,6 @@ dist_noinst_man_MANS = \
 	%D%/man1/cstyle.1
 dist_man_MANS = \
 -	%D%/man1/arcstat.1 \
 	%D%/man1/raidz_test.1 \
 	%D%/man1/test-runner.1 \
 	%D%/man1/zhack.1 \
@@ -22,6 +21,7 @@ dist_man_MANS = \
 	%D%/man7/zpoolconcepts.7 \
 	%D%/man7/zpoolprops.7 \
 	\
 +	%D%/man8/arcstat.8 \
 	%D%/man8/fsck.zfs.8 \
 	%D%/man8/mount.zfs.8 \
 	%D%/man8/vdev_id.8 \
 diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
 similarity index 99%
 rename from man/man1/arcstat.1
 rename to man/man8/arcstat.8
 index 82358fa68..a8fb55498 100644
 --- a/man/man1/arcstat.1
 +++ b/man/man8/arcstat.8
@@ -13,7 +13,7 @@
 .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
 .\"
 .Dd December 23, 2022
 -.Dt ARCSTAT 1
 +.Dt ARCSTAT 8
 .Os
 .
 .Sh NAME
@@ -1,113 +0,0 @@
 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>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 cmd/arc_summary | 28 ++++++++++++++--------------
 cmd/arcstat.in  | 14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)
 diff --git a/cmd/arc_summary b/cmd/arc_summary
 index 426e02070..9de198150 100755
 --- a/cmd/arc_summary
 +++ b/cmd/arc_summary
@@ -655,13 +655,13 @@ def section_arc(kstats_dict):
     prt_i1('L2 cached evictions:', f_bytes(arc_stats['evict_l2_cached']))
     prt_i1('L2 eligible evictions:', f_bytes(arc_stats['evict_l2_eligible']))
     prt_i2('L2 eligible MFU evictions:',
 -           f_perc(arc_stats['evict_l2_eligible_mfu'],
 +           f_perc(arc_stats.get('evict_l2_eligible_mfu', 0), # 2.0 module compat
            arc_stats['evict_l2_eligible']),
 -           f_bytes(arc_stats['evict_l2_eligible_mfu']))
 +           f_bytes(arc_stats.get('evict_l2_eligible_mfu', 0)))
     prt_i2('L2 eligible MRU evictions:',
 -           f_perc(arc_stats['evict_l2_eligible_mru'],
 +           f_perc(arc_stats.get('evict_l2_eligible_mru', 0), # 2.0 module compat
            arc_stats['evict_l2_eligible']),
 -           f_bytes(arc_stats['evict_l2_eligible_mru']))
 +           f_bytes(arc_stats.get('evict_l2_eligible_mru', 0)))
     prt_i1('L2 ineligible evictions:',
            f_bytes(arc_stats['evict_l2_ineligible']))
     print()
@@ -851,20 +851,20 @@ def section_l2arc(kstats_dict):
            f_perc(arc_stats['l2_hdr_size'], arc_stats['l2_size']),
            f_bytes(arc_stats['l2_hdr_size']))
     prt_i2('MFU allocated size:',
 -           f_perc(arc_stats['l2_mfu_asize'], arc_stats['l2_asize']),
 -           f_bytes(arc_stats['l2_mfu_asize']))
 +           f_perc(arc_stats.get('l2_mfu_asize', 0), arc_stats['l2_asize']),
 +           f_bytes(arc_stats.get('l2_mfu_asize', 0))) # 2.0 module compat
     prt_i2('MRU allocated size:',
 -           f_perc(arc_stats['l2_mru_asize'], arc_stats['l2_asize']),
 -           f_bytes(arc_stats['l2_mru_asize']))
 +           f_perc(arc_stats.get('l2_mru_asize', 0), arc_stats['l2_asize']),
 +           f_bytes(arc_stats.get('l2_mru_asize', 0))) # 2.0 module compat
     prt_i2('Prefetch allocated size:',
 -           f_perc(arc_stats['l2_prefetch_asize'], arc_stats['l2_asize']),
 -           f_bytes(arc_stats['l2_prefetch_asize']))
 +           f_perc(arc_stats.get('l2_prefetch_asize', 0), arc_stats['l2_asize']),
 +           f_bytes(arc_stats.get('l2_prefetch_asize',0))) # 2.0 module compat
     prt_i2('Data (buffer content) allocated size:',
 -           f_perc(arc_stats['l2_bufc_data_asize'], arc_stats['l2_asize']),
 -           f_bytes(arc_stats['l2_bufc_data_asize']))
 +           f_perc(arc_stats.get('l2_bufc_data_asize', 0), arc_stats['l2_asize']),
 +           f_bytes(arc_stats.get('l2_bufc_data_asize', 0))) # 2.0 module compat
     prt_i2('Metadata (buffer content) allocated size:',
 -           f_perc(arc_stats['l2_bufc_metadata_asize'], arc_stats['l2_asize']),
 -           f_bytes(arc_stats['l2_bufc_metadata_asize']))
 +           f_perc(arc_stats.get('l2_bufc_metadata_asize', 0), arc_stats['l2_asize']),
 +           f_bytes(arc_stats.get('l2_bufc_metadata_asize', 0))) # 2.0 module compat
     print()
     prt_1('L2ARC breakdown:', f_hits(l2_access_total))
 diff --git a/cmd/arcstat.in b/cmd/arcstat.in
 index 8df1c62f7..833348d0e 100755
 --- a/cmd/arcstat.in
 +++ b/cmd/arcstat.in
@@ -565,8 +565,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
@@ -581,11 +581,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"]
@@ -1,99 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Mon, 23 Oct 2023 14:45:06 -0700
 Subject: [PATCH] zvol: Remove broken blk-mq optimization
 This fix removes a dubious optimization in zfs_uiomove_bvec_rq()
 that saved the iterator contents of a rq_for_each_segment().  This
 optimization allowed restoring the "saved state" from a previous
 rq_for_each_segment() call on the same uio so that you wouldn't
 need to iterate though each bvec on every zfs_uiomove_bvec_rq() call.
 However, if the kernel is manipulating the requests/bios/bvecs under
 the covers between zfs_uiomove_bvec_rq() calls, then it could result
 in corruption from using the "saved state".  This optimization
 results in an unbootable system after installing an OS on a zvol
 with blk-mq enabled.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 Closes #15351
 (cherry picked from commit 7c9b6fed16ed5034fd1cdfdaedfad93dc97b1557)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 include/os/linux/spl/sys/uio.h |  8 --------
 module/os/linux/zfs/zfs_uio.c  | 29 -----------------------------
 2 files changed, 37 deletions(-)
 diff --git a/include/os/linux/spl/sys/uio.h b/include/os/linux/spl/sys/uio.h
 index cce097e16..a4b600004 100644
 --- a/include/os/linux/spl/sys/uio.h
 +++ b/include/os/linux/spl/sys/uio.h
@@ -73,13 +73,6 @@ typedef struct zfs_uio {
 	size_t		uio_skip;
 	struct request	*rq;
 -
 -	/*
 -	 * Used for saving rq_for_each_segment() state between calls
 -	 * to zfs_uiomove_bvec_rq().
 -	 */
 -	struct req_iterator iter;
 -	struct bio_vec bv;
 } zfs_uio_t;
@@ -138,7 +131,6 @@ zfs_uio_bvec_init(zfs_uio_t *uio, struct bio *bio, struct request *rq)
 	} else {
 		uio->uio_bvec = NULL;
 		uio->uio_iovcnt = 0;
 -		memset(&uio->iter, 0, sizeof (uio->iter));
 	}
 	uio->uio_loffset = io_offset(bio, rq);
 diff --git a/module/os/linux/zfs/zfs_uio.c b/module/os/linux/zfs/zfs_uio.c
 index 3efd4ab15..c2ed67c43 100644
 --- a/module/os/linux/zfs/zfs_uio.c
 +++ b/module/os/linux/zfs/zfs_uio.c
@@ -204,22 +204,6 @@ zfs_uiomove_bvec_rq(void *p, size_t n, zfs_uio_rw_t rw, zfs_uio_t *uio)
 	this_seg_start = orig_loffset;
 	rq_for_each_segment(bv, rq, iter) {
 -		if (uio->iter.bio) {
 -			/*
 -			 * If uio->iter.bio is present, then we know we've saved
 -			 * uio->iter from a previous call to this function, and
 -			 * we can skip ahead in this rq_for_each_segment() loop
 -			 * to where we last left off.  That way, we don't need
 -			 * to iterate over tons of segments we've already
 -			 * processed - we can just restore the "saved state".
 -			 */
 -			iter = uio->iter;
 -			bv = uio->bv;
 -			this_seg_start = uio->uio_loffset;
 -			memset(&uio->iter, 0, sizeof (uio->iter));
 -			continue;
 -		}
 -
 		/*
 		 * Lookup what the logical offset of the last byte of this
 		 * segment is.
@@ -260,19 +244,6 @@ zfs_uiomove_bvec_rq(void *p, size_t n, zfs_uio_rw_t rw, zfs_uio_t *uio)
 			copied = 1;	/* We copied some data */
 		}
 -		if (n == 0) {
 -			/*
 -			 * All done copying.  Save our 'iter' value to the uio.
 -			 * This allows us to "save our state" and skip ahead in
 -			 * the rq_for_each_segment() loop the next time we call
 -			 * call zfs_uiomove_bvec_rq() on this uio (which we
 -			 * will be doing for any remaining data in the uio).
 -			 */
 -			uio->iter = iter; /* make a copy of the struct data */
 -			uio->bv = bv;
 -			return (0);
 -		}
 -
 		this_seg_start = this_seg_end + 1;
 	}
@@ -1,123 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Mon, 23 Oct 2023 14:39:59 -0700
 Subject: [PATCH] Revert "zvol: Temporally disable blk-mq"
 This reverts commit aefb6a2bd6c24597cde655e9ce69edd0a4c34357.
 aefb6a2bd temporally disabled blk-mq until we could fix a fix for
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 Closes #15439
 (cherry picked from commit 05c4710e8958832afc2868102c9535a4f18115be)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 man/man4/zfs.4                       | 57 ++++++++++++++++++++++++++++
 module/os/linux/zfs/zvol_os.c        | 12 ++++++
 tests/zfs-tests/include/tunables.cfg |  2 +-
 3 files changed, 70 insertions(+), 1 deletion(-)
 diff --git a/man/man4/zfs.4 b/man/man4/zfs.4
 index 71a3e67ee..cfadd79d8 100644
 --- a/man/man4/zfs.4
 +++ b/man/man4/zfs.4
@@ -2317,6 +2317,63 @@ If
 .Sy zvol_threads
 to the number of CPUs present or 32 (whichever is greater).
 .
 +.It Sy zvol_blk_mq_threads Ns = Ns Sy 0 Pq uint
 +The number of threads per zvol to use for queuing IO requests.
 +This parameter will only appear if your kernel supports
 +.Li blk-mq
 +and is only read and assigned to a zvol at zvol load time.
 +If
 +.Sy 0
 +(the default) then internally set
 +.Sy zvol_blk_mq_threads
 +to the number of CPUs present.
 +.
 +.It Sy zvol_use_blk_mq Ns = Ns Sy 0 Ns | Ns 1 Pq uint
 +Set to
 +.Sy 1
 +to use the
 +.Li blk-mq
 +API for zvols.
 +Set to
 +.Sy 0
 +(the default) to use the legacy zvol APIs.
 +This setting can give better or worse zvol performance depending on
 +the workload.
 +This parameter will only appear if your kernel supports
 +.Li blk-mq
 +and is only read and assigned to a zvol at zvol load time.
 +.
 +.It Sy zvol_blk_mq_blocks_per_thread Ns = Ns Sy 8 Pq uint
 +If
 +.Sy zvol_use_blk_mq
 +is enabled, then process this number of
 +.Sy volblocksize Ns -sized blocks per zvol thread.
 +This tunable can be use to favor better performance for zvol reads (lower
 +values) or writes (higher values).
 +If set to
 +.Sy 0 ,
 +then the zvol layer will process the maximum number of blocks
 +per thread that it can.
 +This parameter will only appear if your kernel supports
 +.Li blk-mq
 +and is only applied at each zvol's load time.
 +.
 +.It Sy zvol_blk_mq_queue_depth Ns = Ns Sy 0 Pq uint
 +The queue_depth value for the zvol
 +.Li blk-mq
 +interface.
 +This parameter will only appear if your kernel supports
 +.Li blk-mq
 +and is only applied at each zvol's load time.
 +If
 +.Sy 0
 +(the default) then use the kernel's default queue depth.
 +Values are clamped to the kernel's
 +.Dv BLKDEV_MIN_RQ
 +and
 +.Dv BLKDEV_MAX_RQ Ns / Ns Dv BLKDEV_DEFAULT_RQ
 +limits.
 +.
 .It Sy zvol_volmode Ns = Ns Sy 1 Pq uint
 Defines zvol block devices behaviour when
 .Sy volmode Ns = Ns Sy default :
 diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c
 index 76521c959..7a95b54bd 100644
 --- a/module/os/linux/zfs/zvol_os.c
 +++ b/module/os/linux/zfs/zvol_os.c
@@ -1620,6 +1620,18 @@ MODULE_PARM_DESC(zvol_prefetch_bytes, "Prefetch N bytes at zvol start+end");
 module_param(zvol_volmode, uint, 0644);
 MODULE_PARM_DESC(zvol_volmode, "Default volmode property value");
 +#ifdef HAVE_BLK_MQ
 +module_param(zvol_blk_mq_queue_depth, uint, 0644);
 +MODULE_PARM_DESC(zvol_blk_mq_queue_depth, "Default blk-mq queue depth");
 +
 +module_param(zvol_use_blk_mq, uint, 0644);
 +MODULE_PARM_DESC(zvol_use_blk_mq, "Use the blk-mq API for zvols");
 +
 +module_param(zvol_blk_mq_blocks_per_thread, uint, 0644);
 +MODULE_PARM_DESC(zvol_blk_mq_blocks_per_thread,
 +    "Process volblocksize blocks per thread");
 +#endif
 +
 #ifndef HAVE_BLKDEV_GET_ERESTARTSYS
 module_param(zvol_open_timeout_ms, uint, 0644);
 MODULE_PARM_DESC(zvol_open_timeout_ms, "Timeout for ZVOL open retries");
 diff --git a/tests/zfs-tests/include/tunables.cfg b/tests/zfs-tests/include/tunables.cfg
 index 8010a9451..80e7bcb3b 100644
 --- a/tests/zfs-tests/include/tunables.cfg
 +++ b/tests/zfs-tests/include/tunables.cfg
@@ -89,7 +89,7 @@ VDEV_VALIDATE_SKIP		vdev.validate_skip		vdev_validate_skip
 VOL_INHIBIT_DEV			UNSUPPORTED			zvol_inhibit_dev
 VOL_MODE			vol.mode			zvol_volmode
 VOL_RECURSIVE			vol.recursive			UNSUPPORTED
 -VOL_USE_BLK_MQ			UNSUPPORTED			UNSUPPORTED
 +VOL_USE_BLK_MQ			UNSUPPORTED			zvol_use_blk_mq
 XATTR_COMPAT			xattr_compat			zfs_xattr_compat
 ZEVENT_LEN_MAX			zevent.len_max			zfs_zevent_len_max
 ZEVENT_RETAIN_MAX		zevent.retain_max		zfs_zevent_retain_max
@@ -1,76 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: siv0 <github@nomore.at>
 Date: Tue, 31 Oct 2023 21:57:54 +0100
 Subject: [PATCH] Fix nfs_truncate_shares without /etc/exports.d
 Calling nfs_reset_shares on Linux prints a warning:
 `failed to lock /etc/exports.d/zfs.exports.lock: No such file or
 directory`
 when /etc/exports.d does not exist. The directory gets created, when a
 filesystem is actually exported through nfs_toggle_share and
 nfs_init_share. The truncation of /etc/exports.d/zfs.exports happens
 unconditionally when calling `zfs mount -a` (via zfs_do_mount and
 share_mount in `cmd/zfs/zfs_main.c`).
 Fixing the issue only in the Linux part, since the exports file on
 freebsd is in `/etc/zfs/`, which seems present on 2 FreeBSD systems I
 have access to (through `/etc/zfs/compatibility.d/`), while a Debian
 box does not have the directory even if `/usr/sbin/exportfs` is
 present through the `nfs-kernel-server` package.
 The code for exports_available is copied from nfs_available above.
 Fixes: ede037cda73675f42b1452187e8dd3438fafc220
 ("Make zfs-share service resilient to stale exports")
 Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Closes #15369
 Closes #15468
 (cherry picked from commit 41e55b476bcfc90f1ad81c02c5375367fdace9e9)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 lib/libshare/os/linux/nfs.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 diff --git a/lib/libshare/os/linux/nfs.c b/lib/libshare/os/linux/nfs.c
 index 004946b0c..3dce81840 100644
 --- a/lib/libshare/os/linux/nfs.c
 +++ b/lib/libshare/os/linux/nfs.c
@@ -47,6 +47,7 @@
 static boolean_t nfs_available(void);
 +static boolean_t exports_available(void);
 typedef int (*nfs_shareopt_callback_t)(const char *opt, const char *value,
     void *cookie);
@@ -539,6 +540,8 @@ nfs_commit_shares(void)
 static void
 nfs_truncate_shares(void)
 {
 +	if (!exports_available())
 +		return;
 	nfs_reset_shares(ZFS_EXPORTS_LOCK, ZFS_EXPORTS_FILE);
 }
@@ -566,3 +569,18 @@ nfs_available(void)
 	return (avail == 1);
 }
 +
 +static boolean_t
 +exports_available(void)
 +{
 +	static int avail;
 +
 +	if (!avail) {
 +		if (access(ZFS_EXPORTS_DIR, F_OK) != 0)
 +			avail = -1;
 +		else
 +			avail = 1;
 +	}
 +
 +	return (avail == 1);
 +}
@@ -1,72 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Thu, 9 Nov 2023 16:43:35 -0800
 Subject: [PATCH] Workaround UBSAN errors for variable arrays
 This gets around UBSAN errors when using arrays at the end of
 structs.  It converts some zero-length arrays to variable length
 arrays and disables UBSAN checking on certain modules.
 It is based off of the patch from #15460.
 Addresses: #15145
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 Co-authored-by: Tony Hutter <hutter2@llnl.gov>
 Co-authored-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 include/os/linux/spl/sys/kmem_cache.h | 2 +-
 include/sys/vdev_raidz_impl.h         | 4 ++--
 module/Kbuild.in                      | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)
 diff --git a/include/os/linux/spl/sys/kmem_cache.h b/include/os/linux/spl/sys/kmem_cache.h
 index 20eeadc46..82d50b603 100644
 --- a/include/os/linux/spl/sys/kmem_cache.h
 +++ b/include/os/linux/spl/sys/kmem_cache.h
@@ -108,7 +108,7 @@ typedef struct spl_kmem_magazine {
 	uint32_t		skm_refill;	/* Batch refill size */
 	struct spl_kmem_cache	*skm_cache;	/* Owned by cache */
 	unsigned int		skm_cpu;	/* Owned by cpu */
 -	void			*skm_objs[0];	/* Object pointers */
 +	void			*skm_objs[];	/* Object pointers */
 } spl_kmem_magazine_t;
 typedef struct spl_kmem_obj {
 diff --git a/include/sys/vdev_raidz_impl.h b/include/sys/vdev_raidz_impl.h
 index c1037fa12..73c26dff1 100644
 --- a/include/sys/vdev_raidz_impl.h
 +++ b/include/sys/vdev_raidz_impl.h
@@ -130,7 +130,7 @@ typedef struct raidz_row {
 	uint64_t rr_offset;		/* Logical offset for *_io_verify() */
 	uint64_t rr_size;		/* Physical size for *_io_verify() */
 #endif
 -	raidz_col_t rr_col[0];		/* Flexible array of I/O columns */
 +	raidz_col_t rr_col[];		/* Flexible array of I/O columns */
 } raidz_row_t;
 typedef struct raidz_map {
@@ -139,7 +139,7 @@ typedef struct raidz_map {
 	int rm_nskip;			/* RAIDZ sectors skipped for padding */
 	int rm_skipstart;		/* Column index of padding start */
 	const raidz_impl_ops_t *rm_ops;	/* RAIDZ math operations */
 -	raidz_row_t *rm_row[0];		/* flexible array of rows */
 +	raidz_row_t *rm_row[];		/* flexible array of rows */
 } raidz_map_t;
 diff --git a/module/Kbuild.in b/module/Kbuild.in
 index c13217159..b9c284a24 100644
 --- a/module/Kbuild.in
 +++ b/module/Kbuild.in
@@ -488,6 +488,10 @@ zfs-$(CONFIG_ARM64) += $(addprefix zfs/,$(ZFS_OBJS_ARM64))
 zfs-$(CONFIG_PPC)   += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
 zfs-$(CONFIG_PPC64) += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
 +UBSAN_SANITIZE_zap_leaf.o := n
 +UBSAN_SANITIZE_zap_micro.o := n
 +UBSAN_SANITIZE_sa.o := n
 +
 # Suppress incorrect warnings from versions of objtool which are not
 # aware of x86 EVEX prefix instructions used for AVX512.
 OBJECT_FILES_NON_STANDARD_vdev_raidz_math_avx512bw.o := y
@@ -1,66 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thomas Lamprecht <t.lamprecht@proxmox.com>
 Date: Sun, 12 Nov 2023 15:52:25 +0100
 Subject: [PATCH] zpool status: tighten bounds for noalloc stat availabillity
 When running zfs 2.2.0 userspace utilities with a kernel that still
 has 2.1.13 modules zpool status adds `(non-allocating)` next to the
 disk name of a single-disk pool.
 The reason for this seems to be that the patch adding the `vs_pspace` field was
 backported, but the one adding `vs_noalloc` was not.
 Itself that is not a problem, but in 2.2 `noalloc` was added before `psspace`,
 so the struct layout between 2.1.13 and 2.2.0 do NOT match anymore...
 I.e., the struct looks like the following at the end for ZFS 2.1.x:
 ```
 typedef struct vdev_stat {
    hrtime_t        vs_timestamp;           /* time since vdev load */
    // snip
    uint64_t        vs_logical_ashift;      /* vdev_logical_ashift  */
    uint64_t        vs_physical_ashift;     /* vdev_physical_ashift */
    uint64_t        vs_pspace;              /* physical capacity */
 } vdev_stat_t;
 ```
 And like the following on ZFS 2.2.x:
 ```
 typedef struct vdev_stat {
    hrtime_t        vs_timestamp;           /* time since vdev load */
    // snip
    uint64_t        vs_logical_ashift;      /* vdev_logical_ashift  */
    uint64_t        vs_physical_ashift;     /* vdev_physical_ashift */
    uint64_t        vs_noalloc;             /* allocations halted?  */
    uint64_t        vs_pspace;              /* physical capacity */
 } vdev_stat_t;
 ```
 Resulting in 2.2.x user-space tooling interpreting the `vs_pspace` field from
 the 2.1.x kernel module as `vs_noalloc` field.
 For now, work-around that discrepancy by coupling the availability of
 the vs_noalloc field with the one of the vs_pspace one, as when both
 are returned from the module we can be sure that our struct layout
 matches again.
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 cmd/zpool/zpool_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
 index 5507f9d3f..98970abfe 100644
 --- a/cmd/zpool/zpool_main.c
 +++ b/cmd/zpool/zpool_main.c
@@ -2478,7 +2478,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
 	if (vs->vs_scan_removing != 0) {
 		(void) printf(gettext("  (removing)"));
 -	} else if (VDEV_STAT_VALID(vs_noalloc, vsc) && vs->vs_noalloc != 0) {
 +	} else if (VDEV_STAT_VALID(vs_pspace, vsc)
 +		       && VDEV_STAT_VALID(vs_noalloc, vsc) && vs->vs_noalloc != 0) {
 		(void) printf(gettext("  (non-allocating)"));
 	}
@@ -1,44 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Matu=C5=A1ka?= <mm@FreeBSD.org>
 Date: Tue, 31 Oct 2023 21:49:41 +0100
 Subject: [PATCH] Fix block cloning between unencrypted and encrypted datasets
 Block cloning from an encrypted dataset into an unencrypted dataset
 and vice versa is not possible. The current code did allow cloning
 unencrypted files into an encrypted dataset causing a panic when
 these were accessed. Block cloning between encrypted and encrypted
 is currently supported on the same filesystem only.
 Reviewed-by: Alexander Motin <mav@FreeBSD.org>
 Reviewed-by: Kay Pedersen <mail@mkwg.de>
 Reviewed-by: Rob N <robn@despairlabs.com>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Martin Matuska <mm@FreeBSD.org>
 Closes #15464
 Closes #15465
 (cherry picked from commit 459c99ff2339a4a514abcf2255f9b3e5324ef09e)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 module/zfs/zfs_vnops.c | 9 +++++++++
 1 file changed, 9 insertions(+)
 diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
 index 40d6c87a7..84e6b10ef 100644
 --- a/module/zfs/zfs_vnops.c
 +++ b/module/zfs/zfs_vnops.c
@@ -1094,6 +1094,15 @@ zfs_clone_range(znode_t *inzp, uint64_t *inoffp, znode_t *outzp,
 	ASSERT(!outzfsvfs->z_replay);
 +	/*
 +	 * Block cloning from an unencrypted dataset into an encrypted
 +	 * dataset and vice versa is not supported.
 +	 */
 +	if (inos->os_encrypted != outos->os_encrypted) {
 +		zfs_exit_two(inzfsvfs, outzfsvfs, FTAG);
 +		return (SET_ERROR(EXDEV));
 +	}
 +
 	error = zfs_verify_zp(inzp);
 	if (error == 0)
 		error = zfs_verify_zp(outzp);
@@ -1,201 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Rich Ercolani <214141+rincebrain@users.noreply.github.com>
 Date: Thu, 16 Nov 2023 14:35:22 -0500
 Subject: [PATCH] Add a tunable to disable BRT support.
 Copy the disable parameter that FreeBSD implemented, and extend it to
 work on Linux as well, until we're sure this is stable.
 Reviewed-by: Alexander Motin <mav@FreeBSD.org>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
 Closes #15529
 (cherry picked from commit 87e9e828655c250ce064874ff5df16f870c0a52e)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 include/os/freebsd/zfs/sys/zfs_vfsops_os.h        |  1 +
 include/os/linux/zfs/sys/zfs_vfsops_os.h          |  2 ++
 man/man4/zfs.4                                    |  5 +++++
 module/os/freebsd/zfs/zfs_vfsops.c                |  4 ++++
 module/os/freebsd/zfs/zfs_vnops_os.c              |  5 +++++
 module/os/linux/zfs/zfs_vnops_os.c                |  4 ++++
 module/os/linux/zfs/zpl_file_range.c              |  5 +++++
 tests/zfs-tests/include/libtest.shlib             | 15 +++++++++++++++
 tests/zfs-tests/include/tunables.cfg              |  1 +
 .../tests/functional/block_cloning/cleanup.ksh    |  4 ++++
 .../tests/functional/block_cloning/setup.ksh      |  5 +++++
 11 files changed, 51 insertions(+)
 diff --git a/include/os/freebsd/zfs/sys/zfs_vfsops_os.h b/include/os/freebsd/zfs/sys/zfs_vfsops_os.h
 index 24bb03575..56a0ac96a 100644
 --- a/include/os/freebsd/zfs/sys/zfs_vfsops_os.h
 +++ b/include/os/freebsd/zfs/sys/zfs_vfsops_os.h
@@ -286,6 +286,7 @@ typedef struct zfid_long {
 extern uint_t zfs_fsyncer_key;
 extern int zfs_super_owner;
 +extern int zfs_bclone_enabled;
 extern void zfs_init(void);
 extern void zfs_fini(void);
 diff --git a/include/os/linux/zfs/sys/zfs_vfsops_os.h b/include/os/linux/zfs/sys/zfs_vfsops_os.h
 index b4d5db21f..220466550 100644
 --- a/include/os/linux/zfs/sys/zfs_vfsops_os.h
 +++ b/include/os/linux/zfs/sys/zfs_vfsops_os.h
@@ -45,6 +45,8 @@ extern "C" {
 typedef struct zfsvfs zfsvfs_t;
 struct znode;
 +extern int zfs_bclone_enabled;
 +
 /*
  * This structure emulates the vfs_t from other platforms.  It's purpose
  * is to facilitate the handling of mount options and minimize structural
 diff --git a/man/man4/zfs.4 b/man/man4/zfs.4
 index cfadd79d8..32f1765a5 100644
 --- a/man/man4/zfs.4
 +++ b/man/man4/zfs.4
@@ -1137,6 +1137,11 @@ Selecting any option other than
 results in vector instructions
 from the respective CPU instruction set being used.
 .
 +.It Sy zfs_bclone_enabled Ns = Ns Sy 1 Ns | Ns 0 Pq int
 +Enable the experimental block cloning feature.
 +If this setting is 0, then even if feature@block_cloning is enabled,
 +attempts to clone blocks will act as though the feature is disabled.
 +.
 .It Sy zfs_blake3_impl Ns = Ns Sy fastest Pq string
 Select a BLAKE3 implementation.
 .Pp
 diff --git a/module/os/freebsd/zfs/zfs_vfsops.c b/module/os/freebsd/zfs/zfs_vfsops.c
 index e8b9ada13..09e18de81 100644
 --- a/module/os/freebsd/zfs/zfs_vfsops.c
 +++ b/module/os/freebsd/zfs/zfs_vfsops.c
@@ -89,6 +89,10 @@ int zfs_debug_level;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, debug, CTLFLAG_RWTUN, &zfs_debug_level, 0,
 	"Debug level");
 +int zfs_bclone_enabled = 1;
 +SYSCTL_INT(_vfs_zfs, OID_AUTO, bclone_enabled, CTLFLAG_RWTUN,
 +	&zfs_bclone_enabled, 0, "Enable block cloning");
 +
 struct zfs_jailparam {
 	int mount_snapshot;
 };
 diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c
 index c498a1328..f672deed3 100644
 --- a/module/os/freebsd/zfs/zfs_vnops_os.c
 +++ b/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -6243,6 +6243,11 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap)
 	int error;
 	uint64_t len = *ap->a_lenp;
 +	if (!zfs_bclone_enabled) {
 +		mp = NULL;
 +		goto bad_write_fallback;
 +	}
 +
 	/*
 	 * TODO: If offset/length is not aligned to recordsize, use
 	 * vn_generic_copy_file_range() on this fragment.
 diff --git a/module/os/linux/zfs/zfs_vnops_os.c b/module/os/linux/zfs/zfs_vnops_os.c
 index 33baac9db..76fac3a02 100644
 --- a/module/os/linux/zfs/zfs_vnops_os.c
 +++ b/module/os/linux/zfs/zfs_vnops_os.c
@@ -4229,4 +4229,8 @@ EXPORT_SYMBOL(zfs_map);
 module_param(zfs_delete_blocks, ulong, 0644);
 MODULE_PARM_DESC(zfs_delete_blocks, "Delete files larger than N blocks async");
 +/* CSTYLED */
 +module_param(zfs_bclone_enabled, uint, 0644);
 +MODULE_PARM_DESC(zfs_bclone_enabled, "Enable block cloning");
 +
 #endif
 diff --git a/module/os/linux/zfs/zpl_file_range.c b/module/os/linux/zfs/zpl_file_range.c
 index c47fe99da..73476ff40 100644
 --- a/module/os/linux/zfs/zpl_file_range.c
 +++ b/module/os/linux/zfs/zpl_file_range.c
@@ -31,6 +31,8 @@
 #include <sys/zfs_vnops.h>
 #include <sys/zfeature.h>
 +int zfs_bclone_enabled = 1;
 +
 /*
  * Clone part of a file via block cloning.
  *
@@ -50,6 +52,9 @@ __zpl_clone_file_range(struct file *src_file, loff_t src_off,
 	fstrans_cookie_t cookie;
 	int err;
 +	if (!zfs_bclone_enabled)
 +		return (-EOPNOTSUPP);
 +
 	if (!spa_feature_is_enabled(
 	    dmu_objset_spa(ITOZSB(dst_i)->z_os), SPA_FEATURE_BLOCK_CLONING))
 		return (-EOPNOTSUPP);
 diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib
 index 844caa17d..d5d7bb6c8 100644
 --- a/tests/zfs-tests/include/libtest.shlib
 +++ b/tests/zfs-tests/include/libtest.shlib
@@ -3334,6 +3334,21 @@ function set_tunable_impl
 	esac
 }
 +function save_tunable
 +{
 +	[[ ! -d $TEST_BASE_DIR ]] && return 1
 +	[[ -e $TEST_BASE_DIR/tunable-$1 ]] && return 2
 +	echo "$(get_tunable """$1""")" > "$TEST_BASE_DIR"/tunable-"$1"
 +}
 +
 +function restore_tunable
 +{
 +	[[ ! -e $TEST_BASE_DIR/tunable-$1 ]] && return 1
 +	val="$(cat $TEST_BASE_DIR/tunable-"""$1""")"
 +	set_tunable64 "$1" "$val"
 +	rm $TEST_BASE_DIR/tunable-$1
 +}
 +
 #
 # Get a global system tunable
 #
 diff --git a/tests/zfs-tests/include/tunables.cfg b/tests/zfs-tests/include/tunables.cfg
 index 80e7bcb3b..a0edad14d 100644
 --- a/tests/zfs-tests/include/tunables.cfg
 +++ b/tests/zfs-tests/include/tunables.cfg
@@ -90,6 +90,7 @@ VOL_INHIBIT_DEV			UNSUPPORTED			zvol_inhibit_dev
 VOL_MODE			vol.mode			zvol_volmode
 VOL_RECURSIVE			vol.recursive			UNSUPPORTED
 VOL_USE_BLK_MQ			UNSUPPORTED			zvol_use_blk_mq
 +BCLONE_ENABLED			zfs_bclone_enabled		zfs_bclone_enabled
 XATTR_COMPAT			xattr_compat			zfs_xattr_compat
 ZEVENT_LEN_MAX			zevent.len_max			zfs_zevent_len_max
 ZEVENT_RETAIN_MAX		zevent.retain_max		zfs_zevent_retain_max
 diff --git a/tests/zfs-tests/tests/functional/block_cloning/cleanup.ksh b/tests/zfs-tests/tests/functional/block_cloning/cleanup.ksh
 index 7ac13adb6..b985445a5 100755
 --- a/tests/zfs-tests/tests/functional/block_cloning/cleanup.ksh
 +++ b/tests/zfs-tests/tests/functional/block_cloning/cleanup.ksh
@@ -31,4 +31,8 @@ verify_runnable "global"
 default_cleanup_noexit
 +if tunable_exists BCLONE_ENABLED ; then
 +	log_must restore_tunable BCLONE_ENABLED
 +fi
 +
 log_pass
 diff --git a/tests/zfs-tests/tests/functional/block_cloning/setup.ksh b/tests/zfs-tests/tests/functional/block_cloning/setup.ksh
 index 512f5a064..58441bf8f 100755
 --- a/tests/zfs-tests/tests/functional/block_cloning/setup.ksh
 +++ b/tests/zfs-tests/tests/functional/block_cloning/setup.ksh
@@ -33,4 +33,9 @@ fi
 verify_runnable "global"
 +if tunable_exists BCLONE_ENABLED ; then
 +    log_must save_tunable BCLONE_ENABLED
 +    log_must set_tunable32 BCLONE_ENABLED 1
 +fi
 +
 log_pass
@@ -1,42 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Thu, 16 Nov 2023 11:42:19 -0800
 Subject: [PATCH] zfs-2.2.1: Disable block cloning by default
 Disable block cloning by default to mitigate possible data corruption
 (see #15529 and #15526).
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 (cherry picked from commit 479dca51c66a731e637bd2d4f9bba01a05f9ac9f)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 module/os/freebsd/zfs/zfs_vfsops.c   | 2 +-
 module/os/linux/zfs/zpl_file_range.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 diff --git a/module/os/freebsd/zfs/zfs_vfsops.c b/module/os/freebsd/zfs/zfs_vfsops.c
 index 09e18de81..0ac670ed9 100644
 --- a/module/os/freebsd/zfs/zfs_vfsops.c
 +++ b/module/os/freebsd/zfs/zfs_vfsops.c
@@ -89,7 +89,7 @@ int zfs_debug_level;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, debug, CTLFLAG_RWTUN, &zfs_debug_level, 0,
 	"Debug level");
 -int zfs_bclone_enabled = 1;
 +int zfs_bclone_enabled = 0;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, bclone_enabled, CTLFLAG_RWTUN,
 	&zfs_bclone_enabled, 0, "Enable block cloning");
 diff --git a/module/os/linux/zfs/zpl_file_range.c b/module/os/linux/zfs/zpl_file_range.c
 index 73476ff40..139c51cf4 100644
 --- a/module/os/linux/zfs/zpl_file_range.c
 +++ b/module/os/linux/zfs/zpl_file_range.c
@@ -31,7 +31,7 @@
 #include <sys/zfs_vnops.h>
 #include <sys/zfeature.h>
 -int zfs_bclone_enabled = 1;
 +int zfs_bclone_enabled = 0;
 /*
  * Clone part of a file via block cloning.
@@ -1,17 +0,0 @@
 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-Add-systemd-unit-for-importing-specific-pools.patch
 0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
 0009-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
 0010-zvol-Remove-broken-blk-mq-optimization.patch
 0011-Revert-zvol-Temporally-disable-blk-mq.patch
 0012-Fix-nfs_truncate_shares-without-etc-exports.d.patch
 0013-Workaround-UBSAN-errors-for-variable-arrays.patch
 0014-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
 0015-Fix-block-cloning-between-unencrypted-and-encrypted-.patch
 0016-Add-a-tunable-to-disable-BRT-support.patch
 0017-zfs-2.2.1-Disable-block-cloning-by-default.patch
@@ -1 +0,0 @@
 usr/lib/python3*
@@ -1,119 +0,0 @@
 #!/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
 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'
 	# 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'
 override_dh_python3:
 	dh_python3 -p python3-pyzfs
 override_dh_makeshlibs:
 	dh_makeshlibs -a -V
 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
@@ -1 +0,0 @@
 3.0 (quilt)
@@ -1,8 +0,0 @@
 for x in $(cat /proc/cmdline)
 do
 	case $x in
 		root=ZFS=*)
 			BOOT=zfs
 			;;
 	esac
 done
@@ -1,67 +0,0 @@
 #!/bin/sh
 #
 # Add udev rules for ZoL to the initrd.
 #
 PREREQ="udev"
 PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules"
 COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id"
 # Generic result code.
 RC=0
 case $1 in
 prereqs)
 	echo "$PREREQ"
 	exit 0
 	;;
 esac
 for ii in $COPY_EXEC_LIST
 do
 	if [ ! -x "$ii" ]
 	then
 		echo "Error: $ii is not executable."
 		RC=2
 	fi
 done
 if [ "$RC" -ne 0 ]
 then
 	exit "$RC"
 fi
 . /usr/share/initramfs-tools/hook-functions
 mkdir -p "$DESTDIR/lib/udev/rules.d/"
 for ii in $PREREQ_UDEV_RULES
 do
 	if [ -e "/etc/udev/rules.d/$ii" ]
 	then
 		cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
 	elif [ -e "/lib/udev/rules.d/$ii" ]
 	then
 		cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
 	else
 		echo "Error: Missing udev rule: $ii"
 		echo "       This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory."
 		exit 1
 	fi
 done
 for ii in $COPY_EXEC_LIST
 do
 	copy_exec "$ii"
 done
 if [ -f '/etc/default/zfs' -a -r '/etc/default/zfs' ]
 then
 	mkdir -p "$DESTDIR/etc/default"
 	cp -a '/etc/default/zfs' "$DESTDIR/etc/default/"
 fi
 if [ -d '/etc/zfs' -a -r '/etc/zfs' ]
 then
 	mkdir -p "$DESTDIR/etc"
 	cp -a '/etc/zfs' "$DESTDIR/etc/"
 fi
@@ -1,18 +0,0 @@
 ## Allow read-only ZoL commands to be called through sudo
 ## without a password. Remove the first '#' column to enable.
 ##
 ## CAUTION: Any syntax error introduced here will break sudo.
 ##
 ## Cmnd alias specification
 #Cmnd_Alias C_ZFS = \
 #  /sbin/zfs "", /sbin/zfs help *, \
 #  /sbin/zfs get, /sbin/zfs get *, \
 #  /sbin/zfs list, /sbin/zfs list *, \
 #  /sbin/zpool "", /sbin/zpool help *, \
 #  /sbin/zpool iostat, /sbin/zpool iostat *, \
 #  /sbin/zpool list, /sbin/zpool list *, \
 #  /sbin/zpool status, /sbin/zpool status *, \
 #  /sbin/zpool upgrade, /sbin/zpool upgrade -v
 #
 ## allow any user to use basic read-only ZFS commands
 #ALL ALL = (root) NOPASSWD: C_ZFS
@@ -1,14 +0,0 @@
 #!/bin/sh
 # Sub-test to exclude ZVOLs
 set -e
 partition="$1"
 . /usr/share/os-prober/common.sh
 if [ "$(stat -L -c %t "$partition")" = "e6" ] ; then
 	debug "$1 is a ZVOL; skipping"
 	exit 0
 fi
 # No ZVOLs found
 exit 1
@@ -1,45 +0,0 @@
 #!/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
@@ -1,69 +0,0 @@
 #!/bin/sh -u
 # 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
 }
 trim_if_not_already_trimming () {
 	pool="$1"
 	if ! zpool status "${pool}" | grep -q "trimming"; then
 		# This will error on HDD-only pools: doesn't matter
 		zpool trim "${pool}"
 	fi
 }
 # Walk up the kernel parent names:
 # this will catch devices from LVM &a.
 get_transp () {
 	dev="$1"
 	while pd="$(lsblk -dnr -o PKNAME "$dev")"; do
 		if [ -z "$pd" ]; then
 			break
 		else
 			dev="/dev/$pd"
 		fi
 	done
 	lsblk -dnr -o TRAN "$dev"
 }
 pool_is_nvme_only () {
 	pool="$1"
 	# get a list of devices attached to the specified pool
 	zpool list -vHP "${pool}" | \
 		awk -F'\t' '$2 ~ "^/dev/" {print $2}' | \
 	while read -r dev
 	do
 		[ "$(get_transp "$dev")" = "nvme" ] || return
 	done
 }
 # TRIM all healthy pools that are not already trimming as per their configs.
 zpool list -H -o health,name 2>&1 | \
 	awk -F'\t' '$1 == "ONLINE" {print $2}' | \
 while read -r pool
 do
 	# read user-defined config
 	ret=$(get_property "${pool}") || continue
 	case "${ret}" in
 		disable);;
 		enable)	trim_if_not_already_trimming "${pool}" ;;
 		-|auto)	if pool_is_nvme_only "${pool}"; then trim_if_not_already_trimming "${pool}"; fi ;;
 		*)	cat > /dev/stderr <<EOF
 $0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
 $0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
 EOF
 	esac
 done
@@ -1,2 +0,0 @@
 version=3
 https://zfsonlinux.org/ .*zfs-([\d\.]+)\.tar\.gz$
@@ -1,2 +0,0 @@
 usr/lib/dracut
 usr/share/man/man7/dracut.zfs.7
@@ -1,2 +0,0 @@
 ../tree/zfs-initramfs/* /
 usr/share/initramfs-tools/*
@@ -1 +0,0 @@
 executable-not-elf-or-script *usr/share/initramfs-tools/scripts/zfs*
@@ -1,15 +0,0 @@
 sbin/zinject
 sbin/ztest
 usr/bin/raidz_test
 usr/share/man/man1/raidz_test.1
 usr/share/man/man1/test-runner.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/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
@@ -1,10 +0,0 @@
 arch-dependent-file-in-usr-share
 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/*
 package-contains-documentation-outside-usr-share-doc *usr/share/zfs/zfs-tests/*
 script-not-executable [usr/share/zfs/common.sh]
 script-not-executable [usr/share/zfs/zfs-tests/include/default.cfg]
 script-not-executable [usr/share/zfs/zfs-tests/tests/functional/*]
@@ -1,5 +0,0 @@
 etc/zfs/zed.d/*
 lib/systemd/system/zfs-zed.service
 usr/lib/zfs-linux/zed.d/*
 usr/sbin/zed
 usr/share/man/man8/zed.8
@@ -1,4 +0,0 @@
 script-not-executable
 # https://github.com/zfsonlinux/zfs/issues/8064
 systemd-service-file-refers-to-unusual-wantedby-target
@@ -1,20 +0,0 @@
 #!/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#
@@ -1,17 +0,0 @@
 #!/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#
@@ -1,16 +0,0 @@
 #!/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#
@@ -1,7 +0,0 @@
 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
@@ -1,2 +0,0 @@
 COPYRIGHT
 LICENSE
@@ -1,5 +0,0 @@
 etc/zfs/vdev_id.conf.alias.example
 etc/zfs/vdev_id.conf.multipath.example
 etc/zfs/vdev_id.conf.sas_direct.example
 etc/zfs/vdev_id.conf.sas_switch.example
 etc/zfs/vdev_id.conf.scsi.example
@@ -1,135 +0,0 @@
 ../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-load-key.service
 lib/systemd/system/zfs-mount.service
 lib/systemd/system/zfs-scrub-monthly@.timer
 lib/systemd/system/zfs-scrub-weekly@.timer
 lib/systemd/system/zfs-scrub@.service
 lib/systemd/system/zfs-share.service
 lib/systemd/system/zfs-trim-monthly@.timer
 lib/systemd/system/zfs-trim-weekly@.timer
 lib/systemd/system/zfs-trim@.service
 lib/systemd/system/zfs-volume-wait.service
 lib/systemd/system/zfs-volumes.target
 lib/systemd/system/zfs.target
 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/bin/zilstat
 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/vdevprops.7
 usr/share/man/man7/zfsconcepts.7
 usr/share/man/man7/zfsprops.7
 usr/share/man/man7/zpoolconcepts.7
 usr/share/man/man7/zpoolprops.7
 usr/share/man/man7/zpool-features.7
 usr/share/man/man8/fsck.zfs.8
 usr/share/man/man8/mount.zfs.8
 usr/share/man/man8/vdev_id.8
 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-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-unload-key.8
 usr/share/man/man8/zfs-unmount.8
 usr/share/man/man8/zfs-unzone.8
 usr/share/man/man8/zfs-upgrade.8
 usr/share/man/man8/zfs-userspace.8
 usr/share/man/man8/zfs-wait.8
 usr/share/man/man8/zfs.8
 usr/share/man/man8/zfs_ids_to_path.8
 usr/share/man/man8/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/zfs-zone.8
 usr/share/man/man8/zpool.8
 usr/share/man/man8/zstream.8
 usr/share/man/man8/zstreamdump.8
 usr/share/zfs/compatibility.d/
@@ -1,3 +0,0 @@
 sbin/zfs      bin/zfs
 sbin/zpool    bin/zpool
 usr/lib/zfs-linux/zpool_influxdb  bin/zpool_influxdb
@@ -1,13 +0,0 @@
 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*
@@ -1,19 +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 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#
@@ -0,0 +1,61 @@
 spl-linux (0.6.5.7-5~bpo70) unstable; urgency=low
  * rebuild using wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 15:41:00 +0200
 spl-linux (0.6.5.7-4~bpo70) unstable; urgency=low
  * update pkg-spl to spl-0.6.5.7-3-wheezy
  * change versioning scheme to allow upgrades from PVE 3.4 to PVE 4.2
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 13:45:00 +0200
 spl-linux (0.6.5-3~wheezy) unstable; urgency=low
  * update to 0.6.5.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 11:32:38 +0200
 spl-linux (0.6.5-2~wheezy) unstable; urgency=low
  * update to 0.6.5.4
 -- Proxmox Support Team <support@proxmox.com>  Sun, 17 Jan 2016 14:44:31 +0100
 spl-linux (0.6.5-1~wheezy) unstable; urgency=low
  * update to master/debian/wheezy/0.6.5-1-wheezy
 -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 10:03:25 +0200
 spl-linux (0.6.4-4~wheezy) unstable; urgency=low
  * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 07:16:12 +0200
 spl-linux (0.6.4-3~wheezy) unstable; urgency=low
  * update to 0.6.4.1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Apr 2015 07:31:14 +0200
 spl-linux (0.6.4-2~wheezy) unstable; urgency=low
  * include original zol changelog files
 -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 07:38:02 +0200
 spl-linux (0.6.4-1~wheezy) unstable; urgency=low
  * update to 0.6.4 (keep Proxmox VE versioning schema)
 -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Apr 2015 09:32:24 +0200
 spl-linux (0.6.3-1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
@@ -0,0 +1,119 @@
 Index: new/debian/rules
 ===================================================================
 --- new.orig/debian/rules	2015-10-09 10:02:21.000000000 +0200
 +++ new/debian/rules	2015-10-09 10:12:04.000000000 +0200
@@ -22,9 +22,7 @@
 KVERS=$(shell uname -r | sed 's/-$(DEB_HOST_ARCH)//')
 endif
 -CFG_OPTS=--without-selinux \
 -	--with-linux=$(KSRC) \
 -	--with-linux-obj=$(KOBJ)
 +CFG_OPTS=--without-selinux
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 PACKAGE=spl
@@ -33,7 +31,7 @@
 KIMGVER=$(shell dpkg -s linux-image-$(KVERS)-$(DEB_HOST_ARCH) | grep ^Version | sed 's/.*: //')
 %:
 -	dh $@ --with dkms --parallel
 +	dh $@ --parallel
 override_dh_prep-base-deb-files:
 	sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g' < debian/control.in > debian/control
@@ -75,59 +73,6 @@
 	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
 	$(MAKE) distdir
 -	@# Install the DKMS source.
 -	@# We only want the files needed to build the modules
 -	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'
 -	touch '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/.nogitrelease'
 -	cp '$(CURDIR)/autogen.sh' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/'
 -	( for d in include module config; do \
 -	     rm -Rf $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/$$d; \
 -	done)
 -	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
 -	@# Hellish awk line:
 -	@#  * Deletes from configure.ac the parts not needed for building the kernel module
 -	@#     * It deletes from inside AC_CONFIG_FILES([]) everything except:
 -	@#        (Makefile$|include/|module/|*.release$)
 -	@#  * Takes care of spaces and tabs
 -	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|spl\.release([ \t]+)?$$))/){next} } {print}' \
 -		'$(CURDIR)/$(NAME)-$(VERSION)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/configure.ac'
 -	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
 -	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
 -		'$(CURDIR)/$(NAME)-$(VERSION)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
 -	@# Sanity test
 -	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
 -	@# Run autogen on the stripped source tree
 -	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh
 -	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/autom4te.cache'
 -
 -	@# This shunt allows DKMS to install the Module.symvers and spl_config.h
 -	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
 -	echo '#!/bin/sh'  >'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -	echo 'cp "$$@"'  >>'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -
 -	@# Duplicate the dkms directory for module-assistant source package
 -	install -d $(CURDIR)/debian/tmp/usr/src/modules
 -	cp -r $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION) $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)
 -	mkdir -p $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian
 -	cp debian/copyright debian/module/* \
 -	    $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/
 -	sed 's/^spl-linux /spl-modules /' debian/changelog \
 -	    > $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/changelog
 -	chmod 755 $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/rules
 -	chown -R root.src $(CURDIR)/debian/tmp
 -	find $(CURDIR)/debian/tmp/usr/src -type d | xargs chmod 755
 -	find $(CURDIR)/debian/tmp/usr/src -type f -perm -100 | xargs chmod 755
 -	find $(CURDIR)/debian/tmp/usr/src -type f -not -perm -100 | xargs chmod 644
 -	chmod 775 $(CURDIR)/debian/tmp/usr/src/modules
 -	cd $(CURDIR)/debian/tmp/usr/src && tar cf $(PACKAGE).tar modules
 -	rm -Rf $(CURDIR)/debian/tmp/usr/src/modules
 -	bzip2 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar
 -	chmod 644 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2
 -	install -d $(CURDIR)/debian/spl-modules-source/usr/src
 -	mv $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2 $(CURDIR)/debian/spl-modules-source/usr/src/
 -	rm -Rf $(CURDIR)/debian/spl-modules-source/usr/src/$(NAME)-$(VERSION)
 -
 override_dh_dkms:
 	dh_dkms -V $(VERSION)
 Index: new/debian/control.in
 ===================================================================
 --- new.orig/debian/control.in	2015-10-09 10:02:21.000000000 +0200
 +++ new/debian/control.in	2015-10-09 10:12:44.000000000 +0200
@@ -35,30 +35,6 @@
  This package provides the source to the SPL kernel module in a form
  suitable for use by module-assistant or kernel-package.
 -Package: spl-dkms
 -Architecture: all
 -Depends: linux-headers-amd64, libc6-dev, ${misc:Depends}, dkms (>> 2.1.1.2-5), lsb-release, file
 -Recommends: spl (>= ${source:Upstream-Version})
 -Provides: spl-modules
 -Conflicts: spl-modules-source
 -Replaces: spl-modules-source
 -Description: Solaris Porting Layer kernel modules 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 contains the source code for the SPL and SPLAT Linux kernel
 - modules, which can be used with DKMS, so that local kernel modules are
 - automatically built and installed every time the kernel packages are
 - upgraded.
 -
 Package: spl
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -0,0 +1 @@
 fix-control
@@ -0,0 +1,85 @@
 zfs-linux (0.6.5.7-5~bpo70) unstable; urgency=low
  * rebuild using wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 15:41:00 +0200
 zfs-linux (0.6.5.7-4~bpo70) unstable; urgency=low
  * update pkg-zfs to 0.6.5.7-8-wheezy
  * drop unneeded/non-upstream pull requests:
    - #1099: iSCSI support for ZoL
    - #1476: Change sharesmb to use REGISTRY shares for better control by user/admin
    - #2790: Rewrite of nfs.c to keep options per host separated.
    - #3238: Allow "zfs unshare <proto> -a" much like "zfs share <proto> -a" (WIP)
  * change versioning scheme to allow upgrades from PVE 3.4 to PVE 4.2
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 13:45:00 +0200
 zfs-linux (0.6.5-3~wheezy) unstable; urgency=low
  * update to 0.6.5.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 11:32:59 +0200
 zfs-linux (0.6.5-2~wheezy) unstable; urgency=low
  * update to 0.6.5.4
 -- Proxmox Support Team <support@proxmox.com>  Sun, 17 Jan 2016 14:44:55 +0100
 zfs-linux (0.6.5-1~wheezy) unstable; urgency=low
  * update to master/debian/wheezy/0.6.5.2-2-wheezy 
 -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 10:04:04 +0200
 zfs-linux (0.6.4-4~wheezy) unstable; urgency=low
  * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy)
  * use upstream version of /etc/default/zfs
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 07:17:40 +0200
 zfs-linux (0.6.4-3~wheezy) unstable; urgency=low
  * update to 0.6.4.1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Apr 2015 07:31:44 +0200
 zfs-linux (0.6.4-2~wheezy) unstable; urgency=low
  * cleanup /etc/default/zfs
  * include orignial zol changelog files
 -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 07:30:59 +0200
 zfs-linux (0.6.4-1~wheezy) unstable; urgency=low
  * update to 0.6.4
 -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Apr 2015 09:33:13 +0200
 zfs-linux (0.6.3-3~wheezy) unstable; urgency=low
  * install init.d file for zed daemon
 -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Mar 2015 14:57:30 +0100
 zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
  * use /sbin/modprobe to avoid warning inside initrd
  * fix warning about undefined values inside initrd
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
 zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
@@ -0,0 +1,143 @@
 Index: new/debian/control.in
 ===================================================================
 --- new.orig/debian/control.in	2015-10-09 10:02:40.000000000 +0200
 +++ new/debian/control.in	2015-10-09 10:15:36.000000000 +0200
@@ -104,39 +104,9 @@
  This package provides the source to the SPL kernel module in a form
  suitable for use by module-assistant or kernel-package.
 -Package: zfs-dkms
 -Architecture: all
 -Pre-Depends: spl-dkms
 -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}, file
 -Recommends: zfsutils
 -Replaces: lzfs, lzfs-dkms, zfs-modules-source
 -Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules, zfs-modules-source
 -Conflicts: lzfs, lzfs-dkms, zfs-modules-source
 -Description: Native ZFS filesystem kernel modules for Linux
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
 - checksums.
 - .
 - This DKMS package includes the SPA, DMU, ZVOL, and ZPL components of ZFS.
 -
 -Package: zfs-dracut
 -Section: utils
 -Architecture: linux-any
 -Depends: dracut,
 - zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version}),
 - zfsutils, ${misc:Depends}
 -Description: Native ZFS root filesystem capabilities for Linux
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
 - checksums.
 - .
 - This package adds ZFS to the system initramfs with a hook
 - for the dracut infrastructure.
 -
 Package: zfs-initramfs
 Architecture: linux-any
 Depends: initramfs-tools, busybox,
 - zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version}),
  zfsutils, ${misc:Depends}
 Description: Native ZFS root filesystem capabilities for Linux
  The Z file system is a pooled filesystem designed for maximum data
@@ -150,7 +120,6 @@
 Section: admin
 Architecture: linux-any
 Depends: initscripts, lsb-base, python, ${misc:Depends}, ${shlibs:Depends}
 -Recommends: zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version})
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Replaces: zfs
 Index: new/debian/rules
 ===================================================================
 --- new.orig/debian/rules	2015-10-09 10:02:40.000000000 +0200
 +++ new/debian/rules	2015-10-09 10:14:14.000000000 +0200
@@ -25,12 +25,10 @@
 endif
 ifndef SPL
 -SPLSRC=/usr/src/spl-$(VERSION)
 +SPLSRC=../pkg-spl
 endif
 -CFG_OPTS=--with-linux=$(KSRC) \
 -	 --with-linux-obj=$(KOBJ) \
 -	 --with-spl=$(SPLSRC)
 +CFG_OPTS=--with-spl=$(SPLSRC)
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 PACKAGE=zfs
@@ -83,42 +81,6 @@
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 -	@# Get a bare copy of the source code for DKMS.
 -	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree, which does not
 -	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
 -	$(MAKE) distdir
 -
 -	@# Install the DKMS source.
 -	@# We only want the files needed to build the modules
 -	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'
 -	touch '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/.nogitrelease'
 -	cp '$(CURDIR)/autogen.sh' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/'
 -	( for d in include module config; do \
 -	     rm -Rf $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/$$d; \
 -	done)
 -	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
 -	@# Hellish awk line:
 -	@#  * Deletes from configure.ac the parts not needed for building the kernel module
 -	@#     * It deletes from inside AC_CONFIG_FILES([]) everything except:
 -	@#        (Makefile$|include/|module/|*.release$)
 -	@#  * Takes care of spaces and tabs
 -	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \
 -		'$(CURDIR)/$(NAME)-$(VERSION)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/configure.ac'
 -	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
 -	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
 -		'$(CURDIR)/$(NAME)-$(VERSION)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
 -	@# Sanity test
 -	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
 -	@# Run autogen on the stripped source tree
 -	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh
 -	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/autom4te.cache'
 -
 -	@# This shunt allows DKMS to install the Module.symvers and zfs_config.h
 -	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
 -	echo '#!/bin/sh'  >'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -	echo 'cp "$$@"'  >>'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib
 	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
 		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
@@ -137,28 +99,6 @@
 	# Fix the includes according to https://github.com/zfsonlinux/zfs/issues/2903
 	./debian/fix_includes-libspl.sh
 -	@# Duplicate the dkms directory for module-assistant source package
 -	install -d $(CURDIR)/debian/tmp/usr/src/modules
 -	cp -r $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION) $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)
 -	mkdir -p $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian
 -	cp debian/copyright debian/module/* \
 -	    $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/
 -	sed 's/^zfs-linux /zfs-modules /' debian/changelog \
 -	    > $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/changelog
 -	chmod 755 $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/rules
 -	chown -R root.src $(CURDIR)/debian/tmp
 -	find $(CURDIR)/debian/tmp/usr/src -type d | xargs chmod 755
 -	find $(CURDIR)/debian/tmp/usr/src -type f -perm -100 | xargs chmod 755
 -	find $(CURDIR)/debian/tmp/usr/src -type f -not -perm -100 | xargs chmod 644
 -	chmod 775 $(CURDIR)/debian/tmp/usr/src/modules
 -	cd $(CURDIR)/debian/tmp/usr/src && tar cf $(PACKAGE).tar modules
 -	rm -Rf $(CURDIR)/debian/tmp/usr/src/modules
 -	bzip2 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar
 -	chmod 644 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2
 -	install -d $(CURDIR)/debian/zfs-modules-source/usr/src
 -	mv $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2 $(CURDIR)/debian/zfs-modules-source/usr/src/
 -	rm -Rf $(CURDIR)/debian/zfs-modules-source/usr/src/$(NAME)-$(VERSION)
 -
 override_dh_installinit:
 	@# Install systemd files
 	dh_systemd_enable -pzfsutils etc/systemd/system/zfs.target
@@ -0,0 +1,2 @@
 fix-control.patch
 skip-unneeded-pull-requests.patch
@@ -0,0 +1,21 @@
 diff --git a/debian/patches/series b/debian/patches/series
 index ffafe6c..9823273 100644
 --- a/debian/patches/series
 +++ b/debian/patches/series
@@ -1,12 +1,12 @@
 0002-Prevent-manual-builds-in-the-DKMS-source.patch
 0005-Remove-userland-dist-rules.patch
 libzfs-dependencies
 -PR1099.patch
 -PR1476.patch
 +#PR1099.patch
 +#PR1476.patch
 PR1867.patch
 PR2668.patch
 -PR2790.patch
 -PR3238.patch
 +#PR2790.patch
 +#PR3238.patch
 PR3465.patch
 PR3559.patch
 PR3560.patch
Author	SHA1	Message	Date
Fabian Grünbichler	93440c1975	bump version, update changelog	2016-06-28 15:41:47 +02:00
Fabian Grünbichler	8d4db41b48	fix make upload target	2016-06-28 15:27:06 +02:00
Fabian Grünbichler	d5aecb0120	add make deb target	2016-06-28 14:35:56 +02:00
Fabian Grünbichler	787eca93c4	update make upload target	2016-06-28 14:35:35 +02:00
Fabian Grünbichler	e2380c2a18	update source archives	2016-06-28 14:35:23 +02:00
Fabian Grünbichler	9ccb7a65af	update changelogs	2016-06-28 14:35:12 +02:00
Fabian Grünbichler	b6cafe691d	update changelogs	2016-06-28 13:51:08 +02:00
Fabian Grünbichler	6d5485395f	drop unneeded/non-upstream pull requests - #1099: iSCSI support for ZoL - #1476: Change sharesmb to use REGISTRY shares for better control by user/admin - #2790: Rewrite of nfs.c to keep options per host separated. - #3238: Allow "zfs unshare <proto> -a" much like "zfs share <proto> -a" (WIP)	2016-06-28 13:50:15 +02:00
Fabian Grünbichler	e34fbf907c	update to zfs/spl 0.6.5.7 update pkg-zfs to zfs-0.6.5.7-8-wheezy update pkg-spl to spl-0.6.5.7-3-wheezy change package versioning scheme drop cherry-pick workarounds	2016-06-28 13:49:32 +02:00
Dietmar Maurer	a96c6ce442	update to zfs/spl 0.6.5.6	2016-03-30 11:34:48 +02:00
Dietmar Maurer	a0ba3b44a3	update to 0.6.5.4	2016-01-17 15:32:47 +01:00
Dietmar Maurer	8b01c7a110	update to 0.6.5.2	2015-10-09 10:25:57 +02:00
Dietmar Maurer	69aebd7324	update to 0.6.4.2	2015-07-21 08:01:23 +02:00
Dietmar Maurer	0ca48f6b95	update to 0.6.4.1	2015-04-30 07:32:22 +02:00
Dietmar Maurer	4b9f6205df	fix typo	2015-04-14 10:20:51 +02:00
Dietmar Maurer	ead682fb07	remove DKMS settings from /etc/default/zfs	2015-04-14 08:00:31 +02:00
Dietmar Maurer	2f2b265609	fix changelogs	2015-04-14 07:56:26 +02:00
Dietmar Maurer	cefdaf9301	remove unused files	2015-04-13 08:35:28 +02:00
Dietmar Maurer	e37bd2ebdc	use packages from github	2015-04-13 08:31:33 +02:00
Dietmar Maurer	cc8c8584d9	bump version to 0.6.4-1~wheezy	2015-04-12 09:40:23 +02:00
Dietmar Maurer	532f0e92a0	update sources to 0.6.4	2015-04-12 09:27:14 +02:00
Dietmar Maurer	67f0ab4538	set RELEASE=3.4	2015-03-15 15:01:54 +01:00
Dietmar Maurer	eb1b8b66b7	bump zfs package version to 0.6.3-3	2015-03-15 14:57:38 +01:00
Dietmar Maurer	a7c83d2c0c	install init.d file for zed	2015-03-15 14:55:53 +01:00
		`@@ -1,2 +0,0 @@`
			`lib/*/security/pam_zfs_key.so`
			`usr/share/pam-configs/zfs_key`
		`@@ -1,2 +0,0 @@`
			`lib/@DEB_HOST_MULTIARCH@/libzfs.so.*`
			`lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*`
		`@@ -1 +0,0 @@`
			`lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*`
		`@@ -1,2 +0,0 @@`
			`package-name-doesnt-match-sonames`
			`extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz`
		`@@ -1,2 +0,0 @@`
			`version=3`
			`https://zfsonlinux.org/ .*zfs-([\d\.]+)\.tar\.gz$`
		`@@ -1,2 +0,0 @@`
			`usr/lib/dracut`
			`usr/share/man/man7/dracut.zfs.7`
		`@@ -1,2 +0,0 @@`
			`../tree/zfs-initramfs/* /`
			`usr/share/initramfs-tools/*`
		`@@ -1 +0,0 @@`
			`executable-not-elf-or-script usr/share/initramfs-tools/scripts/zfs`
		`@@ -0,0 +1,2 @@`
							`fix-control.patch`
							`skip-unneeded-pull-requests.patch`