app-admin/rsyslog: Drop old versions for cleanup

Package-Manager: Portage-2.3.3, Repoman-2.3.1

5 files changed, 0 insertions, 234 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
deleted file mode 100644
index 99e2d3642981..000000000000
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 2157607e60d6..000000000000
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-leap-year-handling.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
deleted file mode 100644
index 6cf8fa667f3f..000000000000
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From ffb321f1698a971e0acda48cafa97bb344cf0829 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Wed, 2 Mar 2016 11:43:09 +0100
-Subject: [PATCH] bugfix: unixtimestamp was incorrectly computed
-
-The problem happened in leap year from March til then end
-of year and healed itself at the begining of the next year.
-During the problem period, the timestamp was 24 hours too
-low.
-
-This is primarily a simple fix that can also be applied to
-older rsyslog versions. However, we will see if we can
-refactor the code to make use of mktime(). Originally, that
-was not done for some issues seen, which may no longer
-apply.
-
-fixes https://github.com/rsyslog/rsyslog/issues/830
----
- runtime/datetime.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/runtime/datetime.c b/runtime/datetime.c
-index efb4c81..a07c1b7 100644
---- a/runtime/datetime.c
-+++ b/runtime/datetime.c
-@@ -1054,6 +1054,11 @@ time_t syslogTime2time_t(struct syslogTime *ts)
- 			MonthInDays = 0;	/* any value fits ;) */
- 			break;
- 	}	
-+	/* adjust for leap years */
-+	if((ts->year % 100 != 0 && ts->year % 4 == 0) || (ts->year == 2000)) {
-+		if(ts->month > 2)
-+			MonthInDays++;
-+	}
- 
- 
- 	/*	1) Counting how many Years have passed since 1970
-@@ -1064,7 +1069,7 @@ time_t syslogTime2time_t(struct syslogTime *ts)
- 
- 	NumberOfYears = ts->year - yearInSec_startYear - 1;
- 	NumberOfDays = MonthInDays + ts->day - 1;
--	TimeInUnixFormat = yearInSecs[NumberOfYears] + NumberOfDays * 86400;
-+	TimeInUnixFormat = (yearInSecs[NumberOfYears] + 1) + NumberOfDays * 86400;
- 
- 	/*Add Hours, minutes and seconds */
- 	TimeInUnixFormat += ts->hour*60*60;
-From 5cb41f748329986d5e2aa8d5e87f224bb9cb8234 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Wed, 2 Mar 2016 15:58:18 +0100
-Subject: [PATCH] timestamp handling: guard against invalid dates
-
-We do not permit dates outside of the year 1970..2100
-interval. Note that network-receivers do already guard
-against this, so the new guard only guards against invalid
-system time. Still good to have (especially when things are
-extended...)
----
- runtime/datetime.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/runtime/datetime.c b/runtime/datetime.c
-index 9641363..87290c9 100644
---- a/runtime/datetime.c
-+++ b/runtime/datetime.c
-@@ -1023,6 +1023,13 @@ time_t syslogTime2time_t(struct syslogTime *ts)
- 	int utcOffset;
- 	time_t TimeInUnixFormat;
- 
-+	if(ts->year < 1970 || ts->year > 2100) {
-+		TimeInUnixFormat = 0;
-+		errmsg.LogError(0, RS_RET_ERR, "syslogTime2time_t: invalid year %d "
-+			"in timestamp - returning 1970-01-01 instead", ts->year);
-+		goto done;
-+	}
-+
- 	/* Counting how many Days have passed since the 01.01 of the
- 	 * selected Year (Month level), according to the selected Month*/
- 
-@@ -1096,6 +1103,7 @@ time_t syslogTime2time_t(struct syslogTime *ts)
- 	if(ts->OffsetMode == '+')
- 		utcOffset *= -1; /* if timestamp is ahead, we need to "go back" to UTC */
- 	TimeInUnixFormat += utcOffset;
-+done:
- 	return TimeInUnixFormat;
- }
- 
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
deleted file mode 100644
index c906c05f0e55..000000000000
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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);
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch
deleted file mode 100644
index b28fbed062b8..000000000000
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From ac9acbd9297cf986873e972968aca98d65377dab Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann
-Date: Sun, 28 Aug 2016 20:08:58 +0200
-Subject: [PATCH 1/2] configure: Restrict to json-c usage
-
----
- configure.ac | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4551c46..6789ab2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,10 +26,8 @@ PKG_PROG_PKG_CONFIG
- 
- # modules we require
- PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
--PKG_CHECK_MODULES([JSON_C], [libfastjson],, [
--	PKG_CHECK_MODULES([JSON_C], [json],, [
--		PKG_CHECK_MODULES([JSON_C], [json-c],,)
--	])
-+PKG_CHECK_MODULES([JSON_C], [json],, [
-+	PKG_CHECK_MODULES([JSON_C], [json-c],,)
- ])
- 
- save_CFLAGS="$CFLAGS"
--- 
-2.9.3
-
-
-From 7eed92763725244a53c50110fbe7419ba90d41a6 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann
-Date: Sun, 28 Aug 2016 20:15:32 +0200
-Subject: [PATCH 2/2] configure: Restrict to liblognorm-1.1.2 usage
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6789ab2..5f29106 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -927,7 +927,7 @@ AC_ARG_ENABLE(mmnormalize,
-         [enable_mmnormalize=no]
- )
- if test "x$enable_mmnormalize" = "xyes"; then
--	PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.1.2)
-+	PKG_CHECK_MODULES(LIBLOGNORM, lognorm = 1.1.2)
- 
- 	save_CFLAGS="$CFLAGS"
- 	save_LIBS="$LIBS"
--- 
-2.9.3
-