Date: Wed, 17 Oct 2018 23:05:55 +0000 (UTC) From: Craig Leres <leres@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482313 - head/security/bro Message-ID: <201810172305.w9HN5tZn041125@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: leres Date: Wed Oct 17 23:05:55 2018 New Revision: 482313 URL: https://svnweb.freebsd.org/changeset/ports/482313 Log: 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: head/security/bro/Makefile Modified: head/security/bro/Makefile ============================================================================== --- head/security/bro/Makefile Wed Oct 17 22:48:23 2018 (r482312) +++ head/security/bro/Makefile Wed Oct 17 23:05:55 2018 (r482313) @@ -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 <bsd.port.options.mk> + +.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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810172305.w9HN5tZn041125>