bump version to 2.0.3-pve2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
buildsys: validate ABI at build time
2021-02-25 13:06:16 +01:00 · 2021-02-25 12:11:15 +01:00 · 2021-02-25 12:11:15 +01:00 · 2021-02-25 12:11:15 +01:00 · 2021-02-25 12:11:15 +01:00 · 2021-02-15 15:46:37 +01:00
29 changed files with 428 additions and 619 deletions
@@ -6,12 +6,12 @@ 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		\
-libzfs3linux_${ZFSPKGVER}_amd64.deb		\
+libuutil3linux_${ZFSPKGVER}_amd64.deb		\
+libzfs4linux_${ZFSPKGVER}_amd64.deb		\
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool3linux_${ZFSPKGVER}_amd64.deb		\
+libzpool4linux_${ZFSPKGVER}_amd64.deb		\
 zfs-dbg_${ZFSPKGVER}_amd64.deb			\
 zfs-zed_${ZFSPKGVER}_amd64.deb			\
 zfs-initramfs_${ZFSPKGVER}_all.deb		\
@@ -1,3 +1,23 @@
+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
@@ -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 (>= 10~),
               dh-python,
               libblkid-dev,
+               libelf-dev,
+               libpam0g-dev,
               libssl-dev | libssl1.0-dev,
               libtool,
               lsb-release,
@@ -19,23 +22,35 @@ 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
-Replaces: libnvpair1, libnvpair1linux
+Breaks: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
+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
-Replaces: libuutil1, libuutil1linux
+Breaks: libuutil1, libuutil1linux, libuutil2linux, libuutil3
+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,26 @@ Description: Solaris userland utility library for Linux
 Package: libzfslinux-dev
 Section: contrib/libdevel
 Architecture: linux-any
-Depends: libnvpair2linux (= ${binary:Version}),
-         libuutil2linux (= ${binary:Version}),
-         libzfs3linux (= ${binary:Version}),
+Depends: libnvpair3linux (= ${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,
- libzpool3 and libzfs3.
+ This package includes the development files of libnvpair3, libuutil3,
+ libzpool4 and libzfs4.

-Package: libzfs3linux
+Package: libzfs4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzfs2, libzfs2linux
-Replaces: libzfs2, libzfs2linux
+Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4
+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 +96,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 +105,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
-Replaces: libzpool2, libzpool2linux
+Breaks: libzpool2, libzpool2linux, libzpool3linux, libzpool4
+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,
@@ -228,10 +245,10 @@ Package: zfs-dbg
 Section: contrib/debug
 Priority: optional
 Architecture: linux-any
-Depends: libnvpair2linux (= ${binary:Version}),
-         libuutil2linux (= ${binary:Version}),
-         libzfs3linux (= ${binary:Version}),
-         libzpool3linux (= ${binary:Version}),
+Depends: libnvpair3linux (= ${binary:Version}),
+         libuutil3linux (= ${binary:Version}),
+         libzfs4linux (= ${binary:Version}),
+         libzpool4linux (= ${binary:Version}),
         zfs-zed (= ${binary:Version}),
         zfsutils-linux (= ${binary:Version}),
         ${misc:Depends}
@@ -240,8 +257,8 @@ Description: Debugging symbols for OpenZFS userland libraries and tools
 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.
+ This package contains the debugging symbols for libzpool4linux, libzfs4linux,
+ libnvpair3linux, libuutil3linux, zfs-zed and zfsutils-linux.

 Package: spl
 Section: contrib/metapackages
@@ -1 +0,0 @@
-libnvpair2linux: package-name-doesnt-match-sonames
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
@@ -0,0 +1,2 @@
+lib/*/security/pam_zfs_key.so
+usr/share/pam-configs/zfs_key
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+pam-auth-update --package
+
+#DEBHELPER#
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = remove ] ; then
+    pam-auth-update --package --remove zfs_key
+fi
+
+#DEBHELPER#
@@ -1 +0,0 @@
-libuutil2linux: package-name-doesnt-match-sonames
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
@@ -1 +0,0 @@
-libzfs3linux: package-name-doesnt-match-sonames
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
@@ -1 +0,0 @@
-libzpool3linux: package-name-doesnt-match-sonames
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
@@ -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
@@ -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
@@ -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
@@ -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,13 +90,6 @@ 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
@@ -101,9 +100,11 @@ 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_installdocs:
@@ -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
Author	SHA1	Message	Date
Thomas Lamprecht	363c009381	bump version to 2.0.3-pve2 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-02-25 13:06:16 +01:00
Stoiko Ivanov	6967bf4185	buildsys: validate ABI at build time this commit follows: 93661343d884a5339631afd7b683e232d20b7baf and 0b52b09c6083bd590e46cb9884d06bae1b712a2a from debian-upstream [0]. the `make checkabi` invocation takes < .4s on my workstation - so it seems worth the change. [0] https://salsa.debian.org/zfsonlinux-team/zfs Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2021-02-25 12:11:15 +01:00
Stoiko Ivanov	c8ca652406	d/rules: drop unneeded UDEB conditionals we don't build or ship udebs Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2021-02-25 12:11:15 +01:00
Stoiko Ivanov	29e1ddcc26	d/rules: cosmetic cleanups minimize diff with d.o. Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2021-02-25 12:11:15 +01:00
Stoiko Ivanov	00fad03966	d/control: match package names to debian-upstream during the tracking of zfs-2.0.x integration in debian upstream I did not notice that the library packages got renamed yet another time (see [0]) to match the soname version. This patch renames our library packagenames to match debian upstream and includes Breaks,Depends on the intermediate versions we shipped with the zfs-2.0.3 release. Noticed while checking an issue (with `aptitude` vs. `apt`) reported on pve-user. Tested on a VM running our latest packages and on one still running zfs 0.8.5 [0] https://salsa.debian.org/zfsonlinux-team/zfs/-/commit/42ba750f8ca07625e9d58c14b46420768ab23c09 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2021-02-25 12:11:15 +01:00
Thomas Lamprecht	59b6645a48	bump version to 2.0.2-pve2 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-02-15 15:46:37 +01:00
Stoiko Ivanov	8228117e8b	update submodule and patches to zfs-2.0.3 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-02-15 15:46:02 +01:00
Stoiko Ivanov	387483f555	cherry-pick file-mode fix from 2.0.3-staging the patch fixes a potential panic on systems running ZFS > 2.0.0 and is already queued for inclusion in 2.0.3 - see [0] for a related github issue. [0] https://github.com/openzfs/zfs/issues/11474 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2021-02-11 18:20:30 +01:00
Stoiko Ivanov	224ca2e1b4	update debian/copyright by taking the current version from debian-upstream. The only addition is an attribution for Proxmox for the files in debian/* Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2021-02-11 18:20:30 +01:00
Stoiko Ivanov	1f122c546d	buildsys: make libpam-zfs a separate package ZFS includes (since 2.0.0) a pam-module, which takes the login credentials of an user to unlock their home-dataset. Enabling it in its current state can cause some side-effects like prompting for a password when running `su` as root (see [0]). Our update to ZFS 2.0.0 shipped the pam config in zfsutils-linux, whereas debian-upstream split it out into its own optional package This commit adopts this change. based on debian-upstream [1] commit cad2f3d24aa44cfdce1e2eae8b6ba027efaba2d6 The issue becomes apparent by installing the current zfsutils-linux package and running `pam-auth-update --package` (e.g. by installing an upgraded libpam-runtime package). [0] https://github.com/openzfs/zfs/issues/11222 [1] https://salsa.debian.org/zfsonlinux-team/zfs/ Reported-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Originally-by: Antonio Russo <aerusso@aerusso.net> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2021-02-11 18:20:30 +01:00
Thomas Lamprecht	b34f3bcce2	bump version to 2.0.2-pve1 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-02-06 10:23:07 +01:00
Stoiko Ivanov	4b8605c4d7	move manpage arcstat(1) to arcstat(8). Adapted from debian upstream [0] commits: 1a3239e6b3b5604bb588c10912f57f32962b38c3 66b7241c965cdce730e76ca59c242fccc267b302 [0] https://salsa.debian.org/zfsonlinux-team/zfs/ Originally-By: Mo Zhou <cdluminate@gmail.com> Originally-By: Antonio Russo <aerusso@aerusso.net> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-02-06 09:39:41 +01:00
Stoiko Ivanov	9af86c74fe	zgenhostid is installed in /sbin Adapted from debian upstream [0] commits: 76f1cec519ce3bd126dbb3b9d63e3a76c1b7c89e [0] https://salsa.debian.org/zfsonlinux-team/zfs/ Originally-By: Antonio Russo <aerusso@aerusso.net> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-02-06 09:39:41 +01:00
Stoiko Ivanov	6afcaafa51	update submodule to zfs-2.0.2 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-02-06 09:39:38 +01:00
				`@@ -1 +0,0 @@`
				`libnvpair2linux: package-name-doesnt-match-sonames`
				`@@ -1 +0,0 @@`
				`libuutil2linux: package-name-doesnt-match-sonames`
				`@@ -1 +0,0 @@`
				`libzfs3linux: package-name-doesnt-match-sonames`
				`@@ -1 +0,0 @@`
				`libzpool3linux: package-name-doesnt-match-sonames`