[packages/links] - fix build with openssl 1.1.0 - rel 4
baggins
baggins at pld-linux.org
Fri Sep 21 16:34:35 CEST 2018
commit 5395d9087c9cc600ed7f4a59fba77895aca29a48
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Sep 21 14:34:16 2018 +0000
- fix build with openssl 1.1.0
- rel 4
links.spec | 4 +++-
openssl.patch | 31 +++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/links.spec b/links.spec
index 54f0438..b55bd8a 100644
--- a/links.spec
+++ b/links.spec
@@ -6,7 +6,7 @@ Summary(ru.UTF-8): Текстовый WWW броузер типа Lynx
Summary(uk.UTF-8): Текстовий WWW броузер типу Lynx
Name: links
Version: 1.03
-Release: 3
+Release: 4
Epoch: 2
License: GPL v2+
Group: Applications/Networking
@@ -19,6 +19,7 @@ Patch0: %{name}-0.92-ipv6-20000921.patch
Patch1: %{name}-gzip_fallback.patch
Patch2: %{name}-content_encoding.patch
Patch3: %{name}-home_etc.patch
+Patch4: openssl.patch
URL: http://www.jikos.cz/~mikulas/links/
BuildRequires: autoconf
BuildRequires: automake
@@ -85,6 +86,7 @@ Links - це текстовий WWW броузер, на перший погля
%patch1 -p1
%patch2 -p1
#%patch3 -p1
+%patch4 -p1
#cd intl
#./gen-intl
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..a4d12a6
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,31 @@
+--- links-1.03/connect.c.orig 2018-09-21 14:20:27.000000000 +0000
++++ links-1.03/connect.c 2018-09-21 14:30:55.284823551 +0000
+@@ -106,7 +106,7 @@
+
+ set_timeout(c);
+
+- if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
++ if (c->no_tsl) SSL_set_options(c->ssl, SSL_OP_NO_TLSv1);
+ switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
+ case SSL_ERROR_NONE:
+ c->newconn = NULL;
+@@ -187,7 +186,7 @@
+ if (c->ssl) {
+ c->ssl = getSSL();
+ SSL_set_fd(c->ssl, *b->sock);
+- if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
++ if (c->no_tsl) SSL_set_options(c->ssl, SSL_OP_NO_TLSv1);
+ switch (SSL_get_error(c->ssl, SSL_connect(c->ssl))) {
+ case SSL_ERROR_WANT_READ:
+ setcstate(c, S_SSL_NEG);
+--- links-1.03/https.c~ 2006-09-11 02:09:24.000000000 +0000
++++ links-1.03/https.c 2018-09-21 14:32:10.946014296 +0000
+@@ -33,7 +33,7 @@
+ char f_randfile[PATH_MAX];
+
+ const char *f = RAND_file_name(f_randfile, sizeof(f_randfile));
+- if (f && RAND_egd(f)<0) {
++ if (f) {
+ /* Not an EGD, so read and write to it */
+ if (RAND_load_file(f_randfile, -1))
+ RAND_write_file(f_randfile);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/links.git/commitdiff/5395d9087c9cc600ed7f4a59fba77895aca29a48
More information about the pld-cvs-commit
mailing list