Re: [PR PATCH] [Updated] zfs: update to 2.1.7.

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 551 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/zdykstra/void-packages zfs-2.1.7
https://github.com/void-linux/void-packages/pull/40874

zfs: update to 2.1.7.
#### Testing the changes
- I tested the changes in this PR: **YES**

Built on `x86_64`, rebooted with kernel 6.0.10, root-on-ZFS. Could use a few more people checking this out / letting it bake for a day or three.

@Vaelatern @ahesford 

A patch file from https://github.com/void-linux/void-packages/pull/40874.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zfs-2.1.7-40874.patch --]
[-- Type: text/x-diff, Size: 3425 bytes --]

From 48fad9fb4549d5388a2ff3491ac2ba55d3a09c4c Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Thu, 1 Dec 2022 20:41:10 -0600
Subject: [PATCH] zfs: update to 2.1.7.

Close: #40874
---
 common/shlibs        | 12 ++++++------
 srcpkgs/libzfs       |  1 +
 srcpkgs/zfs/template | 18 +++++++++++++-----
 srcpkgs/zfs/zfs      |  1 +
 4 files changed, 21 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/libzfs
 create mode 120000 srcpkgs/zfs/zfs

diff --git a/common/shlibs b/common/shlibs
index 63c81858255f..6dca84db0980 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3871,12 +3871,12 @@ libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1
 libtss2-rc.so.0 tpm2-tss-2.3.1_1
 libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1
 libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
-libzfsbootenv.so.1 zfs-2.0.3_2
-libzfs.so.4 zfs-2.0.3_2
-libuutil.so.3 zfs-2.0.3_2
-libzpool.so.5 zfs-2.1.0_1
-libzfs_core.so.3 zfs-2.0.3_2
-libnvpair.so.3 zfs-2.0.3_2
+libzfsbootenv.so.1 libzfs-2.1.7_1
+libzfs.so.4 libzfs-2.1.7_1
+libuutil.so.3 libzfs-2.1.7_1
+libzpool.so.5 libzfs-2.1.7_1
+libzfs_core.so.3 libzfs-2.1.7_1
+libnvpair.so.3 libzfs-2.1.7_1
 libgmio.so gmio-0.4.1_1
 libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
diff --git a/srcpkgs/libzfs b/srcpkgs/libzfs
new file mode 120000
index 000000000000..eb97035e1184
--- /dev/null
+++ b/srcpkgs/libzfs
@@ -0,0 +1 @@
+zfs
\ No newline at end of file
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 316002635f0d..910cf795319b 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,21 +1,22 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.1.6
-revision=2
+version=2.1.7
+revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
  --with-dracutdir=/usr/lib/dracut --with-tirpc"
 hostmakedepends="dracut libtool pkg-config python3 automake"
 makedepends="pam-devel zlib-devel libuuid-devel libblkid-devel libtirpc-devel attr-devel"
-depends="dkms>=2.2.0.3_9 perl python3 xbps-triggers>=0.121_1"
+depends="dkms>=2.2.0.3_9 perl python3 xbps-triggers>=0.121_1
+ libzfs>=${version}_${revision}"
 conf_files="/etc/zfs/zed.d/zed.rc"
 short_desc="Z File System -- userland, pyzfs, and kernel modules (using DKMS)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=15339014f8d2131348eb937bf8893849806b6d2645ea607a18c7f117749dbd7a
+checksum=6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"
@@ -60,8 +61,15 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/share/zfs/zfs-tests
 }
 
+libzfs_package() {
+	short_desc="Z File System - libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
 zfs-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="libzfs>=${version}_${revision}"
 	short_desc="Z File System -- development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/zfs/zfs b/srcpkgs/zfs/zfs
new file mode 120000
index 000000000000..eb97035e1184
--- /dev/null
+++ b/srcpkgs/zfs/zfs
@@ -0,0 +1 @@
+zfs
\ No newline at end of file