diff -r -c bro-pub-0.8a20/Active.cc bro-pub-0.8a20.patched/Active.cc
*** bro-pub-0.8a20/Active.cc	Fri Nov  1 06:29:27 2002
--- bro-pub-0.8a20.patched/Active.cc	Fri May 30 17:46:48 2003
***************
*** 9,22 ****
  
  #include <arpa/inet.h>
  
! #include <hash_map>
  
  #include "Active.h"
  #include "util.h"
  
! typedef hash_map< const char *, string, hash<const char *>, eqstr > MachineMap;
! typedef hash_map< uint32, MachineMap * > ActiveMap;
! typedef hash_map< uint32, NumericData * > ActiveMapNumeric;
  
  static ActiveMap active_map;
  static ActiveMapNumeric active_map_numeric;
--- 9,23 ----
  
  #include <arpa/inet.h>
  
! #include <ext/hash_map>
! namespace foo_bro = ::__gnu_cxx;
  
  #include "Active.h"
  #include "util.h"
  
! typedef foo_bro::hash_map< const char *, string, foo_bro::hash<const char *>, eqstr > MachineMap;
! typedef foo_bro::hash_map< uint32, MachineMap * > ActiveMap;
! typedef foo_bro::hash_map< uint32, NumericData * > ActiveMapNumeric;
  
  static ActiveMap active_map;
  static ActiveMapNumeric active_map_numeric;
***************
*** 81,87 ****
  	return s;
  	}
  
! hash_map < const char *, ReassemblyPolicy, hash<const char *>, eqstr > reassem_names;
  
  // Remember to index the table with IP address in network order!
  bool load_mapping_table(const char* map_file)
--- 82,88 ----
  	return s;
  	}
  
! foo_bro::hash_map < const char *, ReassemblyPolicy, foo_bro::hash<const char *>, eqstr > reassem_names;
  
  // Remember to index the table with IP address in network order!
  bool load_mapping_table(const char* map_file)
diff -r -c bro-pub-0.8a20/Anon.h bro-pub-0.8a20.patched/Anon.h
*** bro-pub-0.8a20/Anon.h	Sat Oct 26 06:16:11 2002
--- bro-pub-0.8a20.patched/Anon.h	Fri May 30 17:46:48 2003
***************
*** 13,18 ****
--- 13,19 ----
  #define anon_h
  
  #include <vector>
+ using namespace std;
  #include "net_util.h"
  
  enum anonymization_method_t {
diff -r -c bro-pub-0.8a20/Debug.cc bro-pub-0.8a20.patched/Debug.cc
*** bro-pub-0.8a20/Debug.cc	Sun Oct 27 19:51:50 2002
--- bro-pub-0.8a20.patched/Debug.cc	Fri May 30 17:46:48 2003
***************
*** 22,27 ****
--- 22,30 ----
  #include "Scope.h"
  #include "PolicyFile.h"
  
+ // isspace ...
+ #include <ctype.h>
+ 
  bool g_policy_debug = false;
  DebuggerState g_debugger_state;
  TraceState g_trace_state;
diff -r -c bro-pub-0.8a20/DebugCmds.cc bro-pub-0.8a20.patched/DebugCmds.cc
*** bro-pub-0.8a20/DebugCmds.cc	Fri Oct 11 04:02:04 2002
--- bro-pub-0.8a20.patched/DebugCmds.cc	Fri May 30 17:46:48 2003
***************
*** 161,167 ****
  		for ( int j = 0; j < g_DebugCmdInfos[i]->NumNames(); ++j )
  			{
  			const char* curr_name = g_DebugCmdInfos[i]->Names()[j];
! 			if ( prefix.compare(curr_name, 0, arglen) )
  				continue;
  
  			// If exact match, then only return that one.
--- 161,168 ----
  		for ( int j = 0; j < g_DebugCmdInfos[i]->NumNames(); ++j )
  			{
  			const char* curr_name = g_DebugCmdInfos[i]->Names()[j];
! 			// if ( prefix.compare(curr_name, 0, arglen) )
! 			if ( prefix.compare(arglen, 0, curr_name) )
  				continue;
  
  			// If exact match, then only return that one.
diff -r -c bro-pub-0.8a20/Makefile.in bro-pub-0.8a20.patched/Makefile.in
*** bro-pub-0.8a20/Makefile.in	Thu Oct 24 08:31:56 2002
--- bro-pub-0.8a20.patched/Makefile.in	Fri May 30 17:46:48 2003
***************
*** 48,54 ****
  LIBEDIT_LIBS = -Llibedit -ltermcap -ledit
  
  LFLAGS = -s
! LIBS = $(LIBEDIT_LIBS) @LIBS@ -lm
  
  # Purify barfs when c++ is used for $(CPLUS).
  PURIFY_CPLUS = g++
--- 48,54 ----
  LIBEDIT_LIBS = -Llibedit -ltermcap -ledit
  
  LFLAGS = -s
! LIBS = $(LIBEDIT_LIBS) @LIBS@ -lm -lcurses /usr/lib/libresolv.a
  
  # Purify barfs when c++ is used for $(CPLUS).
  PURIFY_CPLUS = g++
diff -r -c bro-pub-0.8a20/Type.h bro-pub-0.8a20.patched/Type.h
*** bro-pub-0.8a20/Type.h	Fri Oct 18 18:08:23 2002
--- bro-pub-0.8a20.patched/Type.h	Fri May 30 17:46:48 2003
***************
*** 27,33 ****
  #include "BroList.h"
  #include "Dict.h"
  #include <map>
! 
  // BRO types.
  
  typedef enum {
--- 27,33 ----
  #include "BroList.h"
  #include "Dict.h"
  #include <map>
! using namespace std;
  // BRO types.
  
  typedef enum {
Only in bro-pub-0.8a20.patched/aux/cf: Makefile
Only in bro-pub-0.8a20.patched: bif_lex.cc
Only in bro-pub-0.8a20.patched: bif_parse.cc
Only in bro-pub-0.8a20.patched: bif_parse.h
diff -r -c bro-pub-0.8a20/builtin-func.y bro-pub-0.8a20.patched/builtin-func.y
*** bro-pub-0.8a20/builtin-func.y	Fri Oct 18 18:08:43 2002
--- bro-pub-0.8a20.patched/builtin-func.y	Fri May 30 17:52:01 2003
***************
*** 6,11 ****
--- 6,12 ----
  extern int line_number;
  extern char* input_filename;
  
+ using namespace std;
  #define print_line_directive(fp) fprintf(fp, "\n#line %d \"%s\"\n", line_number, input_filename)
  
  extern FILE* fp_bro_init;
diff -r -c bro-pub-0.8a20/configure bro-pub-0.8a20.patched/configure
*** bro-pub-0.8a20/configure	Sat Nov  9 20:48:12 2002
--- bro-pub-0.8a20.patched/configure	Fri May 30 17:46:48 2003
***************
*** 4682,4688 ****
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lresolv  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
--- 4682,4689 ----
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! # LIBS="-lresolv  $LIBS"
! LIBS="$LIBS /usr/lib/libresolv.a"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
***************
*** 4735,4742 ****
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBRESOLV 1
  _ACEOF
! 
!   LIBS="-lresolv $LIBS"
  
  fi
  
--- 4736,4744 ----
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBRESOLV 1
  _ACEOF
!   
!   # bad, i know
!   LIBS="$LIBS -lcurses /usr/lib/libresolv.a"
  
  fi
  
Only in bro-pub-0.8a20.patched: parse.y