From nobody Tue Oct 5 23:43:24 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8248E17E6177; Tue, 5 Oct 2021 23:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HPDg030Y3z4Rt3; Tue, 5 Oct 2021 23:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 46F6915C54; Tue, 5 Oct 2021 23:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 195NhOiF035876; Tue, 5 Oct 2021 23:43:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 195NhOCo035875; Tue, 5 Oct 2021 23:43:24 GMT (envelope-from git) Date: Tue, 5 Oct 2021 23:43:24 GMT Message-Id: <202110052343.195NhOCo035875@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Charlie Li Subject: git: d52c2de9d119 - 2021Q4 - net/qt5-network: fix build with LibreSSL 3.4.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: d52c2de9d11909d4df3c1768d7ea64299fb5fd23 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=d52c2de9d11909d4df3c1768d7ea64299fb5fd23 commit d52c2de9d11909d4df3c1768d7ea64299fb5fd23 Author: Charlie Li AuthorDate: 2021-10-04 06:22:15 +0000 Commit: Charlie Li CommitDate: 2021-10-05 23:43:12 +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 (cherry picked from commit 6953f406af68fd1d6e75d60101a64b8f7c3d0529) --- .../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);