From b93ed468a0e0c0c452ec4ddd6f737002ccd48726 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 4 Oct 2012 07:27:55 +0200 Subject: cosmetic: add few files to .gitignore --- .gitignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitignore b/.gitignore index b24a0666..721a4816 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,18 @@ debug core.* shave shave-libtool +core* +vgcore* +*.tar.gz +*.new +*.orig +*.old +*.diff +*.patch +checklog +*.bad +*.rej +*.log +logfile* +*.conf +log -- cgit v1.2.3 From 2b75ccbe54dd67af7911f8a131b08c757e84d744 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 4 Oct 2012 07:34:13 +0200 Subject: bugfix: comments inside objects (e.g. action()) were not properly handled --- ChangeLog | 1 + grammar/lexer.l | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index bc3e7750..acaa0ec9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ --------------------------------------------------------------------------- Version 6.4.3 [V6-STABLE] 2012-??-?? +- bugfix: comments inside objects (e.g. action()) were not properly handled - bugfix: sysklogd-emulating standard template was no longer present in v6 This was obviously lost during the transition to the new config format. Thanks to Milan Bartos for alerting us and a patch! diff --git a/grammar/lexer.l b/grammar/lexer.l index f03659c3..065ea056 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -182,6 +182,7 @@ int fileno(FILE *stream); yylval.estr = es_newStrFromBuf(yytext+1, yyleng-2); return VALUE; } "/*" { preCommentState = YY_START; BEGIN COMMENT; } +"/*" { preCommentState = YY_START; BEGIN COMMENT; } "/*" { preCommentState = YY_START; BEGIN COMMENT; } "*/" { BEGIN preCommentState; } ([^*]|\n)+|. -- cgit v1.2.3 From 5ac39a620787ea995b0029a9d01598074f84b717 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 4 Oct 2012 07:46:31 +0200 Subject: doc: add missing files to distribution tarball Thanks to Michael Biebl for alerting me of the problem. --- doc/Makefile.am | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/doc/Makefile.am b/doc/Makefile.am index 04fda6b3..998d2176 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -126,6 +126,21 @@ html_files = \ rsyslog_conf_nomatch.html \ queues_analogy.html \ multi_ruleset.html \ + dev_oplugins.html \ + free_support.html \ + imudp.html \ + messageparser.html \ + omhdfs.html \ + omprog.html \ + queue_msg_state.jpeg \ + rsconf1_abortonuncleanconfig.html \ + rsconf1_maxopenfiles.html \ + rsconf1_omfileforcechown.html \ + rsyslog_conf_file_syntax_differences.html \ + rsyslog_conf_lines.html \ + rsyslog_queue_pointers.jpeg \ + rsyslog_queue_pointers2.jpeg \ + v6compatibility.html \ src/classes.dia grfx_files = \ -- cgit v1.2.3