Date: Thu, 13 Nov 2025 09:40:24 GMT From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4765ff401ff6 - main - security/pkcs11-helper: restore a patch to fix build on older/alternative ssl versions. Message-ID: <202511130940.5AD9eOf5090772@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=4765ff401ff6c87f8a6fb812a8c1614e879f3991 commit 4765ff401ff6c87f8a6fb812a8c1614e879f3991 Author: Alex Dupre <ale@FreeBSD.org> AuthorDate: 2025-11-13 09:37:47 +0000 Commit: Alex Dupre <ale@FreeBSD.org> CommitDate: 2025-11-13 09:40:20 +0000 security/pkcs11-helper: restore a patch to fix build on older/alternative ssl versions. --- .../files/patch-lib_pkcs11h-openssl.c | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c new file mode 100644 index 000000000000..b39df99149f3 --- /dev/null +++ b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c @@ -0,0 +1,31 @@ +--- lib/pkcs11h-openssl.c.orig 2024-09-04 08:44:23 UTC ++++ lib/pkcs11h-openssl.c +@@ -334,16 +334,26 @@ 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 ( + CRYPTO_EX_DATA *to, + CRYPTO_EX_DATA *from, +- void **from_d, ++ void *from_d, + int idx, + long argl, + void *argp ++) { ++#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 + inthome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511130940.5AD9eOf5090772>