[packages/tn5250] - rel 4; openssl build fix
arekm
arekm at pld-linux.org
Sat Sep 22 20:18:58 CEST 2018
commit c040206bef394b748877e3acd0a0970df648603c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Sep 22 20:18:51 2018 +0200
- rel 4; openssl build fix
openssl.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
tn5250.spec | 4 +++-
2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/tn5250.spec b/tn5250.spec
index 020224c..1c6b86b 100644
--- a/tn5250.spec
+++ b/tn5250.spec
@@ -3,12 +3,13 @@ Summary: 5250 Telnet protocol and Terminal
Summary(pl.UTF-8): Obsługa protokołu i terminal Telnet 5250
Name: tn5250
Version: 0.17.4
-Release: 3
+Release: 4
License: GPL
Group: Applications/Networking
Source0: http://downloads.sourceforge.net/tn5250/%{name}-%{version}.tar.gz
# Source0-md5: d1eb7c5a2e15cd2f43a1c115e2734153
Patch0: format-security.patch
+Patch1: openssl.patch
URL: http://tn5250.sourceforge.net/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -54,6 +55,7 @@ Statyczne biblioteki lib5250.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..fe9327f
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,43 @@
+diff -urN tn5250-0.17.4.org/configure.ac tn5250-0.17.4/configure.ac
+--- tn5250-0.17.4.org/configure.ac 2008-11-21 01:53:32.000000000 +0100
++++ tn5250-0.17.4/configure.ac 2018-09-22 20:12:20.298123448 +0200
+@@ -152,13 +152,13 @@
+ 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,CRYPTO_free)
++ if test "$ac_cv_lib_crypto_CRYPTO_free" != "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,SSL_new)
++ if test "$ac_cv_lib_ssl_SSL_new" != "yes"
+ then
+ AC_MSG_ERROR([** Unable to find OpenSSL libraries!])
+ fi
+diff -urN tn5250-0.17.4.org/lib5250/sslstream.c tn5250-0.17.4/lib5250/sslstream.c
+--- tn5250-0.17.4.org/lib5250/sslstream.c 2008-11-21 09:12:21.000000000 +0100
++++ tn5250-0.17.4/lib5250/sslstream.c 2018-09-22 20:13:26.296754215 +0200
+@@ -368,16 +368,8 @@
+ methstr[4] = '\0';
+ }
+
+- if (!strcmp(methstr, "ssl2")) {
+- meth = SSLv2_client_method();
+- TN5250_LOG(("SSL Method = SSLv2_client_method()\n"));
+- } else if (!strcmp(methstr, "ssl3")) {
+- meth = SSLv3_client_method();
+- TN5250_LOG(("SSL Method = SSLv3_client_method()\n"));
+- } else {
+- meth = SSLv23_client_method();
+- TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
+- }
++ meth = SSLv23_client_method();
++ TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
+
+ /* create a new SSL context */
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tn5250.git/commitdiff/c040206bef394b748877e3acd0a0970df648603c
More information about the pld-cvs-commit
mailing list