fixup spl und zfs changelog entries

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

.gitmodules

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

Makefile

@@ -1,95 +1,104 @@
-RELEASE=3.3
+RELEASE=5.1
 
 # source form https://github.com/zfsonlinux/
 
-ZFSVER=0.6.3-1.2
+SPLDIR=spl-linux_${ZFSVER}
-ZFSPKGREL=2~wheezy
+SPLSRC=spl/upstream
-SPLPKGREL=1~wheezy
+SPLPKG=spl/debian
-ZFSPKGVER=0.6.3-${ZFSPKGREL}
+ZFSDIR=zfs-linux_${ZFSVER}
-SPLPKGVER=0.6.3-${SPLPKGREL}
+ZFSSRC=zfs/upstream
+ZFSPKG=zfs/debian
 
-SPLDIR=spl-spl-${ZFSVER}
+ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
-SPLSRC=spl-${ZFSVER}.tar.gz
-ZFSDIR=zfs-zfs-${ZFSVER}
-ZFSSRC=zfs-${ZFSVER}.tar.gz
 
-SPL_DEBS= 			\
+ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
+SPLPKGVER != dpkg-parsechangelog -l ${SPLPKG}/changelog -Sversion
+
+SPL_DEB = 					\
 spl_${SPLPKGVER}_amd64.deb
+SPL_DSC = spl-linux_${SPLPKGVER}.dsc
 
-ZFS_DEBS= 				\
+ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
-libnvpair1_${ZFSPKGVER}_amd64.deb 		\
+ZFS_DEB2= 					\
-libuutil1_${ZFSPKGVER}_amd64.deb		\
+libuutil1linux_${ZFSPKGVER}_amd64.deb		\
-libzfs2_${ZFSPKGVER}_amd64.deb		\
+libzfs2linux_${ZFSPKGVER}_amd64.deb		\
-libzfs-dev_${ZFSPKGVER}_amd64.deb		\
+libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool2_${ZFSPKGVER}_amd64.deb		\
+libzpool2linux_${ZFSPKGVER}_amd64.deb		\
-zfs-doc_${ZFSPKGVER}_amd64.deb		\
+zfs-dbg_${ZFSPKGVER}_amd64.deb			\
-zfs-initramfs_${ZFSPKGVER}_amd64.deb	\
+zfs-zed_${ZFSPKGVER}_amd64.deb			\
-zfsutils_${ZFSPKGVER}_amd64.deb
+zfs-initramfs_${ZFSPKGVER}_all.deb		\
+zfs-test_${ZFSPKGVER}_amd64.deb		\
+zfsutils-linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
+ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
 
-DEBS=${SPL_DEBS} ${ZFS_DEBS} 
+DEBS=${SPL_DEB} ${ZFS_DEBS}
+DSCS=${SPL_DSC} ${ZFS_DSC}
 
-all: ${DEBS}
+all: deb
+.PHONY: deb
+deb: ${DEBS}
+.PHONY: dsc
+dsc: ${DSCS}
+
+# called from pve-kernel's Makefile to get patched sources
+.PHONY: kernel
+kernel: dsc
+	dpkg-source -x ${SPL_DSC} ../pkg-spl
+	dpkg-source -x ${ZFS_DSC} ../pkg-zfs
 
 .PHONY: dinstall
 dinstall: ${DEBS}
 	dpkg -i ${DEBS}
 
+.PHONY: submodule
+submodule:
+	test -f "${ZFSSRC}/README.markdown" || git submodule update --init
+	test -f "${SPLSRC}/README.markdown" || git submodule update --init
+
 .PHONY: spl
-spl ${SPL_DEBS}: ${SPLSRC}
+spl: ${SPL_DEB}
+${SPL_DEB}: ${SPLDIR}
+	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
+	lintian ${SPL_DEB}
+
+${SPL_DSC}: ${SPLDIR}
+	tar czf spl-linux_${ZFSVER}.orig.tar.gz ${SPLDIR}
+	cd ${SPLDIR}; dpkg-buildpackage -S -uc -us -d
+	lintian $@
+
+${SPLDIR}: ${SPLSRC} ${SPLPKG}
 	rm -rf ${SPLDIR}
-	tar xf ${SPLSRC}
+	mkdir ${SPLDIR}
-	cp -a spl-debian-pve ${SPLDIR}/debian
+	cp -a ${SPLSRC}/* ${SPLDIR}/
-	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us 
+	cp -a ${SPLPKG} ${SPLDIR}/debian
 
 .PHONY: zfs
-zfs ${ZFS_DEBS}: ${ZFSSRC}
+zfs: $(ZFS_DEBS)
-	rm -rf ${ZFSDIR}
+$(ZFS_DEB2): $(ZFS_DEB1)
-	tar xf ${ZFSSRC}
+$(ZFS_DEB1): ${ZFSDIR}
-	cp -a zfs-debian-pve ${ZFSDIR}/debian
+	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
+	lintian ${ZFS_DEBS}
+
+${ZFS_DSC}: ${ZFSDIR}
+	tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
+	cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
+	lintian $@
+
+${ZFSDIR}: $(ZFSSRC) ${ZFSPKG}
+	rm -rf ${ZFSDIR}
+	mkdir ${ZFSDIR}
+	cp -a ${ZFSSRC}/* ${ZFSDIR}/
+	cp -a ${ZFSPKG} ${ZFSDIR}/debian
 
-.PHONY: download
-download:
-	#git clone https://github.com/zfsonlinux/pkg-spl.git
-	#git clone https://github.com/zfsonlinux/pkg-zfs.git
-	##git checkout master/ubuntu/precise
-	##git checkout master/debian/wheezy
-	rm spl-*.tar.gz
-	rm zfs-*.tar.gz
-	wget https://github.com/zfsonlinux/spl/archive/${SPLSRC}
-	wget https://github.com/zfsonlinux/zfs/archive/${ZFSSRC}
 
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR} ${SPLDIR}
 
 .PHONY: distclean
 distclean: clean
 
-
 .PHONY: upload
 upload: ${DEBS}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64
-	mkdir -p /pve/${RELEASE}/extra
-	rm -f /pve/${RELEASE}/extra/spl_*.deb
-	rm -f /pve/${RELEASE}/extra/spl-dkms_*.deb
-	rm -f /pve/${RELEASE}/extra/libnvpair1_*.deb
-	rm -f /pve/${RELEASE}/extra/libnvpair1-dbg_*.deb
-	rm -f /pve/${RELEASE}/extra/libuutil1_*.deb
-	rm -f /pve/${RELEASE}/extra/libuutil1-dbg_*.deb
-	rm -f /pve/${RELEASE}/extra/libzfs2_*.deb
-	rm -f /pve/${RELEASE}/extra/libzfs2-dbg_*.deb
-	rm -f /pve/${RELEASE}/extra/libzfs-dev_*.deb
-	rm -f /pve/${RELEASE}/extra/libzpool2_*.deb
-	rm -f /pve/${RELEASE}/extra/libzpool2-dbg_*.deb
-	rm -f /pve/${RELEASE}/extra/zfs_*.deb
-	rm -f /pve/${RELEASE}/extra/zfs-dkms_*.deb
-	rm -f /pve/${RELEASE}/extra/zfs-doc_*.deb
-	rm -f /pve/${RELEASE}/extra/zfs-initramfs_*.deb
-	rm -f /pve/${RELEASE}/extra/zfsutils_*.deb
-	rm -f /pve/${RELEASE}/extra/zfsutils-dbg_*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEBS} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
-

README

@@ -1,13 +1,13 @@
 Proxmox VE packaging for ZFS on Linux
 
-This is based of code from:
+This is based on code from:
 
-https://github.com/zfsonlinux/pkg-spl.git
+https://salsa.debian.org/zfsonlinux-team/zfs
-https://github.com/zfsonlinux/pkg-zfs.git
+https://salsa.debian.org/zfsonlinux-team/spl
 
-We merged updates from the precice branch into the older wheezy 
+We removed the dkms/modules related code, because we ship the
-branch.
+modules with the kernel.
 
 For licensing questions, see:
 
-http://open-zfs.org/wiki/Talk:FAQ
+http://open-zfs.org/wiki/Talk:FAQ

spl-debian-pve/changelog

@@ -1,6 +0,0 @@
-spl-linux (0.6.3-1~wheezy) unstable; urgency=low
-
-  * first version for Proxmox VE
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
-

spl-debian-pve/compat

@@ -1 +0,0 @@
-7

spl-debian-pve/control

@@ -1,34 +0,0 @@
-Source: spl-linux
-Section: kernel
-Priority: extra
-Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: autotools-dev,
- autoconf,
- autogen,
- automake,
- debhelper (>= 8),
- dh-autoreconf,
- dkms (>= 2.2.0.2),
- libtool,
-Standards-Version: 3.9.5
-Homepage: http://www.zfsonlinux.org/
-
-Package: spl-dkms
-Architecture: all
-Depends: ${misc:Depends}, dkms (>= 2.2.0.2), file, lsb-release
-Recommends: spl
-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.
-
-Package: spl
-Architecture: any
-Conflicts: spl-dev
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Solaris Porting Layer utilities for Linux
- This package provides the userspace utilities for the SPL and SPLAT Linux
- kernel modules.

spl-debian-pve/dkms

@@ -1,35 +0,0 @@
-AUTOINSTALL="yes"
-PACKAGE_NAME="spl"
-PACKAGE_VERSION="#MODULE_VERSION#"
-PRE_BUILD="configure
-  --prefix=/usr
-  --with-config=kernel
-  --with-linux=$(case `lsb_release -is` in
-                   (Debian)
-                     if [ -e ${kernel_source_dir/%build/source} ]
-                     then
-                       echo ${kernel_source_dir/%build/source}
-                     else
-                       # This is a kpkg exception for Proxmox 2.0
-		       echo ${kernel_source_dir}
-                     fi
-                     ;;
-                   (*)
-                     echo ${kernel_source_dir}
-                     ;;
-                 esac)
-  --with-linux-obj=${kernel_source_dir}
-"
-POST_INSTALL="cp
-  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/spl_config.h
-  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/module/Module.symvers
-  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/${kernelver}/${arch}/
-"
-REMAKE_INITRD="no"
-MAKE[0]="make"
-BUILT_MODULE_NAME[0]="spl"
-BUILT_MODULE_LOCATION[0]="module/spl/"
-DEST_MODULE_LOCATION[0]="/extra/spl/spl"
-BUILT_MODULE_NAME[1]="splat"
-BUILT_MODULE_LOCATION[1]="module/splat/"
-DEST_MODULE_LOCATION[1]="/extra/splat/splat"

spl-debian-pve/patches/0001-Revert-Remove-etc-hostid-missing-warning.patch

@@ -1,28 +0,0 @@
-From 7559daf38acc293474d3d2a13ecf746bc7507a11 Mon Sep 17 00:00:00 2001
-From: Darik Horn <dajhorn@vanadac.com>
-Date: Tue, 11 Oct 2011 18:32:58 -0500
-Subject: [PATCH 1/2] Revert "Remove /etc/hostid missing warning"
-
-This reverts commit 6b3b569df30d13ed7bbbff877cffc71290a52f12.
----
- module/spl/spl-generic.c |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-Index: b/module/spl/spl-generic.c
-===================================================================
---- a/module/spl/spl-generic.c
-+++ b/module/spl/spl-generic.c
-@@ -471,8 +471,12 @@
- 
- 	file = kobj_open_file(spl_hostid_path);
- 
--	if (file == (struct _buf *)-1)
-+	if (file == (struct _buf *)-1) {
-+		printk(KERN_WARNING
-+		       "SPL: The %s file is not found.\n",
-+		       spl_hostid_path);
- 		return -1;
-+	}
- 
- 	result = kobj_get_filesize(file, &size);
- 

spl-debian-pve/patches/series

@@ -1 +0,0 @@
-0001-Revert-Remove-etc-hostid-missing-warning.patch

spl-debian-pve/rules

@@ -1,63 +0,0 @@
-#!/usr/bin/make -f
-
-NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
-VERSION := $(shell dpkg-parsechangelog \
-  | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1)
-REVISION := $(shell dpkg-parsechangelog \
-  | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f2-)
-
-%:
-	dh $@ --with autoreconf
-
-override_dh_auto_configure:
-	@# Embed the downstream version in the module.
-	@sed \
-	  -e 's/^Version:.*/Version:      $(VERSION)/' \
-	  -e 's/^Release:.*/Release:      $(REVISION)/' \
-	  -i.orig META
-
-	@# Create the makefiles and configure script.
-	./autogen.sh
-
-	@# Build the userland, but don't build the kernel modules.
-	dh_auto_configure -- --with-config=user
-	
-override_dh_auto_test:
-	# scripts/check.sh tries insmod and rmmod, so it cannot
-	# run in an unprivileged build environment.
-
-override_dh_auto_install:
-	@# Install the utilities.
-	make install DESTDIR='$(CURDIR)/debian/tmp'
-
-	@# Create a dummy hostid file for the zfs-initramfs package.
-	@# NB: Commentary in the spl.postinst script.
-	mkdir -p '$(CURDIR)/debian/tmp/etc/'
-	/usr/bin/printf '\xFF\xFF\xFF\xFF' >'$(CURDIR)/debian/tmp/etc/hostid'
-
-	@# Get a bare copy of the source code.
-	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
-	make distdir
-
-	@# Delete boilerplate to satisfy the lintian extra-license-file check.
-	rm '$(CURDIR)/$(NAME)-$(VERSION)/COPYING'
-
-	@# 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/'
-
-	# Install the dkms.conf file.
-	dh_dkms -V $(VERSION)
-
-override_dh_auto_clean:
-	dh_auto_clean
-	@if test -e META.orig; then mv META.orig META; fi
-
-%:
-	dh $@

spl-debian-pve/spl-dkms.install

@@ -1,3 +0,0 @@
-usr/src/spl-*/AUTHORS	usr/share/doc/spl-dkms/
-usr/src/spl-*/DISCLAIMER	usr/share/doc/spl-dkms/
-usr/src

spl-debian-pve/spl-dkms.postinst

@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#

spl-debian-pve/spl-dkms.prerm

@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#

spl-debian-pve/spl.install

@@ -1,3 +0,0 @@
-etc/hostid
-usr/sbin
-usr/share/man

spl-debian-pve/spl.postinst

@@ -1,59 +0,0 @@
-#!/bin/sh -e
-
-# The hostname and hostid of the last system to access a ZFS pool are stored in
-# the ZFS pool itself.  A pool is foreign if, during `zpool import`, the
-# current hostname and hostid are different than the stored values thereof.
-#
-# The hostname and hostid on Solaris are intrinsic, but they are not on Linux,
-# so the spl kernel module invokes /bin/hostname and /usr/bin/hostid from the
-# userland in its initialization routine.
-#
-# However, these two indentifiers are usually undefined in the Linux initramfs
-# environment, so the /etc/hostname and /etc/hostid files must be added to the
-# initrd.  Things like a DHCP lease change can affect the hostid too.
-#
-# ZFS requires stable values for hostname and hostid, but basic Linux systems
-# do not.  The hostid is therefore stabilized by creating the /etc/hostid file
-# in the regular environment if it does not already exist.  An undefined
-# hostname is usuallly stable.
-#
-# Neither /etc/hostname nor /etc/hostid are controlled configuration files in
-# Debian distributions, but the spl package nevertheless installs a dummy
-# /etc/hostid file that contains the HW_INVALID_HOSTID sentinal value so that
-# the package manager will track it.
-
-# This result is always an eight-character hexadecimal number sans the 0x
-# prefix.  Remember that /usr/bin/hostid generates a value if the /etc/hostid
-# file doesn't exist or is malformed.
-HOSTID=$(hostid)
-
-if [ -f /etc/hostid -a "0x$HOSTID" != "0xffffffff" ]
-then
-	# This system already has a stable hostid.
-	exit 0
-fi
-
-# Truncate the dummy file and generate the actual system hostid.
-: >/etc/hostid
-HOSTID=$(hostid)
-
-# @TODO: Check whether this method is appropriate for gethostid(2) on big
-# endian systems. (Update: It isn't.)
-#
-# The /etc/hostname file on i386 and amd64 systems must be a little endian
-# integer of exacly four bytes.  Regardless, a consistent hostid is more
-# important than a correct byte order here.
-
-# Conveniences like a ${HOSTID:$ii:2} substring range or a `sed` one-liner
-# are prohibited here because this file must be dash-compatible by policy.
-AA=$(echo $HOSTID | cut -b 1,2)
-BB=$(echo $HOSTID | cut -b 3,4)
-CC=$(echo $HOSTID | cut -b 5,6)
-DD=$(echo $HOSTID | cut -b 7,8)
-
-# Invoke the external printf because the dash builtin lacks the byte format.
-"$(which printf)" "\x$DD\x$CC\x$BB\x$AA" >"/etc/hostid"
-
-# @ASSERT: [ "$HOSTID" = "$(hostid)" ]
-
-#DEBHELPER#

spl/debian/changelog

@@ -0,0 +1,380 @@
+spl-linux (0.7.13-pve1~bpo2) unstable; urgency=medium
+
+  * update SPL to 0.7.13
+
+  * base spl-linux on upstream ZOL instead of debian
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Mar 2019 06:53:13 +0100
+
+spl-linux (0.7.12-pve1~bpo1) unstable; urgency=medium
+
+  * update SPL to 0.7.12
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2018 17:51:59 +0100
+
+spl-linux (0.7.11-pve2~bpo1) unstable; urgency=medium
+
+  * update SPL to debian/0.7.11
+
+  * Backport deadlock fix between mm_sem and tx assign in zfs_write() and page
+    fault
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2018 13:47:39 +0100
+
+spl-linux (0.7.11-pve1~bpo1) unstable; urgency=medium
+
+  * update SPL to 0.7.11
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Sep 2018 15:47:06 +0200
+
+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
+
+ -- 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 10:49:49 +0200
+
+spl-linux (0.6.5-pve3~jessie) unstable; urgency=medium
+
+  * update to 0.6.5.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 11:00:40 +0100
+
+spl-linux (0.6.5-pve2~jessie) unstable; urgency=medium
+
+  * update to 0.6.5.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:40:58 +0100
+
+spl-linux (0.6.5-pve1~jessie) unstable; urgency=medium
+
+  * update to master/debian/jessie/0.6.5-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:04:23 +0200
+
+spl-linux (0.6.4-pve3~jessie) unstable; urgency=medium
+
+  * update to snapshot/debian/jessie/0.6.4-8-8ac6ff
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:14:12 +0200
+
+spl-linux (0.6.4-pve2~jessie) unstable; urgency=medium
+
+  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-6-37d7cd)
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:02:31 +0200
+
+spl-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:17:26 +0200
+
+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-linux (0.7.12-1) unstable; urgency=medium
+
+  * New upstream version 0.7.12
+  * Bump linux compatibility to 4.19 .
+
+ -- Mo Zhou <cdluminate@gmail.com>  Mon, 19 Nov 2018 11:25:53 +0000
+
+spl-linux (0.7.11-1) unstable; urgency=medium
+
+  [ Nicolas Braud-Santoni ]
+  * control: Use a canonical URI for Vcs-Git
+  * copyright: Use HTTPs Format URI in copyright
+  * debian/rules: Enable build hardening
+  * debian/rules: Use DEB_VERSION* instead of manually parsing.
+
+  [ Mo Zhou ]
+  * New upstream version 0.7.11 (Closes: #908483)
+  * Append myself to Uploaders.
+  * Suggests linux-libc-dev (<< LINUX_NEXT~) instead of (<< LINUX_NEXT).
+  * Replace get_next.sh with one-liner awk script in rules.
+  * Bump linux_compat to 4.18 .
+  * Fix debian-rules-sets-dpkg-architecture-variable.
+  * Fix debian-watch-uses-insecure-uri.
+
+ -- Mo Zhou <cdluminate@gmail.com>  Wed, 19 Sep 2018 04:13:01 +0000
+
+spl-linux (0.7.9-3) unstable; urgency=medium
+
+  * d/control: migrate to alioth-lists (Closes: #899692)
+
+ -- Aron Xu <aron@debian.org>  Mon, 28 May 2018 18:05:37 +0800
+
+spl-linux (0.7.9-2) unstable; urgency=medium
+
+  [ Aron Xu ]
+  * New upstream version 0.7.9
+  * Fix lintian obsolete-relation-form-in-source
+  * Bump supported linux version to 4.16
+
+  [ Antonio Russo ]
+  * Reduce dependency on spl, and move documentation (Closes: #894608)
+
+ -- Aron Xu <aron@debian.org>  Wed, 16 May 2018 21:36:17 +0800
+
+spl-linux (0.7.6-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #891235)
+  * Update VCS-* URL to salsa.debian.org
+  * Apply wrap-and-sort to control*
+  * Recommends: linux-libc-dev (< ${LINUX_NEXT}):
+    Tries to prevent unexpected upgrades of kernel that is not known
+    to be supported by the packaged version of ZFS/SPL.
+
+ -- Aron Xu <aron@debian.org>  Mon, 26 Feb 2018 16:29:50 +0800
+
+spl-linux (0.7.5-1) unstable; urgency=medium
+
+  * Add libelf-dev to Depends (Closes: #886453)
+  * New upstream version 0.7.5 (Closes: #886453)
+
+ -- Aron Xu <aron@debian.org>  Fri, 19 Jan 2018 15:23:26 +0800
+
+spl-linux (0.7.4-1) unstable; urgency=medium
+
+  * New upstream version 0.7.4 (Closes: #883830)
+  * Update stdver to 4.1.2, no change required
+
+ -- Aron Xu <aron@debian.org>  Mon, 18 Dec 2017 22:05:32 +0800
+
+spl-linux (0.7.3-1) unstable; urgency=medium
+
+  * New upstream version 0.7.3
+
+ -- Aron Xu <aron@debian.org>  Tue, 31 Oct 2017 17:29:08 +0800
+
+spl-linux (0.6.5.11-1) unstable; urgency=medium
+
+  * Imported Upstream version 0.6.5.11
+
+ -- Aron Xu <aron@debian.org>  Fri, 14 Jul 2017 14:39:21 +0800
+
+spl-linux (0.6.5.10-1) unstable; urgency=medium
+
+  * New upstream version 0.6.5.10
+
+ -- Aron Xu <aron@debian.org>  Wed, 05 Jul 2017 18:00:58 +0800
+
+spl-linux (0.6.5.9-1) unstable; urgency=medium
+
+  * Imported Upstream version 0.6.5.9
+
+ -- Aron Xu <aron@debian.org>  Mon, 06 Feb 2017 15:52:47 +0800
+
+spl-linux (0.6.5.8-3) unstable; urgency=medium
+
+  * Fix Linux 4.9 compatibility (Closes: #851352)
+    Thanks to Fabian Grünbichler!
+
+ -- Aron Xu <aron@debian.org>  Tue, 17 Jan 2017 20:57:13 +0800
+
+spl-linux (0.6.5.8-2) unstable; urgency=medium
+
+  [ Petter Reinholdtsen ]
+  * Added d/gbp.conf to enforce the use of pristine-tar.
+  * Added extra autopkgtest script check.sh from the Ubuntu package.
+
+  [ Aron Xu ]
+  * Make use of dh-autoreconf
+  * Deal with /etc/hostid in postinst of spl package
+  * Add lintian-overrides: extra-license-file
+  * Simplify rules by merging Ubuntu one
+  * Handle the case /etc/hostid is being wrongly marked as conffile
+  * Install man pages for spl
+  * Move command-with-path-in-maintainer-script override to spl
+
+ -- Aron Xu <aron@debian.org>  Wed, 28 Sep 2016 05:02:06 +0800
+
+spl-linux (0.6.5.8-1) unstable; urgency=medium
+
+  [ Petter Reinholdtsen ]
+  * Fix invalid command in dkms (Closes: #836578)
+
+  [ Zhou Mo ]
+  * control: bump standards version to 3.9.8
+
+  [ Aron Xu ]
+  * Imported Upstream version 0.6.5.8 (Closes: #835992)
+  * rules: allow parallel building
+
+ -- Aron Xu <aron@debian.org>  Sun, 18 Sep 2016 01:06:04 +0800
+
+spl-linux (0.6.5.7-1) unstable; urgency=medium
+
+  * Imported Upstream version 0.6.5.7
+
+ -- Aron Xu <aron@debian.org>  Wed, 25 May 2016 12:17:05 +0800
+
+spl-linux (0.6.5.6-2) unstable; urgency=medium
+
+  * Add license names to entries missing it.
+  * Added autopkgtest using code from Ubuntu using dkms >= 2.2.0.3-3~.
+
+ -- Petter Reinholdtsen <pere@hungry.com>  Thu, 28 Apr 2016 20:21:29 +0800
+
+spl-linux (0.6.5.6-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Aron Xu <aron@debian.org>  Thu, 24 Mar 2016 07:14:47 +0800
+
+spl-linux (0.6.5.5-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Aron Xu <aron@debian.org>  Sun, 20 Mar 2016 22:50:26 +0800
+
+spl-linux (0.6.5.4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Aron Xu <aron@debian.org>  Sun, 10 Jan 2016 20:13:15 +0800
+
+spl-linux (0.6.5.3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Aron Xu <aron@debian.org>  Thu, 05 Nov 2015 21:08:25 +0800
+
+spl-linux (0.6.5.2-1) unstable; urgency=medium
+
+  * Imported Upstream version 0.6.5.2
+  * Add conflicts to splat (Closes: #769147)
+
+ -- Aron Xu <aron@debian.org>  Tue, 13 Oct 2015 15:26:33 +0100
+
+spl-linux (0.6.4.2-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Aron Xu <aron@debian.org>  Thu, 13 Aug 2015 19:58:26 +0800
+
+spl-linux (0.6.4.1-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Aron Xu <aron@debian.org>  Sun, 17 May 2015 05:47:51 +0800
+
+spl-linux (0.6.2-2) experimental; urgency=low
+
+  * Add file and libc-dev to Depends of spl-dkms (Closes: #717565).
+
+ -- Aron Xu <aron@debian.org>  Sun, 25 Aug 2013 02:02:15 +0800
+
+spl-linux (0.6.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Aron Xu <aron@debian.org>  Sat, 24 Aug 2013 14:30:25 +0800
+
+spl-linux (0.6.1-2) experimental; urgency=low
+
+  * Add license info for scripts/kmodtool
+  * Add linux 3.10 compatibility patch from upstream. (Closes: #717565)
+  * Add facility to build udeb and binary modules, thanks Turbo Fredriksson
+    for the work.
+
+ -- Aron Xu <aron@debian.org>  Mon, 29 Jul 2013 16:04:24 +0800
+
+spl-linux (0.6.1-1) experimental; urgency=low
+
+  * Initial Release (Closes: #686453)
+
+ -- Aron Xu <aron@debian.org>  Tue, 02 Apr 2013 01:03:05 +0200

spl/debian/compat

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

spl/debian/control

@@ -0,0 +1,32 @@
+Source: spl-linux
+Section: kernel
+Priority: optional
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Build-Depends: autogen,
+               autotools-dev,
+               debhelper (>= 10~),
+               dh-autoreconf,
+               libtool
+Standards-Version: 4.1.2
+Homepage: http://www.zfsonlinux.org/
+Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
+Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
+
+Package: spl
+Architecture: linux-any
+Conflicts: spl-dev, splat
+Depends: ${misc:Depends}, ${shlibs:Depends}
+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
+ 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 includes the user space utilities needed to test and debug
+ the SPL and SPLAT kernel modules.

spl/debian/copyright

@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Solaris Porting Layer for Linux
 Upstream-Contact: Brian Behlendorf <behlendorf1@llnl.gov>
-Source: https://github.com/zfsonlinux/zfs/
+Source: https://github.com/zfsonlinux/spl/
 Disclaimer:
  This work was produced at the Lawrence Livermore National Laboratory
  (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44) between
@@ -24,7 +24,7 @@ Disclaimer:
  herein do not necessarily state or reflect those of the Untied States
  Government or Lawrence Livermore National Security, LLC, and shall
  not be used for advertising or product endorsement purposes.
- 
+
 Files: *
 Copyright: Lawrence Livermore National Security, LLC.
  The Regents of the University of California
@@ -48,7 +48,7 @@ License: GPL-2+
 
 Files: config/install-sh
 Copyright: 1994 X Consortium
-License:
+License: X11-install-sh
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to
  deal in the Software without restriction, including without limitation the
@@ -85,7 +85,8 @@ License: GPL-2+
 
 Files: debian/*
 Copyright: Darik Horn <dajhorn@vanadac.com>
-Source: https://github.com/dajhorn/pkg-spl/
+ Carlos Alberto Lopez Perez <clopez@igalia.com>
+ Aron Xu <aron@debian.org>
 License: GPL-2+
 
 Files: include/linux/zlib_compat.h
@@ -115,7 +116,7 @@ License: GPL-2+
 Files: include/sys/zmod.h
 Copyright: Jean-loup Gailly
  Mark Adler
-License:
+License: zmod
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
  arising from the use of this software.
@@ -145,3 +146,44 @@ License: GPL-2+
 Files: module/splat/splat-linux.c
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
+
+Files: scripts/kmodtool
+Copyright: 2003-2012 Ville Skyttä <ville.skytta@iki.fi>
+ Thorsten Leemhuis <fedora@leemhuis.info>
+ Nicolas Chauvet <kwizart@gmail.com>
+License: BSD-like
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this package; if not, write to the Free Software Foundation, Inc., 51 Franklin
+ St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file /usr/share/common-licenses/GPL-2.

spl/debian/rules

@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/pkg-info.mk
+
+VERSION := $(DEB_VERSION_UPSTREAM)
+REVISION := $(shell echo $(DEB_VERSION) | cut -d- -f2)
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@ --with autoreconf --parallel
+
+override_dh_auto_configure:
+	@# Embed the downstream version in the module.
+	@sed \
+	  -e 's/^Version:.*/Version:      $(VERSION)/' \
+	  -e 's/^Release:.*/Release:      $(REVISION)/' \
+	  -i.orig META
+
+	@# Build the userland, but don't build the kernel modules.
+	dh_auto_configure -- --with-config=user --disable-debug-kmem
+
+override_dh_auto_test:
+	# scripts/check.sh tries insmod and rmmod, so it cannot
+	# run in an unprivileged build environment.
+
+override_dh_auto_install:
+	@# Install the utilities.
+	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
+
+override_dh_auto_clean:
+	dh_auto_clean
+	@if test -e META.orig; then mv META.orig META; fi

spl/debian/source/format

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

spl/debian/source/options

@@ -0,0 +1 @@
+extend-diff-ignore='.*'

spl/debian/spl.install

@@ -0,0 +1,2 @@
+usr/sbin
+usr/share/man/man1/splat.1

spl/debian/spl.lintian-overrides

@@ -0,0 +1 @@
+spl: command-with-path-in-maintainer-script

spl/debian/spl.postinst

@@ -0,0 +1,49 @@
+#!/bin/sh
+set -e
+# The hostname and hostid of the last system to access a ZFS pool are stored in
+# the ZFS pool itself.  A pool is foreign if, during `zpool import`, the
+# current hostname and hostid are different than the stored values thereof.
+#
+# The hostid on Solaris is intrinsic, but is not on Linux (see #595790), so the
+# spl kernel module invokes /usr/bin/hostid from the userland in its initialization
+# routine.
+#
+# /usr/bin/hostid will return the 4 first bytes of the file /etc/hostid.
+# If this file is not present or contains less than 4 bytes, then /usr/bin/hostid
+# will return the bytes of the IP address of $(hostname) flipped, or zero if
+# such IP couldn't be obtained
+#
+# This means that things like a DHCP lease change can affect the hostid.
+#
+# Therefore the only way of having a stable hostid is to define it on /etc/hostid.
+# This postinst helper will check if we already have the hostid stabilized by
+# checking the existence of the file /etc/hostid to be 4 bytes at least.
+# If this file don't already exists on our system or has less than 4 bytes, then
+# we will stabilize our current hostid by writing its value to /etc/hostid
+
+# Detect if /etc/hostid is a conffile of previous spl package, migrate if yes
+# hostid file should preserve even when package is purged
+if $(dpkg-query --showformat='${Conffiles}\n' --show spl >/dev/null 2>&1); then
+	dpkg-maintscript-helper rm_conffile /etc/hostid -- "$@"
+fi
+
+if [ ! -f /etc/hostid ] || [ $(stat -c %s /etc/hostid) -lt 4 ] ; then
+
+	# Write our current hostid to /etc/hostid
+	HOSTID=$(hostid)
+	AA=$(echo $HOSTID | cut -b 1,2)
+	BB=$(echo $HOSTID | cut -b 3,4)
+	CC=$(echo $HOSTID | cut -b 5,6)
+	DD=$(echo $HOSTID | cut -b 7,8)
+
+	# Big Endian
+	if [ $(echo -n I | od -to2 | awk 'FNR==1{ print substr($2,6,1)}' 2>/dev/null) = 0 ]; then
+		# Invoke the printf from coreutils. shell builtin lacks the byte format.
+		/usr/bin/printf "\x$AA\x$BB\x$CC\x$DD" >/etc/hostid
+	else
+	# Little Endian
+		/usr/bin/printf "\x$DD\x$CC\x$BB\x$AA" >/etc/hostid
+	fi
+fi
+
+#DEBHELPER#

spl/debian/spl.postrm

@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# Detect if /etc/hostid is a conffile of previous spl package, migrate if yes
+# hostid file should preserve even when package is purged
+if $(dpkg-query --showformat='${Conffiles}\n' --show spl >/dev/null 2>&1); then
+        dpkg-maintscript-helper rm_conffile /etc/hostid -- "$@"
+fi
+
+#DEBHELPER#

spl/debian/spl.preinst

@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# Detect if /etc/hostid is a conffile of previous spl package, migrate if yes
+# hostid file should preserve even when package is purged
+if $(dpkg-query --showformat='${Conffiles}\n' --show spl >/dev/null 2>&1); then
+        dpkg-maintscript-helper rm_conffile /etc/hostid -- "$@"
+fi
+
+#DEBHELPER#

spl/debian/watch

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

zfs-debian-pve/changelog

@@ -1,14 +0,0 @@
-zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
-
-  * use /sbin/modprobe to avoid warning inside initrd
-
-  * fix warning about undefined values inside initrd
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
-
-zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
-
-  * first version for Proxmox VE
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
-

zfs-debian-pve/compat

@@ -1 +0,0 @@
-7

zfs-debian-pve/control

@@ -1,178 +0,0 @@
-Source: zfs-linux
-Section: kernel
-Priority: extra
-Maintainer: Proxmox Support Team <support@proxmox.com> 
-Build-Depends: autotools-dev,
- autoconf,
- autogen,
- automake,
- debhelper (>= 8),
- dh-autoreconf,
- dkms (>= 2.2.0.2),
- libselinux1-dev,
- libtool,
- uuid-dev,
- zlib1g-dev,
-Standards-Version: 3.9.5
-
-Package: libnvpair1
-Section: libs
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libnvpair0
-Description: Solaris name-value library for Linux
- This library provides routines for packing and unpacking nv pairs for
- transporting data across process boundaries, transporting between
- kernel and userland, and possibly saving onto disk files.
-
-Package: libnvpair1-dbg
-Section: debug
-Architecture: linux-any
-Depends: ${misc:Depends}, libnvpair1 (= ${binary:Version})
-Replaces: libnvpair0-dbg
-Description: Debugging symbols for libnvpair1
- This library provides routines for packing and unpacking nv pairs for
- transporting data across process boundaries, transporting between
- kernel and userland, and possibly saving onto disk files.
- .
- This package contains the debugging symbols for libnvpair1.
-
-Package: libuutil1
-Section: libs
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libuutil0
-Description: Solaris userland utility library for Linux
- This library provides a variety of glue functions for OpenZFS on Linux:
-  * libspl: The Solaris Porting Layer library, which provides APIs that make it
- possible to run Solaris user code in a Linux environment with relatively
- minimal modification.
-  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
- library.
-  * libefi: The Extensible Firmware Interface library for GUID disk
- partitioning.
-  * libshare: NFS and SMB service integration for OpenZFS.
-
-Package: libuutil1-dbg
-Section: debug
-Architecture: linux-any
-Depends: ${misc:Depends}, libuutil1 (= ${binary:Version})
-Replaces: libuutil0-dbg
-Description: Debugging symbols for libuutil1
- This library provides a variety of glue functions for OpenZFS on Linux:
-  * libspl: The Solaris Porting Layer library, which provides APIs that make it
- possible to run Solaris user code in a Linux environment with relatively
- minimal modification.
-  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
- library.
-  * libefi: The Extensible Firmware Interface library for GUID disk
- partitioning.
-  * libshare: NFS and SMB service integration for OpenZFS.
- .
- This package contains debugging symbols for libuutil1.
-
-Package: libzfs-dev
-Section: libdevel
-Architecture: linux-any
-Depends: ${misc:Depends}, libzfs2 (= ${binary:Version})
-Provides: libnvpair-dev, libuutil-dev
-Replaces: libefi1,
- libnvpair1,
- libshare1,
- libspl1,
- libunicode1,
- libuutil1,
- libzavl1,
- libzfs2,
- libzpool2,
-Description: Native OpenZFS filesystem development files for Linux
- Header files and static libraries for compiling software
- against libzfs.
-
-Package: libzfs2
-Section: libs
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libzfs0, libzfs1
-Description: Native OpenZFS filesystem library for Linux
- The ZoL management library.
-
-Package: libzfs2-dbg
-Section: debug
-Architecture: linux-any
-Depends: ${misc:Depends}, libzfs2 (= ${binary:Version})
-Replaces: libzfs0-dbg, libzfs1-dbg
-Description: Debugging symbols for libzfs2
- The ZoL management library.
- .
- This package contains the debugging symbols for libzfs2.
-
-Package: libzpool2
-Section: libs
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libzpool0, libzpool1
-Description: Native OpenZFS pool library for Linux
- The zpool management library.
-
-Package: libzpool2-dbg
-Section: debug
-Architecture: linux-any
-Depends: ${misc:Depends}, libzpool2 (= ${binary:Version})
-Replaces: libzpool0-dbg, libzpool1-dbg
-Description: Debugging symbols for libzpool2
- The zpool management library.
- .
- This package contains the debugging symbols for libzpool2.
-
-Package: zfs-dkms
-Section: kernel
-Architecture: linux-any
-Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
-Depends: ${misc:Depends}, dkms (>= 2.2.0.2)
-Replaces: lzfs, lzfs-dkms
-Provides: lustre-backend-fs, lzfs, lzfs-dkms
-Conflicts: lzfs, lzfs-dkms
-Description: Native OpenZFS filesystem kernel modules for Linux
- An advanced integrated volume manager and filesystem that is designed for
- performance and data integrity. Snapshots, clones, checksums, deduplication,
- compression, and RAID redundancy are built-in features.
- .
- Includes the SPA, DMU, ZVOL, and ZPL components of OpenZFS.
-
-Package: zfs-doc
-Section: doc
-Architecture: linux-any
-Depends: ${misc:Depends}
-Description: Native OpenZFS filesystem documentation and examples.
- Shared boilerplate files for OpenZFS on Linux that are not required at runtime.
-
-Package: zfs-initramfs
-Section: kernel
-Architecture: linux-any
-Depends: ${misc:Depends}, zfsutils
-Description: Native OpenZFS root filesystem capabilities for Linux
- This package adds OpenZFS to the system initramfs with a hook
- for the initramfs-tools infrastructure.
-
-Package: zfsutils
-Section: admin
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: samba-common-bin (>= 3.0.23), nfs-kernel-server, zfs-initramfs
-Conflicts: zfs, zfs-fuse
-Replaces: zfs
-Description: Native OpenZFS management utilities for Linux
- This package provides the zpool and zfs commands that are used to
- manage OpenZFS filesystems.
-
-Package: zfsutils-dbg
-Section: debug
-Architecture: linux-any
-Depends: ${misc:Depends}, zfsutils (= ${binary:Version})
-Replaces: zfs-dbg
-Description: Debugging symbols for zfsutils
- This package provides the zpool and zfs commands that are used to
- manage OpenZFS filesystems.
- .
- This package contains the debugging symbols for zfsutils.

zfs-debian-pve/libzfs-dev.install

@@ -1,4 +0,0 @@
-lib/*.a
-lib/*.la
-lib/*.so
-usr/include

zfs-debian-pve/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch

@@ -1,71 +0,0 @@
-From: Darik Horn <dajhorn@vanadac.com>
-Date: Tue, 17 Jan 2012 19:45:07 -0600
-Subject: Prevent manual builds in the DKMS source.
-
-Print an instructive error messsage and exit if the `dkms.conf` file
-exists when the userland is configured. (ie: `--with-config=user`)
-
-A non-trivial number of people try to rebuild ZoL from the
-`/usr/src/zfs` tree, which is modified to better satisfy Debian
-packaging policy and contains only the module sources for DKMS.
-
-Regardless, local installations usually break managed installations,
-so this autotools test could be further enhanced to check whether
-ZFS has a DKMS registration.
----
- config/dkms.m4      | 14 ++++++++++++++
- config/user.m4      |  1 +
- config/zfs-build.m4 |  6 +++---
- 3 files changed, 18 insertions(+), 3 deletions(-)
- create mode 100644 config/dkms.m4
-
-diff --git a/config/dkms.m4 b/config/dkms.m4
-new file mode 100644
-index 0000000..cfa1152
---- /dev/null
-+++ b/config/dkms.m4
-@@ -0,0 +1,14 @@
-+dnl #
-+dnl # Prevent manual building in DKMS source tree.
-+dnl #
-+AC_DEFUN([ZFS_AC_DKMS_INHIBIT], [
-+	AC_MSG_CHECKING([for dkms.conf file])
-+        AS_IF([test -e dkms.conf], [
-+		AC_MSG_ERROR([
-+	*** ZFS should not be manually built in the DKMS source tree.
-+	*** Remove all ZFS packages before compiling the ZoL sources.
-+	*** Running "make install" breaks ZFS packages.])
-+        ], [
-+		AC_MSG_RESULT([not found])
-+        ])
-+])
-diff --git a/config/user.m4 b/config/user.m4
-index 3802437..f5a8827 100644
---- a/config/user.m4
-+++ b/config/user.m4
-@@ -2,6 +2,7 @@ dnl #
- dnl # Default ZFS user configuration
- dnl #
- AC_DEFUN([ZFS_AC_CONFIG_USER], [
-+	ZFS_AC_DKMS_INHIBIT
- 	ZFS_AC_CONFIG_USER_UDEV
- 	ZFS_AC_CONFIG_USER_SYSTEMD
- 	ZFS_AC_CONFIG_USER_SYSVINIT
-diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
-index 5ec94a0..41eec88 100644
---- a/config/zfs-build.m4
-+++ b/config/zfs-build.m4
-@@ -87,10 +87,10 @@ AC_DEFUN([ZFS_AC_CONFIG], [
- 	ZFS_AC_CONFIG_ALWAYS
- 
- 	case "$ZFS_CONFIG" in
--		kernel) ZFS_AC_CONFIG_KERNEL ;;
- 		user)	ZFS_AC_CONFIG_USER   ;;
--		all)    ZFS_AC_CONFIG_KERNEL
--			ZFS_AC_CONFIG_USER   ;;
-+		kernel) ZFS_AC_CONFIG_KERNEL ;;
-+		all)    ZFS_AC_CONFIG_USER
-+			ZFS_AC_CONFIG_KERNEL ;;
- 		srpm)                        ;;
- 		*)
- 		AC_MSG_RESULT([Error!])

zfs-debian-pve/patches/0005-vdev_id-use-mawk-compatible-regular-expression.patch

@@ -1,31 +0,0 @@
-From: Ned Bass <bass6@llnl.gov>
-Date: Wed, 17 Dec 2014 11:01:42 -0800
-Subject: vdev_id: use mawk-compatible regular expression
-
-Slot mapping in vdev_id doesn't work on systems using mawk as the 'awk'
-alternative. A regular expression in map_slot() contains an unquoted
-empty string following the alternation (|) operator, which results in an
-"missing operand" error with mawk. The solution is to rearrange the
-expression so the alternation has two operands.
-
-Signed-off-by: Ned Bass <bass6@llnl.gov>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes zfsonlinux/pkg-zfs#136
-Closes zfsonlinux/zfs#2965
----
- cmd/vdev_id/vdev_id | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmd/vdev_id/vdev_id b/cmd/vdev_id/vdev_id
-index b6752ba..6fddd12 100755
---- a/cmd/vdev_id/vdev_id
-+++ b/cmd/vdev_id/vdev_id
-@@ -116,7 +116,7 @@ map_slot() {
- 	local MAPPED_SLOT=
- 
- 	MAPPED_SLOT=`awk "\\$1 == \"slot\" && \\$2 == ${LINUX_SLOT} && \
--			\\$4 ~ /^(${CHANNEL}|)$/ { print \\$3; exit }" $CONFIG`
-+			\\$4 ~ /^${CHANNEL}$|^$/ { print \\$3; exit }" $CONFIG`
- 	if [ -z "$MAPPED_SLOT" ] ; then
- 		MAPPED_SLOT=$LINUX_SLOT
- 	fi

zfs-debian-pve/patches/series

@@ -1,4 +0,0 @@
-0001-Prevent-manual-builds-in-the-DKMS-source.patch
-0002-Check-for-META-and-DCH-consistency-in-autoconf.patch
-0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
-0005-vdev_id-use-mawk-compatible-regular-expression.patch

zfs-debian-pve/rules

@@ -1,115 +0,0 @@
-#!/usr/bin/make -f
-
-CHMOD ?= chmod
-INSTALL ?= install
-MAKE ?= make
-
-META_NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
-VERSION := $(shell dpkg-parsechangelog \
-  | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1)
-REVISION := $(shell dpkg-parsechangelog \
-  | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f2-)
-
-META_DISTDIR := $(CURDIR)/$(META_NAME)-$(VERSION)/
-
-%:
-	dh $@ --with autoreconf,dkms
-
-override_dh_auto_configure:
-	@# Embed the downstream version in the module.
-	@sed \
-	  -e 's/^Version:.*/Version:      $(VERSION)/' \
-	  -e 's/^Release:.*/Release:      $(REVISION)/' \
-	  -i.orig META
-
-	@# Build the userland, but don't build the kernel modules.
-	dh_auto_configure -- \
-	  --bindir=/bin \
-	  --sbindir=/sbin \
-	  --libdir=/lib \
-	  --with-udevdir=/lib/udev \
-	  --with-config=user
-
-override_dh_auto_test:
-	# The dh_auto_test rule is disabled because
-	# `make check` cannot run in an unprivileged build environment.
-
-override_dh_auto_install:
-	@# Install the utilities.
-	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
-
-	@# Get a bare copy of the source code for DKMS.
-	@# This creates the $(META_DISTDIR)/ tree.
-	$(MAKE) distdir
-
-	@# Delete components that are not required to build the kernel modules.
-	@# This prevents several lintian complaints, discourages users from
-	@# running `make install` in /usr/src, and reduces the installation
-	@# size by one third. The printf creates a dummy automake file.
-	umask 0111 && \
-	cd '$(META_DISTDIR)' && \
-	for ii in $$(find cmd dracut etc lib man rpm scripts udev -type f); do \
-	  rm "$$ii"; \
-	  test "$$ii" != "$${ii%.in}" && printf '%%:\n\t#\n' >"$$ii"; \
-	  true; \
-	done
-
-	@# This shunt allows DKMS to copy the Module.symvers and zfs_config.h
-	@# files into the ${dkms_tree} area through the POST_INSTALL directive.
-	printf '#!/bin/sh\ncp "$$@"\n' >'$(META_DISTDIR)/cp'
-	$(CHMOD) 755 '$(META_DISTDIR)/cp'
-
-	@# Install the DKMS source directly, avoiding dh_install.
-	$(INSTALL) -d '$(CURDIR)/debian/zfs-dkms/usr/src/'
-	mv '$(META_DISTDIR)' '$(CURDIR)/debian/zfs-dkms/usr/src/'
-
-override_dh_dkms:
-	dh_dkms -V
-
-override_dh_install:
-	@# Exclude the upstream /usr/lib/udev/rules.d files.
-	dh_install -X/rules.d/
-
-	@# Ensure that /etc/zfs is in the zfsutils package
-	@# because git has difficulty tracking empty directories.
-	$(INSTALL) -d '$(CURDIR)/debian/zfsutils/etc/zfs/'
-
-	@# Resolve lintian errors regarding Debian Policy Manual Section 8.4
-	@# by moving unversioned library links from /lib to /usr/lib in the
-	@# development package. Look at libc6-dev for a packaging example if
-	@# multiarch support ever becomes a concern here.
-	$(INSTALL) -d '$(CURDIR)/debian/libzfs-dev/usr/lib/'
-	cd '$(CURDIR)/debian/libzfs-dev/lib' && \
-	for ii in $$(find -type l); do \
-	  ln -s "../../lib/$$(readlink "$$ii")" "../usr/lib/$$(basename "$$ii")" \
-	  && rm "$$ii"; \
-	done
-
-override_dh_installdocs:
-	dh_installdocs --link-doc=zfs-doc
-
-override_dh_installinit:
-	@# Install debian/zfsutils.zfs.default as /etc/default/zfs.
-	dh_installinit --name=zfs
-
-	@# Install the /etc/init.d/zfs-mount script.
-	@# Debian runs local mounts at sysv sequences [10..12] [08..09].
-	dh_installinit --name=zfs-mount \
-	  --no-restart-on-upgrade --no-start -- defaults 13 07
-
-	@# Debian runs nfs-kernel-server at sysv sequence 17 01,
-	@# iscsitarget at 02 01, and samba at 01 02.
-	dh_installinit --name=zfs-share \
-	  --no-restart-on-upgrade --no-start -- defaults 18 00
-
-
-override_dh_installudev:
-	dh_installudev --name=zvol --priority=60
-	dh_installudev --name=vdev --priority=69
-
-override_dh_strip:
-	dh_strip -plibnvpair1 --dbg-package=libnvpair1-dbg
-	dh_strip -plibuutil1 --dbg-package=libuutil1-dbg
-	dh_strip -plibzfs2 --dbg-package=libzfs2-dbg
-	dh_strip -plibzpool2 --dbg-package=libzpool2-dbg
-	dh_strip -pzfsutils --dbg-package=zfsutils-dbg

zfs-debian-pve/tree/zfs-doc/etc/dpkg/dpkg.cfg.d/zfs-doc

@@ -1,6 +0,0 @@
-## /etc/dpkg/dpkg.cfg.d/zfs-doc
-##
-## DPKG overrides that prevent the installation of ZoL documentation.
-
-## Enable this line to reduce installation size.
-#path-exclude /usr/share/doc/zfs-doc/*

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

@@ -1,2 +0,0 @@
-# Force the inclusion of Busybox in the initramfs.
-BUSYBOX=y

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

@@ -1,78 +0,0 @@
-#!/bin/sh
-#
-# Add ZoL filesystem capabilities to an initrd, usually for a native OpenZFS root.
-#
-
-# This hook installs udev rules for ZoL.
-PREREQ="zdev"
-
-# These prerequisites are provided by the zfsutils package. The zdb utility is
-# not strictly required, but it can be useful at the initramfs recovery prompt.
-COPY_EXEC_LIST="/sbin/zdb /sbin/zpool /sbin/zfs /sbin/mount.zfs"
-
-# These prerequisites are provided by the base system.
-COPY_EXEC_LIST="$COPY_EXEC_LIST /bin/hostname /sbin/blkid"
-
-# Explicitly specify all kernel modules because automatic dependency resolution
-# is unreliable on many systems.
-MANUAL_ADD_MODULES_LIST="zlib_deflate spl zavl zcommon znvpair zunicode zfs"
-
-# Generic result code.
-RC=0
-
-case $1 in
-prereqs)
-	echo "$PREREQ"
-	exit 0
-	;;
-esac
-
-for ii in $COPY_EXEC_LIST
-do
-	if [ ! -x "$ii" ]
-	then
-		echo "Error: $ii is not executable."
-		RC=2
-	fi
-done
-
-if [ "$RC" -ne 0 ]
-then
-	exit "$RC"
-fi
-
-. /usr/share/initramfs-tools/hook-functions
-
-mkdir -p "$DESTDIR/etc/"
-
-# zpool requires /etc/mtab
-ln -sf "/proc/mounts" "$DESTDIR/etc/mtab"
-
-# ZDB uses pthreads for some functions, but the library dependency is not
-# automatically detected. The `find` utility and extended `cp` options are
-# used here because libgcc_s.so could be in a subdirectory of /lib for
-# multi-arch installations.
-cp --target-directory="$DESTDIR" --parents $(find /lib -type f -name libgcc_s.so.1)
-
-for ii in $COPY_EXEC_LIST
-do
-	copy_exec "$ii"
-done
-
-for ii in $MANUAL_ADD_MODULES_LIST
-do
-	manual_add_modules "$ii"
-done
-
-if [ -f "/etc/hostname" ]
-then
-	cp -p "/etc/hostname" "$DESTDIR/etc/"
-else
-	hostname >"$DESTDIR/etc/hostname"
-fi
-
-# ZoL 0.6.3 deprecated the hostid check.
-if [ -f /etc/hostid ]
-then
-	cp -p /etc/hostid "$DESTDIR/etc/hostid"
-fi

zfs-debian-pve/tree/zfs-initramfs/usr/share/initramfs-tools/scripts/zfs

@@ -1,164 +0,0 @@
-# ZFS boot stub for initramfs-tools.
-#
-# In the initramfs environment, the /init script sources this stub to
-# override the default functions in the /scripts/local script.
-#
-# Enable this by passing boot=zfs on the kernel command line.
-#
-
-
-pre_mountroot()
-{
-	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-top"
-	run_scripts /scripts/local-top
-	[ "$quiet" != "y" ] && log_end_msg
-
-	if [ -r '/etc/default/zfs' ]
-	then
-		ZFS_INITRD_PRE_MOUNTROOT_SLEEP=0
-		. '/etc/default/zfs'
-		if [ "$ZFS_INITRD_PRE_MOUNTROOT_SLEEP" -gt '0' ]
-		then
-			[ "$quiet" != "y" ] && log_begin_msg "Sleeping for $ZFS_INITRD_PRE_MOUNTROOT_SLEEP seconds..."
-			sleep "$ZFS_INITRD_PRE_MOUNTROOT_SLEEP"
-			[ "$quiet" != "y" ] && log_end_msg
-		fi
-	fi
-}
-
-# Duplicates the functionality found under try_failure_hooks in functions
-# but invoking that would be inappropriate here.
-disable_plymouth()
-{
-	if [ -x /bin/plymouth ] && /bin/plymouth --ping
-	then
-		/bin/plymouth hide-splash >/dev/null 2>&1
-	fi
-}
-
-mountroot()
-{
-	pre_mountroot
-
-	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-premount"
-	run_scripts /scripts/local-premount
-	[ "$quiet" != "y" ] && log_end_msg
-
-	# Wait for all of the /dev/{hd,sd}[a-z] device nodes to appear.
-	wait_for_udev
-
-	# Load the module now to get consistent automatic pool import behavior.
-	/sbin/modprobe zfs
-
-	# Check the kernel command line for overrides.
-	ZFS_RPOOL="${rpool#rpool=}"
-	ZFS_BOOTFS="${bootfs#bootfs=}"
-
-	if [ -z "$ZFS_RPOOL" ]
-	then
-		# Check for the `-B zfs-bootfs=%s/%u,...` kind of parameter.
-		#
-		# The ${zfs-bootfs} variable is set at the kernel commmand
-		# line, usually by GRUB, but it cannot be referenced here
-		# directly because bourne variable names cannot contain a
-		# hyphen.
-		#
-		# Reassign the variable by dumping the environment and
-		# stripping the zfs-bootfs= prefix.  Let the shell handle
-		# quoting through the eval command.
-		eval ZFS_RPOOL=$(set | sed -n -e 's,^zfs-bootfs=,,p')
-
-		# Only the pool name is relevant because the ZFS filesystem on
-		# Linux is extrinsic and the userland cannot resolve a ZFS
-		# object number.
-		#
-		# Strip everything after the first slash character.
-		ZFS_RPOOL=$(echo "$ZFS_RPOOL" | sed -e 's,/.*,,')
-	fi
-
-	# Use "rpool" as the default, like on most Solaris systems.
-	[ -z "$ZFS_RPOOL" ] && ZFS_RPOOL='rpool'
-
-	# @FIXME: Forcing the import should not be necessary.
-	#
-	# Consider inhibiting automatic zpool imports in the initramfs
-	# environment and doing a full import in the regular system instead.
-
-	[ "$quiet" != "y" ] && log_begin_msg "Importing ZFS root pool $ZFS_RPOOL"
-	if [ -f /etc/zfs/zpool.cache ]
-	then
-		ZFS_STDERR=$(zpool list "$ZFS_RPOOL" 1>/dev/null 2>&1 \
-		  || zpool import -f -N "$ZFS_RPOOL" 2>&1)
-		ZFS_ERROR=$?
-	else
-		ZFS_STDERR=$(zpool import -f -N "$ZFS_RPOOL" 2>&1)
-		ZFS_ERROR=$?
-	fi
-	[ "$quiet" != "y" ] && log_end_msg
-
-	if [ "$ZFS_ERROR" -ne 0 ]
-	then
-		disable_plymouth
-		echo "Command: zpool import -f -N $ZFS_RPOOL"
-		echo "Message: $ZFS_STDERR"
-		echo "Error: $ZFS_ERROR"
-		echo ""
-		echo "Manually import the root pool at the command prompt and then exit."
-		echo "Hint: Try:  zpool import -f -R / -N $ZFS_RPOOL"
-		/bin/sh
-	fi
-
-	if [ -z "$ZFS_BOOTFS" ]
-	then
-		[ "$quiet" != "y" ] && log_begin_msg "Getting ZFS bootfs property"
-		ZFS_BOOTFS=$(zpool list -H -o bootfs "$ZFS_RPOOL")
-		ZFS_ERROR=$?
-		[ "$quiet" != "y" ] && log_end_msg
-	fi
-
-	if [ -z "$ZFS_BOOTFS" ]
-	then
-		disable_plymouth
-		echo "Command: zpool list -H -o bootfs $ZFS_RPOOL"
-		echo "Error: $ZFS_ERROR, unable to get the bootfs property."
-		echo ""
-		echo "Manually mount the root filesystem on $rootmnt and then exit."
-		echo "Hint: Try:  mount -t zfs -o zfsutil $ZFS_RPOOL/ROOT/system $rootmnt"
-		/bin/sh	
-	fi
-
-	# Force the mountpoint to the only correct value for a root filesystem.
-	[ "$quiet" != "y" ] && log_begin_msg "Setting mountpoint=/ on ZFS filesystem $ZFS_BOOTFS"
-	ZFS_STDERR=$(zfs set mountpoint=/ "$ZFS_BOOTFS" 2>&1)
-	[ "$quiet" != "y" ] && log_end_msg
-
-	# Ideally, the root filesystem would be mounted like this:
-	#
-	#   zpool import -R "$rootmnt" -N "$ZFS_RPOOL"
-	#   zfs mount -o mountpoint=/ "$ZFS_BOOTFS"
-	#
-	# but the MOUNTPOINT prefix is preserved on descendent filesystem after
-	# the pivot into the regular root, which later breaks things like
-	# `zfs mount -a` and the /etc/mtab refresh.
-
-	[ "$quiet" != "y" ] && log_begin_msg "Mounting ZFS filesystem $ZFS_BOOTFS"
-	ZFS_STDERR=$(mount -t zfs -o zfsutil "$ZFS_BOOTFS" "$rootmnt" 2>&1)
-	ZFS_ERROR=$?
-	[ "$quiet" != "y" ] && log_end_msg
-
-	if [ "$ZFS_ERROR" -ne 0 ]
-	then
-		disable_plymouth
-		echo ""
-		echo "Command: mount -t zfs -o zfsutil $ZFS_BOOTFS $rootmnt"
-		echo "Message: $ZFS_STDERR"
-		echo "Error: $ZFS_ERROR"
-		echo ""
-		echo "Manually mount the root filesystem on $rootmnt and then exit."
-		/bin/sh	
-	fi
-
-	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-bottom"
-	run_scripts /scripts/local-bottom
-	[ "$quiet" != "y" ] && log_end_msg
-}

zfs-debian-pve/tree/zfsutils/etc/bash_completion.d/zfs

@@ -1,391 +0,0 @@
-# Copyright (c) 2013, Aneurin Price <aneurin.price@gmail.com>
-
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use,
-# copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following
-# conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-if [[ -w /dev/zfs ]]; then
-    __ZFS_CMD="zfs"
-    __ZPOOL_CMD="zpool"
-else
-    __ZFS_CMD="sudo zfs"
-    __ZPOOL_CMD="sudo zpool"
-fi
-
-__zfs_get_commands()
-{
-    $__ZFS_CMD 2>&1 | awk '/^\t[a-z]/ {print $1}' | cut -f1 -d '|' | uniq
-}
-
-__zfs_get_properties()
-{
-    $__ZFS_CMD get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all name space
-}
-
-__zfs_get_editable_properties()
-{
-    $__ZFS_CMD get 2>&1 | awk '$2 == "YES" {print $1"="}'
-}
-
-__zfs_get_inheritable_properties()
-{
-    $__ZFS_CMD get 2>&1 | awk '$3 == "YES" {print $1}'
-}
-
-__zfs_list_datasets()
-{
-    $__ZFS_CMD list -H -o name -t filesystem,volume
-}
-
-__zfs_list_filesystems()
-{
-    $__ZFS_CMD list -H -o name -t filesystem
-}
-
-__zfs_match_snapshot()
-{
-    local base_dataset=${cur%@*}
-    if [[ $base_dataset != $cur ]]
-    then
-        $__ZFS_CMD list -H -o name -s name -t snapshot -d 1 $base_dataset
-    else
-        $__ZFS_CMD list -H -o name -t filesystem,volume | awk '{print $1"@"}'
-    fi
-}
-
-__zfs_match_explicit_snapshot()
-{
-    local base_dataset=${cur%@*}
-    if [[ $base_dataset != $cur ]]
-    then
-        $__ZFS_CMD list -H -o name -s name -t snapshot -d 1 $base_dataset
-    fi
-}
-
-__zfs_match_multiple_snapshots()
-{
-    local existing_opts=$(expr "$cur" : '\(.*\)[%,]')
-    if [[ $existing_opts ]]
-    then
-        local base_dataset=${cur%@*}
-        if [[ $base_dataset != $cur ]]
-        then
-            local cur=${cur##*,}
-            if [[ $cur =~ ^%|%.*% ]]
-            then
-                # correct range syntax is start%end
-                return 1
-            fi
-            local range_start=$(expr "$cur" : '\(.*%\)')
-            $__ZFS_CMD list -H -o name -s name -t snapshot -d 1 $base_dataset | sed 's$.*@$'$range_start'$g'
-        fi
-    else
-        __zfs_match_explicit_snapshot; __zfs_list_datasets
-    fi
-}
-
-__zfs_list_volumes()
-{
-    $__ZFS_CMD list -H -o name -t volume
-}
-
-__zfs_argument_chosen()
-{
-    local word property
-    for word in $(seq $((COMP_CWORD-1)) -1 2)
-    do
-        local prev="${COMP_WORDS[$word]}"
-        if [[ ${COMP_WORDS[$word-1]} != -[tos] ]]
-        then
-            if [[ "$prev" == [^,]*,* ]] || [[ "$prev" == *[@:]* ]]
-            then
-                return 0
-            fi
-            for property in $@
-            do
-                if [[ $prev == "$property" ]]
-                then
-                    return 0
-                fi
-            done
-        fi
-    done
-    return 1
-}
-
-__zfs_complete_ordered_arguments()
-{
-    local list1=$1
-    local list2=$2
-    local cur=$3
-    local extra=$4
-    if __zfs_argument_chosen $list1
-    then
-        COMPREPLY=($(compgen -W "$list2 $extra" -- "$cur"))
-    else
-        COMPREPLY=($(compgen -W "$list1 $extra" -- "$cur"))
-    fi
-}
-
-__zfs_complete_multiple_options()
-{
-    local options=$1
-    local cur=$2
-
-    COMPREPLY=($(compgen -W "$options" -- "${cur##*,}"))
-    local existing_opts=$(expr "$cur" : '\(.*,\)')
-    if [[ $existing_opts ]] 
-    then
-        COMPREPLY=( "${COMPREPLY[@]/#/${existing_opts}}" )
-    fi
-}
-
-__zfs_complete_switch()
-{
-    local options=$1
-    if [[ ${cur:0:1} == - ]]
-    then
-        COMPREPLY=($(compgen -W "-{$options}" -- "$cur"))
-        return 0
-    else
-        return 1
-    fi
-}
-
-__zfs_complete()
-{
-    local cur prev cmd cmds
-    COMPREPLY=()
-    # Don't split on colon
-    _get_comp_words_by_ref -n : -c cur -p prev -w COMP_WORDS -i COMP_CWORD
-    cmd="${COMP_WORDS[1]}"
-
-    if [[ ${prev##*/} == zfs ]]
-    then
-        cmds=$(__zfs_get_commands)
-        COMPREPLY=($(compgen -W "$cmds -?" -- "$cur"))
-        return 0
-    fi
-
-    case "${cmd}" in
-        clone)
-            case "${prev}" in
-                -o)
-                    COMPREPLY=($(compgen -W "$(__zfs_get_editable_properties)" -- "$cur"))
-                    ;;
-                *)
-                    if ! __zfs_complete_switch "o,p"
-                    then
-                        if __zfs_argument_chosen
-                        then
-                            COMPREPLY=($(compgen -W "$(__zfs_list_datasets)" -- "$cur"))
-                        else
-                            COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur"))
-                        fi
-                    fi
-                    ;;
-            esac
-            ;;
-        get)
-            case "${prev}" in
-                -d)
-                    COMPREPLY=($(compgen -W "" -- "$cur"))
-                    ;;
-                -t)
-                    __zfs_complete_multiple_options "filesystem volume snapshot all" "$cur"
-                    ;;
-                -s)
-                    __zfs_complete_multiple_options "local default inherited temporary none" "$cur"
-                    ;;
-                -o)
-                    __zfs_complete_multiple_options "name property value source received all" "$cur"
-                    ;;
-                *)
-                    if ! __zfs_complete_switch "H,r,p,d,o,t,s"
-                    then
-                        if __zfs_argument_chosen $(__zfs_get_properties)
-                        then
-                            COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur"))
-                        else
-                            __zfs_complete_multiple_options "$(__zfs_get_properties)" "$cur"
-                        fi
-                    fi
-                    ;;
-            esac
-            ;;
-        inherit)
-            if ! __zfs_complete_switch "r"
-            then
-                __zfs_complete_ordered_arguments "$(__zfs_get_inheritable_properties)" "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" $cur
-            fi
-            ;;
-        list)
-            case "${prev}" in
-                -d)
-                    COMPREPLY=($(compgen -W "" -- "$cur"))
-                    ;;
-                -t)
-                    __zfs_complete_multiple_options "filesystem volume snapshot all" "$cur"
-                    ;;
-                -o)
-                    __zfs_complete_multiple_options "$(__zfs_get_properties)" "$cur"
-                    ;;
-                -s|-S)
-                    COMPREPLY=($(compgen -W "$(__zfs_get_properties)" -- "$cur"))
-                    ;;
-                *)
-                    if ! __zfs_complete_switch "H,r,d,o,t,s,S"
-                    then
-                        COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur"))
-                    fi
-                    ;;
-            esac
-            ;;
-        promote)
-            COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur"))
-            ;;
-        rollback)
-            if ! __zfs_complete_switch "r,R,f"
-            then
-                COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur"))
-            fi
-            ;;
-        send)
-            if ! __zfs_complete_switch "d,n,P,p,R,v,i,I"
-            then
-                COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur"))
-            fi
-            ;;
-        snapshot)
-            case "${prev}" in
-                -o)
-                    COMPREPLY=($(compgen -W "$(__zfs_get_editable_properties)" -- "$cur"))
-                    ;;
-                *)
-                    if ! __zfs_complete_switch "o,r"
-                    then
-                        COMPREPLY=($(compgen -W "$(__zfs_list_datasets | awk '{print $1"@"}')" -- "$cur"))
-                    fi
-                    ;;
-            esac
-            ;;
-        set)
-            __zfs_complete_ordered_arguments "$(__zfs_get_editable_properties)" "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" $cur
-            ;;
-        upgrade)
-            case "${prev}" in
-                -a|-V|-v)
-                    COMPREPLY=($(compgen -W "" -- "$cur"))
-                    ;;
-                *)
-                    if ! __zfs_complete_switch "a,V,v,r"
-                    then
-                        COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur"))
-                    fi
-                    ;;
-            esac
-            ;;
-        destroy)
-            if ! __zfs_complete_switch "d,f,n,p,R,r,v"
-            then
-                __zfs_complete_multiple_options "$(__zfs_match_multiple_snapshots)" $cur
-            fi
-            ;;
-        *)
-            COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur"))
-            ;;
-    esac
-    __ltrim_colon_completions "$cur"
-    return 0
-}
-
-__zpool_get_commands()
-{
-    $__ZPOOL_CMD 2>&1 | awk '/^\t[a-z]/ {print $1}' | uniq
-}
-
-__zpool_get_properties()
-{
-    $__ZPOOL_CMD get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all
-}
-
-__zpool_get_editable_properties()
-{
-    $__ZPOOL_CMD get 2>&1 | awk '$2 == "YES" {print $1"="}'
-}
-
-__zpool_list_pools()
-{
-    $__ZPOOL_CMD list -H -o name
-}
-
-__zpool_complete()
-{
-    local cur prev cmd cmds
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    cmd="${COMP_WORDS[1]}"
-
-    if [[ ${prev##*/} == zpool ]]
-    then
-        cmds=$(__zpool_get_commands)
-        COMPREPLY=($(compgen -W "$cmds" -- "$cur"))
-        return 0
-    fi
-
-    case "${cmd}" in
-        get)
-            __zfs_complete_ordered_arguments "$(__zpool_get_properties)" "$(__zpool_list_pools)" $cur
-            return 0
-            ;;
-        import)
-            if [[ $prev == -d ]]
-            then
-                _filedir -d
-            else
-                COMPREPLY=($(compgen -W "$(__zpool_list_pools) -d" -- "$cur"))
-            fi
-            return 0
-            ;;
-        set)
-            __zfs_complete_ordered_arguments "$(__zpool_get_editable_properties)" "$(__zpool_list_pools)" $cur
-            return 0
-            ;;
-        add|attach|clear|create|detach|offline|online|remove|replace)
-            local pools="$(__zpool_list_pools)"
-            if __zfs_argument_chosen $pools
-            then
-                _filedir
-            else
-                COMPREPLY=($(compgen -W "$pools" -- "$cur"))
-            fi
-            return 0
-            ;;
-        *)
-            COMPREPLY=($(compgen -W "$(__zpool_list_pools)" -- "$cur"))
-            return 0
-            ;;
-    esac
-
-}
-
-complete -F __zfs_complete zfs
-complete -F __zpool_complete zpool

zfs-debian-pve/zfs-dkms.dkms

@@ -1,88 +0,0 @@
-BUILD_DEPENDS[0]="spl"
-AUTOINSTALL="yes"
-PACKAGE_NAME="zfs"
-PACKAGE_VERSION="#MODULE_VERSION#"
-PRE_BUILD="configure
-  --prefix=/usr
-  --with-config=kernel
-  --with-linux=$(
-    case `lsb_release -is` in
-      (Debian)
-        if [[ -e ${kernel_source_dir/%build/source} ]]
-        then
-          echo ${kernel_source_dir/%build/source}
-        else
-          # A kpkg exception for Proxmox 2.0
-          echo ${kernel_source_dir}
-        fi
-      ;;
-      (*)
-        echo ${kernel_source_dir}
-      ;;
-    esac
-  )
-  --with-linux-obj=${kernel_source_dir}
-  --with-spl=${source_tree}/spl-${PACKAGE_VERSION}
-  --with-spl-obj=${dkms_tree}/spl/${PACKAGE_VERSION}/${kernelver}/${arch}
-  $(
-    [[ -r /etc/default/zfs ]] \
-    && source /etc/default/zfs \
-    && shopt -q -s extglob \
-    && \
-    {
-      if [[ ${ZFS_DKMS_ENABLE_DEBUG,,} == @(y|yes) ]]
-      then
-        echo --enable-debug
-      fi
-      if [[ ${ZFS_DKMS_ENABLE_DEBUG_DMU_TX,,} == @(y|yes) ]]
-      then
-        echo --enable-debug-dmu-tx
-      fi
-    }
-  )
-"
-POST_BUILD="cp
-  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/zfs_config.h
-  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/module/Module.symvers
-  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/${kernelver}/${arch}/
-"
-REMAKE_INITRD="$(
-  if [ -e /usr/share/initramfs-tools/hooks/zfs \
-       -o -e /usr/share/dracut/modules.d/90zfs ]
-  then
-    echo -n yes
-  else
-    echo -n no
-  fi
-)"
-MAKE[0]="make"
-STRIP[0]="$(
-  [[ -r /etc/default/zfs ]] \
-  && source /etc/default/zfs \
-  && shopt -q -s extglob \
-  && [[ ${ZFS_DKMS_DISABLE_STRIP,,} == @(y|yes) ]] \
-  && echo -n no
-)"
-STRIP[1]="${STRIP[0]}"
-STRIP[2]="${STRIP[0]}"
-STRIP[3]="${STRIP[0]}"
-STRIP[4]="${STRIP[0]}"
-STRIP[5]="${STRIP[0]}"
-BUILT_MODULE_NAME[0]="zavl"
-BUILT_MODULE_LOCATION[0]="module/avl/"
-DEST_MODULE_LOCATION[0]="/extra/zfs/zavl"
-BUILT_MODULE_NAME[1]="zcommon"
-BUILT_MODULE_LOCATION[1]="module/zcommon/"
-DEST_MODULE_LOCATION[1]="/extra/zfs/zcommon"
-BUILT_MODULE_NAME[2]="znvpair"
-BUILT_MODULE_LOCATION[2]="module/nvpair/"
-DEST_MODULE_LOCATION[2]="/extra/zfs/znvpair"
-BUILT_MODULE_NAME[3]="zpios"
-BUILT_MODULE_LOCATION[3]="module/zpios/"
-DEST_MODULE_LOCATION[3]="/extra/zfs/zpios"
-BUILT_MODULE_NAME[4]="zunicode"
-BUILT_MODULE_LOCATION[4]="module/unicode/"
-DEST_MODULE_LOCATION[4]="/extra/zfs/zunicode"
-BUILT_MODULE_NAME[5]="zfs"
-BUILT_MODULE_LOCATION[5]="module/zfs/"
-DEST_MODULE_LOCATION[5]="/extra/zfs/zfs"

zfs-debian-pve/zfs-dkms.postinst

@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-case $1 in
-	(configure)
-		[ -x /usr/share/update-notifier/notify-reboot-required ] \
-		  && /usr/share/update-notifier/notify-reboot-required
-		;;
-esac
-
-#DEBHELPER#

zfs-debian-pve/zfs-dkms.prerm

@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#

zfs-debian-pve/zfs-doc.examples

@@ -1,56 +0,0 @@
-etc/zfs/vdev_id.conf.alias.example
-etc/zfs/vdev_id.conf.multipath.example
-etc/zfs/vdev_id.conf.sas_direct.example
-etc/zfs/vdev_id.conf.sas_switch.example
-scripts/common.sh
-scripts/zconfig.sh
-scripts/zfault.sh
-scripts/zfs.sh
-scripts/zpios-profile/zpios-profile-disk.sh
-scripts/zpios-profile/zpios-profile-pids.sh
-scripts/zpios-profile/zpios-profile-post.sh
-scripts/zpios-profile/zpios-profile-pre.sh
-scripts/zpios-profile/zpios-profile.sh
-scripts/zpios-sanity.sh
-scripts/zpios-survey.sh
-scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh
-scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh
-scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh
-scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh
-scripts/zpios-test/4th-1024rc-4rs-1cs-4off.sh
-scripts/zpios-test/large-thread-survey.sh
-scripts/zpios-test/large.sh
-scripts/zpios-test/lustre.sh
-scripts/zpios-test/medium.sh
-scripts/zpios-test/small.sh
-scripts/zpios-test/tiny.sh
-scripts/zpios.sh
-scripts/zpool-config/dm0-raid0.sh
-scripts/zpool-config/file-raid0.sh
-scripts/zpool-config/file-raid10.sh
-scripts/zpool-config/file-raidz.sh
-scripts/zpool-config/file-raidz2.sh
-scripts/zpool-config/hda-raid0.sh
-scripts/zpool-config/lo-faulty-raid0.sh
-scripts/zpool-config/lo-faulty-raid10.sh
-scripts/zpool-config/lo-faulty-raidz.sh
-scripts/zpool-config/lo-faulty-raidz2.sh
-scripts/zpool-config/lo-faulty-raidz3.sh
-scripts/zpool-config/lo-raid0.sh
-scripts/zpool-config/lo-raid10.sh
-scripts/zpool-config/lo-raidz.sh
-scripts/zpool-config/lo-raidz2.sh
-scripts/zpool-config/md0-raid10.sh
-scripts/zpool-config/md0-raid5.sh
-scripts/zpool-config/ram0-raid0.sh
-scripts/zpool-config/scsi_debug-noraid.sh
-scripts/zpool-config/scsi_debug-raid0.sh
-scripts/zpool-config/scsi_debug-raid10.sh
-scripts/zpool-config/scsi_debug-raidz.sh
-scripts/zpool-config/scsi_debug-raidz2.sh
-scripts/zpool-config/scsi_debug-raidz3.sh
-scripts/zpool-config/sda-raid0.sh
-scripts/zpool-config/zpool-raid0.sh
-scripts/zpool-config/zpool-raid10.sh
-scripts/zpool-config/zpool-raidz.sh
-scripts/zpool-create.sh

zfs-debian-pve/zfs-doc.install

@@ -1 +0,0 @@
-../tree/zfs-doc/* /

zfs-debian-pve/zfs-initramfs.install

@@ -1 +0,0 @@
-../tree/zfs-initramfs/* /

zfs-debian-pve/zfs-initramfs.preinst

@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-# @FIXME: During system start, the /etc/init/mountall.conf on Ubuntu is unable
-# to generate the /etc/mtab file from the /proc/mounts file if a ZFS filesystem
-# is already mounted.
-
-# This depends on mountall 2.18, which recognizes the link.
-ln -sf /proc/mounts /etc/mtab
-
-#DEBHELPER#

zfs-debian-pve/zfsutils.install

@@ -1,4 +0,0 @@
-../tree/zfsutils/* /
-sbin
-lib/udev
-usr/share/man

zfs-debian-pve/zfsutils.postinst

@@ -1,9 +0,0 @@
-#!/bin/sh -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 -- "$@"
-fi
-
-#DEBHELPER#

zfs-debian-pve/zfsutils.postrm

@@ -1,9 +0,0 @@
-#!/bin/sh -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 -- "$@"
-fi
-
-#DEBHELPER#

zfs-debian-pve/zfsutils.preinst

@@ -1,9 +0,0 @@
-#!/bin/sh -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 -- "$@"
-fi
-
-#DEBHELPER#

zfs-debian-pve/zfsutils.vdev.udev

@@ -1,4 +0,0 @@
-ENV{DEVTYPE}=="disk", IMPORT{program}="/lib/udev/vdev_id -d %k"
-KERNEL=="*[!0-9]", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}"
-KERNEL=="*[0-9]", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="partition", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}-part%n"
-KERNEL=="dm-[0-9]*", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}"

zfs-debian-pve/zfsutils.zfs-mount.init

@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides: zvol zfs
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Mount ZFS filesystems
-# Description: Run the `zfs mount -a` or `zfs umount -a` command.
-#              This init script is deprecated and should be disabled in the
-#              /etc/default/zfs options file. Instead, use the zfs-mount
-#              package for Debian or the zfs-mountall package for Ubuntu
-### END INIT INFO
-
-PATH=/sbin:/bin
-
-. /lib/lsb/init-functions
-. /lib/init/vars.sh
-
-[ -f /etc/default/zfs ] && . /etc/default/zfs
-
-do_start()
-{
-	log_begin_msg "Mounting ZFS filesystems"
-	log_progress_msg "filesystems"
-	zfs mount -a
-	RET=$?
-
-	if [ $RET != 0 ] ; then
-		log_end_msg $RET
-		exit $RET
-	fi
-
-	log_end_msg 0
-}
-
-do_stop()
-{
-	log_begin_msg "Unmounting ZFS filesystems"
-	log_progress_msg "filesystems"
-	zfs unmount -a
-	RET=$?
-
-	# Ignore a non-zero `zfs` result so that a busy ZFS instance
-	# does not hang the system during shutdown.
-	if [ $RET != 0 ] ; then
-		log_end_msg $RET
-	fi
-
-	log_end_msg 0
-}
-
-case "$1" in
-	(start)
-		case "$ZFS_MOUNT" in
-			([Oo][Ff][Ff]|[Nn][Oo]|'')
-				exit 0
-				;;
-		esac
-		do_start
-		;;
-	(stop)
-		case "$ZFS_UNMOUNT" in
-			([Oo][Ff][Ff]|[Nn][Oo]|'')
-				exit 0
-				;;
-		esac
-		do_stop
-		;;
-	(force-reload|reload|restart|status)
-		# no-op
-		;;
-
-	(*)
-		[ -n "$1" ] && echo "Error: Unknown command $1."
-		echo "Usage: $0 {start|stop}"
-		exit 3
-	;;
-esac

zfs-debian-pve/zfsutils.zfs-share.init

@@ -1,80 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides: shareiscsi sharenfs sharesmb zfs-share
-# Required-Start: $local_fs $network $remote_fs
-# Required-Stop: $local_fs $network $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Should-Start: iscsi iscsitarget istgt nfs-kernel-server samba
-# Should-Stop: iscsi iscsitarget istgt nfs-kernel-server samba
-# Short-Description: Network share OpenZFS datasets.
-# Description: Run the `zfs share -a` or `zfs unmount -a` commands
-#	for controlling iSCSI, NFS, or CIFS network shares.
-### END INIT INFO
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-. /lib/lsb/init-functions
-. /lib/init/vars.sh
-
-[ -f /etc/default/zfs ] && . /etc/default/zfs
-
-do_start()
-{
-	log_begin_msg "Sharing OpenZFS filesystems"
-	log_progress_msg "filesystems"
-	zfs share -a
-	RET=$?
-
-	if [ $RET != 0 ] ; then
-		log_end_msg $RET
-		exit $RET
-	fi
-
-	log_end_msg 0
-}
-
-do_stop()
-{
-	log_begin_msg "Unsharing OpenZFS filesystems"
-	log_progress_msg "filesystems"
-	zfs unshare -a
-	RET=$?
-
-	# Ignore a non-zero `zfs` result so that a busy OpenZFS instance
-	# does not hang the system during shutdown.
-	if [ $RET != 0 ] ; then
-		log_end_msg $RET
-	fi
-
-	log_end_msg 0
-}
-
-case "$1" in
-	(start)
-		case "$ZFS_SHARE" in
-			([Oo][Ff][Ff]|[Nn][Oo]|'')
-				exit 0
-				;;
-		esac
-		do_start
-		;;
-	(stop)
-		case "$ZFS_UNSHARE" in
-			([Oo][Ff][Ff]|[Nn][Oo]|'')
-				exit 0
-				;;
-		esac
-		do_stop
-		;;
-	(force-reload|reload|restart|status)
-		# no-op
-		;;
-
-	(*)
-		[ -n "$1" ] && echo "Error: Unknown command $1."
-		echo "Usage: $0 {start|stop}"
-		exit 3
-	;;
-esac

zfs-debian-pve/zfsutils.zfs.default

@@ -1,15 +0,0 @@
-# ZoL userland configuration.
-
-# uncomment the following line to mount zfs at startup
-#ZFS_MOUNT=yes
-
-# Wait this many seconds during system start for pool member devices to appear
-# before attempting import and starting mountall.
-ZFS_AUTOIMPORT_TIMEOUT='30'
-
-# Run `zfs share -a` during system start?
-# nb: The shareiscsi, sharenfs, and sharesmb dataset properties.
-ZFS_SHARE='no'
-
-# Run `zfs unshare -a` during system stop?
-ZFS_UNSHARE='no'

zfs-debian-pve/zfsutils.zvol.udev

@@ -1 +0,0 @@
-KERNEL=="zd*" SUBSYSTEM=="block" ACTION=="add|change" PROGRAM="/lib/udev/zvol_id $tempnode" SYMLINK+="zvol/%c"

zfs/debian/changelog

@@ -0,0 +1,685 @@
+zfs-linux (0.7.13-pve1~bpo1) unstable; urgency=medium
+
+  * update ZFS to 0.7.13
+
+  * base zfs-linux on upstream ZOL instead of debian
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Mar 2019 06:53:00 +0100
+
+zfs-linux (0.7.12-pve1~bpo1) unstable; urgency=medium
+
+  * update ZFS to 0.7.12
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2018 17:51:59 +0100
+
+zfs-linux (0.7.11-pve2~bpo1) unstable; urgency=medium
+
+  * update ZFS to debian/0.7.11-3
+
+  * Cherry-pick two fixes planned for 0.7.12
+
+  * Backport deadlock fix between mm_sem and tx assign in zfs_write() and page
+    fault
+
+  * Fix missing Breaks/Replaces in zfs-initramfs
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2018 13:45:49 +0100
+
+zfs-linux (0.7.11-pve1~bpo1) unstable; urgency=medium
+
+  * update ZFS to 0.7.11
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Sep 2018 15:47:31 +0200
+
+zfs-linux (0.7.9-pve3~bpo9) unstable; urgency=medium
+
+  *  Cherry-pick fix for deadlock umount/snapentry_expire
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 03 Aug 2018 11:41:11 +0200
+
+zfs-linux (0.7.9-pve2~bpo9) unstable; urgency=medium
+
+  * Cherry-pick fix for zpl_mount deadlock
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 12 Jul 2018 12:37:50 +0200
+
+zfs-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.9
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
+
+zfs-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.8 (no changes)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
+
+zfs-linux (0.7.7-pve2~bpo9) unstable; urgency=medium
+
+  * (temporarily) revert likely cause of #7401
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 9 Apr 2018 09:49:27 +0200
+
+zfs-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.7
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
+
+zfs-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.6
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:48:29 +0100
+
+zfs-linux (0.7.4-pve2~bpo9) unstable; urgency=medium
+
+  * cherry-pick ARC hit rate fix from 0.7.6
+
+  * always load ZFS modules on boot
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Jan 2018 11:31:14 +0100
+
+zfs-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
+
+zfs-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.3
+
+  * include fix for user namespace setgid issue (#6800 upstream)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
+
+zfs-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
+
+  * update zfs to 0.7.2
+
+  * add PR 6616 - zfs send/recv compatibility with 0.6.5
+
+  * add PR 6695 - zfs recv: don't skip over objects which should be freed
+
+  * various small fixes
+
+  * split test suite into zfs-test package
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:34:05 +0200
+
+zfs-linux (0.6.5.11-pve18~bpo90) unstable; urgency=medium
+
+  * fix #1509: arc_summary error with L2ARC
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 2 Oct 2017 09:30:41 +0200
+
+zfs-linux (0.6.5.11-pve17~bpo90) unstable; urgency=medium
+
+  * update zfs to debian/0.6.5.11-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
+
+zfs-linux (0.6.5.9-pve16~bpo90) unstable; urgency=medium
+
+  * drop transitional packages
+
+  * convert python scripts to python 3, drop .py suffix
+
+  * rebuild for PVE 5.0 / Debian Stretch
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
+
+zfs-linux (0.6.5.9-pve15~bpo80) unstable; urgency=medium
+
+  * update zfs to debian/0.6.5.9-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:10 +0100
+
+zfs-linux (0.6.5.8-pve14~bpo80) unstable; urgency=medium
+
+  * update zfs to debian/0.6.5.8-3
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Jan 2017 09:34:58 +0100
+
+zfs-linux (0.6.5.8-pve13~bpo80) unstable; urgency=medium
+
+  * fix #1184: zfs-share.service has wrong path to 'rm' command
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Oct 2016 11:25:47 +0200
+
+zfs-linux (0.6.5.8-pve12~bpo80) unstable; urgency=medium
+
+  * import with "-d /dev/disk/by-id" in systemd service
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Oct 2016 13:48:08 +0200
+
+zfs-linux (0.6.5.8-pve11~bpo80) unstable; urgency=medium
+
+  * update zfs to debian/0.6.5.8-1
+
+  * switch package upstream sources to Debian (Jessie)
+
+  * add transitional packages for upgrades
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
+
+zfs-linux (0.6.5.7-pve10~bpo80) unstable; urgency=medium
+
+  * update to pkg-zfs jessie/0.6.5.7-8
+
+  * change package versioning to allow upgrades from PVE3/wheezy
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
+
+zfs-linux (0.6.5-pve9~jessie) unstable; urgency=medium
+
+  * Update to pkg-zfs jessie/0.6.5.6-3
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 12 Apr 2016 09:51:35 +0200
+
+zfs-linux (0.6.5-pve8~jessie) unstable; urgency=medium
+
+  * update to zfs-0.6.5.6
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:50:22 +0200
+
+zfs-linux (0.6.5-pve7~jessie) unstable; urgency=medium
+
+  * update to zfs-0.6.5.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 10:51:17 +0100
+
+zfs-linux (0.6.5-pve6~jessie) unstable; urgency=medium
+
+  * Prepare to tag zfs-0.6.5.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Nov 2015 07:21:44 +0100
+
+zfs-linux (0.6.5-pve5~jessie) unstable; urgency=medium
+
+  * Illumos 6267 - dn_bonus evicted too early
+
+  * Fix use-after-free in vdev_disk_physio_completion
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:42:42 +0100
+
+zfs-linux (0.6.5-pve4~jessie) unstable; urgency=medium
+
+  * update to master/debian/jessie/0.6.5.2-2
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 05 Oct 2015 17:56:45 +0200
+
+zfs-linux (0.6.5-pve3~jessie) unstable; urgency=medium
+
+  * do not install /etc/init.d/zfs-zed script to avoid double startup
+    with systemd
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 28 Sep 2015 10:14:40 +0200
+
+zfs-linux (0.6.5-pve2~jessie) unstable; urgency=medium
+
+  * update to master/debian/jessie/0.6.5.1-4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Sep 2015 12:45:33 +0200
+
+zfs-linux (0.6.5-pve1~jessie) unstable; urgency=medium
+
+  * update to master/debian/jessie/0.6.5.1-2
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:02:41 +0200
+
+zfs-linux (0.6.4-pve3~jessie) unstable; urgency=medium
+
+  * update to snapshot/debian/jessie/0.6.4-24-6bec43
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:13:44 +0200
+
+zfs-linux (0.6.4-pve2~jessie) unstable; urgency=medium
+
+  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-21-53b1d9)
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:03:21 +0200
+
+zfs-linux (0.6.4-pve1~jessie) unstable; urgency=medium
+
+  * update to 0.6.4 (use upstream zol package definitions)
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:19:22 +0200
+
+zfs-linux (0.6.3-pve3~jessie) unstable; urgency=medium
+
+  * ignore zfs-import-scan errors
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 31 Mar 2015 17:52:40 +0200
+
+zfs-linux (0.6.3-pve2~jessie) unstable; urgency=medium
+
+  * use systemd for service startup
+
+  * install zed configuration file /etc/zfs/zed.d/zed.rc
+
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Mar 2015 15:52:54 +0100
+
+zfs-linux (0.6.3-pve1~jessie) unstable; urgency=medium
+
+  * recompile on jessie
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:02:08 +0100
+
+zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
+
+  * use /sbin/modprobe to avoid warning inside initrd
+
+  * fix warning about undefined values inside initrd
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
+
+zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
+
+  * first version for Proxmox VE
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
+
+zfs-linux (0.7.12-2) unstable; urgency=medium
+
+  [ Colin Ian King ]
+  * Only run autopkgtests for amd64, arm64, ppc64el and s390x (LP#1805627).
+
+  [ Martin Bagge / brother ]
+  * [INTL:sv] Swedish strings for zfs-linux debconf (Closes: #918020)
+
+  [ Anders Jonsson ]
+  * sv.po: typo fix
+
+  [ Mo Zhou ]
+  * Change init script's behaviour to default during postinst.
+  * Add ${perl:Depends} to zfs-dkms's Depends.
+  * Add autopkgtest script to test zfs-dkms build.
+  * autopkgtest: minor fix
+
+  [ Aron Xu ]
+  * Add XS-Autobuild: yes to d/control
+  * Conflicts with insserv << 1.18 (Closes: #915831)
+
+ -- Aron Xu <aron@debian.org>  Fri, 11 Jan 2019 21:32:06 +0800
+
+zfs-linux (0.7.12-1) unstable; urgency=medium
+
+  [ Stoiko Ivanov ]
+  * Add Breaks/Replaces to zfs-initramfs
+
+  [ Mo Zhou ]
+  * New upstream version 0.7.12
+  * Drop unnecessary patch init-start-stop-dep-on-local-fs.patch .
+  * Override init.d-script-missing-dependency-on-local_fs for zfs-zed.
+  * Bump linux compatibility to 4.19 .
+
+ -- Mo Zhou <cdluminate@gmail.com>  Mon, 19 Nov 2018 11:32:44 +0000
+
+zfs-linux (0.7.11-3) unstable; urgency=medium
+
+  [ Antonio Russo ]
+  + https://salsa.debian.org/zfsonlinux-team/zfs/merge_requests/9
+  * Break/Replace upstream .deb packages (Closes: #839921)
+  * Install upstream bash completion file instead of embedded one.
+  * Modify META before autoreconf.
+  * Make dkms distdir before build to avoid including build artifacts.
+  * Remove ZFS_AC_PACKAGE macros from DKMS sources.
+    This removes dpkg-dev dependency from zfs-dkms package.
+  * Use upstream's dkms.mkconf script to produce dkms.conf .
+  * Ship initramfs zdev hook in zfs-initramfs (Closes: #902052)
+
+  [ Nicolas Braud-Santoni ]
+  * Update debian/copyright, removing unused wildcards.
+
+  [ Nicholas D Steeves ]
+  * Change -dbg package's priority from extra to optional.
+
+  [ Mo Zhou ]
+  * Fix FTBFS on architecture=all due to FileNotFound. (Closes: #911937)
+  * Add isolation-machine restriction to autopkgtest because the tests
+    needs to interact with the kernel, i.e. loading kernel module.
+
+ -- Mo Zhou <cdluminate@gmail.com>  Sun, 28 Oct 2018 10:28:52 +0000
+
+zfs-linux (0.7.11-2) unstable; urgency=medium
+
+  * Support Devuan in dkms script. (Closes: #900089)
+    Thanks to Chris Dos <chris@chrisdos.com>
+  * Install init scripts to support non-systemd setups. (Closes: #826994)
+    Thanks to Chris Dos <chris@chrisdos.com>
+  * Override init.d-script-does-not-source-init-functions for
+    zfsutils-linux and zfs-zed.
+  * Patch upstream init scripts to make them work for Debian+OpenRC setup.
+  * Patch upstream init script to fix missing dependency on local_fs.
+
+ -- Mo Zhou <cdluminate@gmail.com>  Fri, 26 Oct 2018 09:32:06 +0000
+
+zfs-linux (0.7.11-1) unstable; urgency=medium
+
+  [ Aron Xu ]
+  * Add dpkg-dev to Depends of zfs-dkms (Closes: #900714)
+
+  [ Nicolas Braud-Santoni ]
+  * Use canonical HTTPS format URL for Vcs-Git (Closes: #895873)
+
+  [ Mo Zhou ]
+  * New upstream version 0.7.11 (Closes: #908290)
+  * Bump linux_compat to 4.18 .
+  * Replace get_next.sh with one-liner awk script in rules.
+  * Append myself to Uploaders and refresh auto-generated control.
+  * Use HTTPS format URI in watch file.
+  * Recommends linux-libc-dev (<< LINUX_NEXT~) instead of (<< LINUX_NEXT).
+
+ -- Mo Zhou <cdluminate@gmail.com>  Wed, 19 Sep 2018 08:45:18 +0000
+
+zfs-linux (0.7.9-3) unstable; urgency=medium
+
+  [ Antonio Russo ]
+  * Expand zfs-test and add Breaks/Conflicts (Closes: #899047)
+
+  [ Aron Xu ]
+  * d/control: migrate to alioth-lists (Closes: #899756)
+
+ -- Aron Xu <aron@debian.org>  Mon, 28 May 2018 18:22:02 +0800
+
+zfs-linux (0.7.9-2) unstable; urgency=medium
+
+  [ Aron Xu ]
+  * Move more zfs test tools to zfs-test package (Closes: #868653)
+  * New upstream version 0.7.9
+  * d/rules: add --enable-systemd
+  * Fix lintian obsolete-relation-form-in-source
+  * Bump supported linux version to 4.16
+
+  [ Antonio Russo ]
+  * Install enum-extract.pl with dkms
+  * Handle /proc/kallsym obfuscation (Closes: #891936)
+
+ -- Aron Xu <aron@debian.org>  Thu, 17 May 2018 23:47:29 +0800
+
+zfs-linux (0.7.6-1) unstable; urgency=medium
+
+  [ Lev Lamberov ]
+  * [INTL:ru] Updated Russian translation of debconf (Closes: #885990)
+
+  [ Aron Xu]
+  * New upstream release (Closes: #889795, #890576)
+  * 0001-Fix-bug-in-distclean-which-removes-needed-files.patch:
+    removed, applied upstream
+  * Update VCS-* URL to salsa.debian.org
+  * Apply wrap-and-sort
+  * Recommends: linux-libc-dev (< ${LINUX_NEXT}):
+    Tries to prevent unexpected upgrades of kernel that is not known to
+    be supported by the packaged version of ZFS/SPL. (Closes: #849420)
+
+ -- Aron Xu <aron@debian.org>  Mon, 26 Feb 2018 16:32:29 +0800
+
+zfs-linux (0.7.5-1) unstable; urgency=medium
+
+  [ Aron Xu ]
+  * New upstream version 0.7.5 (Closes: #884812)
+
+  [ Antonio Russo ]
+  * Add version dependency on zfsutils-linux package (Closes: #880889)
+
+ -- Aron Xu <aron@debian.org>  Fri, 19 Jan 2018 15:39:23 +0800
+
+zfs-linux (0.7.4-1) unstable; urgency=medium
+
+  * New upstream version 0.7.4 (Closes: #884287, #883832)
+  * Require debhelper >= 10.2
+  * cherry-pick: fix distclean which removes needed files (Closes: #884706)
+  * Refresh patches
+  * Update stdver to 4.1.2, no change required
+  * Install zfs-import.target
+
+ -- Aron Xu <aron@debian.org>  Mon, 18 Dec 2017 22:48:59 +0800
+
+zfs-linux (0.7.3-3) unstable; urgency=medium
+
+  [ Antonio Russo ]
+  * Add maximum version dependency on spl-dkms (Closes: #883008)
+
+ -- Aron Xu <aron@debian.org>  Thu, 30 Nov 2017 00:34:30 +0800
+
+zfs-linux (0.7.3-2) unstable; urgency=medium
+
+  [ Fabian Grünbichler ]
+  * d/rules: remove obsolete calls to dpkg-architecture (Closes: #882209)
+  * zfs-test: add proper Breaks+Replaces (Closes: #880902)
+  * build: add implicit version to dh_makeshlibs (Closes: #880709)
+
+  [ Aron Xu ]
+  * Depend on matching version of spl-dkms (Closes: ##881013)
+
+ -- Aron Xu <aron@debian.org>  Tue, 28 Nov 2017 16:16:34 +0800
+
+zfs-linux (0.7.3-1) unstable; urgency=medium
+
+  [ Antonio Russo ]
+  * Refresh manual builds DKMS prevention patch
+
+  [ Fabian Grünbichler ]
+  * zfs-test package
+  * add files to debian/not-installed
+  * dh_install: switch to --fail-missing
+  * add new files from 0.7 to install
+  * dkms: build icp module as well
+
+  [ Antonio Russo ]
+  * dracut: make module-setup.sh shebang explicit
+  * add man page reference to systemd units
+  * Fix install path of zpool.d scripts
+  * Incorporate DebianPT.org Portuguese translation
+  * Fix typo in debconf templates
+  * Drop dependency on dh-systemd
+
+  [ Aron Xu ]
+  * Drop merged patches, update remainders
+  * Update std-ver to 4.1.1
+  * New upstream version 0.7.3
+  * Update debconf pot file
+  * Update control.in for dh-systemd deprecation
+  * Add lintian override for zfs-test
+
+  [ Colin King ]
+  * Improve cloning performance for large numbers of clones (LP: #1567557)
+    Bump zcmd buffer from 16K to 256K.
+
+ -- Aron Xu <aron@debian.org>  Tue, 31 Oct 2017 18:52:01 +0800
+
+zfs-linux (0.6.5.11-1) unstable; urgency=medium
+
+  [ Aron Xu ]
+  * Imported Upstream version 0.6.5.11
+
+  [ Fabian Grünbichler ]
+  * fix rm path in zfs-share.service
+
+ -- Aron Xu <aron@debian.org>  Fri, 14 Jul 2017 16:33:23 +0800
+
+zfs-linux (0.6.5.10-1) unstable; urgency=medium
+
+  * Add kernel version to depmod cmd (Closes: #860958)
+  * New upstream version 0.6.5.10
+
+ -- Aron Xu <aron@debian.org>  Wed, 05 Jul 2017 18:11:39 +0800
+
+zfs-linux (0.6.5.9-5) unstable; urgency=medium
+
+  * Add zfs initramfs conf for root pool setup
+    (Closes: #848157, LP: #1673197)
+
+ -- Aron Xu <aron@debian.org>  Sun, 19 Mar 2017 18:14:57 +0800
+
+zfs-linux (0.6.5.9-4) unstable; urgency=medium
+
+  * autopkgtest: load zfs module before running tests
+
+ -- Aron Xu <aron@debian.org>  Tue, 14 Mar 2017 11:38:08 +0800
+
+zfs-linux (0.6.5.9-3) unstable; urgency=medium
+
+  [ Petter Reinholdtsen ]
+  * Updated German debconf translation by Helge Kreutzmann. (Closes: #857528)
+  * Updated metadata on a few patches.
+
+  [ Aron Xu ]
+  * Cherry-pick upstream fix for merged /usr/lib and /lib
+  * Manually maintain adt test Depends
+
+ -- Aron Xu <aron@debian.org>  Mon, 13 Mar 2017 12:23:32 +0800
+
+zfs-linux (0.6.5.9-2) unstable; urgency=medium
+
+  [ Fabian Grünbichler ]
+  * fix zed-service-bindir patch
+
+ -- Aron Xu <aron@debian.org>  Tue, 07 Feb 2017 17:22:02 +0800
+
+zfs-linux (0.6.5.9-1) unstable; urgency=medium
+
+  [ Aron Xu ]
+  * Imported Upstream version 0.6.5.9 (Closes: #851513)
+
+  [ Lukas Wunner ]
+  * Cherry picks for root zpool with dracut (Closes: #849969)
+  * Fix installation path of systemd files
+  * Fix build breakage caused by nonstandard umask
+
+  [ Fabian Grünbichler ]
+  * fix python script install path (Closes: #842237)
+
+ -- Aron Xu <aron@debian.org>  Mon, 06 Feb 2017 15:57:50 +0800
+
+zfs-linux (0.6.5.8-3) unstable; urgency=medium
+
+  * Fix the path on the zfs-zed unit file (Closes: #849813)
+
+ -- Carlos Alberto Lopez Perez <clopez@igalia.com>  Thu, 05 Jan 2017 16:23:16 +0100
+
+zfs-linux (0.6.5.8-2) unstable; urgency=medium
+
+  [ Richard Laager ]
+  * Remove .py extension from utilities in /usr/sbin as per policy
+    10.4 Scripts (LP: #1628279)
+
+  [ Colin Ian King ]
+  * Use python3 for arcstat.py, arc_summary.py & dbufstat.py (LP: #1627909)
+
+  [ Richard Laager ]
+  * Set PATH in cron.d job to fix monthly scrubs. (LP: #1548009)
+
+  [ Aron Xu ]
+  * Install zed into /usr/sbin
+  * Rename zfsutils path to follow the package name
+  * Add missing part in python3 move
+  * Install zed to /usr/sbin
+
+  [ Petter Reinholdtsen ]
+  * Updated Italian debconf translation by Beatrice Torracca.
+    (Closes: #846928)
+  * Added patch 1003-linux-4.9-compat.patch from upstream to build with
+    Linux kernel 4.9. (Closes: #847018)
+
+ -- Aron Xu <aron@debian.org>  Sat, 17 Dec 2016 17:42:21 +0800
+
+zfs-linux (0.6.5.8-1) unstable; urgency=medium
+
+  [ Carlos Alberto Lopez Perez ]
+  * Reflow changelog from last upload to avoid lintian warning.
+
+  [ Aron Xu ]
+  * Imported Upstream version 0.6.5.8 (Closes: #838192)
+  * Conflicts with zutils (Closes: #836853)
+
+  [ Zhou Mo ]
+  * Patch: remove merged patches.
+  * Upstream renamed zed.service to zfs-zed.service .
+  * Avoid installing zfs-zed.service twice.
+
+ -- Aron Xu <aron@debian.org>  Tue, 20 Sep 2016 15:20:21 +0800
+
+zfs-linux (0.6.5.7-2) unstable; urgency=medium
+
+  [ Aron Xu ]
+  * Add busybox to zfs-initramfs list of dependencies. (Closes: #824976)
+
+  [ Petter Reinholdtsen ]
+  * Updated Danish debconf translation by Joe Hansen. (Closes: #830652)
+  * Added Dutch (nl) debconf translation by Frans Spiesschaert.
+    (Closes: #832280)
+  * Norwegian Bokmål (nb) debconf template translation by Petter Reinholdtsen.
+
+  [ Eric Desrochers ]
+  * Change utilities path (bindir) to /usr/sbin. (Closes: #832938)
+
+  [ Carlos Alberto Lopez Perez]
+  * Add tunable to ignore hole_birth, and enable it by default.
+    (Closes: #830824)
+
+ -- Carlos Alberto Lopez Perez <clopez@igalia.com>  Tue, 16 Aug 2016 17:43:48 +0200
+
+zfs-linux (0.6.5.7-1) unstable; urgency=medium
+
+  [ YunQiang Su ]
+  * 1002-fix-mips-build.patch: fix builds on mips* archs
+
+  [ Aron Xu ]
+  * New upstream release.
+  * 1001-Fix-aarch64-compilation.patch: dropped, not needed anymore
+  * Merge patches from Ubuntu:
+    - 0002-Check-for-META-and-DCH-consistency-in-autoconf.patch
+    - 0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
+    - enable-zed.patch
+
+ -- Aron Xu <aron@debian.org>  Tue, 31 May 2016 14:10:49 +0800
+
+zfs-linux (0.6.5.6-2) unstable; urgency=medium
+
+  [ Aron Xu ]
+  * Adding smoke testing scripts from Ubuntu
+  * Fix binary module builds
+  * Add libblkid-dev, libattr1-dev to build-dep
+  * Re-sync source tree
+  * Add dh-python to b-d
+  * Remove .gitignore files and clean build tree
+  * Scrub all healthy pools monthly from Richard Laager
+
+  [ Petter Reinholdtsen ]
+  * Copied 1000-ppc64el-endian-support.patch from Ubuntu to fix endian
+    build problem on ppc64el
+  * Copied 1001-Fix-aarch64-compilation.patch from Ubuntu to fix build
+    problem on arm64.
+  * Copied 0001-Prevent-manual-builds-in-the-DKMS-source.patch from
+    Ubuntu to block manual building in the DKMS source tree.
+  * Updated Standards-Version from 3.9.7 to 3.9.8.
+  * Bring some files back to the upstream tarball content to get gbp
+    buildpackage working.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Thu, 12 May 2016 12:19:55 +0200
+
+zfs-linux (0.6.5.6-1) unstable; urgency=medium
+
+  [ Aron Xu ]
+  * New upstream version 0.6.5.6.
+
+  [ Petter Reinholdtsen ]
+  * Generated new copyright.cme file based on version 0.6.5.6.
+  * Updated d/copyright file, add missing BSD licensed init.d scripts, and
+    new copyright holders in the new upstream version.
+  * Updated Standards-Version from 3.9.6 to 3.9.7.
+  * Added myself as uploader.
+  * Updated debconf po files based on newest pot file.
+  * Correct URL to git repo in d/control.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sat, 26 Mar 2016 07:08:11 +0000
+
+zfs-linux (0.6.5.5-1) unstable; urgency=medium
+
+  * Initial Release (Closes: #686447)
+
+ -- Aron Xu <aron@debian.org>  Sun, 20 Mar 2016 22:57:06 +0800

zfs/debian/compat

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

zfs/debian/control

@@ -0,0 +1,184 @@
+Source: zfs-linux
+Section: contrib/kernel
+Priority: optional
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Build-Depends: autotools-dev,
+               debhelper (>= 10~),
+               dh-autoreconf,
+               dh-python,
+               libattr1-dev,
+               libblkid-dev,
+               libselinux1-dev,
+               libtool,
+               lsb-release,
+               python3,
+               uuid-dev,
+               zlib1g-dev
+Standards-Version: 4.1.2
+Homepage: http://www.zfsonlinux.org/
+Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
+Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
+
+Package: libnvpair1linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libnvpair1
+Replaces: libnvpair1
+Description: Solaris name-value library for Linux
+ This library provides routines for packing and unpacking nv pairs for
+ transporting data across process boundaries, transporting between
+ kernel and userland, and possibly saving onto disk files.
+
+Package: libuutil1linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libuutil1
+Replaces: libuutil1
+Description: Solaris userland utility library for Linux
+ This library provides a variety of glue functions for ZFS on Linux:
+  * libspl: The Solaris Porting Layer userland library, which provides APIs
+    that make it possible to run Solaris user code in a Linux environment
+    with relatively minimal modification.
+  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
+    library.
+  * libefi: The Extensible Firmware Interface library for GUID disk
+    partitioning.
+  * libshare: NFS, SMB, and iSCSI service integration for ZFS.
+
+Package: libzfslinux-dev
+Section: contrib/libdevel
+Architecture: linux-any
+Depends: libnvpair1linux (= ${binary:Version}),
+         libuutil1linux (= ${binary:Version}),
+         libzfs2linux (= ${binary:Version}),
+         libzpool2linux (= ${binary:Version}),
+         ${misc:Depends}
+Provides: libnvpair-dev, libuutil-dev
+Description: OpenZFS filesystem development files for Linux
+ Header files and static libraries for compiling software against
+ libraries of OpenZFS filesystem.
+ .
+ This package includes the development files of libnvpair1, libuutil1,
+ libzpool2 and libzfs2.
+
+Package: libzfs2linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libzfs2
+Replaces: libzfs2
+Description: OpenZFS filesystem library for Linux
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ The OpenZFS library provides support for managing OpenZFS filesystems.
+
+Package: libzpool2linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libzpool2
+Replaces: libzpool2
+Description: OpenZFS pool library for Linux
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This zpool library provides support for managing zpools.
+
+Package: zfs-initramfs
+Architecture: all
+Depends: busybox-initramfs | busybox-static | busybox,
+         initramfs-tools,
+         zfsutils-linux (>= ${binary:Version}),
+         ${misc:Depends}
+Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
+Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
+Description: OpenZFS root filesystem capabilities for Linux - initramfs
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package adds OpenZFS to the system initramfs with a hook
+ for the initramfs-tools infrastructure.
+
+Package: zfsutils-linux
+Section: contrib/admin
+Architecture: linux-any
+Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Recommends: lsb-base, zfs-zed
+Suggests: nfs-kernel-server,
+          samba-common-bin (>= 3.0.23),
+          zfs-initramfs
+Conflicts: zfs, zfs-fuse, insserv (<< 1.18)
+Provides: zfsutils
+Description: command-line tools to manage OpenZFS filesystems
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package provides the zfs and zpool commands to create and administer
+ OpenZFS filesystems.
+
+Package: zfs-zed
+Section: contrib/admin
+Architecture: linux-any
+Depends: zfsutils-linux (>= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: OpenZFS Event Daemon
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package provides the OpenZFS Event Daemon (zed).
+
+Package: zfs-test
+Section: contrib/admin
+Architecture: linux-any
+Depends: acl,
+         bc,
+         fio,
+         ksh,
+         lsscsi,
+         mdadm,
+         parted,
+         python,
+         sudo,
+         sysstat,
+         zfsutils-linux (>=${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: zfsutils-linux (<= 0.7.9-2)
+Replaces: zfsutils-linux (<= 0.7.9-2)
+Conflicts: zutils
+Description: OpenZFS test infrastructure an support scripts
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package provides the OpenZFS test infrastructure for destructively
+ testing and validating a system using OpenZFS. It is entirely optional
+ and should only be installed and used in test environments.
+
+Package: zfs-dbg
+Section: contrib/debug
+Priority: optional
+Architecture: linux-any
+Depends: libnvpair1linux (= ${binary:Version}),
+         libuutil1linux (= ${binary:Version}),
+         libzfs2linux (= ${binary:Version}),
+         libzpool2linux (= ${binary:Version}),
+         zfs-zed (= ${binary:Version}),
+         zfsutils-linux (= ${binary:Version}),
+         ${misc:Depends}
+Description: Debugging symbols for OpenZFS userland libraries and tools
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package contains the debugging symbols for libzpool2linux, libzfs2linux,
+ libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.

zfs/debian/libnvpair1linux.lintian-overrides

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

zfs/debian/libuutil1linux.docs

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

zfs/debian/libuutil1linux.lintian-overrides

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

zfs/debian/libzfs2linux.docs

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

zfs/debian/libzfs2linux.lintian-overrides

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

zfs/debian/libzfslinux-dev.docs

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

zfs/debian/libzfslinux-dev.install

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

zfs/debian/libzpool2linux.docs

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

zfs/debian/libzpool2linux.lintian-overrides

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

zfs/debian/not-installed

@@ -0,0 +1,11 @@
+usr/share/zfs/enum-extract.pl
+usr/share/zfs/zfs-helpers.sh
+etc/init.d
+etc/sudoers.d
+etc/zfs/vdev_id.conf.alias.example
+etc/zfs/vdev_id.conf.multipath.example
+etc/zfs/vdev_id.conf.sas_direct.example
+etc/zfs/vdev_id.conf.sas_switch.example
+etc/zfs/vdev_id.conf.scsi.example
+usr/lib/dracut
+usr/share/zfs/enum-extract.pl

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

@@ -1,16 +1,15 @@
-From: Darik Horn <dajhorn@vanadac.com>
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-Date: Sat, 18 Oct 2014 14:23:11 -0500
+From: Debian ZFS on Linux maintainers
-Subject: Check for META and DCH consistency in autoconf.
+ <pkg-zfsonlinux-devel@alioth-lists.debian.net>
+Date: Wed, 30 Jan 2019 15:12:04 +0100
+Subject: [PATCH] Check-for-META-and-DCH-consistency-in-autoconf
 
-If a debian/ packaging overlay exists, then the software versions defined in
-the META and debian/changelog files must be the same to ensure that DKMS uses
-correct paths and that users see the same version everywhere.
 ---
  config/zfs-meta.m4 | 34 +++++++++++++++++++++++++++++-----
  1 file changed, 29 insertions(+), 5 deletions(-)
 
 diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
-index 7c92dd5..d174ccc 100644
+index 3e1429d99..b8e26c492 100644
 --- a/config/zfs-meta.m4
 +++ b/config/zfs-meta.m4
 @@ -1,9 +1,10 @@

zfs/debian/patches/0002-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch

@@ -1,24 +1,19 @@
-From: Darik Horn <dajhorn@vanadac.com>
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-Date: Sat, 18 Oct 2014 19:48:46 -0500
+From: Debian ZFS on Linux maintainers
-Subject: Add libuutil to LIBADD for libzfs and libzfs_core
+ <pkg-zfsonlinux-devel@alioth-lists.debian.net>
+Date: Wed, 30 Jan 2019 15:12:04 +0100
+Subject: [PATCH] Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core
 
-Resolve spurious dpkg-shlibdeps warnings like this:
-
-	warning: symbol strlcpy used by libzfs_core.so found in none of the libraries
-
-This happens because dpkg-shlibdeps does not recursively search for symbols.
-
-Signed-off-by: Darik Horn <dajhorn@vanadac.com>
 ---
  lib/libzfs/Makefile.am      | 1 +
  lib/libzfs_core/Makefile.am | 3 ++-
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
-index 8b1f517..efdf84b 100644
+index f1260ea71..5b07b9d9d 100644
 --- a/lib/libzfs/Makefile.am
 +++ b/lib/libzfs/Makefile.am
-@@ -23,6 +23,7 @@ libzfs_la_SOURCES = \
+@@ -31,6 +31,7 @@ nodist_libzfs_la_SOURCES = \
  
  libzfs_la_LIBADD = \
  	$(top_builddir)/lib/libzfs_core/libzfs_core.la \
@@ -27,11 +22,11 @@ index 8b1f517..efdf84b 100644
  	$(top_builddir)/lib/libnvpair/libnvpair.la \
  	$(top_builddir)/lib/libzpool/libzpool.la
 diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am
-index 0ecd208..6f0be5f 100644
+index 5eafc25c0..10d6de3d6 100644
 --- a/lib/libzfs_core/Makefile.am
 +++ b/lib/libzfs_core/Makefile.am
-@@ -10,6 +10,7 @@ libzfs_core_la_SOURCES = \
+@@ -16,7 +16,8 @@ nodist_libzfs_core_la_SOURCES = \
- 	$(top_srcdir)/lib/libzfs_core/libzfs_core.c
+ 	$(KERNEL_C)
  
  libzfs_core_la_LIBADD = \
 -	$(top_builddir)/lib/libnvpair/libnvpair.la
@@ -39,3 +34,4 @@ index 0ecd208..6f0be5f 100644
 +	$(top_builddir)/lib/libuutil/libuutil.la
  
  libzfs_core_la_LDFLAGS = -version-info 1:0:0
+ 

zfs/debian/patches/0003-add-man-page-reference-to-systemd-units.patch

@@ -0,0 +1,60 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Mon, 4 Sep 2017 10:59:32 +0200
+Subject: [PATCH] add man page reference to systemd units
+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-cache.service.in | 1 +
+ etc/systemd/system/zfs-import-scan.service.in  | 1 +
+ etc/systemd/system/zfs-mount.service.in        | 1 +
+ etc/systemd/system/zfs-share.service.in        | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in
+index 97808dee7..cb4358fb4 100644
+--- a/etc/systemd/system/zfs-import-cache.service.in
++++ b/etc/systemd/system/zfs-import-cache.service.in
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=Import ZFS pools by cache file
++Documentation=man:zpool(8)
+ DefaultDependencies=no
+ Requires=systemd-udev-settle.service
+ After=systemd-udev-settle.service
+diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
+index c097e3852..e7b1d8862 100644
+--- a/etc/systemd/system/zfs-import-scan.service.in
++++ b/etc/systemd/system/zfs-import-scan.service.in
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=Import ZFS pools by device scanning
++Documentation=man:zpool(8)
+ DefaultDependencies=no
+ Requires=systemd-udev-settle.service
+ After=systemd-udev-settle.service
+diff --git a/etc/systemd/system/zfs-mount.service.in b/etc/systemd/system/zfs-mount.service.in
+index 728fc630c..8a73716f5 100644
+--- a/etc/systemd/system/zfs-mount.service.in
++++ b/etc/systemd/system/zfs-mount.service.in
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=Mount ZFS filesystems
++Documentation=man:zfs(8)
+ DefaultDependencies=no
+ After=systemd-udev-settle.service
+ After=zfs-import.target
+diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in
+index 494f5cbef..d0c93a3e6 100644
+--- a/etc/systemd/system/zfs-share.service.in
++++ b/etc/systemd/system/zfs-share.service.in
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=ZFS file system shares
++Documentation=man:zfs(8)
+ After=nfs-server.service nfs-kernel-server.service
+ After=smb.service
+ After=zfs-mount.service

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

@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Fri, 19 Jan 2018 12:13:46 +0100
+Subject: [PATCH] always load ZFS module on boot
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+since zfs-import-scan.service is disabled by default, and
+zfs-import-cache.service only gets started if a cache file exists, this
+is needed for zfs-mount, zfs-share and zfs-zed services in case ZFS is
+not actually used.
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ etc/modules-load.d/zfs.conf.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf.in
+index 44e1bb3ed..7509b03cb 100644
+--- a/etc/modules-load.d/zfs.conf.in
++++ b/etc/modules-load.d/zfs.conf.in
+@@ -1,3 +1,3 @@
+ # The default behavior is to allow udev to load the kernel modules on demand.
+ # Uncomment the following line to unconditionally load them at boot.
+-#zfs
++zfs

zfs/debian/patches/0005-fix-install-path-of-zpool.d-scripts.patch

@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Thu, 12 Oct 2017 08:57:48 +0200
+Subject: [PATCH] fix install path of zpool.d scripts
+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>
+---
+ cmd/zpool/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
+index d07f8d616..5d26f326e 100644
+--- a/cmd/zpool/Makefile.am
++++ b/cmd/zpool/Makefile.am
+@@ -22,11 +22,11 @@ zpool_LDADD = \
+ 	-lm $(LIBBLKID)
+ 
+ zpoolconfdir = $(sysconfdir)/zfs/zpool.d
+-zpoolexecdir = $(libexecdir)/zfs/zpool.d
++zpoollibdir = /usr/lib/zfs-linux/zpool.d
+ 
+ EXTRA_DIST = zpool.d/README
+ 
+-dist_zpoolexec_SCRIPTS = \
++dist_zpoollib_SCRIPTS = \
+ 	zpool.d/enc \
+ 	zpool.d/encdev \
+ 	zpool.d/fault_led \
+@@ -119,5 +119,5 @@ install-data-hook:
+ 	for f in $(zpoolconfdefaults); do \
+ 	  test -f "$(DESTDIR)$(zpoolconfdir)/$${f}" -o \
+ 	       -L "$(DESTDIR)$(zpoolconfdir)/$${f}" || \
+-	    ln -s "$(zpoolexecdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
++	    ln -s "$(zpoollibdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
+ 	done

zfs/debian/patches/0006-Use-python3-for-arcstat.py-arc_summary.py-dbufstat.p.patch

@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Mon, 17 Oct 2016 14:30:56 +0800
+Subject: [PATCH] Use python3 for arcstat.py, arc_summary.py & dbufstat.py
+
+---
+ cmd/arc_summary/arc_summary.py | 2 +-
+ cmd/arcstat/arcstat.py         | 2 +-
+ cmd/dbufstat/dbufstat.py       | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmd/arc_summary/arc_summary.py b/cmd/arc_summary/arc_summary.py
+index f6dbb9bfb..723c2e5a6 100755
+--- a/cmd/arc_summary/arc_summary.py
++++ b/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 $
+ #
+diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py
+index d7d3e9b73..3a7a47d67 100755
+--- a/cmd/arcstat/arcstat.py
++++ b/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
+diff --git a/cmd/dbufstat/dbufstat.py b/cmd/dbufstat/dbufstat.py
+index 42bb0c7c7..73e02ca11 100755
+--- a/cmd/dbufstat/dbufstat.py
++++ b/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

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

@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Mon, 6 Feb 2017 12:04:35 +0100
+Subject: [PATCH] Fix the path to the zed binary on the systemd unit.
+
+We install zed into /usr/sbin manually meanwhile the upstream default is
+installing it into /sbin. Ubuntu packages also install zed to /usr/sbin, but
+they ship their own zfs-zed unit.
+---
+ etc/systemd/system/zfs-zed.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
+index e3dec3dca..0b85f169a 100644
+--- a/etc/systemd/system/zfs-zed.service.in
++++ b/etc/systemd/system/zfs-zed.service.in
+@@ -5,7 +5,7 @@ After=zfs-import-cache.service
+ After=zfs-import-scan.service
+ 
+ [Service]
+-ExecStart=@sbindir@/zed -F
++ExecStart=/usr/sbin/zed -F
+ Restart=on-abort
+ 
+ [Install]

zfs/debian/patches/0008-increase-default-zcmd-allocation-to-256K.patch

@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Tue, 31 Oct 2017 19:12:42 +0800
+Subject: [PATCH] increase-default-zcmd-allocation-to-256K
+
+Increase default zcmd allocation to 256K (LP: #567557)
+
+When creating hundreds of clones (for example using containers with
+LXD) cloning slows down as the number of clones increases over time.
+The reason for this is that the fetching of the clone information
+using a small zcmd buffer requires two ioctl calls, one to determine
+the size and a second to return the data. However, this requires
+gathering the data twice, once to determine the size and again to
+populate the zcmd buffer to return it to userspace.
+
+These are expensive ioctl() calls, so instead, make the default buffer
+size much larger: 256K. This may sound large, but on 64 bit systems
+running ZFS this is not a huge chunk of memory for the speed
+improvement we gains for large sets of clones:
+
+        16K zcmd        256K zcmd
+Clones	Time    Clones  Time    Clone   % improvement
+        (secs) 	per sec (secs)  per sec
+100	7	14.29	5	20.00	28.57
+200	10	20.00	9	22.22	10.00
+300	19	15.79	18	16.67	5.26
+400	22	18.18	22	18.18	0.00
+500	29	17.24	29	17.24	0.00
+600	39	15.38	39	15.38	0.00
+700	46	15.22	45	15.56	2.17
+800	58	13.79	51	15.69	12.07
+900	74	12.16	61	14.75	17.57
+1000	90	11.11	74	13.51	17.78
+1100	98	11.22	87	12.64	11.22
+1200	102	11.76	95	12.63	6.86
+1300	113	11.50	104	12.50	7.96
+1400	143	9.79	109	12.84	23.78
+1500	145	10.34	132	11.36	8.97
+1600	165	9.70	145	11.03	12.12
+1700	187	9.09	156	10.90	16.58
+1800	210	8.57	166	10.84	20.95
+1900	226	8.41	183	10.38	19.03
+2000	256	7.81	198	10.10	22.66
+2200	311	7.07	238	9.24	23.47
+2400	373	6.43	271	8.86	27.35
+2600	487	5.34	316	8.23	35.11
+3000	619	4.85	426	7.04	31.18
+3400	915	3.72	549	6.19	40.00
+4000	1332	3.00	923	4.33	30.71
+
+As one can see, with > 2000 clones we get 25-40% speed
+improvement.
+
+This patch was originally suggested by Brian Behlendorf
+(see https://github.com/zfsonlinux/zfs/issues/6372), however
+this fix is a more generic fix to cover all zcmd cases.
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+---
+ lib/libzfs/libzfs_util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
+index 9703f844f..0cfcf9c2f 100644
+--- a/lib/libzfs/libzfs_util.c
++++ b/lib/libzfs/libzfs_util.c
+@@ -1355,7 +1355,7 @@ int
+ zcmd_alloc_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, size_t len)
+ {
+ 	if (len == 0)
+-		len = 16 * 1024;
++		len = 256 * 1024;
+ 	zc->zc_nvlist_dst_size = len;
+ 	zc->zc_nvlist_dst =
+ 	    (uint64_t)(uintptr_t)zfs_alloc(hdl, zc->zc_nvlist_dst_size);

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

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Mon, 24 Oct 2016 13:47:06 +0200
+Subject: [PATCH] import with -d /dev/disk/by-id in scan service
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ 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 e7b1d8862..060540f63 100644
+--- a/etc/systemd/system/zfs-import-scan.service.in
++++ b/etc/systemd/system/zfs-import-scan.service.in
+@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none
++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
+ 
+ [Install]
+ WantedBy=zfs-import.target

zfs/debian/patches/0010-Fix-deadlock-between-zfs-umount-snapentry_expire.patch

@@ -0,0 +1,61 @@
+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>
+
+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 bf5a1d059..2964b65a6 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/debian/patches/0011-Enable-zed-emails.patch

@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Richard Laager <rlaager@wiktel.com>
+Date: Wed, 30 Jan 2019 15:12:04 +0100
+Subject: [PATCH] Enable zed emails
+
+The OpenZFS event daemon monitors pools. This patch enables the email sending
+function by default (if zed is installed). This is consistent with the default
+behavior of mdadm.
+---
+ cmd/zed/zed.d/zed.rc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
+index 35a4d1275..c6c106b06 100644
+--- a/cmd/zed/zed.d/zed.rc
++++ b/cmd/zed/zed.d/zed.rc
+@@ -15,7 +15,7 @@
+ # Email will only be sent if ZED_EMAIL_ADDR is defined.
+ # Disabled by default; uncomment to enable.
+ #
+-#ZED_EMAIL_ADDR="root"
++ZED_EMAIL_ADDR="root"
+ 
+ ##
+ # Name or path of executable responsible for sending notifications via email;
+@@ -41,7 +41,7 @@
+ ##
+ # Minimum number of seconds between notifications for a similar event.
+ #
+-#ZED_NOTIFY_INTERVAL_SECS=3600
++ZED_NOTIFY_INTERVAL_SECS=3600
+ 
+ ##
+ # Notification verbosity.

zfs/debian/patches/series

@@ -0,0 +1,11 @@
+0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
+0002-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
+0003-add-man-page-reference-to-systemd-units.patch
+0004-always-load-ZFS-module-on-boot.patch
+0005-fix-install-path-of-zpool.d-scripts.patch
+0006-Use-python3-for-arcstat.py-arc_summary.py-dbufstat.p.patch
+0007-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
+0008-increase-default-zcmd-allocation-to-256K.patch
+0009-import-with-d-dev-disk-by-id-in-scan-service.patch
+0010-Fix-deadlock-between-zfs-umount-snapentry_expire.patch
+0011-Enable-zed-emails.patch

zfs/debian/rules

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

zfs/debian/source/format

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

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

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

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

@@ -5,7 +5,7 @@
 
 PREREQ="udev"
 PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules"
-COPY_EXEC_LIST="/lib/udev/vdev_id /lib/udev/zvol_id"
+COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id"
 
 # Generic result code.
 RC=0
@@ -56,7 +56,7 @@ done
 
 if [ -f '/etc/default/zfs' -a -r '/etc/default/zfs' ]
 then
-	mkdir -p "$DESTDIR/etc/default"	
+	mkdir -p "$DESTDIR/etc/default"
 	cp -a '/etc/default/zfs' "$DESTDIR/etc/default/"
 fi
 

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

@@ -14,15 +14,5 @@
 #  /sbin/zpool status, /sbin/zpool status *, \
 #  /sbin/zpool upgrade, /sbin/zpool upgrade -v
 #
-#Runas_Alias R_ROOT = root
-#
-## User privilege specification
-#root    ALL=(ALL) ALL
-#
-## Members of the admin group may gain root privileges
-#%adm ALL=(ALL) ALL  # linux
-#%admin ALL=(ALL) ALL  # linux
-#%staff ALL=(ALL) ALL  # solaris
-#
 ## allow any user to use basic read-only ZFS commands
-#ALL ALL = (R_ROOT) NOPASSWD: C_ZFS
+#ALL ALL = (root) NOPASSWD: C_ZFS

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

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

zfs/debian/watch

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