bump version to 2.1.5-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
d/control: add new zfs-dracut package
2022-06-28 16:13:51 +02:00 · 2022-06-28 16:12:01 +02:00 · 2022-06-28 16:12:01 +02:00 · 2022-06-28 16:12:01 +02:00
6 changed files with 35 additions and 6 deletions
@@ -1,3 +1,13 @@
+zfs-linux (2.1.5-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.5
+
+  * Build with libcurl for new keylocation=https://
+
+  * d/control: add new zfs-dracut package
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2022 16:13:24 +0200
+
 zfs-linux (2.1.4-pve1) bullseye; urgency=medium

  * update ZFS to 2.1.4
@@ -6,6 +6,7 @@ Build-Depends: abigail-tools,
               debhelper-compat (= 12),
               dh-python,
               libblkid-dev,
+               libcurl4-openssl-dev | libcurl4-gnutls-dev,
               libelf-dev,
               libpam0g-dev,
               libssl-dev | libssl1.0-dev,
@@ -84,9 +85,12 @@ Package: libzfs4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+# The libcurl4 is loaded through dlopen("libcurl.so.4").
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
+Recommends: libcurl4
 Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4
 Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4
-Description: OpenZFS filesystem library for Linux
+Description: OpenZFS filesystem library for Linux - general support
 OpenZFS is a storage platform that encompasses the functionality of
 traditional filesystems and volume managers. It supports data checksums,
 compression, encryption, snapshots, and more.
@@ -180,6 +184,19 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
 This package adds OpenZFS to the system initramfs with a hook
 for the initramfs-tools infrastructure.

+Package: zfs-dracut
+Architecture: all
+Depends: dracut,
+         zfsutils-linux (>= ${source:Version}),
+         ${misc:Depends}
+Description: OpenZFS root filesystem capabilities for Linux - dracut
+ 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 dracut infrastructure.
+
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
@@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index 9ac77f929..672617f54 100644
+index 227b26c26..240d0dbfa 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
-@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root"
+@@ -42,7 +42,7 @@ ZED_EMAIL_ADDR="root"
 ##
 # Minimum number of seconds between notifications for a similar event.
 #
@@ -14,7 +14,7 @@ Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)

 diff --git a/man/Makefile.am b/man/Makefile.am
-index 8ab1b7572..8b3dbe633 100644
+index 64650c2b9..95a66a62f 100644
 --- a/man/Makefile.am
 +++ b/man/Makefile.am
@@ -8,7 +8,6 @@ dist_man_MANS = \
@@ -25,7 +25,7 @@ index 8ab1b7572..8b3dbe633 100644
 	\
 	man5/vdev_id.conf.5 \
 	\
-@@ -21,6 +20,7 @@ dist_man_MANS = \
+@@ -22,6 +21,7 @@ dist_man_MANS = \
 	man7/zpoolconcepts.7 \
 	man7/zpoolprops.7 \
 	\
@@ -0,0 +1,2 @@
+usr/lib/dracut
+usr/share/man/man7/dracut.zfs.7
Author	SHA1	Message	Date
Thomas Lamprecht	3f3541cad0	bump version to 2.1.5-pve1 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2022-06-28 16:13:51 +02:00
Stoiko Ivanov	68469c1a83	d/control: add new zfs-dracut package following debian upstream (which pulled it in from Ubuntu in 44915cf387d45a123b11a8c24d3f30a8fdbcc532) Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2022-06-28 16:12:01 +02:00
Stoiko Ivanov	41ebc8de33	Build with libcurl for new keylocation=https:// following commit da40a1b007d2a99bac95bd67ec6dd7b8e217c0cf from debian-upstream. However since some of our rust-packages seem to depend on libcurl4-gnutls-dev (via librust-curl-sys-dev) we add a option for the dependency - I would assume that both should work equally well (the callers are in upstream/lib/libzfs/libzfs_crypto.c) Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2022-06-28 16:12:01 +02:00
Stoiko Ivanov	b530052969	update submodule and patches to ZFS Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2022-06-28 16:12:01 +02:00