From: Russ Combs <rucombs@cisco.com>
Date: Fri, 8 May 2015 11:46:18 +0000 (-0400)
Subject: bump build
X-Git-Tag: 3.0.0-233~979
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=993511076a96ff61d651ca335cbd9e4a5af5ae7d;p=thirdparty%2Fsnort3.git

bump build
---

diff --git a/ChangeLog b/ChangeLog
index 2765101d6..c5e51c204 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+15/05/08 - build 151
+
+-- doc tweaks
+-- new_http_inspect message parsing updates
+-- misc bug fixes
+
 15/04/30 - build 150
 
 -- fixed xcode static analysis issues
diff --git a/doc/start.txt b/doc/start.txt
index 3df03423a..c963bbd92 100644
--- a/doc/start.txt
+++ b/doc/start.txt
@@ -28,14 +28,19 @@ Optional:
 * asciidoc from http://www.methods.co.nz/asciidoc/ to build the HTML
   manual
 
+* check from http://check.sourceforge.net to build unit tests
+
 * dblatex from http://dblatex.sourceforge.net to build the pdf manual (in
   addition to asciidoc)
 
+* 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.
+
 * w3m from http://sourceforge.net/projects/w3m/ to build the plain text
   manual
 
-* check from http://check.sourceforge.net to build unit tests
-
 
 === Building
 
diff --git a/src/actions/act_reject.cc b/src/actions/act_reject.cc
index 3428a355a..e477dc9aa 100644
--- a/src/actions/act_reject.cc
+++ b/src/actions/act_reject.cc
@@ -42,7 +42,7 @@
  * - bypasses sequence strafing in inline mode.
  */
 
-// act_rej.cc author Russ Combs <rucombs@cisco.com>
+// act_reject.cc author Russ Combs <rucombs@cisco.com>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/main/build.h b/src/main/build.h
index a76785c6a..b002c256c 100644
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -7,5 +7,5 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "150"
+#define BUILD "151"
 
diff --git a/src/main/snort_module.cc b/src/main/snort_module.cc
index e5aec4357..3ccee6f17 100644
--- a/src/main/snort_module.cc
+++ b/src/main/snort_module.cc
@@ -188,7 +188,7 @@ static const Parameter s_params[] =
       "<pcap>... (same as --pcap-list)" },
 
     { "-S", Parameter::PT_STRING, nullptr, nullptr,
-      "<n=v> set rules file variable n equal to value v" },
+      "<x=v> set config variable x equal to value v" },
 
     { "-s", Parameter::PT_INT, "68:65535", "1514",
       "<snap> (same as --snaplen)" },
@@ -229,8 +229,8 @@ static const Parameter s_params[] =
       "include year in timestamp in the alert and log files" },
 
     { "-z", Parameter::PT_INT, "0:", "1",
-      "<count> maximum number of packet threads (same as --max-packet-threads)\n"
-      "        0 gets the number of CPU cores reported by the system" },
+      "<count> maximum number of packet threads (same as --max-packet-threads); "
+      "0 gets the number of CPU cores reported by the system" },
 
     { "--alert-before-pass", Parameter::PT_IMPLIED, nullptr, nullptr,
       "process alert, drop, sdrop, or reject before pass; "
@@ -337,8 +337,7 @@ static const Parameter s_params[] =
       "output help in asciidoc compatible format" },
 
     { "--max-packet-threads", Parameter::PT_INT, "0:", "1",
-      "<count> configure maximum number of packet threads (same as -z)\n"
-      "        0 gets the number of CPU cores reported by the system" },
+      "<count> configure maximum number of packet threads (same as -z)" },
 
     { "--nostamps", Parameter::PT_IMPLIED, nullptr, nullptr,
       "don't include timestamps in log file names" },