bump version to 0.7.3-pve1

tracked upstream in #6800, full fix/user NS compatibility not yet
available.

https://github.com/zfsonlinux/zfs/issues/6800

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "zfs-debian"]
+	path = zfs-debian
+	url = ../mirror_zfs-debian
+[submodule "spl-debian"]
+	path = spl-debian
+	url = ../mirror_spl-debian

Makefile

@@ -1,79 +1,74 @@
-RELEASE=3.4
+RELEASE=5.1
 
 # source form https://github.com/zfsonlinux/
 
-# also update version in 
-# zfs-changelog.Debian and spl-changelog.Debian
-ZFSVER=0.6.5.7
-ZFSPKGREL=5~bpo70
-SPLPKGREL=5~bpo70
+ZFSVER=0.7.3
+ZFSPKGREL=pve1~bpo9
+SPLPKGREL=pve1~bpo9
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
-SPLDIR=pkg-spl
-SPLSRC=pkg-spl.tar.gz
-ZFSDIR=pkg-zfs
-ZFSSRC=pkg-zfs.tar.gz
+SPLDIR=spl-build
+SPLSRC=spl-debian
+ZFSDIR=zfs-build
+ZFSSRC=zfs-debian
 
 SPL_DEBS= 					\
 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		\
+libnvpair1linux_${ZFSPKGVER}_amd64.deb		\
+libuutil1linux_${ZFSPKGVER}_amd64.deb		\
+libzfs2linux_${ZFSPKGVER}_amd64.deb		\
+libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
+libzpool2linux_${ZFSPKGVER}_amd64.deb		\
 zfs-dbg_${ZFSPKGVER}_amd64.deb			\
-zfs-initramfs_${ZFSPKGVER}_amd64.deb		\
-zfsutils_${ZFSPKGVER}_amd64.deb
+zfs-zed_${ZFSPKGVER}_amd64.deb			\
+zfs-initramfs_${ZFSPKGVER}_all.deb		\
+zfs-test_${ZFSPKGVER}_amd64.deb		\
+zfsutils-linux_${ZFSPKGVER}_amd64.deb
 
-DEBS=${SPL_DEBS} ${ZFS_DEBS} 
+DEBS=${SPL_DEBS} ${ZFS_DEBS}
 
-all: ${DEBS}
-
-.PHONY: deb
+all: deb
 deb: ${DEBS}
 
 .PHONY: dinstall
 dinstall: ${DEBS}
 	dpkg -i ${DEBS}
 
+.PHONY: submodule
+submodule:
+	test -f "${ZFSSRC}/debian/changelog" || git submodule update --init
+	test -f "${SPLSRC}/debian/changelog" || git submodule update --init
+
 .PHONY: spl
 spl ${SPL_DEBS}: ${SPLSRC}
 	rm -rf ${SPLDIR}
-	tar xf ${SPLSRC}
+	mkdir ${SPLDIR}
+	cp -a ${SPLSRC}/* ${SPLDIR}/
 	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} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
 	rm -rf ${ZFSDIR}
-	tar xf ${ZFSSRC}
+	mkdir ${ZFSDIR}
+	cp -a ${ZFSSRC}/* ${ZFSDIR}/
 	mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org
 	cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog
 	cd ${ZFSDIR}; ln -s ../zfs-patches patches
 	cd ${ZFSDIR}; quilt push -a
 	cd ${ZFSDIR}; rm -rf .pc ./patches
-	cd ${ZFSDIR}; ./debian/rules override_dh_prep-base-deb-files
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
-
-.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
+	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
 
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes *.buildinfo ${ZFSDIR} ${SPLDIR}
 
 .PHONY: distclean
 distclean: clean
@@ -81,4 +76,4 @@ 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 --dist stretch --arch amd64

README

@@ -10,4 +10,4 @@ modules with the kernel.
 
 For licensing questions, see:
 
-http://open-zfs.org/wiki/Talk:FAQ
+http://open-zfs.org/wiki/Talk:FAQ

spl-changelog.Debian

@@ -1,61 +1,108 @@
-spl-linux (0.6.5.7-5~bpo70) unstable; urgency=low
+spl-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
 
-  * rebuild using wheezy
+  * update spl to 0.7.3
 
- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 15:41:00 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
 
-spl-linux (0.6.5.7-4~bpo70) unstable; urgency=low
+spl-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
 
-  * update pkg-spl to spl-0.6.5.7-3-wheezy
+  * update spl to 0.7.2
 
-  * change versioning scheme to allow upgrades from PVE 3.4 to PVE 4.2
+  * clean up man pages
 
- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 13:45:00 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:33:04 +0200
 
-spl-linux (0.6.5-3~wheezy) unstable; urgency=low
+spl-linux (0.6.5.11-pve10~bpo90) unstable; urgency=medium
+
+  * update spl to debian/0.6.5.11-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
+
+spl-linux (0.6.5.9-pve9~bpo90) unstable; urgency=medium
+
+  * rebuild for PVE 5.0 / Debian Stretch
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
+
+spl-linux (0.6.5.9-pve8~bpo80) unstable; urgency=medium
+
+  * update spl to debian/0.6.5.9-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:35 +0100
+
+spl-linux (0.6.5.8-pve7~bpo80) unstable; urgency=medium
+
+  * update spl to debian/0.6.5.8-2
+
+  * switch package upstream sources to Debian (Jessie)
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
+
+spl-linux (0.6.5.7-pve6~bpo80) unstable; urgency=medium
+
+  * update pkg-spl to jessie/0.6.5.7-5
+
+  * change package versioning to allow upgrades from PVE3/wheezy
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
+
+spl-linux (0.6.5-pve5~jessie) unstable; urgency=medium
+
+  * Update pkg-spl to jessie/0.6.5.6-3
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Apr 2016 11:11:59 +0200
+
+spl-linux (0.6.5-pve4~jessie) unstable; urgency=medium
 
   * update to 0.6.5.6
 
- -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 11:32:38 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:49:49 +0200
 
-spl-linux (0.6.5-2~wheezy) unstable; urgency=low
+spl-linux (0.6.5-pve3~jessie) unstable; urgency=medium
 
   * update to 0.6.5.4
 
- -- Proxmox Support Team <support@proxmox.com>  Sun, 17 Jan 2016 14:44:31 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 11:00:40 +0100
 
-spl-linux (0.6.5-1~wheezy) unstable; urgency=low
+spl-linux (0.6.5-pve2~jessie) unstable; urgency=medium
 
-  * update to master/debian/wheezy/0.6.5-1-wheezy
+  * update to 0.6.5.3
 
- -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 10:03:25 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:40:58 +0100
 
-spl-linux (0.6.4-4~wheezy) unstable; urgency=low
+spl-linux (0.6.5-pve1~jessie) unstable; urgency=medium
 
-  * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy)
+  * update to master/debian/jessie/0.6.5-1
 
- -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 07:16:12 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:04:23 +0200
 
-spl-linux (0.6.4-3~wheezy) unstable; urgency=low
+spl-linux (0.6.4-pve3~jessie) unstable; urgency=medium
 
-  * update to 0.6.4.1
+  * update to snapshot/debian/jessie/0.6.4-8-8ac6ff
 
- -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Apr 2015 07:31:14 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:14:12 +0200
 
-spl-linux (0.6.4-2~wheezy) unstable; urgency=low
+spl-linux (0.6.4-pve2~jessie) unstable; urgency=medium
 
-  * include original zol changelog files
+  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-6-37d7cd)
 
- -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 07:38:02 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:02:31 +0200
 
-spl-linux (0.6.4-1~wheezy) unstable; urgency=low
+spl-linux (0.6.4-pve1~jessie) unstable; urgency=medium
 
-  * update to 0.6.4 (keep Proxmox VE versioning schema)
+  * update to 0.6.4 (use upstream zol package definitions)
 
- -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Apr 2015 09:32:24 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:17:26 +0200
 
-spl-linux (0.6.3-1~wheezy) unstable; urgency=low
+spl-linux (0.6.3-pve1~jessie) unstable; urgency=medium
+
+  * recompile for jessie
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:03:01 +0100
+
+spl-linux (0.6.3-pve1~wheezy) unstable; urgency=low
 
   * first version for Proxmox VE
 
  -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
+

spl-patches/0001-remove-DKMS-and-module-build.patch

@@ -0,0 +1,163 @@
+From 9cb5edffe475c25c4132aace431ffc6a97531583 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 12 Oct 2016 10:57:39 +0200
+Subject: [PATCH 1/3] remove DKMS and module build
+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>
+---
+ debian/control.in | 24 --------------------
+ debian/control    |  1 -
+ debian/rules      | 68 +------------------------------------------------------
+ 3 files changed, 1 insertion(+), 92 deletions(-)
+
+diff --git a/debian/control.in b/debian/control.in
+index 52c1660..dc6ee96 100644
+--- a/debian/control.in
++++ b/debian/control.in
+@@ -8,40 +8,16 @@ Build-Depends: autogen,
+                autotools-dev,
+                debhelper (>= 9),
+                dh-autoreconf,
+-               dkms (>> 2.2.0.2-1~),
+                libtool
+ Standards-Version: 3.9.8
+ Homepage: http://www.zfsonlinux.org/
+ Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/spl.git
+ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
+ 
+-Package: spl-dkms
+-Architecture: all
+-Depends: dkms (>> 2.2.1.0), file, libc-dev, lsb-release, ${misc:Depends}
+-Recommends: spl (>= ${source:Upstream-Version})
+-Provides: spl-modules
+-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
+ Conflicts: spl-dev, splat
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+-Recommends: spl-modules | spl-dkms
+ Description: Solaris Porting Layer user-space utilities for Linux
+  The Solaris Porting Layer (SPL) is a Linux kernel module which provides
+  many of the Solaris kernel APIs. This shim layer makes it possible to
+diff --git a/debian/control b/debian/control
+index 52c1660..e055965 100644
+--- a/debian/control
++++ b/debian/control
+@@ -8,7 +8,6 @@ Build-Depends: autogen,
+                autotools-dev,
+                debhelper (>= 9),
+                dh-autoreconf,
+-               dkms (>> 2.2.0.2-1~),
+                libtool
+ Standards-Version: 3.9.8
+ Homepage: http://www.zfsonlinux.org/
+diff --git a/debian/rules b/debian/rules
+index b2fc86c..a474ca4 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -14,12 +14,8 @@ ifndef KVERS
+ KVERS=$(shell uname -r)
+ endif
+ 
+-non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
+-PACKAGE=spl
+-pmodules = $(PACKAGE)-modules-$(non_epoch_version)
+-
+ %:
+-	dh $@ --with dkms,autoreconf --parallel
++	dh $@ --with autoreconf --parallel
+ 
+ override_dh_auto_configure:
+ 	@cp debian/control.in debian/control
+@@ -45,69 +41,7 @@ override_dh_auto_install:
+ 	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
+ 	$(MAKE) distdir
+ 
+-	@# 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)/$(NAME)-$(VERSION)/cp'
+-	echo 'cp "$$@"'  >>'$(CURDIR)/$(NAME)-$(VERSION)/cp'
+-	chmod 755 '$(CURDIR)/$(NAME)-$(VERSION)/cp'
+-
+-	# Install the DKMS source.
+-	mkdir -p '$(CURDIR)/debian/tmp/usr/src/'
+-	mv '$(CURDIR)/$(NAME)-$(VERSION)' '$(CURDIR)/debian/tmp/usr/src/'
+-
+-override_dh_dkms:
+-	dh_dkms -V $(VERSION)
+-
+ override_dh_auto_clean:
+ 	dh_auto_clean
+ 	@if test -e META.orig; then mv META.orig META; fi
+ 	cp debian/control.in debian/control
+-
+-# ------------
+-
+-override_dh_prep-deb-files:
+-	for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
+-		sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ;  s/_ARCH_/$(DEB_HOST_ARCH)/g' \
+-		< $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
+-	done
+-	sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g' \
+-	< debian/control.modules.in > debian/control
+-
+-override_dh_configure_modules: override_dh_configure_modules_stamp
+-override_dh_configure_modules_stamp:
+-	./configure --with-config=kernel --with-linux=$(KSRC) \
+-		--with-linux-obj=$(KOBJ) \
+-		--disable-debug-kmem
+-	touch override_dh_configure_modules_stamp
+-
+-override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules
+-	dh_testdir
+-	dh_testroot
+-	dh_prep
+-
+-	$(MAKE) -C $(CURDIR)/module modules
+-
+-	dh_installdirs -p${pmodules}-di
+-	dh_install -p${pmodules}-di
+-	dh_gencontrol -p${pmodules}-di
+-
+-	dh_builddeb -p${pmodules}-di
+-
+-override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_modules
+-	dh_testdir
+-	dh_testroot
+-	dh_prep
+-
+-	$(MAKE) -C $(CURDIR)/module modules
+-
+-	dh_installdocs -p${pmodules}
+-	dh_install -p${pmodules}
+-	dh_installchangelogs -p${pmodules}
+-	dh_compress -p${pmodules}
+-	dh_strip -p${pmodules}
+-	dh_fixperms -p${pmodules}
+-	dh_installdeb -p${pmodules}
+-	dh_gencontrol -p${pmodules}
+-	dh_md5sums -p${pmodules}
+-
+-	dh_builddeb -p${pmodules}
+-- 
+2.14.1
+

spl-patches/0002-splat.1-manpage-fix-spelling-of-hexadecimal.patch

@@ -0,0 +1,55 @@
+From b414fa1353cac23e1d58d3fbdd1c48a7925bdbdb Mon Sep 17 00:00:00 2001
+From: Fabian-Gruenbichler <f.gruenbichler@proxmox.com>
+Date: Fri, 11 Aug 2017 00:21:54 +0200
+Subject: [PATCH 2/3] splat.1 manpage: fix spelling of 'hexadecimal'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reviewed-by: George Melikov <mail@gmelikov.ru>
+Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #642
+(cherry picked from commit a02fa347b75266f40c8f571d7d63a21ec7f6f13d)
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ man/man1/splat.1 | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/man/man1/splat.1 b/man/man1/splat.1
+index 37f8435..407680b 100644
+--- a/man/man1/splat.1
++++ b/man/man1/splat.1
+@@ -32,7 +32,7 @@ Print the usage message.
+ .BI "\-l" "" ", \-\-list" ""
+ .IP
+ For each spl.ko subsystem, print all available test names and
+-hexidecimal identifiers with a short description.
++hexadecimal identifiers with a short description.
+ .HP
+ .BI "\-t" " subsystem" ":" "test" ", \-\-test" " subsystem" ":" "test"
+ .HP
+@@ -42,9 +42,9 @@ Run the \fItest\fR diagnostic routine for the spl.ko \fIsubsystem\fR.
+ Specify this option more than once to run multiple tests.
+ 
+ The \fItest\fR and \fIsubsystem\fR parameters are the names or
+-hexidecimal identifiers returned by the \fBsplat --list\fR command.
++hexadecimal identifiers returned by the \fBsplat --list\fR command.
+ 
+-If \fIsubsystem\fR is a name and not a hexidecimal identifier, then the
++If \fIsubsystem\fR is a name and not a hexadecimal identifier, then the
+ \fBall\fR keyword can be used to run all available \fIsubsystem\fR
+ tests.
+ 
+@@ -73,7 +73,7 @@ Test the kernel compression and queue waiting facilities:
+ # splat --test zlib:compress/uncompress --test taskq:wait
+ .LP
+ This is the same as the previous command, except that the subsystems
+-and tests are referenced by hexidecimal identifier instead of by name:
++and tests are referenced by hexadecimal identifier instead of by name:
+ .IP
+ # splat -t 0x0f00:0x0f01 -t 0x0200:0x0204
+ 
+-- 
+2.14.1
+

spl-patches/0003-spl-module-parameters.5-manpage-fix-macro.patch

@@ -0,0 +1,38 @@
+From cb03b1234f9e3645fb731fdbeb5ba12f0013caa8 Mon Sep 17 00:00:00 2001
+From: Fabian-Gruenbichler <f.gruenbichler@proxmox.com>
+Date: Fri, 11 Aug 2017 00:22:31 +0200
+Subject: [PATCH 3/3] spl-module-parameters.5 manpage: fix macro
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There is no '.sh' macro in troff/groff/man, only '.SH' for section
+headers. I assume .sp for a line break was intended here like
+in the rest of the man page.
+
+Reviewed-by: George Melikov <mail@gmelikov.ru>
+Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #643
+(cherry picked from commit 945b7f1c63e3a12d08349afb986b7dfaca370222)
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ man/man5/spl-module-parameters.5 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/man5/spl-module-parameters.5 b/man/man5/spl-module-parameters.5
+index 97241fd..e151144 100644
+--- a/man/man5/spl-module-parameters.5
++++ b/man/man5/spl-module-parameters.5
+@@ -153,7 +153,7 @@ function takes a single global lock over the entire virtual address range
+ which serializes all allocations.  Using slightly different allocation
+ functions for small and large objects allows us to handle a wide range of
+ object sizes.
+-.sh
++.sp
+ The \fBspl_kmem_cache_kmem_limit\fR value is used to determine this cutoff
+ size.  One quarter the PAGE_SIZE is used as the default value because
+ \fBspl_kmem_cache_obj_per_slab\fR defaults to 16.  This means that at
+-- 
+2.14.1
+

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 +1,3 @@
-fix-control
+0001-remove-DKMS-and-module-build.patch
+0002-splat.1-manpage-fix-spelling-of-hexadecimal.patch
+0003-spl-module-parameters.5-manpage-fix-macro.patch

zfs-changelog.Debian

@@ -1,74 +1,183 @@
-zfs-linux (0.6.5.7-5~bpo70) unstable; urgency=low
+zfs-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
 
-  * rebuild using wheezy
+  * update ZFS to 0.7.3
 
- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 15:41:00 +0200
+  * include fix for user namespace setgid issue (#6800 upstream)
 
-zfs-linux (0.6.5.7-4~bpo70) unstable; urgency=low
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
 
-  * update pkg-zfs to 0.6.5.7-8-wheezy
+zfs-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
 
-  * 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)
+  * update zfs to 0.7.2
 
-  * change versioning scheme to allow upgrades from PVE 3.4 to PVE 4.2
+  * add PR 6616 - zfs send/recv compatibility with 0.6.5
 
- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 13:45:00 +0200
+  * add PR 6695 - zfs recv: don't skip over objects which should be freed
 
-zfs-linux (0.6.5-3~wheezy) unstable; urgency=low
+  * various small fixes
 
-  * update to 0.6.5.6
+  * split test suite into zfs-test package
 
- -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 11:32:59 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:34:05 +0200
 
-zfs-linux (0.6.5-2~wheezy) unstable; urgency=low
+zfs-linux (0.6.5.11-pve18~bpo90) unstable; urgency=medium
 
-  * update to 0.6.5.4
+  * fix #1509: arc_summary error with L2ARC
 
- -- Proxmox Support Team <support@proxmox.com>  Sun, 17 Jan 2016 14:44:55 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 2 Oct 2017 09:30:41 +0200
 
-zfs-linux (0.6.5-1~wheezy) unstable; urgency=low
+zfs-linux (0.6.5.11-pve17~bpo90) unstable; urgency=medium
 
-  * update to master/debian/wheezy/0.6.5.2-2-wheezy 
+  * update zfs to debian/0.6.5.11-1
 
- -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 10:04:04 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
 
-zfs-linux (0.6.4-4~wheezy) unstable; urgency=low
+zfs-linux (0.6.5.9-pve16~bpo90) unstable; urgency=medium
 
-  * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy)
-  
-  * use upstream version of /etc/default/zfs
+  * drop transitional packages
 
- -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 07:17:40 +0200
+  * convert python scripts to python 3, drop .py suffix
 
-zfs-linux (0.6.4-3~wheezy) unstable; urgency=low
+  * rebuild for PVE 5.0 / Debian Stretch
 
-  * update to 0.6.4.1
-  
- -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Apr 2015 07:31:44 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
 
-zfs-linux (0.6.4-2~wheezy) unstable; urgency=low
+zfs-linux (0.6.5.9-pve15~bpo80) unstable; urgency=medium
 
-  * cleanup /etc/default/zfs
-  
-  * include orignial zol changelog files
+  * update zfs to debian/0.6.5.9-1
 
- -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 07:30:59 +0200
- 
-zfs-linux (0.6.4-1~wheezy) unstable; urgency=low
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:10 +0100
 
-  * update to 0.6.4
+zfs-linux (0.6.5.8-pve14~bpo80) unstable; urgency=medium
 
- -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Apr 2015 09:33:13 +0200
+  * update zfs to debian/0.6.5.8-3
 
-zfs-linux (0.6.3-3~wheezy) unstable; urgency=low
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Jan 2017 09:34:58 +0100
 
-  * install init.d file for zed daemon
+zfs-linux (0.6.5.8-pve13~bpo80) unstable; urgency=medium
 
- -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Mar 2015 14:57:30 +0100
+  * 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
 
@@ -83,3 +192,4 @@ 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/0001-remove-DKMS-modules-and-dracut-build.patch

@@ -0,0 +1,274 @@
+From 0337ccd47d411a1db11e09dce1a6d183c2542f29 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Mon, 6 Feb 2017 11:03:10 +0100
+Subject: [PATCH 1/3] remove DKMS, modules and dracut build
+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>
+---
+ debian/control.in    |  36 +++---------------
+ debian/control       |   1 -
+ debian/not-installed |   1 +
+ debian/rules         | 105 +--------------------------------------------------
+ 4 files changed, 8 insertions(+), 135 deletions(-)
+
+diff --git a/debian/control.in b/debian/control.in
+index 18d2417cc..79bd9b302 100644
+--- a/debian/control.in
++++ b/debian/control.in
+@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf,
+                dh-systemd | debhelper (>= 10.1),
+                autotools-dev,
+                debhelper (>= 9),
+-               dkms (>> 2.1.1.2-5),
+                libselinux1-dev,
+                libtool,
+                lsb-release,
+@@ -85,25 +84,11 @@ Description: OpenZFS pool library for Linux
+  .
+  This zpool library provides support for managing zpools.
+ 
+-Package: zfs-dkms
+-Architecture: all
+-Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
+-Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
+-Recommends: zfsutils-linux, zfs-zed
+-Provides: zfs-modules
+-Description: OpenZFS 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
+- OpenZFS.
+-
+ Package: zfs-initramfs
+ Architecture: all
+ Depends: initramfs-tools,
+  busybox-initramfs | busybox-static | busybox,
+- zfs-modules | zfs-dkms, zfsutils-linux,
++ zfsutils-linux,
+  ${misc:Depends}
+ Description: OpenZFS root filesystem capabilities for Linux - initramfs
+  The Z file system is a pooled filesystem designed for maximum data
+@@ -113,23 +98,12 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
+  This package adds OpenZFS to the system initramfs with a hook
+  for the initramfs-tools infrastructure.
+ 
+-Package: zfs-dracut
+-Architecture: all
+-Depends: dracut, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
+-Description: OpenZFS root filesystem capabilities for Linux - dracut
+- 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 dracut infrastructure.
+-
+ Package: zfsutils-linux
+ Section: contrib/admin
+ Architecture: linux-any
+ Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
+-Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
+-Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
++Recommends: lsb-base, zfs-zed
++Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
+ Conflicts: zfs, zfs-fuse, zutils
+ Provides: zfsutils
+ Description: command-line tools to manage OpenZFS filesystems
+@@ -143,7 +117,7 @@ Description: command-line tools to manage OpenZFS filesystems
+ Package: zfs-zed
+ Section: contrib/admin
+ Architecture: linux-any
+-Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux
++Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux
+ Description: OpenZFS Event Daemon
+  The Z file system is a pooled filesystem designed for maximum data
+  integrity, supporting data snapshots, multiple copies, and data
+@@ -154,7 +128,7 @@ Description: OpenZFS Event Daemon
+ Package: zfs-test
+ Section: contrib/admin
+ Architecture: linux-any
+-Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python
++Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python
+ 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
+diff --git a/debian/control b/debian/control
+index 18d2417cc..b426b93c0 100644
+--- a/debian/control
++++ b/debian/control
+@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf,
+                dh-systemd | debhelper (>= 10.1),
+                autotools-dev,
+                debhelper (>= 9),
+-               dkms (>> 2.1.1.2-5),
+                libselinux1-dev,
+                libtool,
+                lsb-release,
+diff --git a/debian/not-installed b/debian/not-installed
+index f54fe7310..16b1cef6c 100644
+--- a/debian/not-installed
++++ b/debian/not-installed
+@@ -5,3 +5,4 @@ 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
++usr/lib/dracut
+diff --git a/debian/rules b/debian/rules
+index 800df22e0..8c5beca10 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
+ VERSION := $(shell dpkg-parsechangelog \
+   | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1)
+ 
+-DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
+-		DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
+-
+ ifndef BUILD_UDEB
+ BUILD_UDEB=false
+ endif
+@@ -21,21 +18,16 @@ KVERS=$(shell uname -r)
+ endif
+ 
+ ifndef SPL
+-SPL=/usr/src/spl-$(VERSION)
+-endif
+-
+-ifndef SPLOBJ
+-SPLOBJ=/var/lib/dkms/spl/$(VERSION)/$(KVERS)/$(shell dpkg-architecture -qDEB_TARGET_GNU_CPU)
++SPL=../pkg-spl
+ endif
+ 
+ non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
+ PACKAGE=zfs
+-pmodules = $(PACKAGE)-modules-$(non_epoch_version)
+ 
+ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+ 
+ %:
+-	dh $@ --with autoreconf,dkms,python3,systemd --parallel
++	dh $@ --with autoreconf,python3,systemd --parallel
+ 
+ override_dh_auto_configure:
+ 	@cp debian/control.in debian/control
+@@ -77,36 +69,6 @@ override_dh_auto_install:
+ 	$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
+ 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
+ 
+-	@# 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)'
+-	$(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.
+-	printf '#!/bin/sh\ncp "$$@"\n' > '$(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}`; \
+@@ -116,9 +78,6 @@ override_dh_auto_install:
+ 	chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
+ 	chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
+ 
+-override_dh_dkms:
+-	dh_dkms -V $(VERSION)
+-
+ override_dh_makeshlibs:
+ 	dh_makeshlibs -a
+ ifeq ($(BUILD_UDEB), true)
+@@ -156,65 +115,5 @@ override_dh_install:
+ 
+ # ------------
+ 
+-override_dh_prep-deb-files:
+-	for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
+-		sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/' \
+-		< $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
+-	done
+-	sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g' \
+-	< debian/control.modules.in > debian/control
+-
+-override_dh_configure_modules_udeb: override_dh_configure_modules_udeb_stamp
+-override_dh_configure_modules_udeb_stamp:
+-	./configure \
+-		--without-selinux \
+-		--with-config=kernel \
+-		--with-linux=$(KSRC) \
+-		--with-linux-obj=$(KOBJ) \
+-		--with-spl=$(SPL) \
+-		--with-spl-obj=$(SPLOBJ)
+-	touch override_dh_configure_modules_udeb_stamp
+-
+-override_dh_configure_modules: override_dh_configure_modules_stamp
+-override_dh_configure_modules_stamp:
+-	./configure \
+-		--with-config=kernel \
+-		--with-linux=$(KSRC) \
+-		--with-linux-obj=$(KOBJ) \
+-		--with-spl=$(SPL) \
+-		--with-spl-obj=$(SPLOBJ)
+-	touch override_dh_configure_modules_stamp
+-
+-override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules_udeb
+-	dh_testdir
+-	dh_testroot
+-	dh_prep
+-
+-	$(MAKE) -C $(CURDIR)/module modules
+-
+-	dh_installdirs -p${pmodules}-di
+-	dh_install -p${pmodules}-di
+-	dh_gencontrol -p${pmodules}-di
+-
+-	dh_builddeb -p${pmodules}-di
+-
+-override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_modules
+-	dh_testdir
+-	dh_testroot
+-	dh_prep
+-
+-	$(MAKE) -C $(CURDIR)/module modules
+-
+-	dh_install -p${pmodules}
+-	dh_installdocs -p${pmodules}
+-	dh_installchangelogs -p${pmodules}
+-	dh_compress -p${pmodules}
+-	dh_strip -p${pmodules}
+-	dh_fixperms -p${pmodules}
+-	dh_installdeb -p${pmodules}
+-	dh_gencontrol -p${pmodules}
+-	dh_md5sums -p${pmodules}
+-	dh_builddeb -p${pmodules}
+-
+ debian-copyright:
+ 	cme update dpkg-copyright -file debian/copyright.cme
+-- 
+2.14.2
+

zfs-patches/0002-import-with-d-dev-disk-by-id-in-scan-service.patch

@@ -0,0 +1,29 @@
+From 72fbbc64fe6f9e527e7ebce42d8e57c1fa82dd34 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 2/3] 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>
+---
+ 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 625f3a955..9a33d5f4a 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
+ Type=oneshot
+ RemainAfterExit=yes
+ ExecStartPre=/sbin/modprobe zfs
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none
++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
+ 
+ [Install]
+ WantedBy=zfs-mount.service
+-- 
+2.14.2
+

zfs-patches/0003-Use-user-namespaces-for-FSETID-policy-check.patch

@@ -0,0 +1,66 @@
+From f9171eb92ffd260debce2b28111dc7018d258588 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Tue, 31 Oct 2017 09:08:42 +0100
+Subject: [PATCH 3/3] Use user namespaces for FSETID policy check.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With this we also need to verify the group id of a file with
+the setgid flag has a valid mapping in the current
+namespace.
+
+Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
+---
+ module/zfs/policy.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/module/zfs/policy.c b/module/zfs/policy.c
+index 03e8f748b..dbbcfefa3 100644
+--- a/module/zfs/policy.c
++++ b/module/zfs/policy.c
+@@ -42,19 +42,26 @@
+  * all other cases this function must fail and return the passed err.
+  */
+ static int
+-priv_policy(const cred_t *cr, int capability, boolean_t all, int err)
++priv_policy_ns(const cred_t *cr, int capability, boolean_t all, int err,
++    struct user_namespace *ns)
+ {
+ 	ASSERT3S(all, ==, B_FALSE);
+ 
+ 	if (cr != CRED() && (cr != kcred))
+ 		return (err);
+ 
+-	if (!capable(capability))
++	if (!(ns ? ns_capable(ns, capability) : capable(capability)))
+ 		return (err);
+ 
+ 	return (0);
+ }
+ 
++static int
++priv_policy(const cred_t *cr, int capability, boolean_t all, int err)
++{
++	return priv_policy_ns(cr, capability, all, err, NULL);
++}
++
+ /*
+  * Checks for operations that are either client-only or are used by
+  * both clients and servers.
+@@ -175,8 +182,11 @@ secpolicy_vnode_setid_retain(const cred_t *cr, boolean_t issuidroot)
+ int
+ secpolicy_vnode_setids_setgids(const cred_t *cr, gid_t gid)
+ {
++	if (!kgid_has_mapping(cr->user_ns, SGID_TO_KGID(gid)))
++		return (EPERM);
+ 	if (crgetfsgid(cr) != gid && !groupmember(gid, cr))
+-		return (priv_policy(cr, CAP_FSETID, B_FALSE, EPERM));
++		return (priv_policy_ns(cr, CAP_FSETID, B_FALSE, EPERM,
++		    cr->user_ns));
+ 
+ 	return (0);
+ }
+-- 
+2.14.2
+

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 +1,3 @@
-fix-control.patch
-skip-unneeded-pull-requests.patch
+0001-remove-DKMS-modules-and-dracut-build.patch
+0002-import-with-d-dev-disk-by-id-in-scan-service.patch
+0003-Use-user-namespaces-for-FSETID-policy-check.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