Bug 174016

Summary: port update, security/bro && add new slave port
Product: Ports & Packages Reporter: pauls
Component: Individual Port(s)Assignee: Kevin Lo <kevlo>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.shar
none
patch-bro-submission.diff none

Description pauls 2012-11-30 16:50:00 UTC 
	port update, update security/bro to the latest version and
	add a slave port required by barnyard2
	NOTE: please cancel PR ports/173964, which I submitted on
	Wednesday, 11/28 and replace it with this one.  The maintainer
	is kevlo@FreeBSD.org, so he will need to approve these changes.

Fix: 

--- bro-barnyard2.shar ends here -----7geU5M5Jxit0zHOTeOQ59D7kUkqZVl184Nj1pNbyoSrvshEq
Content-Type: text/plain; name="bro.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="bro.diff"

Index: ../bro/Makefile
===================================================================
--- ../bro/Makefile	(revision 308018)
+++ ../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@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
@@ -26,8 +25,26 @@
 LBL_CF_DESC=	Unix time to formated time/date filter support
 OPTIONS_EXCLUDE=NLS DOCS
 
+.if defined(SLAVE)
+OPTIONS_DEFINE+=	BROCCOLI
+OPTIONS_DEFAULT+=	BROCCOLI
+BROCCOLI_DESC=	Build support for libbroccoli communications
+.endif
+
 .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 308018)
+++ ../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 308018)
+++ ../bro/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-@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
+@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
+@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
+@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
+@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 +240,4 @@
 @dirrm %%DATADIR%%/base/frameworks/cluster
 @dirrm %%DATADIR%%/base/frameworks
 @dirrm %%DATADIR%%/base
-@dirrm %%DATADIR%%/site
 @dirrm %%DATADIR%%
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-11-30 16:50:09 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->kevlo

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 pauls 2012-11-30 22:26:28 UTC 
This is a patch to the svn diff for security/bro to fix a problem with 
installing broccoli.  The ${FILESDIR} is removed along with the 
broccoli.patch file and the BRO OPTION is edited to run cmake rather than 
trying to patch the cmake_install.file.

-- 
Paul Schmehl (pauls@utdallas.edu)
Senior Information Security Analyst
The University of Texas at Dallas
http://www.utdallas.edu/infosecurity/
Comment 3 Kevin Lo freebsd_committer freebsd_triage 2012-12-03 05:21:08 UTC 
State Changed
From-To: open->closed

Committed, thanks. BTW, the patch with modifications to  
support broccoli from me.