Merge pull request #263 in SNORT/snort3 from crc/187 to master

Squashed commit of the following:

commit fe9bcf8fe19640d770449b6d7677770b529fbcef
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Feb 12 09:20:44 2016 -0500

    build 187

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4601cfe6e5234837cb2df77ddc0b8aa7a58ab26e..23df6e009a9c3ec0e52d3fbc55fddf4de4cce028 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (SNORT_VERSION_MAJOR 3)
 set (SNORT_VERSION_MINOR 0)
-set (SNORT_VERSION_BUILD 0-a3)
+set (SNORT_VERSION_BUILD 0-a4)
 set (VERSION "${SNORT_VERSION_MAJOR}.${SNORT_VERSION_MINOR}.${SNORT_VERSION_BUILD}")
 
 # ensure cmake will look in the cmake directory for configuration files

diff --git a/ChangeLog b/ChangeLog
index ae18321957900134a3b80e81360a7760afe64fca..ce2b9914f80f6b81b907adacb09f1920c5f67bad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+16/02/12 - build 187
+
+-- file capture added - initial version writes from packet thread
+-- added support for http 0.9 to new_http_inspect
+-- added URI normalization of headers, cookies, and post bodies to new_http_inspect
+-- configure_cmake.sh updates to better support scripting
+-- updated catch header (used for some unit tests)
+-- continued dce2 port
+-- fixed misc clang and dynamic plugin build issues
+-- fixed static analysis issues and crash in new_http_inspect
+-- fixed tcp paws issue
+-- fixed normalization stats
+-- fixed issues reported by Bill Parker
+-- refactoring updates to tcp session
+-- refactoring updates to profiler
+
 16/02/02 - build 186
 
 -- update copyright to 2016, add missing license blocks

diff --git a/configure.ac b/configure.ac
index d70a32204223aea5394b232f6f03c6cb4e2ff0a3..8345dce3a807aec53ffaf0c41d43eca4d1dce98d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # initialization
 #--------------------------------------------------------------------------
 
-AC_INIT([snort], [3.0.0-a3], [snort-team@sourcefire.com])
+AC_INIT([snort], [3.0.0-a4], [snort-team@sourcefire.com])
 AC_PREREQ([2.69])
 
 AC_CONFIG_SRCDIR([src/main.h])

diff --git a/doc/bugs.txt b/doc/bugs.txt
index b922a7c4d217a8a46b508dd576a908b8dc2f8ad0..e684ef3685a411f33cdaa1f96b47641d4c2e98d1 100644 (file)
--- a/doc/bugs.txt
+++ b/doc/bugs.txt
@@ -21,6 +21,9 @@
 
     clang: warning: argument unused during compilation: '-pthread'
 
+* It is not possible to build dynamic plugins using apple clang due to its
+  limited support for thread local variables.
+
 
 ==== Config
 

diff --git a/src/main/build.h b/src/main/build.h
index f31b5b4a0951716b40b9cb5e1de433df7791cbf2..7c4c71e3b41c5ba45811e4bf81414c860403635a 100644 (file)
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -10,7 +10,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "186"
+#define BUILD "187"
 
 #endif