From fa5c1371db8669043c30f402d9a096e7036a8dcd Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 13 Jul 2011 14:49:14 +0200 Subject: preparing for 6.3.3 --- ChangeLog | 5 +++-- configure.ac | 2 +- doc/manual.html | 2 +- doc/v6compatibility.html | 4 ++++ grammar/Makefile.am | 1 + tests/diag.sh | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b5f908d..9fbf1d53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ --------------------------------------------------------------------------- -Version 6.3.3 [DEVEL] (rgerhards), 2011-06-?? +Version 6.3.3 [DEVEL] (rgerhards), 2011-07-13 - rsyslog.conf format: now parsed by RainerScript parser this provides the necessary base for future enhancements as well as some - minor immediate ones + minor immediate ones. For details see: + http://blog.gerhards.net/2011/07/rsyslog-633-config-format-improvements.html - performance of script-based filters notably increased - removed compatibility mode as we expect people have adjusted their confs by now diff --git a/configure.ac b/configure.ac index b9208bc7..0093d860 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],[6.3.2],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[6.3.3],[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 761417f1..6c3b52a8 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 6.3.2 (devel branch) of rsyslog. +

This documentation is for version 6.3.3 (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/v6compatibility.html b/doc/v6compatibility.html index e67efff3..67f7f0d8 100644 --- a/doc/v6compatibility.html +++ b/doc/v6compatibility.html @@ -52,6 +52,10 @@ all legacy config files. However, we may have failed in one case or another. So experience problems during config processing, chances are there may be a problem on the rsyslog side. In that case, please let us know. +

Please see the +blog +post about rsyslog 6.3.3 config format for details of what is currently supported. +

compatibility mode

Compatibility mode (specified via -c option) has been removed. This was a migration aid from sysklogd and very early versions of rsyslog. As all major distros now have rsyslog as their diff --git a/grammar/Makefile.am b/grammar/Makefile.am index 2b149abe..9767c12f 100644 --- a/grammar/Makefile.am +++ b/grammar/Makefile.am @@ -9,6 +9,7 @@ libgrammar_la_SOURCES = \ lexer.l \ rainerscript.c \ rainerscript.h \ + parserif.h \ grammar.h testdriver_SOURCES = testdriver.c libgrammar.la diff --git a/tests/diag.sh b/tests/diag.sh index 9fd878a4..b278d2c5 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -10,7 +10,7 @@ #valgrind="valgrind --tool=helgrind --log-fd=1" #valgrind="valgrind --tool=exp-ptrcheck --log-fd=1" #set -o xtrace -#export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction stdout" +#export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout" #export RSYSLOG_DEBUGLOG="log" case $1 in 'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason -- cgit