app-admin/rsyslog: Bump to version 8.16.0

Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

3 files changed, 93 insertions, 0 deletions

diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch
new file mode 100644
index 000000000000..99e2d3642981
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch
@@ -0,0 +1,30 @@
+Workaround for https://github.com/rsyslog/rsyslog/issues/746
+
+--- rsyslog-9999/tests/imfile-readmode2-vg.sh	2016-01-20 12:35:20.368238216 +0100
++++ rsyslog-9999/tests/imfile-readmode2-vg.sh	2016-01-20 12:36:14.357031527 +0100
+@@ -11,7 +11,7 @@ echo 'msgnum:0
+ echo 'msgnum:2' >> rsyslog.input
+ 
+ # sleep a little to give rsyslog a chance to begin processing
+-sleep 1
++sleep 10
+ 
+ # write some more lines (see https://github.com/rsyslog/rsyslog/issues/144)
+ echo 'msgnum:3
+@@ -19,14 +19,14 @@ echo 'msgnum:3
+ echo 'msgnum:5' >> rsyslog.input # this one shouldn't be written to the output file because of ReadMode 2
+ 
+ # give it time to finish
+-sleep 1
++sleep 10
+ 
+ . $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+ . $srcdir/diag.sh wait-shutdown-vg    # we need to wait until rsyslogd is finished!
+ . $srcdir/diag.sh check-exit-vg
+ 
+ # give it time to write the output file
+-sleep 1
++sleep 10
+ 
+ ## check if we have the correct number of messages
+ 
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch
new file mode 100644
index 000000000000..2157607e60d6
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch
@@ -0,0 +1,12 @@
+Workaround for https://github.com/rsyslog/rsyslog/issues/688
+
+--- rsyslog-9999/tests/imtcp-tls-basic-vg.sh	2016-01-20 12:01:44.493617917 +0100
++++ rsyslog-9999/tests/imtcp-tls-basic-vg.sh	2016-01-20 12:04:18.394711527 +0100
+@@ -9,6 +9,7 @@ echo \$DefaultNetstreamDriverCertFile $s
+ echo \$DefaultNetstreamDriverKeyFile $srcdir/tls-certs/key.pem   >>rsyslog.conf.tlscert
+ . $srcdir/diag.sh startup-vg-noleak imtcp-tls-basic.conf
+ . $srcdir/diag.sh tcpflood -p13514 -m50000 -Ttls -Z$srcdir/tls-certs/cert.pem -z$srcdir/tls-certs/key.pem
++sleep 10
+ . $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+ . $srcdir/diag.sh wait-shutdown-vg
+ . $srcdir/diag.sh check-exit-vg
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch
new file mode 100644
index 000000000000..c906c05f0e55
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch
@@ -0,0 +1,51 @@
+From b435f4e7d2ece7f2ea0a7b42826498e224be3f23 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Wed, 3 Feb 2016 16:32:07 +0100
+Subject: [PATCH] bugfix: queue engine can loose one message during queue
+ shutdown
+
+... due to improper checking of return states.
+
+closes https://github.com/rsyslog/rsyslog/issues/262
+---
+ runtime/ruleset.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/runtime/ruleset.c b/runtime/ruleset.c
+index ae5a9bd..6ca97e8 100644
+--- a/runtime/ruleset.c
++++ b/runtime/ruleset.c
+@@ -495,6 +495,7 @@ processBatch(batch_t *pBatch, wti_t *pWti)
+ 	int i;
+ 	msg_t *pMsg;
+ 	ruleset_t *pRuleset;
++	rsRetVal localRet;
+ 	DEFiRet;
+ 
+ 	DBGPRINTF("processBATCH: batch of %d elements must be processed\n", pBatch->nElem);
+@@ -506,15 +507,19 @@ processBatch(batch_t *pBatch, wti_t *pWti)
+ 		pMsg = pBatch->pElem[i].pMsg;
+ 		DBGPRINTF("processBATCH: next msg %d: %.128s\n", i, pMsg->pszRawMsg);
+ 		pRuleset = (pMsg->pRuleset == NULL) ? ourConf->rulesets.pDflt : pMsg->pRuleset;
+-		scriptExec(pRuleset->root, pMsg, pWti);
+-		// TODO: think if we need a return state of scriptExec - most probably
+-		// the answer is "no", as we need to process the batch in any case!
+-		// TODO: we must refactor this!  flag messages as committed
+-		batchSetElemState(pBatch, i, BATCH_STATE_COMM);
++		localRet = scriptExec(pRuleset->root, pMsg, pWti);
++		/* the most important case here is that processing may be aborted
++		 * due to pbShutdownImmediate, in which case we MUST NOT flag this
++		 * message as committed. If we would do so, the message would
++		 * potentially be lost.
++		 */
++		if(localRet == RS_RET_OK)
++			batchSetElemState(pBatch, i, BATCH_STATE_COMM);
+ 	}
+ 
+ 	/* commit phase */
+-	dbgprintf("END batch execution phase, entering to commit phase\n");
++	DBGPRINTF("END batch execution phase, entering to commit phase "
++		"[processed %d of %d messages]\n", i, batchNumMsgs(pBatch));
+ 	actionCommitAllDirect(pWti);
+ 
+ 	DBGPRINTF("processBATCH: batch of %d elements has been processed\n", pBatch->nElem);