bump version to 2.0.2-pve2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
update submodule and patches to zfs-2.0.3
2021-02-15 15:46:37 +01:00 · 2021-02-15 15:46:02 +01:00 · 2021-02-11 18:20:30 +01:00 · 2021-02-11 18:20:30 +01:00 · 2021-02-11 18:20:30 +01:00
9 changed files with 312 additions and 574 deletions
@@ -1,3 +1,11 @@
+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
@@ -5,6 +5,8 @@ Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: debhelper (>= 10~),
               dh-python,
               libblkid-dev,
+               libelf-dev,
+               libpam0g-dev,
               libssl-dev | libssl1.0-dev,
               libtool,
               lsb-release,
@@ -30,6 +32,18 @@ Description: Solaris name-value library for Linux
 transporting data across process boundaries, transporting between
 kernel and userland, and possibly saving onto disk files.

+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: libuutil2linux
 Section: contrib/libs
 Architecture: linux-any
@@ -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#
@@ -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
@@ -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
@@ -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	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