From: Russ Combs <rucombs@cisco.com>
Date: Thu, 17 Sep 2015 15:41:21 +0000 (-0400)
Subject: build 170 updates
X-Git-Tag: 3.0.0-233~830^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42b0a90419085f89ac20f92ebb2ea494f02f4fb2;p=thirdparty%2Fsnort3.git

build 170 updates
---

diff --git a/ChangeLog b/ChangeLog
index 46ba783c5..78af60254 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
-15/09/04 - build 169
+15/09/17 - build 170
+
+-- removed unused control socket defines from cmake
+-- fixed build error with valgrind build option
+-- cleanup *FLAGS use in configure.ac
+-- change configure.ac compiler search order to prefer clang over gcc
+-- update where to get dnet
+-- update usage and bug list
+-- move extra daqs and extra hext logger to main source tree
+-- fix breakloop in file daq
+-- fix plain file processing
+-- fix detection of stream_user and stream_file data
+-- log innermost proto for type of broken packets
+
+15/09/10 - build 169
 
 -- fix chunked manual install
 -- add event direction bug
diff --git a/configure.ac b/configure.ac
index 7811b7d74..5841dd8c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -526,22 +526,6 @@ if test "x$LPCAP" = "xno"; then
   fi
 fi
 
-AC_MSG_CHECKING([for pcap_lex_destroy])
-AC_RUN_IFELSE(
-[AC_LANG_PROGRAM(
-[[
-#include <pcap.h>
-]],
-[[
-   pcap_lex_destroy();
-]])],
-[have_pcap_lex_destroy="yes"],
-[have_pcap_lex_destroy="no"])
-AC_MSG_RESULT($have_pcap_lex_destroy)
-if test "x$have_pcap_lex_destroy" = "xyes"; then
-    AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter])
-fi
-
 AC_MSG_CHECKING([for pcap_lib_version])
 AC_LINK_IFELSE(
     [AC_LANG_PROGRAM(
diff --git a/doc/features.txt b/doc/features.txt
index 47d54ac2f..6d58ea7c6 100644
--- a/doc/features.txt
+++ b/doc/features.txt
@@ -9,3 +9,26 @@ into the Snort binary.  For a full list of build features, run ./configure
 
 *  *--enable-shell*: enable local and remote command line shell support.
 
+These features are built only if the required libraries and headers are
+present.  There is no need to explicitly enable.
+
+* *lzma*: from http://www.7-zip.org/sdk.html for decompression of SWF fles.
+
+* *openssl*: from https://www.openssl.org for SHA and MD5 file signatures and
+  the protected_content rule option.
+
+* *intel-soft-cpm": an optional pattern matcher based on a library from
+  Intel.
+
+If you need to use headers and/or libraries in non-standard locations, you
+can use these options:
+
+* *--with-pkg-includes*: specify the directory containing the package
+  headers.
+
+* *--with-pkg-libraries*: specify the directory containing the package
+  libraries.
+
+These can be use for pcap, luajit, pcre, dnet, daq, lzma, openssl, and
+intel-soft-cpm packages.
+
diff --git a/src/main/build.h b/src/main/build.h
index 9ac061567..3fbdd6839 100644
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -10,7 +10,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "169"
+#define BUILD "170"
 
 #endif