bump version to 0.8.2-pve2

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

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "zfs/upstream"]
+	path = upstream
+	url = ../mirror_zfs

Makefile

@@ -1,84 +1,72 @@
-RELEASE=3.4
-
 # source form https://github.com/zfsonlinux/
 
-# also update version in 
+ZFSPKG=debian
-# zfs-changelog.Debian and spl-changelog.Debian
+ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
-ZFSVER=0.6.5.7
+ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
-ZFSPKGREL=5~bpo70
+ZFSDIR=zfs-linux_${ZFSVER}
-SPLPKGREL=5~bpo70
+ZFSSRC=upstream
-ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
-SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
-SPLDIR=pkg-spl
+ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
-SPLSRC=pkg-spl.tar.gz
+ZFS_DEB2= 					\
-ZFSDIR=pkg-zfs
+libuutil1linux_${ZFSPKGVER}_amd64.deb		\
-ZFSSRC=pkg-zfs.tar.gz
+libzfs2linux_${ZFSPKGVER}_amd64.deb		\
-
+libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-SPL_DEBS= 					\
+libzpool2linux_${ZFSPKGVER}_amd64.deb		\
-spl_${SPLPKGVER}_amd64.deb
-
-ZFS_DEBS= 					\
-libnvpair1_${ZFSPKGVER}_amd64.deb 		\
-libuutil1_${ZFSPKGVER}_amd64.deb		\
-libzfs2_${ZFSPKGVER}_amd64.deb			\
-libzfs-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool2_${ZFSPKGVER}_amd64.deb		\
 zfs-dbg_${ZFSPKGVER}_amd64.deb			\
-zfs-initramfs_${ZFSPKGVER}_amd64.deb		\
+zfs-zed_${ZFSPKGVER}_amd64.deb			\
-zfsutils_${ZFSPKGVER}_amd64.deb
+zfs-initramfs_${ZFSPKGVER}_all.deb		\
-
+zfs-test_${ZFSPKGVER}_amd64.deb		\
-DEBS=${SPL_DEBS} ${ZFS_DEBS} 
+zfsutils-linux_${ZFSPKGVER}_amd64.deb
-
+ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
-all: ${DEBS}
+ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
 
+all: deb
 .PHONY: deb
-deb: ${DEBS}
+deb: ${ZFS_DEBS}
+.PHONY: dsc
+dsc: ${ZFS_DSC}
+
+# called from pve-kernel's Makefile to get patched sources
+.PHONY: kernel
+kernel: dsc
+	dpkg-source -x ${ZFS_DSC} ../pkg-zfs
+	$(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
 
 .PHONY: dinstall
 dinstall: ${DEBS}
 	dpkg -i ${DEBS}
 
-.PHONY: spl
+.PHONY: submodule
-spl ${SPL_DEBS}: ${SPLSRC}
+submodule:
-	rm -rf ${SPLDIR}
+	test -f "$(ZFSSRC)/README.md" || git submodule update --init
-	tar xf ${SPLSRC}
+$(ZFSSRC)/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 ${ZFS_DEBS}: ${ZFSSRC}
+zfs: $(ZFS_DEBS)
-	rm -rf ${ZFSDIR}
+$(ZFS_DEB2): $(ZFS_DEB1)
-	tar xf ${ZFSSRC}
+$(ZFS_DEB1): ${ZFSDIR}
-	mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org
+	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
-	cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog
+	lintian ${ZFS_DEBS}
-	cd ${ZFSDIR}; ln -s ../zfs-patches patches
+
-	cd ${ZFSDIR}; quilt push -a
+${ZFS_DSC}: ${ZFSDIR}
-	cd ${ZFSDIR}; rm -rf .pc ./patches
+	tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
-	cd ${ZFSDIR}; ./debian/rules override_dh_prep-base-deb-files
+	cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
+	lintian $@
+
+${ZFSDIR}: $(ZFSSRC)/README.md $(ZFSSRC) ${ZFSPKG}
+	rm -rf ${ZFSDIR} ${ZFSDIR}.tmp
+	cp -a ${ZFSSRC} ${ZFSDIR}.tmp
+	cp -a ${ZFSPKG} ${ZFSDIR}.tmp/debian
+	mv ${ZFSDIR}.tmp ${ZFSDIR}
 
-.PHONY: download
-download:
-	rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
-	git clone -b master/debian/wheezy/0.6.5.7-3-wheezy https://github.com/zfsonlinux/pkg-spl.git
-	git clone -b master/debian/wheezy/0.6.5.7-8-wheezy https://github.com/zfsonlinux/pkg-zfs.git
-	tar czf ${SPLSRC} pkg-spl
-	tar czf ${ZFSSRC} pkg-zfs
 
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR}
 
 .PHONY: distclean
 distclean: clean
 
-
 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --dist wheezy
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch amd64

README

@@ -2,12 +2,12 @@ Proxmox VE packaging for ZFS on Linux
 
 This is based on code from:
 
-https://github.com/zfsonlinux/pkg-spl.git
+https://salsa.debian.org/zfsonlinux-team/zfs
-https://github.com/zfsonlinux/pkg-zfs.git
+https://salsa.debian.org/zfsonlinux-team/spl
 
 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

debian/changelog

@@ -0,0 +1,746 @@
+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

debian/compat

@@ -0,0 +1 @@
+10

debian/control

@@ -0,0 +1,249 @@
+Source: zfs-linux
+Section: contrib/kernel
+Priority: optional
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Build-Depends: debhelper (>= 10~),
+               dh-python,
+               libblkid-dev,
+               libssl-dev | libssl1.0-dev,
+               libtool,
+               lsb-release,
+               python3-cffi,
+               python3-setuptools,
+               python3-sphinx,
+               python3-all-dev,
+               uuid-dev,
+               zlib1g-dev
+Standards-Version: 4.1.2
+Homepage: https://www.zfsonlinux.org/
+Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
+Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
+
+Package: libnvpair1linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libnvpair1
+Replaces: libnvpair1
+Description: Solaris name-value library for Linux
+ This library provides routines for packing and unpacking nv pairs for
+ transporting data across process boundaries, transporting between
+ kernel and userland, and possibly saving onto disk files.
+
+Package: libuutil1linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libuutil1
+Replaces: libuutil1
+Description: Solaris userland utility library for Linux
+ This library provides a variety of glue functions for ZFS on Linux:
+  * libspl: The Solaris Porting Layer userland library, which provides APIs
+    that make it possible to run Solaris user code in a Linux environment
+    with relatively minimal modification.
+  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
+    library.
+  * libefi: The Extensible Firmware Interface library for GUID disk
+    partitioning.
+  * libshare: NFS, SMB, and iSCSI service integration for ZFS.
+
+Package: libzfslinux-dev
+Section: contrib/libdevel
+Architecture: linux-any
+Depends: libnvpair1linux (= ${binary:Version}),
+         libuutil1linux (= ${binary:Version}),
+         libzfs2linux (= ${binary:Version}),
+         libzpool2linux (= ${binary:Version}),
+         ${misc:Depends}
+Provides: libnvpair-dev, libuutil-dev
+Description: OpenZFS filesystem development files for Linux
+ Header files and static libraries for compiling software against
+ libraries of OpenZFS filesystem.
+ .
+ This package includes the development files of libnvpair1, libuutil1,
+ libzpool2 and libzfs2.
+
+Package: libzfs2linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libzfs2
+Replaces: libzfs2
+Description: OpenZFS filesystem library for Linux
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ The OpenZFS library provides support for managing OpenZFS filesystems.
+
+Package: libzpool2linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libzpool2
+Replaces: libzpool2
+Description: OpenZFS pool library for Linux
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This zpool library provides support for managing zpools.
+
+Package: python3-pyzfs
+Section: contrib/python
+Architecture: linux-any
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         python3-cffi,
+         zfsutils-linux (= ${binary:Version})
+Description: wrapper for libzfs_core C library
+ libzfs_core is intended to be a stable interface for programmatic
+ administration of ZFS. This wrapper provides one-to-one wrappers for
+ libzfs_core API functions, but the signatures and types are more natural to
+ Python.
+ .
+ nvlists are wrapped as dictionaries or lists depending on their usage.
+ Some parameters have default values depending on typical use for
+ increased convenience. Enumerations and bit flags become strings and lists
+ of strings in Python. Errors are reported as exceptions rather than integer
+ errno-style error codes.  The wrapper takes care to provide one-to-many
+ mapping of the error codes to the exceptions by interpreting a context
+ in which the error code is produced.
+
+Package: pyzfs-doc
+Section: contrib/doc
+Architecture: all
+Depends:
+ ${sphinxdoc:Depends},
+ ${misc:Depends}
+Recommends:
+ python3-pyzfs
+Description: wrapper for libzfs_core C library (documentation)
+ libzfs_core is intended to be a stable interface for programmatic
+ administration of ZFS. This wrapper provides one-to-one wrappers for
+ libzfs_core API functions, but the signatures and types are more natural to
+ Python.
+ .
+ nvlists are wrapped as dictionaries or lists depending on their usage.
+ Some parameters have default values depending on typical use for
+ increased convenience. Enumerations and bit flags become strings and lists
+ of strings in Python. Errors are reported as exceptions rather than integer
+ errno-style error codes.  The wrapper takes care to provide one-to-many
+ mapping of the error codes to the exceptions by interpreting a context
+ in which the error code is produced.
+ .
+ This package contains the documentation.
+
+Package: zfs-initramfs
+Architecture: all
+Depends: busybox-initramfs | busybox-static | busybox,
+         initramfs-tools,
+         zfsutils-linux (>= ${binary:Version}),
+         ${misc:Depends}
+Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
+Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
+Description: OpenZFS root filesystem capabilities for Linux - initramfs
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package adds OpenZFS to the system initramfs with a hook
+ for the initramfs-tools infrastructure.
+
+Package: zfsutils-linux
+Section: contrib/admin
+Architecture: linux-any
+Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Recommends: lsb-base, zfs-zed
+Suggests: nfs-kernel-server,
+          samba-common-bin (>= 3.0.23),
+          zfs-initramfs
+Conflicts: zfs, zfs-fuse
+Provides: zfsutils
+Description: command-line tools to manage OpenZFS filesystems
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package provides the zfs and zpool commands to create and administer
+ OpenZFS filesystems.
+
+Package: zfs-zed
+Section: contrib/admin
+Architecture: linux-any
+Depends: zfsutils-linux (>= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: OpenZFS Event Daemon
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package provides the OpenZFS Event Daemon (zed).
+
+Package: zfs-test
+Section: contrib/admin
+Architecture: linux-any
+Depends: acl,
+         bc,
+         fio,
+         ksh,
+         lsscsi,
+         mdadm,
+         parted,
+         python3,
+         python3-pyzfs,
+         sudo,
+         sysstat,
+         zfsutils-linux (>=${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: zfsutils-linux (<= 0.7.9-2)
+Replaces: zfsutils-linux (<= 0.7.9-2)
+Conflicts: zutils
+Description: OpenZFS test infrastructure an support scripts
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package provides the OpenZFS test infrastructure for destructively
+ testing and validating a system using OpenZFS. It is entirely optional
+ and should only be installed and used in test environments.
+
+Package: zfs-dbg
+Section: contrib/debug
+Priority: optional
+Architecture: linux-any
+Depends: libnvpair1linux (= ${binary:Version}),
+         libuutil1linux (= ${binary:Version}),
+         libzfs2linux (= ${binary:Version}),
+         libzpool2linux (= ${binary:Version}),
+         zfs-zed (= ${binary:Version}),
+         zfsutils-linux (= ${binary:Version}),
+         ${misc:Depends}
+Description: Debugging symbols for OpenZFS userland libraries and tools
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package contains the debugging symbols for libzpool2linux, libzfs2linux,
+ libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
+
+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.

debian/libnvpair1linux.docs

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

debian/libnvpair1linux.install

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

debian/libnvpair1linux.lintian-overrides

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

debian/libuutil1linux.docs

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

debian/libuutil1linux.install

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

debian/libuutil1linux.lintian-overrides

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

debian/libzfs2linux.docs

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

debian/libzfs2linux.install

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

debian/libzfs2linux.lintian-overrides

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

debian/libzfslinux-dev.docs

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

debian/libzfslinux-dev.install

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

debian/libzpool2linux.docs

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

debian/libzpool2linux.install

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

debian/libzpool2linux.lintian-overrides

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

debian/not-installed

@@ -0,0 +1,11 @@
+usr/share/zfs/enum-extract.pl
+usr/share/zfs/zfs-helpers.sh
+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

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

@@ -0,0 +1,70 @@
+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 aa0fc1420..f525e2010 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}|cut -f3- -d'-'|sed 's/-/_/g')

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

@@ -0,0 +1,29 @@
+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.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf.in
+index 44e1bb3ed..7509b03cb 100644
+--- a/etc/modules-load.d/zfs.conf.in
++++ b/etc/modules-load.d/zfs.conf.in
+@@ -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

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

@@ -0,0 +1,27 @@
+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 f4313625e..444e776fd 100644
+--- a/etc/systemd/system/zfs-zed.service.in
++++ b/etc/systemd/system/zfs-zed.service.in
+@@ -3,7 +3,7 @@ Description=ZFS Event Daemon (zed)
+ Documentation=man:zed(8)
+ 
+ [Service]
+-ExecStart=@sbindir@/zed -F
++ExecStart=/usr/sbin/zed -F
+ Restart=on-abort
+ 
+ [Install]

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

@@ -0,0 +1,28 @@
+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 4aae9f06e..ec5c45e63 100644
+--- a/etc/systemd/system/zfs-import-scan.service.in
++++ b/etc/systemd/system/zfs-import-scan.service.in
+@@ -11,7 +11,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none
++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
+ 
+ [Install]
+ WantedBy=zfs-import.target

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

@@ -0,0 +1,36 @@
+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 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
+index 0ef706849..50632bfcb 100644
+--- a/cmd/zed/zed.d/zed.rc
++++ b/cmd/zed/zed.d/zed.rc
+@@ -15,7 +15,7 @@
+ # Email will only be sent if ZED_EMAIL_ADDR is defined.
+ # Disabled by default; uncomment to enable.
+ #
+-#ZED_EMAIL_ADDR="root"
++ZED_EMAIL_ADDR="root"
+ 
+ ##
+ # Name or path of executable responsible for sending notifications via email;
+@@ -41,7 +41,7 @@
+ ##
+ # Minimum number of seconds between notifications for a similar event.
+ #
+-#ZED_NOTIFY_INTERVAL_SECS=3600
++ZED_NOTIFY_INTERVAL_SECS=3600
+ 
+ ##
+ # Notification verbosity.

debian/patches/0008-Linux-4.14-4.19-5.0-compat-SIMD-save-restore.patch

@@ -0,0 +1,333 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Thu, 3 Oct 2019 00:03:20 +0000
+Subject: [PATCH] Linux 4.14, 4.19, 5.0+ compat: SIMD save/restore
+
+Contrary to initial testing we cannot rely on these kernels to
+invalidate the per-cpu FPU state and restore the FPU registers.
+Therefore, the kfpu_begin() and kfpu_end() functions have been
+updated to unconditionally save and restore the FPU state.
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Issue #9346
+(cherry picked from commit 813fd014a90229127f80b970a8fef5049fd4c713)
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ config/kernel-fpu.m4     |  82 +++++++++++----------
+ include/linux/simd_x86.h | 152 ++++++++++++++++++++++++++++-----------
+ 2 files changed, 155 insertions(+), 79 deletions(-)
+
+diff --git a/config/kernel-fpu.m4 b/config/kernel-fpu.m4
+index a2c47d65a..9ed9b14ad 100644
+--- a/config/kernel-fpu.m4
++++ b/config/kernel-fpu.m4
+@@ -2,15 +2,9 @@ dnl #
+ dnl # Handle differences in kernel FPU code.
+ dnl #
+ dnl # Kernel
+-dnl # 5.2:	The fpu->initialized flag was replaced by TIF_NEED_FPU_LOAD.
+-dnl #		HAVE_KERNEL_TIF_NEED_FPU_LOAD
+-dnl #
+-dnl # 5.0:	As an optimization SIMD operations performed by kernel
+-dnl #		threads can skip saving and restoring their FPU context.
+-dnl #		Wrappers have been introduced to determine the running
+-dnl #		context and use either the SIMD or generic implementation.
++dnl # 5.0:	Wrappers have been introduced to save/restore the FPU state.
+ dnl #		This change was made to the 4.19.38 and 4.14.120 LTS kernels.
+-dnl #		HAVE_KERNEL_FPU_INITIALIZED
++dnl #		HAVE_KERNEL_FPU_INTERNAL
+ dnl #
+ dnl # 4.2:	Use __kernel_fpu_{begin,end}()
+ dnl #		HAVE_UNDERSCORE_KERNEL_FPU & KERNEL_EXPORTS_X86_FPU
+@@ -61,22 +55,47 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
+ 		__kernel_fpu_end();
+ 	], [], [$ZFS_META_LICENSE])
+ 
+-	ZFS_LINUX_TEST_SRC([fpu_initialized], [
+-		#include <linux/module.h>
++	ZFS_LINUX_TEST_SRC([fpu_internal], [
++		#if defined(__x86_64) || defined(__x86_64__) || \
++		    defined(__i386) || defined(__i386__)
++		#if !defined(__x86)
++		#define __x86
++		#endif
++		#endif
++
++		#if !defined(__x86)
++		#error Unsupported architecture
++		#endif
++
+ 		#include <linux/sched.h>
+-	],[
+-		struct fpu *fpu = &current->thread.fpu;
+-		if (fpu->initialized) { return (0); };
+-	])
+ 
+-	ZFS_LINUX_TEST_SRC([tif_need_fpu_load], [
+-		#include <linux/module.h>
+-		#include <asm/thread_info.h>
++		#if !defined(PF_KTHREAD)
++		#error PF_KTHREAD not defined
++		#endif
+ 
+-		#if !defined(TIF_NEED_FPU_LOAD)
+-		#error "TIF_NEED_FPU_LOAD undefined"
++		#ifdef HAVE_KERNEL_FPU_API_HEADER
++		#include <asm/fpu/api.h>
++		#include <asm/fpu/internal.h>
++		#else
++		#include <asm/i387.h>
++		#include <asm/xcr.h>
++		#endif
++
++		#if !defined(XSTATE_XSAVE)
++		#error XSTATE_XSAVE not defined
++		#endif
++
++		#if !defined(XSTATE_XRESTORE)
++		#error XSTATE_XRESTORE not defined
+ 		#endif
+-	],[])
++	],[
++		struct fpu *fpu = &current->thread.fpu;
++		union fpregs_state *st = &fpu->state;
++		struct fregs_state *fr __attribute__ ((unused)) = &st->fsave;
++		struct fxregs_state *fxr __attribute__ ((unused)) = &st->fxsave;
++		struct xregs_state *xr __attribute__ ((unused)) = &st->xsave;
++		fpu->last_cpu = -1;
++	])
+ ])
+ 
+ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
+@@ -104,25 +123,12 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
+ 			AC_DEFINE(KERNEL_EXPORTS_X86_FPU, 1,
+ 			    [kernel exports FPU functions])
+ 		],[
+-			dnl #
+-			dnl # Linux 5.0 kernel
+-			dnl #
+-			ZFS_LINUX_TEST_RESULT([fpu_initialized], [
+-				AC_MSG_RESULT(fpu.initialized)
+-				AC_DEFINE(HAVE_KERNEL_FPU_INITIALIZED, 1,
+-				    [kernel fpu.initialized exists])
++			ZFS_LINUX_TEST_RESULT([fpu_internal], [
++				AC_MSG_RESULT(internal)
++				AC_DEFINE(HAVE_KERNEL_FPU_INTERNAL, 1,
++				    [kernel fpu internal])
+ 			],[
+-				dnl #
+-				dnl # Linux 5.2 kernel
+-				dnl #
+-				ZFS_LINUX_TEST_RESULT([tif_need_fpu_load], [
+-					AC_MSG_RESULT(TIF_NEED_FPU_LOAD)
+-					AC_DEFINE(
+-					    HAVE_KERNEL_TIF_NEED_FPU_LOAD, 1,
+-					    [kernel TIF_NEED_FPU_LOAD exists])
+-				],[
+-					AC_MSG_RESULT(unavailable)
+-				])
++				AC_MSG_RESULT(unavailable)
+ 			])
+ 		])
+ 	])
+diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h
+index 641f43955..d1ded3af2 100644
+--- a/include/linux/simd_x86.h
++++ b/include/linux/simd_x86.h
+@@ -126,38 +126,68 @@
+ #endif
+ 
+ #else /* defined(KERNEL_EXPORTS_X86_FPU) */
++
+ /*
+  * When the kernel_fpu_* symbols are unavailable then provide our own
+  * versions which allow the FPU to be safely used in kernel threads.
+  * In practice, this is not a significant restriction for ZFS since the
+  * vast majority of SIMD operations are performed by the IO pipeline.
+  */
++#if defined(HAVE_KERNEL_FPU_INTERNAL)
+ 
+ /*
+- * Returns non-zero if FPU operations are allowed in the current context.
++ * FPU usage only allowed in dedicated kernel threads.
+  */
+-#if defined(HAVE_KERNEL_TIF_NEED_FPU_LOAD)
+-#define	kfpu_allowed()		((current->flags & PF_KTHREAD) && \
+-				test_thread_flag(TIF_NEED_FPU_LOAD))
+-#elif defined(HAVE_KERNEL_FPU_INITIALIZED)
+-#define	kfpu_allowed()		((current->flags & PF_KTHREAD) && \
+-				current->thread.fpu.initialized)
+-#else
+-#define	kfpu_allowed()		0
+-#endif
++#define	kfpu_allowed()		(current->flags & PF_KTHREAD)
++#define	ex_handler_fprestore	ex_handler_default
++
++/*
++ * FPU save and restore instructions.
++ */
++#define	__asm			__asm__ __volatile__
++#define	kfpu_fxsave(addr)	__asm("fxsave %0" : "=m" (*(addr)))
++#define	kfpu_fxsaveq(addr)	__asm("fxsaveq %0" : "=m" (*(addr)))
++#define	kfpu_fnsave(addr)	__asm("fnsave %0; fwait" : "=m" (*(addr)))
++#define	kfpu_fxrstor(addr)	__asm("fxrstor %0" : : "m" (*(addr)))
++#define	kfpu_fxrstorq(addr)	__asm("fxrstorq %0" : : "m" (*(addr)))
++#define	kfpu_frstor(addr)	__asm("frstor %0" : : "m" (*(addr)))
++#define	kfpu_fxsr_clean(rval)	__asm("fnclex; emms; fildl %P[addr]" \
++				    : : [addr] "m" (rval));
+ 
+ static inline void
+ kfpu_initialize(void)
+ {
+ 	WARN_ON_ONCE(!(current->flags & PF_KTHREAD));
+ 
+-#if defined(HAVE_KERNEL_TIF_NEED_FPU_LOAD)
+-	__fpu_invalidate_fpregs_state(&current->thread.fpu);
+-	set_thread_flag(TIF_NEED_FPU_LOAD);
+-#elif defined(HAVE_KERNEL_FPU_INITIALIZED)
+-	__fpu_invalidate_fpregs_state(&current->thread.fpu);
+-	current->thread.fpu.initialized = 1;
+-#endif
++	/* Invalidate the task's FPU state */
++	current->thread.fpu.last_cpu = -1;
++}
++
++static inline void
++kfpu_save_xsave(struct xregs_state *addr, uint64_t mask)
++{
++	uint32_t low, hi;
++	int err;
++
++	low = mask;
++	hi = mask >> 32;
++	XSTATE_XSAVE(addr, low, hi, err);
++	WARN_ON_ONCE(err);
++}
++
++static inline void
++kfpu_save_fxsr(struct fxregs_state *addr)
++{
++	if (IS_ENABLED(CONFIG_X86_32))
++		kfpu_fxsave(addr);
++	else
++		kfpu_fxsaveq(addr);
++}
++
++static inline void
++kfpu_save_fsave(struct fregs_state *addr)
++{
++	kfpu_fnsave(addr);
+ }
+ 
+ static inline void
+@@ -172,46 +202,86 @@ kfpu_begin(void)
+ 	preempt_disable();
+ 	local_irq_disable();
+ 
+-#if defined(HAVE_KERNEL_TIF_NEED_FPU_LOAD)
+ 	/*
+ 	 * The current FPU registers need to be preserved by kfpu_begin()
+-	 * and restored by kfpu_end().  This is required because we can
+-	 * not call __cpu_invalidate_fpregs_state() to invalidate the
+-	 * per-cpu FPU state and force them to be restored during a
+-	 * context switch.
++	 * and restored by kfpu_end().  This is always required because we
++	 * can not call __cpu_invalidate_fpregs_state() to invalidate the
++	 * per-cpu FPU state and force them to be restored.  Furthermore,
++	 * this implementation relies on the space provided in the task
++	 * structure to store the user FPU state.  As such, it can only
++	 * be used with dedicated kernels which by definition will never
++	 * store user FPU state.
+ 	 */
+-	copy_fpregs_to_fpstate(&current->thread.fpu);
+-#elif defined(HAVE_KERNEL_FPU_INITIALIZED)
++	if (static_cpu_has(X86_FEATURE_XSAVE)) {
++		kfpu_save_xsave(&current->thread.fpu.state.xsave, ~0);
++	} else if (static_cpu_has(X86_FEATURE_FXSR)) {
++		kfpu_save_fxsr(&current->thread.fpu.state.fxsave);
++	} else {
++		kfpu_save_fsave(&current->thread.fpu.state.fsave);
++	}
++}
++
++static inline void
++kfpu_restore_xsave(struct xregs_state *addr, uint64_t mask)
++{
++	uint32_t low, hi;
++
++	low = mask;
++	hi = mask >> 32;
++	XSTATE_XRESTORE(addr, low, hi);
++}
++
++static inline void
++kfpu_restore_fxsr(struct fxregs_state *addr)
++{
+ 	/*
+-	 * There is no need to preserve and restore the FPU registers.
+-	 * They will always be restored from the task's stored FPU state
+-	 * when switching contexts.
++	 * On AuthenticAMD K7 and K8 processors the fxrstor instruction only
++	 * restores the _x87 FOP, FIP, and FDP registers when an exception
++	 * is pending.  Clean the _x87 state to force the restore.
+ 	 */
+-	WARN_ON_ONCE(current->thread.fpu.initialized == 0);
+-#endif
++	if (unlikely(static_cpu_has_bug(X86_BUG_FXSAVE_LEAK)))
++		kfpu_fxsr_clean(addr);
++
++	if (IS_ENABLED(CONFIG_X86_32)) {
++		kfpu_fxrstor(addr);
++	} else {
++		kfpu_fxrstorq(addr);
++	}
+ }
+ 
+ static inline void
+-kfpu_end(void)
++kfpu_restore_fsave(struct fregs_state *addr)
+ {
+-#if defined(HAVE_KERNEL_TIF_NEED_FPU_LOAD)
+-	union fpregs_state *state = &current->thread.fpu.state;
+-	int error;
++	kfpu_frstor(addr);
++}
+ 
+-	if (use_xsave()) {
+-		error = copy_kernel_to_xregs_err(&state->xsave, -1);
+-	} else if (use_fxsr()) {
+-		error = copy_kernel_to_fxregs_err(&state->fxsave);
++static inline void
++kfpu_end(void)
++{
++	if (static_cpu_has(X86_FEATURE_XSAVE)) {
++		kfpu_restore_xsave(&current->thread.fpu.state.xsave, ~0);
++	} else if (static_cpu_has(X86_FEATURE_FXSR)) {
++		kfpu_restore_fxsr(&current->thread.fpu.state.fxsave);
+ 	} else {
+-		error = copy_kernel_to_fregs_err(&state->fsave);
++		kfpu_restore_fsave(&current->thread.fpu.state.fsave);
+ 	}
+-	WARN_ON_ONCE(error);
+-#endif
+ 
+ 	local_irq_enable();
+ 	preempt_enable();
+ }
+-#endif /* defined(HAVE_KERNEL_FPU) */
++
++#else
++
++/*
++ * FPU support is unavailable.
++ */
++#define	kfpu_allowed()		0
++#define	kfpu_initialize(tsk)	do {} while (0)
++#define	kfpu_begin()		do {} while (0)
++#define	kfpu_end()		do {} while (0)
++
++#endif /* defined(HAVE_KERNEL_FPU_INTERNAL) */
++#endif /* defined(KERNEL_EXPORTS_X86_FPU) */
+ 
+ #else /* defined(_KERNEL) */
+ /*

debian/patches/0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch

@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Wed, 17 Jul 2019 09:14:36 -0700
+Subject: [PATCH] Fix CONFIG_X86_DEBUG_FPU build failure
+
+When CONFIG_X86_DEBUG_FPU is defined the alternatives_patched symbol
+is pulled in as a dependency which results in a build failure.  To
+prevent this undefine CONFIG_X86_DEBUG_FPU to disable the WARN_ON_FPU()
+macro and rely on WARN_ON_ONCE debugging checks which were previously
+added.
+
+Reviewed-by: Tony Hutter <hutter2@llnl.gov>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #9041
+Closes #9049
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ include/linux/simd_x86.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h
+index d1ded3af2..b32bccc41 100644
+--- a/include/linux/simd_x86.h
++++ b/include/linux/simd_x86.h
+@@ -84,6 +84,15 @@
+ 
+ #if defined(_KERNEL)
+ 
++/*
++ * Disable the WARN_ON_FPU() macro to prevent additional dependencies
++ * when providing the kfpu_* functions.  Relevant warnings are included
++ * as appropriate and are unconditionally enabled.
++ */
++#if defined(CONFIG_X86_DEBUG_FPU) && !defined(KERNEL_EXPORTS_X86_FPU)
++#undef CONFIG_X86_DEBUG_FPU
++#endif
++
+ #if defined(HAVE_KERNEL_FPU_API_HEADER)
+ #include <asm/fpu/api.h>
+ #include <asm/fpu/internal.h>

debian/patches/0011-Allow-FPU-usage-in-user-and-kernel-thread-contexts.patch

@@ -0,0 +1,327 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Wed, 9 Oct 2019 22:36:19 +0000
+Subject: [PATCH] Allow FPU usage in user and kernel thread contexts
+
+Even for dedicated kernel threads we apparently cannot be
+guaranteed that the kernel won't modify the FPU state which
+we saved in the task struck.  Allocate our own per-cpu state
+to preserve the saved register state.  Aside from correctness,
+this allows use of the FPU in user threads again.
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+(cherry picked from commit 11170d9073edcbb613f5a4c992293cbb4e3c8e31)
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ config/kernel-fpu.m4                         |  7 --
+ include/os/linux/kernel/linux/simd.h         |  1 -
+ include/os/linux/kernel/linux/simd_aarch64.h |  2 -
+ include/os/linux/kernel/linux/simd_x86.h     | 87 +++++++++++++-------
+ module/spl/spl-taskq.c                       |  2 -
+ module/spl/spl-thread.c                      |  2 -
+ module/zcommon/zfs_prop.c                    | 18 ++++
+ 7 files changed, 73 insertions(+), 46 deletions(-)
+
+diff --git a/config/kernel-fpu.m4 b/config/kernel-fpu.m4
+index 9ed9b14ad..15bea3c22 100644
+--- a/config/kernel-fpu.m4
++++ b/config/kernel-fpu.m4
+@@ -67,12 +67,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
+ 		#error Unsupported architecture
+ 		#endif
+ 
+-		#include <linux/sched.h>
+-
+-		#if !defined(PF_KTHREAD)
+-		#error PF_KTHREAD not defined
+-		#endif
+-
+ 		#ifdef HAVE_KERNEL_FPU_API_HEADER
+ 		#include <asm/fpu/api.h>
+ 		#include <asm/fpu/internal.h>
+@@ -94,7 +88,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
+ 		struct fregs_state *fr __attribute__ ((unused)) = &st->fsave;
+ 		struct fxregs_state *fxr __attribute__ ((unused)) = &st->fxsave;
+ 		struct xregs_state *xr __attribute__ ((unused)) = &st->xsave;
+-		fpu->last_cpu = -1;
+ 	])
+ ])
+ 
+diff --git a/include/os/linux/kernel/linux/simd.h b/include/os/linux/kernel/linux/simd.h
+index 1f6574a90..5138a908b 100644
+--- a/include/os/linux/kernel/linux/simd.h
++++ b/include/os/linux/kernel/linux/simd.h
+@@ -33,7 +33,6 @@
+ #else
+ 
+ #define	kfpu_allowed()		0
+-#define	kfpu_initialize(tsk)	do {} while (0)
+ #define	kfpu_begin()		do {} while (0)
+ #define	kfpu_end()		do {} while (0)
+ 
+diff --git a/include/os/linux/kernel/linux/simd_aarch64.h b/include/os/linux/kernel/linux/simd_aarch64.h
+index ac530d920..f6cf3c377 100644
+--- a/include/os/linux/kernel/linux/simd_aarch64.h
++++ b/include/os/linux/kernel/linux/simd_aarch64.h
+@@ -27,7 +27,6 @@
+  *
+  * Kernel fpu methods:
+  *	kfpu_allowed()
+- *	kfpu_initialize()
+  *	kfpu_begin()
+  *	kfpu_end()
+  */
+@@ -43,7 +42,6 @@
+ #include <asm/neon.h>
+ 
+ #define	kfpu_allowed()		1
+-#define	kfpu_initialize(tsk)	do {} while (0)
+ #define	kfpu_begin()		kernel_neon_begin()
+ #define	kfpu_end()		kernel_neon_end()
+ 
+diff --git a/include/os/linux/kernel/linux/simd_x86.h b/include/os/linux/kernel/linux/simd_x86.h
+index 486e31845..c42ea918e 100644
+--- a/include/os/linux/kernel/linux/simd_x86.h
++++ b/include/os/linux/kernel/linux/simd_x86.h
+@@ -27,7 +27,6 @@
+  *
+  * Kernel fpu methods:
+  *	kfpu_allowed()
+- *	kfpu_initialize()
+  *	kfpu_begin()
+  *	kfpu_end()
+  *
+@@ -99,7 +98,6 @@
+ #if defined(KERNEL_EXPORTS_X86_FPU)
+ 
+ #define	kfpu_allowed()		1
+-#define	kfpu_initialize(tsk)	do {} while (0)
+ 
+ #if defined(HAVE_UNDERSCORE_KERNEL_FPU)
+ #define	kfpu_begin()		\
+@@ -129,16 +127,52 @@
+ 
+ /*
+  * When the kernel_fpu_* symbols are unavailable then provide our own
+- * versions which allow the FPU to be safely used in kernel threads.
+- * In practice, this is not a significant restriction for ZFS since the
+- * vast majority of SIMD operations are performed by the IO pipeline.
++ * versions which allow the FPU to be safely used.
+  */
+ #if defined(HAVE_KERNEL_FPU_INTERNAL)
+ 
++extern struct fpu **zfs_kfpu_fpregs;
++
+ /*
+- * FPU usage only allowed in dedicated kernel threads.
++ * Initialize per-cpu variables to store FPU state.
+  */
+-#define	kfpu_allowed()		(current->flags & PF_KTHREAD)
++static inline void
++kfpu_fini(void)
++{
++	int cpu;
++
++	for_each_possible_cpu(cpu) {
++		if (zfs_kfpu_fpregs[cpu] != NULL) {
++			kfree(zfs_kfpu_fpregs[cpu]);
++		}
++	}
++
++	kfree(zfs_kfpu_fpregs);
++}
++
++static inline int
++kfpu_init(void)
++{
++	int cpu;
++
++	zfs_kfpu_fpregs = kzalloc(num_possible_cpus() *
++	    sizeof (struct fpu *), GFP_KERNEL);
++	if (zfs_kfpu_fpregs == NULL)
++		return (ENOMEM);
++
++	for_each_possible_cpu(cpu) {
++		zfs_kfpu_fpregs[cpu] = kmalloc_node(sizeof (struct fpu),
++		    GFP_KERNEL, cpu_to_node(cpu));
++		if (zfs_kfpu_fpregs[cpu] == NULL) {
++			kfpu_fini();
++			return (ENOMEM);
++		}
++	}
++
++	return (0);
++}
++
++#define	kfpu_allowed()		1
+ #define	ex_handler_fprestore	ex_handler_default
+ 
+ /*
+@@ -154,15 +188,6 @@
+ #define	kfpu_fxsr_clean(rval)	__asm("fnclex; emms; fildl %P[addr]" \
+ 				    : : [addr] "m" (rval));
+ 
+-static inline void
+-kfpu_initialize(void)
+-{
+-	WARN_ON_ONCE(!(current->flags & PF_KTHREAD));
+-
+-	/* Invalidate the task's FPU state */
+-	current->thread.fpu.last_cpu = -1;
+-}
+-
+ static inline void
+ kfpu_save_xsave(struct xregs_state *addr, uint64_t mask)
+ {
+@@ -193,8 +218,6 @@ kfpu_save_fsave(struct fregs_state *addr)
+ static inline void
+ kfpu_begin(void)
+ {
+-	WARN_ON_ONCE(!kfpu_allowed());
+-
+ 	/*
+ 	 * Preemption and interrupts must be disabled for the critical
+ 	 * region where the FPU state is being modified.
+@@ -204,20 +227,18 @@ kfpu_begin(void)
+ 
+ 	/*
+ 	 * The current FPU registers need to be preserved by kfpu_begin()
+-	 * and restored by kfpu_end().  This is always required because we
+-	 * can not call __cpu_invalidate_fpregs_state() to invalidate the
+-	 * per-cpu FPU state and force them to be restored.  Furthermore,
+-	 * this implementation relies on the space provided in the task
+-	 * structure to store the user FPU state.  As such, it can only
+-	 * be used with dedicated kernels which by definition will never
+-	 * store user FPU state.
++	 * and restored by kfpu_end().  They are stored in a dedicated
++	 * per-cpu variable, not in the task struct, this allows any user
++	 * FPU state to be correctly preserved and restored.
+ 	 */
++	struct fpu *fpu = zfs_kfpu_fpregs[smp_processor_id()];
++
+ 	if (static_cpu_has(X86_FEATURE_XSAVE)) {
+-		kfpu_save_xsave(&current->thread.fpu.state.xsave, ~0);
++		kfpu_save_xsave(&fpu->state.xsave, ~0);
+ 	} else if (static_cpu_has(X86_FEATURE_FXSR)) {
+-		kfpu_save_fxsr(&current->thread.fpu.state.fxsave);
++		kfpu_save_fxsr(&fpu->state.fxsave);
+ 	} else {
+-		kfpu_save_fsave(&current->thread.fpu.state.fsave);
++		kfpu_save_fsave(&fpu->state.fsave);
+ 	}
+ }
+ 
+@@ -258,12 +279,14 @@ kfpu_restore_fsave(struct fregs_state *addr)
+ static inline void
+ kfpu_end(void)
+ {
++	struct fpu *fpu = zfs_kfpu_fpregs[smp_processor_id()];
++
+ 	if (static_cpu_has(X86_FEATURE_XSAVE)) {
+-		kfpu_restore_xsave(&current->thread.fpu.state.xsave, ~0);
++		kfpu_restore_xsave(&fpu->state.xsave, ~0);
+ 	} else if (static_cpu_has(X86_FEATURE_FXSR)) {
+-		kfpu_restore_fxsr(&current->thread.fpu.state.fxsave);
++		kfpu_restore_fxsr(&fpu->state.fxsave);
+ 	} else {
+-		kfpu_restore_fsave(&current->thread.fpu.state.fsave);
++		kfpu_restore_fsave(&fpu->state.fsave);
+ 	}
+ 
+ 	local_irq_enable();
+@@ -276,7 +299,6 @@ kfpu_end(void)
+  * FPU support is unavailable.
+  */
+ #define	kfpu_allowed()		0
+-#define	kfpu_initialize(tsk)	do {} while (0)
+ #define	kfpu_begin()		do {} while (0)
+ #define	kfpu_end()		do {} while (0)
+ 
+@@ -286,6 +308,7 @@ kfpu_end(void)
+ /*
+  * Linux kernel provides an interface for CPU feature testing.
+  */
++
+ /*
+  * Detect register set support
+  */
+diff --git a/module/spl/spl-taskq.c b/module/spl/spl-taskq.c
+index 90e1d0a4d..a39f94e4c 100644
+--- a/module/spl/spl-taskq.c
++++ b/module/spl/spl-taskq.c
+@@ -28,7 +28,6 @@
+ #include <sys/taskq.h>
+ #include <sys/kmem.h>
+ #include <sys/tsd.h>
+-#include <sys/simd.h>
+ 
+ int spl_taskq_thread_bind = 0;
+ module_param(spl_taskq_thread_bind, int, 0644);
+@@ -854,7 +853,6 @@ taskq_thread(void *args)
+ 	sigfillset(&blocked);
+ 	sigprocmask(SIG_BLOCK, &blocked, NULL);
+ 	flush_signals(current);
+-	kfpu_initialize();
+ 
+ 	tsd_set(taskq_tsd, tq);
+ 	spin_lock_irqsave_nested(&tq->tq_lock, flags, tq->tq_lock_class);
+diff --git a/module/spl/spl-thread.c b/module/spl/spl-thread.c
+index 29de9252a..0352a31ea 100644
+--- a/module/spl/spl-thread.c
++++ b/module/spl/spl-thread.c
+@@ -27,7 +27,6 @@
+ #include <sys/thread.h>
+ #include <sys/kmem.h>
+ #include <sys/tsd.h>
+-#include <sys/simd.h>
+ 
+ /*
+  * Thread interfaces
+@@ -55,7 +54,6 @@ thread_generic_wrapper(void *arg)
+ 	args = tp->tp_args;
+ 	set_current_state(tp->tp_state);
+ 	set_user_nice((kthread_t *)current, PRIO_TO_NICE(tp->tp_pri));
+-	kfpu_initialize();
+ 	kmem_free(tp->tp_name, tp->tp_name_size);
+ 	kmem_free(tp, sizeof (thread_priv_t));
+ 
+diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
+index dab749138..b5fa1c2f4 100644
+--- a/module/zcommon/zfs_prop.c
++++ b/module/zcommon/zfs_prop.c
+@@ -853,10 +853,27 @@ zfs_prop_align_right(zfs_prop_t prop)
+ #endif
+ 
+ #if defined(_KERNEL)
++
++#if defined(HAVE_KERNEL_FPU_INTERNAL)
++#include <linux/simd.h>
++
++struct fpu **zfs_kfpu_fpregs;
++EXPORT_SYMBOL(zfs_kfpu_fpregs);
++
++#else
++#define	kfpu_init()	0
++#define	kfpu_fini()	((void) 0)
++#endif /* HAVE_KERNEL_FPU_INTERNAL */
++
+ static int __init
+ zcommon_init(void)
+ {
++	int error = kfpu_init();
++	if (error)
++		return (-error);
++
+ 	fletcher_4_init();
++
+ 	return (0);
+ }
+ 
+@@ -864,6 +881,7 @@ static void __exit
+ zcommon_fini(void)
+ {
+ 	fletcher_4_fini();
++	kfpu_fini();
+ }
+ 
+ module_init(zcommon_init);

debian/patches/series

@@ -0,0 +1,11 @@
+0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
+0002-always-load-ZFS-module-on-boot.patch
+0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
+0004-import-with-d-dev-disk-by-id-in-scan-service.patch
+0005-Enable-zed-emails.patch
+0006-Linux-5.0-compat-SIMD-compatibility.patch
+0007-Perform-KABI-checks-in-parallel.patch
+0008-Linux-4.14-4.19-5.0-compat-SIMD-save-restore.patch
+0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch
+0010-OpenZFS-restructuring-move-platform-specific-headers.patch
+0011-Allow-FPU-usage-in-user-and-kernel-thread-contexts.patch

debian/python3-pyzfs.install

@@ -0,0 +1 @@
+usr/lib/python3*

debian/rules

@@ -0,0 +1,109 @@
+#!/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 "sphinx-build$$")
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@ --with autoreconf,python3,systemd,sphinxdoc --parallel
+
+adapt_meta_file:
+	@# Embed the downstream version in the module.
+	@sed \
+	  -e 's/^Version:.*/Version:      $(VERSION)/' \
+	  -e 's/^Release:.*/Release:      $(REVISION)/' \
+	  -i.orig META
+
+
+override_dh_autoreconf: adapt_meta_file
+	dh_autoreconf
+
+override_dh_auto_configure:
+	@# Build the userland, but don't build the kernel modules.
+	dh_auto_configure -- \
+	  --bindir=/usr/bin \
+	  --sbindir=/sbin \
+	  --libdir=/lib \
+	  --with-udevdir=/lib/udev \
+	  --with-zfsexecdir=/usr/lib/zfs-linux \
+	  --enable-systemd \
+	  --enable-pyzfs \
+	  --with-systemdunitdir=/lib/systemd/system \
+	  --with-systemdpresetdir=/lib/systemd/system-preset \
+	  --with-systemdgeneratordir=/lib/systemd/system-generators \
+	  --with-config=user
+
+override_dh_auto_test:
+	# The dh_auto_test rule is disabled because
+	# `make check` cannot run in an unprivileged build environment.
+
+override_dh_auto_install:
+	@# Install the utilities.
+	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
+
+	# Use upstream's bash completion
+	install -D -t '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/' \
+		'$(CURDIR)/contrib/bash_completion.d/zfs'
+
+	# Move from bin_dir to /usr/sbin
+	# Remove suffix (.py) as per policy 10.4 - Scripts
+	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
+	mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/'
+	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
+	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
+	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
+
+	@# Zed has dependencies outside of the system root.
+	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
+
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib
+	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
+		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
+		rm $${i}; \
+	done
+
+	chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
+	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
+	chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
+
+override_dh_python3:
+	dh_python3 -p python3-pyzfs
+
+override_dh_makeshlibs:
+	dh_makeshlibs -a -V
+ifeq ($(BUILD_UDEB), true)
+	dh_makeshlibs -V -plibnvpair1linux
+	dh_makeshlibs -V -plibuutil1linux
+	dh_makeshlibs -V -plibzfs2linux
+	dh_makeshlibs -V -plibzpool2linux
+	dh_makeshlibs -V -pzfsutils-linux
+endif
+
+override_dh_strip:
+	dh_strip --dbg-package=zfs-dbg
+
+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_missing:
+	find . -name lib*.la -delete
+	dh_missing --fail-missing
+
+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

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs

@@ -0,0 +1,8 @@
+for x in $(cat /proc/cmdline)
+do
+	case $x in
+		root=ZFS=*)
+			BOOT=zfs
+			;;
+	esac
+done

debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev

@@ -0,0 +1,67 @@
+#!/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

debian/tree/zfsutils-linux/etc/sudoers.d/zfs

@@ -0,0 +1,18 @@
+## 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

debian/tree/zfsutils-linux/usr/lib/os-probes/10zvol-test

@@ -0,0 +1,14 @@
+#!/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

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

@@ -0,0 +1,9 @@
+#!/bin/sh -eu
+
+# Scrub all healthy pools.
+zpool list -H -o health,name 2>&1 | \
+	awk 'BEGIN {FS="\t"} {if ($1 ~ /^ONLINE/) print $2}' | \
+while read pool
+do
+	zpool scrub "$pool"
+done

debian/watch

@@ -0,0 +1,2 @@
+version=3
+https://zfsonlinux.org/ .*zfs-([\d\.]+)\.tar\.gz$

debian/zfs-initramfs.install

@@ -0,0 +1,2 @@
+../tree/zfs-initramfs/* /
+usr/share/initramfs-tools/*

debian/zfs-initramfs.triggers

@@ -0,0 +1 @@
+activate update-initramfs

debian/zfs-test.install

@@ -0,0 +1,15 @@
+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

debian/zfs-test.lintian-overrides

@@ -0,0 +1 @@
+zfs-test: arch-dependent-file-in-usr-share

debian/zfs-zed.install

@@ -0,0 +1,5 @@
+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

debian/zfsutils-linux.cron.d

@@ -0,0 +1,4 @@
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+# Scrub the second Sunday of every month.
+24 0 8-14 * * root [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ] && /usr/lib/zfs-linux/scrub

debian/zfsutils-linux.docs

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

debian/zfsutils-linux.examples

@@ -0,0 +1,5 @@
+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

debian/zfsutils-linux.install

@@ -0,0 +1,43 @@
+../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.target
+lib/systemd/system/zfs-mount.service
+lib/systemd/system/zfs-share.service
+lib/systemd/system/zfs-volume-wait.service
+lib/systemd/system/zfs-volumes.target
+lib/systemd/system/zfs.target
+lib/systemd/system-generators/zfs-mount-generator
+lib/udev/
+sbin/fsck.zfs
+sbin/mount.zfs
+sbin/zdb
+sbin/zfs
+sbin/zhack
+sbin/zpool
+sbin/zstreamdump
+usr/bin/zgenhostid
+usr/bin/zvol_wait
+usr/lib/modules-load.d/ lib/
+usr/lib/zfs-linux/zpool.d/
+usr/sbin/arc_summary
+usr/sbin/arcstat
+usr/sbin/dbufstat
+usr/share/bash-completion/completions
+usr/share/man/man1/zhack.1
+usr/share/man/man1/zvol_wait.1
+usr/share/man/man5/
+usr/share/man/man8/fsck.zfs.8
+usr/share/man/man8/mount.zfs.8
+usr/share/man/man8/vdev_id.8
+usr/share/man/man8/zdb.8
+usr/share/man/man8/zfs.8
+usr/share/man/man8/zfs-mount-generator.8
+usr/share/man/man8/zfs-program.8
+usr/share/man/man8/zgenhostid.8
+usr/share/man/man8/zpool.8
+usr/share/man/man8/zstreamdump.8

debian/zfsutils-linux.lintian-overrides

@@ -0,0 +1 @@
+systemd-service-file-refers-to-unusual-wantedby-target

debian/zfsutils-linux.postinst

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+# The hostname and hostid of the last system to access a ZFS pool are stored in
+# the ZFS pool itself. A pool is foreign if, during `zpool import`, the
+# current hostname and hostid are different than the stored values thereof.
+#
+# The only way of having a stable hostid is to define it in /etc/hostid.
+# This postinst helper will check if we already have the hostid stabilized by
+# checking the existence of the file /etc/hostid to be 4 bytes at least.
+# If this file don't already exists on our system or has less than 4 bytes, then
+# a new (random) value is generated with zgenhostid (8) and stored in
+# /etc/hostid
+
+if [ ! -f /etc/hostid ] || [ "$(stat -c %s /etc/hostid)" -lt 4 ] ; then
+	zgenhostid
+fi
+
+#DEBHELPER#
+

spl-changelog.Debian

@@ -1,61 +0,0 @@
-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

spl-patches/fix-control

@@ -1,119 +0,0 @@
-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}

spl-patches/series

@@ -1 +0,0 @@
-fix-control

zfs-changelog.Debian

@@ -1,85 +0,0 @@
-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

zfs-patches/fix-control.patch

@@ -1,143 +0,0 @@
-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

zfs-patches/series

@@ -1,2 +0,0 @@
-fix-control.patch
-skip-unneeded-pull-requests.patch

zfs-patches/skip-unneeded-pull-requests.patch

@@ -1,21 +0,0 @@
-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