--- Makefile	(revision 445995)
+++ Makefile	(working copy)
@@ -2,10 +2,12 @@ 
 # $FreeBSD$
 
 PORTNAME=	bro
-PORTVERSION=	2.4.1
-PORTREVISION=	3
+PORTVERSION=	2.5.1
 CATEGORIES=	security
-MASTER_SITES=	http://www.bro.org/downloads/release/
+MASTER_SITES=	https://www.bro.org/downloads/ \
+		https://github.com/actor-framework/actor-framework/releases/:source2
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION2}_GH0${EXTRACT_SUFX}
 
 MAINTAINER=	leres@ee.lbl.gov
 COMMENT=	System for detecting network intruders in real-time
@@ -12,29 +14,30 @@ 
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bison:devel/bison \
-		${LOCALBASE}/bin/swig:devel/swig13
+BUILD_DEPENDS=	bison:devel/bison
 LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 BROKEN_powerpc64=	Does not build: error: zero-size array 'names'
 
-USES=		cmake:outsource compiler:c++11-lang perl5 python shebangfix ssl
+GH_ACCOUNT=	actor-framework
+GH_PROJECT=	${GH_ACCOUNT}
 
-CMAKE_ARGS+=	-D PYTHON_EXECUTABLE:PATH=${PYTHON_CMD}
-CXXFLAGS+=	-std=c++11 -Wextra -Wall -pedantic
+USES=		cmake:outsource compiler:c++11-lang ninja perl5 python shebangfix ssl
 
+CMAKE_ARGS+=	-DPYTHON_EXECUTABLE:PATH=${PYTHON_CMD}
+CXXFLAGS+=	-std=c++11 -Wall
+
+PORTVERSION2=	0.14.5
+WRKSRC2=	${WRKDIR}/${GH_PROJECT}-${PORTVERSION2}
+STAGEDIR2=	${STAGEDIR}-caf
+
 SHEBANG_FILES=	aux/broctl/aux/trace-summary/trace-summary
 
 SUB_FILES=	pkg-message
 NO_MTREE=	yes
 
-.if defined(BRO_PREFIX)
-PREFIX=${BRO_PREFIX}
-PLIST_SUB+=	CLEANUP_PREFIX=""
-.else
-PLIST_SUB+=	CLEANUP_PREFIX="@comment "
-.endif
-CMAKE_ARGS+=	-D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
+CMAKE_ARGS+=	-GNinja \
+		-D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
 		-D BRO_ROOT_DIR:PATH=${PREFIX} \
 		-D PY_MOD_INSTALL_DIR:PATH=${PREFIX}/lib/broctl \
 		-D BRO_SCRIPT_INSTALL_PATH:PATH=${PREFIX}/share/bro \
@@ -55,7 +58,7 @@ 
 USERS=		${BROUSER}
 GROUPS=		${BROGROUP}
 
-OPTIONS_DEFINE= BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS
+OPTIONS_DEFINE=	BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS
 OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF
 OPTIONS_SUB=	yes
 
@@ -71,7 +74,8 @@ 
 
 BROCCOLI_LIB_DEPENDS=	libbroccoli.so:security/broccoli
 BROCTL_BUILD_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
-			${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+			${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+			swig3.0:devel/swig30
 BROCTL_RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
 			${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 BROCTL_CMAKE_BOOL=	INSTALL_BROCTL
@@ -79,20 +83,56 @@ 
 IPSUMDUMP_BUILD_DEPENDS=ipsumdump:net/ipsumdump
 IPSUMDUMP_RUN_DEPENDS=	ipsumdump:net/ipsumdump
 BROKER_CMAKE_BOOL=	ENABLE_BROKER
-BROKER_BUILD_DEPENDS=	caf>=0.14.1:devel/caf
+BROKER_BUILD_DEPENDS=	swig3.0:devel/swig30
+BROKER_CMAKE_ON+=	-DCAF_ROOT_DIR=${STAGEDIR2}${PREFIX}
 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
 PERFTOOLS_CMAKE_BOOL=	ENABLE_PERFTOOLS
 PERFTOOLS_RUN_DEPENDS=	${LOCALBASE}/bin/pprof:devel/google-perftools
+PYTHON_BUILD_DEPENDS=	swig3.0:devel/swig30
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MBROCTL}
+USE_RC_SUBR=	bro
+.endif
+
+CMAKE_ARGS2=		-GNinja \
+			-D CMAKE_INSTALL_PREFIX:PATH=${STAGEDIR2}${PREFIX} \
+			-D CAF_BUILD_STATIC_ONLY:BOOL=yes \
+			-D CAF_LOG_LEVEL:STRING=0 \
+			-D CAF_NO_EXAMPLES:BOOL=yes \
+			-D CAF_NO_OPENCL:BOOL=yes \
+			-D CAF_NO_UNIT_TESTS:BOOL=yes
+
+CMAKE_SOURCE_PATH2=	${WRKSRC2}
+
+CONFIGURE_WRKSRC2=	${WRKDIR}/.build-caf
+BUILD_WRKSRC2=		${CONFIGURE_WRKSRC2}
+INSTALL_WRKSRC2=	${CONFIGURE_WRKSRC2}
+
+# Build the version of caf this version of bro requires
+pre-configure-BROKER-on:
+	${MKDIR} ${CONFIGURE_WRKSRC2}
+	(cd ${CONFIGURE_WRKSRC2} && \
+	    ${CMAKE_BIN} ${CMAKE_ARGS2} ${CMAKE_SOURCE_PATH2})
+	${MKDIR} ${STAGEDIR2}
+	(cd ${BUILD_WRKSRC2} && \
+	    ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} install)
+	${LN} -s libcaf_core_static.a ${STAGEDIR2}${PREFIX}/lib/libcaf_core.a
+	${LN} -s libcaf_io_static.a ${STAGEDIR2}${PREFIX}/lib/libcaf_io.a
+
 post-install-BROCTL-on:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/logs
-	@${MKDIR} ${STAGEDIR}${PREFIX}/spool/tmp
-	@${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto
-	@${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/site
+	${MKDIR} ${STAGEDIR}${PREFIX}/logs
+	${MKDIR} ${STAGEDIR}${PREFIX}/spool/tmp
+	${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto
+	${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/site
 .for F in broctl.cfg networks.cfg node.cfg
-	@${MV} ${STAGEDIR}${PREFIX}/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
+	${MV} ${STAGEDIR}${PREFIX}/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
 .endfor
 
+pre-install-BROCTL-on:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d
+
 .include <bsd.port.mk>
--- distinfo	(revision 445995)
+++ distinfo	(working copy)
@@ -1,2 +1,5 @@ 
-SHA256 (bro-2.4.1.tar.gz) = d8b99673a5024630f6bae820c4f8c3ca9029f1167f9e5729c914c66e1fc7c8f6
-SIZE (bro-2.4.1.tar.gz) = 15010455
+TIMESTAMP = 1499014689
+SHA256 (bro-2.5.1.tar.gz) = 2c6ce502864bee9323c3e46213a21cfe9281a65cbedf81d5ab6160a437a89511
+SIZE (bro-2.5.1.tar.gz) = 18521029
+SHA256 (actor-framework-actor-framework-0.14.5_GH0.tar.gz) = afc4bc928ecd7d017768e5c85b7300196aa5b70ef11d97e11b21a1ae28ce9d3f
+SIZE (actor-framework-actor-framework-0.14.5_GH0.tar.gz) = 1239461
--- files/bro.in	(nonexistent)
+++ files/bro.in	(working copy)
@@ -0,0 +1,81 @@ 
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: bro
+# REQUIRE: NETWORKING
+# REQUIRE: LOGIN FILESYSTEMS
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name="bro"
+rcvar=`set_rcvar`
+node=$2
+
+start_cmd="bro_start"
+stop_cmd="bro_stop"
+restart_cmd="bro_restart"
+deploy_cmd="bro_deploy"
+install_cmd="bro_install"
+cleanup_cmd="bro_cleanup"
+restart_cmd="bro_restart"
+status_cmd="bro_status"
+
+extra_commands="deploy install cleanup status restart"
+
+: ${broctl_program:=%%PREFIX%%/bin/broctl}
+
+bro_enable=${bro_enable-"NO"}
+
+bro_start() {
+    if [ ! "${node}" ];
+    then
+        $broctl_program start
+    else
+        $broctl_program start $node
+    fi
+}
+
+bro_stop() {
+    if [ ! "${node}" ];
+    then
+        $broctl_program stop
+    else
+        $broctl_program stop $node
+    fi
+}
+
+bro_restart() {
+    if [ ! "${node}" ];
+    then
+        $broctl_program restart
+    else
+        $broctl_program restart $node
+    fi
+}
+
+bro_deploy() {
+    $broctl_program deploy
+}
+
+bro_install() {
+    $broctl_program install
+}
+
+bro_cleanup() {
+    if [ ! "${node}" ];
+    then
+        $broctl_program cleanup
+    else
+        $broctl_program cleanup ${node}
+    fi
+}
+
+bro_status() {
+    $broctl_program status
+}
+
+load_rc_config $name
+run_rc_command "$1"
--- files/patch-aux_broker_CMakeLists.txt	(nonexistent)
+++ files/patch-aux_broker_CMakeLists.txt	(working copy)
@@ -0,0 +1,85 @@ 
+--- aux/broker/CMakeLists.txt.orig	2016-11-16 22:53:56 UTC
++++ aux/broker/CMakeLists.txt
+@@ -2,7 +2,32 @@ project(broker C CXX)
+ cmake_minimum_required(VERSION 2.8)
+ include(cmake/CommonCMakeConfig.cmake)
+ 
+-find_package(CAF COMPONENTS core io REQUIRED)
++set(ENABLE_SHARED true)
++
++if ( ENABLE_STATIC_ONLY )
++    set(ENABLE_STATIC true)
++    set(ENABLE_SHARED false)
++endif ()
++
++if ( ENABLE_STATIC )
++    set(CAF_STATIC_ONLY true)
++    find_package(CAF COMPONENTS core io REQUIRED)
++    set(LINK_CAF_STATIC ${CAF_LIBRARIES})
++endif ()
++if ( ENABLE_SHARED )
++	unset(CAF_STATIC_ONLY CACHE)
++	unset(CAF_FOUND CACHE)
++	unset(CAF_LIBRARIES CACHE)
++	unset(CAF_LIBRARY_CORE CACHE)
++	unset(CAF_STATIC_ONLY)
++	unset(CAF_FOUND)
++	unset(CAF_LIBRARIES)
++	unset(CAF_LIBRARY_CORE)
++	unset(CAF_LIBRARY_IO)
++unset(CAF_LIBRARY_IO CACHE)
++    find_package(CAF COMPONENTS core io REQUIRED)
++    set(LINK_CAF_SHARED ${CAF_LIBRARIES})
++endif ()
+ 
+ # Check for required CAF version.
+ set(CAF_VERSION_REQUIRED 0.14)
+@@ -23,7 +48,6 @@ if ( ( CAF_VERSION VERSION_LESS ${CAF_VE
+ endif ()
+ 
+ include_directories(BEFORE ${CAF_INCLUDE_DIRS})
+-set(LINK_LIBS ${LINK_LIBS} ${CAF_LIBRARIES})
+ 
+ find_package(RocksDB)
+ 
+@@ -50,12 +74,6 @@ set(BROKER_VERSION
+     ${BROKER_VERSION_MAJOR}.${BROKER_VERSION_MINOR}.${BROKER_VERSION_PATCH})
+ # The SO number shall increase only if binary interface changes.
+ set(BROKER_SOVERSION 0)
+-set(ENABLE_SHARED true)
+-
+-if ( ENABLE_STATIC_ONLY )
+-    set(ENABLE_STATIC true)
+-    set(ENABLE_SHARED false)
+-endif ()
+ 
+ include(RequireCXX11)
+ 
+@@ -147,21 +165,23 @@ if ( ENABLE_SHARED )
+                           # MACOSX_RPATH).
+                           INSTALL_NAME_DIR "@rpath"
+                           OUTPUT_NAME broker)
+-    target_link_libraries(broker ${LINK_LIBS})
++		  target_link_libraries(broker ${LINK_LIBS} ${LINK_CAF_SHARED})
+     install(TARGETS broker DESTINATION ${INSTALL_LIB_DIR})
+ endif ()
+ 
+ if ( ENABLE_STATIC )
+     add_library(brokerStatic STATIC ${BROKER_SRC})
+     set_target_properties(brokerStatic PROPERTIES OUTPUT_NAME broker)
+-    target_link_libraries(brokerStatic ${LINK_LIBS})
++    target_link_libraries(brokerStatic ${LINK_LIBS} ${LINK_CAF_STATIC})
+     install(TARGETS brokerStatic DESTINATION ${INSTALL_LIB_DIR})
+ endif ()
+ 
+ add_subdirectory(bindings)
+ 
+-enable_testing()
+-add_subdirectory(tests)
++if ( !ENABLE_SHARED )
++    enable_testing()
++    add_subdirectory(tests)
++endif ()
+ 
+ string(TOUPPER ${CMAKE_BUILD_TYPE} BuildType)
+ 
--- files/patch-aux_broker_cmake_FindCAF.cmake	(nonexistent)
+++ files/patch-aux_broker_cmake_FindCAF.cmake	(working copy)
@@ -0,0 +1,57 @@ 
+--- aux/broker/cmake/FindCAF.cmake.orig	2016-11-16 22:53:56 UTC
++++ aux/broker/cmake/FindCAF.cmake
+@@ -10,6 +10,8 @@
+ #  CAF_ROOT_DIR  Set this variable either to an installation prefix or to wa
+ #                CAF build directory where to look for the CAF libraries.
+ #
++#  CAF_STATIC_ONLY  Find the static libraries of caf only.
++#
+ # Variables defined by this module:
+ #
+ #  CAF_FOUND              System has CAF headers and library
+@@ -34,11 +36,18 @@ foreach (comp ${CAF_FIND_COMPONENTS})
+         "${CAF_ROOT_DIR}/include"
+         "${CAF_ROOT_DIR}/../libcaf_${comp}")
+   endif ()
++  # give CAF_ROOT_DIR priority...
++  find_path(CAF_INCLUDE_DIR_${UPPERCOMP}
++            NAMES
++              ${HDRNAME}
++            HINTS
++	      ${header_hints}
++	    NO_DEFAULT_PATH)
++  # ...then look in default locations if not found yet
+   find_path(CAF_INCLUDE_DIR_${UPPERCOMP}
+             NAMES
+               ${HDRNAME}
+             HINTS
+-              ${header_hints}
+               /usr/include
+               /usr/local/include
+               /opt/local/include
+@@ -65,11 +74,24 @@ foreach (comp ${CAF_FIND_COMPONENTS})
+       if (CAF_ROOT_DIR)
+         set(library_hints "${CAF_ROOT_DIR}/lib")
+       endif ()
++      # Find dynamic or static library
++      if (CAF_STATIC_ONLY)
++        set(library_name "caf_${comp}_static")
++      else ()
++        set(library_name "caf_${comp}")
++      endif ()
++      # give CAF_ROOT_DIR priority...
+       find_library(CAF_LIBRARY_${UPPERCOMP}
+                    NAMES
+-                     "caf_${comp}"
++                     ${library_name}
+                    HINTS
+                      ${library_hints}
++		     NO_DEFAULT_PATH)
++      # ...then look in default locations if not found yet
++      find_library(CAF_LIBRARY_${UPPERCOMP}
++                   NAMES
++                     ${library_name}
++                   HINTS
+                      /usr/lib
+                      /usr/local/lib
+                      /opt/local/lib
--- pkg-plist	(revision 445995)
+++ pkg-plist	(working copy)
@@ -1,21 +1,22 @@ 
-%%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/logs
-%%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool
-%%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool/tmp
-%%BROCTL%%@exec chown -R %%BROUSER%%:%%BROGROUP%% %D/spool/installed-scripts-do-not-touch
+@postexec chown %%BROUSER%%:%%BROGROUP%% %D/logs
+%%BROCTL%%@postexec chown %%BROUSER%%:%%BROGROUP%% %D/spool
+%%BROCTL%%@postexec chown %%BROUSER%%:%%BROGROUP%% %D/spool/tmp
+%%BROCTL%%@postexec chown -R %%BROUSER%%:%%BROGROUP%% %D/spool/installed-scripts-do-not-touch
 bin/bro
+bin/bro-config
 bin/bro-cut
 %%BROCTL%%bin/broctl
 %%BROCTL%%bin/capstats
 %%BROCTL%%bin/trace-summary
-%%BROCTL%%@unexec if cmp -s %D/etc/broctl.cfg.example %D/etc/broctl.cfg ; then rm -f %D/etc/broctl.cfg; fi
+%%BROCTL%%@preunexec if cmp -s %D/etc/broctl.cfg.example %D/etc/broctl.cfg ; then rm -f %D/etc/broctl.cfg; fi
 %%BROCTL%%etc/broctl.cfg.example
-%%BROCTL%%@exec if [ ! -f %D/etc/broctl.cfg ] ; then cp -p %D/etc/broctl.cfg.example %D/etc/broctl.cfg; fi
-%%BROCTL%%@unexec if cmp -s %D/etc/networks.cfg.example %D/etc/networks.cfg ; then rm -f %D/etc/networks.cfg; fi
+%%BROCTL%%@postexec if [ ! -f %D/etc/broctl.cfg ] ; then cp -p %D/etc/broctl.cfg.example %D/etc/broctl.cfg; fi
+%%BROCTL%%@preunexec if cmp -s %D/etc/networks.cfg.example %D/etc/networks.cfg ; then rm -f %D/etc/networks.cfg; fi
 %%BROCTL%%etc/networks.cfg.example
-%%BROCTL%%@exec if [ ! -f %D/etc/networks.cfg ] ; then cp -p %D/etc/networks.cfg.example %D/etc/networks.cfg; fi
-%%BROCTL%%@unexec if cmp -s %D/etc/node.cfg.example %D/etc/node.cfg ; then rm -f %D/etc/node.cfg; fi
+%%BROCTL%%@postexec if [ ! -f %D/etc/networks.cfg ] ; then cp -p %D/etc/networks.cfg.example %D/etc/networks.cfg; fi
+%%BROCTL%%@preunexec if cmp -s %D/etc/node.cfg.example %D/etc/node.cfg ; then rm -f %D/etc/node.cfg; fi
 %%BROCTL%%etc/node.cfg.example
-%%BROCTL%%@exec if [ ! -f %D/etc/node.cfg ] ; then cp -p %D/etc/node.cfg.example %D/etc/node.cfg; fi
+%%BROCTL%%@postexec if [ ! -f %D/etc/node.cfg ] ; then cp -p %D/etc/node.cfg.example %D/etc/node.cfg; fi
 %%BROKER%%include/broker/address.hh
 %%BROKER%%include/broker/broker.h
 %%BROKER%%include/broker/broker.hh
@@ -56,63 +57,72 @@ 
 %%BROKER%%include/broker/util/optional.hh
 %%BROKER%%include/broker/util/variant.hh
 %%BROCTL%%lib/broctl/BroControl/__init__.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/__init__.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/__init__.pyc
 %%BROCTL%%lib/broctl/BroControl/brocmd.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/brocmd.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/brocmd.pyc
 %%BROCTL%%lib/broctl/BroControl/broctl.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/broctl.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/broctl.pyc
 %%BROCTL%%lib/broctl/BroControl/cmdresult.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/cmdresult.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/cmdresult.pyc
 %%BROCTL%%lib/broctl/BroControl/config.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/config.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/config.pyc
 %%BROCTL%%lib/broctl/BroControl/control.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/control.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/control.pyc
 %%BROCTL%%lib/broctl/BroControl/cron.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/cron.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/cron.pyc
 %%BROCTL%%lib/broctl/BroControl/doc.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/doc.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/doc.pyc
 %%BROCTL%%lib/broctl/BroControl/events.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/events.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/events.pyc
+%%BROCTL%%lib/broctl/BroControl/exceptions.py
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/exceptions.pyc
 %%BROCTL%%lib/broctl/BroControl/execute.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/execute.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/execute.pyc
 %%BROCTL%%lib/broctl/BroControl/install.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/install.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/install.pyc
+%%BROCTL%%lib/broctl/BroControl/lock.py
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/lock.pyc
 %%BROCTL%%lib/broctl/BroControl/node.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/node.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/node.pyc
 %%BROCTL%%lib/broctl/BroControl/options.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/options.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/options.pyc
 %%BROCTL%%lib/broctl/BroControl/plugin.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/plugin.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/plugin.pyc
 %%BROCTL%%lib/broctl/BroControl/pluginreg.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/pluginreg.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/pluginreg.pyc
 %%BROCTL%%lib/broctl/BroControl/printdoc.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/printdoc.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/printdoc.pyc
 %%BROCTL%%lib/broctl/BroControl/py3bro.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/py3bro.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/py3bro.pyc
 %%BROCTL%%lib/broctl/BroControl/ssh_runner.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/ssh_runner.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/ssh_runner.pyc
 %%BROCTL%%lib/broctl/BroControl/state.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/state.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/state.pyc
 %%BROCTL%%lib/broctl/BroControl/util.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/util.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/util.pyc
 %%BROCTL%%lib/broctl/BroControl/utilcurses.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/utilcurses.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/utilcurses.pyc
 %%BROCTL%%lib/broctl/BroControl/version.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/BroControl/version.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/version.pyc
 %%BROCTL%%lib/broctl/SubnetTree.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/SubnetTree.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/SubnetTree.pyc
 %%BROCTL%%lib/broctl/_SubnetTree.so
+%%BROKER%%lib/broctl/_pybroker.so
 %%BROCTL%%lib/broctl/plugins/TestPlugin.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/plugins/TestPlugin.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/plugins/TestPlugin.pyc
+%%BROCTL%%lib/broctl/plugins/lb_custom.py
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/plugins/lb_custom.pyc
 %%BROCTL%%lib/broctl/plugins/lb_myricom.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/plugins/lb_myricom.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/plugins/lb_myricom.pyc
 %%BROCTL%%lib/broctl/plugins/lb_pf_ring.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/plugins/lb_pf_ring.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/plugins/lb_pf_ring.pyc
 %%BROCTL%%lib/broctl/plugins/ps.py
-%%BROCTL%%@unexec rm -f %D/lib/broctl/plugins/ps.pyc
+%%BROCTL%%@preunexec rm -f %D/lib/broctl/plugins/ps.pyc
+%%BROKER%%lib/broctl/pybroker.py
+%%BROKER%%@preunexec rm -f %D/lib/broctl/pybroker.pyc
 %%BROKER%%lib/libbroker.so
 %%BROKER%%lib/libbroker.so.0
-%%BROKER%%lib/libbroker.so.0.4.0
+%%BROKER%%lib/libbroker.so.0.7.0
 man/man1/bro-cut.1.gz
 %%BROCTL%%man/man1/trace-summary.1.gz
 man/man8/bro.8.gz
@@ -133,7 +143,6 @@ 
 %%DATADIR%%/base/bif/messaging.bif.bro
 %%DATADIR%%/base/bif/pcap.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_ARP.events.bif.bro
-%%DATADIR%%/base/bif/plugins/Bro_AYIYA.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_AsciiReader.ascii.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_AsciiWriter.ascii.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_BackDoor.events.bif.bro
@@ -142,7 +151,9 @@ 
 %%DATADIR%%/base/bif/plugins/Bro_BitTorrent.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_ConnSize.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_ConnSize.functions.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_DCE_RPC.consts.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_DCE_RPC.events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_DCE_RPC.types.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_DHCP.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_DNP3.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_DNS.events.bif.bro
@@ -149,15 +160,18 @@ 
 %%DATADIR%%/base/bif/plugins/Bro_FTP.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_FTP.functions.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_File.events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_FileEntropy.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_FileExtract.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_FileExtract.functions.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_FileHash.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_Finger.events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_GSSAPI.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_GTPv1.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_Gnutella.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_HTTP.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_HTTP.functions.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_ICMP.events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_IMAP.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_IRC.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_Ident.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_InterConn.events.bif.bro
@@ -169,20 +183,51 @@ 
 %%DATADIR%%/base/bif/plugins/Bro_Modbus.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_MySQL.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_NCP.events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_NTLM.events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_NTLM.types.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_NTP.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_NetBIOS.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_NetBIOS.functions.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_NoneWriter.none.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_PE.events.bif.bro
-%%DATADIR%%/base/bif/plugins/Bro_PIA.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_POP3.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_RADIUS.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_RDP.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_RDP.types.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_RFB.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_RPC.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_RawReader.raw.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_SIP.events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.consts.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_SMB.events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_check_directory.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_close.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_create_directory.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_echo.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_logoff_andx.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_negotiate.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_nt_cancel.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_nt_create_andx.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_query_information.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_read_andx.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_session_setup_andx.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_transaction.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_transaction2.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_tree_connect_andx.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_tree_disconnect.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_com_write_andx.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb1_events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb2_com_close.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb2_com_create.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb2_com_negotiate.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb2_com_read.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb2_com_session_setup.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb2_com_set_info.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb2_com_tree_connect.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb2_com_tree_disconnect.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb2_com_write.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.smb2_events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SMB.types.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_SMTP.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_SMTP.functions.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_SNMP.events.bif.bro
@@ -193,6 +238,8 @@ 
 %%DATADIR%%/base/bif/plugins/Bro_SSH.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_SSH.types.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_SSL.events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SSL.functions.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_SSL.types.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_SteppingStone.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_Syslog.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_TCP.events.bif.bro
@@ -204,9 +251,10 @@ 
 %%DATADIR%%/base/bif/plugins/Bro_X509.events.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_X509.functions.bif.bro
 %%DATADIR%%/base/bif/plugins/Bro_X509.types.bif.bro
-%%DATADIR%%/base/bif/plugins/Bro_ZIP.events.bif.bro
+%%DATADIR%%/base/bif/plugins/Bro_XMPP.events.bif.bro
 %%DATADIR%%/base/bif/plugins/__load__.bro
 %%DATADIR%%/base/bif/reporter.bif.bro
+%%DATADIR%%/base/bif/stats.bif.bro
 %%DATADIR%%/base/bif/store.bif.bro
 %%DATADIR%%/base/bif/strings.bif.bro
 %%DATADIR%%/base/bif/top-k.bif.bro
@@ -226,8 +274,10 @@ 
 %%DATADIR%%/base/frameworks/analyzer/main.bro
 %%DATADIR%%/base/frameworks/broker/__load__.bro
 %%DATADIR%%/base/frameworks/broker/main.bro
+%%DATADIR%%/base/frameworks/broker/store.bro
 %%DATADIR%%/base/frameworks/cluster/__load__.bro
 %%DATADIR%%/base/frameworks/cluster/main.bro
+%%DATADIR%%/base/frameworks/cluster/nodes/logger.bro
 %%DATADIR%%/base/frameworks/cluster/nodes/manager.bro
 %%DATADIR%%/base/frameworks/cluster/nodes/proxy.bro
 %%DATADIR%%/base/frameworks/cluster/nodes/worker.bro
@@ -258,6 +308,7 @@ 
 %%DATADIR%%/base/frameworks/input/readers/sqlite.bro
 %%DATADIR%%/base/frameworks/intel/__load__.bro
 %%DATADIR%%/base/frameworks/intel/cluster.bro
+%%DATADIR%%/base/frameworks/intel/files.bro
 %%DATADIR%%/base/frameworks/intel/input.bro
 %%DATADIR%%/base/frameworks/intel/main.bro
 %%DATADIR%%/base/frameworks/logging/__load__.bro
@@ -268,6 +319,21 @@ 
 %%DATADIR%%/base/frameworks/logging/writers/ascii.bro
 %%DATADIR%%/base/frameworks/logging/writers/none.bro
 %%DATADIR%%/base/frameworks/logging/writers/sqlite.bro
+%%DATADIR%%/base/frameworks/netcontrol/__load__.bro
+%%DATADIR%%/base/frameworks/netcontrol/catch-and-release.bro
+%%DATADIR%%/base/frameworks/netcontrol/cluster.bro
+%%DATADIR%%/base/frameworks/netcontrol/drop.bro
+%%DATADIR%%/base/frameworks/netcontrol/main.bro
+%%DATADIR%%/base/frameworks/netcontrol/non-cluster.bro
+%%DATADIR%%/base/frameworks/netcontrol/plugin.bro
+%%DATADIR%%/base/frameworks/netcontrol/plugins/__load__.bro
+%%DATADIR%%/base/frameworks/netcontrol/plugins/acld.bro
+%%DATADIR%%/base/frameworks/netcontrol/plugins/broker.bro
+%%DATADIR%%/base/frameworks/netcontrol/plugins/debug.bro
+%%DATADIR%%/base/frameworks/netcontrol/plugins/openflow.bro
+%%DATADIR%%/base/frameworks/netcontrol/plugins/packetfilter.bro
+%%DATADIR%%/base/frameworks/netcontrol/shunt.bro
+%%DATADIR%%/base/frameworks/netcontrol/types.bro
 %%DATADIR%%/base/frameworks/notice/__load__.bro
 %%DATADIR%%/base/frameworks/notice/actions/add-geodata.bro
 %%DATADIR%%/base/frameworks/notice/actions/drop.bro
@@ -279,6 +345,16 @@ 
 %%DATADIR%%/base/frameworks/notice/main.bro
 %%DATADIR%%/base/frameworks/notice/non-cluster.bro
 %%DATADIR%%/base/frameworks/notice/weird.bro
+%%DATADIR%%/base/frameworks/openflow/__load__.bro
+%%DATADIR%%/base/frameworks/openflow/cluster.bro
+%%DATADIR%%/base/frameworks/openflow/consts.bro
+%%DATADIR%%/base/frameworks/openflow/main.bro
+%%DATADIR%%/base/frameworks/openflow/non-cluster.bro
+%%DATADIR%%/base/frameworks/openflow/plugins/__load__.bro
+%%DATADIR%%/base/frameworks/openflow/plugins/broker.bro
+%%DATADIR%%/base/frameworks/openflow/plugins/log.bro
+%%DATADIR%%/base/frameworks/openflow/plugins/ryu.bro
+%%DATADIR%%/base/frameworks/openflow/types.bro
 %%DATADIR%%/base/frameworks/packet-filter/__load__.bro
 %%DATADIR%%/base/frameworks/packet-filter/cluster.bro
 %%DATADIR%%/base/frameworks/packet-filter/main.bro
@@ -313,6 +389,7 @@ 
 %%DATADIR%%/base/misc/find-checksum-offloading.bro
 %%DATADIR%%/base/misc/find-filtered-trace.bro
 %%DATADIR%%/base/misc/p0f.fp
+%%DATADIR%%/base/misc/version.bro
 %%DATADIR%%/base/protocols/conn/__load__.bro
 %%DATADIR%%/base/protocols/conn/contents.bro
 %%DATADIR%%/base/protocols/conn/inactivity.bro
@@ -319,6 +396,10 @@ 
 %%DATADIR%%/base/protocols/conn/main.bro
 %%DATADIR%%/base/protocols/conn/polling.bro
 %%DATADIR%%/base/protocols/conn/thresholds.bro
+%%DATADIR%%/base/protocols/dce-rpc/__load__.bro
+%%DATADIR%%/base/protocols/dce-rpc/consts.bro
+%%DATADIR%%/base/protocols/dce-rpc/dpd.sig
+%%DATADIR%%/base/protocols/dce-rpc/main.bro
 %%DATADIR%%/base/protocols/dhcp/__load__.bro
 %%DATADIR%%/base/protocols/dhcp/consts.bro
 %%DATADIR%%/base/protocols/dhcp/dpd.sig
@@ -345,6 +426,8 @@ 
 %%DATADIR%%/base/protocols/http/files.bro
 %%DATADIR%%/base/protocols/http/main.bro
 %%DATADIR%%/base/protocols/http/utils.bro
+%%DATADIR%%/base/protocols/imap/__load__.bro
+%%DATADIR%%/base/protocols/imap/main.bro
 %%DATADIR%%/base/protocols/irc/__load__.bro
 %%DATADIR%%/base/protocols/irc/dcc-send.bro
 %%DATADIR%%/base/protocols/irc/dpd.sig
@@ -361,6 +444,8 @@ 
 %%DATADIR%%/base/protocols/mysql/__load__.bro
 %%DATADIR%%/base/protocols/mysql/consts.bro
 %%DATADIR%%/base/protocols/mysql/main.bro
+%%DATADIR%%/base/protocols/ntlm/__load__.bro
+%%DATADIR%%/base/protocols/ntlm/main.bro
 %%DATADIR%%/base/protocols/pop3/__load__.bro
 %%DATADIR%%/base/protocols/pop3/dpd.sig
 %%DATADIR%%/base/protocols/radius/__load__.bro
@@ -370,9 +455,16 @@ 
 %%DATADIR%%/base/protocols/rdp/consts.bro
 %%DATADIR%%/base/protocols/rdp/dpd.sig
 %%DATADIR%%/base/protocols/rdp/main.bro
+%%DATADIR%%/base/protocols/rfb/__load__.bro
+%%DATADIR%%/base/protocols/rfb/dpd.sig
+%%DATADIR%%/base/protocols/rfb/main.bro
 %%DATADIR%%/base/protocols/sip/__load__.bro
 %%DATADIR%%/base/protocols/sip/dpd.sig
 %%DATADIR%%/base/protocols/sip/main.bro
+%%DATADIR%%/base/protocols/smb/__load__.bro
+%%DATADIR%%/base/protocols/smb/const-dos-error.bro
+%%DATADIR%%/base/protocols/smb/const-nt-status.bro
+%%DATADIR%%/base/protocols/smb/consts.bro
 %%DATADIR%%/base/protocols/smtp/__load__.bro
 %%DATADIR%%/base/protocols/smtp/dpd.sig
 %%DATADIR%%/base/protocols/smtp/entities.bro
@@ -398,13 +490,19 @@ 
 %%DATADIR%%/base/protocols/syslog/main.bro
 %%DATADIR%%/base/protocols/tunnels/__load__.bro
 %%DATADIR%%/base/protocols/tunnels/dpd.sig
+%%DATADIR%%/base/protocols/xmpp/__load__.bro
+%%DATADIR%%/base/protocols/xmpp/dpd.sig
+%%DATADIR%%/base/protocols/xmpp/main.bro
 %%DATADIR%%/base/utils/active-http.bro
 %%DATADIR%%/base/utils/addrs.bro
 %%DATADIR%%/base/utils/conn-ids.bro
 %%DATADIR%%/base/utils/dir.bro
 %%DATADIR%%/base/utils/directions-and-hosts.bro
+%%DATADIR%%/base/utils/email.bro
 %%DATADIR%%/base/utils/exec.bro
 %%DATADIR%%/base/utils/files.bro
+%%DATADIR%%/base/utils/geoip-distance.bro
+%%DATADIR%%/base/utils/json.bro
 %%DATADIR%%/base/utils/numbers.bro
 %%DATADIR%%/base/utils/paths.bro
 %%DATADIR%%/base/utils/patterns.bro
@@ -428,8 +526,10 @@ 
 %%DATADIR%%/policy/frameworks/dpd/detect-protocols.bro
 %%DATADIR%%/policy/frameworks/dpd/packet-segment-logging.bro
 %%DATADIR%%/policy/frameworks/files/detect-MHR.bro
+%%DATADIR%%/policy/frameworks/files/entropy-test-all-files.bro
 %%DATADIR%%/policy/frameworks/files/extract-all-files.bro
 %%DATADIR%%/policy/frameworks/files/hash-all-files.bro
+%%DATADIR%%/policy/frameworks/intel/do_expire.bro
 %%DATADIR%%/policy/frameworks/intel/do_notice.bro
 %%DATADIR%%/policy/frameworks/intel/seen/__load__.bro
 %%DATADIR%%/policy/frameworks/intel/seen/conn-established.bro
@@ -444,6 +544,7 @@ 
 %%DATADIR%%/policy/frameworks/intel/seen/ssl.bro
 %%DATADIR%%/policy/frameworks/intel/seen/where-locations.bro
 %%DATADIR%%/policy/frameworks/intel/seen/x509.bro
+%%DATADIR%%/policy/frameworks/intel/whitelist.bro
 %%DATADIR%%/policy/frameworks/packet-filter/shunt.bro
 %%DATADIR%%/policy/frameworks/signatures/detect-windows-shells.sig
 %%DATADIR%%/policy/frameworks/software/version-changes.bro
@@ -454,15 +555,6 @@ 
 %%DATADIR%%/policy/integration/barnyard2/types.bro
 %%DATADIR%%/policy/integration/collective-intel/__load__.bro
 %%DATADIR%%/policy/integration/collective-intel/main.bro
-%%DATADIR%%/policy/misc/app-stats/__load__.bro
-%%DATADIR%%/policy/misc/app-stats/main.bro
-%%DATADIR%%/policy/misc/app-stats/plugins/__load__.bro
-%%DATADIR%%/policy/misc/app-stats/plugins/facebook.bro
-%%DATADIR%%/policy/misc/app-stats/plugins/gmail.bro
-%%DATADIR%%/policy/misc/app-stats/plugins/google.bro
-%%DATADIR%%/policy/misc/app-stats/plugins/netflix.bro
-%%DATADIR%%/policy/misc/app-stats/plugins/pandora.bro
-%%DATADIR%%/policy/misc/app-stats/plugins/youtube.bro
 %%DATADIR%%/policy/misc/capture-loss.bro
 %%DATADIR%%/policy/misc/detect-traceroute/__load__.bro
 %%DATADIR%%/policy/misc/detect-traceroute/detect-low-ttls.sig
@@ -477,6 +569,8 @@ 
 %%DATADIR%%/policy/misc/trim-trace-file.bro
 %%DATADIR%%/policy/protocols/conn/known-hosts.bro
 %%DATADIR%%/policy/protocols/conn/known-services.bro
+%%DATADIR%%/policy/protocols/conn/mac-logging.bro
+%%DATADIR%%/policy/protocols/conn/vlan-logging.bro
 %%DATADIR%%/policy/protocols/conn/weirds.bro
 %%DATADIR%%/policy/protocols/dhcp/known-devices-and-hostnames.bro
 %%DATADIR%%/policy/protocols/dns/auth-addl.bro
@@ -492,10 +586,17 @@ 
 %%DATADIR%%/policy/protocols/http/software.bro
 %%DATADIR%%/policy/protocols/http/var-extraction-cookies.bro
 %%DATADIR%%/policy/protocols/http/var-extraction-uri.bro
+%%DATADIR%%/policy/protocols/krb/ticket-logging.bro
 %%DATADIR%%/policy/protocols/modbus/known-masters-slaves.bro
 %%DATADIR%%/policy/protocols/modbus/track-memmap.bro
 %%DATADIR%%/policy/protocols/mysql/software.bro
 %%DATADIR%%/policy/protocols/rdp/indicate_ssl.bro
+%%DATADIR%%/policy/protocols/smb/__load__.bro
+%%DATADIR%%/policy/protocols/smb/dpd.sig
+%%DATADIR%%/policy/protocols/smb/files.bro
+%%DATADIR%%/policy/protocols/smb/main.bro
+%%DATADIR%%/policy/protocols/smb/smb1-main.bro
+%%DATADIR%%/policy/protocols/smb/smb2-main.bro
 %%DATADIR%%/policy/protocols/smtp/blocklists.bro
 %%DATADIR%%/policy/protocols/smtp/detect-suspicious-orig.bro
 %%DATADIR%%/policy/protocols/smtp/entities-excerpt.bro
@@ -520,6 +621,7 @@ 
 %%DATADIR%%/policy/tuning/defaults/warnings.bro
 %%DATADIR%%/policy/tuning/json-logs.bro
 %%DATADIR%%/policy/tuning/track-all-assets.bro
+%%DATADIR%%/site/local-logger.bro
 %%DATADIR%%/site/local-manager.bro
 %%DATADIR%%/site/local-proxy.bro
 %%DATADIR%%/site/local-worker.bro
@@ -526,10 +628,10 @@ 
 %%DATADIR%%/site/local.bro
 %%BROCTL%%%%DATADIR%%ctl/scripts/archive-log
 %%BROCTL%%%%DATADIR%%ctl/scripts/broctl-config.sh
-%%BROCTL%%%%DATADIR%%ctl/scripts/cflow-stats
 %%BROCTL%%%%DATADIR%%ctl/scripts/check-config
 %%BROCTL%%%%DATADIR%%ctl/scripts/crash-diag
 %%BROCTL%%%%DATADIR%%ctl/scripts/delete-log
+%%BROCTL%%%%DATADIR%%ctl/scripts/expire-crash
 %%BROCTL%%%%DATADIR%%ctl/scripts/expire-logs
 %%BROCTL%%%%DATADIR%%ctl/scripts/helpers/check-pid
 %%BROCTL%%%%DATADIR%%ctl/scripts/helpers/df
@@ -548,17 +650,17 @@ 
 %%BROCTL%%%%DATADIR%%ctl/scripts/set-bro-path
 %%BROCTL%%%%DATADIR%%ctl/scripts/stats-to-csv
 %%BROCTL%%%%DATADIR%%ctl/scripts/update
-%%BROCTL%%@unexec rm -f %D/logs/current
-%%BROCTL%%@unexec rm -f %D/spool/broctl-config.sh
-%%BROCTL%%@unexec rm -f %D/spool/broctl.dat
-%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/auto/broctl-config.bro
-%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/auto/local-networks.bro
-%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/auto/standalone-layout.bro
-%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-manager.bro
-%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-proxy.bro
-%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-worker.bro
-%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local.bro
-%%BROCTL%%@unexec rm -f %D/spool/state.db
+%%BROCTL%%spool/broctl-config.sh
+%%BROCTL%%@preunexec rm -f %D/logs/current
+%%BROCTL%%@preunexec rm -f %D/spool/broctl.dat
+%%BROCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/auto/broctl-config.bro
+%%BROCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/auto/local-networks.bro
+%%BROCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/auto/standalone-layout.bro
+%%BROCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-manager.bro
+%%BROCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-proxy.bro
+%%BROCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-worker.bro
+%%BROCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local.bro
+%%BROCTL%%@preunexec rm -f %D/spool/state.db
 %%BROCTL%%@dir spool/tmp
 %%BROCTL%%@dir spool/installed-scripts-do-not-touch/site
 %%BROCTL%%@dir spool/installed-scripts-do-not-touch/auto
@@ -574,9 +676,11 @@ 
 @dir %%DATADIR%%/policy/protocols/ssl
 @dir %%DATADIR%%/policy/protocols/ssh
 @dir %%DATADIR%%/policy/protocols/smtp
+@dir %%DATADIR%%/policy/protocols/smb
 @dir %%DATADIR%%/policy/protocols/rdp
 @dir %%DATADIR%%/policy/protocols/mysql
 @dir %%DATADIR%%/policy/protocols/modbus
+@dir %%DATADIR%%/policy/protocols/krb
 @dir %%DATADIR%%/policy/protocols/http
 @dir %%DATADIR%%/policy/protocols/ftp
 @dir %%DATADIR%%/policy/protocols/dns
@@ -584,8 +688,6 @@ 
 @dir %%DATADIR%%/policy/protocols/conn
 @dir %%DATADIR%%/policy/protocols
 @dir %%DATADIR%%/policy/misc/detect-traceroute
-@dir %%DATADIR%%/policy/misc/app-stats/plugins
-@dir %%DATADIR%%/policy/misc/app-stats
 @dir %%DATADIR%%/policy/misc
 @dir %%DATADIR%%/policy/integration/collective-intel
 @dir %%DATADIR%%/policy/integration/barnyard2
@@ -604,6 +706,7 @@ 
 @dir %%DATADIR%%/broxygen
 %%BROCTL%%@dir %%DATADIR%%/broctl
 @dir %%DATADIR%%/base/utils
+@dir %%DATADIR%%/base/protocols/xmpp
 @dir %%DATADIR%%/base/protocols/tunnels
 @dir %%DATADIR%%/base/protocols/syslog
 @dir %%DATADIR%%/base/protocols/ssl
@@ -611,19 +714,24 @@ 
 @dir %%DATADIR%%/base/protocols/socks
 @dir %%DATADIR%%/base/protocols/snmp
 @dir %%DATADIR%%/base/protocols/smtp
+@dir %%DATADIR%%/base/protocols/smb
 @dir %%DATADIR%%/base/protocols/sip
+@dir %%DATADIR%%/base/protocols/rfb
 @dir %%DATADIR%%/base/protocols/rdp
 @dir %%DATADIR%%/base/protocols/radius
 @dir %%DATADIR%%/base/protocols/pop3
+@dir %%DATADIR%%/base/protocols/ntlm
 @dir %%DATADIR%%/base/protocols/mysql
 @dir %%DATADIR%%/base/protocols/modbus
 @dir %%DATADIR%%/base/protocols/krb
 @dir %%DATADIR%%/base/protocols/irc
+@dir %%DATADIR%%/base/protocols/imap
 @dir %%DATADIR%%/base/protocols/http
 @dir %%DATADIR%%/base/protocols/ftp
 @dir %%DATADIR%%/base/protocols/dns
 @dir %%DATADIR%%/base/protocols/dnp3
 @dir %%DATADIR%%/base/protocols/dhcp
+@dir %%DATADIR%%/base/protocols/dce-rpc
 @dir %%DATADIR%%/base/protocols/conn
 @dir %%DATADIR%%/base/protocols
 @dir %%DATADIR%%/base/misc
@@ -634,9 +742,13 @@ 
 @dir %%DATADIR%%/base/frameworks/signatures
 @dir %%DATADIR%%/base/frameworks/reporter
 @dir %%DATADIR%%/base/frameworks/packet-filter
+@dir %%DATADIR%%/base/frameworks/openflow/plugins
+@dir %%DATADIR%%/base/frameworks/openflow
 @dir %%DATADIR%%/base/frameworks/notice/extend-email
 @dir %%DATADIR%%/base/frameworks/notice/actions
 @dir %%DATADIR%%/base/frameworks/notice
+@dir %%DATADIR%%/base/frameworks/netcontrol/plugins
+@dir %%DATADIR%%/base/frameworks/netcontrol
 @dir %%DATADIR%%/base/frameworks/logging/writers
 @dir %%DATADIR%%/base/frameworks/logging/postprocessors
 @dir %%DATADIR%%/base/frameworks/logging
@@ -663,20 +775,9 @@ 
 @dir %%DATADIR%%/base/bif
 @dir %%DATADIR%%/base
 @dir %%DATADIR%%
-%%CLEANUP_PREFIX%%@dir share
-%%CLEANUP_PREFIX%%%%BROKER%%@dir man/man8
-%%CLEANUP_PREFIX%%%%BROKER%%@dir man/man1
-%%CLEANUP_PREFIX%%%%BROKER%%@dir man
-%%BROCTL%%@dir logs
+@dir logs
 %%BROCTL%%@dir lib/broctl/plugins
 %%BROCTL%%@dir lib/broctl/BroControl
 %%BROCTL%%@dir lib/broctl
 @dir lib/bro/plugins
-%%CLEANUP_PREFIX%%@dir lib
-%%CLEANUP_PREFIX%%%%BROKER%%@dir include/broker/util
-%%CLEANUP_PREFIX%%%%BROKER%%@dir include/broker/store
-%%CLEANUP_PREFIX%%%%BROKER%%@dir include/broker
-%%CLEANUP_PREFIX%%@dir include
-%%CLEANUP_PREFIX%%@dir etc
-%%CLEANUP_PREFIX%%@dir bin
-%%BROCTL%%@exec su -fm %%BROUSER%% -c '%D/bin/broctl install'
+%%BROCTL%%@postexec su -fm %%BROUSER%% -c '%D/bin/broctl install'