From owner-svn-ports-head@freebsd.org Mon Sep 12 05:15:45 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4848BD66B1; Mon, 12 Sep 2016 05:15:45 +0000 (UTC) (envelope-from marino@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 mx1.freebsd.org (Postfix) with ESMTPS id 8D3361C25; Mon, 12 Sep 2016 05:15:45 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8C5Fi26060375; Mon, 12 Sep 2016 05:15:44 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8C5Fik5060373; Mon, 12 Sep 2016 05:15:44 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609120515.u8C5Fik5060373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 12 Sep 2016 05:15:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421907 - in head/net/l4ip: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2016 05:15:45 -0000 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) { +