diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/manual.html | 2 | ||||
-rw-r--r-- | plugins/pmlastmsg/pmlastmsg.c | 1 | ||||
-rwxr-xr-x | tests/diag.sh | 1 |
6 files changed, 5 insertions, 7 deletions
@@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 5.5.6 [DEVEL] (rgerhards), 2010-06-?? +Version 5.5.6 [DEVEL] (rgerhards), 2010-07-21 - added parser modules * pmlastmsg, which supports the notoriously malformed "last message repeated n times" messages from some syslogd's (namely sysklogd) @@ -17,7 +17,7 @@ Version 5.5.6 [DEVEL] (rgerhards), 2010-06-?? * RSYSLOG_TraditionalFileFormat * RSYSLOG_ForwardFormat * RSYSLOG_TraditionalForwardFormat -- bugfix: mutexes used to similate atomic instructions were not destructed +- bugfix: mutexes used to simulate atomic instructions were not destructed - bugfix: regression caused more locking action in msg.c than necessary - bugfix: "$ActionExecOnlyWhenPreviousIsSuspended on" was broken - bugfix: segfault on HUP when "HUPIsRestart" was set to "on" diff --git a/Makefile.am b/Makefile.am index a7670f64..f4cd98f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,8 +168,6 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ --enable-pgsql \ --enable-libdbi \ --enable-mysql \ - --enable-omtemplate \ - --enable-imtemplate \ --enable-relp \ --enable-rsyslogd \ --enable-mail \ diff --git a/configure.ac b/configure.ac index bfcd3f0d..bcfdaf2f 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.5.5],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[5.5.6],[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 b9085daf..99e44fc2 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p> <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a> to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the project goals.</p> -<p><b>This documentation is for version 5.5.5 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 5.5.6 (devel branch) of rsyslog.</b> Visit the <i><a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b> to obtain current version information and project status. </p><p><b>If you like rsyslog, you might diff --git a/plugins/pmlastmsg/pmlastmsg.c b/plugins/pmlastmsg/pmlastmsg.c index 67a742c9..275f1c1f 100644 --- a/plugins/pmlastmsg/pmlastmsg.c +++ b/plugins/pmlastmsg/pmlastmsg.c @@ -35,7 +35,6 @@ #include <string.h> #include <assert.h> #include <ctype.h> -#include "syslogd.h" #include "conf.h" #include "syslogd-types.h" #include "template.h" diff --git a/tests/diag.sh b/tests/diag.sh index 3d072880..2f307750 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -121,6 +121,7 @@ case $1 in echo "sequence error detected" exit 1 fi + rm -f work2 ;; 'gzip-seq-check') # do the usual sequence check, but for gzip files rm -f work |