[PR PATCH] zfs: upgrade to 2.1.0

[PR PATCH] zfs: upgrade to 2.1.0

[ahesford]

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

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages zfs-2.1.0
https://github.com/void-linux/void-packages/pull/31771

zfs: upgrade to 2.1.0
Works on `x86_64` and within ZFSBootMenu. Adds a few new features so could use a bit of testing.

cc: @Vaelatern @ericonr @zdykstra 

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

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

From ef460844a196b7c251be05f555e7d2a3c3e6f84e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jul 2021 16:59:39 -0400
Subject: [PATCH 1/2] zfs: update to 2.1.0.

---
 common/shlibs        | 2 +-
 srcpkgs/zfs/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 798fa9601f56..2463c7535163 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3848,7 +3848,7 @@ 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.4 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
 libgmio.so gmio-0.4.1_1
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index b25cb8d88177..8ed0f7c26797 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.0.5
+version=2.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,7 +15,7 @@ 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=3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9
+checksum=60bddcb630284c771dcf5a1109ca9329d16523a3a40a374019955cfbf97bf34f
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

From 3579d45699fd0f132a85d696f8a28332e31c5460 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jul 2021 17:00:10 -0400
Subject: [PATCH 2/2] pam_zfscrypt: rebuild for zfs-2.1.0

---
 srcpkgs/pam_zfscrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pam_zfscrypt/template b/srcpkgs/pam_zfscrypt/template
index ec272c357fe9..eb22650a7228 100644
--- a/srcpkgs/pam_zfscrypt/template
+++ b/srcpkgs/pam_zfscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_zfscrypt'
 pkgname=pam_zfscrypt
 version=0.2.0
-revision=2
+revision=3
 wrksrc="zfscrypt-${version}"
 build_style=gnu-makefile
 makedepends="pam-devel zfs-devel"

Re: [PR PATCH] [Updated] zfs: upgrade to 2.1.0

[ahesford]

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

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

https://github.com/ahesford/void-packages zfs-2.1.0
https://github.com/void-linux/void-packages/pull/31771

zfs: upgrade to 2.1.0
Works on `x86_64` and within ZFSBootMenu. Adds a few new features so could use a bit of testing.

cc: @Vaelatern @ericonr @zdykstra 

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

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

From 257267a4b8965a896123f427156869964edc42cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jul 2021 16:59:39 -0400
Subject: [PATCH 1/2] zfs: update to 2.1.0.

---
 common/shlibs        | 2 +-
 srcpkgs/zfs/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 798fa9601f56..2463c7535163 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3848,7 +3848,7 @@ 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.4 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
 libgmio.so gmio-0.4.1_1
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index b25cb8d88177..79cf6830f10a 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.0.5
+version=2.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,13 +15,17 @@ 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=3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9
+checksum=60bddcb630284c771dcf5a1109ca9329d16523a3a40a374019955cfbf97bf34f
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"
 
 replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 post_patch() {
 	# When collecting a "clean" tree for DKMS, don't leave patches in place
 	local _f

From 2bcd7b670644d333290412cea784161b611fc1d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jul 2021 23:17:11 -0400
Subject: [PATCH 2/2] pam_zfscrypt: revbump for zfs-2.1.0

---
 srcpkgs/pam_zfscrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pam_zfscrypt/template b/srcpkgs/pam_zfscrypt/template
index ec272c357fe9..eb22650a7228 100644
--- a/srcpkgs/pam_zfscrypt/template
+++ b/srcpkgs/pam_zfscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_zfscrypt'
 pkgname=pam_zfscrypt
 version=0.2.0
-revision=2
+revision=3
 wrksrc="zfscrypt-${version}"
 build_style=gnu-makefile
 makedepends="pam-devel zfs-devel"

Re: zfs: upgrade to 2.1.0

[zdykstra]

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

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/31771#issuecomment-873340688

Comment:
Tested on x86_64 and ppc64le, no issues so far.

Re: [PR PATCH] [Updated] zfs: upgrade to 2.1.0

[ahesford]

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

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

https://github.com/ahesford/void-packages zfs-2.1.0
https://github.com/void-linux/void-packages/pull/31771

zfs: upgrade to 2.1.0
Works on `x86_64` and within ZFSBootMenu. Adds a few new features so could use a bit of testing.

cc: @Vaelatern @ericonr @zdykstra 

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

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

From 257267a4b8965a896123f427156869964edc42cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jul 2021 16:59:39 -0400
Subject: [PATCH 1/2] zfs: update to 2.1.0.

---
 common/shlibs        | 2 +-
 srcpkgs/zfs/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 798fa9601f56..2463c7535163 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3848,7 +3848,7 @@ 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.4 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
 libgmio.so gmio-0.4.1_1
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index b25cb8d88177..79cf6830f10a 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.0.5
+version=2.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,13 +15,17 @@ 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=3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9
+checksum=60bddcb630284c771dcf5a1109ca9329d16523a3a40a374019955cfbf97bf34f
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"
 
 replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 post_patch() {
 	# When collecting a "clean" tree for DKMS, don't leave patches in place
 	local _f

From 4aaa5b678964bb115c4162aa28e29eb7a02df616 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jul 2021 23:17:11 -0400
Subject: [PATCH 2/2] pam_zfscrypt: revbump for zfs-2.1.0, avoid build race

---
 srcpkgs/pam_zfscrypt/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pam_zfscrypt/template b/srcpkgs/pam_zfscrypt/template
index ec272c357fe9..abd3b5c57bda 100644
--- a/srcpkgs/pam_zfscrypt/template
+++ b/srcpkgs/pam_zfscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_zfscrypt'
 pkgname=pam_zfscrypt
 version=0.2.0
-revision=2
+revision=3
 wrksrc="zfscrypt-${version}"
 build_style=gnu-makefile
 makedepends="pam-devel zfs-devel"
@@ -12,6 +12,8 @@ license="MIT"
 homepage="https://github.com/project-trident/zfscrypt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=73244e7e97ab5a47a9ea4a24ac490f07bfe7c1eb0c920e03df202494ea61b650
+# Makefile is racy, build sequentially
+disable_parallel_build=yes
 
 CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -Iinclude"
 

Re: zfs: upgrade to 2.1.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31771#issuecomment-873342179

Comment:
I took a quick look, and /usr/src/zfs-2.1.0/tests takes up 35MB uncompressed. We should obviously test building for a few kernels without it, but if possible it would certainly make the package a tad smaller for little work on our side.

@Vaelatern, thoughts?

Re: zfs: upgrade to 2.1.0

[Vaelatern]

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

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/31771#issuecomment-873520498

Comment:
I'm OK with turning tests into a subpackage for those who want it

Re: zfs: upgrade to 2.1.0

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/31771#issuecomment-873593201

Comment:
The `/usr/src/zfs-2.x.y` directory is just a pristine version of the upstream source (except for any patches we've applied, especially the one that skips building user-space utilities that would just be thrown out by DKMS anyway).

1. If we start pruning tests, why not also prune contrib and all of the other utilities? We start down a slippery slope regarding where to stop removing pieces unnecessary for the kmods.
2. If the answer is that tests are obviously different because they are, well, tests; and the test suite is several times *larger* than the kmod source, which itself is about as large as the rest of the tree combined; then I wonder what value a tests subpackage has. Using the build-time test suite we ship in this package is not much easier than fetching an upstream source tarball and running them in a different place.
 
My take is that, if tests are special enough to want to eliminate, we just drop them. If somebody finds value in the tests, we should just keep the tree pristine.

Re: zfs: upgrade to 2.1.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31771#issuecomment-873648242

Comment:
I generally agree with 2 and think we should drop them entirely.

Re: zfs: upgrade to 2.1.0

[Vaelatern]

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

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/31771#issuecomment-873679982

Comment:
I somewhat favor a subpackage, so a machine admin doesn't need to make sure trees are synced with xbps

Re: zfs: upgrade to 2.1.0

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/31771#issuecomment-876464929

Comment:
When building the module, DKMS runs the package's configure script; this references the `tests` tree and fails, preventing the module from building. I attempted to remove `tests` in `post_extract`, but this directory is listed as a requirement in both `Makefile.am` and `configure.ac`. While this is probably an easy fix (remove all `tests/*` file references in `configure.ac` and remove references to the `tests` directories in, *e.g.*, the `SUBDIRS` specification of `Makefile.am`), I'm not thrilled about carrying patches to the build system to support test removals, especially since there is some disagreement about whether the tests should just be removed or offered in a subpackage.

I'm merging as-is for now; anybody who wants to pick up the effort can do so.

Re: [PR PATCH] [Merged]: zfs: upgrade to 2.1.0

[ahesford]

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

There's a merged pull request on the void-packages repository

zfs: upgrade to 2.1.0
https://github.com/void-linux/void-packages/pull/31771

Description:
Works on `x86_64` and within ZFSBootMenu. Adds a few new features so could use a bit of testing.

cc: @Vaelatern @ericonr @zdykstra