From 9aa6ebe724f32183cc52b468783abc987f6b8a9f Mon Sep 17 00:00:00 2001
From: "Scott R. Shinn" <scott@atomicorp.com>
Date: Fri, 15 Nov 2019 13:50:58 -0500
Subject: [PATCH] Updating to 3.5.0

Signed-off-by: Scott R. Shinn <scott@atomicorp.com>
---
 BUGS                          |  2 +-
 CHANGELOG                     | 38 +++++++++++++++++++++++++++++++++++
 CONFIG                        |  2 +-
 INSTALL                       |  2 +-
 README.md                     |  2 +-
 src/VERSION                   |  2 +-
 src/headers/defs.h            |  2 +-
 src/init/ossec-client.sh      |  2 +-
 src/init/ossec-local.sh       |  2 +-
 src/init/ossec-server.sh      |  2 +-
 src/win32/help.txt            |  2 +-
 src/win32/ossec-installer.nsi |  2 +-
 12 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/BUGS b/BUGS
index fedd38f32..e1026e1b5 100644
--- a/BUGS
+++ b/BUGS
@@ -1,4 +1,4 @@
-OSSEC v3.4.0
+OSSEC v3.5.0
 Copyright (C) 2019 Trend Micro Inc.
 
 
diff --git a/CHANGELOG b/CHANGELOG
index d2728fbde..ccce95e9f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,41 @@
+OSSEC changelog (3.5.0) <scott@atomicorp.com>
+
+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:
+
+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
+the past was limited in processing events that did not use indentiation, a fairly common modern practice
+for readability. This update adds a new type: multi-line_indented to handle this condition (Example: postgresql). 
+
+Maintenance fixes in this release also address issue #1781, which affected maild when calling an external program, and add support for Fedora 31
+
+
+Whats New:
+
+(@atomicturtle) - Fedora 31 Support
+(@sempervictus) - Implement multi-line collection for indented logs #1780
+(@drsjb80) -  Added authentication log file location for debian-based systems #1784
+
+
+General
+
+(@ddpbsd) - Fix for Issue #1781, corrects issues with program sending mail
+
+
+
+
 OSSEC changelog (3.4.0) <scott@atomicorp.com>
 
 Release Maintainers
diff --git a/CONFIG b/CONFIG
index 091f95437..ed40d476e 100644
--- a/CONFIG
+++ b/CONFIG
@@ -1,4 +1,4 @@
-OSSEC v3.4.0
+OSSEC v3.5.0
 Copyright (C) 2019 Trend Micro Inc.
 
 
diff --git a/INSTALL b/INSTALL
index e70b53753..2d91bb3da 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-OSSEC v3.4.0
+OSSEC v3.5.0
 Copyright (C) 2019 Trend Micro Inc.
 
 
diff --git a/README.md b/README.md
index 55abe2045..61483d1c7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-OSSEC v3.4.0 Copyright (C) 2019 Trend Micro Inc.
+OSSEC v3.5.0 Copyright (C) 2019 Trend Micro Inc.
 
 # Information about OSSEC 
 
diff --git a/src/VERSION b/src/VERSION
index c219f7237..c0c4025db 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-v3.4.0
+v3.5.0
diff --git a/src/headers/defs.h b/src/headers/defs.h
index f0863f156..32d3676b7 100644
--- 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.4.0"
+#define __version       "v3.5.0"
 #define __author        "OSSEC Foundation"
 #define __contact       "contact@ossec.net"
 #define __site          "https://www.ossec.net"
diff --git a/src/init/ossec-client.sh b/src/init/ossec-client.sh
index 6682d58df..36378428e 100755
--- 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.4.0"
+VERSION="v3.5.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
index 869e261af..076adbfc7 100755
--- 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.4.0"
+VERSION="v3.5.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
index ecd908f04..2e31d6ba9 100755
--- 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.4.0"
+VERSION="v3.5.0"
 
 [ -f /etc/ossec-init.conf ] && . /etc/ossec-init.conf;
 
diff --git a/src/win32/help.txt b/src/win32/help.txt
index ea1c85a35..08b51629c 100644
--- a/src/win32/help.txt
+++ b/src/win32/help.txt
@@ -1,4 +1,4 @@
-** OSSEC Windows Agent v3.4.0 **
+** OSSEC Windows Agent v3.5.0 **
 ** Copyright (C) 2014 Trend Micro Inc. **
 
 
diff --git a/src/win32/ossec-installer.nsi b/src/win32/ossec-installer.nsi
index 4fb02d4f6..65881cc19 100644
--- 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.4.0"
+!define VERSION "3.5.0"
 !define NAME "OSSEC HIDS"
 !define SERVICE "OssecSvc"