Index: head/security/bro/Makefile =================================================================== --- head/security/bro/Makefile (revision 308121) +++ head/security/bro/Makefile (revision 308122) @@ -1,51 +1,60 @@ # Created by: David O'Brien # $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 BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS= GeoIP:${PORTSDIR}/net/GeoIP USE_PERL5= yes USE_CMAKE= yes 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 + +.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 .if ${PORT_OPTIONS:MLBL_HF} RUN_DEPENDS+= hf:${PORTSDIR}/sysutils/lbl-hf .endif .if ${PORT_OPTIONS:MLBL_CF} RUN_DEPENDS+= cf:${PORTSDIR}/sysutils/lbl-cf .endif .if ${PORT_OPTIONS:MASSERT} CMAKE_ARGS+= -DENABLE_DEBUG:BOOL=ON .endif post-patch: # avoid installing .in header file ${REINPLACE_CMD} -e '13d' ${WRKSRC}/aux/binpac/lib/CMakeLists.txt .include Index: head/security/bro/distinfo =================================================================== --- head/security/bro/distinfo (revision 308121) +++ head/security/bro/distinfo (revision 308122) @@ -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 Index: head/security/bro/pkg-plist =================================================================== --- head/security/bro/pkg-plist (revision 308121) +++ head/security/bro/pkg-plist (revision 308122) @@ -1,220 +1,245 @@ @comment $FreeBSD$ bin/binpac bin/bro include/binpac.h include/binpac_analyzer.h 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 %%DATADIR%%/base/frameworks/cluster/__load__.bro %%DATADIR%%/base/frameworks/cluster/main.bro %%DATADIR%%/base/frameworks/cluster/nodes/manager.bro %%DATADIR%%/base/frameworks/cluster/nodes/proxy.bro %%DATADIR%%/base/frameworks/cluster/nodes/worker.bro %%DATADIR%%/base/frameworks/cluster/setup-connections.bro %%DATADIR%%/base/frameworks/communication/__load__.bro %%DATADIR%%/base/frameworks/communication/main.bro %%DATADIR%%/base/frameworks/control/__load__.bro %%DATADIR%%/base/frameworks/control/main.bro %%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 %%DATADIR%%/base/frameworks/logging/main.bro %%DATADIR%%/base/frameworks/logging/postprocessors/__load__.bro %%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 %%DATADIR%%/base/frameworks/metrics/non-cluster.bro %%DATADIR%%/base/frameworks/notice/__load__.bro %%DATADIR%%/base/frameworks/notice/actions/add-geodata.bro %%DATADIR%%/base/frameworks/notice/actions/drop.bro %%DATADIR%%/base/frameworks/notice/actions/email_admin.bro %%DATADIR%%/base/frameworks/notice/actions/page.bro %%DATADIR%%/base/frameworks/notice/actions/pp-alarms.bro %%DATADIR%%/base/frameworks/notice/cluster.bro %%DATADIR%%/base/frameworks/notice/extend-email/hostnames.bro %%DATADIR%%/base/frameworks/notice/main.bro %%DATADIR%%/base/frameworks/notice/weird.bro %%DATADIR%%/base/frameworks/packet-filter/__load__.bro %%DATADIR%%/base/frameworks/packet-filter/main.bro %%DATADIR%%/base/frameworks/packet-filter/netstats.bro %%DATADIR%%/base/frameworks/reporter/__load__.bro %%DATADIR%%/base/frameworks/reporter/main.bro %%DATADIR%%/base/frameworks/signatures/__load__.bro %%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 %%DATADIR%%/base/protocols/conn/contents.bro %%DATADIR%%/base/protocols/conn/inactivity.bro %%DATADIR%%/base/protocols/conn/main.bro %%DATADIR%%/base/protocols/dns/__load__.bro %%DATADIR%%/base/protocols/dns/consts.bro %%DATADIR%%/base/protocols/dns/main.bro %%DATADIR%%/base/protocols/ftp/__load__.bro %%DATADIR%%/base/protocols/ftp/file-extract.bro %%DATADIR%%/base/protocols/ftp/main.bro %%DATADIR%%/base/protocols/ftp/utils-commands.bro %%DATADIR%%/base/protocols/http/__load__.bro %%DATADIR%%/base/protocols/http/file-extract.bro %%DATADIR%%/base/protocols/http/file-hash.bro %%DATADIR%%/base/protocols/http/file-ident.bro %%DATADIR%%/base/protocols/http/file-ident.sig %%DATADIR%%/base/protocols/http/main.bro %%DATADIR%%/base/protocols/http/utils.bro %%DATADIR%%/base/protocols/irc/__load__.bro %%DATADIR%%/base/protocols/irc/dcc-send.bro %%DATADIR%%/base/protocols/irc/main.bro %%DATADIR%%/base/protocols/smtp/__load__.bro %%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 %%DATADIR%%/base/protocols/ssl/consts.bro %%DATADIR%%/base/protocols/ssl/main.bro %%DATADIR%%/base/protocols/ssl/mozilla-ca-list.bro %%DATADIR%%/base/protocols/syslog/__load__.bro %%DATADIR%%/base/protocols/syslog/consts.bro %%DATADIR%%/base/protocols/syslog/main.bro %%DATADIR%%/base/reporter.bif.bro %%DATADIR%%/base/strings.bif.bro %%DATADIR%%/base/types.bif.bro %%DATADIR%%/base/utils/addrs.bro %%DATADIR%%/base/utils/conn-ids.bro %%DATADIR%%/base/utils/directions-and-hosts.bro %%DATADIR%%/base/utils/files.bro %%DATADIR%%/base/utils/numbers.bro %%DATADIR%%/base/utils/paths.bro %%DATADIR%%/base/utils/patterns.bro %%DATADIR%%/base/utils/site.bro %%DATADIR%%/base/utils/strings.bro %%DATADIR%%/base/utils/thresholds.bro %%DATADIR%%/policy/frameworks/communication/listen.bro %%DATADIR%%/policy/frameworks/control/controllee.bro %%DATADIR%%/policy/frameworks/control/controller.bro %%DATADIR%%/policy/frameworks/dpd/detect-protocols.bro %%DATADIR%%/policy/frameworks/dpd/packet-segment-logging.bro %%DATADIR%%/policy/frameworks/metrics/conn-example.bro %%DATADIR%%/policy/frameworks/metrics/http-example.bro %%DATADIR%%/policy/frameworks/metrics/ssl-example.bro %%DATADIR%%/policy/frameworks/signatures/detect-windows-shells.sig %%DATADIR%%/policy/frameworks/software/version-changes.bro %%DATADIR%%/policy/frameworks/software/vulnerable.bro %%DATADIR%%/policy/integration/barnyard2/__load__.bro %%DATADIR%%/policy/integration/barnyard2/main.bro %%DATADIR%%/policy/integration/barnyard2/types.bro %%DATADIR%%/policy/misc/analysis-groups.bro %%DATADIR%%/policy/misc/capture-loss.bro %%DATADIR%%/policy/misc/loaded-scripts.bro %%DATADIR%%/policy/misc/profiling.bro %%DATADIR%%/policy/misc/stats.bro %%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/weirds.bro %%DATADIR%%/policy/protocols/dns/auth-addl.bro %%DATADIR%%/policy/protocols/dns/detect-external-names.bro %%DATADIR%%/policy/protocols/ftp/detect.bro %%DATADIR%%/policy/protocols/ftp/software.bro %%DATADIR%%/policy/protocols/http/detect-MHR.bro %%DATADIR%%/policy/protocols/http/detect-intel.bro %%DATADIR%%/policy/protocols/http/detect-sqli.bro %%DATADIR%%/policy/protocols/http/detect-webapps.bro %%DATADIR%%/policy/protocols/http/detect-webapps.sig %%DATADIR%%/policy/protocols/http/header-names.bro %%DATADIR%%/policy/protocols/http/software-browser-plugins.bro %%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/smtp/blocklists.bro %%DATADIR%%/policy/protocols/smtp/detect-suspicious-orig.bro %%DATADIR%%/policy/protocols/smtp/software.bro %%DATADIR%%/policy/protocols/ssh/detect-bruteforcing.bro %%DATADIR%%/policy/protocols/ssh/geo-data.bro %%DATADIR%%/policy/protocols/ssh/interesting-hostnames.bro %%DATADIR%%/policy/protocols/ssh/software.bro %%DATADIR%%/policy/protocols/ssl/cert-hash.bro %%DATADIR%%/policy/protocols/ssl/expiring-certs.bro %%DATADIR%%/policy/protocols/ssl/extract-certs-pem.bro %%DATADIR%%/policy/protocols/ssl/known-certs.bro %%DATADIR%%/policy/protocols/ssl/validate-certs.bro %%DATADIR%%/policy/tuning/__load__.bro %%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 @dirrm %%DATADIR%%/policy/protocols/ssh @dirrm %%DATADIR%%/policy/protocols/smtp @dirrm %%DATADIR%%/policy/protocols/http @dirrm %%DATADIR%%/policy/protocols/ftp @dirrm %%DATADIR%%/policy/protocols/dns @dirrm %%DATADIR%%/policy/protocols/conn @dirrm %%DATADIR%%/policy/protocols @dirrm %%DATADIR%%/policy/misc @dirrm %%DATADIR%%/policy/integration/barnyard2 @dirrm %%DATADIR%%/policy/integration @dirrm %%DATADIR%%/policy/frameworks/software @dirrm %%DATADIR%%/policy/frameworks/signatures @dirrm %%DATADIR%%/policy/frameworks/metrics @dirrm %%DATADIR%%/policy/frameworks/dpd @dirrm %%DATADIR%%/policy/frameworks/control @dirrm %%DATADIR%%/policy/frameworks/communication @dirrm %%DATADIR%%/policy/frameworks @dirrm %%DATADIR%%/policy @dirrm %%DATADIR%%/base/utils @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 @dirrm %%DATADIR%%/base/protocols/ftp @dirrm %%DATADIR%%/base/protocols/dns @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 @dirrm %%DATADIR%%/base/frameworks/packet-filter @dirrm %%DATADIR%%/base/frameworks/notice/extend-email @dirrm %%DATADIR%%/base/frameworks/notice/actions @dirrm %%DATADIR%%/base/frameworks/notice @dirrm %%DATADIR%%/base/frameworks/metrics @dirrm %%DATADIR%%/base/frameworks/logging/writers @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 @dirrm %%DATADIR%%/base/frameworks/cluster/nodes @dirrm %%DATADIR%%/base/frameworks/cluster @dirrm %%DATADIR%%/base/frameworks @dirrm %%DATADIR%%/base -@dirrm %%DATADIR%%/site @dirrm %%DATADIR%%