ports/173964: port update, security/bro
Paul Schmehl
pauls at utdallas.edu
Wed Nov 28 03:00:01 UTC 2012
>Number: 173964
>Category: ports
>Synopsis: port update, security/bro
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 28 03:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Paul Schmehl
>Release: FreeBSD 8.3-STABLE amd64
>Organization:
The University of Texas at Dallas
>Environment:
System: FreeBSD hostname.utdallas.edu 8.3-STABLE FreeBSD 8.3-STABLE #2 r243378M: Wed Nov 21 22:16:38 UTC 2012 root at hostname.utdallas.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
port update, security/bro, bump version and add an
option to install broccoli libs, required for
security/barnyard2 if the option bro is selected
>How-To-Repeat:
>Fix:
--- bro.diff begins here ---
Index: ../bro/Makefile
===================================================================
--- ../bro/Makefile (revision 307875)
+++ ../bro/Makefile (working copy)
@@ -2,17 +2,16 @@
# $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 at 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
+LIB_DEPENDS= GeoIP:${PORTSDIR}/net/GeoIP \
USE_PERL5= yes
USE_CMAKE= yes
@@ -20,14 +19,27 @@
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
-OPTIONS_DEFINE= IPV6 LBL_HF LBL_CF ASSERT
+OPTIONS_DEFINE= IPV6 LBL_HF LBL_CF ASSERT BROCCOLI
OPTIONS_DEFAULT= 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}
+PLIST_SUB+= BROCCOLI=""
+pre-configure:
+ (cd ${WRKSRC}/aux/broccoli && ./configure)
+pre-build:
+ (cd ${WRKSRC}/aux/broccoli && ${MAKE})
+post-build:
+ patch ${BUILD_WRKSRC}/cmake_install.cmake ${FILESDIR}/broccoli.patch
+.else
+PLIST_SUB+= BROCCOLI="@comment "
+.endif
+
.if ${PORT_OPTIONS:MIPV6}
CMAKE_ARGS+= -DBROv6:BOOL=ON
.endif
Index: ../bro/distinfo
===================================================================
--- ../bro/distinfo (revision 307875)
+++ ../bro/distinfo (working copy)
@@ -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: ../bro/files/broccoli.patch
===================================================================
--- ../bro/files/broccoli.patch (revision 0)
+++ ../bro/files/broccoli.patch (working copy)
@@ -0,0 +1,10 @@
+--- cmake_install.cmake.orig 2012-11-28 01:39:15.000000000 +0000
++++ cmake_install.cmake 2012-11-28 01:39:46.000000000 +0000
+@@ -43,6 +43,7 @@
+ IF(NOT CMAKE_INSTALL_LOCAL_ONLY)
+ # Include the install script for each subdirectory.
+ INCLUDE("/usr/ports/security/bro-update/bro/work/bro-2.1/build/aux/binpac/cmake_install.cmake")
++ INCLUDE("/usr/ports/security/bro-update/bro/work/bro-2.1/aux/broccoli/build/src/cmake_install.cmake")
+ INCLUDE("/usr/ports/security/bro-update/bro/work/bro-2.1/build/src/cmake_install.cmake")
+ INCLUDE("/usr/ports/security/bro-update/bro/work/bro-2.1/build/scripts/cmake_install.cmake")
+ INCLUDE("/usr/ports/security/bro-update/bro/work/bro-2.1/build/doc/cmake_install.cmake")
Index: ../bro/pkg-plist
===================================================================
--- ../bro/pkg-plist (revision 307875)
+++ ../bro/pkg-plist (working copy)
@@ -1,4 +1,3 @@
- at comment $FreeBSD$
bin/binpac
bin/bro
include/binpac.h
@@ -7,7 +6,12 @@
include/binpac_bytestring.h
include/binpac_exception.h
include/binpac_regex.h
-lib/libbinpac.a
+%%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 +28,11 @@
%%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 +41,9 @@
%%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 +67,11 @@
%%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 +99,9 @@
%%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 +177,13 @@
%%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
+ at dirrm %%DATADIR%%/site
@dirrm %%DATADIR%%/policy/tuning/defaults
@dirrm %%DATADIR%%/policy/tuning
@dirrm %%DATADIR%%/policy/protocols/ssl
@@ -189,6 +209,7 @@
@dirrm %%DATADIR%%/base/protocols/syslog
@dirrm %%DATADIR%%/base/protocols/ssl
@dirrm %%DATADIR%%/base/protocols/ssh
+ at dirrm %%DATADIR%%/base/protocols/socks
@dirrm %%DATADIR%%/base/protocols/smtp
@dirrm %%DATADIR%%/base/protocols/irc
@dirrm %%DATADIR%%/base/protocols/http
@@ -197,6 +218,7 @@
@dirrm %%DATADIR%%/base/protocols/conn
@dirrm %%DATADIR%%/base/protocols
@dirrm %%DATADIR%%/base/misc
+ at dirrm %%DATADIR%%/base/frameworks/tunnels
@dirrm %%DATADIR%%/base/frameworks/software
@dirrm %%DATADIR%%/base/frameworks/signatures
@dirrm %%DATADIR%%/base/frameworks/reporter
@@ -209,6 +231,8 @@
@dirrm %%DATADIR%%/base/frameworks/logging/postprocessors
@dirrm %%DATADIR%%/base/frameworks/logging
@dirrm %%DATADIR%%/base/frameworks/intel
+ at dirrm %%DATADIR%%/base/frameworks/input/readers
+ at dirrm %%DATADIR%%/base/frameworks/input
@dirrm %%DATADIR%%/base/frameworks/dpd
@dirrm %%DATADIR%%/base/frameworks/control
@dirrm %%DATADIR%%/base/frameworks/communication
@@ -216,5 +240,4 @@
@dirrm %%DATADIR%%/base/frameworks/cluster
@dirrm %%DATADIR%%/base/frameworks
@dirrm %%DATADIR%%/base
- at dirrm %%DATADIR%%/site
@dirrm %%DATADIR%%
--- bro.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list