summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rw-r--r--doc/v6compatibility.html4
-rw-r--r--grammar/Makefile.am1
-rwxr-xr-xtests/diag.sh2
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</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 6.3.2 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.3.3 (devel branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/status">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/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.
+<p>Please see the
+<a href="http://blog.gerhards.net/2011/07/rsyslog-633-config-format-improvements.html">blog
+post about rsyslog 6.3.3 config format</a> for details of what is currently supported.
+
<h2>compatibility mode</h2>
<p>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