From owner-svn-ports-all@freebsd.org Sun Oct 21 08:10:20 2018 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 BD147FD9C8A; Sun, 21 Oct 2018 08:10:20 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 733278145F; Sun, 21 Oct 2018 08:10:20 +0000 (UTC) (envelope-from antoine@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 6E10029B0; Sun, 21 Oct 2018 08:10:20 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9L8AKVV067269; Sun, 21 Oct 2018 08:10:20 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9L8AKr6067268; Sun, 21 Oct 2018 08:10:20 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201810210810.w9L8AKr6067268@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 21 Oct 2018 08:10:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r482654 - branches/2018Q4/security/bro X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: branches/2018Q4/security/bro X-SVN-Commit-Revision: 482654 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Sun, 21 Oct 2018 08:10:20 -0000 Author: antoine Date: Sun Oct 21 08:10:20 2018 New Revision: 482654 URL: https://svnweb.freebsd.org/changeset/ports/482654 Log: MFH: r482313 Bro 2.5.5 does not build under 12.0-ALPHA10 due to openssl 1.1.1 in the base. Unbreak build by statically linking against security/openssl. This is a stopgap until Bro 2.6 which supports openssl 1.1 is released. It is currently in beta and due in a few weeks. Add missing NETMAP_DESC while we're here. Reviewed by: ler (mentor) Approved by: ler (mentor) Differential Revision: https://reviews.freebsd.org/D17602 Modified: branches/2018Q4/security/bro/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/security/bro/Makefile ============================================================================== --- branches/2018Q4/security/bro/Makefile Sun Oct 21 08:07:14 2018 (r482653) +++ branches/2018Q4/security/bro/Makefile Sun Oct 21 08:10:20 2018 (r482654) @@ -63,6 +63,7 @@ BROKER_DESC= Enable the Broker communication library IPSUMDUMP_DESC= Enables traffic summaries LBL_CF_DESC= Unix time to formated time/date filter support LBL_HF_DESC= Address to hostname filter support +NETMAP_DESC= Native Netmap Packet IOSource for Bro PERFTOOLS_DESC= Use Perftools to improve memory & CPU usage BROCTL_IMPLIES= BROCCOLI IPSUMDUMP @@ -139,5 +140,19 @@ post-build-NETMAP-on: (cd ${WRKSRC_bro_netmap} && ./configure --bro-dist=${WRKSRC} \ --install-root=${STAGEDIR}${PREFIX}/lib/bro/plugins && \ make && make install) + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 +BUILD_DEPENDS+= ${NONEXISTENT}:security/openssl:stage +CXXFLAGS+= -I${WRKDIR}/openssl/include +OPENSSL_LDFLAGS+= -L${WRKDIR}/openssl/lib + +# Don't use COPYTREE_SHARE here as it hard links files, and the original files +# are owned by root, which creates problems of its own. +pre-configure: + @cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/openssl`${PREFIX} \ + && ${FIND} -E . ! -name *.so* | ${CPIO} -dump ${WRKDIR}/openssl >/dev/null 2>&1 +.endif .include