[rsyslog/f20] Add a patch to fix a warning in omjournal

[Tomas Heinrich]

commit 2ec4016d07738d379f1e82e8b8b179b6f146ad55
Author: Tomas Heinrich <theinric at redhat.com>
Date:   Wed Jan 8 16:27:34 2014 +0100

    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(+), 0 deletions(-)
---
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 <theinric at redhat.com>
+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 8b5d978..3885508 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -28,6 +28,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
 
 BuildRequires: bison
 BuildRequires: flex
@@ -246,6 +248,7 @@ of source ports.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %ifarch sparc64
@@ -478,6 +481,8 @@ done
 - install the rsyslog-recover-qi.pl tool
 - fix a typo in a package description
 - add missing defattr directives
+- add rsyslog-7.4.8-omjournal-warning.patch to fix
+  a condition for issuing a warning in omjournal
 
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild