Merge pull request #1836 from atomicturtle/v3.6.0-update

Updates for 3.6.0
ossec · Feb 14, 2020 · 9772223 · 9772223
2 parents 3b56c31 + 8f05aa4
commit 9772223
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 15 deletions.
diff --git a/BUGS b/BUGS
@@ -1,4 +1,4 @@
-OSSEC v3.5.0
+OSSEC v3.6.0
 Copyright (C) 2019 Trend Micro Inc.
 
 

diff --git a/CHANGELOG → CHANGELOG.md b/CHANGELOG → CHANGELOG.md
@@ -1,18 +1,70 @@
-OSSEC changelog (3.5.0) <[email protected]>
+**OSSEC changelog (3.6.0) <[email protected]>**
 
-Release Maintainers
+**Release Maintainers**
 
 Dan Parriott
+
 Scott R. Shinn (http://www.atomicorp.com)
 
-Contributors on this release
+
+**Contributors on this release**
+
+@ddpbsd Dan Parriot - Maintainer
+
+@NicolasCARPi - Nocolas Carpi - Community
+
+@cpu - Daniel McCarney - Community
+
+@jknockaert - Jasper Knockaert - Community
+
+@mwidman - Mike Widman - Community
+
+@drsjb80 - Steve Beaty - Community
+
+
+
+**General** 
+
+@ddpbsd - ossec-dbd, Add help output to dbd, https://github.com/ossec/ossec-hids/pull/1833
+
+@NicolasCARPi - INSTALL, updating depenency list, 
+https://github.com/ossec/ossec-hids/pull/1832
+
+@cpu - PCRE2, refuse to compile empty PCRE2 patterns, fix for Issue #1811,  https://github.com/ossec/ossec-hids/pull/1826
+
+@cpu, analysisd, resolves CVE-2020-8442 Issue #1820, https://github.com/ossec/ossec-hids/pull/1825 
+
+@cpu, analysisd, resolves CVE-2020-8443 Issue #1816, https://github.com/ossec/ossec-hids/pull/1824
+
+@cpu, analysisd, resolves CVE-2020-8448 Issue #1815, https://github.com/ossec/ossec-hids/pull/1823
+
+@cpu, Makefile, fix for DEBUGAD, https://github.com/ossec/ossec-hids/pull/1822
+
+@jknockaert - dropbear rules, limit brute force rule to dropbear, https://github.com/ossec/ossec-hids/pull/1803
+
+@mwidman, analysisd, Added non-standard Sophos UTM syslog timestamp format to pre-decoding. , https://github.com/ossec/ossec-hids/pull/1794
+
+@drsjb80 - configs, Added authentication log file location for debian-based systems , https://github.com/ossec/ossec-hids/pull/1784
+
+@ddpbsd - maild, Fix using a program to send mail, https://github.com/ossec/ossec-hids/pull/1783
+
+
+
+**OSSEC changelog (3.5.0) <[email protected]>**
+
+**Release Maintainers**
+
+Dan Parriott
+Scott R. Shinn (http://www.atomicorp.com)
+
+**Contributors on this release**
 
 (@atomicturtle) Scott Shinn - Maintainer
 (@ddpbsd) Dan Parriot - Maintainer
 (@drsjb80) Steve Beaty - Community
 (@sempervictus) Boris Lukashev - Community
 
-Release notes:
+**Release notes**
 
 This would have been a minor 3.4.1 update if it wasnt for Boris Lukashev of https://www.sempervictus.com
 contributing a much needed update to multi-line log analysis. Previous usage of multi-line in OSSEC in

diff --git a/CONFIG b/CONFIG
@@ -1,4 +1,4 @@
-OSSEC v3.5.0
+OSSEC v3.6.0
 Copyright (C) 2019 Trend Micro Inc.
 
 

diff --git a/INSTALL b/INSTALL
@@ -1,4 +1,4 @@
-OSSEC v3.5.0
+OSSEC v3.6.0
 Copyright (C) 2019 Trend Micro Inc.
 
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-OSSEC v3.5.0 Copyright (C) 2019 Trend Micro Inc.
+OSSEC v3.6.0 Copyright (C) 2019 Trend Micro Inc.
 
 # Information about OSSEC 
 

diff --git a/src/VERSION b/src/VERSION
@@ -1 +1 @@
-v3.5.0
+v3.6.0
diff --git a/src/headers/defs.h b/src/headers/defs.h
@@ -39,7 +39,7 @@
 
 /* Some global names */
 #define __ossec_name    "OSSEC HIDS"
-#define __version       "v3.5.0"
+#define __version       "v3.6.0"
 #define __author        "OSSEC Foundation"
 #define __contact       "[email protected]"
 #define __site          "https://www.ossec.net"

diff --git a/src/init/ossec-client.sh b/src/init/ossec-client.sh
@@ -11,7 +11,7 @@ DIR=`dirname $PWD`;
 
 ###  Do not modify below here ###
 NAME="OSSEC HIDS"
-VERSION="v3.5.0"
+VERSION="v3.6.0"
 DAEMONS="ossec-logcollector ossec-syscheckd ossec-agentd ossec-execd"
 
 [ -f /etc/ossec-init.conf ] && . /etc/ossec-init.conf

diff --git a/src/init/ossec-local.sh b/src/init/ossec-local.sh
@@ -19,7 +19,7 @@ if [ $? = 0 ]; then
 fi
 
 NAME="OSSEC HIDS"
-VERSION="v3.5.0"
+VERSION="v3.6.0"
 DAEMONS="ossec-monitord ossec-logcollector ossec-syscheckd ossec-analysisd ossec-maild ossec-execd ${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON}"
 
 ## Locking for the start/stop

diff --git a/src/init/ossec-server.sh b/src/init/ossec-server.sh
@@ -19,7 +19,7 @@ if [ $? = 0 ]; then
 fi
 
 NAME="OSSEC HIDS"
-VERSION="v3.5.0"
+VERSION="v3.6.0"
 
 [ -f /etc/ossec-init.conf ] && . /etc/ossec-init.conf;
 

diff --git a/src/win32/help.txt b/src/win32/help.txt
@@ -1,4 +1,4 @@
-** OSSEC Windows Agent v3.5.0 **
+** OSSEC Windows Agent v3.6.0 **
 ** Copyright (C) 2014 Trend Micro Inc. **
 
 

diff --git a/src/win32/ossec-installer.nsi b/src/win32/ossec-installer.nsi
@@ -25,7 +25,7 @@
 ; general
 !define MUI_ICON favicon.ico
 !define MUI_UNICON ossec-uninstall.ico
-!define VERSION "3.5.0"
+!define VERSION "3.6.0"
 !define NAME "OSSEC HIDS"
 !define SERVICE "OssecSvc"