Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Jul 2016 10:35:17 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r417921 - in head/www/elinks: . files
Message-ID:  <201607021035.u62AZHPN067898@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sat Jul  2 10:35:17 2016
New Revision: 417921
URL: https://svnweb.freebsd.org/changeset/ports/417921

Log:
  www/elinks: Fix build without RAND_egd
  
    - Add patch for building without EGD (OpenSSL 1.1/LibreSSL)
    - Move from USE_OPENSSL to USES=ssl
  
  PR:		198764

Added:
  head/www/elinks/files/patch-src_network_ssl_ssl.c   (contents, props changed)
Modified:
  head/www/elinks/Makefile

Modified: head/www/elinks/Makefile
==============================================================================
--- head/www/elinks/Makefile	Sat Jul  2 10:30:15 2016	(r417920)
+++ head/www/elinks/Makefile	Sat Jul  2 10:35:17 2016	(r417921)
@@ -11,8 +11,7 @@ MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Links text WWW browser with enhancements
 
 GNU_CONFIGURE=	yes
-USES=		bison cpe execinfo gmake localbase tar:bzip2
-USE_OPENSSL=	yes
+USES=		bison cpe execinfo gmake localbase ssl tar:bzip2
 CONFIGURE_ARGS=	--without-zlib
 
 LIBS+=		-lexecinfo

Added: head/www/elinks/files/patch-src_network_ssl_ssl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/elinks/files/patch-src_network_ssl_ssl.c	Sat Jul  2 10:35:17 2016	(r417921)
@@ -0,0 +1,14 @@
+--- 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)
+ 	 * 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) {
++#ifndef OPENSSL_NO_EGD
++	if (RAND_egd(RAND_file_name(f_randfile, sizeof(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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607021035.u62AZHPN067898>