Date: Mon, 4 Oct 2021 21:32:40 GMT From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6953f406af68 - main - net/qt5-network: fix build with LibreSSL 3.4.0 Message-ID: <202110042132.194LWefr039263@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=6953f406af68fd1d6e75d60101a64b8f7c3d0529 commit 6953f406af68fd1d6e75d60101a64b8f7c3d0529 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2021-10-04 06:22:15 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2021-10-04 21:32:25 +0000 net/qt5-network: fix build with LibreSSL 3.4.0 "Upstream has erroneous #ifdefs which will lead to a runtime abort if both TLS1_3_VERSION and OPENSSL_NO_PSK are defined. Adjust them." Obtained from: https://github.com/openbsd/ports/commit/21d28f231753b5cef153a8ff487573ab5994769e Approved by: fluffy (mentor, kde) Differential Revision: https://reviews.freebsd.org/D32286 --- .../patch-src_network_ssl_qsslsocket__openssl.cpp | 25 ++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp index c9aeb6afd090..5655fb1f7fb8 100644 --- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp +++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp @@ -1,7 +1,28 @@ Patch from Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch ---- src/network/ssl/qsslsocket_openssl.cpp.orig 2020-09-02 10:15:07 UTC +--- src/network/ssl/qsslsocket_openssl.cpp.orig 2020-10-27 08:02:11 UTC +++ src/network/ssl/qsslsocket_openssl.cpp -@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext() +@@ -238,7 +238,11 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, co + + return 1; // need to return 1 or else "the connection setup fails." + } ++#endif // TLS1_3_VERSION + ++#endif // !OPENSSL_NO_PSK ++ ++#ifdef TLS1_3_VERSION + int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *session) + { + if (!ssl) { +@@ -256,8 +260,6 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *sessi + } + #endif // TLS1_3_VERSION + +-#endif // !OPENSSL_NO_PSK +- + #if QT_CONFIG(ocsp) + + int qt_OCSP_status_server_callback(SSL *ssl, void *ocspRequest) +@@ -653,7 +655,7 @@ bool QSslSocketBackendPrivate::initSslContext() else if (mode == QSslSocket::SslServerMode) q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110042132.194LWefr039263>