[pve-devel] [PATCH zfsonlinux 0/3] Update to ZFS 2.1.5

[pve-devel] [PATCH zfsonlinux 0/3] Update to ZFS 2.1.5

[Stoiko Ivanov]

The ZFS 2.1.5 tag was released recently

The following patchset adapts to the changes.

The changelog looks small enough.

One commit should fix an issue quite a few users have reported in our
community forum:
https://github.com/openzfs/zfs/pull/13338
https://forum.proxmox.com/threads/.107709
https://forum.proxmox.com/threads/.109541

minimally tested on 2 VMs with storage-replication setup and by running
ztest there for 20 minutes

Stoiko Ivanov (3):
  update submodule and patches to ZFS
  Build with libcurl for new keylocation=https://
  d/control: add new zfs-dracut package

 debian/control                                | 19 ++++++++++++++++++-
 debian/patches/0005-Enable-zed-emails.patch   |  4 ++--
 ...-move-manpage-arcstat-1-to-arcstat-8.patch |  4 ++--
 debian/zfs-dracut.install                     |  2 ++
 upstream                                      |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 debian/zfs-dracut.install

-- 
2.30.2

[pve-devel] [PATCH zfsonlinux 1/3] update submodule and patches to ZFS

[Stoiko Ivanov]

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/patches/0005-Enable-zed-emails.patch                   | 4 ++--
 .../0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch      | 4 ++--
 upstream                                                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0005-Enable-zed-emails.patch b/debian/patches/0005-Enable-zed-emails.patch
index a41693a0..d87df009 100644
--- a/debian/patches/0005-Enable-zed-emails.patch
+++ b/debian/patches/0005-Enable-zed-emails.patch
@@ -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.
  #
diff --git a/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch b/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
index 6b0453b6..16ab9435 100644
--- a/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
+++ b/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
@@ -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 \
  	\
diff --git a/upstream b/upstream
index 52bad4f2..6c3c5fcf 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit 52bad4f23daaa5f827f802c8d05785a27b80275d
+Subproject commit 6c3c5fcfbe27d9193cd131753cc7e47ee2784621
-- 
2.30.2

[pve-devel] [PATCH zfsonlinux 2/3] Build with libcurl for new keylocation=https://

[Stoiko Ivanov]

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>
---
 debian/control | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 06ec27b7..b6029e8e 100644
--- a/debian/control
+++ b/debian/control
@@ -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.
-- 
2.30.2

[pve-devel] [PATCH zfsonlinux 3/3] d/control: add new zfs-dracut package

[Stoiko Ivanov]

following debian upstream (which pulled it in from Ubuntu in
44915cf387d45a123b11a8c24d3f30a8fdbcc532)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/control            | 13 +++++++++++++
 debian/zfs-dracut.install |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 debian/zfs-dracut.install

diff --git a/debian/control b/debian/control
index b6029e8e..65900c37 100644
--- a/debian/control
+++ b/debian/control
@@ -184,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
diff --git a/debian/zfs-dracut.install b/debian/zfs-dracut.install
new file mode 100644
index 00000000..8c2bf1b5
--- /dev/null
+++ b/debian/zfs-dracut.install
@@ -0,0 +1,2 @@
+usr/lib/dracut
+usr/share/man/man7/dracut.zfs.7
-- 
2.30.2