Merge pull request #2277 in SNORT/snort3 from ~MIALTIZE/snort3:version_3_0_2 to master

Squashed commit of the following:

commit e8f9bc0ab3b216463374ec6d0a30e158fefb05ca
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Jun 22 10:53:12 2020 -0400

    build: Increment version to 3.0.2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffb84a3c89804c4fd721cf746fa78ea8ab06bf07..d305e1a32e6f383c0544c40eccc81259ec39bf22 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (VERSION_MAJOR 3)
 set (VERSION_MINOR 0)
-set (VERSION_PATCH 1)
+set (VERSION_PATCH 2)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 set (CMAKE_CXX_STANDARD 14)

diff --git a/src/main/build.h b/src/main/build.h
index 63325a0813677825724237ee974f961744d5ac49..bc92893684c85e38678fd80d68cc36d5379927fd 100644 (file)
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -12,7 +12,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD_NUMBER 5
+#define BUILD_NUMBER 0
 
 #ifndef EXTRABUILD
 #define BUILD STRINGIFY_MX(BUILD_NUMBER)