From 48767186c685e0370c79361403d4feddb0123d00 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Sun, 17 Mar 2024 09:52:53 +0100
Subject: [PATCH] pam-mount: update to 2.20.

---
 .../pam-mount/patches/add-luks2-support.patch | 34 -------------------
 srcpkgs/pam-mount/template                    | 10 +++---
 2 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/pam-mount/patches/add-luks2-support.patch

diff --git a/srcpkgs/pam-mount/patches/add-luks2-support.patch b/srcpkgs/pam-mount/patches/add-luks2-support.patch
deleted file mode 100644
index 45145fa4e9100b..00000000000000
--- a/srcpkgs/pam-mount/patches/add-luks2-support.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: https://sourceforge.net/p/pam-mount/pam-mount/ci/d4434c05e7c0cf05d87089404cfa2deedc60811a/tree/src/crypto-dmc.c?diff=e47b8ee42f14926b013a78cc487b794059edccff
---- a/src/crypto-dmc.c
-+++ b/src/crypto-dmc.c
-@@ -21,6 +21,12 @@
- #include "libcryptmount.h"
- #include "pam_mount.h"
- 
-+#ifndef CRYPT_LUKS
-+	#define CRYPT_LUKS	NULL /* Passing NULL to crypt_load will
-+					default to LUKS(1) on older
-+					libcryptsetup versions. */
-+#endif
-+
- /**
-  * dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt)
-  * @path:	path to the crypto container
-@@ -48,7 +54,7 @@
- 
- 	ret = crypt_init(&cd, device);
- 	if (ret == 0) {
--		ret = crypt_load(cd, CRYPT_LUKS1, NULL);
-+		ret = crypt_load(cd, CRYPT_LUKS, NULL);
- 		if (ret == -EINVAL)
- 			ret = false;
- 		else if (ret == 0)
-@@ -106,7 +112,7 @@
- #endif
- 	}
- 
--	ret = crypt_load(cd, CRYPT_LUKS1, NULL);
-+	ret = crypt_load(cd, CRYPT_LUKS, NULL);
- 	if (ret == 0) {
- 		ret = crypt_activate_by_passphrase(cd, mt->crypto_name,
- 		      CRYPT_ANY_SLOT, req->key_data, req->key_size, flags);
diff --git a/srcpkgs/pam-mount/template b/srcpkgs/pam-mount/template
index e7544f6bc3d078..60e9fa8e882798 100644
--- a/srcpkgs/pam-mount/template
+++ b/srcpkgs/pam-mount/template
@@ -1,19 +1,19 @@
 # Template file for 'pam-mount'
 pkgname=pam-mount
-version=2.16
-revision=6
+version=2.20
+revision=1
 build_style=gnu-configure
 configure_args="--with-ssbindir=/usr/bin --with-slibdir=/usr/lib"
 hostmakedepends="perl pkg-config"
 makedepends="cryptsetup-devel libHX-devel libmount-devel libxml2-devel pam-devel
- pcre-devel"
+ pcre2-devel"
 depends="hxtools pam"
 short_desc="PAM module that can mount volumes for a user session"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://pam-mount.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/pam-mount/pam_mount/${version}/pam_mount-${version}.tar.xz"
-checksum=ae0207ea6c96189414f906a7b0880abc7751a98e26b3d0375c9afab3722471e7
+distfiles="https://inai.de/files/pam_mount/pam_mount-${version}.tar.xz"
+checksum=5426207a485680f8e1764ba405bb38c39a4e0c8306bc8271910f1b819a336ced
 conf_files="/etc/security/pam_mount.conf.xml"
 
 libpam-mount_package() {