[rsyslog/f20] Update patch3

[Tomas Heinrich]

commit ed591fd92f26029c8446400c8298b0aae3c22843
Author: Tomas Heinrich <theinric at redhat.com>
Date:   Sun Feb 9 20:22:33 2014 +0100

    Update patch3

 rsyslog-7.3.15-imuxsock-warning.patch |   35 -----------------------------
 rsyslog-7.4.8-imuxsock-wrn.patch      |   39 +++++++++++++++++++++++++++++++++
 rsyslog.spec                          |    4 ++-
 3 files changed, 42 insertions(+), 36 deletions(-)
---
diff --git a/rsyslog-7.4.8-imuxsock-wrn.patch b/rsyslog-7.4.8-imuxsock-wrn.patch
new file mode 100644
index 0000000..9974cf6
--- /dev/null
+++ b/rsyslog-7.4.8-imuxsock-wrn.patch
@@ -0,0 +1,39 @@
+From 8e0ac9576056a71dd7ad69157a94d56d433afbf6 Mon Sep 17 00:00:00 2001
+From: Tomas Heinrich <theinric at redhat.com>
+Date: Mon, 20 Jan 2014 16:23:17 +0100
+Subject: [PATCH] imuxsock: don't issue a warning if there are no sockets
+ configured
+
+---
+ plugins/imuxsock/imuxsock.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
+index df504dd..aadb853 100644
+--- a/plugins/imuxsock/imuxsock.c
++++ b/plugins/imuxsock/imuxsock.c
+@@ -1291,6 +1291,10 @@ CODESTARTactivateCnfPrePrivDrop
+ 	for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
+ 		addListner(inst);
+ 	}
++	if(runModConf->bOmitLocalLogging && nfd == 1) {
++		/* No sockets were configured, no reason to run. */
++		ABORT_FINALIZE(RS_RET_OK);
++	}
+ 	CHKiRet(activateListeners());
+ finalize_it:
+ ENDactivateCnfPrePrivDrop
+@@ -1329,6 +1333,10 @@ BEGINrunInput
+ #endif
+ 
+ CODESTARTrunInput
++	if(runModConf->bOmitLocalLogging && nfd == 1) {
++		/* No sockets were configured, no reason to run. */
++		ABORT_FINALIZE(RS_RET_OK);
++	}
+ 	/* this is an endless loop - it is terminated when the thread is
+ 	 * signalled to do so. This, however, is handled by the framework,
+ 	 * right into the sleep below.
+-- 
+1.8.4.3
+
diff --git a/rsyslog.spec b/rsyslog.spec
index 0344f97..644b75d 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -27,7 +27,7 @@ Patch1: rsyslog-7.2.2-manpage-dbg-mode.patch
 # prevent modification of trusted properties (proposed upstream)
 Patch2: rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch
 # merged upstream
-Patch3: rsyslog-7.3.15-imuxsock-warning.patch
+Patch3: rsyslog-7.4.8-imuxsock-wrn.patch
 # merged upstream
 Patch4: rsyslog-7.4.8-omjournal-warning.patch
 Patch5: rsyslog-7.4.8-numeric-uid.patch
@@ -495,6 +495,8 @@ done
 - drop the "v5" string from the conf file as it's misleading
 - add rsyslog-7.4.8-dont-link-libee.patch to prevent
   linking the main binary with libee
+- replace rsyslog-7.3.15-imuxsock-warning.patch
+  with rsyslog-7.4.8-imuxsock-wrn.patch
 
 * 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