elinks: Support OpenSSL 1.1. Based on the FreeBSD Ports patches. While here, define LICENSE. Bump PKGREVISION.diff -r1.63 -r1.64 pkgsrc/www/elinks/Makefile
(nia)
@@ -1,26 +1,27 @@ | @@ -1,26 +1,27 @@ | |||
1 | # $NetBSD: Makefile,v 1.63 2018/04/17 22:29:52 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.64 2019/07/04 12:15:04 nia Exp $ | |
2 | 2 | |||
3 | DISTNAME= elinks-0.12pre6 | 3 | DISTNAME= elinks-0.12pre6 | |
4 | PKGNAME= ${DISTNAME:S/pre/rc/} | 4 | PKGNAME= ${DISTNAME:S/pre/rc/} | |
5 | PKGREVISION= 12 | 5 | PKGREVISION= 12 | |
6 | CATEGORIES= www | 6 | CATEGORIES= www | |
7 | MASTER_SITES= http://elinks.or.cz/download/ | 7 | MASTER_SITES= http://elinks.or.cz/download/ | |
8 | MASTER_SITES+= http://ftp.icm.edu.pl/packages/elinks/ | 8 | MASTER_SITES+= http://ftp.icm.edu.pl/packages/elinks/ | |
9 | EXTRACT_SUFX= .tar.bz2 | 9 | EXTRACT_SUFX= .tar.bz2 | |
10 | 10 | |||
11 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
12 | HOMEPAGE= http://elinks.or.cz/ | 12 | HOMEPAGE= http://elinks.or.cz/ | |
13 | COMMENT= Extended/Enhanced Links | 13 | COMMENT= Extended/Enhanced Links | |
14 | LICENSE= gnu-gpl-v2 | |||
14 | 15 | |||
15 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
16 | USE_PKGLOCALEDIR= yes | 17 | USE_PKGLOCALEDIR= yes | |
17 | USE_TOOLS+= gmake pkg-config | 18 | USE_TOOLS+= gmake pkg-config | |
18 | 19 | |||
19 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share/${PKGBASE} | 20 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share/${PKGBASE} | |
20 | CONFIGURE_ARGS+= --enable-256-colors | 21 | CONFIGURE_ARGS+= --enable-256-colors | |
21 | CONFIGURE_ARGS+= --enable-utf-8 | 22 | CONFIGURE_ARGS+= --enable-utf-8 | |
22 | CONFIGURE_ARGS+= --without-lzma | 23 | CONFIGURE_ARGS+= --without-lzma | |
23 | 24 | |||
24 | .include "../../mk/bsd.prefs.mk" | 25 | .include "../../mk/bsd.prefs.mk" | |
25 | 26 | |||
26 | # for backtrace | 27 | # for backtrace |
@@ -1,13 +1,15 @@ | @@ -1,13 +1,15 @@ | |||
1 | $NetBSD: distinfo,v 1.29 2015/11/04 02:46:52 agc Exp $ | 1 | $NetBSD: distinfo,v 1.30 2019/07/04 12:15:04 nia Exp $ | |
2 | 2 | |||
3 | SHA1 (elinks-0.12pre6.tar.bz2) = 3517795e8a390cb36ca249a5be6514b9784520a5 | 3 | SHA1 (elinks-0.12pre6.tar.bz2) = 3517795e8a390cb36ca249a5be6514b9784520a5 | |
4 | RMD160 (elinks-0.12pre6.tar.bz2) = 99d92dde61ed9c626f10d3d431ed4d325b2e33f6 | 4 | RMD160 (elinks-0.12pre6.tar.bz2) = 99d92dde61ed9c626f10d3d431ed4d325b2e33f6 | |
5 | SHA512 (elinks-0.12pre6.tar.bz2) = bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f | 5 | SHA512 (elinks-0.12pre6.tar.bz2) = bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f | |
6 | Size (elinks-0.12pre6.tar.bz2) = 2854500 bytes | 6 | Size (elinks-0.12pre6.tar.bz2) = 2854500 bytes | |
7 | SHA1 (patch-aa) = b188ab3975bcfd6a491c2e41a17b1f31703d4667 | 7 | SHA1 (patch-aa) = b188ab3975bcfd6a491c2e41a17b1f31703d4667 | |
8 | SHA1 (patch-ab) = a1d9b4246869c1999043c76dbcb35996a6b294fd | 8 | SHA1 (patch-ab) = a1d9b4246869c1999043c76dbcb35996a6b294fd | |
9 | SHA1 (patch-ac) = a7f4bacbdf4073a5a733fe565b1f51dc755c7e4d | 9 | SHA1 (patch-ac) = a7f4bacbdf4073a5a733fe565b1f51dc755c7e4d | |
10 | SHA1 (patch-ad) = 089e2455c64cbfb48907693a653e76cc97961622 | 10 | SHA1 (patch-ad) = 089e2455c64cbfb48907693a653e76cc97961622 | |
11 | SHA1 (patch-ae) = a46c419ec3d96825958903459708b8b131862053 | 11 | SHA1 (patch-ae) = a46c419ec3d96825958903459708b8b131862053 | |
12 | SHA1 (patch-ag) = c31bede62a6baa1d43ab1dff639f9d7265d2bece | 12 | SHA1 (patch-ag) = c31bede62a6baa1d43ab1dff639f9d7265d2bece | |
13 | SHA1 (patch-ah) = 25357fd0b0aa08f7ca55f3f8c262d2d1a4874710 | 13 | SHA1 (patch-ah) = 25357fd0b0aa08f7ca55f3f8c262d2d1a4874710 | |
14 | SHA1 (patch-src_network_ssl_socket.c) = 8929de875b61dc0c343764f01b9f587b0f3760f9 | |||
15 | SHA1 (patch-src_network_ssl_ssl.c) = e74b65f4b866ec0ce1ec290d012cb17cf076fbb1 |
$NetBSD: patch-src_network_ssl_socket.c,v 1.1 2019/07/04 12:15:04 nia Exp $
Support OpenSSL 1.1.
Derived from FreeBSD Ports.
--- src/network/ssl/socket.c.orig 2012-10-28 12:57:15.000000000 +0000
+++ src/network/ssl/socket.c
@@ -67,7 +67,7 @@ static void
ssl_set_no_tls(struct socket *socket)
{
#ifdef CONFIG_OPENSSL
- ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
+ SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1);
#elif defined(CONFIG_GNUTLS)
{
/* GnuTLS does not support SSLv2 because it is "insecure".
@@ -145,7 +145,7 @@ ssl_connect(struct socket *socket)
}
if (client_cert) {
- SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
+ SSL_CTX *ctx = SSL_get_SSL_CTX(socket->ssl);
SSL_CTX_use_certificate_chain_file(ctx, client_cert);
SSL_CTX_use_PrivateKey_file(ctx, client_cert,
$NetBSD: patch-src_network_ssl_ssl.c,v 1.1 2019/07/04 12:15:04 nia Exp $
Build on newer OpenSSL without RAND_egd.
Derived from upstream:
https://repo.or.cz/elinks.git/blobdiff/6eba447e8ae12cacac3b479c7148d189bea3e8ea..f4a58ba3b574a478fd5954ba2c5b29e8b809ff9b:/src/network/ssl/ssl.c
--- src/network/ssl/ssl.c.orig 2012-10-28 12:57:15.000000000 +0000
+++ src/network/ssl/ssl.c
@@ -50,11 +50,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));
+#ifndef OPENSSL_NO_EGD
+ if (RAND_egd(f_randfile) < 0) {
+#endif
/* Not an EGD, so read and write to it */
if (RAND_load_file(f_randfile, -1))
RAND_write_file(f_randfile);
+#ifndef OPENSSL_NO_EGD
}
+#endif
SSLeay_add_ssl_algorithms();
context = SSL_CTX_new(SSLv23_client_method());