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"