bump ZFS version to 0.7.9-pve3~bpo9

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

.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,23 +1,23 @@
-RELEASE=4.1
+RELEASE=5.1
 
 # source form https://github.com/zfsonlinux/
 
-ZFSVER=0.6.5.9
+ZFSVER=0.7.9
-ZFSPKGREL=pve15~bpo80
+ZFSPKGREL=pve3~bpo9
-SPLPKGREL=pve8~bpo80
+SPLPKGREL=pve1~bpo9
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
-SPLDIR=pkg-spl
+SPLDIR=spl-build
-SPLSRC=pkg-spl.tar.gz
+SPLSRC=spl-debian
-ZFSDIR=pkg-zfs
+ZFSDIR=zfs-build
-ZFSSRC=pkg-zfs.tar.gz
+ZFSSRC=zfs-debian
 
-SPL_DEBS= 					\
+SPL_DEB = 					\
 spl_${SPLPKGVER}_amd64.deb
 
-ZFS_DEBS= 					\
+ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
-libnvpair1linux_${ZFSPKGVER}_amd64.deb		\
+ZFS_DEB2= 					\
 libuutil1linux_${ZFSPKGVER}_amd64.deb		\
 libzfs2linux_${ZFSPKGVER}_amd64.deb		\
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
@@ -25,27 +25,30 @@ libzpool2linux_${ZFSPKGVER}_amd64.deb		\
 zfs-dbg_${ZFSPKGVER}_amd64.deb			\
 zfs-zed_${ZFSPKGVER}_amd64.deb			\
 zfs-initramfs_${ZFSPKGVER}_all.deb		\
+zfs-test_${ZFSPKGVER}_amd64.deb		\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
 
-ZFS_TRANS_DEBS=					\
+DEBS=${SPL_DEB} ${ZFS_DEBS}
-libnvpair1_${ZFSPKGVER}_all.deb			\
-libuutil1_${ZFSPKGVER}_all.deb			\
-libzfs2_${ZFSPKGVER}_all.deb			\
-libzpool2_${ZFSPKGVER}_all.deb			\
-zfsutils_${ZFSPKGVER}_all.deb
 
-DEBS=${SPL_DEBS} ${ZFS_DEBS} ${ZFS_TRANS_DEBS}
+all: deb
-
+deb: ${DEBS}
-all: ${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}
+spl: ${SPL_DEB}
+${SPL_DEB}: ${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
@@ -54,9 +57,12 @@ spl ${SPL_DEBS}: ${SPLSRC}
 	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
 
 .PHONY: zfs
-zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
+zfs: $(ZFS_DEBS)
+$(ZFS_DEB2): $(ZFS_DEB1)
+$(ZFS_DEB1): $(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
@@ -64,19 +70,9 @@ zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
 	cd ${ZFSDIR}; rm -rf .pc ./patches
 	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
 
-.PHONY: download
-download:
-	rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
-	# clone pkg-zfsonlinux/spl and checkout 0.6.5.9-1
-	git clone -b debian/0.6.5.9-1 git://anonscm.debian.org/pkg-zfsonlinux/spl.git pkg-spl
-	# clone pkg-zfsonlinux/zfs and checkout 0.6.5.9-2
-	git clone -b debian/0.6.5.9-2 git://anonscm.debian.org/pkg-zfsonlinux/zfs.git pkg-zfs
-	tar czf ${SPLSRC} pkg-spl
-	tar czf ${ZFSSRC} pkg-zfs
-
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes *.buildinfo ${ZFSDIR} ${SPLDIR}
 
 .PHONY: distclean
 distclean: clean
@@ -84,4 +80,4 @@ distclean: clean
 
 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com upload
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64

spl-changelog.Debian

@@ -1,3 +1,59 @@
+spl-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
+
+  * update SPL to 0.7.9
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
+
+spl-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
+
+  * update SPL to 0.7.8 (no changes)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
+
+spl-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
+
+  * update SPL to 0.7.7
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
+
+spl-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
+
+  * update SPL to 0.7.6
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:47:54 +0100
+
+spl-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
+
+  * update SPL to 0.7.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
+
+spl-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
+
+  * update spl to 0.7.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
+
+spl-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
+
+  * update spl to 0.7.2
+
+  * clean up man pages
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:33:04 +0200
+
+spl-linux (0.6.5.11-pve10~bpo90) unstable; urgency=medium
+
+  * update spl to debian/0.6.5.11-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
+
+spl-linux (0.6.5.9-pve9~bpo90) unstable; urgency=medium
+
+  * rebuild for PVE 5.0 / Debian Stretch
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
+
 spl-linux (0.6.5.9-pve8~bpo80) unstable; urgency=medium
 
   * update spl to debian/0.6.5.9-1

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

@@ -1,4 +1,4 @@
-From b750abda7a2b24c52a4fba505571a629223ad64e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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] remove DKMS and module build
@@ -8,29 +8,49 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
- debian/control.in | 24 --------------------
+ debian/control    |  1 -
+ debian/control.in | 31 -------------------------
  debian/rules      | 68 +------------------------------------------------------
- 2 files changed, 1 insertion(+), 91 deletions(-)
+ 3 files changed, 1 insertion(+), 99 deletions(-)
 
-diff --git a/debian/control.in b/debian/control.in
+diff --git a/debian/control b/debian/control
-index 52c1660..dc6ee96 100644
+index 07db14a..01387e5 100644
---- a/debian/control.in
+--- a/debian/control
-+++ b/debian/control.in
++++ b/debian/control
-@@ -8,40 +8,16 @@ Build-Depends: autogen,
+@@ -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
+ Standards-Version: 4.1.2
  Homepage: http://www.zfsonlinux.org/
- Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/spl.git
+diff --git a/debian/control.in b/debian/control.in
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
+index 91242a1..5fd81aa 100644
+--- a/debian/control.in
++++ b/debian/control.in
+@@ -8,47 +8,16 @@ Build-Depends: autogen,
+                autotools-dev,
+                debhelper (>= 9),
+                dh-autoreconf,
+-               dkms (>> 2.2.0.2-1~),
+                libtool
+ Standards-Version: 4.1.2
+ Homepage: http://www.zfsonlinux.org/
+ Vcs-Git: git@salsa.debian.org:zfsonlinux-team/spl.git
+ Vcs-Browser: https://salsa.debian.org/zfsonlinux-team/spl
  
 -Package: spl-dkms
 -Architecture: all
--Depends: dkms (>> 2.2.1.0), file, libc-dev, lsb-release, ${misc:Depends}
+-Depends: dkms (>> 2.2.1.0),
--Recommends: spl (>= ${source:Upstream-Version})
+-         file,
+-         libc-dev,
+-         libelf-dev,
+-         lsb-release,
+-         ${misc:Depends}
+-Suggests: spl (>= ${source:Upstream-Version}),
+-         @LINUX_COMPAT@
+-Conflicts: spl (<< 0.7.9~)
 -Provides: spl-modules
 -Description: Solaris Porting Layer kernel modules for Linux
 - The Solaris Porting Layer (SPL) is a Linux kernel module which provides
@@ -58,7 +78,7 @@ index 52c1660..dc6ee96 100644
   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/rules b/debian/rules
-index b2fc86c..a474ca4 100755
+index 3a12abc..8dca8fd 100755
 --- a/debian/rules
 +++ b/debian/rules
 @@ -14,12 +14,8 @@ ifndef KVERS
@@ -74,7 +94,7 @@ index b2fc86c..a474ca4 100755
 +	dh $@ --with autoreconf --parallel
  
  override_dh_auto_configure:
- 	@cp debian/control.in debian/control
+ 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(<< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
 @@ -45,69 +41,7 @@ override_dh_auto_install:
  	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
  	$(MAKE) distdir
@@ -95,7 +115,7 @@ index b2fc86c..a474ca4 100755
  override_dh_auto_clean:
  	dh_auto_clean
  	@if test -e META.orig; then mv META.orig META; fi
- 	cp debian/control.in debian/control
+ 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(<< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
 -
 -# ------------
 -
@@ -146,5 +166,5 @@ index b2fc86c..a474ca4 100755
 -
 -	dh_builddeb -p${pmodules}
 -- 
-2.1.4
+2.11.0
 

spl-patches/series

@@ -1 +1 @@
-fix-control.patch
+0001-remove-DKMS-and-module-build.patch

zfs-changelog.Debian

@@ -1,3 +1,103 @@
+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

zfs-patches/0001-Undo-python-changes-until-PVE-5.0-release.patch

@@ -1,174 +0,0 @@
-From b8f3b081a866fc3d529fb2e72c425ef54c4d141d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 11 Jan 2017 09:16:11 +0100
-Subject: [PATCH 1/6] Undo python changes until PVE 5.0 release
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Revert "Remove .py extension from utilities in /usr/sbin as per policy 10.4 Scripts  (LP: #1628279)"
-
-This reverts commit e1c956cc55451476c465aad351c4b9c92294fc36.
-
-Revert "Use python3 for arcstat.py, arc_summary.py & dbufstat.py (LP: #1627909)"
-
-This reverts commit a52a9356809b8a09b97957a238a36da82ce9f850.
-
-Revert "Add missing part in python3 move"
-
-This reverts commit 9173586640d4a9f64f87a70bb9f93e41c78009fc.
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/control.in                              |  4 ++--
- debian/patches/1001-cmd-python-exec-path.patch | 30 --------------------------
- debian/control                                 |  4 ++--
- debian/patches/series                          |  1 -
- debian/rules                                   | 11 ++++------
- debian/zfsutils-linux.install                  |  6 +++---
- 6 files changed, 11 insertions(+), 45 deletions(-)
- delete mode 100644 debian/patches/1001-cmd-python-exec-path.patch
-
-diff --git a/debian/control.in b/debian/control.in
-index 76907e4..db75496 100644
---- a/debian/control.in
-+++ b/debian/control.in
-@@ -16,7 +16,7 @@ Build-Depends: dh-autoreconf,
-                po-debconf,
-                uuid-dev,
-                zlib1g-dev,
--               python3,
-+               python,
-                dh-python,
-                libblkid-dev,
-                libattr1-dev
-@@ -127,7 +127,7 @@ Description: OpenZFS root filesystem capabilities for Linux - dracut
- Package: zfsutils-linux
- Section: contrib/admin
- Architecture: linux-any
--Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
-+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
- Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
- Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
- Conflicts: zfs, zfs-fuse, zutils
-diff --git a/debian/patches/1001-cmd-python-exec-path.patch b/debian/patches/1001-cmd-python-exec-path.patch
-deleted file mode 100644
-index a05afb4..0000000
---- a/debian/patches/1001-cmd-python-exec-path.patch
-+++ /dev/null
-@@ -1,30 +0,0 @@
--Index: zfs-linux-0.6.5.8/cmd/arc_summary/arc_summary.py
--===================================================================
----- zfs-linux-0.6.5.8.orig/cmd/arc_summary/arc_summary.py
--+++ zfs-linux-0.6.5.8/cmd/arc_summary/arc_summary.py
--@@ -1,4 +1,4 @@
---#!/usr/bin/python
--+#!/usr/bin/python3
-- #
-- # $Id: arc_summary.pl,v 388:e27800740aa2 2011-07-08 02:53:29Z jhell $
-- #
--Index: zfs-linux-0.6.5.8/cmd/arcstat/arcstat.py
--===================================================================
----- zfs-linux-0.6.5.8.orig/cmd/arcstat/arcstat.py
--+++ zfs-linux-0.6.5.8/cmd/arcstat/arcstat.py
--@@ -1,4 +1,4 @@
---#!/usr/bin/python
--+#!/usr/bin/python3
-- #
-- # Print out ZFS ARC Statistics exported via kstat(1)
-- # For a definition of fields, or usage, use arctstat.pl -v
--Index: zfs-linux-0.6.5.8/cmd/dbufstat/dbufstat.py
--===================================================================
----- zfs-linux-0.6.5.8.orig/cmd/dbufstat/dbufstat.py
--+++ zfs-linux-0.6.5.8/cmd/dbufstat/dbufstat.py
--@@ -1,4 +1,4 @@
---#!/usr/bin/python
--+#!/usr/bin/python3
-- #
-- # Print out statistics for all cached dmu buffers.  This information
-- # is available through the dbufs kstat and may be post-processed as
-diff --git a/debian/control b/debian/control
-index 76907e4..db75496 100644
---- a/debian/control
-+++ b/debian/control
-@@ -16,7 +16,7 @@ Build-Depends: dh-autoreconf,
-                po-debconf,
-                uuid-dev,
-                zlib1g-dev,
--               python3,
-+               python,
-                dh-python,
-                libblkid-dev,
-                libattr1-dev
-@@ -127,7 +127,7 @@ Description: OpenZFS root filesystem capabilities for Linux - dracut
- Package: zfsutils-linux
- Section: contrib/admin
- Architecture: linux-any
--Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
-+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
- Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
- Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
- Conflicts: zfs, zfs-fuse, zutils
-diff --git a/debian/patches/series b/debian/patches/series
-index df85d5b..0fed690 100644
---- a/debian/patches/series
-+++ b/debian/patches/series
-@@ -4,7 +4,6 @@
- 1000-ppc64el-endian-support.patch
- 1002-fix-mips-build.patch
- enable-zed.patch
--1001-cmd-python-exec-path.patch
- 1004-zed-service-bindir.patch
- 1002-Fix-dev-zfs-device-is-missing.patch
- 0001-fix-booting-via-dracut-generated-initramfs.patch
-diff --git a/debian/rules b/debian/rules
-index 9efbace..70e57e5 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -35,7 +35,7 @@ pmodules = $(PACKAGE)-modules-$(non_epoch_version)
- export DEB_BUILD_MAINT_OPTIONS = hardening=+all
- 
- %:
--	dh $@ --with autoreconf,dkms,python3,systemd --parallel
-+	dh $@ --with autoreconf,dkms,python2,systemd --parallel
- 
- override_dh_auto_configure:
- 	@cp debian/control.in debian/control
-@@ -64,14 +64,11 @@ override_dh_auto_install:
- 	@# Install the utilities.
- 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
- 
-- 
- 	# Move from bin_dir to /usr/sbin
--	# Remove suffix (.py) as per policy 10.4 - Scripts
--	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
- 	mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/'
--	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary.py' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
--	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat.py' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
--	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
-+	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary.py' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary.py'
-+	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat.py' '$(CURDIR)/debian/tmp/usr/sbin/arcstat.py'
-+	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat.py'
- 
- 	@# Zed has dependencies outside of the system root.
- 	$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
-diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
-index 947ffd9..4badbf1 100644
---- a/debian/zfsutils-linux.install
-+++ b/debian/zfsutils-linux.install
-@@ -19,9 +19,9 @@ sbin/zdb
- sbin/zpios
- sbin/zpool
- sbin/zfs
--usr/sbin/arc_summary
--usr/sbin/arcstat
--usr/sbin/dbufstat
-+usr/sbin/arc_summary.py
-+usr/sbin/arcstat.py
-+usr/sbin/dbufstat.py
- usr/share/zfs/
- usr/share/man/man1/
- usr/share/man/man5/
--- 
-2.1.4
-

zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch

@@ -1,38 +1,53 @@
-From 0e7871b8878f78fd2c8c73a50cbf805b39afb4e7 Mon Sep 17 00:00:00 2001
+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 11:03:10 +0100
-Subject: [PATCH 2/6] remove DKMS, modules and dracut build
+Subject: [PATCH] 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 |  34 +++---------------
+ debian/control       |   1 -
- debian/rules      | 105 ++----------------------------------------------------
+ debian/control.in    |  40 ++-----------------
- 2 files changed, 6 insertions(+), 133 deletions(-)
+ debian/not-installed |   2 +
+ debian/rules         | 106 +--------------------------------------------------
+ 4 files changed, 7 insertions(+), 142 deletions(-)
 
+diff --git a/debian/control b/debian/control
+index 9e4f8fa7..42fbec35 100644
+--- a/debian/control
++++ b/debian/control
+@@ -9,7 +9,6 @@ Build-Depends: autotools-dev,
+                debhelper (>= 10.2),
+                dh-autoreconf,
+                dh-python,
+-               dkms (>> 2.1.1.2-5),
+                libattr1-dev,
+                libblkid-dev,
+                libselinux1-dev,
 diff --git a/debian/control.in b/debian/control.in
-index db75496..22dd958 100644
+index e193f017..2cb2f614 100644
 --- a/debian/control.in
 +++ b/debian/control.in
-@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf,
+@@ -9,7 +9,6 @@ Build-Depends: autotools-dev,
-                dh-systemd,
+                debhelper (>= 10.2),
-                autotools-dev,
+                dh-autoreconf,
-                debhelper (>= 9),
+                dh-python,
 -               dkms (>> 2.1.1.2-5),
+                libattr1-dev,
+                libblkid-dev,
                 libselinux1-dev,
-                libtool,
+@@ -86,26 +85,10 @@ Description: OpenZFS pool library for Linux
-                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})
+-Pre-Depends: spl-dkms (<<${source:Upstream-Version}.),
+-             spl-dkms (>= ${source:Upstream-Version})
 -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
--Recommends: zfsutils-linux, zfs-zed
+-Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}), @LINUX_COMPAT@
 -Provides: zfs-modules
 -Description: OpenZFS filesystem kernel modules for Linux
 - The Z file system is a pooled filesystem designed for maximum data
@@ -44,20 +59,22 @@ index db75496..22dd958 100644
 -
  Package: zfs-initramfs
  Architecture: all
- Depends: initramfs-tools,
+ Depends: busybox-initramfs | busybox-static | busybox,
-  busybox-initramfs | busybox-static | busybox,
+          initramfs-tools,
-- zfs-modules | zfs-dkms, zfsutils-linux,
+-         zfs-modules | zfs-dkms,
-+ zfsutils-linux,
+          zfsutils-linux (>= ${binary:Version}),
-  ${misc:Depends}
+          ${misc:Depends}
  Description: OpenZFS root filesystem capabilities for Linux - initramfs
-  The Z file system is a pooled filesystem designed for maximum data
+@@ -116,29 +99,14 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
-@@ -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}
+-Depends: dracut,
+-         zfs-modules | zfs-dkms,
+-         zfsutils-linux (>= ${binary:Version}),
+-         ${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
@@ -69,30 +86,52 @@ index db75496..22dd958 100644
  Package: zfsutils-linux
  Section: contrib/admin
  Architecture: linux-any
- Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+ Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
 -Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
--Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
+-Breaks: zfs-dkms (<< ${binary:Version}), zfs-dkms (>> ${binary:Version})
 +Recommends: lsb-base, zfs-zed
-+Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
+ Suggests: nfs-kernel-server,
- Conflicts: zfs, zfs-fuse, zutils
+           samba-common-bin (>= 3.0.23),
+-          zfs-initramfs | zfs-dracut
++          zfs-initramfs
+ Conflicts: zfs, zfs-fuse
  Provides: zfsutils
  Description: command-line tools to manage OpenZFS filesystems
-@@ -143,7 +117,7 @@ Description: command-line tools to manage OpenZFS filesystems
+@@ -152,8 +120,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: zfs-modules | zfs-dkms,
-+Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux
+-         zfsutils-linux (>= ${binary:Version}),
++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
+@@ -176,7 +143,6 @@ Depends: acl,
-  integrity, supporting data snapshots, multiple copies, and data
+          python,
+          sudo,
+          sysstat,
+-         zfs-modules | zfs-dkms,
+          zfsutils-linux (>=${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
+diff --git a/debian/not-installed b/debian/not-installed
+index a008985c..c60b0016 100644
+--- a/debian/not-installed
++++ b/debian/not-installed
+@@ -6,3 +6,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
++usr/lib/dracut
++usr/share/zfs/enum-extract.pl
 diff --git a/debian/rules b/debian/rules
-index 70e57e5..0c8a6a2 100755
+index e2c5a25f..86b5994d 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
+@@ -5,9 +5,6 @@ include /usr/share/dpkg/default.mk
- VERSION := $(shell dpkg-parsechangelog \
+ LSB_DISTRIBUTOR := $(shell lsb_release -is)
-   | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1)
+ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
  
 -DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
 -		DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
@@ -100,16 +139,16 @@ index 70e57e5..0c8a6a2 100755
  ifndef BUILD_UDEB
  BUILD_UDEB=false
  endif
-@@ -21,21 +18,16 @@ KVERS=$(shell uname -r)
+@@ -17,21 +14,16 @@ KVERS=$(shell uname -r)
  endif
  
  ifndef SPL
--SPL=/usr/src/spl-$(VERSION)
+-SPL=/usr/src/spl-$(DEB_VERSION_UPSTREAM)
 -endif
 -
 -ifndef SPLOBJ
--SPLOBJ=/var/lib/dkms/spl/$(VERSION)/$(KVERS)/$(shell dpkg-architecture -qDEB_TARGET_GNU_CPU)
+-SPLOBJ=/var/lib/dkms/spl/$(DEB_VERSION_UPSTREAM)/$(KVERS)/$(DEB_TARGET_GNU_CPU)
-+SPL=../pkg-spl
++SPL=../spl-build
  endif
  
  non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
@@ -119,59 +158,60 @@ index 70e57e5..0c8a6a2 100755
  export DEB_BUILD_MAINT_OPTIONS = hardening=+all
  
  %:
--	dh $@ --with autoreconf,dkms,python2,systemd --parallel
+-	dh $@ --with autoreconf,dkms,python3,systemd --parallel
-+	dh $@ --with autoreconf,python2,systemd --parallel
++	dh $@ --with autoreconf,python3,systemd --parallel
  
  override_dh_auto_configure:
- 	@cp debian/control.in debian/control
+ 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(<< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
-@@ -74,36 +66,6 @@ override_dh_auto_install:
+@@ -74,37 +66,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
+-	@# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ 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)'
+-	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts'
--	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
+-	cp '$(CURDIR)/scripts/enum-extract.pl' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts'
+-	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)' || 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'
+-		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/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'
+-		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
 -	@# Sanity test
--	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
+-	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
 -	@# Run autogen on the stripped source tree
--	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh
+-	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'; ./autogen.sh
--	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/autom4te.cache'
+-	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/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'
+-	printf '#!/bin/sh\ncp "$$@"\n' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/cp'
--	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
+-	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/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}`; \
-@@ -113,9 +75,6 @@ override_dh_auto_install:
+@@ -114,9 +75,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)
+-	dh_dkms -V $(DEB_VERSION_UPSTREAM)
 -
  override_dh_makeshlibs:
- 	dh_makeshlibs -a
+ 	dh_makeshlibs -a -V
  ifeq ($(BUILD_UDEB), true)
-@@ -153,65 +112,5 @@ override_dh_install:
+@@ -154,65 +112,5 @@ override_dh_install:
  
  # ------------
  
@@ -238,5 +278,5 @@ index 70e57e5..0c8a6a2 100755
  debian-copyright:
  	cme update dpkg-copyright -file debian/copyright.cme
 -- 
-2.1.4
+2.11.0
 

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

@@ -1,7 +1,7 @@
-From 9a97a884f8a409395e00891afdc28fa92b9f79b3 Mon Sep 17 00:00:00 2001
+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 5/6] import with -d /dev/disk/by-id in scan service
+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
@@ -12,18 +12,18 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
-index 0105283..665b9c8 100644
+index abc8e8e6..8fe2c107 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -10,7 +10,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
  Type=oneshot
  RemainAfterExit=yes
- ExecStartPre=/sbin/modprobe zfs
+ 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
+ WantedBy=zfs-import.target
 -- 
-2.1.4
+2.11.0
 

zfs-patches/0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch

@@ -1,68 +0,0 @@
-From 7e46d0f379706d74d5dc05ff20e58e708a1005a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 12 Oct 2016 11:32:17 +0200
-Subject: [PATCH 3/6] add zfsutils.preinst/postinst for wheezy upgrade path
-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/zfsutils-linux.postinst | 20 ++++++++++++++++++++
- debian/zfsutils-linux.preinst  | 17 +++++++++++++++++
- 2 files changed, 37 insertions(+)
- create mode 100755 debian/zfsutils-linux.postinst
- create mode 100755 debian/zfsutils-linux.preinst
-
-diff --git a/debian/zfsutils-linux.postinst b/debian/zfsutils-linux.postinst
-new file mode 100755
-index 0000000..7d57919
---- /dev/null
-+++ b/debian/zfsutils-linux.postinst
-@@ -0,0 +1,20 @@
-+#!/bin/sh
-+
-+set -e
-+
-+# Source debconf library
-+. /usr/share/debconf/confmodule
-+
-+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
-+then
-+	dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zed -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-zed -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-mount -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-share -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-import -- "$@"
-+fi
-+
-+#DEBHELPER#
-+
-diff --git a/debian/zfsutils-linux.preinst b/debian/zfsutils-linux.preinst
-new file mode 100755
-index 0000000..9338a7c
---- /dev/null
-+++ b/debian/zfsutils-linux.preinst
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+
-+set -e
-+
-+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
-+then
-+	dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zed -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-zed -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-mount -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-share -- "$@"
-+	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-import -- "$@"
-+fi
-+
-+#DEBHELPER#
-+
--- 
-2.1.4
-

zfs-patches/0003-always-load-ZFS-module-on-boot.patch

@@ -0,0 +1,30 @@
+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>
+---
+ 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 8b41baa3..59b058c9 100644
+--- a/etc/modules-load.d/zfs.conf.in
++++ b/etc/modules-load.d/zfs.conf.in
+@@ -1,3 +1,3 @@
+ # Always load kernel modules at boot.  The default behavior is to load the
+ # kernel modules in the zfs-import-*.service or when blkid(8) detects a pool.
+-#zfs
++zfs
+-- 
+2.11.0
+

zfs-patches/0004-Fix-zpl_mount-deadlock.patch

@@ -0,0 +1,92 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Wed, 11 Jul 2018 15:49:10 -0700
+Subject: [PATCH] Fix zpl_mount() deadlock
+
+Commit 93b43af10 inadvertently introduced the following scenario which
+can result in a deadlock.  This issue was most easily reproduced by
+LXD containers using a ZFS storage backend but should be reproducible
+under any workload which is frequently mounting and unmounting.
+
+-- THREAD A --
+spa_sync()
+  spa_sync_upgrades()
+    rrw_enter(&dp->dp_config_rwlock, RW_WRITER, FTAG); <- Waiting on B
+
+-- THREAD B --
+mount_fs()
+  zpl_mount()
+    zpl_mount_impl()
+      dmu_objset_hold()
+        dmu_objset_hold_flags()
+          dsl_pool_hold()
+            dsl_pool_config_enter()
+              rrw_enter(&dp->dp_config_rwlock, RW_READER, tag);
+    sget()
+      sget_userns()
+        grab_super()
+          down_write(&s->s_umount); <- Waiting on C
+
+-- THREAD C --
+cleanup_mnt()
+  deactivate_super()
+    down_write(&s->s_umount);
+    deactivate_locked_super()
+      zpl_kill_sb()
+        kill_anon_super()
+          generic_shutdown_super()
+            sync_filesystem()
+              zpl_sync_fs()
+                zfs_sync()
+                  zil_commit()
+                    txg_wait_synced() <- Waiting on A
+
+Reviewed by: Alek Pinchuk <apinchuk@datto.com>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #7598
+Closes #7659
+Closes #7691
+Closes #7693
+
+(Cherry-picked from ac09630d8b0bf6c92084a30fdaefd03fd0adbdc1)
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ include/sys/zfs_vfsops.h |  1 +
+ module/zfs/zpl_super.c   | 11 ++++++++++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/include/sys/zfs_vfsops.h b/include/sys/zfs_vfsops.h
+index 2326da42..927153b2 100644
+--- a/include/sys/zfs_vfsops.h
++++ b/include/sys/zfs_vfsops.h
+@@ -32,6 +32,7 @@
+ #include <sys/zil.h>
+ #include <sys/sa.h>
+ #include <sys/rrwlock.h>
++#include <sys/dsl_dataset.h>
+ #include <sys/zfs_ioctl.h>
+ 
+ #ifdef	__cplusplus
+diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c
+index fc10271b..5c426b0a 100644
+--- a/module/zfs/zpl_super.c
++++ b/module/zfs/zpl_super.c
+@@ -271,8 +271,17 @@ zpl_mount_impl(struct file_system_type *fs_type, int flags, zfs_mnt_t *zm)
+ 	if (err)
+ 		return (ERR_PTR(-err));
+ 
++	/*
++	 * The dsl pool lock must be released prior to calling sget().
++	 * It is possible sget() may block on the lock in grab_super()
++	 * while deactivate_super() holds that same lock and waits for
++	 * a txg sync.  If the dsl_pool lock is held over over sget()
++	 * this can prevent the pool sync and cause a deadlock.
++	 */
++	dsl_pool_rele(dmu_objset_pool(os), FTAG);
+ 	s = zpl_sget(fs_type, zpl_test_super, set_anon_super, flags, os);
+-	dmu_objset_rele(os, FTAG);
++	dsl_dataset_rele(dmu_objset_ds(os), FTAG);
++
+ 	if (IS_ERR(s))
+ 		return (ERR_CAST(s));
+ 

zfs-patches/0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch

@@ -1,141 +0,0 @@
-From 97a0ced45e12cd4cca627392f2d9eea6963ee00e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 12 Oct 2016 13:16:03 +0200
-Subject: [PATCH 4/6] ensure upgrade path from existing PVE ZFS packages
-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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 58 insertions(+), 1 deletion(-)
-
-diff --git a/debian/control.in b/debian/control.in
-index 22dd958..2bee2bf 100644
---- a/debian/control.in
-+++ b/debian/control.in
-@@ -28,6 +28,8 @@ Package: libnvpair1linux
- Section: contrib/libs
- Architecture: linux-any
- Depends: ${misc:Depends}, ${shlibs:Depends}
-+Replaces: libnvpair1 (<< 0.6.5.8-pve11~bpo80)
-+Breaks: libnvpair1 (<< 0.6.5.8-pve11~bpo80)
- 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
-@@ -37,6 +39,8 @@ Package: libuutil1linux
- Section: contrib/libs
- Architecture: linux-any
- Depends: ${misc:Depends}, ${shlibs:Depends}
-+Replaces: libuutil1 (<< 0.6.5.8-pve11~bpo80)
-+Breaks: libuutil1 (<< 0.6.5.8-pve11~bpo80)
- 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
-@@ -54,6 +58,8 @@ Architecture: linux-any
- Depends: libzfs2linux (= ${binary:Version}), libzpool2linux (= ${binary:Version}),
-  libnvpair1linux (= ${binary:Version}), libuutil1linux (= ${binary:Version}),
-  ${misc:Depends}
-+Replaces: libzfs-dev (<< 0.6.5.8-pve11~bpo80)
-+Breaks: libzfs-dev (<< 0.6.5.8-pve11~bpo80)
- Provides: libnvpair-dev, libuutil-dev
- Description: OpenZFS filesystem development files for Linux
-  Header files and static libraries for compiling software against
-@@ -66,6 +72,8 @@ Package: libzfs2linux
- Section: contrib/libs
- Architecture: linux-any
- Depends: ${misc:Depends}, ${shlibs:Depends}
-+Replaces: libzfs2 (<< 0.6.5.8-pve11~bpo80)
-+Breaks: libzfs2 (<< 0.6.5.8-pve11~bpo80)
- 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
-@@ -77,6 +85,8 @@ Package: libzpool2linux
- Section: contrib/libs
- Architecture: linux-any
- Depends: ${misc:Depends}, ${shlibs:Depends}
-+Replaces: libzpool2 (<< 0.6.5.8-pve11~bpo80)
-+Breaks: libzpool2 (<< 0.6.5.8-pve11~bpo80)
- 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
-@@ -88,8 +98,10 @@ Package: zfs-initramfs
- Architecture: all
- Depends: initramfs-tools,
-  busybox-initramfs | busybox-static | busybox,
-- zfsutils-linux,
-+ zfsutils-linux (>= 0.6.5.8-pve11~bpo80),
-  ${misc:Depends}
-+Breaks: zfs-initramfs (<< 0.6.5.8-pve11~bpo80)
-+Replaces: zfs-initramfs (<< 0.6.5.8-pve11~bpo80)
- 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
-@@ -104,7 +116,9 @@ Architecture: linux-any
- Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
- Recommends: lsb-base, zfs-zed
- Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
-+Replaces: zfsutils (<< 0.6.5.8-pve11~bpo80)
- Conflicts: zfs, zfs-fuse, zutils
-+Breaks: zfsutils (<< 0.6.5.8-pve11~bpo80)
- Provides: zfsutils
- Description: command-line tools to manage OpenZFS filesystems
-  The Z file system is a pooled filesystem designed for maximum data
-@@ -118,6 +132,7 @@ Package: zfs-zed
- Section: contrib/admin
- Architecture: linux-any
- Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux
-+Replaces: zfsutils (<< 0.6.5.8-pve11~bpo80)
- Description: OpenZFS Event Daemon
-  The Z file system is a pooled filesystem designed for maximum data
-  integrity, supporting data snapshots, multiple copies, and data
-@@ -142,3 +157,45 @@ Description: Debugging symbols for OpenZFS userland libraries and tools
-  .
-  This package contains the debugging symbols for libzpool2linux, libzfs2linux,
-  libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
-+
-+# Transitional packages
-+
-+Package: libzfs2
-+Depends: libzfs2linux, ${misc:Depends}
-+Architecture: all
-+Priority: extra
-+Section: oldlibs
-+Description: transitional package
-+ This is a transitional package. It can safely be removed.
-+
-+Package: libzpool2
-+Depends: libzpool2linux, ${misc:Depends}
-+Architecture: all
-+Priority: extra
-+Section: oldlibs
-+Description: transitional package
-+ This is a transitional package. It can safely be removed.
-+
-+Package: libnvpair1
-+Depends: libnvpair1linux, ${misc:Depends}
-+Architecture: all
-+Priority: extra
-+Section: oldlibs
-+Description: transitional package
-+ This is a transitional package. It can safely be removed.
-+
-+Package: libuutil1
-+Depends: libuutil1linux, ${misc:Depends}
-+Architecture: all
-+Priority: extra
-+Section: oldlibs
-+Description: transitional package
-+ This is a transitional package. It can safely be removed.
-+
-+Package: zfsutils
-+Depends: zfsutils-linux, ${misc:Depends}
-+Architecture: all
-+Priority: extra
-+Section: oldlibs
-+Description: transitional package
-+ This is a transitional package. It can safely be removed.
--- 
-2.1.4
-

zfs-patches/0005-Fix-deadlock-between-zfs-umount-snapentry_expire.patch

@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Rohan Puri <rohan.puri15@gmail.com>
+Date: Sat, 28 Jul 2018 18:32:12 +0530
+Subject: [PATCH] Fix deadlock between zfs umount & snapentry_expire
+
+zfs umount -> zfsctl_destroy() takes the zfs_snapshot_lock as a
+writer and calls zfsctl_snapshot_unmount_cancel(), which waits
+for snapentry_expire() if present (when snap is automounted).
+This snapentry_expire() itself then waits for zfs_snapshot_lock
+as a reader, resulting in a deadlock.
+
+The fix is to only hold the zfs_snapshot_lock over the tree
+lookup and removal.  After a successful lookup the lock can
+be dropped and zfs_snapentry_t will remain valid until the
+reference taken by the lookup is released.
+
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Rohan Puri <rohan.puri15@gmail.com>
+Closes #7751
+Closes #7752
+
+(Cherry-picked from fd7265c646f40e364396af5014bbb83e809e124a)
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ module/zfs/zfs_ctldir.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
+index 3b5fb196..14af55c4 100644
+--- a/module/zfs/zfs_ctldir.c
++++ b/module/zfs/zfs_ctldir.c
+@@ -358,8 +358,6 @@ snapentry_expire(void *data)
+ static void
+ zfsctl_snapshot_unmount_cancel(zfs_snapentry_t *se)
+ {
+-	ASSERT(RW_LOCK_HELD(&zfs_snapshot_lock));
+-
+ 	if (taskq_cancel_id(system_delay_taskq, se->se_taskqid) == 0) {
+ 		se->se_taskqid = TASKQID_INVALID;
+ 		zfsctl_snapshot_rele(se);
+@@ -570,13 +568,14 @@ zfsctl_destroy(zfsvfs_t *zfsvfs)
+ 		uint64_t objsetid = dmu_objset_id(zfsvfs->z_os);
+ 
+ 		rw_enter(&zfs_snapshot_lock, RW_WRITER);
+-		if ((se = zfsctl_snapshot_find_by_objsetid(spa, objsetid))
+-		    != NULL) {
+-			zfsctl_snapshot_unmount_cancel(se);
++		se = zfsctl_snapshot_find_by_objsetid(spa, objsetid);
++		if (se != NULL)
+ 			zfsctl_snapshot_remove(se);
++		rw_exit(&zfs_snapshot_lock);
++		if (se != NULL) {
++			zfsctl_snapshot_unmount_cancel(se);
+ 			zfsctl_snapshot_rele(se);
+ 		}
+-		rw_exit(&zfs_snapshot_lock);
+ 	} else if (zfsvfs->z_ctldir) {
+ 		iput(zfsvfs->z_ctldir);
+ 		zfsvfs->z_ctldir = NULL;

zfs-patches/0006-fix-rm-path-in-zfs-share.service.patch

@@ -1,29 +0,0 @@
-From 4264f648987efc980002ede5add258a427ad9a05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Thu, 27 Oct 2016 10:18:55 +0200
-Subject: [PATCH 6/6] fix rm path in zfs-share.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-share.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in
-index 688731e..494f5cb 100644
---- a/etc/systemd/system/zfs-share.service.in
-+++ b/etc/systemd/system/zfs-share.service.in
-@@ -9,7 +9,7 @@ PartOf=smb.service
- [Service]
- Type=oneshot
- RemainAfterExit=yes
--ExecStartPre=-@bindir@/rm -f /etc/dfs/sharetab
-+ExecStartPre=-/bin/rm -f /etc/dfs/sharetab
- ExecStart=@sbindir@/zfs share -a
- 
- [Install]
--- 
-2.1.4
-

zfs-patches/series

@@ -1,6 +1,5 @@
-0001-Undo-python-changes-until-PVE-5.0-release.patch
+0001-remove-DKMS-modules-and-dracut-build.patch
-0002-remove-DKMS-modules-and-dracut-build.patch
+0002-import-with-d-dev-disk-by-id-in-scan-service.patch
-0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch
+0003-always-load-ZFS-module-on-boot.patch
-0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch
+0004-Fix-zpl_mount-deadlock.patch
-0005-import-with-d-dev-disk-by-id-in-scan-service.patch
+0005-Fix-deadlock-between-zfs-umount-snapentry_expire.patch
-0006-fix-rm-path-in-zfs-share.service.patch