git: fe2bbe58908f - main - news/nzbget: Fix build with openssl3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 18 Aug 2023 02:57:26 UTC
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe2bbe58908f4c3577ba2ffae0ded22db6e804ec commit fe2bbe58908f4c3577ba2ffae0ded22db6e804ec Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-08-18 02:53:50 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-08-18 02:57:11 +0000 news/nzbget: Fix build with openssl3 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- news/nzbget/Makefile | 2 +- news/nzbget/files/patch-configure.ac | 4 ++-- news/nzbget/files/patch-daemon_connect_TlsSocket.cpp | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile index ea5a08273a4c..20807b0566df 100644 --- a/news/nzbget/Makefile +++ b/news/nzbget/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --disable-sigchld-handler .endif .if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} -CXXFLAGS+= -DOPENSSL_API_COMPAT=0x30000000L +CXXFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L .endif post-install: diff --git a/news/nzbget/files/patch-configure.ac b/news/nzbget/files/patch-configure.ac index 727d6b320cfa..f23d7de16403 100644 --- a/news/nzbget/files/patch-configure.ac +++ b/news/nzbget/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2018-06-06 19:34:34 UTC +--- configure.ac.orig 2023-08-18 02:50:39 UTC +++ configure.ac @@ -37,7 +37,7 @@ dnl Check for programs. dnl @@ -9,7 +9,7 @@ AC_PROG_INSTALL -@@ -553,7 +553,7 @@ dnl +@@ -554,7 +554,7 @@ dnl AC_MSG_CHECKING(whether to use SIMD-optimized routines) USE_SIMD=no case $host_cpu in diff --git a/news/nzbget/files/patch-daemon_connect_TlsSocket.cpp b/news/nzbget/files/patch-daemon_connect_TlsSocket.cpp new file mode 100644 index 000000000000..ac3bb6bb6199 --- /dev/null +++ b/news/nzbget/files/patch-daemon_connect_TlsSocket.cpp @@ -0,0 +1,11 @@ +--- daemon/connect/TlsSocket.cpp.orig 2023-08-18 02:50:58 UTC ++++ daemon/connect/TlsSocket.cpp +@@ -188,7 +188,7 @@ void TlsSocket::Final() + #endif /* HAVE_LIBGNUTLS */ + + #ifdef HAVE_OPENSSL +-#ifndef LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x30000000L && ! defined (LIBRESSL_VERSION_NUMBER) + FIPS_mode_set(0); + #endif + #ifdef NEED_CRYPTO_LOCKING