[rsyslog] Fix default syslog priority of imjournal messages

[Tomas Heinrich]

commit fa6a64804caf5561e3ca557c5eaa1148d5e793df
Author: Tomas Heinrich <theinric at redhat.com>
Date:   Fri Mar 20 18:22:46 2015 +0100

    Fix default syslog priority of imjournal messages

 rsyslog-8.8.0-imjournal-dflt-pri.patch | 27 +++++++++++++++++++++++++++
 rsyslog.spec                           |  8 +++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/rsyslog-8.8.0-imjournal-dflt-pri.patch b/rsyslog-8.8.0-imjournal-dflt-pri.patch
new file mode 100644
index 0000000..738d52d
--- /dev/null
+++ b/rsyslog-8.8.0-imjournal-dflt-pri.patch
@@ -0,0 +1,27 @@
+From f88f5d4f7e57a6f41b01d4e06f8d40dee4c0dbad Mon Sep 17 00:00:00 2001
+From: Tomas Heinrich <theinric at redhat.com>
+Date: Fri, 20 Mar 2015 18:17:05 +0100
+Subject: [PATCH] imjournal: fix default message priority
+
+---
+ plugins/imjournal/imjournal.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
+index 7c2c2fa..b5866e8 100644
+--- a/plugins/imjournal/imjournal.c
++++ b/plugins/imjournal/imjournal.c
+@@ -97,8 +97,8 @@ static struct cnfparamblk modpblk =
+ 	};
+ 
+ #define DFLT_persiststateinterval 10
+-#define DFLT_SEVERITY pri2fac(LOG_NOTICE)
+-#define DFLT_FACILITY pri2sev(LOG_USER)
++#define DFLT_SEVERITY pri2sev(LOG_NOTICE)
++#define DFLT_FACILITY pri2fac(LOG_USER)
+ 
+ static int bLegacyCnfModGlobalsPermitted = 1;/* are legacy module-global config parameters permitted? */
+ 
+-- 
+1.9.3
+
diff --git a/rsyslog.spec b/rsyslog.spec
index 341f027..93a14bd 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -12,7 +12,7 @@
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
 Version: 8.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -26,6 +26,7 @@ Patch0: rsyslog-8.8.0-sd-service.patch
 # prevent modification of trusted properties (proposed upstream)
 Patch1: rsyslog-8.8.0-immutable-json-props.patch
 Patch2: rsyslog-8.8.0-missing-test-data.patch
+Patch3: rsyslog-8.8.0-imjournal-dflt-pri.patch
 
 BuildRequires: bison
 BuildRequires: dos2unix
@@ -251,6 +252,7 @@ mv build doc
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifarch sparc64
@@ -497,6 +499,10 @@ done
 %{_libdir}/rsyslog/omudpspoof.so
 
 %changelog
+* Fri Mar 20 2015 Tomas Heinrich <theinric at redhat.com> 8.8.0-2
+- add a patch to fix default syslog priority assigned to journal
+  messages which have none
+
 * Thu Mar 19 2015 Tomas Heinrich <theinric at redhat.com> 8.8.0-1
 - rebase to 8.8.0
   resolves: rhbz#1069690