git: 9ae0d7bb010a - 2025Q4 - security/pkcs11-helper: update to 1.31.0 release.

The branch 2025Q4 has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9ae0d7bb010ad02ae159ad639c8d5784afe31e91

commit 9ae0d7bb010ad02ae159ad639c8d5784afe31e91
Author:     Alex Dupre <ale@FreeBSD.org>
AuthorDate: 2025-11-11 10:14:29 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-11-17 22:43:12 +0000

    security/pkcs11-helper: update to 1.31.0 release.
    
    (cherry picked from commit 1f67990baf40e4eddf2f6126e22670b955e9859d)
---
 security/pkcs11-helper/Makefile                    |  6 +--
 security/pkcs11-helper/distinfo                    |  8 ++--
 .../files/patch-lib_pkcs11h-openssl.c              | 49 ----------------------
 3 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/security/pkcs11-helper/Makefile b/security/pkcs11-helper/Makefile
index d2953236cc7e..fdc209f4f026 100644
--- a/security/pkcs11-helper/Makefile
+++ b/security/pkcs11-helper/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	pkcs11-helper
-PORTVERSION=	1.29.0
-PORTREVISION=	3
+PORTVERSION=	1.31.0
 CATEGORIES=	security devel
 MASTER_SITES=	https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${PORTVERSION}/
 
-PATCH_SITES=	https://github.com/OpenSC/pkcs11-helper/commit/
-PATCHFILES=	98b16208d5c7d27e1f15835f3d4961349f425351.diff:-p1
-
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Helper library for multiple PKCS\#11 providers
 WWW=		https://github.com/OpenSC/pkcs11-helper
diff --git a/security/pkcs11-helper/distinfo b/security/pkcs11-helper/distinfo
index 7e77191c3abd..d135b537b86d 100644
--- a/security/pkcs11-helper/distinfo
+++ b/security/pkcs11-helper/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1706083226
-SHA256 (pkcs11-helper-1.29.0.tar.bz2) = 996846a3c8395e03d8c0515111dc84d82e6e3648d44ba28cb2dbbbca2d4db7d6
-SIZE (pkcs11-helper-1.29.0.tar.bz2) = 422549
-SHA256 (98b16208d5c7d27e1f15835f3d4961349f425351.diff) = f650a1869658f0018e90177ef45348e22f1c8bff3b41fc84c68d5396736c3681
-SIZE (98b16208d5c7d27e1f15835f3d4961349f425351.diff) = 955
+TIMESTAMP = 1762856051
+SHA256 (pkcs11-helper-1.31.0.tar.bz2) = 46f0067bccd7be2c28f88b8bca775172b9e52fb6fc1280b44ca8bb831433fef9
+SIZE (pkcs11-helper-1.31.0.tar.bz2) = 424487
diff --git a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c
deleted file mode 100644
index 99db16701bc0..000000000000
--- a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- lib/pkcs11h-openssl.c.orig	2022-04-07 17:01:01 UTC
-+++ lib/pkcs11h-openssl.c
-@@ -235,9 +235,13 @@ DSA_meth_free (DSA_METHOD *meth)
- static int
- DSA_meth_set1_name (DSA_METHOD *meth, const char *name)
- {
-+#if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L)
-+	return 0;
-+#else
- 	CK_RV rv;
- 	rv = _pkcs11h_mem_strdup ((void *)&meth->name, name);
- 	return rv == CKR_OK ? 1 : 0;
-+#endif
- }
- #endif
- 
-@@ -330,7 +334,7 @@ static struct {
- #endif
- } __openssl_methods;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100001L
-+#if OPENSSL_VERSION_NUMBER < 0x10100001L || defined(LIBRESSL_VERSION_NUMBER)
- static
- int
- __pkcs11h_openssl_ex_data_dup (
-@@ -341,12 +345,22 @@ __pkcs11h_openssl_ex_data_dup (
- 	long argl,
- 	void *argp
- ) {
--#else
-+#elif OPENSSL_VERSION_NUMBER < 0x30000000L
- int
- __pkcs11h_openssl_ex_data_dup (
- 	CRYPTO_EX_DATA *to,
- 	const CRYPTO_EX_DATA *from,
- 	void *from_d,
-+	int idx,
-+	long argl,
-+	void *argp
-+) {
-+#else
-+int
-+__pkcs11h_openssl_ex_data_dup (
-+	CRYPTO_EX_DATA *to,
-+	const CRYPTO_EX_DATA *from,
-+	void **from_d,
- 	int idx,
- 	long argl,
- 	void *argp