Date: Mon, 19 Feb 2018 22:04:09 +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: r462351 - head/security/bro Message-ID: <201802192204.w1JM49JA072338@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: leres Date: Mon Feb 19 22:04:08 2018 New Revision: 462351 URL: https://svnweb.freebsd.org/changeset/ports/462351 Log: Add a NETMAP option to build and install the bro netmap plugin. PR: 224918 Reported by: Shane Peters Reviewed by: matthew (mentor) Approved by: matthew (mentor) Differential Revision: https://reviews.freebsd.org/D14378 Modified: head/security/bro/Makefile head/security/bro/distinfo head/security/bro/pkg-plist Modified: head/security/bro/Makefile ============================================================================== --- head/security/bro/Makefile Mon Feb 19 21:53:01 2018 (r462350) +++ head/security/bro/Makefile Mon Feb 19 22:04:08 2018 (r462351) @@ -3,6 +3,7 @@ PORTNAME= bro PORTVERSION= 2.5.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.bro.org/downloads/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -16,10 +17,7 @@ BROKEN_powerpc64= Does not build: error: zero-size arr LIB_DEPENDS= libGeoIP.so:net/GeoIP - USES= bison cmake:outsource compiler:c++11-lang ninja perl5 python shebangfix ssl -USE_GITHUB= nodefault -GH_TUPLE= actor-framework:actor-framework:0.14.6:actor_framework CMAKE_ARGS+= -DPYTHON_EXECUTABLE:PATH=${PYTHON_CMD} CXXFLAGS+= -std=c++11 -Wall @@ -47,14 +45,17 @@ CMAKE_ARGS+= -GNinja \ BROUSER?= bro BROGROUP?= bro -PLIST_SUB+= BROUSER=${BROUSER} \ - BROGROUP=${BROGROUP} +PLIST_SUB+= ARCH=${ARCH} \ + BROUSER=${BROUSER} \ + BROGROUP=${BROGROUP} \ + LCASE_OPSYS=${OPSYS:tl} USERS= ${BROUSER} GROUPS= ${BROGROUP} -OPTIONS_DEFINE= BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS -OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF +OPTIONS_DEFINE= BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF \ + NETMAP PERFTOOLS +OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF NETMAP OPTIONS_SUB= yes BROCCOLI_DESC= Build support for libbroccoli communications @@ -77,12 +78,16 @@ BROCTL_CMAKE_BOOL= INSTALL_BROCTL BROCTL_USE= LDCONFIG=yes IPSUMDUMP_BUILD_DEPENDS=ipsumdump:net/ipsumdump IPSUMDUMP_RUN_DEPENDS= ipsumdump:net/ipsumdump -BROKER_CMAKE_BOOL= ENABLE_BROKER BROKER_BUILD_DEPENDS= swig3.0:devel/swig30 +BROKER_CMAKE_BOOL= ENABLE_BROKER BROKER_CMAKE_ON+= -DCAF_ROOT_DIR=${STAGEDIR2}${PREFIX} +BROKER_GH_TUPLE= actor-framework:actor-framework:0.14.6:actor_framework +BROKER_USE= GITHUB=nodefault DEBUG_CMAKE_BOOL= ENABLE_DEBUG LBL_HF_RUN_DEPENDS= ${LOCALBASE}/bin/hf:sysutils/lbl-hf LBL_CF_RUN_DEPENDS= ${LOCALBASE}/bin/cf:sysutils/lbl-cf +NETMAP_GH_TUPLE= bro:bro-netmap:cf88debf487b31ab30dc3b5bac64783b4e49997e:bro_netmap +NETMAP_USE= GITHUB=nodefault PERFTOOLS_CMAKE_BOOL= ENABLE_PERFTOOLS PERFTOOLS_RUN_DEPENDS= ${LOCALBASE}/bin/pprof:devel/google-perftools PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 @@ -127,5 +132,11 @@ post-install-BROCTL-on: pre-install-BROCTL-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d + +post-build-NETMAP-on: + ${LN} -s ../.build ${WRKSRC}/build + (cd ${WRKSRC_bro_netmap} && ./configure --bro-dist=${WRKSRC} \ + --install-root=${STAGEDIR}${PREFIX}/lib/bro/plugins && \ + make && make install) .include <bsd.port.mk> Modified: head/security/bro/distinfo ============================================================================== --- head/security/bro/distinfo Mon Feb 19 21:53:01 2018 (r462350) +++ head/security/bro/distinfo Mon Feb 19 22:04:08 2018 (r462351) @@ -1,5 +1,7 @@ -TIMESTAMP = 1508621466 +TIMESTAMP = 1516330946 SHA256 (bro-2.5.2.tar.gz) = ab95b1bc376282919e5fa6b25b5ef8864e2e7bd5efe842db35d4a223b8f5b970 SIZE (bro-2.5.2.tar.gz) = 18512696 SHA256 (actor-framework-actor-framework-0.14.6_GH0.tar.gz) = cbc2033896fe41e42604de2f74673971718a40684996650157484485755f7720 SIZE (actor-framework-actor-framework-0.14.6_GH0.tar.gz) = 1239451 +SHA256 (bro-bro-netmap-cf88debf487b31ab30dc3b5bac64783b4e49997e_GH0.tar.gz) = 383423f92932c3ef244194954708b3a237b4f37ebc358014f51dcb3b9786896b +SIZE (bro-bro-netmap-cf88debf487b31ab30dc3b5bac64783b4e49997e_GH0.tar.gz) = 24630 Modified: head/security/bro/pkg-plist ============================================================================== --- head/security/bro/pkg-plist Mon Feb 19 21:53:01 2018 (r462350) +++ head/security/bro/pkg-plist Mon Feb 19 22:04:08 2018 (r462351) @@ -56,6 +56,12 @@ bin/bro-cut %%BROKER%%include/broker/util/operators.hh %%BROKER%%include/broker/util/optional.hh %%BROKER%%include/broker/util/variant.hh +%%NETMAP%%lib/bro/plugins/Bro_Netmap/COPYING +%%NETMAP%%lib/bro/plugins/Bro_Netmap/__bro_plugin__ +%%NETMAP%%lib/bro/plugins/Bro_Netmap/broctl/netmap.py +%%NETMAP%%lib/bro/plugins/Bro_Netmap/lib/Bro-Netmap.%%LCASE_OPSYS%%-%%ARCH%%.so +%%NETMAP%%lib/bro/plugins/Bro_Netmap/scripts/__load__.bro +%%NETMAP%%lib/bro/plugins/Bro_Netmap/scripts/init.bro %%BROCTL%%lib/broctl/BroControl/__init__.py %%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/__init__.pyc %%BROCTL%%lib/broctl/BroControl/brocmd.py @@ -780,5 +786,9 @@ man/man8/bro.8.gz %%BROCTL%%@dir lib/broctl/plugins %%BROCTL%%@dir lib/broctl/BroControl %%BROCTL%%@dir lib/broctl +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/scripts +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/lib +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/broctl +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap @dir lib/bro/plugins %%BROCTL%%@postexec su -fm %%BROUSER%% -c '%D/bin/broctl install; rm -f %D/spool/debug.log'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802192204.w1JM49JA072338>