Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_156224250478570"
MIME-Version: 1.0
Date: Thu, 4 Jul 2019 12:15:04 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/www/elinks
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20190704121504.5F184FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_156224250478570
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Thu Jul  4 12:15:04 UTC 2019

Modified Files:
	pkgsrc/www/elinks: Makefile distinfo
Added Files:
	pkgsrc/www/elinks/patches: patch-src_network_ssl_socket.c
	    patch-src_network_ssl_ssl.c

Log Message:
elinks: Support OpenSSL 1.1. Based on the FreeBSD Ports patches.

While here, define LICENSE.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/www/elinks/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/www/elinks/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/elinks/patches/patch-src_network_ssl_socket.c \
    pkgsrc/www/elinks/patches/patch-src_network_ssl_ssl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_156224250478570
Content-Disposition: inline
Content-Length: 4075
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/elinks/Makefile
diff -u pkgsrc/www/elinks/Makefile:1.63 pkgsrc/www/elinks/Makefile:1.64
--- pkgsrc/www/elinks/Makefile:1.63	Tue Apr 17 22:29:52 2018
+++ pkgsrc/www/elinks/Makefile	Thu Jul  4 12:15:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2018/04/17 22:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2019/07/04 12:15:04 nia Exp $
 
 DISTNAME=		elinks-0.12pre6
 PKGNAME=		${DISTNAME:S/pre/rc/}
@@ -11,6 +11,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://elinks.or.cz/
 COMMENT=		Extended/Enhanced Links
+LICENSE=		gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes

Index: pkgsrc/www/elinks/distinfo
diff -u pkgsrc/www/elinks/distinfo:1.29 pkgsrc/www/elinks/distinfo:1.30
--- pkgsrc/www/elinks/distinfo:1.29	Wed Nov  4 02:46:52 2015
+++ pkgsrc/www/elinks/distinfo	Thu Jul  4 12:15:04 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2015/11/04 02:46:52 agc Exp $
+$NetBSD: distinfo,v 1.30 2019/07/04 12:15:04 nia Exp $
 
 SHA1 (elinks-0.12pre6.tar.bz2) = 3517795e8a390cb36ca249a5be6514b9784520a5
 RMD160 (elinks-0.12pre6.tar.bz2) = 99d92dde61ed9c626f10d3d431ed4d325b2e33f6
@@ -11,3 +11,5 @@ SHA1 (patch-ad) = 089e2455c64cbfb4890769
 SHA1 (patch-ae) = a46c419ec3d96825958903459708b8b131862053
 SHA1 (patch-ag) = c31bede62a6baa1d43ab1dff639f9d7265d2bece
 SHA1 (patch-ah) = 25357fd0b0aa08f7ca55f3f8c262d2d1a4874710
+SHA1 (patch-src_network_ssl_socket.c) = 8929de875b61dc0c343764f01b9f587b0f3760f9
+SHA1 (patch-src_network_ssl_ssl.c) = e74b65f4b866ec0ce1ec290d012cb17cf076fbb1

Added files:

Index: pkgsrc/www/elinks/patches/patch-src_network_ssl_socket.c
diff -u /dev/null pkgsrc/www/elinks/patches/patch-src_network_ssl_socket.c:1.1
--- /dev/null	Thu Jul  4 12:15:04 2019
+++ pkgsrc/www/elinks/patches/patch-src_network_ssl_socket.c	Thu Jul  4 12:15:04 2019
@@ -0,0 +1,26 @@
+$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,
Index: pkgsrc/www/elinks/patches/patch-src_network_ssl_ssl.c
diff -u /dev/null pkgsrc/www/elinks/patches/patch-src_network_ssl_ssl.c:1.1
--- /dev/null	Thu Jul  4 12:15:04 2019
+++ pkgsrc/www/elinks/patches/patch-src_network_ssl_ssl.c	Thu Jul  4 12:15:04 2019
@@ -0,0 +1,28 @@
+$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());


--_----------=_156224250478570--