buildsys: fix DEBS variable name

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
(cherry picked from commit b577f030c4)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

Makefile

@@ -6,23 +6,33 @@ ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
 ZFSDIR=zfs-linux_${ZFSVER}
 ZFSSRC=upstream
 
-ZFS_DEB1= libnvpair2linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
-ZFS_DEB2= 					\
+
-libuutil2linux_${ZFSPKGVER}_amd64.deb		\
+ZFS_DEB_BINARY =				\
-libzfs3linux_${ZFSPKGVER}_amd64.deb		\
+libpam-zfs_${ZFSPKGVER}_amd64.deb		\
-libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
+libuutil3linux_${ZFSPKGVER}_amd64.deb		\
-libzpool3linux_${ZFSPKGVER}_amd64.deb		\
+libzfs4linux_${ZFSPKGVER}_amd64.deb		\
-zfs-dbg_${ZFSPKGVER}_amd64.deb			\
+libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb	\
-zfs-zed_${ZFSPKGVER}_amd64.deb			\
+libzpool4linux_${ZFSPKGVER}_amd64.deb		\
-zfs-initramfs_${ZFSPKGVER}_all.deb		\
 zfs-test_${ZFSPKGVER}_amd64.deb			\
-zfsutils-linux_${ZFSPKGVER}_amd64.deb
+zfsutils-linux_${ZFSPKGVER}_amd64.deb		\
-ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
+zfs-zed_${ZFSPKGVER}_amd64.deb
+
+ZFS_DBG_DEBS = $(patsubst %_${ZFSPKGVER}_amd64.deb, %-dbgsym_${ZFSPKGVER}_amd64.deb, ${ZFS_DEB1} ${ZFS_DEB_BINARY})
+
+ZFS_DEB2= ${ZFS_DEB_BINARY}			\
+libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
+python3-pyzfs_${ZFSPKGVER}_amd64.deb		\
+pyzfs-doc_${ZFSPKGVER}_all.deb			\
+spl_${ZFSPKGVER}_all.deb			\
+zfs-initramfs_${ZFSPKGVER}_all.deb
+DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
+
 ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
 
 all: deb
 .PHONY: deb
-deb: ${ZFS_DEBS}
+deb: ${DEBS}
 .PHONY: dsc
 dsc: ${ZFS_DSC}
 
@@ -30,7 +40,7 @@ dsc: ${ZFS_DSC}
 .PHONY: kernel
 kernel: dsc
 	dpkg-source -x ${ZFS_DSC} ../pkg-zfs
-	$(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
+	${MAKE} -C ../pkg-zfs -f debian/rules adapt_meta_file
 
 .PHONY: dinstall
 dinstall: ${DEBS}
@@ -38,22 +48,22 @@ dinstall: ${DEBS}
 
 .PHONY: submodule
 submodule:
-	test -f "$(ZFSSRC)/README.md" || git submodule update --init
+	test -f "${ZFSSRC}/README.md" || git submodule update --init
-$(ZFSSRC)/README.md: submodule
+${ZFSSRC}/README.md: submodule
 
 .PHONY: zfs
-zfs: $(ZFS_DEBS)
+zfs: ${DEBS}
-$(ZFS_DEB2): $(ZFS_DEB1)
+${ZFS_DEB2}: ${ZFS_DEB1}
-$(ZFS_DEB1): ${ZFSDIR}
+${ZFS_DEB1}: ${ZFSDIR}
 	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
-	lintian ${ZFS_DEBS}
+	lintian ${DEBS}
 
 ${ZFS_DSC}: ${ZFSDIR}
 	tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
 	cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
 	lintian $@
 
-${ZFSDIR}: $(ZFSSRC)/README.md $(ZFSSRC) ${ZFSPKG}
+${ZFSDIR}: ${ZFSSRC}/README.md ${ZFSSRC} ${ZFSPKG}
 	rm -rf ${ZFSDIR} ${ZFSDIR}.tmp
 	cp -a ${ZFSSRC} ${ZFSDIR}.tmp
 	cp -a ${ZFSPKG} ${ZFSDIR}.tmp/debian
@@ -69,4 +79,4 @@ distclean: clean
 
 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch amd64
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch amd64

debian/changelog

@@ -1,3 +1,57 @@
+zfs-linux (2.0.7-pve1) buster; urgency=medium
+
+  * update ZFS to 2.0.7
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Jan 2022 18:46:26 +0100
+
+zfs-linux (2.0.6-pve1~bpo10+1) buster; urgency=medium
+
+  * update ZFS to 2.0.6
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 09:19:18 +0200
+
+zfs-linux (2.0.5-pve1~bpo10+1) buster; urgency=medium
+
+  * Rebuild for buster based releases
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Jul 2021 18:01:07 +0200
+
+zfs-linux (2.0.5-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.0.5
+
+  * do not restart most services upon upgrade
+
+  * add a script and cronjob for regular trimming of pools
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Jul 2021 18:23:58 +0200
+
+zfs-linux (2.0.4-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 2.0.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 18 Mar 2021 13:31:18 +0100
+
+zfs-linux (2.0.3-pve2) pve pmg; urgency=medium
+
+  * match package names to the ones used by Debian
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 25 Feb 2021 13:06:07 +0100
+
+zfs-linux (2.0.3-pve1) pve pmg; urgency=medium
+
+  * buildsys: make libpam-zfs a separate package
+
+  * update ZFS to 2.0.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 15 Feb 2021 15:46:03 +0100
+
+zfs-linux (2.0.2-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 2.0.2
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 06 Feb 2021 10:23:03 +0100
+
 zfs-linux (2.0.1-pve1) pve pmg; urgency=medium
 
   * update ZFS to 2.0.1

debian/compat

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

debian/control

@@ -2,9 +2,12 @@ Source: zfs-linux
 Section: contrib/kernel
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 10~),
+Build-Depends: abigail-tools,
+               debhelper-compat (= 12),
                dh-python,
                libblkid-dev,
+               libelf-dev,
+               libpam0g-dev,
                libssl-dev | libssl1.0-dev,
                libtool,
                lsb-release,
@@ -14,28 +17,40 @@ Build-Depends: debhelper (>= 10~),
                python3-all-dev,
                uuid-dev,
                zlib1g-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 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
 
-Package: libnvpair2linux
+Package: libnvpair3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libnvpair1, libnvpair1linux
+Breaks: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
-Replaces: libnvpair1, libnvpair1linux
+Replaces: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
 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: libuutil2linux
+Package: libpam-zfs
+Section: contrib/admin
+Architecture: linux-any
+Depends: libpam-runtime, ${misc:Depends}, ${shlibs:Depends}
+Description: PAM module for managing encryption keys for ZFS
+ 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 provides a Pluggable Authentication Module (PAM) that automatically
+ unlocks encrypted ZFS datasets upon login.
+
+Package: libuutil3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libuutil1, libuutil1linux
+Breaks: libuutil1, libuutil1linux, libuutil2linux, libuutil3
-Replaces: libuutil1, libuutil1linux
+Replaces: libuutil1, libuutil1linux, libuutil2linux, libuutil3
 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
@@ -50,26 +65,27 @@ Description: Solaris userland utility library for Linux
 Package: libzfslinux-dev
 Section: contrib/libdevel
 Architecture: linux-any
-Depends: libnvpair2linux (= ${binary:Version}),
+Depends: libssl-dev | libssl1.0-dev,
-         libuutil2linux (= ${binary:Version}),
+         libnvpair3linux (= ${binary:Version}),
-         libzfs3linux (= ${binary:Version}),
+         libuutil3linux (= ${binary:Version}),
+         libzfs4linux (= ${binary:Version}),
          libzfsbootenv1linux (= ${binary:Version}),
-         libzpool3linux (= ${binary:Version}),
+         libzpool4linux (= ${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 libnvpair2, libuutil2,
+ This package includes the development files of libnvpair3, libuutil3,
- libzpool3 and libzfs3.
+ libzpool4 and libzfs4.
 
-Package: libzfs3linux
+Package: libzfs4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzfs2, libzfs2linux
+Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4
-Replaces: libzfs2, libzfs2linux
+Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4
 Description: OpenZFS filesystem library for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -81,6 +97,8 @@ Package: libzfsbootenv1linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libzfs2, libzfs4
+Replaces: libzfs2, libzfs4
 Description: OpenZFS filesystem library for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -88,12 +106,12 @@ Description: OpenZFS filesystem library for Linux
  .
  The zfsbootenv library provides support for modifying ZFS label information.
 
-Package: libzpool3linux
+Package: libzpool4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzpool2, libzpool2linux
+Breaks: libzpool2, libzpool2linux, libzpool3linux, libzpool4
-Replaces: libzpool2, libzpool2linux
+Replaces: libzpool2, libzpool2linux, libzpool3linux, libzpool4
 Description: OpenZFS pool library for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -191,6 +209,11 @@ Description: OpenZFS Event Daemon
  traditional filesystems and volume managers. It supports data checksums,
  compression, encryption, snapshots, and more.
  .
+ ZED (ZFS Event Daemon) monitors events generated by the ZFS kernel
+ module. When a zevent (ZFS Event) is posted, ZED will run any ZEDLETs
+ (ZFS Event Daemon Linkage for Executable Tasks) that have been enabled
+ for the corresponding zevent class.
+ .
  This package provides the OpenZFS Event Daemon (zed).
 
 Package: zfs-test
@@ -224,25 +247,6 @@ Description: OpenZFS test infrastructure and support scripts
  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: libnvpair2linux (= ${binary:Version}),
-         libuutil2linux (= ${binary:Version}),
-         libzfs3linux (= ${binary:Version}),
-         libzpool3linux (= ${binary:Version}),
-         zfs-zed (= ${binary:Version}),
-         zfsutils-linux (= ${binary:Version}),
-         ${misc:Depends}
-Description: Debugging symbols for OpenZFS userland libraries and tools
- 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 libzpool3linux, libzfs3linux,
- libnvpair2linux, libuutil2linux, zfs-zed and zfsutils-linux.
-
 Package: spl
 Section: contrib/metapackages
 Architecture: all
@@ -261,3 +265,17 @@ Description: Solaris Porting Layer user-space utilities for Linux (dummy)
  to Linux primitives.
  .
  This is a transitional dummy package. It can safely be removed.
+
+Package: zfs-dbg
+Section: contrib/metapackages
+Architecture: all
+Suggests: libnvpair3linux-dbgsym,
+         libpam-zfs-dbgsym,
+         libuutil3linux-dbgsym,
+         libzfs4linux-dbgsym,
+         libzfsbootenv1linux-dbgsym,
+         libzpool4linux-dbgsym,
+         zfs-test-dbgsym,
+         zfsutils-linux-dbgsym,
+         zfs-zed-dbgsym,
+Description: Transitional package. It can be safely removed.

debian/copyright

@@ -27,7 +27,9 @@ Disclaimer:
 License: CDDL-1.0
 
 Files: *
-Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
+Copyright:
+  2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
+  2013-2014, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 
 Files: cmd/*
@@ -58,44 +60,50 @@ Copyright: 2011, Lawrence Livermore National Security, LLC
            2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 
+Files: cmd/raidz_test/*
+Copyright: 2016 Gvozden Nešković.
+License: CDDL-1.0
+
 Files: cmd/vdev_id/*
 Copyright: 2011, 2013, Nexenta Systems, Inc.
            2007, 2009, Sun Microsystems, Inc.
 License: CDDL-1.0
 
 Files: cmd/zdb/*
-Copyright: 2015, Intel Corporation
+Copyright:
-  2011, 2014, Delphix.
   2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
+  2011, 2018 by Delphix.
-
+  2014 Integros [integros.com]
-Files: cmd/zdb/zdb_il.c
+  2016 Nexenta Systems, Inc.
-Copyright: 2013, 2014, Delphix.
+  2017, 2018 Lawrence Livermore National Security, LLC.
+  2015, 2017, Intel Corporation.
+  2017 Spectra Logic Corp Inc.
   2012, Cyril Plisko.
   2009, Sun Microsystems, Inc.
 License: CDDL-1.0
 
 Files: cmd/zed/*
-Copyright: 2013-2014, Lawrence Livermore National Security, LLC
+Copyright:
+  2004, 2010, Oracle and/or its affiliates.
+  2004 Sun Microsystems, Inc.
+  2016, Intel Corporation.
+  2018, loli10K <ezomori.nozomu@gmail.com>
+  2017 Open-E, Inc.
+  2013-2014, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 
-Files: cmd/zfs/zfs_iter.c
+Files: cmd/zfs/*
-Copyright: 2013, Nexenta Systems, Inc.
+Copyright:
-  2013, Delphix.
-  2012, Pawel Jakub Dawidek <pawel@dawidek.net>
   2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
+  2009 Sun Microsystems, Inc.
-
+  2011, 2013, 2014, Delphix.
-Files: cmd/zfs/zfs_main.c
-Copyright: 2013, Steven Hartland.
-  2013, Nexenta Systems, Inc.
   2012, Joyent, Inc.
-  2011, 2014, Delphix.
+  2012, Pawel Jakub Dawidek <pawel@dawidek.net>
-  2005, 2010, Oracle and/or its affiliates.
+  2013, Nexenta Systems, Inc.
-License: CDDL-1.0
+  2013, Steven Hartland.
-
+  2012 Milan Jurik.
-Files: cmd/zfs/zfs_util.h
+  2016 Igor Kozhukhov <ikozhukhov@gmail.com>
-Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
+  2018 Datto Inc.
 License: CDDL-1.0
 
 Files: cmd/zhack/*
@@ -106,50 +114,40 @@ License: CDDL-1.0
 Files: cmd/zinject/*
 Copyright: 2011-2015, Delphix.
            2000, 2005-2010, Oracle and/or its affiliates.
+           2017, Intel Corporation.
 License: CDDL-1.0
 
-Files: cmd/zinject/zinject.h
-Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: cmd/zpios/*
-Copyright: 2008-2010, Lawrence Livermore National Security, LLC
-  2004, Cluster File Systems, Inc
-License: GPL-2+
-
 Files: cmd/zpool/*
-Copyright: 2005-2010, Sun Microsystems, Inc.
+Copyright:
-License: CDDL-1.0
+ 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-
+ 2005-2010, Sun Microsystems, Inc.
-Files: cmd/zpool/zpool_main.c
+ 2011 Nexenta Systems, Inc. All rights reserved.
-Copyright: 2013, Prasad Joshi (sTec).
+ 2011, 2018 by Delphix. All rights reserved.
-  2012, Frederik Wessels.
+ 2012 by Cyril Plisko. All rights reserved.
-  2012, Cyril Plisko.
+ 2012 by Frederik Wessels. All rights reserved.
-  2011, Nexenta Systems, Inc.
+ 2013 by Prasad Joshi (sTec). All rights reserved.
-  2011, 2014, Delphix.
+ 2016 Igor Kozhukhov <ikozhukhov@gmail.com>.
-  2005, 2010, Oracle and/or its affiliates.
+ 2017 Datto Inc.
-License: CDDL-1.0
+ 2017 Open-E, Inc. All Rights Reserved.
-
+ 2017, Intel Corporation.
-Files: cmd/zpool/zpool_util.h
-Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: cmd/zpool/zpool_vdev.c
-Copyright: 2011-2015, Delphix.
-  2000, 2005-2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 
 Files: cmd/zstreamdump/*
-Copyright: 2013, Delphix.
+Copyright:
+  2013, Delphix.
   2012, Martin Matuska <martin@matuska.org>
   2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 
 Files: cmd/ztest/*
-Copyright: 2013, Steven Hartland.
+Copyright:
-  2011, Nexenta Systems, Inc.
-  2011, 2015, Delphix.
   2005, 2010, Oracle and/or its affiliates.
+  2011, 2018 by Delphix.
+  2011 Nexenta Systems, Inc.
+  2013 Steven Hartland.
+  2014 Integros [integros.com]
+  2017 Joyent, Inc.
+  2017, Intel Corporation.
 License: CDDL-1.0
 
 Files: cmd/zvol_id/*
@@ -181,10 +179,18 @@ License: PERMISSIVE2
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
 
-Files: contrib/*
+Files: contrib/bash_completion.d/*
 Copyright: 2010, 2013, Aneurin Price <aneurin.price@gmail.com>
 License: Expat
 
+Files: contrib/pam_zfs_key/*
+Copyright: Copyright (c) 2020, Felix Dörre. All rights reserved.
+License: BSD-3-clause
+
+Files: contrib/pyzfs/*
+Copyright: 2015 ClusterHQ
+License: Apache-2.0
+
 Files: debian/*
 Copyright:
  2013-2016, Aron Xu <aron@debian.org>
@@ -193,6 +199,9 @@ Copyright:
  2013, Turbo Fredriksson <turbo@bayour.com>
  2012-2013, Richard Laager <rlaager@wiktel.com>
  2011-2013, Darik Horn <dajhorn@vanadac.com>
+ 2018-2019, Mo Zhou <cdluminate@gmail.com>
+ 2018-2020, Mo Zhou <lumin@debian.org>
+ 2015-2021 Proxmox Server Solutions GmbH <support@proxmox.com>
 License: GPL-2+
 
 Files: debian/po/*
@@ -211,233 +220,41 @@ Copyright:
   2011, Darik Horn.
 License: BSD-2-clause
 
+Files: etc/systemd/system-generators/*
+Copyright: 2017 Antonio Russo <antonio.e.russo@gmail.com>
+License: Expat
+
 Files: include/*
-Copyright: 2000, 2002, 2004, 2005, 2007, 2009, 2010, Oracle and/or its affiliates.
+Copyright:
-License: CDDL-1.0
+  2000, 2002, 2004, 2005, 2007, 2009, 2010, Oracle and/or its affiliates.
-
+  2007 The Regents of the University of California.
-Files: include/libuutil_common.h
+  2008 Sun Microsystems, Inc.
-  include/zfs_fletcher.h
+  2009, 2010, Jorn Amundsen <jorn.amundsen@ntnu.no>
-  include/zfs_prop.h
+  2011 Nexenta Systems, Inc.
-Copyright: 2005-2010, Sun Microsystems, Inc.
+  2011, 2018 by Delphix.
-License: CDDL-1.0
+  2011-2018 Lawrence Livermore National Security, LLC.
-
+  2013 by Saso Kiselkov.
-Files: include/libuutil_impl.h
+  2013, 2017 Joyent, Inc.
-Copyright: 1990-2010, Sun Microsystems, Inc.
+  2014 HybridCluster.
-License: CDDL-1.0
+  2014 Integros [integros.com]
-
+  2014 Spectra Logic Corporation,
-Files: include/libzfs.h
+  2015 Jörg Thalheim.
-Copyright: 2013, Steven Hartland.
+  2015 by Chunwei Chen.
-  2013, Nexenta Systems, Inc.
+  2016 Actifio, Inc.
-  2013, Delphix.
+  2016 Gvozden Neskovic <neskovic@compeng.uni-frankfurt.de>
-  2012, Joyent, Inc.
+  2016 Romain Dolbeau <romain@dolbeau.org>
-  2005, 2010, Oracle and/or its affiliates.
+  2017 Datto Inc.
-License: CDDL-1.0
+  2017, Intel Corporation.
-
+  2016 RackTop Systems.
-Files: include/libzfs_core.h
+  2016 Toomas Soome <tsoome@me.com>
-Copyright: 2011-2014, Delphix.
+  1983-1989, AT&T
-License: CDDL-1.0
+  1982, 1986, 1988, The Regents of the University of California
-
-Files: include/libzfs_impl.h
-  include/zfs_comutil.h
-Copyright: 2011-2015, Delphix.
-  2000, 2005-2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/linux/*
-Copyright: 2008-2011, Lawrence Livermore National Security, LLC
-License: CDDL-1.0
-
-Files: include/linux/kmap_compat.h
-Copyright: 2015, Chunwei Chen.
-License: CDDL-1.0
-
-Files: include/linux/vfs_compat.h
-Copyright: 2015, Jörg Thalheim
-  2011, Lawrence Livermore National Security, LLC
-License: CDDL-1.0
-
-Files: include/sys/arc.h
-Copyright: 2013, Saso Kiselkov.
-  2011, 2012, 2014, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/arc_impl.h
-Copyright: 2013, Saso Kiselkov.
-  2013, Nexenta Systems, Inc.
-  2013, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/avl.h
-  include/sys/dmu_tx.h
-  include/sys/metaslab_impl.h
-  include/sys/range_tree.h
-  include/sys/rrwlock.h
-  include/sys/space_map.h
-  include/sys/space_reftree.h
-  include/sys/txg.h
-  include/sys/txg_impl.h
-  include/sys/uberblock.h
-  include/sys/zio_impl.h
-Copyright: 2011-2014, Delphix.
-  2007, 2009, 2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: include/sys/avl_impl.h
-  include/sys/nvpair_impl.h
-  include/sys/sdt.h
-  include/sys/uuid.h
-  include/sys/vdev_file.h
-Copyright: 1990-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: include/sys/blkptr.h
-  include/sys/dsl_bookmark.h
-  include/sys/multilist.h
-Copyright: 2013-2014, Delphix.
-License: CDDL-1.0
-
-Files: include/sys/bpobj.h
-  include/sys/dmu_traverse.h
-  include/sys/dsl_deleg.h
-  include/sys/dsl_pool.h
-  include/sys/dsl_prop.h
-  include/sys/dsl_scan.h
-  include/sys/dsl_synctask.h
-  include/sys/metaslab.h
-  include/sys/nvpair.h
-  include/sys/vdev.h
-  include/sys/vdev_impl.h
-  include/sys/zap.h
-  include/sys/zfs_debug.h
-  include/sys/zfs_ioctl.h
-  include/sys/zfs_znode.h
-Copyright: 2011-2015, Delphix.
-  2000, 2005-2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/bptree.h
-  include/sys/zfeature.h
-Copyright: 2011-2014, Delphix.
-License: CDDL-1.0
-
-Files: include/sys/dbuf.h
-Copyright: 2014, Spectra Logic Corporation
-  2013, Saso Kiselkov.
-  2012, 2015, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/dmu.h
-Copyright: 2014, Spectra Logic Corporation
-  2014, HybridCluster.
-  2012, Joyent, Inc.
-  2011, Nexenta Systems, Inc.
-  2011, 2014, Delphix.
   2010, Robert Milkowski
-  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 
-Files: include/sys/dmu_impl.h
+Files: include/sys/lua/*
-Copyright: 2013, Delphix.
+Copyright: 1994-2015 Lua.org, PUC-Rio.
-  2012, Joyent, Inc.
+License: Expat
-  2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: include/sys/dmu_objset.h
-Copyright: 2014, Spectra Logic Corporation
-  2013, Saso Kiselkov.
-  2012, 2014, Delphix.
-  2010, Robert Milkowski
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/dmu_send.h
-Copyright: 2013, Joyent, Inc.
-  2012, 2014, Delphix.
-  2011, Nexenta Systems, Inc.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/dmu_zfetch.h
-  include/sys/spa_boot.h
-  include/sys/u8_textprep.h
-  include/sys/unique.h
-  include/sys/zfs_dir.h
-  include/sys/zfs_fuid.h
-  include/sys/zfs_rlock.h
-  include/sys/zfs_sa.h
-  include/sys/zio_compress.h
-Copyright: 2005-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: include/sys/dnode.h
-  include/sys/sa_impl.h
-Copyright: 2014, Spectra Logic Corporation
-  2011-2015, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/dsl_dataset.h
-Copyright: 2014, Spectra Logic Corporation
-  2013, Steven Hartland.
-  2013, Joyent, Inc.
-  2013, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/dsl_destroy.h
-Copyright: 2013, Delphix.
-  2012, Joyent, Inc.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/dsl_dir.h
-Copyright: 2014, Spectra Logic Corporation
-  2014, Joyent, Inc.
-  2013, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/dsl_userhold.h
-Copyright: 2013, Steven Hartland.
-  2012, 2013, Joyent, Inc.
-  2012, 2014, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/fm/fs/*
-Copyright: 2005-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: include/sys/fs/*
-Copyright: 2013, Joyent, Inc.
-  2011, Nexenta Systems, Inc.
-  2011, 2014, Delphix.
-  2010, Robert Milkowski
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/mntent.h
-Copyright: 2008, 2009, Sun Microsystems, Inc.
-  1984, 1986-1989, AT&T
-License: CDDL-1.0
-
-Files: include/sys/spa.h
-Copyright: 2014, Spectra Logic Corporation
-  2011, Nexenta Systems, Inc.
-  2011, 2014, 2015, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/spa_impl.h
-Copyright: 2016, Actifio, Inc.
-  2014, Spectra Logic Corporation
-  2011, Nexenta Systems, Inc.
-  2011, 2015, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
 
 Files: include/sys/u8_textprep_data.h
 Copyright: 2007, Sun Microsystems, Inc.
@@ -476,316 +293,102 @@ License: Expat~Unicode
  registered in some jurisdictions. All other trademarks and registered
  trademarks mentioned herein are the property of their respective owners.
 
-Files: include/sys/uio_impl.h
-Copyright: 2007, 2009, 2010, Sun Microsystems, Inc.
-  1983-1989, AT&T
-  1982, 1986, 1988, The Regents of the University of California
-License: CDDL-1.0
-
-Files: include/sys/vdev_disk.h
-  include/sys/zpl.h
-Copyright: 2008-2011, Lawrence Livermore National Security, LLC
-License: CDDL-1.0
-
-Files: include/sys/xvattr.h
-Copyright: 1988, 2010, Oracle and/or its affiliates.
-  1983-1989, AT&T
-  1982, 1986, 1988, The Regents of the University of California
-License: CDDL-1.0
-
-Files: include/sys/zap_impl.h
-  include/sys/zap_leaf.h
-Copyright: 2014, Spectra Logic Corporation
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/zfs_context.h
-Copyright: 2012, Joyent, Inc.
-  2012, 2014, Delphix.
-  2011, Nexenta Systems, Inc.
-  2009, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: include/sys/zfs_ctldir.h
-Copyright: 2011, Lawrence Livermore National Security, LLC
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/zil.h
-  include/sys/zil_impl.h
-Copyright: 2011-2014, Delphix.
-  2010, Robert Milkowski
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/zio.h
-Copyright: 2013, Saso Kiselkov.
-  2012, 2014, Delphix.
-  2011, Nexenta Systems, Inc.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/sys/zvol.h
-Copyright: 2016, Actifio, Inc.
-  2005, 2006, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/zfeature_common.h
-Copyright: 2013, Saso Kiselkov.
-  2013, Delphix.
-License: CDDL-1.0
-
-Files: include/zfs_deleg.h
-Copyright: 2012-2015, Delphix.
-  2010, 2011, Nexenta Systems, Inc.
-  2005, 2007, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: include/zfs_namecheck.h
-Copyright: 2011-2014, Delphix.
-  2007, 2009, 2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: include/zpios-ctl.h
-  include/zpios-internal.h
-Copyright: 2008-2010, Lawrence Livermore National Security, LLC
-  2004, Cluster File Systems, Inc
-License: GPL-2+
-
 Files: lib/*
-Copyright: 2000, 2002, 2004, 2005, 2007, 2009, 2010, Oracle and/or its affiliates.
+Copyright:
+  2000, 2002, 2004, 2005, 2007, 2009, 2010, Oracle and/or its affiliates.
+  2011-2018 Lawrence Livermore National Security, LLC.
 License: CDDL-1.0
 
 Files: lib/libnvpair/*
-Copyright: 2011-2015, Delphix.
+Copyright:
+  2014, Joyent, Inc.
+  2011-2015, Delphix.
   2000, 2005-2010, Oracle and/or its affiliates.
-License: CDDL-1.0
+  1990-2010, Sun Microsystems, Inc.
-
-Files: lib/libnvpair/nvpair_alloc_system.c
-Copyright: 1990-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 
 Files: lib/libshare/*
 Copyright: 2011, Gunnar Beutner
   2002, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
+  2011,2012 Turbo Fredriksson <turbo@bayour.com>
-
+  2012 Cyril Plisko.
-Files: lib/libshare/nfs.c
-Copyright: 2012, Cyril Plisko.
-  2011, Gunnar Beutner
-  2002, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: lib/libshare/smb.c
-Copyright: 2011, 2012, Turbo Fredriksson <turbo@bayour.com>, based on nfs.c
-  2002, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: lib/libshare/smb.h
-Copyright: 2011, Turbo Fredriksson <turbo@bayour.com>
 License: CDDL-1.0
 
 Files: lib/libspl/*
-Copyright: 2005-2010, Sun Microsystems, Inc.
+Copyright:
-License: CDDL-1.0
-
-Files: lib/libspl/asm-generic/*
-Copyright: 1990-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: lib/libspl/getexecname.c
-Copyright: 1990-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: lib/libspl/getmntany.c
-Copyright: 2006, Ricardo Correia.
-  2005, Sun Microsystems, Inc.
-  1988, AT&T
-License: CDDL-1.0
-
-Files: lib/libspl/include/*
-Copyright: 1990-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: lib/libspl/include/atomic.h
-  lib/libspl/include/libshare.h
-  lib/libspl/include/statcommon.h
-  lib/libspl/include/zone.h
-Copyright: 2005-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: lib/libspl/include/note.h
-Copyright: 1994, 2008, Sun Microsystems, Inc
-License: CDDL-1.0
-
-Files: lib/libspl/include/rpc/*
-Copyright: 2005-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: lib/libspl/include/rpc/xdr.h
-Copyright: 2005, Sun Microsystems, Inc.
-  1983-1989, AT&T
-License: CDDL-1.0
-
-Files: lib/libspl/include/synch.h
-Copyright: 2014, Zettabyte Software, LLC.
-  2008, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: lib/libspl/include/sys/acl.h
-  lib/libspl/include/sys/acl_impl.h
-  lib/libspl/include/sys/dkio.h
-  lib/libspl/include/sys/isa_defs.h
-  lib/libspl/include/sys/kmem.h
-  lib/libspl/include/sys/kstat.h
-  lib/libspl/include/sys/list.h
-  lib/libspl/include/sys/stack.h
-  lib/libspl/include/sys/stropts.h
-  lib/libspl/include/sys/types32.h
-  lib/libspl/include/sys/tzfile.h
-Copyright: 2005-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: lib/libspl/include/sys/byteorder.h
-Copyright: 2007, 2009, 2010, Sun Microsystems, Inc.
-  1983-1989, AT&T
   1982, 1986, 1988, The Regents of the University of California
-License: CDDL-1.0
-
-Files: lib/libspl/include/sys/dktp/*
-Copyright: 2008, 2009, Sun Microsystems, Inc.
   1984, 1986-1989, AT&T
-License: CDDL-1.0
+  2005-2010, Sun Microsystems, Inc.
-
+  2006, Ricardo Correia.
-Files: lib/libspl/include/sys/mnttab.h
+  2010, Oracle and/or its affiliates.
-Copyright: 2006, Ricardo Correia
+  2014, Zettabyte Software, LLC.
-  2004, Sun Microsystems, Inc.
+  2017, Lawrence Livermore National Security, LLC.
-  1984, 1986-1989, AT&T
-License: CDDL-1.0
-
-Files: lib/libspl/include/sys/note.h
-  lib/libspl/include/sys/sunddi.h
-Copyright: 1994, 2008, Sun Microsystems, Inc
-License: CDDL-1.0
-
-Files: lib/libspl/include/sys/stat.h
-Copyright: 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: lib/libspl/include/sys/uio.h
-Copyright: 2005, Sun Microsystems, Inc.
-  1984, 1986-1989, AT&T
-  1982, 1986, 1988, The Regents of the University of California
-License: CDDL-1.0
-
-Files: lib/libspl/include/sys/vtoc.h
-Copyright: 2008, 2009, Sun Microsystems, Inc.
-  1984, 1986-1989, AT&T
-License: CDDL-1.0
-
-Files: lib/libspl/mkdirp.c
-Copyright: 2008, 2009, Sun Microsystems, Inc.
-  1984, 1986-1989, AT&T
-License: CDDL-1.0
-
-Files: lib/libspl/strnlen.c
-Copyright: 2008, Sun Microsystems, Inc
-License: CDDL-1.0
-
-Files: lib/libspl/zone.c
-Copyright: 2006, Ricardo Correia.
 License: CDDL-1.0
 
 Files: lib/libuutil/*
 Copyright: 1990-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
+           2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
-
-Files: lib/libuutil/uu_alloc.c
-  lib/libuutil/uu_misc.c
-  lib/libuutil/uu_string.c
-Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: lib/libuutil/uu_avl.c
-  lib/libuutil/uu_list.c
-Copyright: 2005-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 
 Files: lib/libzfs/*
-Copyright: 2011, 2014, Nexenta Systems, Inc.
+Copyright:
-  2011-2015, Delphix.
+  2005, 2010, Oracle and/or its affiliates.
+  2005, 2010, Oracle and/or its affiliates.
   2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: lib/libzfs/libzfs_changelist.c
-Copyright: 2010, Sun Microsystems, Inc.
-  2007, Ramprakash Jelari
-License: CDDL-1.0
-
-Files: lib/libzfs/libzfs_config.c
-Copyright: 2011-2014, Delphix.
   2007, 2009, 2010, Sun Microsystems, Inc.
-License: CDDL-1.0
+  2007, Ramprakash Jelari
-
-Files: lib/libzfs/libzfs_dataset.c
-Copyright: 2013, Steven Hartland.
-  2013, Nexenta Systems, Inc.
-  2013, Martin Matuska.
-  2013, Joyent, Inc.
-  2013, Delphix.
-  2012, Pawel Jakub Dawidek <pawel@dawidek.net>
-  2012, DEY Storage Systems, Inc.
-  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: lib/libzfs/libzfs_diff.c
-Copyright: 2015, Nexenta Systems, Inc.
-  2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: lib/libzfs/libzfs_fru.c
-  lib/libzfs/libzfs_graph.c
-Copyright: 2005-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: lib/libzfs/libzfs_mount.c
-Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
-
-Files: lib/libzfs/libzfs_sendrecv.c
-Copyright: 2013, Steven Hartland.
-  2012, Pawel Jakub Dawidek <pawel@dawidek.net>
-  2012, Joyent, Inc.
   2011, 2014, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
+  2011, 2014, Nexenta Systems, Inc.
-License: CDDL-1.0
+  2011-2015, Delphix.
-
+  2012, DEY Storage Systems, Inc.
-Files: lib/libzfs/libzfs_status.c
+  2012, Joyent, Inc.
-Copyright: 2013, Steven Hartland.
+  2012, Pawel Jakub Dawidek <pawel@dawidek.net>
-  2012, 2014, Delphix.
+  2013, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
+  2013, Joyent, Inc.
-License: CDDL-1.0
+  2013, Martin Matuska.
-
+  2013, Nexenta Systems, Inc.
-Files: lib/libzfs/libzfs_util.c
+  2013, Steven Hartland.
-Copyright: 2013, Joyent, Inc.
+  2015 by Syneto S.R.L.
-  2012, Delphix.
+  2015, OmniTI Computer Consulting, Inc.
-  2005, 2010, Oracle and/or its affiliates.
+  2016 Igor Kozhukhov <ikozhukhov@gmail.com>
+  2017-2018 RackTop Systems.
+  2017 Open-E, Inc.
+  2017, Intel Corporation.
+  2018, loli10K <ezomori.nozomu@gmail.com>
+  2018 Datto Inc.
 License: CDDL-1.0
 
 Files: lib/libzfs_core/*
-Copyright: 2013, Steven Hartland.
+Copyright:
-  2011, 2012, 2014, Delphix.
+  2012, 2018 by Delphix.
+  2017 Datto Inc.
+  2017 RackTop Systems.
+  2017 Open-E, Inc.
+  2013, Steven Hartland.
 License: CDDL-1.0
 
-Files: lib/libzpool/taskq.c
+Files: lib/libzpool/*
-Copyright: 2014, Delphix.
+Copyright:
+  2014, Delphix.
+  2016 Actifio, Inc.
+  2014 by Delphix.
+  2017 Jason King
+  2017, Intel Corporation.
   2012, Garrett DAmore <garrett@damore.org>.
   2011, Nexenta Systems, Inc.
   2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 
+Files: lib/libzutil/*
+Copyright:
+  2015 Nexenta Systems, Inc.
+  2005, 2010, Oracle and/or its affiliates.
+  2012, 2018 by Delphix.
+  2015 RackTop Systems.
+  2016, Intel Corporation.
+License: CDDL-1.0
+
 Files: man/man1/zhack.1
-       man/man1/zpios.1
        man/man8/mount.zfs.8
        man/man8/zinject.8
 Copyright: 2013, Darik Horn <dajhorn@vanadac.com>
@@ -833,6 +436,10 @@ Copyright: 2011-2014, Delphix.
   2007, 2009, 2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 
+Files: module/lua
+Copyright: 1994-2015 Lua.org, PUC-Rio.
+License: Expat
+
 Files: module/nvpair/*
 Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
@@ -882,6 +489,13 @@ Copyright: 2007, 2009, 2010, Sun Microsystems, Inc.
   1982, 1986, 1988, The Regents of the University of California
 License: CDDL-1.0
 
+Files: module/os/linux/spl/*
+Copyright:
+  2008-2010 Sun Microsystems, Inc.
+  2007-2010 Lawrence Livermore National Security, LLC.
+  2007 The Regents of the University of California.
+License: GPL-2+
+
 Files: module/zfs/*
 Copyright: 2011-2015, Delphix.
   2000, 2005-2010, Oracle and/or its affiliates.
@@ -1088,12 +702,6 @@ Copyright: 2012, 2014, Delphix.
   2008-2010, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 
-Files: module/zfs/zfeature_common.c
-Copyright: 2014, Nexenta Systems, Inc.
-  2013, Saso Kiselkov.
-  2013, Delphix.
-License: CDDL-1.0
-
 Files: module/zfs/zfs_ctldir.c
 Copyright: 2013, Delphix.
   2011, Lawrence Livermore National Security, LLC
@@ -1163,17 +771,72 @@ Copyright: 2015, Chunwei Chen.
   2011, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 
-Files: module/zpios/*
+Files: module/zstd/zstd-in.c
-Copyright: 2008-2010, Lawrence Livermore National Security, LLC
+Copyright: Copyright (c) 2016-2020, Yann Collet, Facebook, Inc.
-  2004, Cluster File Systems, Inc
+  Copyright (c) 2019-2020, Michael Niewöhner
-License: GPL-2+
+License: BSD-3-clause
+
+Files: module/zstd/zfs_zstd.c
+Copyright: Copyright (c) 2016-2018, Klara Inc.
+  Copyright (c) 2016-2018, Allan Jude
+  Copyright (c) 2018-2020, Sebastian Gottschall
+  Copyright (c) 2019-2020, Michael Niewöhner
+  Copyright (c) 2020, The FreeBSD Foundation [1]
+License: BSD-3-clause
+Comment:  [1] Portions of this software were developed by Allan Jude
+  under sponsorship from the FreeBSD Foundation.
 
 Files: scripts/*
 Copyright: 2003-2012, Ville Skyttä <ville.skytta@iki.fi>
+           Thorsten Leemhuis <fedora@leemhuis.info>
+           Nicolas Chauvet <kwizart@gmail.com>
 License: Expat
 
 Files: scripts/cstyle.pl
+       scripts/make_gitrev.sh
+       scripts/zfs-tests.sh
+       scripts/zloop.sh
 Copyright: 2005-2010, Sun Microsystems, Inc.
+  2018 by Delphix.
+  2018 by Matthew Thode.
+License: CDDL-1.0
+
+Files: tests/*
+Copyright:
+  2007 Sun Microsystems, Inc.  All rights reserved.
+  2012, 2018 by Delphix. All rights reserved.
+  2013 Saso Kiselkov. All rights reserved.
+  2013 by Jinshan Xiong. No rights reserved.
+  2013, 2018 by Delphix. All rights reserved.
+  2014 Nexenta Systems, Inc.
+  2015 STRATO AG.
+  2015-2018 Lawrence Livermore National Security, LLC.
+  2015, OmniTI Computer Consulting, Inc. All rights reserved.
+  2016 by Gvozden Neskovic. All rights reserved.
+  2016 by Intel, Corp.
+  2016 by Jinshan Xiong. No rights reserved.
+  2016, loli10K. All rights reserved.
+  2017 Datto, Inc.
+  2017 Open-E, Inc. All Rights Reserved.
+  2017 by Datto Inc. All rights reserved.
+  2017 by Fan Yong. All rights reserved.
+  2018 Canonical.  All rights reserved.
+  2018 George Melikov. All Rights Reserved.
+  2018 Joyent, Inc.
+  2018 Nutanix Inc.  All rights reserved.
+  2018 by Nutanix. All rights reserved.
+  2018, Nexenta Systems, Inc.  All rights reserved.
+  2018, loli10K <ezomori.nozomu@gmail.com>. All rights reserved.
+License: CDDL-1.0
+
+Files: tests/zfs-tests/tests/functional/channel_program/lua_core/*.lua
+Copyright:1994-2016 Lua.org, PUC-Rio.
+License: Expat
+
+Files: tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_dryrun_output.ksh
+       tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_dryrun_output.ksh
+       tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_dryrun_output.ksh
+Copyright: 2020 Attila Fülöp <attila@fueloep.org>
 License: CDDL-1.0
 
 
@@ -1577,3 +1240,42 @@ License: BSD-2-clause
  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+     * Neither the name of the <organization> nor the
+       names of its contributors may be used to endorse or promote products
+       derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".

debian/libnvpair2linux.lintian-overrides

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

debian/libnvpair3linux.lintian-overrides

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

debian/libpam-zfs.install

@@ -0,0 +1,2 @@
+lib/*/security/pam_zfs_key.so
+usr/share/pam-configs/zfs_key

debian/libpam-zfs.postinst

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+pam-auth-update --package
+
+#DEBHELPER#

debian/libpam-zfs.prerm

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = remove ] ; then
+    pam-auth-update --package --remove zfs_key
+fi
+
+#DEBHELPER#

debian/libuutil2linux.lintian-overrides

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

debian/libuutil3linux.lintian-overrides

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

debian/libzfs3linux.lintian-overrides

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

debian/libzfs4linux.lintian-overrides

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

debian/libzfsbootenv1linux.lintian-overrides

@@ -1,2 +1,2 @@
-libzfsbootenv1linux: package-name-doesnt-match-sonames
+package-name-doesnt-match-sonames
-libzfsbootenv1linux: extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz
+extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz

debian/libzpool3linux.lintian-overrides

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

debian/libzpool4linux.lintian-overrides

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

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

@@ -14,7 +14,7 @@ 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 6520f3246..1718f98a2 100644
+index f0317e23e..9a5e9cb17 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
 @@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs

debian/patches/0005-Enable-zed-emails.patch

@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index df560f921..4ce7af744 100644
+index 1c278b2ef..41c075c09 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
 @@ -15,7 +15,7 @@

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

@@ -28,7 +28,7 @@ index 3788543b0..c7ee4ae9a 100755
  
  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 f89cb3b31..375d483f7 100755
+index d52f0261a..18356b017 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
@@ -41,10 +41,10 @@ index f89cb3b31..375d483f7 100755
  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 394fe95bb..43560aac5 100755
+index 551ed15db..bd30488ea 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
+@@ -88,7 +88,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

debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch

@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stoiko Ivanov <s.ivanov@proxmox.com>
+Date: Thu, 4 Feb 2021 19:01:12 +0100
+Subject: [PATCH] Patch: move manpage arcstat(1) to arcstat(8).
+
+Originally-By: Mo Zhou <cdluminate@gmail.com>
+Originally-By: Antonio Russo <aerusso@aerusso.net>
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ man/man1/Makefile.am                   | 2 +-
+ man/man8/Makefile.am                   | 1 +
+ man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+ rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
+
+diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
+index 8d7457a3e..101af7b6c 100644
+--- a/man/man1/Makefile.am
++++ b/man/man1/Makefile.am
+@@ -1,4 +1,4 @@
+-dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
++dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1
+ EXTRA_DIST = cstyle.1
+ 
+ if BUILD_LINUX
+diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
+index 07f6aefa6..a757b1c62 100644
+--- a/man/man8/Makefile.am
++++ b/man/man8/Makefile.am
+@@ -1,6 +1,7 @@
+ include $(top_srcdir)/config/Substfiles.am
+ 
+ dist_man_MANS = \
++	arcstat.8 \
+ 	fsck.zfs.8 \
+ 	mount.zfs.8 \
+ 	vdev_id.8 \
+diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
+similarity index 99%
+rename from man/man1/arcstat.1
+rename to man/man8/arcstat.8
+index ca508b49c..0aa81849a 100644
+--- a/man/man1/arcstat.1
++++ b/man/man8/arcstat.8
+@@ -13,7 +13,7 @@
+ .\" Copyright (c) 2015 by Delphix. All rights reserved.
+ .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
+ .\"
+-.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS
++.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS
+ .SH NAME
+ arcstat \- report ZFS ARC and L2ARC statistics
+ .SH SYNOPSIS

debian/patches/series

@@ -6,3 +6,4 @@
 0006-dont-symlink-zed-scripts.patch
 0007-Use-installed-python3.patch
 0008-Add-systemd-unit-for-importing-specific-pools.patch
+0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch

debian/rules

@@ -29,13 +29,13 @@ override_dh_auto_configure:
 	  --bindir=/usr/bin \
 	  --sbindir=/sbin \
 	  --libdir=/lib/"$(DEB_HOST_MULTIARCH)" \
-	  --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
 	  --with-udevdir=/lib/udev \
 	  --with-zfsexecdir=/usr/lib/zfs-linux \
 	  --enable-systemd \
 	  --enable-pyzfs \
 	  --with-python=python3 \
 	  --with-pammoduledir='/lib/$(DEB_HOST_MULTIARCH)/security' \
+	  --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
 	  --with-systemdunitdir=/lib/systemd/system \
 	  --with-systemdpresetdir=/lib/systemd/system-preset \
 	  --with-systemdgeneratordir=/lib/systemd/system-generators \
@@ -47,6 +47,12 @@ override_dh_auto_configure:
 	done
 
 override_dh_auto_test:
+override_dh_auto_test:
+ifeq (amd64,$(DEB_HOST_ARCH))
+	# Upstream provides an ABI guarantee that we validate here
+	-$(MAKE) checkabi
+endif
+
 	# The dh_auto_test rule is disabled because
 	# `make check` cannot run in an unprivileged build environment.
 
@@ -84,16 +90,9 @@ override_dh_python3:
 
 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
+	dh_strip --dbgsym-migration='zfs-dbg (<< 2.0.4~)'
 
 override_dh_auto_clean:
 	find . -name .gitignore -delete
@@ -101,11 +100,21 @@ override_dh_auto_clean:
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
 
+override_dh_install:
+	find debian/tmp/lib -name *.la -delete
+	dh_install
+
 override_dh_missing:
-	find . -name lib*.la -delete
-	rm debian/tmp/lib/$(DEB_HOST_MULTIARCH)/security/pam_zfs_key.la
 	dh_missing --fail-missing
 
+override_dh_installsystemd:
+	# these to lines prevent the restarting of all systemd services, except
+	# zfs-zed - they should not be restarted (importing, mounting, creating
+	# links in /dev, and can cause erros in the log
+	# (upon major.minor change)
+	dh_installsystemd --no-stop-on-upgrade -X zfs-zed.service
+	dh_installsystemd --name zfs-zed
+
 override_dh_installdocs:
 	dh_installdocs
 ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))

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

@@ -1,12 +1,45 @@
 #!/bin/sh -eu
 
-# Scrub all healthy pools that are not already scrubbing.
+# directly exit successfully when zfs module is not loaded
+if ! [ -d /sys/module/zfs ]; then
+	exit 0
+fi
+
+# [auto] / enable / disable
+PROPERTY_NAME="org.debian:periodic-scrub"
+
+get_property () {
+	# Detect the ${PROPERTY_NAME} property on a given pool.
+	# We are abusing user-defined properties on the root dataset,
+	# since they're not available on pools https://github.com/openzfs/zfs/pull/11680
+	# TODO: use zpool user-defined property when such feature is available.
+	pool="$1"
+	zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null || return 1
+}
+
+scrub_if_not_scrub_in_progress () {
+	pool="$1"
+	if ! zpool status "${pool}" | grep -q "scrub in progress"; then
+		# Ignore errors and continue with scrubbing other pools.
+		zpool scrub "${pool}" || true
+	fi
+}
+
+# Scrub all healthy pools that are not already scrubbing as per their configs.
 zpool list -H -o health,name 2>&1 | \
-	awk 'BEGIN {FS="\t"} {if ($1 ~ /^ONLINE/) print $2}' | \
+	awk -F'\t' '$1 == "ONLINE" {print $2}' | \
 while read pool
 do
-	if ! zpool status "$pool" | grep -q "scrub in progress"
+	# read user-defined config
-	then
+	ret=$(get_property "${pool}")
-		zpool scrub "$pool"
+	if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
+		:
+	elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ] || [ "enable" = "${ret}" ]; then
+		scrub_if_not_scrub_in_progress "${pool}"
+	else
+		cat > /dev/stderr <<EOF
+$0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
+$0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
+EOF
 	fi
 done

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

@@ -0,0 +1,60 @@
+#!/bin/sh -eu
+
+# directly exit successfully when zfs module is not loaded
+if ! [ -d /sys/module/zfs ]; then
+	exit 0
+fi
+
+# [auto] / enable / disable
+PROPERTY_NAME="org.debian:periodic-trim"
+
+get_property () {
+	# Detect the ${PROPERTY_NAME} property on a given pool.
+	# We are abusing user-defined properties on the root dataset,
+	# since they're not available on pools https://github.com/openzfs/zfs/pull/11680
+	# TODO: use zpool user-defined property when such feature is available.
+	pool="$1"
+	zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null || return 1
+}
+
+trim_if_not_already_trimming () {
+	pool="$1"
+	if ! zpool status "${pool}" | grep -q "trimming"; then
+		# Ignore errors (i.e. HDD pools),
+		# and continue with trimming other pools.
+		zpool trim "${pool}" || true
+	fi
+}
+
+zpool_is_nvme_only () {
+	zpool=$1
+	# get a list of devices attached to the specified zpool
+	zpool list -vHPL "${zpool}" |
+		awk -F'\t' '$2 ~ /^\/dev\// {
+			if($2 !~ /^\/dev\/nvme/)
+				exit 1
+		}'
+}
+
+# TRIM all healthy pools that are not already trimming as per their configs.
+zpool list -H -o health,name 2>&1 | \
+	awk -F'\t' '$1 == "ONLINE" {print $2}' | \
+while read pool
+do
+	# read user-defined config
+	ret=$(get_property "${pool}")
+	if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
+		:
+	elif [ "enable" = "${ret}" ]; then
+		trim_if_not_already_trimming "${pool}"
+	elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ]; then
+		if zpool_is_nvme_only "${pool}"; then
+			trim_if_not_already_trimming "${pool}"
+		fi
+	else
+		cat > /dev/stderr <<EOF
+$0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
+$0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
+EOF
+	fi
+done

debian/zfs-initramfs.triggers

@@ -1 +0,0 @@
-activate update-initramfs

debian/zfs-test.lintian-overrides

@@ -1 +1,13 @@
-zfs-test: arch-dependent-file-in-usr-share
+arch-dependent-file-in-usr-share
+script-not-executable usr/share/zfs/common.sh
+command-in-sbin-has-manpage-in-incorrect-section
+arch-dep-package-has-big-usr-share
+manpage-without-executable
+national-encoding usr/share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.lib_table.lua
+executable-not-elf-or-script usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/jail.conf
+script-not-executable usr/share/zfs/zfs-tests/include/default.cfg
+script-not-executable usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait.kshlib
+script-not-executable usr/share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
+script-not-executable usr/share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc.cfg
+script-not-executable usr/share/zfs/zfs-tests/tests/functional/redacted_send/redacted.kshlib
+package-contains-documentation-outside-usr-share-doc usr/share/zfs/zfs-tests/*

debian/zfs-zed.lintian-overrides

@@ -0,0 +1,4 @@
+
+script-not-executable
+# https://github.com/zfsonlinux/zfs/issues/8064
+systemd-service-file-refers-to-unusual-wantedby-target

debian/zfs-zed.postinst

@@ -8,7 +8,7 @@ etcd="/etc/zfs/zed.d"
 while read -r file ; do
     etcfile="${etcd}/${file}"
     [ -e "${etcfile}" ] && continue
-    ln -s "${zedd}/${file}" "${etcfile}"
+    ln -sfT "${zedd}/${file}" "${etcfile}"
 done < "${zedd}/DEFAULT-ENABLED"
 
 # remove the overrides created in prerm

debian/zfs-zed.postrm

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+zedd="/usr/lib/zfs-linux/zed.d"
+etcd="/etc/zfs/zed.d"
+
+if [ "$1" = "purge" ] && [ -d "$etcd" ] ; then
+    # 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
+    # clean up any empty directories
+    ( rmdir "$etcd" && rmdir "/etc/zfs" ) || true
+fi
+
+#DEBHELPER#
+

debian/zfs-zed.prerm

@@ -7,8 +7,8 @@ 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
+        ( [ -L "${etcfile}" ] || [ -e "${etcfile}" ] ) && continue
-        ln -s /dev/null "${etcfile}"
+        ln -sT /dev/null "${etcfile}"
     done < "${zedd}/DEFAULT-ENABLED"
 fi
 

debian/zfsutils-linux.cron.d

@@ -1,4 +1,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
+# TRIM the first Sunday of every month.
+24 0 1-7 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/trim ]; then /usr/lib/zfs-linux/trim; fi
+
 # Scrub the second Sunday of every month.
-24 0 8-14 * * root [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ] && /usr/lib/zfs-linux/scrub
+24 0 8-14 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ]; then /usr/lib/zfs-linux/scrub; fi

debian/zfsutils-linux.install

@@ -2,7 +2,6 @@
 etc/default/zfs
 etc/zfs/zfs-functions
 etc/zfs/zpool.d/
-lib/*/security/pam_zfs_key.so
 lib/systemd/system-preset/
 lib/systemd/system/zfs-import-cache.service
 lib/systemd/system/zfs-import-scan.service
@@ -21,11 +20,11 @@ sbin/mount.zfs
 sbin/zdb
 sbin/zfs
 sbin/zfs_ids_to_path
+sbin/zgenhostid
 sbin/zhack
 sbin/zpool
 sbin/zstream
 sbin/zstreamdump
-usr/bin/zgenhostid
 usr/bin/zvol_wait
 usr/lib/modules-load.d/ lib/
 usr/lib/zfs-linux/zpool.d/
@@ -33,7 +32,7 @@ usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
 usr/share/bash-completion/completions
-usr/share/man/man1/arcstat.1
+usr/share/man/man8/arcstat.8
 usr/share/man/man1/zhack.1
 usr/share/man/man1/zvol_wait.1
 usr/share/man/man5/
@@ -119,4 +118,3 @@ usr/share/man/man8/zpoolconcepts.8
 usr/share/man/man8/zpoolprops.8
 usr/share/man/man8/zstream.8
 usr/share/man/man8/zstreamdump.8
-usr/share/pam-configs/zfs_key

debian/zfsutils-linux.lintian-overrides

@@ -1 +1,14 @@
+spare-manual-page
 systemd-service-file-refers-to-unusual-wantedby-target
+binary-without-manpage usr/sbin/dbufstat
+binary-without-manpage usr/sbin/arc_summary
+manpage-has-errors-from-man
+appstream-metadata-missing-modalias-provide
+command-in-sbin-has-manpage-in-incorrect-section
+package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-import-cache.service
+package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-import-scan.service
+spelling-error-in-manpage
+package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-volume-wait.service
+systemd-service-file-missing-documentation-key lib/systemd/system/zfs-volume-wait.service
+extra-license-file usr/share/doc/zfsutils-linux/LICENSE.gz
+package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-load-module.service