From owner-svn-ports-all@freebsd.org Wed Feb 27 07:23:50 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E92D61513A86; Wed, 27 Feb 2019 07:23:49 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 894FD6AAF6; Wed, 27 Feb 2019 07:23:49 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 77CAB1980D; Wed, 27 Feb 2019 07:23:49 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1R7NnHo092798; Wed, 27 Feb 2019 07:23:49 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1R7Nnrn092797; Wed, 27 Feb 2019 07:23:49 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201902270723.x1R7Nnrn092797@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Wed, 27 Feb 2019 07:23:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r494029 - branches/2019Q1/www/elinks/files X-SVN-Group: ports-branches X-SVN-Commit-Author: pi X-SVN-Commit-Paths: branches/2019Q1/www/elinks/files X-SVN-Commit-Revision: 494029 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 894FD6AAF6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2019 07:23:50 -0000 Author: pi Date: Wed Feb 27 07:23:49 2019 New Revision: 494029 URL: https://svnweb.freebsd.org/changeset/ports/494029 Log: MFH: r494026 www/elinks: Fix ssl initialization on newer openssl/libressl without EGD PR: 234808 Submitted by: Derek Schrock Approved by: beat (maintainer timeout) Obtained from: https://repo.or.cz/elinks.git/blobdiff/6eba447e8ae12cacac3b479c7148d189bea3e8ea..f4a58ba3b574a478fd5954ba2c5b29e8b809ff9b:/src/network/ssl/ssl.c Approved by: ports-secteam (joneum) Modified: branches/2019Q1/www/elinks/files/patch-src_network_ssl_ssl.c Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/www/elinks/files/patch-src_network_ssl_ssl.c ============================================================================== --- branches/2019Q1/www/elinks/files/patch-src_network_ssl_ssl.c Wed Feb 27 07:14:35 2019 (r494028) +++ branches/2019Q1/www/elinks/files/patch-src_network_ssl_ssl.c Wed Feb 27 07:23:49 2019 (r494029) @@ -1,14 +1,21 @@ ---- src/network/ssl/ssl.c.orig 2009-08-22 13:15:08.000000000 +0200 -+++ src/network/ssl/ssl.c 2015-03-21 12:41:15.886709287 +0100 -@@ -49,7 +49,10 @@ init_openssl(struct module *module) +--- src/network/ssl/ssl.c.orig 2019-01-09 23:04:06 UTC ++++ src/network/ssl/ssl.c +@@ -49,11 +49,17 @@ 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(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) -+#endif ++ 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); ++#ifndef OPENSSL_NO_EGD + } ++#endif + + SSLeay_add_ssl_algorithms(); + context = SSL_CTX_new(SSLv23_client_method());