Date: Mon, 12 Sep 2016 05:15:44 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421907 - in head/net/l4ip: . files Message-ID: <201609120515.u8C5Fik5060373@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Sep 12 05:15:44 2016 New Revision: 421907 URL: https://svnweb.freebsd.org/changeset/ports/421907 Log: net/l4ip: Support non-base SSL, handle no EGD case (LibreSSL) Approved by: SSL blanket Added: head/net/l4ip/files/ head/net/l4ip/files/patch-lion_tls.c (contents, props changed) Modified: head/net/l4ip/Makefile Modified: head/net/l4ip/Makefile ============================================================================== --- head/net/l4ip/Makefile Mon Sep 12 05:05:32 2016 (r421906) +++ head/net/l4ip/Makefile Mon Sep 12 05:15:44 2016 (r421907) @@ -11,14 +11,14 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/([ MAINTAINER= leeym@FreeBSD.org COMMENT= L4 health check daemon for IPFILTER -USES= gmake tar:tgz -USE_OPENSSL= yes +USES= gmake ssl tar:tgz WRKSRC= ${WRKDIR}/${PORTNAME}/src post-patch: ${REINPLACE_CMD} -e 's,service_type_t,script_type_t,g' ${WRKSRC}/service.c ${REINPLACE_CMD} -e 's,/usr/sbin,/sbin,g' ${WRKSRC}/l4ip.conf ${REINPLACE_CMD} -e '/^CC/d' ${WRKSRC}/${MAKEFILE} ${WRKSRC}/../lion/${MAKEFILE} + ${REINPLACE_CMD} -e "s|/usr/local/ssl|${OPENSSLBASE}|g" ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/l4ip ${STAGEDIR}${PREFIX}/sbin Added: head/net/l4ip/files/patch-lion_tls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/l4ip/files/patch-lion_tls.c Mon Sep 12 05:15:44 2016 (r421907) @@ -0,0 +1,18 @@ +--- ../lion/tls.c.orig 2005-02-17 03:34:13.000000000 +0100 ++++ ../lion/tls.c 2016-04-13 21:52:15.409533000 +0200 +@@ -94,6 +94,7 @@ int tls_init( void ) + + if (RAND_status() != 1) { + ++#ifndef OPENSSL_NO_EGD + if ( (egdbytes = RAND_egd(ssl_egdsocket)) == -1 ) { + + net_server_SSL = 0; +@@ -105,6 +106,7 @@ int tls_init( void ) + + return -2; + } ++#endif + + if (RAND_status() != 1) { +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609120515.u8C5Fik5060373>