From 81bf276d9274564fcd08790aa57836dd3ca4c1c6 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Mon, 2 Nov 2009 11:59:27 +0100
Subject: preparing for version 5.2.0
---
ChangeLog | 7 +++++++
configure.ac | 2 +-
doc/manual.html | 2 +-
doc/omstdout.html | 42 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 51 insertions(+), 2 deletions(-)
create mode 100644 doc/omstdout.html
diff --git a/ChangeLog b/ChangeLog
index 4240fc62..f7eef99e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
---------------------------------------------------------------------------
+Version 5.2.0 [v5-stable] (rgerhards), 2009-11-02
+This is a re-release of version 5.1.6 as stable after we did not get any bug
+reports during the whole beta phase. Still, this first v5-stable may not be
+as stable as one hopes for, I am not sure if we did not get bug reports
+just because nobody tried it. Anyhow, we need to go forward and so we
+have the initial v5-stable.
+---------------------------------------------------------------------------
Version 5.1.6 [v5-beta] (rgerhards), 2009-10-15
- feature imports from v4.5.6
- bugfix: potential race condition when queue worker threads were
diff --git a/configure.ac b/configure.ac
index 5bbc5e55..e87f201a 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],[5.1.6],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.2.0],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/manual.html b/doc/manual.html
index 90af6940..a476b52d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support 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 5.1.6 (devel branch) of rsyslog.
+
This documentation is for version 5.2.0 (devel branch) of rsyslog.
Visit the rsyslog status page
to obtain current version information and project status.
If you like rsyslog, you might
diff --git a/doc/omstdout.html b/doc/omstdout.html
new file mode 100644
index 00000000..0bd10cfb
--- /dev/null
+++ b/doc/omstdout.html
@@ -0,0 +1,42 @@
+
+
+
+stdout output module (omstdout)
+
+
+rsyslog module reference
+
+stdout output module (stdout)
+
Module Name: omstdout
+Author: Rainer Gerhards
+<rgerhards@adiscon.com>
+Available Since: 4.1.6
+Description:
+This module writes any messages that are passed to it to stdout.
+It was developed for the rsyslog test suite. However, there may
+(limited) other uses exists. Please not that we do not put too much
+effort into the quality of this module as we do not expect it to
+be used in real deployments. If you do, please drop us a note so
+that we can enhance its priority!
+
Configuration Directives:
+
+- $ActionOMStdoutArrayInterface [on|off
+This setting instructs omstdout to use the alternate
+array based method of parameter passing. If used, the values
+will be output with commas between the values but no other padding bytes.
+This is a test aid for the alternate calling interface.
+ - $ActionOMStdoutEnsureLFEnding [on|off
+Makes sure that each message is written with a terminating LF. This is needed for
+the automatted tests. If the message contains a trailing LF, none is added.
+
+Caveats/Known Bugs:
+Currently none known.
+
[rsyslog.conf overview]
+[manual index] [rsyslog site]
+This documentation is part of the
+rsyslog
+project.
+Copyright © 2009 by Rainer Gerhards and
+Adiscon.
+Released under the GNU GPL version 3 or higher.
+
--
cgit
From a5ca9993258f6293f61fae3e0b3df458f454bec5 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Thu, 12 Nov 2009 14:49:16 +0100
Subject: cosmetic: added bugfix to changelog
---
ChangeLog | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 0637bb33..01402310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
Version 5.2.1 [v5-stable] (rgerhards), 2009-11-02
- bugfix [imported from 4.4.3]: $ActionExecOnlyOnceEveryInterval did
not work.
+- bugfix: segfault on startup when -q or -Q option was given
+ [imported from v3-stable]
---------------------------------------------------------------------------
Version 5.2.0 [v5-stable] (rgerhards), 2009-11-02
This is a re-release of version 5.1.6 as stable after we did not get any bug
--
cgit
From 35fa257f37f6376887c1aa0a3a77f4ed249fd22a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Wed, 18 Nov 2009 14:27:04 +0100
Subject: bugfix: omfile output was only written when buffer was full
... not at end of transaction.
---
ChangeLog | 4 ++++
tools/omfile.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 6316a945..f598dd58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
---------------------------------------------------------------------------
+Version 5.3.6 [BETA] (rgerhards), 2009-11-??
+- bugfix: omfile output was only written when buffer was full, not at
+ end of transaction
+---------------------------------------------------------------------------
Version 5.3.5 [BETA] (rgerhards), 2009-11-13
- some light performance enhancement by replacing time() call with much
faster (at least under linux) gettimeofday() calls.
diff --git a/tools/omfile.c b/tools/omfile.c
index f4945ba0..02bb5cf3 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -663,6 +663,8 @@ CODESTARTdoAction
CHKiRet(strm.Flush(pData->pStrm));
}
finalize_it:
+ if(iRet == RS_RET_OK)
+ iRet = RS_RET_DEFER_COMMIT;
ENDdoAction
--
cgit
From 52a0120a3845bd17855156dd59ed6beaf9658e0f Mon Sep 17 00:00:00 2001
From: Tomas Kubina
Date: Wed, 25 Nov 2009 14:47:39 +0100
Subject: bugfix: enabling GSSServer crashes rsyslog startup
---
ChangeLog | 4 ++++
plugins/imgssapi/imgssapi.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 01402310..bdb70af7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
---------------------------------------------------------------------------
+Version 5.2.2 [v5-stable] (rgerhards), 2009-11-??
+- bugfix: enabling GSSServer crashes rsyslog startup
+ Thanks to Tomas Kubina for the patch [imgssapi]
+---------------------------------------------------------------------------
Version 5.2.1 [v5-stable] (rgerhards), 2009-11-02
- bugfix [imported from 4.4.3]: $ActionExecOnlyOnceEveryInterval did
not work.
diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c
index f9c1f86b..111ed595 100644
--- a/plugins/imgssapi/imgssapi.c
+++ b/plugins/imgssapi/imgssapi.c
@@ -48,6 +48,7 @@
#include "dirty.h"
#include "cfsysline.h"
#include "module-template.h"
+#include "unicode-helper.h"
#include "net.h"
#include "srUtils.h"
#include "gss-misc.h"
@@ -330,6 +331,7 @@ addGSSListener(void __attribute__((unused)) *pVal, uchar *pNewVal)
CHKiRet(tcpsrv.SetCBOnSessAccept(pOurTcpsrv, onSessAccept));
CHKiRet(tcpsrv.SetCBOnRegularClose(pOurTcpsrv, onRegularClose));
CHKiRet(tcpsrv.SetCBOnErrClose(pOurTcpsrv, onErrClose));
+ CHKiRet(tcpsrv.SetInputName(pOurTcpsrv, UCHAR_CONSTANT("imgssapi")));
tcpsrv.configureTCPListen(pOurTcpsrv, pNewVal);
CHKiRet(tcpsrv.ConstructFinalize(pOurTcpsrv));
}
--
cgit