git: 02e76c94a8a1 - main - devel/ucommon: Fix build with openssl3

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Thu, 17 Aug 2023 04:33:31 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=02e76c94a8a1d30b993ddc2ad84abc9fa7dfbb2f

commit 02e76c94a8a1d30b993ddc2ad84abc9fa7dfbb2f
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-08-16 16:15:40 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-08-17 04:33:21 +0000

    devel/ucommon: Fix build with openssl3
    
    Sponsored by:   The FreeBSD Foundation
---
 devel/ucommon/Makefile                       |  4 ----
 devel/ucommon/files/patch-openssl_secure.cpp | 12 ++++++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index 5d3f9048b0f5..b86b69db4292 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -23,10 +23,6 @@ TEST_TARGET=	test
 USE_CXXSTD=	c++11
 .endif
 
-.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*}
-CXXFLAGS+=      -DOPENSSL_API_COMPAT=0x30000000L
-.endif
-
 post-install:
 	${INSTALL_DATA} ${BUILD_WRKSRC}/ucommon-config.h ${STAGEDIR}${PREFIX}/include/ucommon
 
diff --git a/devel/ucommon/files/patch-openssl_secure.cpp b/devel/ucommon/files/patch-openssl_secure.cpp
new file mode 100644
index 000000000000..6821ad6a11b3
--- /dev/null
+++ b/devel/ucommon/files/patch-openssl_secure.cpp
@@ -0,0 +1,12 @@
+--- openssl/secure.cpp.orig	2023-08-16 16:05:03 UTC
++++ openssl/secure.cpp
+@@ -72,7 +72,9 @@ bool secure::init(void)
+ 
+     SSL_library_init();
+     SSL_load_error_strings();
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+     ERR_load_BIO_strings();
++#endif
+     OpenSSL_add_all_algorithms();
+     OpenSSL_add_all_digests();
+