From 0ba70cd0e88bc29cd72b8f89d8a4fb4a64b93db8 Mon Sep 17 00:00:00 2001 From: Tomas Heinrich Date: Fri, 7 Feb 2014 14:18:23 +0100 Subject: [PATCH] Add a patch to fix a warning in omjournal --- rsyslog-7.4.8-omjournal-warning.patch | 25 +++++++++++++++++++++++++ rsyslog.spec | 5 +++++ 2 files changed, 30 insertions(+) create mode 100644 rsyslog-7.4.8-omjournal-warning.patch diff --git a/rsyslog-7.4.8-omjournal-warning.patch b/rsyslog-7.4.8-omjournal-warning.patch new file mode 100644 index 0000000..6d4a18a --- /dev/null +++ b/rsyslog-7.4.8-omjournal-warning.patch @@ -0,0 +1,25 @@ +From e921bfe82068a1767311181ad7f4c78ed86e2577 Mon Sep 17 00:00:00 2001 +From: Tomas Heinrich +Date: Thu, 16 Jan 2014 11:43:55 +0100 +Subject: [PATCH] bugfix: invert the logic for issuing a warning + +--- + plugins/omjournal/omjournal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/omjournal/omjournal.c b/plugins/omjournal/omjournal.c +index 160c369..937d277 100644 +--- a/plugins/omjournal/omjournal.c ++++ b/plugins/omjournal/omjournal.c +@@ -153,7 +153,7 @@ ENDdoAction + BEGINparseSelectorAct + CODESTARTparseSelectorAct + CODE_STD_STRING_REQUESTparseSelectorAct(1) +- if(strncmp((char*) p, ":omjournal:", sizeof(":omjournal:") - 1)) { ++ if(!strncmp((char*) p, ":omjournal:", sizeof(":omjournal:") - 1)) { + errmsg.LogError(0, RS_RET_LEGA_ACT_NOT_SUPPORTED, + "omjournal supports only v6+ config format, use: " + "action(type=\"omjournal\" ...)"); +-- +1.8.4.3 + diff --git a/rsyslog.spec b/rsyslog.spec index 8933c1a..e48b7a3 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -26,6 +26,8 @@ Patch1: rsyslog-7.2.2-manpage-dbg-mode.patch Patch2: rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch # merged upstream Patch3: rsyslog-7.3.15-imuxsock-warning.patch +# merged upstream +Patch4: rsyslog-7.4.8-omjournal-warning.patch Patch5: rsyslog-7.4.7-numeric-uid.patch Patch6: rsyslog-7.4.7-atomicops.patch @@ -247,6 +249,7 @@ of source ports. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -482,6 +485,8 @@ done rsyslog-7.4.7-bz1030044-remove-ads.patch - add an explicit requirement on the version of libestr - drop the "v5" string from the conf file as it's misleading +- add rsyslog-7.4.8-omjournal-warning.patch to fix + a condition for issuing a warning in omjournal * Sun Feb 09 2014 Lubomir Rintel 7.4.7-3 - Fixed 32-bit PowerPC build