git: 37658ce90473 - main - security/pkcs11-helper: Fix build with libressl
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 15 Mar 2024 13:56:38 UTC
The branch main has been updated by zirias:
URL: https://cgit.FreeBSD.org/ports/commit/?id=37658ce90473565f4ccf37655a1056920ccbd4c3
commit 37658ce90473565f4ccf37655a1056920ccbd4c3
Author: Felix Palmen <zirias@FreeBSD.org>
AuthorDate: 2024-03-14 07:09:13 +0000
Commit: Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2024-03-15 13:56:13 +0000
security/pkcs11-helper: Fix build with libressl
Approved by: portmgr (blanket, just-fix-it)
---
security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c
index e27454eb3d28..99db16701bc0 100644
--- a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c
+++ b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c
@@ -1,6 +1,6 @@
--- lib/pkcs11h-openssl.c.orig 2022-04-07 17:01:01 UTC
+++ lib/pkcs11h-openssl.c
-@@ -235,9 +235,13 @@ DSA_meth_set1_name (DSA_METHOD *meth, const char *name
+@@ -235,9 +235,13 @@ DSA_meth_free (DSA_METHOD *meth)
static int
DSA_meth_set1_name (DSA_METHOD *meth, const char *name)
{
@@ -14,6 +14,15 @@
}
#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