diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
| commit | bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch) | |
| tree | 3559b3e11424f5529527f2474d8a977a91ee3389 /www-client/elinks/files | |
| parent | 8b2628ad8526c806375e7b157889e4274b70248b (diff) | |
gentoo resync : 29.10.2017
Diffstat (limited to 'www-client/elinks/files')
3 files changed, 51 insertions, 2 deletions
diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff index dc64712b29a8..83accf4c2d95 100644 --- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff +++ b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff @@ -1,5 +1,5 @@ ---- elinks-0.10.4.conf 2005-04-08 15:29:49.000000000 -0700 -+++ elinks-0.10.4-syscharset.conf 2006-11-04 00:26:26.000000000 -0800 +--- a/elinks-0.10.4.conf 2005-04-08 15:29:49.000000000 -0700 ++++ b/elinks-0.10.4-syscharset.conf 2006-11-04 00:26:26.000000000 -0800 @@ -12,8 +12,6 @@ # obsolete config.saving_style. You shouldn't touch it. set config.saving_style_w = 1 diff --git a/www-client/elinks/files/elinks-0.12_pre5-libressl.patch b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch new file mode 100644 index 000000000000..d41ab689e9f1 --- /dev/null +++ b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch @@ -0,0 +1,29 @@ +Adapted from upstream +commit 54ebe365b752f8969a67279d0d29552ab638e025 +Author: Witold Filipczyk <witekfl@poczta.onet.pl> +Date: Mon Mar 6 17:39:36 2017 +0100 + + Compilation fix for OpenSSL-1.1 + +--- a/src/network/ssl/socket.c ++++ b/src/network/ssl/socket.c +@@ -67,7 +67,9 @@ + ssl_set_no_tls(struct socket *socket) + { + #ifdef CONFIG_OPENSSL +- ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1; ++#ifdef SSL_OP_NO_TLSv1 ++ SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1); ++#endif + #elif defined(CONFIG_GNUTLS) + { + /* GnuTLS does not support SSLv2 because it is "insecure". +@@ -145,7 +147,7 @@ + } + + if (client_cert) { +- SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx; ++ SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl); + + SSL_CTX_use_certificate_chain_file(ctx, client_cert); + SSL_CTX_use_PrivateKey_file(ctx, client_cert, diff --git a/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch new file mode 100644 index 000000000000..6c5679a95bbd --- /dev/null +++ b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch @@ -0,0 +1,20 @@ +--- a/src/network/ssl/ssl.c ++++ b/src/network/ssl/ssl.c +@@ -84,11 +84,16 @@ init_openssl(struct module *module) + * cannot initialize the PRNG and so every attempt to use SSL fails. + * It's actually an OpenSSL FAQ, and according to them, it's up to the + * application coders to seed the RNG. -- William Yodlowsky */ +- if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) { ++ RAND_file_name(f_randfile, sizeof(f_randfile)); ++#ifdef HAVE_RAND_EGD ++ if (RAND_egd(f_randfile) < 0) { + /* Not an EGD, so read and write to it */ ++#endif + if (RAND_load_file(f_randfile, -1)) + RAND_write_file(f_randfile); ++#ifdef HAVE_RAND_EGD + } ++#endif + + SSLeay_add_ssl_algorithms(); + context = SSL_CTX_new(SSLv23_client_method()); |