From owner-svn-ports-head@freebsd.org Sun Sep 11 23:57:58 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 0911FBD7CE5; Sun, 11 Sep 2016 23:57:58 +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 B5ECBBF1; Sun, 11 Sep 2016 23:57:57 +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 u8BNvu69038280; Sun, 11 Sep 2016 23:57:56 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8BNvurg038278; Sun, 11 Sep 2016 23:57:56 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609112357.u8BNvurg038278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 11 Sep 2016 23:57:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421885 - in head/security/broccoli: . 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: Sun, 11 Sep 2016 23:57:58 -0000 Author: marino Date: Sun Sep 11 23:57:56 2016 New Revision: 421885 URL: https://svnweb.freebsd.org/changeset/ports/421885 Log: security/broccoli: Document SSL requirement and handle no SSLv3 (LibreSSL) Approved by: SSL blanket Added: head/security/broccoli/files/ head/security/broccoli/files/patch-aux_broccoli_src_bro__openssl.c (contents, props changed) Modified: head/security/broccoli/Makefile Modified: head/security/broccoli/Makefile ============================================================================== --- head/security/broccoli/Makefile Sun Sep 11 23:56:30 2016 (r421884) +++ head/security/broccoli/Makefile Sun Sep 11 23:57:56 2016 (r421885) @@ -19,7 +19,7 @@ LIB_DEPENDS= libGeoIP.so:net/GeoIP EXTRACT_AFTER_ARGS= ${DISTNAME}/aux/broccoli -USES= cmake:outsource +USES= cmake:outsource ssl USE_LDCONFIG= yes CMAKE_SOURCE_PATH= ${WRKSRC}/aux/broccoli @@ -32,6 +32,7 @@ PLIST_SUB+= CLEANUP_PREFIX="@comment " .endif CMAKE_ARGS+= -D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ -D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc +CFLAGS+= -I${OPENSSLINC} OPTIONS_DEFINE= DEBUG PYTHON RUBY OPTIONS_SUB= Added: head/security/broccoli/files/patch-aux_broccoli_src_bro__openssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/broccoli/files/patch-aux_broccoli_src_bro__openssl.c Sun Sep 11 23:57:56 2016 (r421885) @@ -0,0 +1,14 @@ +--- aux/broccoli/src/bro_openssl.c.orig 2015-09-06 19:43:23 UTC ++++ aux/broccoli/src/bro_openssl.c +@@ -302,7 +302,11 @@ __bro_openssl_init(void) + * to set up an SSL connection now and abort if this fails in any way. + */ + ++#ifndef OPENSSL_NO_SSL3 + if (! (ctx = SSL_CTX_new(SSLv3_method()))) ++#else ++ if (! (ctx = SSL_CTX_new(SSLv23_method()))) ++#endif + D_RETURN_(FALSE); + + /* We expect things to be stored in PEM format, which means that we