Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Jul 2021 18:47:36 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: d44b7ae85229 - 2021Q3 - emulators/yuzu: unbreak on FreeBSD < 12 after c8b56ee72403
Message-ID:  <202107271847.16RIlaR7031126@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by jbeich:

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

commit d44b7ae852296acb2ed1a1b7d51e37aee32a3e73
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-07-27 18:40:36 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
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 <iostream>
  #include <sstream>
  
@@ -32,3 +32,15 @@ externals/./httplib/httplib.h:214:2: error: Sorry, OpenSSL versions prior to 1.1
  #if OPENSSL_VERSION_NUMBER < 0x10100000L
  #include <openssl/crypto.h>
  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_,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107271847.16RIlaR7031126>