From seth at icir.org  Fri Mar 28 11:22:42 2014
From: seth at icir.org (Seth Hall)
Date: Fri, 28 Mar 2014 11:22:42 -0700
Subject: [TM] [git] master: Several path-related fixes for building.
	(4926747)
Message-ID: <201403281822.s2SIMgOa002916@bro-ids.icir.org>

Repository : ssh://git at bro-ids.icir.org/time-machine

On branch  : master

>---------------------------------------------------------------

commit 4926747b1c371a875d0d09b1db6095193dd9ac32
Author: Seth Hall <seth at icir.org>
Date:   Fri Mar 28 14:11:52 2014 -0400

    Several path-related fixes for building.
    
     - Config file installs to correct location.
     - Workdir placed into prefix.
     - Default config uses daemon mode.


>---------------------------------------------------------------

4926747b1c371a875d0d09b1db6095193dd9ac32
 CMakeLists.txt                              |  5 +++--
 configure                                   |  3 ++-
 etc/{timemachine.cfg => timemachine.cfg.in} | 11 +++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6f8f54..3dd63a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,11 +48,12 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 
 add_subdirectory(src)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/etc/timemachine.cfg.in
+               ${CMAKE_CURRENT_BINARY_DIR}/etc/timemachine.cfg)
 
 include(InstallPackageConfigFile)
-
 InstallPackageConfigFile(
-    ${CMAKE_CURRENT_SOURCE_DIR}/etc/timemachine.cfg
+    ${CMAKE_CURRENT_BINARY_DIR}/etc/timemachine.cfg
     ${ETC}
     timemachine.cfg)
 
diff --git a/configure b/configure
index a412a44..421a221 100755
--- a/configure
+++ b/configure
@@ -75,7 +75,8 @@ while [ $# -ne 0 ]; do
             builddir=$optarg
             ;;
         --prefix=*)
-            append_cache_entry CMAKE_INSTALL_PREFIX PATH   $optarg
+            prefix=$optarg
+            append_cache_entry CMAKE_INSTALL_PREFIX PATH   $prefix
             ;;
         --conf-files-dir=*)
             append_cache_entry BRO_ETC_INSTALL_DIR  PATH   $optarg
diff --git a/etc/timemachine.cfg b/etc/timemachine.cfg.in
similarity index 89%
rename from etc/timemachine.cfg
rename to etc/timemachine.cfg.in
index fa85cb1..d5c1dde 100644
--- a/etc/timemachine.cfg
+++ b/etc/timemachine.cfg.in
@@ -6,20 +6,19 @@ main {
 
 	## Directories for packet captures, logs, and indexes. 
 	## These directories must exist when timemachine starts!
-	workdir "/var/timemachine";
-	indexdir "indexes/";
-	queryfiledir "queries/";
+	workdir "@CMAKE_INSTALL_PREFIX@/var/tm";
+	indexdir "@CMAKE_INSTALL_PREFIX@/indexes";
+	queryfiledir "@CMAKE_INSTALL_PREFIX@/queries";
 
 	## Name for the log to be stored in <workdir>
 	logfile "timemachine.log";
 
 	## Set this value to '1' if you'd like timemachine to
 	## start in daemon mode.
-	daemon 0;
+	daemon 1;
 	## If you are running in daemon mode, this setting 
 	## MUST be set to '0'
-	console 1;
-
+	console 0;
 	
 	## How often in seconds timemachine should log statistical 
 	## information.


From seth at icir.org  Fri Mar 28 12:01:09 2014
From: seth at icir.org (Seth Hall)
Date: Fri, 28 Mar 2014 12:01:09 -0700
Subject: [TM] [git] master: Updated re2 to version 20140304. (2a64002)
Message-ID: <201403281901.s2SJ19Bb003222@bro-ids.icir.org>

Repository : ssh://git at bro-ids.icir.org/time-machine

On branch  : master

>---------------------------------------------------------------

commit 2a640020f2fd23b007c5b27c7a40fb780f174327
Author: Seth Hall <seth at icir.org>
Date:   Fri Mar 28 14:48:18 2014 -0400

    Updated re2 to version 20140304.


>---------------------------------------------------------------

2a640020f2fd23b007c5b27c7a40fb780f174327
 src/re2/CMakeLists.txt           |  27 --
 src/re2/compile.cc               |  17 +-
 src/re2/dfa.cc                   |  91 ++--
 src/re2/make_perl_groups.pl      |   6 +-
 src/re2/make_unicode_casefold.py |   4 +-
 src/re2/make_unicode_groups.py   |   6 +-
 src/re2/parse.cc                 |  36 +-
 src/re2/perl_groups.cc           |  42 +-
 src/re2/prefilter.cc             |   2 +-
 src/re2/prefilter_tree.cc        |  31 +-
 src/re2/prefilter_tree.h         |   3 +-
 src/re2/prog.cc                  |  14 +-
 src/re2/re2.cc                   |  27 +-
 src/re2/re2.h                    |  48 ++-
 src/re2/unicode.py               |   2 +-
 src/re2/unicode_casefold.cc      |  27 +-
 src/re2/unicode_casefold.h       |  12 +-
 src/re2/unicode_groups.cc        | 893 ++++++++++++++++++++++++---------------
 src/re2/unicode_groups.h         |  16 +-
 src/re2/util/atomicops.h         |  62 ++-
 src/re2/util/mutex.h             |   4 +-
 src/re2/util/util.h              |  19 +-
 src/re2/util/valgrind.cc         |   8 +-
 src/re2/variadic_function.h      |   2 -
 24 files changed, 841 insertions(+), 558 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2a640020f2fd23b007c5b27c7a40fb780f174327

From seth at icir.org  Fri Mar 28 12:01:11 2014
From: seth at icir.org (Seth Hall)
Date: Fri, 28 Mar 2014 12:01:11 -0700
Subject: [TM] [git] master: Fix a clang compile issue. (72adf72)
Message-ID: <201403281901.s2SJ1BD6003231@bro-ids.icir.org>

Repository : ssh://git at bro-ids.icir.org/time-machine

On branch  : master

>---------------------------------------------------------------

commit 72adf728e817105d2e829dd238aa3d90ad49b88c
Author: Seth Hall <seth at icir.org>
Date:   Fri Mar 28 14:48:29 2014 -0400

    Fix a clang compile issue.


>---------------------------------------------------------------

72adf728e817105d2e829dd238aa3d90ad49b88c
 src/DiskIndex.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/DiskIndex.cc b/src/DiskIndex.cc
index 8d58373..5f237d0 100644
--- a/src/DiskIndex.cc
+++ b/src/DiskIndex.cc
@@ -5,6 +5,7 @@
 #include <sys/stat.h>
 #include <netinet/in.h>  // htonl()
 #include <errno.h>
+#include <unistd.h>
 
 #include <fstream>
 #include <vector>


From seth at icir.org  Fri Mar 28 12:04:19 2014
From: seth at icir.org (Seth Hall)
Date: Fri, 28 Mar 2014 12:04:19 -0700
Subject: [TM] [git] master: Fixed url in README. (2c6eb22)
Message-ID: <201403281904.s2SJ4Jbl003343@bro-ids.icir.org>

Repository : ssh://git at bro-ids.icir.org/time-machine

On branch  : master

>---------------------------------------------------------------

commit 2c6eb2246e6d3fcc0ed17fe6c50b496047e72b2f
Author: Seth Hall <seth at icir.org>
Date:   Fri Mar 28 14:53:30 2014 -0400

    Fixed url in README.


>---------------------------------------------------------------

2c6eb2246e6d3fcc0ed17fe6c50b496047e72b2f
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 41f9881..c3e024a 100644
--- a/README
+++ b/README
@@ -8,4 +8,4 @@ features for tuning and operation.
 For more documentation, research publications, and community contact
 information, please see the Time Machines's home page:
 
-	http://tracker.bro-ids.org/time-machine
+	http://www.bro.org/community/time-machine.html