bump version to 0.8.4-pve1

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

debian/changelog

@@ -1,3 +1,9 @@
+zfs-linux (0.8.4-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 0.8.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 14 May 2020 10:39:11 +0200
+
 zfs-linux (0.8.3-pve1) pve pmg; urgency=medium
 
   * update ZFS to 0.8.3

debian/control

@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 10~),
                python3-all-dev,
                uuid-dev,
                zlib1g-dev
-Standards-Version: 4.1.2
+Standards-Version: 4.5.0
 Homepage: https://www.zfsonlinux.org/
 Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
 Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
@@ -70,9 +70,9 @@ 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.
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
  .
  The OpenZFS library provides support for managing OpenZFS filesystems.
 
@@ -83,9 +83,9 @@ 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.
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
  .
  This zpool library provides support for managing zpools.
 
@@ -143,9 +143,9 @@ Depends: busybox-initramfs | busybox-static | busybox,
 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.
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
  .
  This package adds OpenZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
@@ -161,9 +161,9 @@ Suggests: nfs-kernel-server,
 Conflicts: zfs, zfs-fuse
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
  .
  This package provides the zfs and zpool commands to create and administer
  OpenZFS filesystems.
@@ -175,9 +175,9 @@ 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.
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
  .
  This package provides the OpenZFS Event Daemon (zed).
 
@@ -185,6 +185,7 @@ Package: zfs-test
 Section: contrib/admin
 Architecture: linux-any
 Depends: acl,
+         attr,
          bc,
          fio,
          ksh,
@@ -198,13 +199,14 @@ Depends: acl,
          zfsutils-linux (>=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Recommends: nfs-kernel-server
 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.
+Description: OpenZFS test infrastructure and support scripts
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
  .
  This package provides the OpenZFS test infrastructure for destructively
  testing and validating a system using OpenZFS. It is entirely optional
@@ -222,9 +224,9 @@ Depends: libnvpair1linux (= ${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.
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
  .
  This package contains the debugging symbols for libzpool2linux, libzfs2linux,
  libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.

debian/copyright

@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Native ZFS for Linux
+Upstream-Name: OpenZFS on Linux and FreeBSD
 Upstream-Contact: Brian Behlendorf <behlendorf1@llnl.gov>
-Source: https://github.com/zfsonlinux/zfs/
+Source: https://github.com/openzfs/zfs
 Disclaimer:
  This work was produced at the Lawrence Livermore National Laboratory
  (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44) between

debian/not-installed

@@ -1,5 +1,6 @@
 usr/share/zfs/enum-extract.pl
 usr/share/zfs/zfs-helpers.sh
+etc/default/zfs
 etc/init.d
 etc/sudoers.d
 etc/zfs/vdev_id.conf.alias.example
@@ -9,3 +10,4 @@ etc/zfs/vdev_id.conf.sas_switch.example
 etc/zfs/vdev_id.conf.scsi.example
 usr/lib/dracut
 usr/share/zfs/enum-extract.pl
+etc/zfs/zfs-functions

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

@@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
-index 4aae9f06e..ec5c45e63 100644
+index 278f937fe..e8c502a33 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -11,7 +11,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
  [Service]
  Type=oneshot
  RemainAfterExit=yes

debian/patches/0006-dont-symlink-zed-scripts.patch

@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Antonio Russo <antonio.e.russo@gmail.com>
+Date: Fri, 20 Mar 2020 17:28:43 +0100
+Subject: [PATCH] dont symlink zed scripts
+
+(cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0])
+
+[0] https://salsa.debian.org/zfsonlinux-team/zfs.git
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+
+Description: track default symlinks, instead of symlinking
+Forwarded: no need
+---
+ cmd/zed/zed.d/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
+index 716db2b2f..57fed7fdf 100644
+--- a/cmd/zed/zed.d/Makefile.am
++++ b/cmd/zed/zed.d/Makefile.am
+@@ -52,6 +52,6 @@ install-data-hook:
+ 	for f in $(zedconfdefaults); do \
+ 	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
+ 	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
+-	    ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
++	    echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
+ 	done
+ 	chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"

debian/patches/0007-Use-installed-python3.patch

@@ -0,0 +1,60 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Antonio Russo <antonio.e.russo@gmail.com>
+Date: Tue, 5 May 2020 22:15:16 -0600
+Subject: [PATCH] Use installed python3
+
+---
+ debian/patches/0004-prefer-python3-tests.patch              | 0
+ .../functional/cli_root/zfs_program/zfs_program_json.ksh    | 6 +++---
+ .../tests/functional/rsend/send_encrypted_files.ksh         | 2 +-
+ .../tests/functional/rsend/send_realloc_dnode_size.ksh      | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+ create mode 100644 debian/patches/0004-prefer-python3-tests.patch
+
+diff --git a/debian/patches/0004-prefer-python3-tests.patch b/debian/patches/0004-prefer-python3-tests.patch
+new file mode 100644
+index 000000000..e69de29bb
+diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
+index 3788543b0..c7ee4ae9a 100755
+--- a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
++++ b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
+@@ -100,10 +100,10 @@ typeset -a pos_cmds_out=(
+ # the same as the input and the --sort-keys option was added.  Detect when
+ # --sort-keys is supported and apply the option to ensure the expected order.
+ #
+-if python -m json.tool --sort-keys <<< "{}"; then
+-	JSON_TOOL_CMD="python -m json.tool --sort-keys"
++if python3 -m json.tool --sort-keys <<< "{}"; then
++	JSON_TOOL_CMD="python3 -m json.tool --sort-keys"
+ else
+-	JSON_TOOL_CMD="python -m json.tool"
++	JSON_TOOL_CMD="python3 -m json.tool"
+ fi
+ 
+ typeset -i cnt=0
+diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
+index 6288178f8..d4475b369 100755
+--- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
++++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
+@@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
+ # ZoL issue #7432
+ log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2
+ log_must touch /$TESTPOOL/$TESTFS2/attrs
+-log_must eval "python -c 'print \"a\" * 4096' | \
++log_must eval "python3 -c 'print \"a\" * 4096' | \
+ 	attr -s bigval /$TESTPOOL/$TESTFS2/attrs"
+ log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2
+ 
+diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
+index 12a72fa09..aceec7880 100755
+--- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
++++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
+@@ -93,7 +93,7 @@ log_must zfs snapshot $POOL/fs@c
+ # 4. Create an empty file and add xattrs to it to exercise reclaiming a
+ #    dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
+ log_must zfs set compression=on xattr=sa $POOL/fs
+-log_must eval "python -c 'print \"a\" * 512' | attr -s bigval /$POOL/fs/attrs"
++log_must eval "python3 -c 'print \"a\" * 512' | attr -s bigval /$POOL/fs/attrs"
+ log_must zfs snapshot $POOL/fs@d
+ 
+ # 5. Generate initial and incremental streams

debian/patches/series

@@ -3,3 +3,5 @@
 0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
 0004-import-with-d-dev-disk-by-id-in-scan-service.patch
 0005-Enable-zed-emails.patch
+0006-dont-symlink-zed-scripts.patch
+0007-Use-installed-python3.patch

debian/rules

@@ -10,7 +10,7 @@ SPHINX_BUILD = $(shell dpkg -L python3-sphinx | grep "sphinx-build$$")
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autoreconf,python3,systemd,sphinxdoc --parallel
+	dh $@ --with autoreconf,python3,sphinxdoc --parallel
 
 adapt_meta_file:
 	@# Embed the downstream version in the module.
@@ -33,6 +33,7 @@ override_dh_auto_configure:
 	  --with-zfsexecdir=/usr/lib/zfs-linux \
 	  --enable-systemd \
 	  --enable-pyzfs \
+	  --with-python=python3 \
 	  --with-systemdunitdir=/lib/systemd/system \
 	  --with-systemdpresetdir=/lib/systemd/system-preset \
 	  --with-systemdgeneratordir=/lib/systemd/system-generators \

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

@@ -1,9 +1,12 @@
 #!/bin/sh -eu
 
-# Scrub all healthy pools.
+# Scrub all healthy pools that are not already scrubbing.
 zpool list -H -o health,name 2>&1 | \
 	awk 'BEGIN {FS="\t"} {if ($1 ~ /^ONLINE/) print $2}' | \
 while read pool
 do
-	zpool scrub "$pool"
+	if ! zpool status "$pool" | grep -q "scrub in progress"
+	then
+		zpool scrub "$pool"
+	fi
 done

debian/zfs-zed.postinst

@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+zedd="/usr/lib/zfs-linux/zed.d"
+etcd="/etc/zfs/zed.d"
+
+# enable all default zedlets that are not overridden
+while read -r file ; do
+    etcfile="${etcd}/${file}"
+    [ -e "${etcfile}" ] && continue
+    ln -s "${zedd}/${file}" "${etcfile}"
+done < "${zedd}/DEFAULT-ENABLED"
+
+# remove the overrides created in prerm
+find "${etcd}" -maxdepth 1 -lname '/dev/null' -delete
+# remove any dangling symlinks to old zedlets
+find "${etcd}" -maxdepth 1 -lname "${zedd}/*" -xtype l  -delete
+
+#DEBHELPER#
+

debian/zfs-zed.prerm

@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+zedd="/usr/lib/zfs-linux/zed.d"
+etcd="/etc/zfs/zed.d"
+
+if [ "$1" != "failed-upgrade" ] && [ -d "${etcd}" ] && [ -d "${zedd}" ] ; then
+    while read -r file ; do
+        etcfile="${etcd}/${file}"
+        [ -e "${etcfile}" ] && continue
+        ln -s /dev/null "${etcfile}"
+    done < "${zedd}/DEFAULT-ENABLED"
+fi
+
+#DEBHELPER#
+