Index: security/bro/Makefile =================================================================== --- security/bro/Makefile +++ security/bro/Makefile @@ -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,10 @@ 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 +BROKER_GH_TUPLE= actor-framework:actor-framework:0.14.6:actor_framework +NETMAP_GH_TUPLE= bro:bro-netmap:cf88debf487b31ab30dc3b5bac64783b4e49997e:bro_netmap CMAKE_ARGS+= -DPYTHON_EXECUTABLE:PATH=${PYTHON_CMD} CXXFLAGS+= -std=c++11 -Wall @@ -47,14 +48,17 @@ 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 @@ -128,4 +132,10 @@ 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 Index: security/bro/distinfo =================================================================== --- security/bro/distinfo +++ security/bro/distinfo @@ -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 Index: security/bro/pkg-plist =================================================================== --- security/bro/pkg-plist +++ security/bro/pkg-plist @@ -56,6 +56,12 @@ %%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 @@ %%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'