3 files changed, 43 insertions, 9 deletions

diff --git a/security/bro/Makefile b/security/bro/Makefile
index bdfde85c2e24..d787159656de 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	bro
-PORTVERSION=	2.0
-PORTREVISION=	2
+PORTVERSION=	2.1
 CATEGORIES=	security
-MASTER_SITES=	http://www.bro-ids.org/downloads/archive/
+MASTER_SITES=	http://www.bro-ids.org/downloads/release/
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	System for detecting network intruders in real-time
@@ -20,14 +19,24 @@ CONFIGURE_WRKSRC=	${WRKSRC}/build
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 
-OPTIONS_DEFINE=	IPV6 LBL_HF LBL_CF ASSERT
-OPTIONS_DEFAULT=	LBL_HF LBL_CF
+OPTIONS_DEFINE=	IPV6 LBL_HF LBL_CF ASSERT BROCCOLI
+OPTIONS_DEFAULT=IPV6 LBL_HF LBL_CF
 LBL_HF_DESC=	Address to hostname filter support
 LBL_CF_DESC=	Unix time to formated time/date filter support
+BROCCOLI_DESC=	Build support for libbroccoli communications
 OPTIONS_EXCLUDE=NLS DOCS
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MBROCCOLI}
+CMAKE_ARGS+=	-DINSTALL_BROCCOLI:BOOL=ON \
+		-DDISABLE_PYTHON_BINDINGS:BOOL=ON \
+		-DDISABLE_RUBY_BINDINGS:BOOL=ON
+PLIST_SUB+=	BROCCOLI=""
+.else
+PLIST_SUB+=	BROCCOLI="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MIPV6}
 CMAKE_ARGS+=	-DBROv6:BOOL=ON
 .endif
diff --git a/security/bro/distinfo b/security/bro/distinfo
index 6d7f52819a0a..603120096066 100644
--- a/security/bro/distinfo
+++ b/security/bro/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bro-2.0.tar.gz) = 52df8fd777516761b4c9754ef587f326f6c2efcc8958a440cae9f9de92501947
-SIZE (bro-2.0.tar.gz) = 3652838
+SHA256 (bro-2.1.tar.gz) = 0d83b7c78d6e247d44b0407649df7fefa6da5c73a572a16c0096c9b7f2a955e0
+SIZE (bro-2.1.tar.gz) = 5627966
diff --git a/security/bro/pkg-plist b/security/bro/pkg-plist
index 77f12520ed8b..c58bef41296e 100644
--- a/security/bro/pkg-plist
+++ b/security/bro/pkg-plist
@@ -7,7 +7,13 @@ include/binpac_buffer.h
 include/binpac_bytestring.h
 include/binpac_exception.h
 include/binpac_regex.h
-lib/libbinpac.a
+%%BROCCOLI%%bin/broccoli-config
+%%BROCCOLI%%include/broccoli.h
+%%BROCCOLI%%lib/libbinpac.a
+%%BROCCOLI%%lib/libbroccoli.a
+%%BROCCOLI%%lib/libbroccoli.so
+%%BROCCOLI%%lib/libbroccoli.so.5
+%%BROCCOLI%%lib/libbroccoli.so.5.1.0
 %%DATADIR%%/base/bro.bif.bro
 %%DATADIR%%/base/const.bif.bro
 %%DATADIR%%/base/event.bif.bro
@@ -24,6 +30,11 @@ lib/libbinpac.a
 %%DATADIR%%/base/frameworks/dpd/__load__.bro
 %%DATADIR%%/base/frameworks/dpd/dpd.sig
 %%DATADIR%%/base/frameworks/dpd/main.bro
+%%DATADIR%%/base/frameworks/input/__load__.bro
+%%DATADIR%%/base/frameworks/input/main.bro
+%%DATADIR%%/base/frameworks/input/readers/ascii.bro
+%%DATADIR%%/base/frameworks/input/readers/benchmark.bro
+%%DATADIR%%/base/frameworks/input/readers/raw.bro
 %%DATADIR%%/base/frameworks/intel/__load__.bro
 %%DATADIR%%/base/frameworks/intel/main.bro
 %%DATADIR%%/base/frameworks/logging/__load__.bro
@@ -32,6 +43,9 @@ lib/libbinpac.a
 %%DATADIR%%/base/frameworks/logging/postprocessors/scp.bro
 %%DATADIR%%/base/frameworks/logging/postprocessors/sftp.bro
 %%DATADIR%%/base/frameworks/logging/writers/ascii.bro
+%%DATADIR%%/base/frameworks/logging/writers/dataseries.bro
+%%DATADIR%%/base/frameworks/logging/writers/elasticsearch.bro
+%%DATADIR%%/base/frameworks/logging/writers/none.bro
 %%DATADIR%%/base/frameworks/metrics/__load__.bro
 %%DATADIR%%/base/frameworks/metrics/cluster.bro
 %%DATADIR%%/base/frameworks/metrics/main.bro
@@ -55,8 +69,11 @@ lib/libbinpac.a
 %%DATADIR%%/base/frameworks/signatures/main.bro
 %%DATADIR%%/base/frameworks/software/__load__.bro
 %%DATADIR%%/base/frameworks/software/main.bro
+%%DATADIR%%/base/frameworks/tunnels/__load__.bro
+%%DATADIR%%/base/frameworks/tunnels/main.bro
 %%DATADIR%%/base/init-bare.bro
 %%DATADIR%%/base/init-default.bro
+%%DATADIR%%/base/input.bif.bro
 %%DATADIR%%/base/logging.bif.bro
 %%DATADIR%%/base/misc/p0f.fp
 %%DATADIR%%/base/protocols/conn/__load__.bro
@@ -84,6 +101,9 @@ lib/libbinpac.a
 %%DATADIR%%/base/protocols/smtp/entities-excerpt.bro
 %%DATADIR%%/base/protocols/smtp/entities.bro
 %%DATADIR%%/base/protocols/smtp/main.bro
+%%DATADIR%%/base/protocols/socks/__load__.bro
+%%DATADIR%%/base/protocols/socks/consts.bro
+%%DATADIR%%/base/protocols/socks/main.bro
 %%DATADIR%%/base/protocols/ssh/__load__.bro
 %%DATADIR%%/base/protocols/ssh/main.bro
 %%DATADIR%%/base/protocols/ssl/__load__.bro
@@ -159,11 +179,13 @@ lib/libbinpac.a
 %%DATADIR%%/policy/tuning/defaults/__load__.bro
 %%DATADIR%%/policy/tuning/defaults/packet-fragments.bro
 %%DATADIR%%/policy/tuning/defaults/warnings.bro
+%%DATADIR%%/policy/tuning/logs-to-elasticsearch.bro
 %%DATADIR%%/policy/tuning/track-all-assets.bro
 %%DATADIR%%/site/local-manager.bro
 %%DATADIR%%/site/local-proxy.bro
 %%DATADIR%%/site/local-worker.bro
 %%DATADIR%%/site/local.bro
+@dirrm %%DATADIR%%/site
 @dirrm %%DATADIR%%/policy/tuning/defaults
 @dirrm %%DATADIR%%/policy/tuning
 @dirrm %%DATADIR%%/policy/protocols/ssl
@@ -189,6 +211,7 @@ lib/libbinpac.a
 @dirrm %%DATADIR%%/base/protocols/syslog
 @dirrm %%DATADIR%%/base/protocols/ssl
 @dirrm %%DATADIR%%/base/protocols/ssh
+@dirrm %%DATADIR%%/base/protocols/socks
 @dirrm %%DATADIR%%/base/protocols/smtp
 @dirrm %%DATADIR%%/base/protocols/irc
 @dirrm %%DATADIR%%/base/protocols/http
@@ -197,6 +220,7 @@ lib/libbinpac.a
 @dirrm %%DATADIR%%/base/protocols/conn
 @dirrm %%DATADIR%%/base/protocols
 @dirrm %%DATADIR%%/base/misc
+@dirrm %%DATADIR%%/base/frameworks/tunnels
 @dirrm %%DATADIR%%/base/frameworks/software
 @dirrm %%DATADIR%%/base/frameworks/signatures
 @dirrm %%DATADIR%%/base/frameworks/reporter
@@ -209,6 +233,8 @@ lib/libbinpac.a
 @dirrm %%DATADIR%%/base/frameworks/logging/postprocessors
 @dirrm %%DATADIR%%/base/frameworks/logging
 @dirrm %%DATADIR%%/base/frameworks/intel
+@dirrm %%DATADIR%%/base/frameworks/input/readers
+@dirrm %%DATADIR%%/base/frameworks/input
 @dirrm %%DATADIR%%/base/frameworks/dpd
 @dirrm %%DATADIR%%/base/frameworks/control
 @dirrm %%DATADIR%%/base/frameworks/communication
@@ -216,5 +242,4 @@ lib/libbinpac.a
 @dirrm %%DATADIR%%/base/frameworks/cluster
 @dirrm %%DATADIR%%/base/frameworks
 @dirrm %%DATADIR%%/base
-@dirrm %%DATADIR%%/site
 @dirrm %%DATADIR%%