<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/89b2c99ced7bb23b73f293beb505687bba530326">https://github.com/macports/macports-ports/commit/89b2c99ced7bb23b73f293beb505687bba530326</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 89b2c99ced7 libsockets: fix build with openssl 1.1
</span>89b2c99ced7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 89b2c99ced7bb23b73f293beb505687bba530326
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jan 18 22:57:09 2021 +1100

<span style='display:block; white-space:pre;color:#404040;'>    libsockets: fix build with openssl 1.1
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/62077
</span>---
 devel/libsockets/Portfile                  |  4 ++--
 devel/libsockets/files/TcpSocket.cpp.patch | 20 ++++++++++++++++++++
 devel/libsockets/files/patch-Makefile.diff |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsockets/Portfile b/devel/libsockets/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b849d5839e..796f78e74db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsockets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsockets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,8 @@ checksums           rmd160  9507b1b7e0a4e6a9471c90b2ee8efd73017e58b9 \
</span>                     sha256  5b88723fe26836fb42dc9d8c974e801fdb7a404c27511247e560455bef0ebc60
 
 patchfiles          patch-HttpRequest.cpp.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    TcpSocket.cpp.patch
</span> 
 depends_lib         path:lib/libssl.dylib:openssl port:libxml2
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,4 +54,3 @@ pre-destroot {
</span> livecheck.type      regex
 livecheck.url       http://www.alhem.net/Sockets/download.html
 livecheck.regex     Sockets-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsockets/files/TcpSocket.cpp.patch b/devel/libsockets/files/TcpSocket.cpp.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c30f62371f0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsockets/files/TcpSocket.cpp.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- TcpSocket.cpp.orig     2012-09-08 16:47:13.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ TcpSocket.cpp  2021-01-18 22:54:21.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1283,7 +1283,7 @@ void TcpSocket::InitializeContext(const 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   /* Create our context*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (m_client_contexts.find(context) == m_client_contexts.end())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          const SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          const SSL_METHOD *meth = meth_in ? meth_in : SSLv23_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           m_ssl_ctx = m_client_contexts[context] = SSL_CTX_new(const_cast<SSL_METHOD *>(meth));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           SSL_CTX_set_mode(m_ssl_ctx, SSL_MODE_AUTO_RETRY|SSL_MODE_ENABLE_PARTIAL_WRITE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1339,7 +1339,7 @@ void TcpSocket::InitializeContext(const 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   /* Create our context*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (m_server_contexts.find(context) == m_server_contexts.end())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          const SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          const SSL_METHOD *meth = meth_in ? meth_in : SSLv23_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           m_ssl_ctx = m_server_contexts[context] = SSL_CTX_new(const_cast<SSL_METHOD *>(meth));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           SSL_CTX_set_mode(m_ssl_ctx, SSL_MODE_AUTO_RETRY|SSL_MODE_ENABLE_PARTIAL_WRITE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           // session id
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsockets/files/patch-Makefile.diff b/devel/libsockets/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a43ff1fb555..e04f59b2d56 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsockets/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsockets/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> --- Makefile.orig 2010-02-21 02:57:49.000000000 -0600
 +++ Makefile   2011-03-29 01:24:39.000000000 -0500
 @@ -38,6 +38,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE =      -I/usr/include/libxml2 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #CFLAGS +=        `xml2-config --cflags`
</span>  
  # CXX, CFLAGS, LIBS, LDFLAGS, LDFLAGSSO
 +include               Makefile.macports
</pre><pre style='margin:0'>

</pre>