From 44bdfdcf1d71fe1b5a1bf68a3fd1f476ec95c75c Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Thu, 4 Jul 2013 11:16:54 +0200
Subject: prepare for 7.4.2 release
---
ChangeLog | 8 ++++++--
configure.ac | 2 +-
doc/manual.html | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 729c360e..16365d10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,16 @@
---------------------------------------------------------------------------
-Version 7.4.2 [v7.4-stable] 2013-06-??
+Version 7.4.2 [v7.4-stable] 2013-07-04
- bugfix: in RFC5425 TLS, multiple wildcards in auth could cause segfault
- bugfix: RainerScript object required parameters were not properly
checked - this clould result to segfaults on startup if parameters
were missing.
- bugfix: double-free in omelasticsearch
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=461
- Thanks to Marius Ionescu for providing a detailled bug report
+ a security advisory for this bug is available at:
+ http://www.lsexperts.de/advisories/lse-2013-07-03.txt
+ Thanks to Markus Vervier and Marius Ionescu for providing a detailled
+ bug report. Special thanks to Markus for coordinating his security
+ advisory with us.
- bugfix: omrelp potential segfault at startup on invalid config parameters
- bugfix: small memory leak when $uptime property was used
- bugfix: potential segfault on rsyslog termination in imudp
diff --git a/configure.ac b/configure.ac
index a62bc687..db324c7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[7.4.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.4.2],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index bc57c136..3c0c6ce3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ professional services available directly from the source!
Please visit the rsyslog sponsor's page
to honor the project sponsors or become one yourself! We are very grateful for any help towards the
project goals.
-This documentation is for version 7.4.1 (v7.4-stable branch) of rsyslog.
+
This documentation is for version 7.4.2 (v7.4-stable branch) of rsyslog.
Visit the rsyslog status page
to obtain current version information and project status.
If you like rsyslog, you might
--
cgit v1.2.3