From 92c185ccfa0b31b829874e8410bce6e8f3ab58b8 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 11 Oct 2012 10:56:01 +0200 Subject: preparing for 6.5.1 release --- ChangeLog | 2 +- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8cfd79f..0cf1e27d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 6.5.1 [devel] 2012-08-?? +Version 6.5.1 [beta] 2012-10-11 - added tool "logctl" to handle lumberjack logs in MongoDB - imfile ported to new v6 config interface - imfile now supports config parameter for maximum number of submits diff --git a/configure.ac b/configure.ac index 2d5e17cf..2c3bb2ab 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.5.0],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[6.5.1],[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 9a8644c9..15281921 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.5.0 (devel branch) of rsyslog. +

This documentation is for version 6.5.1 (beta branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit v1.2.3 From b7f1b3265c5578f7f498d98fe9d7cd93bcad2ba4 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 19 Oct 2012 08:09:42 +0200 Subject: doc: add imported bugfix to ChangeLog --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 718eb70c..e4d3f1d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ --------------------------------------------------------------------------- +Version 6.5.2 [beta] 2012-10-?? +- bugfix: imuxsock did not properly honor $LocalHostIPIF +--------------------------------------------------------------------------- Version 6.5.1 [beta] 2012-10-11 - added tool "logctl" to handle lumberjack logs in MongoDB - imfile ported to new v6 config interface -- cgit v1.2.3 From 316ad4e4c998865cdc90f7c2d0589578c67e5824 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 10:16:42 +0200 Subject: permit action-like statements (stop, call, ...) in action lists --- ChangeLog | 1 + grammar/grammar.y | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dc5584b..e0ad37bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +- permited action-like statements (stop, call, ...) in action lists ---------------------------------------------------------------------------- Version 7.1.13 [beta] 2012-10-?? - bugfix: imuxsock did not properly honor $LocalHostIPIF diff --git a/grammar/grammar.y b/grammar/grammar.y index 343daaaa..42da0efc 100644 --- a/grammar/grammar.y +++ b/grammar/grammar.y @@ -148,7 +148,6 @@ value: STRING { $$ = nvlstNewStr($1); } script: stmt { $$ = $1; } | script stmt { $$ = scriptAddStmt($1, $2); } stmt: actlst { $$ = $1; } - | STOP { $$ = cnfstmtNew(S_STOP); } | IF expr THEN block { $$ = cnfstmtNew(S_IF); $$->d.s_if.expr = $2; $$->d.s_if.t_then = $4; @@ -161,14 +160,16 @@ stmt: actlst { $$ = $1; } | UNSET VAR ';' { $$ = cnfstmtNewUnset($2); } | PRIFILT block { $$ = cnfstmtNewPRIFILT($1, $2); } | PROPFILT block { $$ = cnfstmtNewPROPFILT($1, $2); } - | CALL NAME { $$ = cnfstmtNewCall($2); } - | CONTINUE { $$ = cnfstmtNewContinue(); } block: stmt { $$ = $1; } | '{' script '}' { $$ = $2; } actlst: s_act { $$ = $1; } | actlst '&' s_act { $$ = scriptAddStmt($1, $3); } +/* s_act are actions and action-like statements */ s_act: BEGIN_ACTION nvlst ENDOBJ { $$ = cnfstmtNewAct($2); } | LEGACY_ACTION { $$ = cnfstmtNewLegaAct($1); } + | STOP { $$ = cnfstmtNew(S_STOP); } + | CALL NAME { $$ = cnfstmtNewCall($2); } + | CONTINUE { $$ = cnfstmtNewContinue(); } expr: expr AND expr { $$ = cnfexprNew(AND, $1, $3); } | expr OR expr { $$ = cnfexprNew(OR, $1, $3); } | NOT expr { $$ = cnfexprNew(NOT, NULL, $2); } -- cgit v1.2.3 From 3d0122be52faa6009f43f151a1ca24cf30ef12cc Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 10:19:54 +0200 Subject: disable deprecated warnings in omdiscard/omruleset ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem. --- plugins/omruleset/omruleset.c | 4 ++++ tools/omdiscard.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c index 6c770c94..d1d6eb00 100644 --- a/plugins/omruleset/omruleset.c +++ b/plugins/omruleset/omruleset.c @@ -165,8 +165,12 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) p += sizeof(":omruleset:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ CHKiRet(createInstance(&pData)); + /* re-enable in v7.3: requires action list to support + * action-like statements, something that is too late to + * do in 7.1. errmsg.LogError(0, RS_RET_DEPRECATED, "warning: omruleset is deprecated, consider " "using the 'call' statement instead"); + */ /* check if a non-standard template is to be applied */ if(*(p-1) == ';') diff --git a/tools/omdiscard.c b/tools/omdiscard.c index 15c6ea82..08cd7491 100644 --- a/tools/omdiscard.c +++ b/tools/omdiscard.c @@ -95,9 +95,13 @@ CODE_STD_STRING_REQUESTparseSelectorAct(0) if(*p == '~') { dbgprintf("discard\n"); + /* re-enable in v7.3: requires action list to support + * action-like statements, something that is too late to + * do in 7.1. errmsg.LogError(0, RS_RET_DEPRECATED, "warning: ~ action " "is deprecated, consider using the 'stop' " "statement instead"); + */ } else { iRet = RS_RET_CONFLINE_UNPROCESSED; } -- cgit v1.2.3 From d82327c9547c6fb2dcd6d1820c81e4da72c9531b Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 10:27:07 +0200 Subject: re-enable deprecated warings for omdiscard/omruleset merge for action list functionality will follow soon --- plugins/omruleset/omruleset.c | 4 ---- tools/omdiscard.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c index d1d6eb00..6c770c94 100644 --- a/plugins/omruleset/omruleset.c +++ b/plugins/omruleset/omruleset.c @@ -165,12 +165,8 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) p += sizeof(":omruleset:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ CHKiRet(createInstance(&pData)); - /* re-enable in v7.3: requires action list to support - * action-like statements, something that is too late to - * do in 7.1. errmsg.LogError(0, RS_RET_DEPRECATED, "warning: omruleset is deprecated, consider " "using the 'call' statement instead"); - */ /* check if a non-standard template is to be applied */ if(*(p-1) == ';') diff --git a/tools/omdiscard.c b/tools/omdiscard.c index 08cd7491..15c6ea82 100644 --- a/tools/omdiscard.c +++ b/tools/omdiscard.c @@ -95,13 +95,9 @@ CODE_STD_STRING_REQUESTparseSelectorAct(0) if(*p == '~') { dbgprintf("discard\n"); - /* re-enable in v7.3: requires action list to support - * action-like statements, something that is too late to - * do in 7.1. errmsg.LogError(0, RS_RET_DEPRECATED, "warning: ~ action " "is deprecated, consider using the 'stop' " "statement instead"); - */ } else { iRet = RS_RET_CONFLINE_UNPROCESSED; } -- cgit v1.2.3 From ede5d1a1217a9101e0288a1ef7cc6c06f2705564 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 10:48:41 +0200 Subject: testbench: -c option no longer exists --- tests/diag.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/diag.sh b/tests/diag.sh index b278d2c5..bd38b29d 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -36,12 +36,12 @@ case $1 in ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use # returns only after successful startup, $3 is the instance (blank or 2!) - $valgrind ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & + $valgrind ../tools/rsyslogd -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & $srcdir/diag.sh wait-startup $3 ;; 'startup-vg') # start rsyslogd with default params under valgrind control. $2 is the config file name to use # returns only after successful startup, $3 is the instance (blank or 2!) - valgrind --log-fd=1 --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & + valgrind --log-fd=1 --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & $srcdir/diag.sh wait-startup $3 ;; 'wait-startup') # wait for rsyslogd startup ($2 is the instance) -- cgit v1.2.3 From 95fefbc12a71c26e02bb1de8628b3f70a6856b08 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 11:20:07 +0200 Subject: prepare for 7.20 stable release & minor things The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized. --- ChangeLog | 5 ++++- configure.ac | 2 +- doc/manual.html | 2 +- runtime/nsdpoll_ptcp.c | 2 +- tools/syslogd.c | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dc5584b..dbabd9b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ ---------------------------------------------------------------------------- -Version 7.1.13 [beta] 2012-10-?? +Version 7.2.0 [v7-stable] 2012-10-22 +This starts a new stable branch based on 7.1.12 plus the following changes: - bugfix: imuxsock did not properly honor $LocalHostIPIF +- omruleset/omdiscard do no longer issue "deprecated" warings, as 7.1 + grammar does not permit to use the replacements under all circumstances ---------------------------------------------------------------------------- Version 7.1.12 [beta] 2012-10-18 - minor updates to better support newer systemd developments diff --git a/configure.ac b/configure.ac index 3c5b6764..5e92e349 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],[7.1.12],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[7.2.0],[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 45ba771b..e645f2ca 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 7.1.12 (beta branch) of rsyslog. +

This documentation is for version 7.2.0 (v7-stable 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/runtime/nsdpoll_ptcp.c b/runtime/nsdpoll_ptcp.c index e69c0fbb..8d95811a 100644 --- a/runtime/nsdpoll_ptcp.c +++ b/runtime/nsdpoll_ptcp.c @@ -66,7 +66,7 @@ addEvent(nsdpoll_ptcp_t *pThis, int id, void *pUsr, int mode, nsd_ptcp_t *pSock, nsdpoll_epollevt_lst_t *pNew; DEFiRet; - CHKmalloc(pNew = (nsdpoll_epollevt_lst_t*) malloc(sizeof(nsdpoll_epollevt_lst_t))); + CHKmalloc(pNew = (nsdpoll_epollevt_lst_t*) calloc(1, sizeof(nsdpoll_epollevt_lst_t))); pNew->id = id; pNew->pUsr = pUsr; pNew->pSock = pSock; diff --git a/tools/syslogd.c b/tools/syslogd.c index edb546a1..c5801555 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1858,7 +1858,7 @@ int realMain(int argc, char **argv) CHKiRet(bufOptAdd(ch, optarg)); break; case 'c': /* compatibility mode */ - fprintf(stderr, "rsyslogd: error: option -c is no longer supported - ignored"); + fprintf(stderr, "rsyslogd: error: option -c is no longer supported - ignored\n"); break; case 'd': /* debug - must be handled now, so that debug is active during init! */ debugging_on = 1; -- cgit v1.2.3 From 6bfc397b09eab1269a718f1bf661bb31cadd626b Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 12:20:18 +0200 Subject: preparing for 6.6.0 --- ChangeLog | 7 +++++-- configure.ac | 2 +- doc/manual.html | 2 +- runtime/nsdpoll_ptcp.c | 2 +- tests/diag.sh | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4d3f1d7..38768095 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ --------------------------------------------------------------------------- -Version 6.5.2 [beta] 2012-10-?? +Version 6.6.0 [v6-stable] 2012-10-22 +This starts a new stable branch, based on the 6.5.x series, plus: - bugfix: imuxsock did not properly honor $LocalHostIPIF --------------------------------------------------------------------------- Version 6.5.1 [beta] 2012-10-11 @@ -56,7 +57,9 @@ Version 6.5.0 [devel] 2012-08-28 Note: patches were released under ASL 2.0, see http://bugzilla.adiscon.com/show_bug.cgi?id=353 --------------------------------------------------------------------------- -Version 6.4.3 [V6-STABLE] 2012-??-?? +Version 6.4.3 [V6-STABLE/NEVER RELEASED] 2012-??-?? +This version was never released as 6.6.0 came quickly enough. Note that +all these patches here are present in 6.6.0. - cleanup: removed remains of -c option (compatibility mode) both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 diff --git a/configure.ac b/configure.ac index 2c3bb2ab..7664cf39 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.5.1],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[6.6.0],[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 15281921..9c7c677e 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.5.1 (beta branch) of rsyslog. +

This documentation is for version 6.6.0 (v6-stable 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/runtime/nsdpoll_ptcp.c b/runtime/nsdpoll_ptcp.c index e69c0fbb..8d95811a 100644 --- a/runtime/nsdpoll_ptcp.c +++ b/runtime/nsdpoll_ptcp.c @@ -66,7 +66,7 @@ addEvent(nsdpoll_ptcp_t *pThis, int id, void *pUsr, int mode, nsd_ptcp_t *pSock, nsdpoll_epollevt_lst_t *pNew; DEFiRet; - CHKmalloc(pNew = (nsdpoll_epollevt_lst_t*) malloc(sizeof(nsdpoll_epollevt_lst_t))); + CHKmalloc(pNew = (nsdpoll_epollevt_lst_t*) calloc(1, sizeof(nsdpoll_epollevt_lst_t))); pNew->id = id; pNew->pUsr = pUsr; pNew->pSock = pSock; diff --git a/tests/diag.sh b/tests/diag.sh index b278d2c5..bd38b29d 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -36,12 +36,12 @@ case $1 in ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use # returns only after successful startup, $3 is the instance (blank or 2!) - $valgrind ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & + $valgrind ../tools/rsyslogd -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & $srcdir/diag.sh wait-startup $3 ;; 'startup-vg') # start rsyslogd with default params under valgrind control. $2 is the config file name to use # returns only after successful startup, $3 is the instance (blank or 2!) - valgrind --log-fd=1 --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & + valgrind --log-fd=1 --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & $srcdir/diag.sh wait-startup $3 ;; 'wait-startup') # wait for rsyslogd startup ($2 is the instance) -- cgit v1.2.3 From 2a4c68954b717b8c09221a86794c8a5573120726 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 23 Oct 2012 09:39:56 +0200 Subject: bugfix: segfault on startup when modules using MSG_PASSING mode are used --- ChangeLog | 1 + action.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7825cc7c..8c762c61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ --------------------------------------------------------------------------- Version 7.3.2 [devel] 2012-10-?? - permited action-like statements (stop, call, ...) in action lists +- bugfix: segfault on startup when modules using MSG_PASSING mode are used --------------------------------------------------------------------------- Version 7.3.1 [devel] 2012-10-19 - optimized template processing performance, especially for $NOW family diff --git a/action.c b/action.c index cf010d01..33580f7f 100644 --- a/action.c +++ b/action.c @@ -1890,13 +1890,16 @@ actionRequiresDateCall(action_t *pAction) int i; int r = 0; + if(pAction->eParamPassing == ACT_MSG_PASSING) + /* in msg passing mode, we have NO templates! */ + goto done; for(i = 0 ; i < pAction->iNumTpls ; ++i) { if(tplRequiresDateCall(pAction->ppTpl[i])) { r = 1; break; } } - return r; +done: return r; } -- cgit v1.2.3