update make upload target

2017-03-10 09:36:44 +01:00
20 changed files with 476 additions and 337 deletions
@@ -1,6 +0,0 @@
-[submodule "zfs-debian"]
-	path = zfs-debian
-	url = ../mirror_zfs-debian
-[submodule "spl-debian"]
-	path = spl-debian
-	url = ../mirror_spl-debian
@@ -1,17 +1,17 @@
-RELEASE=5.1
+RELEASE=4.1

 # source form https://github.com/zfsonlinux/

-ZFSVER=0.7.3
-ZFSPKGREL=pve1~bpo9
-SPLPKGREL=pve1~bpo9
+ZFSVER=0.6.5.9
+ZFSPKGREL=pve15~bpo80
+SPLPKGREL=pve8~bpo80
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}

-SPLDIR=spl-build
-SPLSRC=spl-debian
-ZFSDIR=zfs-build
-ZFSSRC=zfs-debian
+SPLDIR=pkg-spl
+SPLSRC=pkg-spl.tar.gz
+ZFSDIR=pkg-zfs
+ZFSSRC=pkg-zfs.tar.gz

 SPL_DEBS= 					\
 spl_${SPLPKGVER}_amd64.deb
@@ -25,50 +25,58 @@ 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

-DEBS=${SPL_DEBS} ${ZFS_DEBS}
+ZFS_TRANS_DEBS=					\
+libnvpair1_${ZFSPKGVER}_all.deb			\
+libuutil1_${ZFSPKGVER}_all.deb			\
+libzfs2_${ZFSPKGVER}_all.deb			\
+libzpool2_${ZFSPKGVER}_all.deb			\
+zfsutils_${ZFSPKGVER}_all.deb

-all: deb
-deb: ${DEBS}
+DEBS=${SPL_DEBS} ${ZFS_DEBS} ${ZFS_TRANS_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}
 	rm -rf ${SPLDIR}
-	mkdir ${SPLDIR}
-	cp -a ${SPLSRC}/* ${SPLDIR}/
+	tar xf ${SPLSRC}
 	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}; dpkg-buildpackage -b -uc -us
+	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us 

 .PHONY: zfs
 zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
 	rm -rf ${ZFSDIR}
-	mkdir ${ZFSDIR}
-	cp -a ${ZFSSRC}/* ${ZFSDIR}/
+	tar xf ${ZFSSRC}
 	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}; dpkg-buildpackage -b -uc -us
+	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 *.buildinfo ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}

 .PHONY: distclean
 distclean: clean
@@ -76,4 +84,4 @@ distclean: clean

 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch amd64
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist jessie
@@ -1,29 +1,3 @@
-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
@@ -1,55 +0,0 @@
-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
-
@@ -1,38 +0,0 @@
-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
-
@@ -1,7 +1,7 @@
-From 9cb5edffe475c25c4132aace431ffc6a97531583 Mon Sep 17 00:00:00 2001
+From b750abda7a2b24c52a4fba505571a629223ad64e 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
+Subject: [PATCH] remove DKMS and module build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -9,9 +9,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(-)
+ 2 files changed, 1 insertion(+), 91 deletions(-)

 diff --git a/debian/control.in b/debian/control.in
 index 52c1660..dc6ee96 100644
@@ -58,18 +57,6 @@ index 52c1660..dc6ee96 100644
 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
@@ -159,5 +146,5 @@ index b2fc86c..a474ca4 100755
 -
 -	dh_builddeb -p${pmodules}
 -- 
-2.14.1
+2.1.4

@@ -1,3 +1 @@
-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
+fix-control.patch
@@ -1,47 +1,3 @@
-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
@@ -0,0 +1,174 @@
+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
+
@@ -1,25 +1,23 @@
-From 0337ccd47d411a1db11e09dce1a6d183c2542f29 Mon Sep 17 00:00:00 2001
+From 0e7871b8878f78fd2c8c73a50cbf805b39afb4e7 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
+Subject: [PATCH 2/6] 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(-)
+ debian/control.in |  34 +++---------------
+ debian/rules      | 105 ++----------------------------------------------------
+ 2 files changed, 6 insertions(+), 133 deletions(-)

 diff --git a/debian/control.in b/debian/control.in
-index 18d2417cc..79bd9b302 100644
+index db75496..22dd958 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf,
-                dh-systemd | debhelper (>= 10.1),
+                dh-systemd,
                autotools-dev,
                debhelper (>= 9),
 -               dkms (>> 2.1.1.2-5),
@@ -71,7 +69,7 @@ index 18d2417cc..79bd9b302 100644
 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
 +Recommends: lsb-base, zfs-zed
@@ -88,38 +86,8 @@ index 18d2417cc..79bd9b302 100644
 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
+index 70e57e5..0c8a6a2 100755
 --- a/debian/rules
 +++ b/debian/rules
@@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
@@ -151,12 +119,12 @@ index 800df22e0..8c5beca10 100755
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autoreconf,dkms,python3,systemd --parallel
-+	dh $@ --with autoreconf,python3,systemd --parallel
+-	dh $@ --with autoreconf,dkms,python2,systemd --parallel
+	dh $@ --with autoreconf,python2,systemd --parallel
 
 override_dh_auto_configure:
 	@cp debian/control.in debian/control
-@@ -77,36 +69,6 @@ override_dh_auto_install:
+@@ -74,36 +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'
 
@@ -193,7 +161,7 @@ index 800df22e0..8c5beca10 100755
 	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:
+@@ -113,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
 
@@ -203,7 +171,7 @@ index 800df22e0..8c5beca10 100755
 override_dh_makeshlibs:
 	dh_makeshlibs -a
 ifeq ($(BUILD_UDEB), true)
-@@ -156,65 +115,5 @@ override_dh_install:
+@@ -153,65 +112,5 @@ override_dh_install:
 
 # ------------
 
@@ -270,5 +238,5 @@ index 800df22e0..8c5beca10 100755
 debian-copyright:
 	cme update dpkg-copyright -file debian/copyright.cme
 -- 
-2.14.2
+2.1.4

@@ -1,66 +0,0 @@
-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
-
@@ -0,0 +1,68 @@
+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
+
@@ -0,0 +1,141 @@
+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
+
@@ -1,7 +1,7 @@
-From 72fbbc64fe6f9e527e7ebce42d8e57c1fa82dd34 Mon Sep 17 00:00:00 2001
+From 9a97a884f8a409395e00891afdc28fa92b9f79b3 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
+Subject: [PATCH 5/6] 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,10 +12,10 @@ 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 625f3a955..9a33d5f4a 100644
+index 0105283..665b9c8 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
+@@ -10,7 +10,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
 Type=oneshot
 RemainAfterExit=yes
 ExecStartPre=/sbin/modprobe zfs
@@ -25,5 +25,5 @@ index 625f3a955..9a33d5f4a 100644
 [Install]
 WantedBy=zfs-mount.service
 -- 
-2.14.2
+2.1.4

@@ -0,0 +1,29 @@
+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
+
@@ -1,3 +1,6 @@
-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
+0001-Undo-python-changes-until-PVE-5.0-release.patch
+0002-remove-DKMS-modules-and-dracut-build.patch
+0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch
+0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch
+0005-import-with-d-dev-disk-by-id-in-scan-service.patch
+0006-fix-rm-path-in-zfs-share.service.patch