diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2019-02-24 10:33:30 +0100 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2019-02-24 11:52:58 +0100 |
| commit | 58f23370c5f39898121cd8bbb05638cd288eba37 (patch) | |
| tree | e651b36f229cf15c83a99beb38d9ccb4ceb60340 /net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch | |
| parent | net-irc/quassel: Remove 0.13.0 (diff) | |
| download | gentoo-58f23370c5f39898121cd8bbb05638cd288eba37.tar.gz gentoo-58f23370c5f39898121cd8bbb05638cd288eba37.tar.bz2 gentoo-58f23370c5f39898121cd8bbb05638cd288eba37.zip | |
net-misc/tn5250: Fix openssl-1.1 compat
Closes: https://bugs.gentoo.org/676654
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
Diffstat (limited to 'net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch')
| -rw-r--r-- | net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch b/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch new file mode 100644 index 000000000000..8c6d0fde1c70 --- /dev/null +++ b/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch @@ -0,0 +1,49 @@ +From 5922e57bb5ea78ff35f82a60f1721d533cc0584a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz> +Date: Mon, 20 Feb 2017 15:37:51 +0100 +Subject: [PATCH 4/4] port to OpenSSL 1.1 + +- check for better functions in configure +- update SSL initialization call +--- + configure.ac | 8 ++++---- + lib5250/sslstream.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4ba0007..8a16cff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -152,13 +152,13 @@ dnl ** happily, we don't have to hunt for them thanks to ldconfig! + dnl ** + if test -n $sslincludedir; then + CPPFLAGS="$CPPFLAGS $sslincludedir" +- AC_CHECK_LIB(crypto,CRYPTO_num_locks) +- if test "$ac_cv_lib_crypto_CRYPTO_num_locks" != "yes" ++ AC_CHECK_LIB(crypto,OPENSSL_init) ++ if test "$ac_cv_lib_crypto_OPENSSL_init" != "yes" + then + AC_MSG_ERROR([** Unable to find OpenSSL libraries!]) + fi +- AC_CHECK_LIB(ssl,SSL_library_init) +- if test "$ac_cv_lib_ssl_SSL_library_init" != "yes" ++ AC_CHECK_LIB(ssl,OPENSSL_init_ssl) ++ if test "$ac_cv_lib_ssl_OPENSSL_init_ssl" != "yes" + then + AC_MSG_ERROR([** Unable to find OpenSSL libraries!]) + fi +diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c +index 86d38cf..3c0f390 100644 +--- a/lib5250/sslstream.c ++++ b/lib5250/sslstream.c +@@ -368,7 +368,7 @@ int tn5250_ssl_stream_init (Tn5250Stream *This) + /* initialize SSL library */ + + SSL_load_error_strings(); +- SSL_library_init(); ++ OPENSSL_init_ssl(0, NULL); + + /* which SSL method do we use? */ + +-- +2.7.4 |