Merge pull request #847 in SNORT/snort3 from 230 to master

Squashed commit of the following:

commit 1a9ccf0123184d2e531a4950c2142d533d517c96
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Mar 27 12:00:18 2017 -0400

    build 230

commit 95ab2af6205f0fd40b41a16139bd2ab06db7d200
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Mar 27 12:00:09 2017 -0400

    fix os x build issue

diff --git a/ChangeLog b/ChangeLog
index bd761b24f01f15cccc62c7c236a0613f5f2c7524..78e89e7e5ccf618d9a0f90017a58ab1f93767a85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+17/03/27 - build 230
+
+-- require hyperscan >= 4.4.0, check runtime support
+   thanks to justin.viiret@intel.com for submitting the patch
+-- fix search tool issue with empty pattern database
+   thanks to justin.viiret@intel.com for reporting the issue
+-- fix sip_method to error out if sip not instantiated
+-- major appid overhaul to address lingering concerns: refactor, cleanup,
+   simplify
+-- major detection overhaul to address lingering concerns: refactor, cleanup,
+   release memory ASAP
+-- add FlatBuffers output format to perf_monitor
+   also added tool to convert FlatBuffers files to yaml
+-- add regex.fast_pattern; do not use for fast pattern unless explicitly indicated
+-- update copyrights to 2017
+
 17/03/17 - build 229
 
 -- fixed mpse to ensure all search methods return consistent results

diff --git a/src/main/build.h b/src/main/build.h
index 7ab65457ff4ab616edc787d7f8a6c8f204d5849c..8f58910b19d2c40f58e6aa50434daf842f07688d 100644 (file)
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -10,7 +10,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "229"
+#define BUILD "230"
 
 #endif
 

diff --git a/src/network_inspectors/appid/lua_detector_module.cc b/src/network_inspectors/appid/lua_detector_module.cc
index 394fde58aa1caa9218ef3dde0662aabb65ca9005..59f500c0fb4b7eb4346201be98c36705cf703203 100644 (file)
--- a/src/network_inspectors/appid/lua_detector_module.cc
+++ b/src/network_inspectors/appid/lua_detector_module.cc
@@ -26,6 +26,7 @@
 #include "lua_detector_module.h"
 
 #include <glob.h>
+#include <libgen.h>
 #include <lua.hpp>
 #include "lua/lua.h"