[Bro] new Bro CURRENT release (1.3.2)

[Vern Paxson]

Bro release 1.3.2 is now available from:

	ftp://bro-ids.org/bro-1.X-current.tar.gz

This version fixes three bugs in the recent 1.3.1 release:

	1.3.2 Tue Jul 24 13:36:27 PDT 2007

	- Bug fix for files being closed prior to bro_done() (Vern Paxson).

	- aux/broccoli/contrib was not included in distribution (Robin Sommer).

	- Auto-configuration bug fix for BinPAC (Craig Leres).

Patch appended.

		Vern

-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

diff -ru bro-1.3.1/CHANGES bro-1.3.2/CHANGES
--- bro-1.3.1/CHANGES	Fri Jul 20 09:15:37 2007
+++ bro-1.3.2/CHANGES	Sat Jul 28 18:03:59 2007
@@ -1,6 +1,15 @@
-@(#) $Id: CHANGES 4653 2007-07-20 16:05:51Z vern $
+@(#) $Id: CHANGES 4663 2007-07-28 00:37:28Z vern $
 
 -+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+1.3.2 Tue Jul 24 13:36:27 PDT 2007
+
+- Bug fix for files being closed prior to bro_done() (Vern Paxson).
+
+- aux/broccoli/contrib was not included in distribution (Robin Sommer).
+
+- Auto-configuration bug fix for BinPAC (Craig Leres).
+
 
 1.3.1 Thu Jul 19 09:39:33 PDT 2007
 
diff -ru bro-1.3.1/VERSION bro-1.3.2/VERSION
--- bro-1.3.1/VERSION	Fri Jul 20 09:15:37 2007
+++ bro-1.3.2/VERSION	Sat Jul 28 18:03:59 2007
@@ -1 +1 @@
-1.3.1
+1.3.2
diff -ru bro-1.3.1/aux/broccoli/Makefile.am bro-1.3.2/aux/broccoli/Makefile.am
--- bro-1.3.1/aux/broccoli/Makefile.am	Thu Jul  5 23:04:22 2007
+++ bro-1.3.2/aux/broccoli/Makefile.am	Sat Jul 28 18:03:59 2007
@@ -15,4 +15,4 @@
 dist_sysconf_DATA = broccoli.conf
 
 EXTRA_DIST = README AUTHORS COPYING VERSION depcomp ylwrap shtool \
-	compat/sys/queue.h test/dummysensor.c broccoli.spec
+	compat/sys/queue.h test/dummysensor.c broccoli.spec contrib
diff -ru bro-1.3.1/aux/broccoli/Makefile.in bro-1.3.2/aux/broccoli/Makefile.in
--- bro-1.3.1/aux/broccoli/Makefile.in	Fri Jul 20 09:16:40 2007
+++ bro-1.3.2/aux/broccoli/Makefile.in	Sat Jul 28 18:05:28 2007
@@ -124,7 +124,7 @@
 dist_sysconf_DATA = broccoli.conf
 
 EXTRA_DIST = README AUTHORS COPYING VERSION depcomp ylwrap shtool \
-	compat/sys/queue.h test/dummysensor.c broccoli.spec
+	compat/sys/queue.h test/dummysensor.c broccoli.spec contrib
 
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Only in bro-1.3.2/aux/broccoli: contrib
diff -ru bro-1.3.1/configure bro-1.3.2/configure
--- bro-1.3.1/configure	Fri Jul 20 09:16:24 2007
+++ bro-1.3.2/configure	Sat Jul 28 18:05:13 2007
@@ -1671,7 +1671,7 @@
 
 # Define the identity of the package.
  PACKAGE=bro
- VERSION=1.3.1
+ VERSION=1.3.2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9146,7 +9146,7 @@
 
 fi
 
-if test "$BINPAC" == ""; then
+if test "$BINPAC" = ""; then
 
 
 subdirs="$subdirs aux/binpac"
diff -ru bro-1.3.1/configure.in bro-1.3.2/configure.in
--- bro-1.3.1/configure.in	Sat Jul 14 23:09:11 2007
+++ bro-1.3.2/configure.in	Sat Jul 28 18:03:59 2007
@@ -1,4 +1,4 @@
-dnl @(#) $Id: configure.in 4628 2007-07-15 06:09:04Z vern $ (LBL)
+dnl @(#) $Id: configure.in 4663 2007-07-28 00:37:28Z vern $ (LBL)
 dnl
 dnl Copyright (c) 1997, 1998, 2001, 2002
 dnl	The Regents of the University of California.  All rights reserved.
@@ -483,7 +483,7 @@
 dnl # build, unless the user selected another binpac
 dnl # via --with-binpac=.
 dnl ################################################
-if test "$BINPAC" == ""; then
+if test "$BINPAC" = ""; then
    AC_CONFIG_SUBDIRS(aux/binpac)
    BINPAC="\${top_builddir}/aux/binpac/src/binpac"
    binpacmsg="shipped with Bro"
diff -ru bro-1.3.1/src/main.cc bro-1.3.2/src/main.cc
--- bro-1.3.1/src/main.cc	Thu Jul  5 23:04:17 2007
+++ bro-1.3.2/src/main.cc	Sat Jul 28 18:03:57 2007
@@ -1,4 +1,4 @@
-// $Id: main.cc 4613 2007-07-06 04:16:51Z vern $
+// $Id: main.cc 4657 2007-07-24 20:37:07Z vern $
 //
 // Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 //      The Regents of the University of California.  All rights reserved.
@@ -281,12 +281,12 @@
 	done_with_network();
 	net_delete();
 
+	terminate_bro();
+
 	// Close files after net_delete(), because net_delete()
 	// might write to connection content files.
 	BroFile::CloseCachedFiles();
 
-	terminate_bro();
-
 	delete rule_matcher;
 
 	exit(0);
@@ -1010,11 +1010,11 @@
 		done_with_network();
 		net_delete();
 
+		terminate_bro();
+
 		// Close files after net_delete(), because net_delete()
 		// might write to connection content files.
 		BroFile::CloseCachedFiles();
-
-		terminate_bro();
 
 #ifdef USE_MPATROL
 		fputs( "Stopping mpatrol logging...", stderr );
diff -ru bro-1.3.1/src/version.c bro-1.3.2/src/version.c
--- bro-1.3.1/src/version.c	Fri Jul 20 09:26:58 2007
+++ bro-1.3.2/src/version.c	Sat Jul 28 18:17:08 2007
@@ -1 +1 @@
-char version[] = "1.3.1";
+char version[] = "1.3.2";