<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/ba54661c1b7e2d370740900b70157d7ed852a3ad">https://github.com/macports/macports-ports/commit/ba54661c1b7e2d370740900b70157d7ed852a3ad</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 ba54661 tn5250: fix build with current openssl
</span>ba54661 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ba54661c1b7e2d370740900b70157d7ed852a3ad
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 29 13:32:47 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> tn5250: fix build with current openssl
</span>---
net/tn5250/Portfile | 5 ++
net/tn5250/files/configure.patch | 127 +++++++++++++++++++++++++++++
net/tn5250/files/patch-lib5250_sslstream.c | 24 ++++++
3 files changed, 156 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tn5250/Portfile b/net/tn5250/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ecac8f..737fc80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tn5250/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tn5250/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +22,11 @@ master_sites sourceforge:project/tn5250/tn5250/${version}
</span> checksums sha1 2c84f03f798fd5095009d6798d1e6c0b29e48a75 \
rmd160 a2fd1d96fe89a521c53449174b0898574562ad7b
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles configure.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# from https://svnweb.freebsd.org/ports/head/net/tn5250/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-lib5250_sslstream.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --enable-ssl
#variant python {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tn5250/files/configure.patch b/net/tn5250/files/configure.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9e78b2c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tn5250/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,127 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2008-11-22 12:14:41.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-01-29 13:19:23.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23294,9 +23294,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n $sslincludedir; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="$CPPFLAGS $sslincludedir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ echo "$as_me:$LINENO: checking for CRYPTO_num_locks in -lcrypto" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo $ECHO_N "checking for CRYPTO_num_locks in -lcrypto... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "${ac_cv_lib_crypto_CRYPTO_num_locks+set}" = set; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ echo "$as_me:$LINENO: checking for OPENSSL_init_crypto in -lcrypto" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo $ECHO_N "checking for OPENSSL_init_crypto in -lcrypto... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "${ac_cv_lib_crypto_OPENSSL_init_crypto+set}" = set; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $ECHO_N "(cached) $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23314,11 +23314,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char CRYPTO_num_locks ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++char OPENSSL_init_crypto ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-return CRYPTO_num_locks ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++return OPENSSL_init_crypto ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23341,21 +23341,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test ! -s conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } && test -s conftest$ac_exeext &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_test_x conftest$ac_exeext; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_lib_crypto_CRYPTO_num_locks=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_lib_crypto_OPENSSL_init_crypto=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_lib_crypto_CRYPTO_num_locks=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_lib_crypto_OPENSSL_init_crypto=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS=$ac_check_lib_save_LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_num_locks" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_num_locks" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test $ac_cv_lib_crypto_CRYPTO_num_locks = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_OPENSSL_init_crypto" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo "${ECHO_T}$ac_cv_lib_crypto_OPENSSL_init_crypto" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test $ac_cv_lib_crypto_OPENSSL_init_crypto = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_LIBCRYPTO 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23364,16 +23364,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "$ac_cv_lib_crypto_CRYPTO_num_locks" != "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "$ac_cv_lib_crypto_OPENSSL_init_crypto" != "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { { echo "$as_me:$LINENO: error: ** Unable to find OpenSSL libraries!" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$as_me: error: ** Unable to find OpenSSL libraries!" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { (exit 1); exit 1; }; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ echo "$as_me:$LINENO: checking for OPENSSL_init_ssl in -lssl" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo $ECHO_N "checking for OPENSSL_init_ssl in -lssl... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "${ac_cv_lib_ssl_OPENSSL_init_ssl+set}" = set; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $ECHO_N "(cached) $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23391,11 +23391,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char SSL_library_init ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++char OPENSSL_init_ssl ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-return SSL_library_init ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++return OPENSSL_init_ssl ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23418,21 +23418,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test ! -s conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } && test -s conftest$ac_exeext &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_test_x conftest$ac_exeext; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_lib_ssl_SSL_library_init=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_lib_ssl_OPENSSL_init_ssl=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_lib_ssl_SSL_library_init=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_lib_ssl_OPENSSL_init_ssl=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS=$ac_check_lib_save_LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test $ac_cv_lib_ssl_SSL_library_init = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_OPENSSL_init_ssl" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo "${ECHO_T}$ac_cv_lib_ssl_OPENSSL_init_ssl" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test $ac_cv_lib_ssl_OPENSSL_init_ssl = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_LIBSSL 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23441,7 +23441,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "$ac_cv_lib_ssl_SSL_library_init" != "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "$ac_cv_lib_ssl_OPENSSL_init_ssl" != "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { { echo "$as_me:$LINENO: error: ** Unable to find OpenSSL libraries!" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$as_me: error: ** Unable to find OpenSSL libraries!" >&2;}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tn5250/files/patch-lib5250_sslstream.c b/net/tn5250/files/patch-lib5250_sslstream.c
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5244282
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tn5250/files/patch-lib5250_sslstream.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib5250/sslstream.c.orig 2008-11-21 08:12:21 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib5250/sslstream.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,13 +368,19 @@ int tn5250_ssl_stream_init (Tn5250Stream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ methstr[4] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!strcmp(methstr, "ssl2")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meth = SSLv2_client_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TN5250_LOG(("SSL Method = SSLv2_client_method()\n"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else if (!strcmp(methstr, "ssl3")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OPENSSL_NO_SSL3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!strcmp(methstr, "ssl3")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meth = SSLv3_client_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TN5250_LOG(("SSL Method = SSLv3_client_method()\n"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meth = SSLv23_client_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>