From owner-dev-commits-ports-all@freebsd.org Tue Jul 27 18:47:36 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 94E21666C4D; Tue, 27 Jul 2021 18:47:36 +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 4GZ5Q03Gdhz4v9s; Tue, 27 Jul 2021 18:47:36 +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 4B1917BA2; Tue, 27 Jul 2021 18:47:36 +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 16RIla7S031127; Tue, 27 Jul 2021 18:47:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16RIlaR7031126; Tue, 27 Jul 2021 18:47:36 GMT (envelope-from git) Date: Tue, 27 Jul 2021 18:47:36 GMT Message-Id: <202107271847.16RIlaR7031126@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: d44b7ae85229 - 2021Q3 - emulators/yuzu: unbreak on FreeBSD < 12 after c8b56ee72403 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: d44b7ae852296acb2ed1a1b7d51e37aee32a3e73 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jul 2021 18:47:36 -0000 The branch 2021Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d44b7ae852296acb2ed1a1b7d51e37aee32a3e73 commit d44b7ae852296acb2ed1a1b7d51e37aee32a3e73 Author: Jan Beich AuthorDate: 2021-07-27 18:40:36 +0000 Commit: Jan Beich CommitDate: 2021-07-27 18:47:14 +0000 emulators/yuzu: unbreak on FreeBSD < 12 after c8b56ee72403 externals/./cpp-httplib/httplib.h: In constructor 'httplib::SSLServer::SSLServer(const char*, const char*, const char*, const char*)': externals/./cpp-httplib/httplib.h:6728:22: error: 'TLS_method' was not declared in this scope; did you mean 'DTLS_method'? 6728 | ctx_ = SSL_CTX_new(TLS_method()); | ^~~~~~~~~~ | DTLS_method Reported by: pkg-fallout (cherry picked from commit 31538e49e28778b1f69491fea6cc1119463d3a6f) --- emulators/yuzu/files/patch-freebsd11 | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/emulators/yuzu/files/patch-freebsd11 b/emulators/yuzu/files/patch-freebsd11 index 7bf47285fa3b..c3922e2e2507 100644 --- a/emulators/yuzu/files/patch-freebsd11 +++ b/emulators/yuzu/files/patch-freebsd11 @@ -19,9 +19,9 @@ externals/./httplib/httplib.h:214:2: error: Sorry, OpenSSL versions prior to 1.1 if (OPENSSL_FOUND) set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) else() ---- externals/cpp-httplib/httplib.h.orig 2020-11-18 04:02:27 UTC +--- externals/cpp-httplib/httplib.h.orig 2021-06-18 12:45:50 UTC +++ externals/cpp-httplib/httplib.h -@@ -210,10 +210,6 @@ using socket_t = int; +@@ -219,10 +219,6 @@ using socket_t = int; #include #include @@ -32,3 +32,15 @@ externals/./httplib/httplib.h:214:2: error: Sorry, OpenSSL versions prior to 1.1 #if OPENSSL_VERSION_NUMBER < 0x10100000L #include inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) { +@@ -6729,7 +6725,11 @@ static SSLInit sslinit_; + inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path, + const char *client_ca_cert_file_path, + const char *client_ca_cert_dir_path) { ++#if OPENSSL_VERSION_NUMBER < 0x10100001L ++ ctx_ = SSL_CTX_new(SSLv23_server_method()); ++#else + ctx_ = SSL_CTX_new(TLS_method()); ++#endif + + if (ctx_) { + SSL_CTX_set_options(ctx_,