Port of Vern Paxson's Bro?

Sun Oct 5 08:27:14 PDT 2003

On Sat, Oct 04, 2003 at 09:22:56PM -0400, Richard Bejtlich wrote:
> I'm happy to see Vern Paxson's Bro included in the FreeBSD ports tree. 
> I was wondering if anyone had plans to update the port to match the 
> current 0.8 or stable 0.7 release listed at
> 
> http://www.icir.org/vern/bro-info.html

OK, please test following changes.
If patch is OK - I'll commit it ASAP.

-- 

Rgdz,                        /"\  ASCII RIBBON CAMPAIGN
Sergey Osokin aka oZZ,       \ /    AGAINST HTML MAIL
http://ozz.pp.ru/             X          AND NEWS
                             / \
-------------- next part --------------
Index: ports/security/bro/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/bro/Makefile,v
retrieving revision 1.20
diff -u -u -r1.20 Makefile

--- ports/security/bro/Makefile	24 Sep 2003 09:36:57 -0000	1.20
+++ ports/security/bro/Makefile	5 Oct 2003 15:22:04 -0000
@@ -7,43 +7,30 @@
 #
 
 PORTNAME=	bro
-PORTVERSION=	0.5a
+PORTVERSION=	0.8
 CATEGORIES=	security
-#MASTER_SITES=	ftp://ee.lbl.gov/
-#see http://www-nrg.ee.lbl.gov/bro-info.html
-DISTNAME=	vp-bro-0.5-alpha
+MASTER_SITES=	ftp://ftp.ee.lbl.gov/
+DISTNAME=	${PORTNAME}-pub-${PORTVERSION}-current
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	System for detecting Network Intruders in real-time
 
-RESTRICTED=	"Author wishes Alpha releases not to be distrubted."
-
-.include <bsd.port.pre.mk>
-
-.if !exists(${DISTDIR}/vp-bro-0.5-alpha${EXTRACT_SUFX})
-IGNORE=is still in alpha test.  Please contact Vern Paxson <vern at ee.lbl.gov> to obtain the obtain the Bro source.  Put it in ${DISTDIR} as ${DISTFILES} and run make again
-.endif
-
-IS_INTERACTIVE=	"manual fetch"
-WRKSRC=		${WRKDIR}/bro-pub-0.5a1
+WRKSRC=		${WRKDIR}/${PORTNAME}-pub-${PORTVERSION}a37
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
 GNU_CONFIGURE=	yes
+USE_BISON=	yes
+USE_PERL=	yes
 
-post-patch:
-	@${MV} ${WRKSRC}/util.cc ${WRKSRC}/util.cc.in
-	@${SED} -e "s|/usr/src/rtsg/bro/policy:/usr/local/lib/bro|${PREFIX}/share/bro|" \
-		${WRKSRC}/util.cc.in >${WRKSRC}/util.cc
 pre-install:
-	@${MKDIR} ${PREFIX}/share/bro
+	@${MKDIR} ${DATADIR}
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/sbin/bro
-	@${INSTALL_DATA} ${WRKSRC}/policy/*.* ${PREFIX}/share/bro
+	@${INSTALL_DATA} ${WRKSRC}/policy/*.* ${DATADIR}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/bro
-	${INSTALL_MAN} ${WRKSRC}/doc/bro-usenix98-revised.ps \
-		${PREFIX}/share/doc/bro
-	@${GZIP_CMD} ${PREFIX}/share/doc/bro/bro-usenix98-revised.ps
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/bro-CN99.ps ${DOCSDIR}
+	@${GZIP_CMD} ${DOCSDIR}/bro-CN99.ps
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: ports/security/bro/distinfo
===================================================================
RCS file: /home/pcvs/ports/security/bro/distinfo,v
retrieving revision 1.3
diff -u -u -r1.3 distinfo
--- ports/security/bro/distinfo	13 Feb 1999 20:03:59 -0000	1.3
+++ ports/security/bro/distinfo	5 Oct 2003 15:22:20 -0000
@@ -1 +1 @@
-MD5 (vp-bro-0.5-alpha.tar.gz) = 122eef8bb0a5aba87ac56c1e1d149f97
+MD5 (bro-pub-0.8-current.tar.gz) = abf9ddc6e7086639130f2e792eca4ab3
Index: ports/security/bro/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/security/bro/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- ports/security/bro/pkg-plist	22 Nov 2000 00:17:11 -0000	1.3
+++ ports/security/bro/pkg-plist	5 Oct 2003 15:22:12 -0000
@@ -1,17 +1,83 @@
 @comment $FreeBSD: ports/security/bro/pkg-plist,v 1.3 2000/11/22 00:17:11 obrien Exp $
 sbin/bro
-share/bro/bro.init
-share/bro/analy.bro
-share/bro/dns.bro
-share/bro/finger.bro
-share/bro/ftp.bro
-share/bro/hot.bro
-share/bro/http.bro
-share/bro/mt.bro
-share/bro/port-name.bro
-share/bro/portmapper.bro
-share/bro/scan.bro
-share/bro/tcp.bro
-share/bro/telnet.bro
-share/bro/udp.bro
-share/doc/bro/bro-usenix98-revised.ps.gz
+%%DATADIR%%/active.bro
+%%DATADIR%%/alert.bro
+%%DATADIR%%/analy.bro
+%%DATADIR%%/anon.bro
+%%DATADIR%%/backdoor.bro
+%%DATADIR%%/bro.bif.bro
+%%DATADIR%%/bro.init
+%%DATADIR%%/capture-events.bro
+%%DATADIR%%/checkpoint.bro
+%%DATADIR%%/common-rw.bif.bro
+%%DATADIR%%/conn.bro
+%%DATADIR%%/const.bif.bro
+%%DATADIR%%/contents.bro
+%%DATADIR%%/demux.bro
+%%DATADIR%%/dns.bro
+%%DATADIR%%/dns-lookup.bro
+%%DATADIR%%/drop-adapt.bro
+%%DATADIR%%/event.bif.bro
+%%DATADIR%%/finger.bro
+%%DATADIR%%/finger-rw.bif.bro
+%%DATADIR%%/flag-irc.bro
+%%DATADIR%%/flag-warez.bro
+%%DATADIR%%/frag.bro
+%%DATADIR%%/ftp.bro
+%%DATADIR%%/ftp-anonymizer.bro
+%%DATADIR%%/ftp-cmd-arg.bro
+%%DATADIR%%/ftp-rw.bif.bro
+%%DATADIR%%/ftp-safe-words.bro
+%%DATADIR%%/hot.bro
+%%DATADIR%%/hot-ids.bro
+%%DATADIR%%/http.bro
+%%DATADIR%%/http-abstract.bro
+%%DATADIR%%/http-body.bro
+%%DATADIR%%/http-entity.bro
+%%DATADIR%%/http-event.bro
+%%DATADIR%%/http-header.bro
+%%DATADIR%%/http-reply.bro
+%%DATADIR%%/http-request.bro
+%%DATADIR%%/http-rewriter.bro
+%%DATADIR%%/http-rw.bif.bro
+%%DATADIR%%/icmp.bro
+%%DATADIR%%/ident-rewriter.bro
+%%DATADIR%%/ident.bro
+%%DATADIR%%/ident-rw.bif.bro
+%%DATADIR%%/inactivity.bro
+%%DATADIR%%/interconn.bro
+%%DATADIR%%/load-level.bro
+%%DATADIR%%/log.bro
+%%DATADIR%%/login.bro
+%%DATADIR%%/mime.bro
+%%DATADIR%%/mt.bro
+%%DATADIR%%/netstats.bro
+%%DATADIR%%/ntp.bro
+%%DATADIR%%/pcap.bro
+%%DATADIR%%/port-name.bro
+%%DATADIR%%/portmapper.bro
+%%DATADIR%%/print-filter.bro
+%%DATADIR%%/print-globals.bro
+%%DATADIR%%/print-resources.bro
+%%DATADIR%%/reduce-memory.bro
+%%DATADIR%%/scan.bro
+%%DATADIR%%/signatures.bro
+%%DATADIR%%/site.bro
+%%DATADIR%%/smtp-relay.bro
+%%DATADIR%%/smtp-rewriter.bro
+%%DATADIR%%/smtp.bro
+%%DATADIR%%/smtp-rw.bif.bro
+%%DATADIR%%/software.bro
+%%DATADIR%%/ssh-stepping.bro
+%%DATADIR%%/ssh.bro
+%%DATADIR%%/ssl-worm.bro
+%%DATADIR%%/stepping.bro
+%%DATADIR%%/synflood.bro
+%%DATADIR%%/tcp.bro
+%%DATADIR%%/tftp.bro
+%%DATADIR%%/udp.bro
+%%DATADIR%%/weird.bro
+%%DATADIR%%/worm.bro
+%%PORTDOCS%%%%DOCSDIR%%/bro-CN99.ps.gz
+%%PORTDOCS%%@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- /dev/null	Sun Oct  5 19:18:51 2003
+++ ports/security/bro/files/patch-Makefile.in	Sun Oct  5 19:21:49 2003
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Oct  5 18:43:09 2003
++++ Makefile.in	Sun Oct  5 18:43:23 2003
+@@ -58,7 +58,7 @@
+ YACC = @YACC@
+ YFLAGS = -d -t -v
+ LEX = @LEX@
+-INSTALL = @INSTALL@ -d
++INSTALL = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ @SET_MAKE@
+ COMPRESS = @COMPRESS@
--- /dev/null	Sun Oct  5 19:18:51 2003
+++ ports/security/bro/files/patch-Obj.cc	Sun Oct  5 19:21:49 2003
@@ -0,0 +1,11 @@
+--- Obj.cc.orig	Sun Oct  5 18:27:31 2003
++++ Obj.cc	Sun Oct  5 18:27:44 2003
+@@ -47,7 +47,7 @@
+ 	delete_data = true;
+ 
+ 	int tmp;
+-	return s->Read(&(char*) filename, &tmp) &&
++	return s->Read((char**) filename, &tmp) &&
+ 		s->Read(&first_line) && s->Read(&last_line) &&
+ 		s->Read(&first_column) && s->Read(&last_column);
+ 	}
--- /dev/null	Sun Oct  5 19:18:51 2003
+++ ports/security/bro/files/patch-patricia.h	Sun Oct  5 19:21:49 2003
@@ -0,0 +1,11 @@
+--- patricia.h.orig	Sun Oct  5 18:29:52 2003
++++ patricia.h	Sun Oct  5 18:30:05 2003
+@@ -51,6 +51,8 @@
+ #ifndef _PATRICIA_H
+ #define _PATRICIA_H
+ 
++#include <sys/types.h>
++
+ /* typedef unsigned int u_int; */
+ typedef void (*void_fn_t)();
+ /* { from defs.h */
