rpms/rsyslog
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update patch3

Browse Source
This commit is contained in:
Tomas Heinrich 2014-02-09 20:22:33 +01:00
parent 943b294f51
commit 910802ebc4
3 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
rsyslog-7.3.15-imuxsock-warning.patch
View File

@ -1,35 +0,0 @@
From ac6c45537391d67beb55b03ccf301bdaa150cd8a Mon Sep 17 00:00:00 2001
From: Tomas Heinrich <theinric@redhat.com>
Date: Mon, 3 Jun 2013 15:09:07 +0200
Subject: [PATCH] imuxsock: don't report an error message for
$OmitLocalLogging
---
plugins/imuxsock/imuxsock.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index c503852..dad09ab 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -1284,6 +1284,8 @@ BEGINactivateCnfPrePrivDrop
instanceConf_t *inst;
CODESTARTactivateCnfPrePrivDrop
runModConf = pModConf;
+ if(runModConf->bOmitLocalLogging && nfd == 1)
+ ABORT_FINALIZE(RS_RET_OK);
for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
addListner(inst);
}
@@ -1325,6 +1327,8 @@ BEGINrunInput
#endif
CODESTARTrunInput
+ if(runModConf->bOmitLocalLogging && nfd == 1)
+ 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.7.10.4

39
rsyslog-7.4.8-imuxsock-wrn.patch Normal file
View File

@ -0,0 +1,39 @@
From 8e0ac9576056a71dd7ad69157a94d56d433afbf6 Mon Sep 17 00:00:00 2001
From: Tomas Heinrich <theinric@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

4
rsyslog.spec
View File

@ -25,7 +25,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.7-numeric-uid.patch
@ -492,6 +492,8 @@ done
a condition for issuing a warning in omjournal
- 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 Feb 09 2014 Lubomir Rintel <lkundrak@v3.sk> 7.4.7-3
- Fixed 32-bit PowerPC build