开源软件构建与测试

_service:tar_scm:rsyslog.spec Changed

@@ -6,8 +6,8 @@
 %define systemd_lived 1
 
 Name:           rsyslog
-Version:        8.2210.0
-Release:        7
+Version:        8.2312.0
+Release:        1
 Summary:        The rocket-fast system for log processing
 License:        (GPLv3+ and ASL 2.0)
 URL:            http://www.rsyslog.com/
@@ -20,7 +20,7 @@
 Source6:        os_check_timezone_for_rsyslog.sh
 Source7:        timezone.cron
 Source8:        rsyslog.service
-Source9:	timezone_update.sh
+Source9:        timezone_update.sh
 
 Patch9000:      rsyslog-8.24.0-ensure-parent-dir-exists-when-writting-log-file.patch
 Patch9001:      bugfix-rsyslog-7.4.7-imjournal-add-monotonic-timestamp.patch
@@ -28,16 +28,8 @@
 Patch9003:      rsyslog-8.37.0-initialize-variables-and-check-return-value.patch
 Patch9004:      print-main-queue-info-to-journal-when-queue-full.patch
 Patch9005:      print-main-queue-info-to-journal-when-receive-USR1-signal.patch
- 
-Patch6000:      backport-core-bugfix-local-hostname-invalid-if-no-global-config-object-given.patch 
-Patch6001:      backport-imtcp-bugfix-legacy-config-directives-did-no-longer-work.patch
-Patch6002:      backport-core-bugfix-template-system-may-generate-invalid-json.patch
-Patch6003:      backport-omprog-bugfix-invalid-status-handling-at-called-prog.patch
-Patch6004:      backport-imjournal-add-second-fallback-to-_COMM.patch
-Patch6005:      backport-bugfix-prevent-pot.-segfault-when-switchung.patch
-Patch6006:      backport-core-bugfix-using-uuid-msg-prop-can-deadloc.patch
-Patch6007:      backport-GNUTls-Driver-Fix-memory-leaks-in-gtlsInitC.patch
-Patch6008:      backport-outchannel-eleminate-type-cast-for-compatibility-rea.patch
+
+Patch6000:      backport-outchannel-eleminate-type-cast-for-compatibility-rea.patch
 
 BuildRequires:  gcc autoconf automake bison dos2unix flex pkgconfig python3-docutils libtool
 BuildRequires:  libgcrypt-devel libuuid-devel zlib-devel krb5-devel libnet-devel gnutls-devel
@@ -141,7 +133,7 @@
 Summary: RELP protocol support for rsyslog
 Group: System Environment/Daemons
 Requires: %name = %version-%release
-BuildRequires: librelp-devel >= 1.0.3
+BuildRequires: librelp-devel >= 1.2.16
 
 %description relp
 The rsyslog-relp package contains the rsyslog plugins that provide
@@ -239,6 +231,13 @@
 spoof the sender address. Also, it enables to circle through a number
 of source ports.
 
+%package mmtaghostname
+Summary: Message modification module supporting adding tags
+Requires: %name = %version-%release
+
+%description mmtaghostname
+This module provides message modification for changing or adding the host name.
+
 %package_help
 Provides: %{name}-doc
 
@@ -303,7 +302,8 @@
 	--enable-snmp \
 	--enable-unlimited-select \
 	--enable-usertools \
-	--enable-omkafka
+	--enable-omkafka \
+	--enable-mmtaghostname
 
 %make_build
 
@@ -496,6 +496,9 @@
 %files udpspoof
 %{_libdir}/rsyslog/omudpspoof.so
 
+%files mmtaghostname
+%{_libdir}/rsyslog/mmtaghostname.so
+
 %files help
 %doc %{rsyslog_docdir}/html
 %{_mandir}/man5/rsyslog.conf.5.gz
@@ -503,6 +506,12 @@
 %{_mandir}/man1/rscryutil.1.gz
 
 %changelog
+* Sun Feb 18 2024 sunhai <sunhai10@huawei.com> - 8.2312.0-1
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC: update to 8.2312 version
+
 * Mon Dec 25 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 8.2210.0-7
 - Type:bugfix
 - ID:NA

_service:tar_scm:backport-GNUTls-Driver-Fix-memory-leaks-in-gtlsInitC.patch Deleted

@@ -1,54 +0,0 @@
-From 0f06a850ced79244774734ed525b289f2930d9c7 Mon Sep 17 00:00:00 2001
-From: Andre lorbach <alorbach@adiscon.com>
-Date: Thu, 11 May 2023 16:49:11 +0200
-Subject: PATCH backport GNUTls Driver: Fix memory leaks in gtlsInitCred
-
-Missing CA Certificate or multiple Connections caused
-a memory leak in pThis->xcred as it was allocated each time in
-gtlsInitCred by gnutls_certificate_allocate_credentials
-
-closes: https://github.com/rsyslog/rsyslog/issues/5135
-
----
-
-Conflict:NA
-Type:bugfix
-Reference:https://github.com/rsyslog/rsyslog/commit/3401d687d2d5f9556165b53be79fbe4dc49b8c79
-
----
----
- runtime/nsd_gtls.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c
-index e003d85d3..91cffb500 100644
---- a/runtime/nsd_gtls.c
-+++ b/runtime/nsd_gtls.c
-@@ -711,7 +711,10 @@ gtlsInitCred(nsd_gtls_t *const pThis )
- 	DEFiRet;
- 
- 	/* X509 stuff */
--	CHKgnutls(gnutls_certificate_allocate_credentials(&pThis->xcred));
-+	if (pThis->xcred == NULL) {
-+		/* Allocate only ONCE */
-+		CHKgnutls(gnutls_certificate_allocate_credentials(&pThis->xcred));
-+	}
- 
- 	/* sets the trusted cas file */
- 	cafile = (pThis->pszCAFile == NULL) ? glbl.GetDfltNetstrmDrvrCAF(runConf) : pThis->pszCAFile;
-@@ -2277,7 +2280,12 @@ finalize_it:
- 		if(pThis->bHaveSess) {
- 			gnutls_deinit(pThis->sess);
- 			pThis->bHaveSess = 0;
-+			/* Free memory using gnutls api first*/
-+			gnutls_certificate_free_credentials(pThis->xcred);
- 			pThis->xcred = NULL;
-+			/* Free other memory */
-+			free(pThis->pszConnectHost);
-+			pThis->pszConnectHost = NULL;
- 		}
- 	}
- 
--- 
-2.33.0
-

_service:tar_scm:backport-bugfix-prevent-pot.-segfault-when-switchung.patch Deleted

@@ -1,57 +0,0 @@
-From 1807410d18519520ed813dd4b9d2b2d34e583415 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Sun, 30 Oct 2022 18:43:26 +0100
-Subject: PATCH backport bugfix: prevent pot. segfault when switchung to
- queue emergency mode
-
-When switching to Disk queue emergency mode, we destructed the in-memory
-queue object.  Practice has shown that this MAY cause races during
-destruction which themselfs can lead to segfault. For that reason, we
-now keep the disk queueu object. This will keep some ressources,
-including disk space, allocated. But  we prefer that over a segfault.
-After all, it only happens after a serious queue error when we are
-already at the edge of hard problems.
-
-see also: https://github.com/rsyslog/rsyslog/issues/4963
-
----
-
-Conflict:NA
-Type:bugfix
-Reference:https://github.com/rsyslog/rsyslog/commit/eaac48d0d23afe0146454cd9f5004ddcb47cc81b
-
----
----
- runtime/queue.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/runtime/queue.c b/runtime/queue.c
-index b3fdd5101..856b4df25 100644
---- a/runtime/queue.c
-+++ b/runtime/queue.c
-@@ -794,8 +794,12 @@ static rsRetVal qDelLinkedList(qqueue_t *pThis)
- /* The following function is used to "save" ourself from being killed by
-  * a fatally failed disk queue. A fatal failure is, for example, if no
-  * data can be read or written. In that case, the disk support is disabled,
-- * with all on-disk structures kept as-is as much as possible. Instead, the
-- * queue is switched to direct mode, so that at least
-+ * with all on-disk structures kept as-is as much as possible. However,
-+ * we do not really stop or destruct the in-memory disk queue object.
-+ * Practice has shown that this may cause races during destruction which
-+ * themselfs can lead to segfault. So we prefer to was some ressources by
-+ * keeping the queue active.
-+ * Instead, the queue is switched to direct mode, so that at least
-  * some processing can happen. Of course, this may still have lots of
-  * undesired side-effects, but is probably better than aborting the
-  * syslogd. Note that this function *must* succeed in one way or another, as
-@@ -808,7 +812,6 @@ queueSwitchToEmergencyMode(qqueue_t *pThis, rsRetVal initiatingError)
- {
- 	pThis->iQueueSize = 0;
- 	pThis->nLogDeq = 0;
--	qDestructDisk(pThis); /* free disk structures */
- 
- 	pThis->qType = QUEUETYPE_DIRECT;
- 	pThis->qConstruct = qConstructDirect;
--- 
-2.12.3
-

_service:tar_scm:backport-core-bugfix-local-hostname-invalid-if-no-global-config-object-given.patch Deleted

@@ -1,45 +0,0 @@
-From e2beca531157a4c0a27bcdda689bc53373e305b3 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Thu, 20 Oct 2022 18:08:11 +0200
-Subject: PATCH core bugfix: local hostname invalid if no global() config
- object given
-
-The local hostname is invalidly set to "localhost" on rsyslog startup
-if no global() config object is present in rsyslog.conf. Sending a HUP
-corrects the hostname.
-
-This is a regression from ba00a9f25293f
-
-closes https://github.com/rsyslog/rsyslog/issues/4975,
-closes https://github.com/rsyslog/rsyslog/issues/4825From cfe12d3df739adc6e583e3d4dd798f492b0aa17e Mon Sep 17 00:00:00 2001
-
-Conflict:NA
-Reference:https://github.com/rsyslog/rsyslog/commit/e2beca531157a4c0a27bcdda689bc53373e305b3
----
- runtime/glbl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/runtime/glbl.c b/runtime/glbl.c
-index ff11419..71c3989 100644
---- a/runtime/glbl.c
-+++ b/runtime/glbl.c
-@@ -1567,6 +1567,7 @@ glblDoneLoadCnf(void)
- 		stddbg = -1;
- 	}
- 
-+finalize_it:
- 	/* we have now read the config. We need to query the local host name now
- 	 * as it was set by the config.
- 	 *
-@@ -1575,8 +1576,7 @@ glblDoneLoadCnf(void)
- 	 * are taken from that queue, the hostname will be adapted.
- 	 */
- 	queryLocalHostname();
--
--finalize_it:	RETiRet;
-+	RETiRet;
- }
- 
- 
--- 
-2.27.0

_service:tar_scm:backport-core-bugfix-template-system-may-generate-invalid-json.patch Deleted

@@ -1,66 +0,0 @@
-From 246b8d8553b6880146d6c489a28cf4bacea8a199 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Fri, 30 Dec 2022 17:13:17 +0100
-Subject: PATCH core bugfix: template system may generate invalid json
- 
-When
-- a list template
-- is created with option.jsonf="on"
-- and the last list element is a property with onEmpty="skip"
-- and that property is actually empty
-invalid JSON is generated.
- 
-The JSON string in this case ends with ", " instead of "}\n". This
-patch fixes the issue.
- 
-closes https://github.com/rsyslog/rsyslog/issues/5050
----
- 
-Conflict:NA
-Reference:https://github.com/rsyslog/rsyslog/commit/246b8d8553b6880146d6c489a28cf4bacea8a199
----
- template.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
- 
-diff --git a/template.c b/template.c
-index 21d8b8d..18bcda7 100644
---- a/template.c
-+++ b/template.c
-@@ -163,6 +163,7 @@ tplToString(struct template *__restrict__ const pTpl,
- 	unsigned short bMustBeFreed = 0;
- 	uchar *pVal;
- 	rs_size_t iLenVal = 0;
-+	int need_comma = 0;
- 
- 	if(pTpl->pStrgen != NULL) {
- 		CHKiRet(pTpl->pStrgen(pMsg, iparam));
-@@ -230,15 +231,24 @@ tplToString(struct template *__restrict__ const pTpl,
- 			if(iBuf + iLenVal + extra_space >= iparam->lenBuf) /* we reserve one char for the final \0! */
- 				CHKiRet(ExtendBuf(iparam, iBuf + iLenVal + 1));
- 
-+			if(need_comma) {
-+				memcpy(iparam->param + iBuf, ", ", 2);
-+				iBuf += 2;
-+			}
- 			memcpy(iparam->param + iBuf, pVal, iLenVal);
- 			iBuf += iLenVal;
- 			if(pTpl->optFormatEscape == JSONF) {
--				memcpy(iparam->param + iBuf,
--					(pTpe->pNext == NULL) ? "}\n" : ", ", 2);
--				iBuf += 2;
-+				need_comma = 1;
- 			}
- 		}
- 
-+		if((pTpl->optFormatEscape == JSONF) && (pTpe->pNext == NULL)) {
-+			/* space was reserved while processing field above
-+			   (via extra_space in ExtendBuf() new size formula. */
-+			memcpy(iparam->param + iBuf, "}\n", 2);
-+			iBuf += 2;
-+		}
-+
- 		if(bMustBeFreed) {
- 			free(pVal);
- 			bMustBeFreed = 0;
--- 
-2.27.0
\ No newline at end of file

_service:tar_scm:backport-core-bugfix-using-uuid-msg-prop-can-deadloc.patch Deleted

@@ -1,84 +0,0 @@
-From deefc958c388995fac99c581284fb86eb9653ece Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Thu, 23 Mar 2023 10:58:32 +0100
-Subject: PATCH backport core/bugfix: using $uuid msg prop can deadlock
- rsyslog on shutdown
-
-This problem can occur if a large number of threads is used and rsyslog
-cannot shut down all queues etc within the regular time interval. In this
-case, it cancels some threads. That can leave the mutex guarding libuuid
-calls locked and thus prevents other, not yet cancelled threads from
-progressing. Assuming pthread_mutex_lock() is not a cancellation point,
-this will case these other threads to hang forever and thus create a
-deadlock situation.
-
-closes https://github.com/rsyslog/rsyslog/issues/5104
-
----
-
-Conflict:NA
-Type:bugfix
-Reference:https://github.com/rsyslog/rsyslog/commit/82687e14fbf3d854e8cc954efb9fb0efa69a28d2
-
----
----
- runtime/msg.c | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/runtime/msg.c b/runtime/msg.c
-index 73b7cec80..a3ddb8684 100644
---- a/runtime/msg.c
-+++ b/runtime/msg.c
-@@ -7,7 +7,7 @@
-  * of the "old" message code without any modifications. However, it
-  * helps to have things at the right place one we go to the meat of it.
-  *
-- * Copyright 2007-2022 Rainer Gerhards and Adiscon GmbH.
-+ * Copyright 2007-2023 Rainer Gerhards and Adiscon GmbH.
-  *
-  * This file is part of the rsyslog runtime library.
-  *
-@@ -1618,13 +1618,22 @@ msgSetPRI(smsg_t *const __restrict__ pMsg, syslog_pri_t pri)
- /* note: libuuid seems not to be thread-safe, so we need
-  * to get some safeguards in place.
-  */
-+static pthread_mutex_t mutUUID = PTHREAD_MUTEX_INITIALIZER;
-+
-+static void call_uuid_generate(uuid_t uuid)
-+{
-+	pthread_mutex_lock(&mutUUID);
-+	pthread_cleanup_push(mutexCancelCleanup, &mutUUID);
-+	uuid_generate(uuid);
-+	pthread_cleanup_pop(1);
-+}
-+
- static void msgSetUUID(smsg_t * const pM)
- {
- 	size_t lenRes = sizeof(uuid_t) * 2 + 1;
- 	char hex_char  = "0123456789ABCDEF";
- 	unsigned int byte_nbr;
- 	uuid_t uuid;
--	static pthread_mutex_t mutUUID = PTHREAD_MUTEX_INITIALIZER;
- 
- 	dbgprintf("MsgSetUUID START, lenRes %llu\n", (long long unsigned) lenRes);
- 	assert(pM != NULL);
-@@ -1632,9 +1641,7 @@ static void msgSetUUID(smsg_t * const pM)
- 	if((pM->pszUUID = (uchar*) malloc(lenRes)) == NULL) {
- 		pM->pszUUID = (uchar *)"";
- 	} else {
--		pthread_mutex_lock(&mutUUID);
--		uuid_generate(uuid);
--		pthread_mutex_unlock(&mutUUID);
-+		call_uuid_generate(uuid);
- 		for (byte_nbr = 0; byte_nbr < sizeof (uuid_t); byte_nbr++) {
- 			pM->pszUUIDbyte_nbr * 2 + 0 = hex_charuuid byte_nbr >> 4;
- 			pM->pszUUIDbyte_nbr * 2 + 1 = hex_charuuid byte_nbr & 15;
-@@ -5352,5 +5359,3 @@ BEGINObjClassInit(msg, 1, OBJ_IS_CORE_MODULE)
- 	INIT_ATOMIC_HELPER_MUT(mutTrimCtr);
- #	endif
- ENDObjClassInit(msg)
--/* vim:set ai:
-- */
--- 
-2.12.3
-

_service:tar_scm:backport-imjournal-add-second-fallback-to-_COMM.patch Deleted

@@ -1,38 +0,0 @@
-From 45900dd550e0aca724a4ec66c2833de3d27565e1 Mon Sep 17 00:00:00 2001
-From: alakatos <alakatos@redhat.com>
-Date: Mon, 31 Oct 2022 14:40:12 +0100
-Subject: PATCH backport imjournal: add second fallback to _COMM
-
-If SYSLOG_IDENTIFIER is not present in the journal message,
-then lookup the _COMM field, which stands for the name
-of the process the journal entry originates from. This is
-needed in order to be in compliance with the journalctl
-output.
-
----
-
-Conflict:NA
-Type:bugfix
-Reference:https://github.com/rsyslog/rsyslog/commit/fb5ae30e6ac4dc584dd9c5463e27e7fc5e9060a4
-
----
----
- plugins/imjournal/imjournal.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
-index 6fb3b7a07..4d9e59966 100644
---- a/plugins/imjournal/imjournal.c
-+++ b/plugins/imjournal/imjournal.c
-@@ -453,6 +453,8 @@ readjournal(void)
- 	/* Get message identifier, client pid and add ':' */
- 	if (journalGetData("SYSLOG_IDENTIFIER", &get, &length) >= 0) {
- 		CHKiRet(sanitizeValue(((const char *)get) + 18, length - 18, &sys_iden));
-+	} else if (journalGetData("_COMM", &get, &length) >= 0) {
-+		CHKiRet(sanitizeValue(((const char *)get) + 6, length - 6, &sys_iden));
- 	} else {
- 		CHKmalloc(sys_iden = strdup("journal"));
- 	}
--- 
-2.12.3
-

_service:tar_scm:backport-imtcp-bugfix-legacy-config-directives-did-no-longer-work.patch Deleted

@@ -1,98 +0,0 @@
-From 2623a89a0c66cced8fc37ac1daa0da936005bad6 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Tue, 15 Nov 2022 15:11:50 +0100
-Subject: PATCH imtcp bugfix: legacy config directives did no longer work
-
-Many "$InputTCPServer..." config directives did no longer work
-and were completely ignored (e.g. "$InputTCPServerStreamDriverMode").
-
-This was a regression from a08591be5d9 (May, 5th 2021).
-
-closes https://github.com/rsyslog/rsyslog/issues/5021
-
-Conflict:NA
-Reference:https://github.com/rsyslog/rsyslog/commit/2623a89a0c66cced8fc37ac1daa0da936005bad6
----
- plugins/imtcp/imtcp.c                   | 15 ++++++++++++++-
- runtime/nsd_gtls.c                      |  3 ++-
- tests/imtcp-tls-gtls-x509name-legacy.sh | 10 ++++++----
- 3 files changed, 22 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
-index ccc99b0..e275750 100644
---- a/plugins/imtcp/imtcp.c
-+++ b/plugins/imtcp/imtcp.c
-@@ -446,6 +446,20 @@ static rsRetVal addInstance(void __attribute__((unused)) *pVal, uchar *pNewVal)
- 		CHKmalloc(inst->pszInputName = ustrdup(cs.pszInputName));
- 	}
- 	inst->cnf_params->bSuppOctetFram = cs.bSuppOctetFram;
-+	inst->iStrmDrvrMode = cs.iStrmDrvrMode;
-+	inst->bKeepAlive = cs.bKeepAlive ;
-+	inst->bUseFlowControl = cs.bUseFlowControl;
-+	inst->bDisableLFDelim = cs.bDisableLFDelim;
-+	inst->bEmitMsgOnClose = cs.bEmitMsgOnClose;
-+	inst->bPreserveCase = cs.bPreserveCase;
-+	inst->iKeepAliveProbes = cs.iKeepAliveProbes;
-+	inst->iKeepAliveIntvl = cs.iKeepAliveIntvl;
-+	inst->iKeepAliveTime = cs.iKeepAliveTime;
-+	inst->iKeepAliveTime = cs.iKeepAliveTime;
-+	inst->iAddtlFrameDelim = cs.iAddtlFrameDelim;
-+	inst->iTCPLstnMax = cs.iTCPLstnMax;
-+	inst->iTCPSessMax = cs.iTCPSessMax;
-+	inst->iStrmDrvrMode = cs.iStrmDrvrMode;
- 
- finalize_it:
- 	free(pNewVal);
-@@ -952,7 +966,6 @@ RunServerThread(void *myself)
- {
- 	tcpsrv_etry_t *const etry = (tcpsrv_etry_t*) myself;
- 	rsRetVal iRet;
--	dbgprintf("RGER: running ety %p\n", etry);
- 	iRet = tcpsrv.Run(etry->tcpsrv);
- 	if(iRet != RS_RET_OK) {
- 		LogError(0, iRet, "imtcp: error while terminating server; rsyslog may hang on shutdown");
-diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c
-index 65e492d..378febb 100644
---- a/runtime/nsd_gtls.c
-+++ b/runtime/nsd_gtls.c
-@@ -1430,12 +1430,13 @@ ENDobjDestruct(nsd_gtls)
-  * rgerhards, 2008-04-28
-  */
- static rsRetVal
--SetMode(nsd_t *pNsd, int mode)
-+SetMode(nsd_t *const pNsd, const int mode)
- {
- 	DEFiRet;
- 	nsd_gtls_t *pThis = (nsd_gtls_t*) pNsd;
- 
- 	ISOBJ_TYPE_assert((pThis), nsd_gtls);
-+	dbgprintf("(tls) mode: %d\n", mode);
- 	if(mode != 0 && mode != 1) {
- 		LogError(0, RS_RET_INVALID_DRVR_MODE, "error: driver mode %d not supported by "
- 				"gtls netstream driver", mode);
-diff --git a/tests/imtcp-tls-gtls-x509name-legacy.sh b/tests/imtcp-tls-gtls-x509name-legacy.sh
-index c2c9bdd..4e8878c 100755
---- a/tests/imtcp-tls-gtls-x509name-legacy.sh
-+++ b/tests/imtcp-tls-gtls-x509name-legacy.sh
-@@ -12,12 +12,14 @@ global(	defaultNetstreamDriverCAFile="'$srcdir/tls-certs/ca.pem'"
- 
- # NOTE: we intentionally use legacy statements here! This *IS* what we want to test!
- $ModLoad ../plugins/imtcp/.libs/imtcp
-+$DefaultNetstreamDriver gtls
- $inputTcpserverStreamdriverPermittedPeer rsyslog-client
- 
--input(type="imtcp" port="0" listenPortFileName="'$RSYSLOG_DYNNAME'.tcpflood_port"
--	StreamDriver.Name="gtls"
--	StreamDriver.Mode="1"
--	StreamDriver.AuthMode="x509/name")
-+$InputTCPServerStreamDriverAuthMode x509/name
-+$InputTCPServerStreamDriverPermittedPeer Log_Streaming_Client
-+$InputTCPServerStreamDriverMode 1
-+$InputTCPServerListenPortFile '$RSYSLOG_DYNNAME'.tcpflood_port
-+$InputTCPServerRun 0
- 
- template(name="outfmt" type="string" string="%msg:F,58:2%\n")
- :msg, contains, "msgnum:" action(	type="omfile" 
--- 
-2.27.0
-

_service:tar_scm:backport-omprog-bugfix-invalid-status-handling-at-called-prog.patch Deleted

@@ -1,47 +0,0 @@
-From 1128d320750fb6cfe57b8ad53ef1d5ddf80c81cf Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Sun, 4 Dec 2022 16:05:22 +0100
-Subject: PATCH omprog bugfix: invalid status handling at called program
- 
-There is a bug when external program *startup* does not return "OK". This
-can also lead to a misadressing with potentially a segfault (very unlikely).
-Note that no problem exists once the initializiation phase of the external
-program is finished and regular message transfer runs.
- 
-The problem basically is that for a startup failure, the control data for
-that external program instance is freed on error. Unfortunately, that state
-data is needed later on to detect a suspended instance. We now keep the control
-data even on init failure (as we then need to do normal control options).
- 
-closes https://github.com/rsyslog/rsyslog/issues/4967
----
-Conflict:NA
-Reference:https://github.com/rsyslog/rsyslog/commit/1128d320750fb6cfe57b8ad53ef1d5ddf80c81cf
----
- plugins/omprog/omprog.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
- 
-diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c
-index 4f46f92..dd83e93 100644
---- a/plugins/omprog/omprog.c
-+++ b/plugins/omprog/omprog.c
-@@ -379,6 +379,7 @@ cleanupChild(instanceData *pData, childProcessCtx_t *pChildCtx)
- static void
- terminateChild(instanceData *pData, childProcessCtx_t *pChildCtx)
- {
-+	DBGPRINTF("terminateChild called\n");
- 	assert(pChildCtx->bIsRunning);
- 
- 	if (pData->bSignalOnClose) {
-@@ -927,9 +928,6 @@ CODESTARTcreateWrkrInstance
- 	}
- 
- finalize_it:
--	if(iRet != RS_RET_OK && !pWrkrData->pData->bForceSingleInst) {
--		free(pWrkrData->pChildCtx);
--	}
- ENDcreateWrkrInstance
- 
- 
--- 
-2.27.0
\ No newline at end of file

_service:tar_scm:bugfix-rsyslog-7.4.7-imjournal-add-monotonic-timestamp.patch Changed

@@ -9,10 +9,10 @@
  1 file changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
-index 29dcec1..3a93b37 100644
+index cda9b4b..2268018 100644
 --- a/plugins/imjournal/imjournal.c
 +++ b/plugins/imjournal/imjournal.c
-@@ -386,6 +386,7 @@ readjournal(void)
+@@ -447,6 +447,7 @@ readjournal(struct journalContext_s *journalContext, ruleset_t *pBindRuleset)
  
  	struct timeval tv;
  	uint64_t timestamp;
@@ -20,7 +20,7 @@
  
  	struct fjson_object *json = NULL;
  	int r;
-@@ -395,6 +396,9 @@ readjournal(void)
+@@ -456,6 +457,9 @@ readjournal(struct journalContext_s *journalContext, ruleset_t *pBindRuleset)
  	char *sys_iden;
  	char *sys_iden_help = NULL;
  
@@ -30,13 +30,13 @@
  	const void *get;
  	const void *pidget;
  	size_t length;
-@@ -501,8 +505,19 @@ readjournal(void)
+@@ -564,8 +568,19 @@ readjournal(struct journalContext_s *journalContext, ruleset_t *pBindRuleset)
  
- 	iRet = updateJournalCursor();
+ 	iRet = updateJournalCursor(journalContext);
  
 -	/* submit message */
--	enqMsg((uchar *)message, (uchar *) sys_iden_help, facility, severity, &tv, json, 0);
-+	if (journalGetData("_SOURCE_MONOTONIC_TIMESTAMP", &get, &length) >= 0)
+-	enqMsg((uchar *)message, (uchar *) sys_iden_help, facility, severity, &tv, json, 0, pBindRuleset);
++	if (journalGetData(journalContext, "_SOURCE_MONOTONIC_TIMESTAMP", &get, &length) >= 0)
 +	{
 +	       t = strndup(get+28, length-28);
 +	       monotonic_timestamp = atoll(t);
@@ -44,11 +44,11 @@
 +	       tpmessage = (char *)malloc(strlen(message)+30);
 +	       int ret = sprintf(tpmessage,"%5lu.%06lu ",monotonic_timestamp/1000000, monotonic_timestamp%1000000);
 +	       memcpy(tpmessage+(ret > 30 ? 0 :(ret < 0 ? 0:ret)),message,strlen(message)+1);
-+	       enqMsg((uchar *)tpmessage, (uchar *) sys_iden_help, facility, severity, &tv, json, 0);
++	       enqMsg((uchar *)tpmessage, (uchar *) sys_iden_help, facility, severity, &tv, json, 0, pBindRuleset);
 +	       free(tpmessage);
 +	}else
 +	       /* submit message */
-+	       enqMsg((uchar *)message, (uchar *) sys_iden_help, facility, severity, &tv, json, 0);
++	       enqMsg((uchar *)message, (uchar *) sys_iden_help, facility, severity, &tv, json, 0, pBindRuleset);
  
  finalize_it:
  	free(sys_iden_help);

_service:tar_scm:print-main-queue-info-to-journal-when-receive-USR1-signal.patch Changed

@@ -10,22 +10,22 @@
 Signed-off-by: wangshouping <wangshouping@huawei.com>
 Signed-off-by: pengyi37 <pengyi37@huawei.com>
 ---
- tools/rsyslogd.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
+ tools/rsyslogd.c | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
 
 diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c
-index 31b91a1..b92aca5 100644
+index d27a2a7..6aa81b8 100644
 --- a/tools/rsyslogd.c
 +++ b/tools/rsyslogd.c
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
  #endif
  #ifdef HAVE_LIBSYSTEMD
  #	include <systemd/sd-daemon.h>
 +#include <systemd/sd-journal.h>
  #endif
- 
- #include "rsyslog.h"
-@@ -182,6 +183,9 @@ static pthread_mutex_t mutChildDied;
+ #ifdef ENABLE_LIBCAPNG
+ 	#include <cap-ng.h>
+@@ -189,6 +190,9 @@ static pthread_mutex_t mutChildDied;
  static int bChildDied = 0;
  static pthread_mutex_t mutHadHUP;
  static int bHadHUP;
@@ -35,11 +35,8 @@
  static int doFork = 1; 	/* fork - run in daemon mode - read-only after startup */
  int bFinished = 0;	/* used by termination signal handler, read-only except there
  			 * is either 0 or the number of the signal that requested the
-@@ -1294,9 +1298,16 @@ rsyslogdDebugSwitch(void)
- 		dbgprintf("\n");
- 		debugging_on = 0;
+@@ -1377,6 +1381,12 @@ rsyslogdDebugSwitch(void)
  	}
-+
  }
  
 +#ifdef HAVE_LIBSYSTEMD
@@ -47,12 +44,11 @@
 +{
 +	g_bRecordQueue = 1;
 +}
- 
 +#endif
+ 
  /* This is the main entry point into rsyslogd. Over time, we should try to
   * modularize it a bit more...
-  *
-@@ -1629,7 +1640,11 @@ initAll(int argc, char **argv)
+@@ -1798,7 +1808,11 @@ initAll(int argc, char **argv)
  		hdlr_enable(SIGINT,  rsyslogdDoDie);
  		hdlr_enable(SIGQUIT, rsyslogdDoDie);
  	} else {
@@ -64,7 +60,7 @@
  		hdlr_enable(SIGINT,  SIG_IGN);
  		hdlr_enable(SIGQUIT, SIG_IGN);
  	}
-@@ -1971,6 +1986,9 @@ mainloop(void)
+@@ -2143,6 +2157,9 @@ mainloop(void)
  	sigaddset(&sigblockset, SIGTERM);
  	sigaddset(&sigblockset, SIGCHLD);
  	sigaddset(&sigblockset, SIGHUP);
@@ -74,20 +70,20 @@
  
  	do {
  		pthread_sigmask(SIG_BLOCK, &sigblockset, &origmask);
-@@ -2000,6 +2018,18 @@ mainloop(void)
+@@ -2174,6 +2191,18 @@ mainloop(void)
  
  		processImInternal();
  
 +#ifdef HAVE_LIBSYSTEMD
-+	if (g_bRecordQueue) {
-+		if (runConf->pMsgQueue != NULL) {
-+			sd_journal_print(LOG_NOTICE, "main queue size information: current QueueSize=%d MaxQeueSize=%d\n",
-+				runConf->pMsgQueue->iQueueSize, runConf->pMsgQueue->iMaxQueueSize);
-+		} else {
-+			sd_journal_print(LOG_NOTICE, "main queue size information: pMsgQueue is NULL!\n");
++		if (g_bRecordQueue) {
++			if (runConf->pMsgQueue != NULL) {
++				sd_journal_print(LOG_NOTICE, "main queue size information: current QueueSize=%d MaxQeueSize=%d\n",
++					runConf->pMsgQueue->iQueueSize, runConf->pMsgQueue->iMaxQueueSize);
++			} else {
++				sd_journal_print(LOG_NOTICE, "main queue size information: pMsgQueue is NULL!\n");
++			}
++			g_bRecordQueue = 0;
 +		}
-+		g_bRecordQueue = 0;
-+	}
 +#endif
 +
  		if(bFinished)

_service:tar_scm:rsyslog-8.37.0-initialize-variables-and-check-return-value.patch Changed

@@ -9,10 +9,10 @@
  1 file changed, 13 insertions(+), 9 deletions(-)
 
 diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
-index aa27fe7..c5d3d25 100644
+index 2268018..b7125a0 100644
 --- a/plugins/imjournal/imjournal.c
 +++ b/plugins/imjournal/imjournal.c
-@@ -386,7 +386,7 @@ readjournal(void)
+@@ -447,7 +447,7 @@ readjournal(struct journalContext_s *journalContext, ruleset_t *pBindRuleset)
  
  	struct timeval tv;
  	uint64_t timestamp;
@@ -21,7 +21,7 @@
  
  	struct fjson_object *json = NULL;
  	int r;
-@@ -396,8 +396,8 @@ readjournal(void)
+@@ -457,8 +457,8 @@ readjournal(struct journalContext_s *journalContext, ruleset_t *pBindRuleset)
  	char *sys_iden;
  	char *sys_iden_help = NULL;
  
@@ -32,29 +32,29 @@
  
  	const void *get;
  	const void *pidget;
-@@ -508,13 +508,17 @@ readjournal(void)
- 	if (journalGetData("_SOURCE_MONOTONIC_TIMESTAMP", &get, &length) >= 0)
+@@ -571,13 +571,17 @@ readjournal(struct journalContext_s *journalContext, ruleset_t *pBindRuleset)
+ 	if (journalGetData(journalContext, "_SOURCE_MONOTONIC_TIMESTAMP", &get, &length) >= 0)
  	{
  	       t = strndup(get+28, length-28);
 -	       monotonic_timestamp = atoll(t);
 -	       free(t);
-+	       if (t != NULL) {
++           if (t != NULL) {
 +		       monotonic_timestamp = atoll(t);
 +		       free(t);
 +	       }
  	       tpmessage = (char *)malloc(strlen(message)+30);
 -	       int ret = sprintf(tpmessage,"%5lu.%06lu ",monotonic_timestamp/1000000, monotonic_timestamp%1000000);
 -	       memcpy(tpmessage+(ret > 30 ? 0 :(ret < 0 ? 0:ret)),message,strlen(message)+1);
--	       enqMsg((uchar *)tpmessage, (uchar *) sys_iden_help, facility, severity, &tv, json, 0);
+-	       enqMsg((uchar *)tpmessage, (uchar *) sys_iden_help, facility, severity, &tv, json, 0, pBindRuleset);
 -	       free(tpmessage);
-+	       if (tpmessage != NULL) {
-+		       int ret = sprintf(tpmessage,"%5lu.%06lu ",monotonic_timestamp/1000000, monotonic_timestamp%1000000);
-+		       memcpy(tpmessage+(ret >= 30 ? 0 :(ret < 0 ? 0:ret)),message,strlen(message)+1);
-+		       enqMsg((uchar *)tpmessage, (uchar *) sys_iden_help, facility, severity, &tv, json, 0);
-+		       free(tpmessage);
-+	       }
++		   if (tpmessage != NULL) {
++	           int ret = sprintf(tpmessage,"%5lu.%06lu ",monotonic_timestamp/1000000, monotonic_timestamp%1000000);
++	           memcpy(tpmessage+(ret >= 30 ? 0 :(ret < 0 ? 0:ret)),message,strlen(message)+1);
++	           enqMsg((uchar *)tpmessage, (uchar *) sys_iden_help, facility, severity, &tv, json, 0, pBindRuleset);
++	           free(tpmessage);
++		   }
  	}else
  	       /* submit message */
- 	       enqMsg((uchar *)message, (uchar *) sys_iden_help, facility, severity, &tv, json, 0);
+ 	       enqMsg((uchar *)message, (uchar *) sys_iden_help, facility, severity, &tv, json, 0, pBindRuleset);
 -- 
 2.27.0

_service:tar_scm:rsyslog-8.2210.0.tar.gz/TODO Deleted

_service:tar_scm:rsyslog-8.2210.0.tar.gz/.tarball-version -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/.tarball-version Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/ChangeLog -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/ChangeLog Changed

@@ -1,4 +1,601 @@
 ----------------------------------------------------------------------------------------
+Scheduled Release 8.2312.0 (aka 2023.12) 2023-12-12
+- 2023-12-11: imjournal: Add new input module parameter 'defaulttag'
+  The DefaultTag option specifies the default value for the tag field.
+  In imjournal, this can happen when one of the following is missing:
+   * identifier string provided by the application (SYSLOG_IDENTIFIER)
+   * name of the process the journal entry originates from (_COMM)
+  Thanks to Attila Lakatos for the patch.
+- 2023-12-08: core bugfix: rsyslog messages may not always have FQDN
+  Even if hostname FQDN is configured, rsyslog internal messages generated
+  after rsyslog startup and before the first HUP will not necessarily have
+  FQDN but instead only the shortname of the local host. This commit
+  fixes the situation.
+  Special thanks to github user eciii for doing a great bug analysis
+  and helping us considerably to fix the issue.
+  closes https://github.com/rsyslog/rsyslog/issues/5218
+- 2023-12-08: omlibdbi regression fix: database path was not properly used
+  Commit 4a072d6c93015a63716c49a6c7756df22750086a caused a regression that made
+  the database path unreliable to use. Depending on platform/libc version the
+  basename was improperly extracted, which made access to the database of sqllite
+  impossible.
+  Thanks to Flávio Tapajós for the patch.
+  closes: https://github.com/rsyslog/rsyslog/issues/5282
+- 2023-12-06: mazureeventhubs: Corrected handling of transport closed failures
+  - Added test for connection interrupts (requires root)
+  - Corrected handling of PN_TRANSPORT_CLOSED.
+  - Make sure Connection is being reestablished trough tryResume
+  - Enhanced Debug log output
+  closes: https://github.com/rsyslog/rsyslog/issues/5269
+- 2023-11-24: imkmsg: add params "readMode" and "expectedBootCompleteSeconds"
+  These parameters permit to control when imkmsg reads the full
+  kernel log upon startup.
+  Parameter "readMode" provides the following options:
+    * full-boot - (default) read full klog, but only "immediately" after
+      boot. "Immediately" is hereby meant in seconds of system
+      uptime given in "expectedBootCompleteSeconds"
+    * full-always - read full klog on every rsyslog startup. Most
+      probably causes messag duplication
+    * new-only - never emit existing kernel log message, read only
+      new ones.
+  Note that some message loss can happen if rsyslog is stopped
+  in "full-boot" and "new-only" read mode. The longer rsyslog is
+  inactive, the higher the message loss probability and potential
+  number of messages lost. For typical restart scenarios, this
+  should be minimal. On HUP, no message loss occurs as rsyslog
+  is not actually stopped.
+  The default value for "expectedBootCompleteSeconds" is 90.
+  see also https://github.com/rsyslog/rsyslog/issues/5161
+- 2023-11-10: imkmsg: add module param parseKernelTimestamp
+  The parameter permits to select whether or not and when kernel
+  timestamps shall parsed, that is be used as the actual time a
+  log message occurs.
+  This permits to work around problems with the way kernel
+  timestamps are represented. The reasoning is given in a sysklogd
+  commit by Joachim Wiberg, which we reproduce below ("QUOTE") to
+  have a stable reference.
+  The commit itself can be found for example at:
+  https://github.com/troglobit/sysklogd/commit/9f6fbb3301e571d8af95f8d771469291384e9e95
+  The new parameter parseKernelTimestamp has three possible modes:
+  "startup" - uses the kernel time stamp during the initial read
+  loop of /dev/kmsg, but replaced it later ignores it for later reads.
+  This is the DEFAULT setting.
+  "on" - kernel timestamps are always used and no correction is tried
+  "off" - kernel timestamps are never used, system time is used instead
+  Note that there this is a slightly breaking change. Previously, imkmsg
+  reported similar to "off" mode, now it reports by default in "startup"
+  mode. We consider this acceptable, as "off" mode timestamps are not
+  correct for startup. After startup, the behaviour is correct. All in
+  all, the new default is kind of a bugfix.
+  ============== QUOTE ===============
+  The spec1 says the /dev/kmsg timestamp is a monotonic clock and in
+  microseconds.  After a while you realize it's also relative to the boot
+  of the system, that fact was probably too obvious to be put in the spec.
+  However, what's *not* in the spec, and what takes a while to realize, is
+  that this monotonic time is *not* adjusted for suspend/resume cycles ...
+  On a frequently used laptop this can manifest itself as follows.  The
+  kernel is stuck on Nov 15, and for the life of me I cannot find any to
+  adjust for this offset:
+      $ dmesg -T |tail -1; date
+      Mon Nov 15 01:42:08 2021 wlan0: Limiting TX power to 23 (23 - 0) dBm as advertised by 18:e8:29:55:b0:62
+      Tue 23 Nov 2021 05:20:53 PM CET
+  Hence this patch.  After initial "emptying" of /dev/kmsg when syslogd
+  starts up, we raise a flag (denoting done with backlog), and after this
+  point we ignore the kernel's idea of time and replace it with the actual
+  time we have now, the same that userspace messages are logged with.
+  Sure, there will be occasions where there's a LOT of kernel messages to
+  read and we won't be able to keep track.  Yet, this patch is better than
+  the current state (where we log Nov 15).
+  1: https://www.kernel.org/doc/Documentation/ABI/testing/dev-kmsg
+  ===========END QUOTE ===============
+  closes https://github.com/rsyslog/rsyslog/issues/4561
+  closes https://github.com/rsyslog/rsyslog/issues/5161
+- 2023-11-07: imfile bugfix: remove state file on file delete
+  The state file would remain in the working directory
+  after shutdown, even though deleteStateOnfileDelete is
+  set to "on" and the monitored file was removed.
+  closes https://github.com/rsyslog/rsyslog/issues/5258
+  Thanks to Attila Lakatos for the patch.
+- 2023-10-31: TLS subsystem: fix small memory leak on startup
+  This was a one-time leak of the file name that hapened if a certificate file
+  was not accessible. It had no operational issues, but could confuse automatted
+  testing. As not only a side-effect, certificate load failures are now somewhat
+  more verbosely reported, which we consider helpful to the user.
+  Thanks to Attila Lakatos for the patch.
+- 2023-10-31: imklog bugfix: keepKernelTimestamp=off config param did not work
+   ... at least not as expected. It was only honored for kernel-level
+   messages and only when parseKernelTimestamp was "on". Otherwise, the
+   kernel timestamp was always kept inside the message.
+   closes https://github.com/rsyslog/rsyslog/issues/5160
+- 2023-10-26: TLS subsystem: add remote hostname to error reporting
+  This provides richer and easier to process logs for error and warning
+  cases. One goal is to enable automatic operations without the need
+  to consolidate multiple message to a single information.
+  This improves one situation in gtls driver and provides a more
+  generic approach in ossl driver for OpenSSL error reporting.
+  There is probably still room for improvement, however this patch
+  is at least a good starting point for further work. Please
+  provide feedback if you need more!
+  closes https://github.com/rsyslog/rsyslog/issues/5244
+- 2023-10-24: imjournal: add the ability to run multiple journal inputs
+  This may be useful to de-couple journal processing.
+  Thanks to Willy Tu for the patch.
+- 2023-10-24: regression fix: forking rsyslogd on BSD did not work
+  Actually, this was an issue for all platforms that do not provide open file handle
+  detection via the /proc file system.
+  Tech details: After fork if the child process uses close_range to close open file
+  descriptors it has no way to exempt the parentPipeFD causing a failure to signal
+  successful startup to the parent process. This causes failures on all systems that
+  aren't Linux that implement close_range.
+  Thanks to Nathan Huff for the patch.
+- 2023-10-24: omusrmsg: use logind instead of utmp for wall messages with systemd
+  Future SUSE versions will get rid of utmp due to a 32bit time_t counter
+  overflow in 2038.
+  See details at:
+  https://github.com/thkukuk/utmpx/blob/main/Y2038.md
+  On systemd based systems logind is an alternative to utmp.
+  Thanks to github user tblume for the patch.
+- 2023-10-24: cleanup: rm no longer used --with-systemdsystemunitdir configure switch
+  This is a clean up following the removal of the service unit in
+  cfd07503ba055100a84d75d1a78a5c6cceb9fdab
+- 2023-10-23: testbench: bump zookeeper version to match current offering
+  Older version can no longer be downloaded. It also makes sense to
+  test with mainstream version.
+----------------------------------------------------------------------------------------
+Scheduled Release 8.2310.0 (aka 2023.10) 2023-10-10
+- 2023-10-04: Add CAP_NET_RAW capability due to the omudpspoof module
+  The CAP_NET_RAW ensures the use of RAW and PACKET sockets,
+  which is utilized by the omudpspoof module, more precisely
+  the libnet_init function.
+  Thanks to Attila Lakatos for the patch.
+- 2023-10-04: Add new global config option "libcapng.enable"
+  Defines whether rsyslog should drop capabilities at startup or not.
+  By default, it is set to "on". Until this point, if the project was
+  compiled with --enable-libcap-ng option, capabilities were
+  automatically dropped. This is configurable now.
+  Thanks to Attila Lakatos for the patch.
+- 2023-10-04: tcp net subsystem: handle data race gracefully
+  It may happen that a socket file descriptor has been closed either
+  while setting up poll() et al or while being inside the system call.
+  This was previously treated as error and caused abort in debug
+  builds. However, it was essentially ignored in production builds.
+  This has now been fixed and now is always gracefully ignored. This
+  most importantly fixes some flakes in CI runs (which were caused
+  by this situation).
+- 2023-09-29: imrelp bufgifx: avoid crash on restart in imrelp SIGTTIN handler
+  While existing, if at specific time rsyslog receives a SIGTTIN, it
+  crashes due to 2 issues.
+  1. debug.unloadModules="off" a double free of pRelpEngine
+  2. debug.unloadModules="on" it crashes because the signal handler has
+     been unmapped from memory.
+  This patch covers both issues.
+  Thanks to Ali Abdallah for the patch.
+- 2023-09-28: fix startup issue on modern systemd systems
+  When we startup AND are told to auto-background ourselfs, we must
+  close all unneeded file descriptors. Not doing this has some
+  security implications. Traditionally, we do this by iterating
+  over all possible file descriptor values. This is fairly compatible,
+  because we need no OS-specific method. However, modern systemd configs
+  tend to not limit the number of fds, so there are potentially 2^30(*)
+  fds to close. While this is OKish, it takes some time and makes
+  systemd think that rsyslog did not properly start up.
+  We have now solved this by using the /proc filesystem to obtain our
+  currently open fds. This works for Linux, as well as Cygwin, NetBSD,
+  FreeBDS and MacOS. Where not available,and close_range() is available
+  on the (build) platform, we try to use it. If that fails as well, we
+  fall back to the traditional method. In our opionion, this fallback
+  is unproblematic, as on these platforms there is no systemd and in
+  almost all cases a decent number of fds to close.
+  Very special thanks go out to Brennan Kinney, who clearly described
+  the issue to us on github and also provided ample ways to solve it.
+  What we did is just implement what we think is the best fit from
+  rsyslog's PoV.
+  (*) Some details below on the number of potentially to close fds.
+      This is directly from a github posting from Brennan Kinney.
+  Just to clarify, by default since systemd v240 (2018Q4), that
+  should be `1024:524288` limit. As in the soft limit is the expected
+  `1024`.
+  The problem is other software shipping misconfiguration in systemd
+  services that overrides this to something silly like

_service:tar_scm:rsyslog-8.2210.0.tar.gz/Makefile.am -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/Makefile.am Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/Makefile.in Changed

@@ -138,62 +138,63 @@
 @ENABLE_FFAUP_TRUE@am__append_46 = contrib/ffaup
 @ENABLE_OMKAFKA_TRUE@am__append_47 = plugins/omkafka
 @ENABLE_IMKAFKA_TRUE@am__append_48 = plugins/imkafka
-@ENABLE_OMPROG_TRUE@am__append_49 = plugins/omprog
-@ENABLE_RFC3195_TRUE@am__append_50 = plugins/im3195
-@ENABLE_MMNORMALIZE_TRUE@am__append_51 = plugins/mmnormalize
-@ENABLE_MMJSONPARSE_TRUE@am__append_52 = plugins/mmjsonparse
-@ENABLE_MMGROK_TRUE@am__append_53 = contrib/mmgrok
-@ENABLE_MMAUDIT_TRUE@am__append_54 = plugins/mmaudit
-@ENABLE_MMANON_TRUE@am__append_55 = plugins/mmanon
-@ENABLE_MMRM1STSPACE_TRUE@am__append_56 = plugins/mmrm1stspace
-@ENABLE_MMUTF8FIX_TRUE@am__append_57 = plugins/mmutf8fix
-@ENABLE_MMCOUNT_TRUE@am__append_58 = contrib/mmcount
-@ENABLE_MMSEQUENCE_TRUE@am__append_59 = contrib/mmsequence
-@ENABLE_MMDBLOOKUP_TRUE@am__append_60 = plugins/mmdblookup
-@ENABLE_MMDARWIN_TRUE@am__append_61 = contrib/mmdarwin
-@ENABLE_MMFIELDS_TRUE@am__append_62 = plugins/mmfields
-@ENABLE_MMPSTRUCDATA_TRUE@am__append_63 = plugins/mmpstrucdata
-@ENABLE_MMRFC5424ADDHMAC_TRUE@am__append_64 = contrib/mmrfc5424addhmac
+@ENABLE_OMAZUREEVENTHUBS_TRUE@am__append_49 = plugins/omazureeventhubs
+@ENABLE_OMPROG_TRUE@am__append_50 = plugins/omprog
+@ENABLE_RFC3195_TRUE@am__append_51 = plugins/im3195
+@ENABLE_MMNORMALIZE_TRUE@am__append_52 = plugins/mmnormalize
+@ENABLE_MMJSONPARSE_TRUE@am__append_53 = plugins/mmjsonparse
+@ENABLE_MMGROK_TRUE@am__append_54 = contrib/mmgrok
+@ENABLE_MMAUDIT_TRUE@am__append_55 = plugins/mmaudit
+@ENABLE_MMANON_TRUE@am__append_56 = plugins/mmanon
+@ENABLE_MMRM1STSPACE_TRUE@am__append_57 = plugins/mmrm1stspace
+@ENABLE_MMUTF8FIX_TRUE@am__append_58 = plugins/mmutf8fix
+@ENABLE_MMCOUNT_TRUE@am__append_59 = contrib/mmcount
+@ENABLE_MMSEQUENCE_TRUE@am__append_60 = contrib/mmsequence
+@ENABLE_MMDBLOOKUP_TRUE@am__append_61 = plugins/mmdblookup
+@ENABLE_MMDARWIN_TRUE@am__append_62 = contrib/mmdarwin
+@ENABLE_MMFIELDS_TRUE@am__append_63 = plugins/mmfields
+@ENABLE_MMPSTRUCDATA_TRUE@am__append_64 = plugins/mmpstrucdata
+@ENABLE_MMRFC5424ADDHMAC_TRUE@am__append_65 = contrib/mmrfc5424addhmac
 
 # omhttpfs
-@ENABLE_OMHTTPFS_TRUE@am__append_65 = contrib/omhttpfs
+@ENABLE_OMHTTPFS_TRUE@am__append_66 = contrib/omhttpfs
 
 # omamqp1
-@ENABLE_OMAMQP1_TRUE@am__append_66 = contrib/omamqp1
+@ENABLE_OMAMQP1_TRUE@am__append_67 = contrib/omamqp1
 
 # imbatchreport
-@ENABLE_IMBATCHREPORT_TRUE@am__append_67 = contrib/imbatchreport
+@ENABLE_IMBATCHREPORT_TRUE@am__append_68 = contrib/imbatchreport
 
 # omtcl
-@ENABLE_OMTCL_TRUE@am__append_68 = contrib/omtcl
+@ENABLE_OMTCL_TRUE@am__append_69 = contrib/omtcl
 
 # mmkubernetes
-@ENABLE_MMKUBERNETES_TRUE@am__append_69 = contrib/mmkubernetes
+@ENABLE_MMKUBERNETES_TRUE@am__append_70 = contrib/mmkubernetes
 
 # impcap
-@ENABLE_IMPCAP_TRUE@am__append_70 = contrib/impcap
+@ENABLE_IMPCAP_TRUE@am__append_71 = contrib/impcap
 
 # imtuxedoulog
-@ENABLE_IMTUXEDOULOG_TRUE@am__append_71 = contrib/imtuxedoulog
+@ENABLE_IMTUXEDOULOG_TRUE@am__append_72 = contrib/imtuxedoulog
 
 # improg
-@ENABLE_IMPROG_TRUE@am__append_72 = contrib/improg
+@ENABLE_IMPROG_TRUE@am__append_73 = contrib/improg
 
 # imhttp
-@ENABLE_IMHTTP_TRUE@am__append_73 = contrib/imhttp
+@ENABLE_IMHTTP_TRUE@am__append_74 = contrib/imhttp
 
 # mmtaghostname
-@ENABLE_MMTAGHOSTNAME_TRUE@am__append_74 = contrib/mmtaghostname
+@ENABLE_MMTAGHOSTNAME_TRUE@am__append_75 = contrib/mmtaghostname
 
 # imdb2diag
-@ENABLE_PMDB2DIAG_TRUE@am__append_75 = contrib/pmdb2diag
+@ENABLE_PMDB2DIAG_TRUE@am__append_76 = contrib/pmdb2diag
 
 # imhiredis
-@ENABLE_IMHIREDIS_TRUE@am__append_76 = contrib/imhiredis
+@ENABLE_IMHIREDIS_TRUE@am__append_77 = contrib/imhiredis
 # currently not supported in make distcheck:
 # --enable-pgsql-tests
 # --enable-extended-tests --> should probably never be enabled due to runtime
-@ENABLE_DEFAULT_TESTS_TRUE@am__append_77 = \
+@ENABLE_DEFAULT_TESTS_TRUE@am__append_78 = \
 @ENABLE_DEFAULT_TESTS_TRUE@	--enable-diagtools \
 @ENABLE_DEFAULT_TESTS_TRUE@	--enable-impstats \
 @ENABLE_DEFAULT_TESTS_TRUE@	--enable-imptcp \
@@ -219,65 +220,66 @@
 @ENABLE_DEFAULT_TESTS_TRUE@	--enable-pmsnare \
 @ENABLE_DEFAULT_TESTS_TRUE@	--enable-usertools
 
-@ENABLE_DEFAULT_TESTS_FALSE@am__append_78 = \
+@ENABLE_DEFAULT_TESTS_FALSE@am__append_79 = \
 @ENABLE_DEFAULT_TESTS_FALSE@	--disable-default-tests
 
-@ENABLE_IMPROG_TRUE@am__append_79 = --enable-improg
-@ENABLE_IMHTTP_TRUE@am__append_80 = --enable-imhttp
-@ENABLE_OMPROG_TRUE@am__append_81 = --enable-omprog
-@ENABLE_GSSAPI_TRUE@am__append_82 = --enable-gssapi-krb5
-@ENABLE_PMNORMALIZE_TRUE@am__append_83 = --enable-pmnormalize
-@ENABLE_MMDBLOOKUP_TRUE@am__append_84 = --enable-mmdblookup
-@ENABLE_MMDARWIN_TRUE@am__append_85 = --enable-mmdarwin
-@ENABLE_MMNORMALIZE_TRUE@am__append_86 = --enable-mmnormalize
-@ENABLE_OMMONGODB_TRUE@am__append_87 = --enable-ommongodb
-@ENABLE_OMHIREDIS_TRUE@am__append_88 = --enable-omhiredis
-@ENABLE_MMSNMPTRAPD_TRUE@am__append_89 = --enable-mmsnmptrapd
-@ENABLE_OMLIBDBI_TRUE@am__append_90 = --enable-libdbi
-@ENABLE_LIBGCRYPT_TRUE@am__append_91 = --enable-libgcrypt
-@ENABLE_OMHTTP_TRUE@am__append_92 = --enable-omhttp
-@ENABLE_OMHTTPFS_TRUE@am__append_93 = --enable-omhttpfs
-@ENABLE_OMTCL_TRUE@am__append_94 = --enable-omtcl
-@ENABLE_SNMP_TRUE@am__append_95 = --enable-snmp
-@ENABLE_SNMP_TESTS_TRUE@am__append_96 = --enable-snmp-tests
-@ENABLE_FMHTTP_TRUE@am__append_97 = --enable-fmhttp
-@ENABLE_OMUDPSPOOF_TRUE@am__append_98 = --enable-omudpspoof
-@ENABLE_PGSQL_TRUE@am__append_99 = --enable-pgsql
-@ENABLE_GNUTLS_TRUE@am__append_100 = --enable-gnutls
-@ENABLE_GNUTLS_TESTS_TRUE@am__append_101 = --enable-gnutls-tests
-@ENABLE_GNUTLS_TESTS_FALSE@am__append_102 = --disable-gnutls-tests
-@ENABLE_OPENSSL_TRUE@am__append_103 = --enable-openssl
-@ENABLE_MYSQL_TRUE@am__append_104 = --enable-mysql
-@ENABLE_MYSQL_TESTS_TRUE@am__append_105 = --enable-mysql-tests
-@ENABLE_ELASTICSEARCH_TRUE@am__append_106 = --enable-elasticsearch
-@ENABLE_ELASTICSEARCH_TESTS_TRUE@am__append_107 = --enable-elasticsearch-tests
-@ENABLE_CLICKHOUSE_TRUE@am__append_108 = --enable-clickhouse
-@ENABLE_CLICKHOUSE_TESTS_TRUE@am__append_109 = --enable-clickhouse-tests
-@ENABLE_MMGROK_TRUE@am__append_110 = --enable-mmgrok
-@ENABLE_RELP_TRUE@am__append_111 = --enable-relp --enable-omrelp-default-port=13515
-@ENABLE_IMKAFKA_TRUE@am__append_112 = --enable-imkafka
-@ENABLE_OMKAFKA_TRUE@am__append_113 = --enable-omkafka
-@ENABLE_KAFKA_TESTS_TRUE@am__append_114 = --enable-kafka-tests
-@ENABLE_IMJOURNAL_TRUE@am__append_115 = --enable-imjournal
-@ENABLE_OMJOURNAL_TRUE@am__append_116 = --enable-omjournal
-@ENABLE_JOURNAL_TESTS_TRUE@am__append_117 = --enable-journal-tests
-@ENABLE_IMCZMQ_TRUE@am__append_118 = --enable-imczmq
-@ENABLE_OMCZMQ_TRUE@am__append_119 = --enable-omczmq
-@ENABLE_MMTAGHOSTNAME_TRUE@am__append_120 = --enable-mmtaghostname
-@ENABLE_IMTUXEDOULOG_TRUE@am__append_121 = --enable-imtuxedolog
-@ENABLE_PMDB2DIAG_TRUE@am__append_122 = --enable-pmdb2diag
-@ENABLE_IMBATCHREPORT_TRUE@am__append_123 = --enable-imbatchreport
-@ENABLE_IMFILE_TRUE@am__append_124 = --enable-imfile
-@ENABLE_IMFILE_TESTS_TRUE@am__append_125 = --enable-imfile-tests
-@ENABLE_IMFILE_TESTS_FALSE@am__append_126 = --disable-imfile-tests
-@ENABLE_IMPCAP_TRUE@am__append_127 = --enable-impcap
-@ENABLE_IMDOCKER_TRUE@am__append_128 = --enable-imdocker
-@ENABLE_OMRABBITMQ_TRUE@am__append_129 = --enable-omrabbitmq
-@ENABLE_MMKUBERNETES_TRUE@am__append_130 = --enable-mmkubernetes
-@ENABLE_OMAMQP1_TRUE@am__append_131 = --enable-omamqp1
-@ENABLE_DISTCHECK_WORKAROUND_TRUE@am__append_132 = --disable-testbench
-@ENABLE_DISTCHECK_WORKAROUND_FALSE@am__append_133 = --enable-testbench
-@ENABLE_IMHIREDIS_TRUE@am__append_134 = --enable-imhiredis
+@ENABLE_IMPROG_TRUE@am__append_80 = --enable-improg
+@ENABLE_IMHTTP_TRUE@am__append_81 = --enable-imhttp
+@ENABLE_OMPROG_TRUE@am__append_82 = --enable-omprog
+@ENABLE_GSSAPI_TRUE@am__append_83 = --enable-gssapi-krb5
+@ENABLE_PMNORMALIZE_TRUE@am__append_84 = --enable-pmnormalize
+@ENABLE_MMDBLOOKUP_TRUE@am__append_85 = --enable-mmdblookup
+@ENABLE_MMDARWIN_TRUE@am__append_86 = --enable-mmdarwin
+@ENABLE_MMNORMALIZE_TRUE@am__append_87 = --enable-mmnormalize
+@ENABLE_OMMONGODB_TRUE@am__append_88 = --enable-ommongodb
+@ENABLE_OMHIREDIS_TRUE@am__append_89 = --enable-omhiredis
+@ENABLE_MMSNMPTRAPD_TRUE@am__append_90 = --enable-mmsnmptrapd
+@ENABLE_OMLIBDBI_TRUE@am__append_91 = --enable-libdbi
+@ENABLE_LIBGCRYPT_TRUE@am__append_92 = --enable-libgcrypt
+@ENABLE_OMHTTP_TRUE@am__append_93 = --enable-omhttp
+@ENABLE_OMHTTPFS_TRUE@am__append_94 = --enable-omhttpfs
+@ENABLE_OMTCL_TRUE@am__append_95 = --enable-omtcl
+@ENABLE_SNMP_TRUE@am__append_96 = --enable-snmp
+@ENABLE_SNMP_TESTS_TRUE@am__append_97 = --enable-snmp-tests
+@ENABLE_FMHTTP_TRUE@am__append_98 = --enable-fmhttp
+@ENABLE_OMUDPSPOOF_TRUE@am__append_99 = --enable-omudpspoof
+@ENABLE_PGSQL_TRUE@am__append_100 = --enable-pgsql
+@ENABLE_GNUTLS_TRUE@am__append_101 = --enable-gnutls
+@ENABLE_GNUTLS_TESTS_TRUE@am__append_102 = --enable-gnutls-tests
+@ENABLE_GNUTLS_TESTS_FALSE@am__append_103 = --disable-gnutls-tests
+@ENABLE_OPENSSL_TRUE@am__append_104 = --enable-openssl
+@ENABLE_MYSQL_TRUE@am__append_105 = --enable-mysql
+@ENABLE_MYSQL_TESTS_TRUE@am__append_106 = --enable-mysql-tests
+@ENABLE_ELASTICSEARCH_TRUE@am__append_107 = --enable-elasticsearch
+@ENABLE_ELASTICSEARCH_TESTS_TRUE@am__append_108 = --enable-elasticsearch-tests
+@ENABLE_CLICKHOUSE_TRUE@am__append_109 = --enable-clickhouse
+@ENABLE_CLICKHOUSE_TESTS_TRUE@am__append_110 = --enable-clickhouse-tests
+@ENABLE_MMGROK_TRUE@am__append_111 = --enable-mmgrok
+@ENABLE_RELP_TRUE@am__append_112 = --enable-relp --enable-omrelp-default-port=13515
+@ENABLE_IMKAFKA_TRUE@am__append_113 = --enable-imkafka
+@ENABLE_OMKAFKA_TRUE@am__append_114 = --enable-omkafka
+@ENABLE_KAFKA_TESTS_TRUE@am__append_115 = --enable-kafka-tests
+@ENABLE_OMAZUREEVENTHUBS_TRUE@am__append_116 = --enable-omazureeventhubs
+@ENABLE_IMJOURNAL_TRUE@am__append_117 = --enable-imjournal
+@ENABLE_OMJOURNAL_TRUE@am__append_118 = --enable-omjournal
+@ENABLE_JOURNAL_TESTS_TRUE@am__append_119 = --enable-journal-tests
+@ENABLE_IMCZMQ_TRUE@am__append_120 = --enable-imczmq
+@ENABLE_OMCZMQ_TRUE@am__append_121 = --enable-omczmq
+@ENABLE_MMTAGHOSTNAME_TRUE@am__append_122 = --enable-mmtaghostname

_service:tar_scm:rsyslog-8.2210.0.tar.gz/README.md -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/README.md Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/action.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/action.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/compat/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/compat/Makefile.in Changed

@@ -242,6 +242,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -310,6 +314,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -321,6 +327,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -416,7 +423,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/config.h.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/config.h.in Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/configure -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for rsyslog 8.2210.0.
+# Generated by GNU Autoconf 2.69 for rsyslog 8.2312.0.
 #
 # Report bugs to <rsyslog@lists.adiscon.com>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='rsyslog'
 PACKAGE_TARNAME='rsyslog'
-PACKAGE_VERSION='8.2210.0'
-PACKAGE_STRING='rsyslog 8.2210.0'
+PACKAGE_VERSION='8.2312.0'
+PACKAGE_STRING='rsyslog 8.2312.0'
 PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com'
 PACKAGE_URL=''
 
@@ -660,18 +660,19 @@
 TCL_VERSION
 ENABLE_OMAMQP1_FALSE
 ENABLE_OMAMQP1_TRUE
-PROTON_LIBS
-PROTON_CFLAGS
 ENABLE_OMHTTPFS_FALSE
 ENABLE_OMHTTPFS_TRUE
 ENABLE_IMHIREDIS_FALSE
 ENABLE_IMHIREDIS_TRUE
 ENABLE_OMHIREDIS_FALSE
 ENABLE_OMHIREDIS_TRUE
+REDIS
 LIBEVENT_LIBS
 LIBEVENT_CFLAGS
 HIREDIS_LIBS
 HIREDIS_CFLAGS
+ENABLE_REDIS_TESTS_FALSE
+ENABLE_REDIS_TESTS_TRUE
 ENABLE_OMRABBITMQ_FALSE
 ENABLE_OMRABBITMQ_TRUE
 RABBITMQ_LIBS
@@ -686,6 +687,14 @@
 ENABLE_OMMONGODB_TRUE
 LIBMONGOC_LIBS
 LIBMONGOC_CFLAGS
+ENABLE_QPIDPROTON_STATIC_FALSE
+ENABLE_QPIDPROTON_STATIC_TRUE
+ENABLE_OMAZUREEVENTHUBS_FALSE
+ENABLE_OMAZUREEVENTHUBS_TRUE
+PROTON_PROACTOR_LIBS
+PROTON_PROACTOR_CFLAGS
+PROTON_LIBS
+PROTON_CFLAGS
 ENABLE_IMKAFKA_FALSE
 ENABLE_IMKAFKA_TRUE
 ENABLE_OMKAFKA_FALSE
@@ -706,6 +715,8 @@
 ENABLE_KAFKA_STATIC_TRUE
 ENABLE_KAFKA_TESTS_FALSE
 ENABLE_KAFKA_TESTS_TRUE
+ENABLE_OMAZUREEVENTHUBS_TESTS_FALSE
+ENABLE_OMAZUREEVENTHUBS_TESTS_TRUE
 ENABLE_OMHDFS_FALSE
 ENABLE_OMHDFS_TRUE
 ENABLE_MMSNMPTRAPD_FALSE
@@ -925,9 +936,6 @@
 ENABLE_USERTOOLS_TRUE
 ENABLE_DIAGTOOLS_FALSE
 ENABLE_DIAGTOOLS_TRUE
-HAVE_SYSTEMD_FALSE
-HAVE_SYSTEMD_TRUE
-systemdsystemunitdir
 ENABLE_JEMALLOC_FALSE
 ENABLE_JEMALLOC_TRUE
 ENABLE_INET_FALSE
@@ -968,6 +976,10 @@
 ENABLE_FMHASH_XXHASH_TRUE
 ENABLE_FMHASH_FALSE
 ENABLE_FMHASH_TRUE
+LIBCAPNG_LIBS
+LIBCAPNG_CFLAGS
+LIBCAPNG_PRESENT_LIBS
+LIBCAPNG_PRESENT_CFLAGS
 ZLIB_LIBS
 ZLIB_CFLAGS
 ENABLE_REGEXP_FALSE
@@ -1148,6 +1160,7 @@
 enable_largefile
 enable_regexp
 enable_fmhash
+enable_libcap_ng
 enable_fmhash_xxhash
 enable_ffaup
 enable_fmunflatten
@@ -1160,7 +1173,6 @@
 enable_inet
 enable_jemalloc
 enable_unlimited_select
-with_systemdsystemunitdir
 enable_debug
 enable_debug_symbols
 enable_debugless
@@ -1248,14 +1260,18 @@
 enable_omhdfs
 enable_omkafka
 enable_imkafka
+enable_omazureeventhubs_tests
 enable_kafka_tests
 enable_kafka_static
+enable_omazureeventhubs
+enable_qpidproton_static
 enable_ommongodb
 enable_imczmq
 enable_omczmq
 enable_omrabbitmq
 enable_imhiredis
 enable_omhiredis
+enable_redis_tests
 enable_omhttpfs
 enable_omamqp1
 enable_omtcl
@@ -1289,6 +1305,10 @@
 PYTHON
 ZLIB_CFLAGS
 ZLIB_LIBS
+LIBCAPNG_PRESENT_CFLAGS
+LIBCAPNG_PRESENT_LIBS
+LIBCAPNG_CFLAGS
+LIBCAPNG_LIBS
 LIBSYSTEMD_JOURNAL_CFLAGS
 LIBSYSTEMD_JOURNAL_LIBS
 LIBSYSTEMD_CFLAGS
@@ -1323,6 +1343,10 @@
 LIBRDKAFKA_LIBS
 LIBLZ4_CFLAGS
 LIBLZ4_LIBS
+PROTON_CFLAGS
+PROTON_LIBS
+PROTON_PROACTOR_CFLAGS
+PROTON_PROACTOR_LIBS
 LIBMONGOC_CFLAGS
 LIBMONGOC_LIBS
 CZMQ_CFLAGS
@@ -1332,9 +1356,7 @@
 HIREDIS_CFLAGS
 HIREDIS_LIBS
 LIBEVENT_CFLAGS
-LIBEVENT_LIBS
-PROTON_CFLAGS
-PROTON_LIBS'
+LIBEVENT_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1885,7 +1907,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures rsyslog 8.2210.0 to adapt to many kinds of systems.
+\`configure' configures rsyslog 8.2312.0 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1956,7 +1978,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rsyslog 8.2210.0:";;
+     short | recursive ) echo "Configuration of rsyslog 8.2312.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1985,6 +2007,8 @@
   --disable-largefile     omit support for large files
   --enable-regexp         Enable regular expressions support default=yes
   --enable-fmhash         Enable fmhash support default=yes
+  --enable-libcap-ng      Enable dropping capabilities to only the necessary
+                          set default=no
   --enable-fmhash-xxhash  Enable xxhash in fmhash support default=no
   --enable-ffaup          Enable ffaup support default=no
   --enable-fmunflatten    Enable fmunflatten support default=no
@@ -1995,7 +2019,8 @@
                           default=no
   --enable-imjournal      Systemd journal message import default=no
   --enable-libsystemd     Enable libsystemd mode default=auto
-  --enable-inet           Enable networking support default=yes
+  --enable-inet           Enable automatic load of omfwd and limit build of
+                          networking libraries default=yes
   --enable-jemalloc       Enable jemalloc support default=no
   --enable-unlimited-select
                           Enable unlimited select() syscall default=no
@@ -2107,15 +2132,24 @@
   --enable-omhdfs         Compiles omhdfs module default=no
   --enable-omkafka        Compiles kafka output module default=no
   --enable-imkafka        Compiles kafka input and output module default=no
+  --enable-omazureeventhubs-tests
+                          Enable Omazureeventhubs tests default=no
   --enable-kafka-tests    Enable Kafka tests, needs Java default=no
   --enable-kafka-static   Enable static library linking for Kafka modules.
                           Removes dependency for rdkafka.so. default=no

_service:tar_scm:rsyslog-8.2210.0.tar.gz/configure.ac -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/configure.ac Changed

@@ -2,9 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(rsyslog,8.2210.0,rsyslog@lists.adiscon.com)   # UPDATE on release
-AC_DEFINE(VERSION_YEAR,  22, year part of real rsyslog version)  # UPDATE on release
-AC_DEFINE(VERSION_MONTH, 10, month part of real rsyslog version) # UPDATE on release
+AC_INIT(rsyslog,8.2312.0,rsyslog@lists.adiscon.com)   # UPDATE on release
+AC_DEFINE(VERSION_YEAR,  23, year part of real rsyslog version)  # UPDATE on release
+AC_DEFINE(VERSION_MONTH, 12, month part of real rsyslog version) # UPDATE on release
 
 AM_INIT_AUTOMAKE(subdir-objects)
 
@@ -200,7 +200,7 @@
      #endif
   
 )
-AC_CHECK_HEADERS(fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h sys/select.h getopt.h)
+AC_CHECK_HEADERS(fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h sys/select.h getopt.h linux/close_range.h)
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -233,7 +233,7 @@
 AC_FUNC_STAT
 AC_FUNC_STRERROR_R
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(flock recvmmsg basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setsid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync syscall lseek64 asprintf)
+AC_CHECK_FUNCS(flock recvmmsg basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setsid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync syscall lseek64 asprintf close_range)
 AC_CHECK_FUNC(setns, AC_DEFINE(HAVE_SETNS, 1, Define if setns exists.))
 AC_CHECK_TYPES(off64_t)
 
@@ -377,6 +377,34 @@
 	enable_fmhash=yes
 )
 
+AC_ARG_ENABLE(libcap-ng,
+        AS_HELP_STRING(--enable-libcap-ng,Enable dropping capabilities to only the necessary set @<:@default=no@:>@),
+        case "${enableval}" in
+         yes) enable_libcapng="yes" ;;
+          no) enable_libcapng="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable_libcapng) ;;
+         esac,
+        enable_libcapng=no
+)
+
+if test "$enable_libcapng" = "yes"; then
+        PKG_CHECK_MODULES(
+                LIBCAPNG_PRESENT,
+                libcap-ng,
+                AC_DEFINE(ENABLE_LIBCAPNG_PRESENT, 1, Indicator that libcap-ng is present),
+                AC_MSG_ERROR(libcap-ng is not present.)
+        )
+        PKG_CHECK_MODULES(
+                LIBCAPNG,
+                libcap-ng >= 0.8.2,
+                AC_DEFINE(ENABLE_LIBCAPNG, 1, Indicator that libcap-ng is present),
+                AC_MSG_ERROR(libcap-ng is present, but outdated - need 0.8.2 or above.)
+        )
+        CFLAGS="$CFLAGS $LIBCAPNG_CFLAGS"
+        LIBS="$LIBS $LIBCAPNG_LIBS"
+fi
+
+
 AC_ARG_ENABLE(fmhash-xxhash,
 	AS_HELP_STRING(--enable-fmhash-xxhash,Enable xxhash in fmhash support @<:@default=no@:>@),
         case "${enableval}" in
@@ -649,7 +677,7 @@
 
 # inet
 AC_ARG_ENABLE(inet,
-        AS_HELP_STRING(--enable-inet,Enable networking support @<:@default=yes@:>@),
+        AS_HELP_STRING(--enable-inet,Enable automatic load of omfwd and limit build of networking libraries @<:@default=yes@:>@),
         case "${enableval}" in
          yes) enable_inet="yes" ;;
           no) enable_inet="no" ;;
@@ -701,16 +729,6 @@
 fi
 
 
-# support for systemd unit files
-AC_ARG_WITH(systemdsystemunitdir,
-        AS_HELP_STRING(--with-systemdsystemunitdir=DIR, Directory for systemd service files),
-        , with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd))
-if test "x$with_systemdsystemunitdir" != xno; then
-        AC_SUBST(systemdsystemunitdir, $with_systemdsystemunitdir)
-fi
-AM_CONDITIONAL(HAVE_SYSTEMD, test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno )
-
-
 # debug
 AC_ARG_ENABLE(debug,
         AS_HELP_STRING(--enable-debug,Enable debug mode @<:@default=auto@:>@),
@@ -2285,6 +2303,17 @@
         enable_imkafka=no
 )
 
+AC_ARG_ENABLE(omazureeventhubs_tests,
+        AS_HELP_STRING(--enable-omazureeventhubs-tests,Enable Omazureeventhubs tests @<:@default=no@:>@),
+        case "${enableval}" in
+         yes) enable_omazureeventhubs_tests="yes" ;;
+          no) enable_omazureeventhubs_tests="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-omazureeventhubs-tests) ;;
+         esac,
+        enable_omazureeventhubs_tests=no
+)
+AM_CONDITIONAL(ENABLE_OMAZUREEVENTHUBS_TESTS, test x$enable_omazureeventhubs_tests = xyes)
+
 AC_ARG_ENABLE(kafka_tests,
         AS_HELP_STRING(--enable-kafka-tests,Enable Kafka tests, needs Java @<:@default=no@:>@),
         case "${enableval}" in
@@ -2399,8 +2428,58 @@
 AM_CONDITIONAL(ENABLE_OMKAFKA, test x$enable_omkafka = xyes -o x$enable_omkafka = xoptional)
 AM_CONDITIONAL(ENABLE_IMKAFKA, test x$enable_imkafka = xyes -o x$enable_imkafka = xoptional)
 
-#MONGODB SUPPORT
 
+# omazureeventhubs support for output module
+AC_ARG_ENABLE(omazureeventhubs,
+        AS_HELP_STRING(--enable-omazureeventhubs,Compiles AzureEventHubs output module @<:@default=no@:>@),
+        case "${enableval}" in
+         yes) enable_omazureeventhubs="yes" ;;
+          no) enable_omazureeventhubs="no" ;;
+         optional) enable_omazureeventhubs="optional" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-omazureeventhubs) ;;
+         esac,
+        enable_omazureeventhubs=no
+)
+
+# PROTON PROTOCOL SUPPORT for omazureeventhubs
+# uses qpid-proton library
+if test "x$enable_omazureeventhubs" = "xyes"; then
+        PKG_CHECK_MODULES(PROTON, libqpid-proton >= 0.13)
+        AC_SUBST(PROTON_CFLAGS)
+        AC_SUBST(PROTON_LIBS)
+fi
+if test "x$enable_omazureeventhubs" = "xyes"; then
+        PKG_CHECK_MODULES(PROTON_PROACTOR, libqpid-proton-proactor >= 0.13)
+        AC_SUBST(PROTON_PROACTOR_CFLAGS)
+        AC_SUBST(PROTON_PROACTOR_LIBS)
+fi
+AM_CONDITIONAL(ENABLE_OMAZUREEVENTHUBS, test x$enable_omazureeventhubs = xyes)
+# END PROTON
+
+if test "x$enable_omazureeventhubs" = "xyes"; then
+	if test "x$enable_omazure_tests" = "xyes"; then
+		AC_MSG_NOTICE(omazureveenthubs: TEST Suite enabled, requires Azure Environment variables!)
+	fi
+else
+	if test "x$enable_omazure_tests" = "xyes"; then
+		AC_MSG_WARN(Omazureeventhubs Tests can not be enabled omazureveenthubs support. Disabling enable_omazure_tests...)
+		enable_omazure_tests="no"
+	fi
+fi
+
+# Static QPID-Proton support?
+AC_ARG_ENABLE(qpidproton_static,
+        AS_HELP_STRING(--enable-qpidproton_static,Enable static library linking for qpid-proton (required by omazureeventhubs module). Removes dependency for libqpid-proton*.so. @<:@default=no@:>@),
+        case "${enableval}" in
+         yes) enable_qpidproton_static="yes" ;;
+          no) enable_qpidproton_static="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-qpidproton_static) ;;
+         esac,
+        enable_qpidproton_static=no
+)
+AM_CONDITIONAL(ENABLE_QPIDPROTON_STATIC, test x$enable_qpidproton_static = xyes)
+
+#MONGODB SUPPORT
 AC_ARG_ENABLE(ommongodb,
         AS_HELP_STRING(--enable-ommongodb,Compiles ommongodb module @<:@default=no@:>@),
         case "${enableval}" in
@@ -2497,6 +2576,17 @@
         enable_omhiredis=no
 )
 
+AC_ARG_ENABLE(redis_tests,
+        AS_HELP_STRING(--enable-redis-tests,Enable redis tests, needs redis-server @<:@default=no@:>@),
+        case "${enableval}" in
+         yes) enable_redis_tests="yes" ;;
+          no) enable_redis_tests="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-redis-tests) ;;
+         esac,
+        enable_redis_tests=no
+)
+AM_CONDITIONAL(ENABLE_REDIS_TESTS, test x$enable_redis_tests = xyes)
+
 if test "x$enable_omhiredis" = "xyes" -o "x$enable_imhiredis" = "xyes" ; then
     PKG_CHECK_MODULES(HIREDIS, hiredis >= 0.10.1, ,
         AC_SEARCH_LIBS(redisConnectWithTimeout, hiredis,
@@ -2533,6 +2623,21 @@
         AC_MSG_ERROR(no libevent >= 2.0 found with pthreads support, imhiredis cannot use pub/sub))
 fi
 
+if test "x$enable_imhiredis" = "xyes" || test "x$enable_omhiredis" = "xyes"; then
+	if test "x$enable_redis_tests" = "xyes"; then
+		AC_CHECK_PROG(REDIS, redis-server, yes, no)
+		if test "x${REDIS}" = "xno"; then
+			AC_MSG_FAILURE(redis-server, which is a redis-tests dependency, not found)
+		fi
+	fi
+else

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/ffaup/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/ffaup/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/ffaup/ffaup.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/ffaup/ffaup.c Changed

@@ -77,13 +77,22 @@
 	int bMustFree;
 	cnfexprEval(func->expr0, &srcVal, usrptr, pWti);
 	char *url = (char*) var2CString(&srcVal, &bMustFree);
-	faup_handler_t *fh = (faup_handler_t *)func->funcdata;
+
+	/*
+	We use the faup_handler_t struct directly instead of calling faup_init to avoid overhead and useless
+	allocations. Using one handler is not possible as the lib is not thread-safe and thread-locale solutions
+	still cause some issues.
+	If the faup_init function changes significantly in the future, it may cause issue.
+	(Validated with faup v1.5 and faup-master fecf768603e713bc903c56c8df0870fae14e3f93)
+	*/
+	faup_handler_t fh = {0};
+	fh.options = glbOptions;
 
 	// default, return 0
 	ret->datatype = 'N';
 	ret->d.n = 0;
 
-	if(!faup_decode(fh, url, strlen(url))) {
+	if(!faup_decode(&fh, url, strlen(url))) {
 		parser_errmsg("faup: could not parse the value\n");
 		// No returned error code, so the reason doesn't matter
 		FINALIZE;
@@ -97,123 +106,123 @@
 				ret->d.json,
 				"scheme",
 				json_object_new_string_len(
-					url + faup_get_scheme_pos(fh),
-					faup_get_scheme_size(fh)));
+					url + faup_get_scheme_pos(&fh),
+					faup_get_scheme_size(&fh)));
 			json_object_object_add(
 				ret->d.json,
 				"credential",
 				json_object_new_string_len(
-					url + faup_get_credential_pos(fh),
-					faup_get_credential_size(fh)));
+					url + faup_get_credential_pos(&fh),
+					faup_get_credential_size(&fh)));
 			json_object_object_add(
 				ret->d.json,
 				"subdomain",
 				json_object_new_string_len(
-					url + faup_get_subdomain_pos(fh),
-					faup_get_subdomain_size(fh)));
+					url + faup_get_subdomain_pos(&fh),
+					faup_get_subdomain_size(&fh)));
 			json_object_object_add(
 				ret->d.json,
 				"domain",
 				json_object_new_string_len(
-					url + faup_get_domain_pos(fh),
-					faup_get_domain_size(fh)));
+					url + faup_get_domain_pos(&fh),
+					faup_get_domain_size(&fh)));
 			json_object_object_add(
 				ret->d.json,
 				"domain_without_tld",
 				json_object_new_string_len(
-					url + faup_get_domain_without_tld_pos(fh),
-					faup_get_domain_without_tld_size(fh)));
+					url + faup_get_domain_without_tld_pos(&fh),
+					faup_get_domain_without_tld_size(&fh)));
 			json_object_object_add(
 				ret->d.json,
 				"host",
 				json_object_new_string_len(
-					url + faup_get_host_pos(fh),
-					faup_get_host_size(fh)));
+					url + faup_get_host_pos(&fh),
+					faup_get_host_size(&fh)));
 			json_object_object_add(
 				ret->d.json,
 				"tld",
 				json_object_new_string_len(
-					url + faup_get_tld_pos(fh),
-					faup_get_tld_size(fh)));
+					url + faup_get_tld_pos(&fh),
+					faup_get_tld_size(&fh)));
 			json_object_object_add(
 				ret->d.json,
 				"port",
 				json_object_new_string_len(
-					url + faup_get_port_pos(fh),
-					faup_get_port_size(fh)));
+					url + faup_get_port_pos(&fh),
+					faup_get_port_size(&fh)));
 			json_object_object_add(
 				ret->d.json,
 				"resource_path",
 				json_object_new_string_len(
-					url + faup_get_resource_path_pos(fh),
-					faup_get_resource_path_size(fh)));
+					url + faup_get_resource_path_pos(&fh),
+					faup_get_resource_path_size(&fh)));
 			json_object_object_add(
 				ret->d.json,
 				"query_string",
 				json_object_new_string_len(
-					url + faup_get_query_string_pos(fh),
-					faup_get_query_string_size(fh)));
+					url + faup_get_query_string_pos(&fh),
+					faup_get_query_string_size(&fh)));
 			json_object_object_add(
 				ret->d.json,
 				"fragment",
 				json_object_new_string_len(
-					url + faup_get_fragment_pos(fh),
-					faup_get_fragment_size(fh)));
+					url + faup_get_fragment_pos(&fh),
+					faup_get_fragment_size(&fh)));
 			break;
 		case FAUP_PARSE_SCHEME:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_scheme_pos(fh), faup_get_scheme_size(fh));
+				url + faup_get_scheme_pos(&fh), faup_get_scheme_size(&fh));
 			break;
 		case FAUP_PARSE_CREDENTIAL:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_credential_pos(fh), faup_get_credential_size(fh));
+				url + faup_get_credential_pos(&fh), faup_get_credential_size(&fh));
 			break;
 		case FAUP_PARSE_SUBDOMAIN:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_subdomain_pos(fh), faup_get_subdomain_size(fh));
+				url + faup_get_subdomain_pos(&fh), faup_get_subdomain_size(&fh));
 			break;
 		case FAUP_PARSE_DOMAIN:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_domain_pos(fh), faup_get_domain_size(fh));
+				url + faup_get_domain_pos(&fh), faup_get_domain_size(&fh));
 			break;
 		case FAUP_PARSE_DOMAIN_WITHOUT_TLD:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_domain_without_tld_pos(fh), faup_get_domain_without_tld_size(fh));
+				url + faup_get_domain_without_tld_pos(&fh), faup_get_domain_without_tld_size(&fh));
 			break;
 		case FAUP_PARSE_HOST:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_host_pos(fh), faup_get_host_size(fh));
+				url + faup_get_host_pos(&fh), faup_get_host_size(&fh));
 			break;
 		case FAUP_PARSE_TLD:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_tld_pos(fh), faup_get_tld_size(fh));
+				url + faup_get_tld_pos(&fh), faup_get_tld_size(&fh));
 			break;
 		case FAUP_PARSE_PORT:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_port_pos(fh), faup_get_port_size(fh));
+				url + faup_get_port_pos(&fh), faup_get_port_size(&fh));
 			break;
 		case FAUP_PARSE_RESOURCE_PATH:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_resource_path_pos(fh), faup_get_resource_path_size(fh));
+				url + faup_get_resource_path_pos(&fh), faup_get_resource_path_size(&fh));
 			break;
 		case FAUP_PARSE_QUERY_STRING:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_query_string_pos(fh), faup_get_query_string_size(fh));
+				url + faup_get_query_string_pos(&fh), faup_get_query_string_size(&fh));
 			break;
 		case FAUP_PARSE_FRAGMENT:
 			ret->datatype = 'S';
 			ret->d.estr = es_newStrFromCStr(
-				url + faup_get_fragment_pos(fh), faup_get_fragment_size(fh));
+				url + faup_get_fragment_pos(&fh), faup_get_fragment_size(&fh));
 			break;
 	}
 
@@ -322,35 +331,24 @@
 		ABORT_FINALIZE(RS_RET_INVLD_NBR_ARGUMENTS);
 	}
 
-	CHKmalloc(func->funcdata = (void *) faup_init(glbOptions));
-
 finalize_it:
 	RETiRet;
 }
 
-static void ATTR_NONNULL(1)
-destructFunc_faup_parse(struct cnffunc *const func)
-{
-	if(func->funcdata != NULL) {
-		faup_terminate((faup_handler_t *)func->funcdata);
-		func->funcdata = NULL;
-	}
-}

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/fmhash/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/fmhash/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/fmunflatten/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/fmunflatten/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imbatchreport/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imbatchreport/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imbatchreport/imbatchreport.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imbatchreport/imbatchreport.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imczmq/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imczmq/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imdocker/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imdocker/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imhiredis/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imhiredis/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imhiredis/README -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imhiredis/README Changed

@@ -20,10 +20,10 @@
  - password: If set, the plugin will issue an "AUTH" command before calling xPOP
  - uselpop: If set to "1", LPOP will be used instead of default RPOP
 
-Redis pipelining is used inside the workerthread, with a hardcoded batch size of #10.
+Redis pipelining is used inside the worker thread. The dequeue batch size is configured with the "batchsize" parameter (default is 10).
 
 Imhiredis will query Redis every second to see if entries are in the list, if that's the case they will be dequeued
-continuously by batches of 10 until none remains.
+continuously by batches of "batchsize elements" until none remains.
 
 Due to its balance between polling interval and pipelining and its use of lists, this mode is quite performant and reliable.
 However, due to the 1 second polling frequency, one may consider using the `subscribe` mode instead if very low latency is required.
@@ -39,6 +39,7 @@
     port="6379"
     uselpop="1"
     password="foobar"
+    batchsize="10"
 )
 ```
 
@@ -69,12 +70,12 @@
     server="127.0.0.1"
     port="6379"
     password="foobar"
+    batchsize="10"
 )
 ```
 
 
 TODO
 * TLS support
-* detect master/replicas relationships and follow them

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imhiredis/imhiredis.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imhiredis/imhiredis.c Changed

@@ -62,9 +62,12 @@
 
 /* static data */
 DEF_IMOD_STATIC_DATA
-#define QUEUE_BATCH_SIZE 10
+#define BATCH_SIZE 10
+#define WAIT_TIME_MS 500
+#define STREAM_INDEX_STR_MAXLEN 44 // "18446744073709551615-18446744073709551615"
 #define IMHIREDIS_MODE_QUEUE 1
 #define IMHIREDIS_MODE_SUBSCRIBE 2
+#define IMHIREDIS_MODE_STREAM 3
 DEFobjCurrIf(prop)
 DEFobjCurrIf(ruleset)
 DEFobjCurrIf(glbl)
@@ -85,8 +88,21 @@
 	uchar *password;
 	uchar *key;
 	uchar *modeDescription;
+	uchar *streamConsumerGroup;
+	uchar *streamConsumerName;
+	uchar *streamReadFrom;
+	int streamAutoclaimIdleTime;
+	sbool streamConsumerACK;
 	int mode;
+	uint batchsize;
 	sbool useLPop;
+
+	struct {
+		int     nmemb;
+		char **name;
+		char **varname;
+	} fieldList;
+
 	ruleset_t *pBindRuleset;	/* ruleset to bind listener to (use system default if unspecified) */
 	uchar *pszBindRuleset;		/* default name of Ruleset to bind to */
 
@@ -117,6 +133,9 @@
 static struct imhiredisWrkrInfo_s {
 	pthread_t tid;		/* the worker's thread ID */
 	instanceConf_t *inst;	/* Pointer to imhiredis instance */
+	rsRetVal (*fnConnectMaster)(instanceConf_t *inst);
+	sbool (*fnIsConnected)(instanceConf_t *inst);
+	rsRetVal (*fnRun)(instanceConf_t *inst);
 } *imhiredisWrkrInfo;
 
 
@@ -124,7 +143,23 @@
 pthread_attr_t wrkrThrdAttr;	/* Attribute for worker threads ; read only after startup */
 
 static int activeHiredisworkers = 0;
-static char *redis_replies = {"unknown", "string", "array", "integer", "nil", "status", "error"};
+static char *REDIS_REPLIES = {
+	"unknown", // 0
+	"string", // 1
+	"array", // 2
+	"integer", // 3
+	"nil", // 4
+	"status", // 5
+	"error", // 6
+	"double", // 7
+	"bool", // 8
+	"map", // 9
+	"set", // 10
+	"attr", // 11
+	"push", // 12
+	"bignum", // 13
+	"verb", // 14
+	};
 
 static modConfData_t *loadModConf = NULL;/* modConf ptr to use for the current load process */
 static modConfData_t *runModConf = NULL;/* modConf ptr to use for the current load process */
@@ -148,9 +183,16 @@
 	{ "port", eCmdHdlrInt, 0 },
 	{ "password", eCmdHdlrGetWord, 0 },
 	{ "mode", eCmdHdlrGetWord, 0 },
-	{ "key", eCmdHdlrGetWord, 0 },
+	{ "batchsize", eCmdHdlrInt, 0 },
+	{ "key", eCmdHdlrGetWord, CNFPARAM_REQUIRED },
 	{ "uselpop", eCmdHdlrBinary, 0 },
 	{ "ruleset", eCmdHdlrString, 0 },
+	{ "stream.consumerGroup", eCmdHdlrGetWord, 0 },
+	{ "stream.consumerName", eCmdHdlrGetWord, 0 },
+	{ "stream.readFrom", eCmdHdlrGetWord, 0 },
+	{ "stream.consumerACK", eCmdHdlrBinary, 0 },
+	{ "stream.autoclaimIdleTime", eCmdHdlrNonNegInt, 0 },
+	{ "fields", eCmdHdlrArray, 0 },
 };
 static struct cnfparamblk inppblk =
 	{ CNFPARAMBLK_VERSION,
@@ -168,17 +210,35 @@
 static void redisAsyncRecvCallback (redisAsyncContext __attribute__((unused)) *c, void *reply, void *inst_obj);
 static void redisAsyncConnectCallback (const redisAsyncContext *c, int status);
 static void redisAsyncDisconnectCallback (const redisAsyncContext *c, int status);
-static rsRetVal enqMsg(instanceConf_t *const inst, const char *message);
+static struct json_object* _redisParseIntegerReply(const redisReply *reply);
+static struct json_object* _redisParseStringReply(const redisReply *reply);
+static struct json_object* _redisParseArrayReply(const redisReply *reply);
+#ifdef REDIS_REPLY_DOUBLE
+static struct json_object* _redisParseDoubleReply(const redisReply *reply);
+#endif
+static rsRetVal enqMsg(instanceConf_t *const inst, const char *message, size_t msgLen);
+static rsRetVal enqMsgJson(instanceConf_t *const inst, struct json_object *json, struct json_object *metadata);
 rsRetVal redisAuthentSynchronous(redisContext *conn, uchar *password);
 rsRetVal redisAuthentAsynchronous(redisAsyncContext *aconn, uchar *password);
 rsRetVal redisActualizeCurrentNode(instanceConf_t *inst);
 rsRetVal redisGetServersList(redisNode *node, uchar *password, redisNode **result);
 rsRetVal redisAuthenticate(instanceConf_t *inst);
 rsRetVal redisConnectSync(redisContext **conn, redisNode *node);
+rsRetVal connectMasterSync(instanceConf_t *inst);
+static sbool isConnectedSync(instanceConf_t *inst);
 rsRetVal redisConnectAsync(redisAsyncContext **aconn, redisNode *node);
+rsRetVal connectMasterAsync(instanceConf_t *inst);
+static sbool isConnectedAsync(instanceConf_t *inst);
 rsRetVal redisDequeue(instanceConf_t *inst);
-void workerLoopSubscribe(struct imhiredisWrkrInfo_s *me);
-void workerLoopQueue(struct imhiredisWrkrInfo_s *me);
+rsRetVal ensureConsumerGroupCreated(instanceConf_t *inst);
+rsRetVal ackStreamIndex(instanceConf_t *inst, uchar *stream, uchar *group, uchar *index);
+static rsRetVal enqueueRedisStreamReply(instanceConf_t *const inst, redisReply *reply);
+static rsRetVal handleRedisXREADReply(instanceConf_t *const inst, const redisReply *reply);
+static rsRetVal handleRedisXAUTOCLAIMReply(
+		instanceConf_t *const inst, const redisReply *reply, char **autoclaimIndex);
+rsRetVal redisStreamRead(instanceConf_t *inst);
+rsRetVal redisSubscribe(instanceConf_t *inst);
+void workerLoop(struct imhiredisWrkrInfo_s *me);
 static void *imhirediswrkr(void *myself);
 static rsRetVal createRedisNode(redisNode **root);
 rsRetVal copyNode(redisNode *src, redisNode **dst);
@@ -195,15 +255,22 @@
 {
 	DEFiRet;
 	instanceConf_t *inst;
-	CHKmalloc(inst = malloc(sizeof(instanceConf_t)));
+	CHKmalloc(inst = calloc(1, sizeof(instanceConf_t)));
 
 	inst->next = NULL;
 	inst->password = NULL;
 	inst->key = NULL;
 	inst->mode = 0;
+	inst->batchsize = 0;
 	inst->useLPop = 0;
+	inst->streamConsumerGroup = NULL;
+	inst->streamConsumerName = NULL;
+	CHKmalloc(inst->streamReadFrom = calloc(1, STREAM_INDEX_STR_MAXLEN));
+	inst->streamAutoclaimIdleTime = 0;
+	inst->streamConsumerACK = 1;
 	inst->pszBindRuleset = NULL;
 	inst->pBindRuleset = NULL;
+	inst->fieldList.nmemb = 0;
 
 	/* Redis objects */
 	inst->conn = NULL;
@@ -265,21 +332,60 @@
 		ABORT_FINALIZE(RS_RET_CONFIG_ERROR);
 	}
 
-	if (inst->key != NULL) {
-		DBGPRINTF("imhiredis: key/channel is '%s'\n", inst->key);
-	} else {
-		LogError(0, RS_RET_CONFIG_ERROR, "imhiredis: no key defined !");
+
+	if (inst->mode < IMHIREDIS_MODE_QUEUE || inst->mode > IMHIREDIS_MODE_STREAM) {
+		LogError(0, RS_RET_CONFIG_ERROR, "imhiredis: invalid mode, please choose 'subscribe', "
+						"'queue' or 'stream' mode.");
 		ABORT_FINALIZE(RS_RET_CONFIG_ERROR);
 	}
 
-	if (inst->mode != IMHIREDIS_MODE_QUEUE && inst->mode != IMHIREDIS_MODE_SUBSCRIBE) {
-		LogError(0, RS_RET_CONFIG_ERROR, "imhiredis: invalid mode, please choose 'subscribe' or 'queue' mode.");
-		ABORT_FINALIZE(RS_RET_CONFIG_ERROR);
+	if (inst->mode != IMHIREDIS_MODE_QUEUE && inst->useLPop) {
+		LogMsg(0, RS_RET_CONFIG_ERROR, LOG_WARNING,"imhiredis: 'uselpop' set with mode != queue : ignored.");
 	}
 
-	if (inst->mode == IMHIREDIS_MODE_SUBSCRIBE && inst->useLPop) {
-		LogMsg(0, RS_RET_CONFIG_ERROR, LOG_WARNING,"imhiredis: 'uselpop' set with mode = subscribe : ignored.");
+	if (inst->mode == IMHIREDIS_MODE_STREAM) {
+		if(inst->streamConsumerGroup != NULL && inst->streamConsumerName == NULL) {
+			LogError(0, RS_RET_CONFIG_ERROR, "imhiredis: invalid configuration, "
+					"please set a consumer name when mode is 'stream' and a consumer group is set");
+			ABORT_FINALIZE(RS_RET_CONFIG_ERROR);
+		}
+		if(inst->streamAutoclaimIdleTime != 0 && inst->streamConsumerGroup == NULL) {
+			LogMsg(0, RS_RET_CONFIG_ERROR, LOG_WARNING,"imhiredis: 'stream.autoclaimIdleTime' "
+					"set with no consumer group set : ignored.");
+		}
+		if(inst->streamReadFrom0 == '\0') {
+			inst->streamReadFrom0 = '$';
+		}
+	} else {
+		if (inst->streamConsumerGroup != NULL) {
+			LogMsg(0, RS_RET_CONFIG_ERROR, LOG_WARNING,"imhiredis: 'stream.consumerGroup' "
+									"set with mode != stream : ignored.");
+		}
+		if (inst->streamConsumerName != NULL) {
+			LogMsg(0, RS_RET_CONFIG_ERROR, LOG_WARNING,"imhiredis: 'stream.consumerName' "
+									"set with mode != stream : ignored.");
+		}
+		if (inst->streamAutoclaimIdleTime != 0) {
+			LogMsg(0, RS_RET_CONFIG_ERROR, LOG_WARNING,"imhiredis: 'stream.autoclaimIdleTime' "

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imhttp/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imhttp/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imkmsg/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imkmsg/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imkmsg/imkmsg.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imkmsg/imkmsg.c Changed

@@ -8,7 +8,7 @@
  * To test under Linux:
  * echo test1 > /dev/kmsg
  *
- * Copyright (C) 2008-2014 Adiscon GmbH
+ * Copyright (C) 2008-2023 Adiscon GmbH
  *
  * This file is part of rsyslog.
  *
@@ -70,6 +70,18 @@
 static modConfData_t *runModConf = NULL;/* modConf ptr to use for the current load process */
 static int bLegacyCnfModGlobalsPermitted;/* are legacy module-global config parameters permitted? */
 
+/* module-global parameters */
+static struct cnfparamdescr modpdescr = {
+	{ "parsekerneltimestamp", eCmdHdlrGetWord, 0 },
+	{ "readmode", eCmdHdlrGetWord, 0 },
+	{ "expectedbootcompleteseconds", eCmdHdlrPositiveInt, 0 }
+};
+static struct cnfparamblk modpblk =
+	{ CNFPARAMBLK_VERSION,
+	  sizeof(modpdescr)/sizeof(struct cnfparamdescr),
+	  modpdescr
+	};
+
 static prop_t *pInputName = NULL;
 /* there is only one global inputName for all messages generated by this module */
 static prop_t *pLocalHostIP = NULL;	/* a pseudo-constant propterty for 127.0.0.1 */
@@ -182,6 +194,9 @@
 	pModConf->pConf = pConf;
 	/* init our settings */
 	pModConf->iFacilIntMsg = klogFacilIntMsg();
+	pModConf->parseKernelStamp = KMSG_PARSE_TS_STARTUP_ONLY;
+	pModConf->readMode = KMSG_READMODE_FULL_BOOT;
+	pModConf->expected_boot_complete_secs = 90;
 	loadModConf->configSetViaV2Method = 0;
 	bLegacyCnfModGlobalsPermitted = 1;
 	/* init legacy config vars */
@@ -189,6 +204,71 @@
 ENDbeginCnfLoad
 
 
+BEGINsetModCnf
+	struct cnfparamvals *pvals = NULL;
+	int i;
+CODESTARTsetModCnf
+	pvals = nvlstGetParams(lst, &modpblk, NULL);
+	if(pvals == NULL) {
+		LogError(0, RS_RET_MISSING_CNFPARAMS, "error processing module "
+				"config parameters module(...)");
+		ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS);
+	}
+
+	if(Debug) {
+		dbgprintf("module (global) param blk for imkmsg:\n");
+		cnfparamsPrint(&modpblk, pvals);
+	}
+
+	for(i = 0 ; i < modpblk.nParams ; ++i) {
+		if(!pvalsi.bUsed)
+			continue;
+		if(!strcmp(modpblk.descri.name, "parsekerneltimestamp")) {
+			if(   !es_strconstcmp(pvalsi.val.d.estr, "on")
+			   || !es_strconstcmp(pvalsi.val.d.estr, "always")) {
+				loadModConf->parseKernelStamp = KMSG_PARSE_TS_ALWAYS;
+			} else if(!es_strconstcmp(pvalsi.val.d.estr, "startup")) {
+				loadModConf->parseKernelStamp = KMSG_PARSE_TS_STARTUP_ONLY;
+			} else if(!es_strconstcmp(pvalsi.val.d.estr, "off")) {
+				loadModConf->parseKernelStamp = KMSG_PARSE_TS_OFF;
+			} else {
+				const char *const cstr = es_str2cstr(pvalsi.val.d.estr, NULL);
+				LogError(0, RS_RET_PARAM_ERROR, "imkmsg: unknown "
+					"parse mode '%s'", cstr);
+				free((void*)cstr);
+			}
+		} else if(!strcmp(modpblk.descri.name, "expectedbootcompleteseconds")) {
+				loadModConf->expected_boot_complete_secs = pvalsi.val.d.n;
+		} else if(!strcmp(modpblk.descri.name, "readmode")) {
+			if(!es_strconstcmp(pvalsi.val.d.estr, "full-boot")) {
+				loadModConf->readMode = KMSG_READMODE_FULL_BOOT;
+			} else if(!es_strconstcmp(pvalsi.val.d.estr, "full-always")) {
+				loadModConf->readMode = KMSG_READMODE_FULL_ALWAYS;
+			} else if(!es_strconstcmp(pvalsi.val.d.estr, "new-only")) {
+				loadModConf->readMode = KMSG_READMODE_NEW_ONLY;
+			} else {
+				const char *const cstr = es_str2cstr(pvalsi.val.d.estr, NULL);
+				LogError(0, RS_RET_PARAM_ERROR, "imkmsg: unknown "
+					"read mode '%s', keeping default setting", cstr);
+				free((void*)cstr);
+			}
+		} else {
+			LogMsg(0, RS_RET_INTERNAL_ERROR, LOG_WARNING,
+				"imkmsg: RSYSLOG BUG, non-handled param '%s' in "
+				"beginCnfLoad\n", modpblk.descri.name);
+		}
+	}
+
+	/* disable legacy module-global config directives */
+	bLegacyCnfModGlobalsPermitted = 0;
+	loadModConf->configSetViaV2Method = 1;
+
+finalize_it:
+	if(pvals != NULL)
+		cnfparamvalsDestruct(pvals, &modpblk);
+ENDsetModCnf
+
+
 BEGINendCnfLoad
 CODESTARTendCnfLoad
 	if(!loadModConf->configSetViaV2Method) {
@@ -254,6 +334,7 @@
 CODEqueryEtryPt_STD_IMOD_QUERIES
 CODEqueryEtryPt_STD_CONF2_QUERIES
 CODEqueryEtryPt_STD_CONF2_PREPRIVDROP_QUERIES
+CODEqueryEtryPt_STD_CONF2_setModCnf_QUERIES
 ENDqueryEtryPt
 
 static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal)
@@ -289,5 +370,3 @@
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler,
 			resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
 ENDmodInit
-/* vim:set ai:
- */

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imkmsg/imkmsg.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imkmsg/imkmsg.h Changed

@@ -1,7 +1,7 @@
 /* imkmsg.h
  * These are the definitions for the kmsg message generation module.
  *
- * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2007-2023 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of rsyslog.
  *
@@ -25,13 +25,27 @@
 #include "rsyslog.h"
 #include "dirty.h"
 
+typedef enum _kernel_ts_parse_mods {
+		KMSG_PARSE_TS_OFF = 0,
+		KMSG_PARSE_TS_ALWAYS = 1,
+		KMSG_PARSE_TS_STARTUP_ONLY = 2
+	} t_kernel_ts_parse_mode;
+
+typedef enum _kernel_readmode {
+		KMSG_READMODE_FULL_BOOT = 0,
+		KMSG_READMODE_FULL_ALWAYS = 1,
+		KMSG_READMODE_NEW_ONLY = 2
+	} t_kernel_readmode;
+
 /* we need to have the modConf type present in all submodules */
 struct modConfData_s {
 	rsconf_t *pConf;
 	int iFacilIntMsg;
 	uchar *pszPath;
 	int console_log_level;
-	sbool bPermitNonKernel;
+	int expected_boot_complete_secs;
+	t_kernel_ts_parse_mode parseKernelStamp;
+	t_kernel_readmode readMode;
 	sbool configSetViaV2Method;
 };
 
@@ -62,5 +76,3 @@
 extern void SetParanoiaLevel(int);
 
 #endif /* #ifndef IMKLOG_H_INCLUDED */
-/* vi:set ai:
- */

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imkmsg/kmsg.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imkmsg/kmsg.c Changed

@@ -4,7 +4,7 @@
  * For a general overview, see head comment in imkmsg.c.
  * This is heavily based on imklog bsd.c file.
  *
- * Copyright 2008-2014 Adiscon GmbH
+ * Copyright 2008-2023 Adiscon GmbH
  *
  * This file is part of rsyslog.
  *
@@ -44,6 +44,18 @@
 
 /* globals */
 static int	fklog = -1;	/* kernel log fd */
+static int	bInInitialReading = 1; /* are we in the intial kmsg reading phase? */
+/* Note: There is a problem with kernel log time.
+ * See https://github.com/troglobit/sysklogd/commit/9f6fbb3301e571d8af95f8d771469291384e9e95
+ * We use the same work-around if bFixKernelStamp is on, and use the kernel log time
+ * only for past records, which we assume to be from recent boot. Later on, we do not
+ * use them but system time.
+ * UNFORTUNATELY, with /dev/kmsg, we always get old messages on startup. That means we
+ * may also pull old messages. We do not address this right now, as for 10 years "old
+ * messages" was pretty acceptable. So we wait until someone complains. Hint: we could
+ * do a seek to the end of kmsg if desired to not pull old messages.
+ * 2023-10-31 rgerhards
+ */
 
 #ifndef _PATH_KLOG
 #	define _PATH_KLOG "/dev/kmsg"
@@ -54,10 +66,11 @@
  * from the rest.
  */
 static void
-submitSyslog(uchar *buf)
+submitSyslog(modConfData_t *const pModConf, const uchar *buf)
 {
 	long offs = 0;
 	struct timeval tv;
+	struct timeval *tp = NULL;
 	struct sysinfo info;
 	unsigned long int timestamp = 0;
 	char name1024;
@@ -129,27 +142,32 @@
 		json_object_object_add(json, name, jval);
 	}
 
-	/* calculate timestamp */
-	sysinfo(&info);
-	gettimeofday(&tv, NULL);
+	if(   (pModConf->parseKernelStamp == KMSG_PARSE_TS_ALWAYS)
+	   || ((pModConf->parseKernelStamp == KMSG_PARSE_TS_STARTUP_ONLY) && bInInitialReading) ) {
+		/* calculate timestamp */
+		sysinfo(&info);
+		gettimeofday(&tv, NULL);
 
-	/* get boot time */
-	tv.tv_sec -= info.uptime;
+		/* get boot time */
+		tv.tv_sec -= info.uptime;
 
-	tv.tv_sec += timestamp / 1000000;
-	tv.tv_usec += timestamp % 1000000;
+		tv.tv_sec += timestamp / 1000000;
+		tv.tv_usec += timestamp % 1000000;
 
-	while (tv.tv_usec < 0) {
-		tv.tv_sec--;
-		tv.tv_usec += 1000000;
-	}
+		while (tv.tv_usec < 0) {
+			tv.tv_sec--;
+			tv.tv_usec += 1000000;
+		}
+
+		while (tv.tv_usec >= 1000000) {
+			tv.tv_sec++;
+			tv.tv_usec -= 1000000;
+		}
 
-	while (tv.tv_usec >= 1000000) {
-		tv.tv_sec++;
-		tv.tv_usec -= 1000000;
+		tp = &tv;
 	}
 
-	Syslog(priority, (uchar *)msg, &tv, json);
+	Syslog(priority, (uchar *)msg, tp, json);
 }
 
 
@@ -161,7 +179,7 @@
 	char errmsg2048;
 	DEFiRet;
 
-	fklog = open(_PATH_KLOG, O_RDONLY, 0);
+	fklog = open(_PATH_KLOG, O_RDONLY | O_NONBLOCK, 0);
 	if (fklog < 0) {
 		imkmsgLogIntMsg(LOG_ERR, "imkmsg: cannot open kernel log (%s): %s.",
 			_PATH_KLOG, rs_strerror_r(errno, errmsg, sizeof(errmsg)));
@@ -184,7 +202,7 @@
 	/* this normally returns EINVAL */
 	/* on an OpenVZ VM, we get EPERM */
 	r = read(fklog, NULL, 0);
-	if (r < 0 && errno != EINVAL) {
+	if (r < 0 && errno != EINVAL && errno != EAGAIN && errno != EWOULDBLOCK) {
 		imkmsgLogIntMsg(LOG_ERR, "imkmsg: cannot open kernel log (%s): %s.",
 			_PATH_KLOG, rs_strerror_r(errno, errmsg, sizeof(errmsg)));
 		fklog = -1;
@@ -195,22 +213,52 @@
 	RETiRet;
 }
 
+
+static void
+change_reads_to_blocking(const int fd)
+{
+	const int flags = fcntl(fd, F_GETFL, 0);
+	fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
+}
+
 /* Read kernel log while data are available, each read() reads one
  * record of printk buffer.
  */
 static void
-readkmsg(void)
+readkmsg(modConfData_t *const pModConf)
 {
 	int i;
-	uchar pRcv8192+1;
+	uchar pRcv16*1024+1;
 	char errmsg2048;
+	off_t seek_result = 0;
+
+	if(pModConf->readMode == KMSG_READMODE_FULL_BOOT) {
+		struct sysinfo info;
+		sysinfo(&info);
+		DBGPRINTF("imkmsg: system uptime is %lld, expected %d\n",
+			(long long) info.uptime, pModConf->expected_boot_complete_secs);
+		if(info.uptime > pModConf->expected_boot_complete_secs) {
+			seek_result = lseek(fklog, 0, SEEK_END);
+		}
+	} else if(pModConf->readMode == KMSG_READMODE_NEW_ONLY) {
+		seek_result = lseek(fklog, 0, SEEK_END);
+	} else if(pModConf->readMode != KMSG_READMODE_FULL_ALWAYS) {
+		imkmsgLogIntMsg(LOG_ERR, "imkmsg: internal program error, "
+				"unknown read mode %d, assuming 'full-always'",
+				pModConf->readMode);
+	}
+
+	if(seek_result == (off_t) -1) {
+		imkmsgLogIntMsg(LOG_WARNING,
+				"imkmsg: could not seek to requested klog entries - will"
+				"now potentially output all messages");
+	}
 
 	for (;;) {
 		dbgprintf("imkmsg waiting for kernel log line\n");
 
 		/* every read() from the opened device node receives one record of the printk buffer */
 		i = read(fklog, pRcv, 8192);
-
 		if (i > 0) {
 			/* successful read of message of nonzero length */
 			pRcvi = '\0';
@@ -220,7 +268,13 @@
 			continue;
 		} else {
 			/* something went wrong - error or zero length message */
-			if (i < 0 && errno != EINTR && errno != EAGAIN) {
+			if(i < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
+				DBGPRINTF("imkmsg: initial read done, changing to blocking mode\n");
+				change_reads_to_blocking(fklog);
+				bInInitialReading = 0;
+				continue;
+			}
+			if(i < 0 && errno != EINTR && errno != EAGAIN) {
 				/* error occurred */
 				imkmsgLogIntMsg(LOG_ERR,
 				       "imkmsg: error reading kernel log - shutting down: %s",
@@ -230,7 +284,7 @@
 			break;
 		}
 
-		submitSyslog(pRcv);
+		submitSyslog(pModConf, pRcv);
 	}
 }
 
@@ -254,10 +308,10 @@
  * "message pull" mechanism.
  * rgerhards, 2008-04-09
  */
-rsRetVal klogLogKMsg(modConfData_t __attribute__((unused)) *pModConf)
+rsRetVal klogLogKMsg(modConfData_t *const pModConf)
 {
 	DEFiRet;
-	readkmsg();
+	readkmsg(pModConf);
 	RETiRet;
 }

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/impcap/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/impcap/Makefile.in Changed

@@ -284,6 +284,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -352,6 +356,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -363,6 +369,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -458,7 +465,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/improg/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/improg/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/imtuxedoulog/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/imtuxedoulog/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/mmcount/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/mmcount/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/mmdarwin/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/mmdarwin/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/mmgrok/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/mmgrok/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/mmkubernetes/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/mmkubernetes/Makefile.in Changed

@@ -268,6 +268,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -336,6 +340,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -347,6 +353,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -442,7 +449,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/mmrfc5424addhmac/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/mmrfc5424addhmac/Makefile.in Changed

@@ -269,6 +269,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -337,6 +341,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -348,6 +354,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -443,7 +450,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/mmsequence/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/mmsequence/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/mmtaghostname/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/mmtaghostname/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/omamqp1/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/omamqp1/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/omczmq/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/omczmq/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/omfile-hardened/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/omfile-hardened/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/omhiredis/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/omhiredis/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/omhiredis/omhiredis.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/omhiredis/omhiredis.c Changed

@@ -30,6 +30,7 @@
 #include <assert.h>
 #include <signal.h>
 #include <time.h>
+#include <math.h>
 #include <hiredis/hiredis.h>
 
 #include "rsyslog.h"
@@ -53,6 +54,7 @@
 #define OMHIREDIS_MODE_QUEUE 1
 #define OMHIREDIS_MODE_PUBLISH 2
 #define OMHIREDIS_MODE_SET 3
+#define OMHIREDIS_MODE_STREAM 4
 
 /* our instance data.
  * this will be accessable
@@ -64,10 +66,34 @@
 	uchar *tplName; /* template name */
 	char *modeDescription; /* mode description */
 	int mode; /* mode constant */
-	uchar *key; /* key for QUEUE and PUBLISH modes */
+	uchar *key; /* key for QUEUE, PUBLISH and STREAM modes */
+	uchar *streamKeyAck; /* key name for STREAM ACKs (when enabled) */
+	uchar *streamGroupAck; /* group name for STREAM ACKs (when enabled) */
+	uchar *streamIndexAck; /* index name for STREAM ACKs (when enabled) */
 	int expiration; /* expiration value for SET/SETEX mode */
 	sbool dynaKey; /* Should we treat the key as a template? */
+	sbool streamDynaKeyAck; /* Should we treat the groupAck as a template? */
+	sbool streamDynaGroupAck; /* Should we treat the groupAck as a template? */
+	sbool streamDynaIndexAck; /* Should we treat the IndexAck as a template? */
 	sbool useRPush; /* Should we use RPUSH instead of LPUSH? */
+	uchar *streamOutField; /* Field to place message into (for stream insertions only) */
+	uint streamCapacityLimit; /* zero means stream is not capped (default)
+				setting a non-zero value ultimately activates the approximate MAXLEN option '~'
+				(see Redis XADD docs)*/
+	sbool streamAck; /* Should the module send an XACK for each inserted message?
+				This feature requires that 3 infos are present in the '$.' object of the log:
+				- $.redis!stream
+				- $.redis!group
+				- $.redis!index
+				Those 3 infos can either be provided through usage of imhiredis
+				or set manually with Rainerscript */
+	sbool streamDel; /* Should the module send an XDEL for each inserted message?
+				This feature requires that 2 infos are present in the '$.' object of the log:
+				- $.redis!stream
+				- $.redis!index
+				Those 2 infos can either be provided through usage of imhiredis
+				or set manually with Rainerscript */
+
 } instanceData;
 
 typedef struct wrkrInstanceData {
@@ -86,6 +112,16 @@
 	{ "expiration", eCmdHdlrInt, 0 },
 	{ "dynakey", eCmdHdlrBinary, 0 },
 	{ "userpush", eCmdHdlrBinary, 0 },
+	{ "stream.outField", eCmdHdlrGetWord, 0 },
+	{ "stream.capacityLimit", eCmdHdlrNonNegInt, 0 },
+	{ "stream.ack", eCmdHdlrBinary, 0 },
+	{ "stream.del", eCmdHdlrBinary, 0 },
+	{ "stream.keyAck", eCmdHdlrGetWord, 0 },
+	{ "stream.groupAck", eCmdHdlrGetWord, 0 },
+	{ "stream.indexAck", eCmdHdlrGetWord, 0 },
+	{ "stream.dynaKeyAck", eCmdHdlrBinary, 0 },
+	{ "stream.dynaGroupAck", eCmdHdlrBinary, 0 },
+	{ "stream.dynaIndexAck", eCmdHdlrBinary, 0 },
 };
 
 static struct cnfparamblk actpblk = {
@@ -127,6 +163,11 @@
 	free(pData->key);
 	free(pData->modeDescription);
 	free(pData->serverpassword);
+	free(pData->tplName);
+	free(pData->streamKeyAck);
+	free(pData->streamGroupAck);
+	free(pData->streamIndexAck);
+	free(pData->streamOutField);
 ENDfreeInstance
 
 BEGINfreeWrkrInstance
@@ -143,14 +184,14 @@
 static rsRetVal initHiredis(wrkrInstanceData_t *pWrkrData, int bSilent)
 {
 	char *server;
-	char *serverpasswd;
+	redisReply *reply = NULL;
 	DEFiRet;
 
 	server = (pWrkrData->pData->server == NULL) ? (char *)"127.0.0.1" :
 			(char*) pWrkrData->pData->server;
 	DBGPRINTF("omhiredis: trying connect to '%s' at port %d\n", server,
 			pWrkrData->pData->port);
-	
+
 	struct timeval timeout = { 1, 500000 }; /* 1.5 seconds */
 	pWrkrData->conn = redisConnectWithTimeout(server, pWrkrData->pData->port,
 			timeout);
@@ -162,18 +203,55 @@
 	}
 
 	if (pWrkrData->pData->serverpassword != NULL) {
-		serverpasswd = (char*) pWrkrData->pData->serverpassword;
-		int rc;
-		rc = redisAppendCommand(pWrkrData->conn, "AUTH %s", serverpasswd);
-		if (rc == REDIS_ERR) {
-			LogError(0, NO_ERRCODE, "omhiredis: %s", pWrkrData->conn->errstr);
+		reply = redisCommand(pWrkrData->conn, "AUTH %s", (char*) pWrkrData->pData->serverpassword);
+		if (reply == NULL) {
+			DBGPRINTF("omhiredis: could not get reply from AUTH command\n");
+			ABORT_FINALIZE(RS_RET_SUSPENDED);
+		}
+		else if (reply->type == REDIS_REPLY_ERROR) {
+			LogError(0, NO_ERRCODE, "omhiredis: error while authenticating: %s", reply->str);
 			ABORT_FINALIZE(RS_RET_ERR);
-		} else {
-			pWrkrData->count++;
 		}
 	}
 
 finalize_it:
+	if (iRet != RS_RET_OK && pWrkrData-> conn != NULL) {
+		redisFree(pWrkrData->conn);
+		pWrkrData->conn = NULL;
+	}
+	if (reply != NULL) freeReplyObject(reply);
+	RETiRet;
+}
+
+static rsRetVal isMaster(wrkrInstanceData_t *pWrkrData) {
+	DEFiRet;
+	redisReply *reply = NULL;
+
+	assert(pWrkrData->conn != NULL);
+
+	reply = redisCommand(pWrkrData->conn, "ROLE");
+	if (reply == NULL) {
+		DBGPRINTF("omhiredis: could not get reply from ROLE command\n");
+		ABORT_FINALIZE(RS_RET_SUSPENDED);
+	}
+	else if (reply->type == REDIS_REPLY_ERROR) {
+		LogMsg(0, RS_RET_REDIS_ERROR, LOG_WARNING, "omhiredis: got an error while querying role -> "
+			"%s\n", reply->str);
+		ABORT_FINALIZE(RS_RET_SUSPENDED);
+	}
+	else if (reply->type != REDIS_REPLY_ARRAY || reply->element0->type != REDIS_REPLY_STRING) {
+		LogMsg(0, RS_RET_REDIS_ERROR, LOG_ERR, "omhiredis: did not get a proper reply from ROLE command");
+		ABORT_FINALIZE(RS_RET_SUSPENDED);
+	}
+	else {
+		if (strncmp(reply->element0->str, "master", 6)) {
+			LogMsg(0, RS_RET_OK, LOG_WARNING, "omhiredis: current connected node is not a master");
+			ABORT_FINALIZE(RS_RET_SUSPENDED);
+		}
+	}
+
+finalize_it:
+	free(reply);
 	RETiRet;
 }
 
@@ -220,6 +298,20 @@
 				rc = REDIS_ERR;
 			}
 			break;
+		case OMHIREDIS_MODE_STREAM:
+			if (pWrkrData->pData->streamCapacityLimit != 0) {
+				rc = redisAppendCommand(pWrkrData->conn, "XADD %s MAXLEN ~ %d * %s %s",
+								key,
+								pWrkrData->pData->streamCapacityLimit,
+								pWrkrData->pData->streamOutField,
+								message);
+			} else {
+				rc = redisAppendCommand(pWrkrData->conn, "XADD %s * %s %s",
+								key,
+								pWrkrData->pData->streamOutField,
+								message);
+			}
+			break;
 		default:
 			dbgprintf("omhiredis: mode %d is invalid something is really wrong\n",
 				pWrkrData->pData->mode);
@@ -239,12 +331,47 @@
 	RETiRet;
 }
 
+static rsRetVal ackHiredisStreamIndex(wrkrInstanceData_t *pWrkrData, uchar *key, uchar *group, uchar *index) {
+	DEFiRet;
+
+	if (REDIS_ERR == redisAppendCommand(pWrkrData->conn, "XACK %s %s %s", key, group, index)) {
+		LogError(0, NO_ERRCODE, "omhiredis: %s", pWrkrData->conn->errstr);
+		DBGPRINTF("omhiredis: %s\n", pWrkrData->conn->errstr);
+		ABORT_FINALIZE(RS_RET_ERR);
+	} else {
+		pWrkrData->count++;
+	}
+
+finalize_it:
+	RETiRet;
+}

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/omhttp/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/omhttp/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/omhttpfs/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/omhttpfs/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/omrabbitmq/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/omrabbitmq/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/omtcl/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/omtcl/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/pmaixforwardedfrom/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/pmaixforwardedfrom/Makefile.in Changed

@@ -268,6 +268,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -336,6 +340,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -347,6 +353,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -442,7 +449,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/pmcisconames/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/pmcisconames/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/pmdb2diag/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/pmdb2diag/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/pmpanngfw/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/pmpanngfw/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/contrib/pmsnare/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/contrib/pmsnare/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/dirty.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/dirty.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/grammar/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/grammar/Makefile.in Changed

@@ -255,6 +255,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -323,6 +327,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -334,6 +340,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -429,7 +436,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/grammar/rainerscript.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/grammar/rainerscript.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/parse.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/parse.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/parse.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/parse.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/fmhttp/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/fmhttp/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/im3195/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/im3195/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imdiag/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imdiag/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imdiag/imdiag.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imdiag/imdiag.c Changed

@@ -5,7 +5,7 @@
  *
  * File begun on 2008-07-25 by RGerhards
  *
- * Copyright 2008-2020 Adiscon GmbH.
+ * Copyright 2008-2023 Adiscon GmbH.
  *
  * This file is part of rsyslog.
  *
@@ -376,6 +376,40 @@
 }
 
 static rsRetVal
+awaitHUPComplete(tcps_sess_t *pSess)
+{
+	const int max_tries = 10;
+	const int ms_to_sleep = 50;
+	const char *return_msg;
+	int b_saw_HUP = 0;
+	int tries = max_tries;
+	unsigned actual_tries = 0;
+	DEFiRet;
+
+	while(tries > 0) {
+		++actual_tries;
+		if(get_bHadHUP() == 1) {
+			tries = max_tries;
+			b_saw_HUP = 1;
+		} else {
+			--tries;
+		}
+		srSleep(0, ms_to_sleep * 50);
+	}
+
+	if(b_saw_HUP) {
+		return_msg = "seen HUP request, looks like it has completed";
+	} else {
+		return_msg = "timeout - looks like_HUP has completed";
+	}
+	CHKiRet(sendResponse(pSess, "%s %d tries\n", return_msg, actual_tries));
+	DBGPRINTF("imdiag: %s\n", return_msg);
+
+finalize_it:
+	RETiRet;
+}
+
+static rsRetVal
 enableDebug(tcps_sess_t *pSess)
 {
 	DEFiRet;
@@ -522,6 +556,8 @@
 		CHKiRet(blockStatsReporting(pSess));
 	} else if(!ustrcmp(cmdBuf, UCHAR_CONSTANT("awaitstatsreport"))) {
 		CHKiRet(awaitStatsReport(pszMsg, pSess));
+	} else if(!ustrcmp(cmdBuf, UCHAR_CONSTANT("awaithupcomplete"))) {
+		CHKiRet(awaitHUPComplete(pSess));
 	} else if(!ustrcmp(cmdBuf, UCHAR_CONSTANT("enabledebug"))) {
 		CHKiRet(enableDebug(pSess));
 	} else {

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imfile/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imfile/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imfile/imfile.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imfile/imfile.c Changed

@@ -852,10 +852,13 @@
 				*  the old file in case a process is still writing into it until the FILE_DELETE_DELAY
 				*  is reached OR the inode has changed (see elseif below). In most cases, the
 				*  delay will never be reached and the file will be closed when the inode has changed.
+				*  Directories are deleted without delay.
 				*/
-				if (act->time_to_delete + FILE_DELETE_DELAY < ttNow) {
-				DBGPRINTF("detect_updates obj gone away, unlinking: '%s', ttDelete: %lds, ttNow:%ld\n",
-					act->name, ttNow - (act->time_to_delete + FILE_DELETE_DELAY), ttNow);
+				sbool is_file = act->edge->is_file;
+				if (!is_file || act->time_to_delete + FILE_DELETE_DELAY < ttNow) {
+				DBGPRINTF("detect_updates obj gone away, unlinking: "
+					"'%s', ttDelete: %lds, ttNow:%ld isFile: %d\n",
+					act->name, ttNow - (act->time_to_delete + FILE_DELETE_DELAY), ttNow, is_file);
 					act_obj_unlink(act);
 					restart = 1;
 				} else {
@@ -1038,9 +1041,9 @@
 		act_obj_t *target_act;
 		for(target_act = act->edge->active ; target_act != NULL ; target_act = target_act->next) {
 			if(target_act->source_name && !strcmp(target_act->source_name, act->name)) {
-				DBGPRINTF("act_obj_destroy: unlinking slink target %s of %s "
-						"symlink\n", target_act->name, act->name);
-				act_obj_unlink(target_act);
+				DBGPRINTF("act_obj_destroy: detect_updates for parent of target %s of %s symlink\n",
+						target_act->name, act->name);
+				detect_updates(target_act->edge->parent->root->edges);
 				break;
 			}
 		}
@@ -1150,6 +1153,7 @@
 	DBGPRINTF("node destroy: %p edges:\n", node);
 
 	for(edge = node->edges ; edge != NULL ; ) {
+		detect_updates(edge);
 		fs_node_destroy(edge->node);
 		fs_edge_t *const toDel = edge;
 		edge = edge->next;

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imgssapi/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imgssapi/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imgssapi/imgssapi.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imgssapi/imgssapi.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imjournal/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imjournal/Makefile.in Changed

@@ -272,6 +272,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -340,6 +344,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -351,6 +357,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -446,7 +453,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imjournal/imjournal.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imjournal/imjournal.c Changed

@@ -33,8 +33,12 @@
 #include <time.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <errno.h>
 #include <systemd/sd-journal.h>
+#include <fcntl.h>
 
 #include "dirty.h"
 #include "cfsysline.h"
@@ -45,6 +49,7 @@
 #include "net.h"
 #include "glbl.h"
 #include "statsobj.h"
+#include "ruleset.h"
 #include "parser.h"
 #include "prop.h"
 #include "errmsg.h"
@@ -64,15 +69,28 @@
 DEFobjCurrIf(parser)
 DEFobjCurrIf(prop)
 DEFobjCurrIf(net)
+DEFobjCurrIf(ruleset)
 DEFobjCurrIf(statsobj)
 
+/* Module static data */
+typedef struct journal_etry_s {
+	pthread_t tid;	/* the worker's thread ID */
+	ruleset_t *pBindRuleset;
+	char* stateFile;
+	struct journalContext_s *journalContext;
+	struct journal_etry_s *next;
+} journal_etry_t;
+static journal_etry_t *journal_root = NULL;
+static int n_journal = 0;
+
 struct modConfData_s {
 	rsconf_t *pConf;
-	int bIgnPrevMsg;
+	instanceConf_t *root, *tail;
 };
 
 static struct configSettings_s {
 	char *stateFile;
+	int fCreateMode; /* default mode to use when creating new files, e.g. stateFile */
 	int iPersistStateInterval;
 	unsigned int ratelimitInterval;
 	unsigned int ratelimitBurst;
@@ -85,6 +103,7 @@
 	int bWorkAroundJournalBug; /* deprecated, left for backwards compatibility only */
 	int bFsync;
 	int bRemote;
+	char *dfltTag;
 } cs;
 
 static rsRetVal facilityHdlr(uchar **pp, void *pVal);
@@ -92,6 +111,7 @@
 /* module-global parameters */
 static struct cnfparamdescr modpdescr = {
 	{ "statefile", eCmdHdlrGetWord, 0 },
+	{ "filecreatemode", eCmdHdlrFileCreateMode, 0 },
 	{ "ratelimit.interval", eCmdHdlrInt, 0 },
 	{ "ratelimit.burst", eCmdHdlrInt, 0 },
 	{ "persiststateinterval", eCmdHdlrInt, 0 },
@@ -103,7 +123,8 @@
 	{ "usepid", eCmdHdlrString, 0 },
 	{ "workaroundjournalbug", eCmdHdlrBinary, 0 },
 	{ "fsync", eCmdHdlrBinary, 0 },
-	{ "remote", eCmdHdlrBinary, 0 }
+	{ "remote", eCmdHdlrBinary, 0 },
+	{ "defaulttag", eCmdHdlrGetWord, 0 }
 };
 static struct cnfparamblk modpblk =
 	{ CNFPARAMBLK_VERSION,
@@ -111,9 +132,31 @@
 	  modpdescr
 	};
 
+/* input instance parameters */
+static struct cnfparamdescr inppdescr = {
+	{ "ruleset", eCmdHdlrString, 0 },
+	{ "main", eCmdHdlrBinary, 0 },
+};
+static struct cnfparamblk inppblk =
+	{ CNFPARAMBLK_VERSION,
+	  sizeof(inppdescr)/sizeof(struct cnfparamdescr),
+	  inppdescr
+	};
+
+struct instanceConf_s {
+	struct instanceConf_s *next;
+	char *stateFile;
+	uchar *pszBindRuleset;
+	ruleset_t *pBindRuleset; /* ruleset to bind listener to (use system default if unspecified) */
+	int bMain;
+};
+
+#include "im-helper.h" /* must be included AFTER the type definitions! */
+
 #define DFLT_persiststateinterval 10
 #define DFLT_SEVERITY pri2sev(LOG_NOTICE)
 #define DFLT_FACILITY pri2fac(LOG_USER)
+#define DFLT_TAG "journal"
 
 static int bLegacyCnfModGlobalsPermitted = 1;/* are legacy module-global config parameters permitted? */
 
@@ -141,54 +184,66 @@
 	sbool atHead; /* true if we are at start of journal (no seek was done) */
 	char *cursor; /* should point to last valid journald entry we processed */
 };
-static struct journalContext_s journalContext = {NULL, 0, 1, NULL};
+
+#define MAX_JOURNAL 8
+static struct journalContext_s journalContextArrayMAX_JOURNAL = {
+	{NULL, 0, 1, NULL},
+	{NULL, 0, 1, NULL},
+	{NULL, 0, 1, NULL},
+	{NULL, 0, 1, NULL},
+	{NULL, 0, 1, NULL},
+	{NULL, 0, 1, NULL},
+	{NULL, 0, 1, NULL},
+	{NULL, 0, 1, NULL},
+};
 static modConfData_t *loadModConf = NULL;/* modConf ptr to use for the current load process */
 static modConfData_t *runModConf = NULL;/* modConf ptr to use for run process */
 
 #define J_PROCESS_PERIOD 1024  /* Call sd_journal_process() every 1,024 records */
 
-static rsRetVal persistJournalState(void);
-static rsRetVal loadJournalState(void);
+static rsRetVal persistJournalState(struct journalContext_s *journalContext, char* stateFile);
+static rsRetVal loadJournalState(struct journalContext_s *journalContext, char* stateFile);
+
+static rsRetVal openJournal(struct journalContext_s *journalContext) {
 
-static rsRetVal openJournal(void) {
 	int r;
 	DEFiRet;
 
-	if (journalContext.j) {
+	if (journalContext->j) {
 		LogMsg(0, RS_RET_OK_WARN, LOG_WARNING, "imjournal: opening journal when already opened.\n");
 	}
-	if ((r = sd_journal_open(&journalContext.j, cs.bRemote? 0 : SD_JOURNAL_LOCAL_ONLY)) < 0) {
+	if ((r = sd_journal_open(&journalContext->j, cs.bRemote? 0 : SD_JOURNAL_LOCAL_ONLY)) < 0) {
 		LogError(-r, RS_RET_IO_ERROR, "imjournal: sd_journal_open() failed");
 		iRet = RS_RET_IO_ERROR;
 	}
-	if ((r = sd_journal_set_data_threshold(journalContext.j, glbl.GetMaxLine(runModConf->pConf))) < 0) {
+	if ((r = sd_journal_set_data_threshold(journalContext->j, glbl.GetMaxLine(runModConf->pConf))) < 0) {
 		LogError(-r, RS_RET_IO_ERROR, "imjournal: sd_journal_set_data_threshold() failed");
 		iRet = RS_RET_IO_ERROR;
 	}
-	journalContext.atHead = 1;
+	journalContext->atHead = 1;
 	RETiRet;
 }
 
 /* trySave shoulod only be true if there is no journald error preceeding this call */
-static void closeJournal(void) {
-	if (!journalContext.j) {
+static void closeJournal(struct journalContext_s *journalContext) {
+	if (!journalContext->j) {
 		LogMsg(0, RS_RET_OK_WARN, LOG_WARNING, "imjournal: closing NULL journal.\n");
 	}
-	sd_journal_close(journalContext.j);
-	journalContext.j = NULL; /* setting to NULL here as journald API will not do that for us... */
+	sd_journal_close(journalContext->j);
+	journalContext->j = NULL; /* setting to NULL here as journald API will not do that for us... */
 }
 
-static int journalGetData(const char *field, const void **data, size_t *length)
+static int journalGetData(struct journalContext_s *journalContext, const char *field, const void **data, size_t *length)
 {
 	int ret;
 
-	ret = sd_journal_get_data(journalContext.j, field, data, length);
+	ret = sd_journal_get_data(journalContext->j, field, data, length);
 	if (ret == -EADDRNOTAVAIL) {
 		LogError(-ret, RS_RET_ERR, "imjournal: Tried to get data without a 'next' call.\n");
-		if ((ret = sd_journal_next(journalContext.j)) < 0) {
+		if ((ret = sd_journal_next(journalContext->j)) < 0) {
 			LogError(-ret, RS_RET_ERR, "imjournal: sd_journal_next() failed\n");
 		} else {
-			ret = sd_journal_get_data(journalContext.j, field, data, length);
+			ret = sd_journal_get_data(journalContext->j, field, data, length);
 		}
 	}
 
@@ -257,7 +312,7 @@
 /* Read JSON part of single journald message and return it as JSON object
  */
 static rsRetVal
-readJSONfromJournalMsg(struct fjson_object **json)
+readJSONfromJournalMsg(struct journalContext_s *journalContext, struct fjson_object **json)
 {
 	DEFiRet;

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imkafka/Makefile.am -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imkafka/Makefile.am Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imkafka/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imkafka/Makefile.in Changed

@@ -269,6 +269,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -337,6 +341,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -348,6 +354,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -443,7 +450,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -451,8 +457,8 @@
 pkglib_LTLIBRARIES = imkafka.la
 @IMKAFKA_USE_DUMMY_FALSE@imkafka_la_SOURCES = imkafka.c
 @IMKAFKA_USE_DUMMY_TRUE@imkafka_la_SOURCES = dummy.c
-@ENABLE_KAFKA_STATIC_TRUE@imkafka_la_LDFLAGS = -module -avoid-version -Wl,--whole-archive -l:librdkafka.a -Wl,--no-whole-archive -lssl -lpthread -lcrypto -lsasl2 -lz -llz4 -lrt # Static Linking now $(LIBRDKAFKA_LIBS)
-@IMKAFKA_USE_DUMMY_FALSE@imkafka_la_LDFLAGS = -module -avoid-version $(LIBRDKAFKA_LIBS)
+@ENABLE_KAFKA_STATIC_FALSE@@IMKAFKA_USE_DUMMY_FALSE@imkafka_la_LDFLAGS = -module -avoid-version $(LIBRDKAFKA_LIBS) -lm
+@ENABLE_KAFKA_STATIC_TRUE@@IMKAFKA_USE_DUMMY_FALSE@imkafka_la_LDFLAGS = -module -avoid-version -Wl,--whole-archive -l:librdkafka-static.a -Wl,--no-whole-archive -ldl -lresolv -lcurl -lssl -lpthread -lcrypto -lsasl2 -lz -llz4 -lrt -lm
 @IMKAFKA_USE_DUMMY_TRUE@imkafka_la_LDFLAGS = -module -avoid-version
 @IMKAFKA_USE_DUMMY_FALSE@imkafka_la_CPPFLAGS = -I$(top_srcdir) $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
 @IMKAFKA_USE_DUMMY_TRUE@imkafka_la_CPPFLAGS = -I$(top_srcdir) $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) -D MODNAME=imkafka

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imklog/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imklog/Makefile.in Changed

@@ -276,6 +276,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -344,6 +348,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -355,6 +361,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -450,7 +457,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imklog/bsd.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imklog/bsd.c Changed

@@ -7,7 +7,7 @@
  * are very small, and so we use a single driver for both OS's with
  * a little help of conditional compilation.
  *
- * Copyright 2008-2018 Adiscon GmbH
+ * Copyright 2008-2023 Adiscon GmbH
  *
  * This file is part of rsyslog.
  *
@@ -82,17 +82,18 @@
 	struct timeval tv;
 	struct timeval *tp = NULL;
 
-	if(!pModConf->bParseKernelStamp)
-		goto done;
-
-	if(buf3 != '')
+	/* find end of pri */
+	int endpri = 1;
+	while(bufendpri != '>' && endpri < 5)
+		++endpri;
+	if(endpri > 4 || bufendpri + 1 != '')
 		goto done;
 	DBGPRINTF("imklog: kernel timestamp detected, extracting it\n");
 
 	/* we now try to parse the timestamp. iff it parses, we assume
 	 * it is a timestamp. Otherwise we know for sure it is no ts ;)
 	 */
-	i = 4; /* space or first digit after '' */
+	i = endpri + 2; /* space or first digit after '' */
 	while(bufi && isspace(bufi))
 		++i; /* skip space */
 	secs = 0;
@@ -121,7 +122,12 @@
 	DBGPRINTF("kernel timestamp is %ld %ld\n", secs, usecs);
 	if(!pModConf->bKeepKernelStamp) {
 		bufsize= strlen((char*)buf);
-		memmove(buf+3, buf+i, bufsize - i + 1);
+		memmove(buf+endpri+1, buf+i, bufsize - i + 1);
+	}
+
+	if(!pModConf->bParseKernelStamp) {
+		DBGPRINTF("imklog/bsd: parseKernelStamp not set, ignoring kernel timestamp\n");
+		goto done;
 	}
 
 	clock_gettime(CLOCK_MONOTONIC, &monotonic);

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imklog/imklog.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imklog/imklog.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/immark/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/immark/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/impstats/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/impstats/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imptcp/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imptcp/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imptcp/imptcp.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imptcp/imptcp.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imrelp/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imrelp/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imrelp/imrelp.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imrelp/imrelp.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imsolaris/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imsolaris/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imtcp/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imtcp/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imtcp/imtcp.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imtcp/imtcp.c Changed

@@ -144,6 +144,7 @@
 	uchar *pszStrmDrvrAuthMode;
 	uchar *pszStrmDrvrPermitExpiredCerts;
 	uchar *pszStrmDrvrCAFile;
+	uchar *pszStrmDrvrCRLFile;
 	uchar *pszStrmDrvrKeyFile;
 	uchar *pszStrmDrvrCertFile;
 	permittedPeers_t *pPermPeersRoot;
@@ -185,6 +186,7 @@
 	uchar *pszStrmDrvrAuthMode; /* authentication mode to use */
 	uchar *pszStrmDrvrPermitExpiredCerts; /* control how to handly expired certificates */
 	uchar *pszStrmDrvrCAFile;
+	uchar *pszStrmDrvrCRLFile;
 	uchar *pszStrmDrvrKeyFile;
 	uchar *pszStrmDrvrCertFile;
 	permittedPeers_t *pPermPeersRoot;
@@ -370,6 +372,7 @@
 	inst->pszStrmDrvrAuthMode = NULL;
 	inst->pszStrmDrvrPermitExpiredCerts = NULL;
 	inst->pszStrmDrvrCAFile = NULL;
+	inst->pszStrmDrvrCRLFile = NULL;
 	inst->pszStrmDrvrKeyFile = NULL;
 	inst->pszStrmDrvrCertFile = NULL;
 	inst->pPermPeersRoot = NULL;
@@ -449,6 +452,20 @@
 		CHKmalloc(inst->pszInputName = ustrdup(cs.pszInputName));
 	}
 	inst->cnf_params->bSuppOctetFram = cs.bSuppOctetFram;
+	inst->iStrmDrvrMode = cs.iStrmDrvrMode;
+	inst->bKeepAlive = cs.bKeepAlive ;
+	inst->bUseFlowControl = cs.bUseFlowControl;
+	inst->bDisableLFDelim = cs.bDisableLFDelim;
+	inst->bEmitMsgOnClose = cs.bEmitMsgOnClose;
+	inst->bPreserveCase = cs.bPreserveCase;
+	inst->iKeepAliveProbes = cs.iKeepAliveProbes;
+	inst->iKeepAliveIntvl = cs.iKeepAliveIntvl;
+	inst->iKeepAliveTime = cs.iKeepAliveTime;
+	inst->iKeepAliveTime = cs.iKeepAliveTime;
+	inst->iAddtlFrameDelim = cs.iAddtlFrameDelim;
+	inst->iTCPLstnMax = cs.iTCPLstnMax;
+	inst->iTCPSessMax = cs.iTCPSessMax;
+	inst->iStrmDrvrMode = cs.iStrmDrvrMode;
 
 finalize_it:
 	free(pNewVal);
@@ -512,6 +529,10 @@
 			? modConf->pszStrmDrvrCAFile : inst->pszStrmDrvrCAFile;
 	CHKiRet(tcpsrv.SetDrvrCAFile(pOurTcpsrv, psz));
 
+	psz = (inst->pszStrmDrvrCRLFile == NULL)
+			? modConf->pszStrmDrvrCRLFile : inst->pszStrmDrvrCRLFile;
+	CHKiRet(tcpsrv.SetDrvrCRLFile(pOurTcpsrv, psz));
+
 	psz = (inst->pszStrmDrvrKeyFile == NULL)
 			? modConf->pszStrmDrvrKeyFile : inst->pszStrmDrvrKeyFile;
 	CHKiRet(tcpsrv.SetDrvrKeyFile(pOurTcpsrv, psz));
@@ -614,6 +635,8 @@
 			inst->pszStrmDrvrPermitExpiredCerts = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
 		} else if(!strcmp(inppblk.descri.name, "streamdriver.cafile")) {
 			inst->pszStrmDrvrCAFile = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
+		} else if(!strcmp(inppblk.descri.name, "streamdriver.crlfile")) {
+			inst->pszStrmDrvrCRLFile = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
 		} else if(!strcmp(inppblk.descri.name, "streamdriver.keyfile")) {
 			inst->pszStrmDrvrKeyFile = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
 		} else if(!strcmp(inppblk.descri.name, "streamdriver.certfile")) {
@@ -710,6 +733,7 @@
 	loadModConf->pszStrmDrvrAuthMode = NULL;
 	loadModConf->pszStrmDrvrPermitExpiredCerts = NULL;
 	loadModConf->pszStrmDrvrCAFile = NULL;
+	loadModConf->pszStrmDrvrCRLFile = NULL;
 	loadModConf->pszStrmDrvrKeyFile = NULL;
 	loadModConf->pszStrmDrvrCertFile = NULL;
 	loadModConf->pPermPeersRoot = NULL;
@@ -797,6 +821,8 @@
 			loadModConf->pszStrmDrvrPermitExpiredCerts = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
 		} else if(!strcmp(modpblk.descri.name, "streamdriver.cafile")) {
 			loadModConf->pszStrmDrvrCAFile = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
+		} else if(!strcmp(modpblk.descri.name, "streamdriver.crlfile")) {
+			loadModConf->pszStrmDrvrCRLFile = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
 		} else if(!strcmp(modpblk.descri.name, "streamdriver.keyfile")) {
 			loadModConf->pszStrmDrvrKeyFile = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
 		} else if(!strcmp(modpblk.descri.name, "streamdriver.certfile")) {
@@ -923,6 +949,7 @@
 	free(pModConf->pszStrmDrvrAuthMode);
 	free(pModConf->pszStrmDrvrPermitExpiredCerts);
 	free(pModConf->pszStrmDrvrCAFile);
+	free(pModConf->pszStrmDrvrCRLFile);
 	free(pModConf->pszStrmDrvrKeyFile);
 	free(pModConf->pszStrmDrvrCertFile);
 	if(pModConf->pPermPeersRoot != NULL) {
@@ -935,6 +962,7 @@
 		free((void*)inst->pszStrmDrvrName);
 		free((void*)inst->pszStrmDrvrPermitExpiredCerts);
 		free((void*)inst->pszStrmDrvrCAFile);
+		free((void*)inst->pszStrmDrvrCRLFile);
 		free((void*)inst->pszStrmDrvrKeyFile);
 		free((void*)inst->pszStrmDrvrCertFile);
 		free((void*)inst->gnutlsPriorityString);
@@ -954,7 +982,6 @@
 {
 	tcpsrv_etry_t *const etry = (tcpsrv_etry_t*) myself;
 	rsRetVal iRet;
-	dbgprintf("RGER: running ety %p\n", etry);
 	iRet = tcpsrv.Run(etry->tcpsrv);
 	if(iRet != RS_RET_OK) {
 		LogError(0, iRet, "imtcp: error while terminating server; rsyslog may hang on shutdown");

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imudp/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imudp/Makefile.in Changed

@@ -268,6 +268,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -336,6 +340,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -347,6 +353,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -442,7 +449,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/imuxsock/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/imuxsock/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmanon/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmanon/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmaudit/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmaudit/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmdblookup/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmdblookup/Makefile.in Changed

@@ -270,6 +270,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -338,6 +342,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -349,6 +355,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -444,7 +451,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmexternal/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmexternal/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmfields/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmfields/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmjsonparse/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmjsonparse/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmnormalize/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmnormalize/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmpstrucdata/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmpstrucdata/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmrm1stspace/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmrm1stspace/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmsnmptrapd/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmsnmptrapd/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/mmutf8fix/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/mmutf8fix/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omazureeventhubs Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omazureeventhubs/Makefile.am Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omazureeventhubs/Makefile.in Added

@@ -0,0 +1,802 @@
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/omazureeventhubs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
+	$(top_srcdir)/m4/atomic_operations.m4 \
+	$(top_srcdir)/m4/atomic_operations_64bit.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+omazureeventhubs_la_DEPENDENCIES =
+am_omazureeventhubs_la_OBJECTS =  \
+	omazureeventhubs_la-omazureeventhubs.lo
+omazureeventhubs_la_OBJECTS = $(am_omazureeventhubs_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+omazureeventhubs_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(omazureeventhubs_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade =  \
+	./$(DEPDIR)/omazureeventhubs_la-omazureeventhubs.Plo
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(omazureeventhubs_la_SOURCES)
+DIST_SOURCES = $(omazureeventhubs_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,

_service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omazureeventhubs/omazureeventhubs.c Added

@@ -0,0 +1,1354 @@
+/* omazureeventhubs.c
+ * This output plugin make rsyslog talk to Azure EventHubs.
+ *
+ * Copyright 2014-2017 by Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *       -or-
+ *       see COPYING.ASL20 in the source distribution
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "config.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <sys/uio.h>
+#include <sys/queue.h>
+#include <sys/types.h>
+#include <math.h>
+#ifdef HAVE_SYS_STAT_H
+#	include <sys/stat.h>
+#endif
+#include <sys/time.h>
+#include <time.h>
+
+// Include Proton headers
+#include <proton/version.h>
+#include <proton/condition.h>
+#include <proton/connection.h>
+#include <proton/delivery.h>
+#include <proton/link.h>
+#include <proton/listener.h>
+#include <proton/netaddr.h>
+#include <proton/message.h>
+#include <proton/object.h>
+#include <proton/proactor.h>
+#include <proton/sasl.h>
+#include <proton/session.h>
+#include <proton/transport.h>
+#include <proton/ssl.h>
+
+// Include rsyslog headers
+#include "rsyslog.h"
+#include "syslogd-types.h"
+#include "srUtils.h"
+#include "template.h"
+#include "module-template.h"
+#include "errmsg.h"
+#include "atomic.h"
+#include "statsobj.h"
+#include "unicode-helper.h"
+#include "datetime.h"
+#include "glbl.h"
+
+MODULE_TYPE_OUTPUT
+MODULE_TYPE_NOKEEP
+MODULE_CNFNAME("omazureeventhubs")
+
+/* internal structures
+ */
+DEF_OMOD_STATIC_DATA
+DEFobjCurrIf(glbl)
+DEFobjCurrIf(datetime)
+DEFobjCurrIf(strm)
+DEFobjCurrIf(statsobj)
+
+statsobj_t *azureStats;
+STATSCOUNTER_DEF(ctrMessageSubmit, mutCtrMessageSubmit);
+STATSCOUNTER_DEF(ctrAzureFail, mutCtrAzureFail);
+STATSCOUNTER_DEF(ctrCacheMiss, mutCtrCacheMiss);
+STATSCOUNTER_DEF(ctrCacheEvict, mutCtrCacheEvict);
+STATSCOUNTER_DEF(ctrCacheSkip, mutCtrCacheSkip);
+STATSCOUNTER_DEF(ctrAzureAck, mutCtrAzureAck);
+STATSCOUNTER_DEF(ctrAzureMsgTooLarge, mutCtrAzureMsgTooLarge);
+STATSCOUNTER_DEF(ctrAzureQueueFull, mutCtrAzureQueueFull);
+STATSCOUNTER_DEF(ctrAzureOtherErrors, mutCtrAzureOtherErrors);
+STATSCOUNTER_DEF(ctrAzureRespTimedOut, mutCtrAzureRespTimedOut);
+STATSCOUNTER_DEF(ctrAzureRespTransport, mutCtrAzureRespTransport);
+STATSCOUNTER_DEF(ctrAzureRespBrokerDown, mutCtrAzureRespBrokerDown);
+STATSCOUNTER_DEF(ctrAzureRespAuth, mutCtrAzureRespAuth);
+STATSCOUNTER_DEF(ctrAzureRespSSL, mutCtrAzureRespSSL);
+STATSCOUNTER_DEF(ctrAzureRespOther, mutCtrAzureRespOther);
+
+#define MAX_ERRMSG 1024		/* max size of error messages that we support */
+#define MAX_DEFAULTMSGS 1024	/* Initial max size of the proton message helper array */
+
+#define SETUP_PROTON_NONE 0
+#define SETUP_PROTON_AUTOCLOSE 1
+
+/* flags for writeAzure: shall we resubmit a failed message? */
+#define RESUBMIT	1
+#define NO_RESUBMIT	0
+
+/* flags for transaction Handling */
+enum proton_submission_status
+{
+	PROTON_UNSUBMITTED = 0,	// Message not submitted yet
+	PROTON_SUBMITTED,	// Message submitted to proton sender instance
+	PROTON_ACCEPTED,	// Message accepted from remote target
+	PROTON_REJECTED,	// Message rejected from remote target (zero credit?)
+};
+
+// event_property NEEDED?
+struct event_property {
+	const char *key;
+	const char *val;
+};
+
+static pn_timestamp_t time_now(void);
+
+/* Struct for Proton Messages Listitems */
+struct s_protonmsg_entry {
+	uchar* payload;
+	size_t payload_len;
+	uchar* MsgID;
+	size_t MsgID_len;
+
+	uchar* address;
+	char status;
+};
+typedef struct s_protonmsg_entry protonmsg_entry;
+
+/* Struct for module InstanceData */
+typedef struct _instanceData {
+	uchar *amqp_address;
+	uchar *azurehost;
+	uchar *azureport;
+	uchar *azure_key_name;
+	uchar *azure_key;
+	uchar *container;
+	uchar *tplName;			/* assigned output template */
+
+	int nEventProperties;
+	struct event_property *eventProperties;
+
+	uchar *statsName;
+	statsobj_t *stats;
+	STATSCOUNTER_DEF(ctrMessageSubmit, mutCtrMessageSubmit);
+	STATSCOUNTER_DEF(ctrAzureFail, mutCtrAzureFail);
+	STATSCOUNTER_DEF(ctrAzureAck, mutCtrAzureAck);
+	STATSCOUNTER_DEF(ctrAzureOtherErrors, mutCtrAzureOtherErrors);
+} instanceData;
+
+/* Struct for module workerInstanceData */
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+
+	protonmsg_entry **aProtonMsgs;	/* dynamically sized array for transactional outputs */
+	unsigned int nProtonMsgs;	/* current used proton msgs */
+	unsigned int nMaxProtonMsgs;	/* current max */
+
+	int bIsConnecting;		/* 1 if connecting, 0 if disconnected */
+	int bIsConnected;		/* 1 if connected, 0 if disconnected */
+	int bIsSuspended;		/* when broker fail, we need to suspend the action */
+	pthread_rwlock_t pnLock;
+
+	// PROTON Handles
+	pn_proactor_t *pnProactor;
+	pn_transport_t *pnTransport;
+	pn_connection_t *pnConn;
+	pn_link_t* pnSender;
+	pn_rwbytes_t pnMessageBuffer;	/* Buffer for messages */
+	int pnStatus;
+
+	// Message Counters for sender link in worker instance
+	unsigned int iMsgSeq;
+	unsigned int iMaxMsgSeq;
+
+	/* The following structure controls the proton handling threads. Passes necessary pointers
+	* needed for their access.
+	*/
+	sbool bThreadRunning;
+	pthread_t tid;		/* the worker's thread ID */
+
+} wrkrInstanceData_t;
+
+#define INST_STATSCOUNTER_INC(inst, ctr, mut) \
+	do { \
+		if (inst->stats) { STATSCOUNTER_INC(ctr, mut); } \
+	} while(0);
+
+// QPID Proton Handler functions
+static rsRetVal proton_run_thread(wrkrInstanceData_t *pWrkrData);

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omclickhouse/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omclickhouse/Makefile.in Changed

@@ -268,6 +268,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -336,6 +340,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -347,6 +353,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -442,7 +449,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omelasticsearch/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omelasticsearch/Makefile.in Changed

@@ -269,6 +269,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -337,6 +341,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -348,6 +354,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -443,7 +450,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omgssapi/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omgssapi/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omhdfs/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omhdfs/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omjournal/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omjournal/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omkafka/Makefile.am -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omkafka/Makefile.am Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omkafka/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omkafka/Makefile.in Changed

@@ -269,6 +269,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -337,6 +341,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -348,6 +354,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -443,7 +450,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -451,11 +457,11 @@
 pkglib_LTLIBRARIES = omkafka.la
 @OMKAFKA_USE_DUMMY_FALSE@omkafka_la_SOURCES = omkafka.c
 @OMKAFKA_USE_DUMMY_TRUE@omkafka_la_SOURCES = dummy.c
-@ENABLE_KAFKA_STATIC_TRUE@omkafka_la_LDFLAGS = -module -avoid-version -Wl,--whole-archive -l:librdkafka.a -Wl,--no-whole-archive -lssl -lpthread -lcrypto -lsasl2 -lz -llz4 -lrt -lm
-@OMKAFKA_USE_DUMMY_FALSE@omkafka_la_LDFLAGS = -module -avoid-version $(LIBRDKAFKA_LIBS) -lm
+@ENABLE_KAFKA_STATIC_FALSE@@OMKAFKA_USE_DUMMY_FALSE@omkafka_la_LDFLAGS = -module -avoid-version $(LIBRDKAFKA_LIBS) -lm
+@ENABLE_KAFKA_STATIC_TRUE@@OMKAFKA_USE_DUMMY_FALSE@omkafka_la_LDFLAGS = -module -avoid-version -Wl,--whole-archive -l:librdkafka-static.a -Wl,--no-whole-archive -ldl -lresolv -lcurl -lssl -lpthread -lcrypto -lsasl2 -lz -llz4 -lrt -lm
 @OMKAFKA_USE_DUMMY_TRUE@omkafka_la_LDFLAGS = -module -avoid-version
-@OMKAFKA_USE_DUMMY_FALSE@omkafka_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
-@OMKAFKA_USE_DUMMY_TRUE@omkafka_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) -D MODNAME=omkafka
+@OMKAFKA_USE_DUMMY_FALSE@omkafka_la_CPPFLAGS = -I$(top_srcdir) $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
+@OMKAFKA_USE_DUMMY_TRUE@omkafka_la_CPPFLAGS = -I$(top_srcdir) $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) -D MODNAME=omkafka
 omkafka_la_LIBADD = 
 EXTRA_DIST = 
 all: all-am

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omlibdbi/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omlibdbi/Makefile.in Changed

@@ -271,6 +271,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -339,6 +343,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -350,6 +356,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -445,7 +452,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omlibdbi/omlibdbi.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omlibdbi/omlibdbi.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/ommail/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/ommail/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/ommongodb/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/ommongodb/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/ommongodb/ommongodb.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/ommongodb/ommongodb.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/ommysql/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/ommysql/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -342,6 +346,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -353,6 +359,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -448,7 +455,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/ompgsql/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/ompgsql/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omprog/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omprog/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omprog/omprog.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omprog/omprog.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omrelp/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omrelp/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omruleset/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omruleset/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omsnmp/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omsnmp/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omstdout/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omstdout/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omtesting/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omtesting/Makefile.in Changed

@@ -267,6 +267,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -335,6 +339,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -346,6 +352,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -441,7 +448,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omudpspoof/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omudpspoof/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/omuxsock/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/omuxsock/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/pmciscoios/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/pmciscoios/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/pmlastmsg/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/pmlastmsg/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/pmnormalize/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/pmnormalize/Makefile.in Changed

@@ -266,6 +266,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -334,6 +338,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -345,6 +351,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -440,7 +447,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/pmnormalize/pmnormalize.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/pmnormalize/pmnormalize.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/plugins/pmnull/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/plugins/pmnull/Makefile.in Changed

@@ -265,6 +265,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -333,6 +337,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -344,6 +350,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -439,7 +446,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/Makefile.am -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/Makefile.am Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/Makefile.in Changed

@@ -105,7 +105,7 @@
 # netstream drivers
 
 # plain tcp driver - main driver
-@ENABLE_INET_TRUE@am__append_8 = lmnet.la lmnetstrms.la lmnsd_ptcp.la
+@ENABLE_INET_TRUE@am__append_8 = lmnetstrms.la lmnsd_ptcp.la
 @ENABLE_INET_TRUE@@ENABLE_LIBLOGGING_STDLOG_TRUE@am__append_9 = $(LIBLOGGING_STDLOG_CFLAGS)
 @ENABLE_INET_TRUE@@ENABLE_LIBLOGGING_STDLOG_TRUE@am__append_10 = $(LIBLOGGING_STDLOG_LIBS)
 @ENABLE_INET_TRUE@@ENABLE_LIBLOGGING_STDLOG_TRUE@am__append_11 = $(LIBLOGGING_STDLOG_CFLAGS)
@@ -250,13 +250,11 @@
 	$(lmgssutil_la_LDFLAGS) $(LDFLAGS) -o $@
 @ENABLE_GSSAPI_TRUE@am_lmgssutil_la_rpath = -rpath $(pkglibdir)
 lmnet_la_DEPENDENCIES =
-am__lmnet_la_SOURCES_DIST = net.c net.h
-@ENABLE_INET_TRUE@am_lmnet_la_OBJECTS = lmnet_la-net.lo
+am_lmnet_la_OBJECTS = lmnet_la-net.lo
 lmnet_la_OBJECTS = $(am_lmnet_la_OBJECTS)
 lmnet_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(lmnet_la_LDFLAGS) $(LDFLAGS) -o $@
-@ENABLE_INET_TRUE@am_lmnet_la_rpath = -rpath $(pkglibdir)
 lmnetstrms_la_DEPENDENCIES =
 am__lmnetstrms_la_SOURCES_DIST = netstrms.c netstrms.h netstrm.c \
 	netstrm.h nssel.c nssel.h nspoll.c nspoll.h
@@ -464,7 +462,7 @@
 	$(lmzstdw_la_SOURCES)
 DIST_SOURCES = $(am__libgcry_la_SOURCES_DIST) $(librsyslog_la_SOURCES) \
 	$(am__lmcry_gcry_la_SOURCES_DIST) \
-	$(am__lmgssutil_la_SOURCES_DIST) $(am__lmnet_la_SOURCES_DIST) \
+	$(am__lmgssutil_la_SOURCES_DIST) $(lmnet_la_SOURCES) \
 	$(am__lmnetstrms_la_SOURCES_DIST) \
 	$(am__lmnsd_gtls_la_SOURCES_DIST) \
 	$(am__lmnsd_ossl_la_SOURCES_DIST) \
@@ -559,6 +557,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -627,6 +629,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -638,6 +642,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -733,7 +738,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -744,10 +748,14 @@
 #
 # zlib support
 #
-pkglib_LTLIBRARIES = $(am__append_3) lmzlibw.la $(am__append_8) \
-	$(am__append_15) $(am__append_16) $(am__append_18) \
-	$(am__append_19) $(am__append_20) lmtcpsrv.la lmtcpclt.la \
-	$(am__append_25)
+
+#
+# basic network support, needed for rsyslog startup (e.g. our own system name)
+#
+pkglib_LTLIBRARIES = $(am__append_3) lmzlibw.la lmnet.la \
+	$(am__append_8) $(am__append_15) $(am__append_16) \
+	$(am__append_18) $(am__append_19) $(am__append_20) lmtcpsrv.la \
+	lmtcpclt.la $(am__append_25)
 #pkglib_LTLIBRARIES = librsyslog.la
 librsyslog_la_SOURCES = \
 	rsyslog.c \
@@ -886,16 +894,11 @@
 lmzlibw_la_LDFLAGS = -module -avoid-version $(ZLIB_LIBS) \
 	$(am__append_7)
 lmzlibw_la_LIBADD = 
-#
-# network support
-#
-@ENABLE_INET_TRUE@lmnet_la_SOURCES = net.c net.h
-@ENABLE_INET_TRUE@lmnet_la_CPPFLAGS = $(PTHREADS_CFLAGS) \
-@ENABLE_INET_TRUE@	$(RSRT_CFLAGS) $(am__append_9)
-@ENABLE_INET_TRUE@lmnet_la_LDFLAGS = -module -avoid-version \
-@ENABLE_INET_TRUE@	../compat/compat_la-getifaddrs.lo \
-@ENABLE_INET_TRUE@	$(am__append_10)
-@ENABLE_INET_TRUE@lmnet_la_LIBADD = 
+lmnet_la_SOURCES = net.c net.h
+lmnet_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(am__append_9)
+lmnet_la_LDFLAGS = -module -avoid-version \
+	../compat/compat_la-getifaddrs.lo $(am__append_10)
+lmnet_la_LIBADD = 
 
 # network stream master class and stream factory
 @ENABLE_INET_TRUE@lmnetstrms_la_SOURCES = netstrms.c netstrms.h \
@@ -1129,7 +1132,7 @@
 	$(AM_V_CCLD)$(lmgssutil_la_LINK) $(am_lmgssutil_la_rpath) $(lmgssutil_la_OBJECTS) $(lmgssutil_la_LIBADD) $(LIBS)
 
 lmnet.la: $(lmnet_la_OBJECTS) $(lmnet_la_DEPENDENCIES) $(EXTRA_lmnet_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(lmnet_la_LINK) $(am_lmnet_la_rpath) $(lmnet_la_OBJECTS) $(lmnet_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(lmnet_la_LINK) -rpath $(pkglibdir) $(lmnet_la_OBJECTS) $(lmnet_la_LIBADD) $(LIBS)
 
 lmnetstrms.la: $(lmnetstrms_la_OBJECTS) $(lmnetstrms_la_DEPENDENCIES) $(EXTRA_lmnetstrms_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(lmnetstrms_la_LINK) $(am_lmnetstrms_la_rpath) $(lmnetstrms_la_OBJECTS) $(lmnetstrms_la_LIBADD) $(LIBS)

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/conf.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/conf.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/debug.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/debug.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/glbl.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/glbl.c Changed

@@ -7,7 +7,7 @@
  *
  * Module begun 2008-04-16 by Rainer Gerhards
  *
- * Copyright 2008-2022 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2008-2023 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of the rsyslog runtime library.
  *
@@ -115,6 +115,7 @@
 	{ "debug.gnutls", eCmdHdlrNonNegInt, 0 },
 	{ "debug.unloadmodules", eCmdHdlrBinary, 0 },
 	{ "defaultnetstreamdrivercafile", eCmdHdlrString, 0 },
+	{ "defaultnetstreamdrivercrlfile", eCmdHdlrString, 0 },
 	{ "defaultnetstreamdriverkeyfile", eCmdHdlrString, 0 },
 	{ "defaultnetstreamdrivercertfile", eCmdHdlrString, 0 },
 	{ "defaultnetstreamdriver", eCmdHdlrString, 0 },
@@ -178,7 +179,9 @@
 	{ "parser.supportcompressionextension", eCmdHdlrBinary, 0 },
 	{ "shutdown.queue.doublesize", eCmdHdlrBinary, 0 },
 	{ "debug.files", eCmdHdlrArray, 0 },
-	{ "debug.whitelist", eCmdHdlrBinary, 0 }
+	{ "debug.whitelist", eCmdHdlrBinary, 0 },
+	{ "libcapng.default", eCmdHdlrBinary, 0 },
+	{ "libcapng.enable", eCmdHdlrBinary, 0 },
 };
 static struct cnfparamblk paramblk =
 	{ CNFPARAMBLK_VERSION,
@@ -261,6 +264,7 @@
 SIMP_PROP(OptionDisallowWarning, optionDisallowWarning, int)
 /* We omit setter on purpose, because we want to customize it */
 SIMP_PROP_GET(DfltNetstrmDrvrCAF, pszDfltNetstrmDrvrCAF, uchar*)
+SIMP_PROP_GET(DfltNetstrmDrvrCRLF, pszDfltNetstrmDrvrCRLF, uchar*)
 SIMP_PROP_GET(DfltNetstrmDrvrCertFile, pszDfltNetstrmDrvrCertFile, uchar*)
 SIMP_PROP_GET(DfltNetstrmDrvrKeyFile, pszDfltNetstrmDrvrKeyFile, uchar*)
 SIMP_PROP_GET(NetstrmDrvrCAExtraFiles, pszNetstrmDrvrCAExtraFiles, uchar*)
@@ -406,6 +410,7 @@
 	DEFiRet;
 	FILE *fp;
 	free(loadConf->globals.pszDfltNetstrmDrvrCAF);
+	loadConf->globals.pszDfltNetstrmDrvrCAF = pNewVal;
 	fp = fopen((const char*)pNewVal, "r");
 	if(fp == NULL) {
 		LogError(errno, RS_RET_NO_FILE_ACCESS,
@@ -413,7 +418,6 @@
 			"could not be accessed", pNewVal);
 	} else {
 		fclose(fp);
-		loadConf->globals.pszDfltNetstrmDrvrCAF = pNewVal;
 	}
 
 	RETiRet;
@@ -450,11 +454,31 @@
 }
 
 static rsRetVal
+setDfltNetstrmDrvrCRLF(void __attribute__((unused)) *pVal, uchar *pNewVal) {
+	DEFiRet;
+	FILE *fp;
+	free(loadConf->globals.pszDfltNetstrmDrvrCRLF);
+	loadConf->globals.pszDfltNetstrmDrvrCRLF = pNewVal;
+	fp = fopen((const char*)pNewVal, "r");
+	if(fp == NULL) {
+		LogError(errno, RS_RET_NO_FILE_ACCESS,
+			"error: defaultnetstreamdrivercrlfile file '%s' "
+			"could not be accessed", pNewVal);
+	} else {
+		fclose(fp);
+	}
+
+	RETiRet;
+}
+
+
+static rsRetVal
 setDfltNetstrmDrvrCertFile(void __attribute__((unused)) *pVal, uchar *pNewVal) {
 	DEFiRet;
 	FILE *fp;
 
 	free(loadConf->globals.pszDfltNetstrmDrvrCertFile);
+	loadConf->globals.pszDfltNetstrmDrvrCertFile = pNewVal;
 	fp = fopen((const char*)pNewVal, "r");
 	if(fp == NULL) {
 		LogError(errno, RS_RET_NO_FILE_ACCESS,
@@ -462,7 +486,6 @@
 			"could not be accessed", pNewVal);
 	} else {
 		fclose(fp);
-		loadConf->globals.pszDfltNetstrmDrvrCertFile = pNewVal;
 	}
 
 	RETiRet;
@@ -474,6 +497,7 @@
 	FILE *fp;
 
 	free(loadConf->globals.pszDfltNetstrmDrvrKeyFile);
+	loadConf->globals.pszDfltNetstrmDrvrKeyFile = pNewVal;
 	fp = fopen((const char*)pNewVal, "r");
 	if(fp == NULL) {
 		LogError(errno, RS_RET_NO_FILE_ACCESS,
@@ -481,7 +505,6 @@
 			"could not be accessed", pNewVal);
 	} else {
 		fclose(fp);
-		loadConf->globals.pszDfltNetstrmDrvrKeyFile = pNewVal;
 	}
 
 	RETiRet;
@@ -925,6 +948,7 @@
 	pIf->GetMaxLine = glblGetMaxLine;
 	pIf->GetOptionDisallowWarning = GetOptionDisallowWarning;
 	pIf->GetDfltNetstrmDrvrCAF = GetDfltNetstrmDrvrCAF;
+	pIf->GetDfltNetstrmDrvrCRLF = GetDfltNetstrmDrvrCRLF;
 	pIf->GetDfltNetstrmDrvrCertFile = GetDfltNetstrmDrvrCertFile;
 	pIf->GetDfltNetstrmDrvrKeyFile = GetDfltNetstrmDrvrKeyFile;
 	pIf->GetDfltNetstrmDrvr = GetDfltNetstrmDrvr;
@@ -963,6 +987,8 @@
 	loadConf->globals.pszDfltNetstrmDrvr = NULL;
 	free(loadConf->globals.pszDfltNetstrmDrvrCAF);
 	loadConf->globals.pszDfltNetstrmDrvrCAF = NULL;
+	free(loadConf->globals.pszDfltNetstrmDrvrCRLF);
+	loadConf->globals.pszDfltNetstrmDrvrCRLF = NULL;
 	free(loadConf->globals.pszDfltNetstrmDrvrKeyFile);
 	loadConf->globals.pszDfltNetstrmDrvrKeyFile = NULL;
 	free(loadConf->globals.pszDfltNetstrmDrvrCertFile);
@@ -1183,6 +1209,20 @@
 		if(!strcmp(paramblk.descri.name, "workdirectory")) {
 			cstr = (uchar*) es_str2cstr(cnfparamvalsi.val.d.estr, NULL);
 			setWorkDir(NULL, cstr);
+		} else if(!strcmp(paramblk.descri.name, "libcapng.default")) {
+#ifdef ENABLE_LIBCAPNG
+			loadConf->globals.bAbortOnFailedLibcapngSetup = (int) cnfparamvalsi.val.d.n;
+#else
+			LogError(0, RS_RET_ERR, "rsyslog wasn't "
+				"compiled with libcap-ng support.");
+#endif
+		} else if(!strcmp(paramblk.descri.name, "libcapng.enable")) {
+#ifdef ENABLE_LIBCAPNG
+			loadConf->globals.bCapabilityDropEnabled = (int) cnfparamvalsi.val.d.n;
+#else
+			LogError(0, RS_RET_ERR, "rsyslog wasn't "
+				"compiled with libcap-ng support.");
+#endif
 		} else if(!strcmp(paramblk.descri.name, "variables.casesensitive")) {
 			const int val = (int) cnfparamvalsi.val.d.n;
 			fjson_global_do_case_sensitive_comparison(val);
@@ -1201,6 +1241,9 @@
 		} else if(!strcmp(paramblk.descri.name, "defaultnetstreamdrivercafile")) {
 			cstr = (uchar*) es_str2cstr(cnfparamvalsi.val.d.estr, NULL);
 			setDfltNetstrmDrvrCAF(NULL, cstr);
+		} else if(!strcmp(paramblk.descri.name, "defaultnetstreamdrivercrlfile")) {
+			cstr = (uchar*) es_str2cstr(cnfparamvalsi.val.d.estr, NULL);
+			setDfltNetstrmDrvrCRLF(NULL, cstr);
 		} else if(!strcmp(paramblk.descri.name, "defaultnetstreamdriver")) {
 			cstr = (uchar*) es_str2cstr(cnfparamvalsi.val.d.estr, NULL);
 			setDfltNetstrmDrvr(NULL, cstr);
@@ -1396,6 +1439,7 @@
 		stddbg = -1;
 	}
 
+finalize_it:
 	/* we have now read the config. We need to query the local host name now
 	 * as it was set by the config.
 	 *
@@ -1403,9 +1447,8 @@
 	 * hostname. These messages are currently in iminternal queue. Once they
 	 * are taken from that queue, the hostname will be adapted.
 	 */
-	queryLocalHostname();
-
-finalize_it:	RETiRet;
+	queryLocalHostname(loadConf);
+	RETiRet;
 }
 
 
@@ -1430,6 +1473,8 @@
 	NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdrivercafile", 0, eCmdHdlrGetWord,
 	setDfltNetstrmDrvrCAF, NULL, NULL));
+	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdrivercrlfile", 0, eCmdHdlrGetWord,
+	setDfltNetstrmDrvrCRLF, NULL, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdriverkeyfile", 0, eCmdHdlrGetWord,
 	setDfltNetstrmDrvrKeyFile, NULL, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdrivercertfile", 0, eCmdHdlrGetWord,

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/glbl.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/glbl.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/lib_ksils12.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/lib_ksils12.c Changed

@@ -904,6 +904,10 @@
 	ctx->dirGID = -1;
 	ctx->fCreateMode = 0644;
 	ctx->fDirCreateMode = 0700;
+#if KSI_SDK_VER_MAJOR == 3 && KSI_SDK_VER_MINOR < 22
+	ctx->roundCount = 0;
+	ctx->bRoundLock = 0;
+#endif
 	ctx->syncMode = LOGSIG_SYNCHRONOUS;
 	ctx->signer_state = SIGNER_IDLE;
 	ctx->disabled = false;
@@ -1754,6 +1758,21 @@
 	return ret;
 }
 
+static KSI_DataHash* clone_hash(KSI_CTX *ksi_ctx, const KSI_DataHash* hash) {
+	int res = KSI_UNKNOWN_ERROR;
+	const unsigned char *imprint = NULL;
+	size_t imprint_len = 0;
+	KSI_DataHash* tmp = NULL;
+
+	if (hash == NULL) return NULL;
+	res = KSI_DataHash_getImprint(hash, &imprint, &imprint_len);
+	if (res != KSI_OK) return NULL;
+	res = KSI_DataHash_fromImprint(ksi_ctx, imprint, imprint_len, &tmp);
+	if (res != KSI_OK) return NULL;
+
+	return tmp;
+}
+
 static bool
 process_requests_async(rsksictx ctx, KSI_CTX *ksi_ctx, KSI_AsyncService *as) {
 	bool ret = false;
@@ -1761,6 +1780,7 @@
 	int res = KSI_OK, tmpRes;
 	KSI_AsyncHandle *reqHandle = NULL;
 	KSI_AsyncHandle *respHandle = NULL;
+	KSI_DataHash *clonedHash = NULL;
 	KSI_AggregationReq *req = NULL;
 	KSI_Config *config = NULL;
 	KSI_Integer *level;
@@ -1784,6 +1804,14 @@
 			break;
 		}
 
+#if KSI_SDK_VER_MAJOR == 3 && KSI_SDK_VER_MINOR < 22
+		if (p != 0 && ctx->roundCount > 0) {
+			ctx->roundCount--;
+		} else {
+			ctx->bRoundLock = 0;
+			ctx->roundCount = 0;
+		}
+#endif
 		state = KSI_ASYNC_STATE_UNDEFINED;
 
 		CHECK_KSI_API(KSI_AsyncHandle_getState(respHandle, &state), ctx, "KSI_AsyncHandle_getState");
@@ -1837,10 +1865,28 @@
 		if(item->status != QITEM_WAITING)
 			continue;
 
+		/* Due to a bug in libksi it is possible that async signer may send out
+		 * more signing requests than permitted by the gateway. Workaround is to
+		 * keep track of signing requests here.
+		 */
+#if KSI_SDK_VER_MAJOR == 3 && KSI_SDK_VER_MINOR < 22
+		if (ctx->roundCount >= ctx->max_requests) ctx->bRoundLock = 1;
+		if (ctx->bRoundLock) break;
+#endif
+
+
+		/* The data hash is produced in another thread by another KSI_CTX and
+		 * libksi internal uses KSI_DataHash cache to reduce the amount of
+		 * memory allocations by recycling old objects. Lets clone the hash
+		 * value with current KSI_CTX as we can not be sure that this thread is
+		 * not affecting the data hash cache operated by another thread.
+		 */
+		clonedHash = clone_hash(ksi_ctx, item->root);
 		CHECK_KSI_API(KSI_AggregationReq_new(ksi_ctx, &req), ctx, "KSI_AggregationReq_new");
 		CHECK_KSI_API(KSI_AggregationReq_setRequestHash((KSI_AggregationReq*)req,
-			KSI_DataHash_ref(item->root)), ctx,
+			clonedHash), ctx,
 			"KSI_AggregationReq_setRequestHash");
+		clonedHash = NULL;
 		CHECK_KSI_API(KSI_Integer_new(ksi_ctx, item->intarg2, &level), ctx,
 			"KSI_Integer_new");
 		CHECK_KSI_API(KSI_AggregationReq_setRequestLevel(req, level), ctx,
@@ -1853,11 +1899,9 @@
 
 		if (res == KSI_OK) {
 			item->status = QITEM_SENT;
-
-			tmpRes=KSI_AsyncService_run(as, NULL, NULL);
-			if(tmpRes!=KSI_OK)
-				reportKSIAPIErr(ctx, NULL, "KSI_AsyncService_run", tmpRes);
-
+#if KSI_SDK_VER_MAJOR == 3 && KSI_SDK_VER_MINOR < 22
+			ctx->roundCount++;
+#endif
 		} else {
 			reportKSIAPIErr(ctx, NULL, "KSI_AsyncService_addRequest", res);
 			KSI_AsyncHandle_free(reqHandle);
@@ -1865,8 +1909,14 @@
 			item->ksi_status = res;
 			break;
 		}
-	}
 
+		if (i != 0 && i % ctx->max_requests == 0) {
+			CHECK_KSI_API(KSI_AsyncService_run(as, NULL, NULL), ctx,
+				"KSI_AsyncService_run");
+		}
+	}
+	CHECK_KSI_API(KSI_AsyncService_run(as, NULL, NULL), ctx,
+		"KSI_AsyncService_run");
 
 	/* Save all consequent fulfilled responses in the front of the queue to the signature file */
 	while(ProtectedQueue_count(ctx->signer_queue)) {
@@ -1902,6 +1952,7 @@
 	ret = true;
 
 cleanup:
+	KSI_DataHash_free(clonedHash);
 	KSI_AsyncService_getPendingCount(as, &p);
 	return ret;
 }

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/lib_ksils12.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/lib_ksils12.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/libgcry.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/libgcry.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/lookup.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/lookup.c Changed

@@ -1,7 +1,7 @@
 /* lookup.c
  * Support for lookup tables in RainerScript.
  *
- * Copyright 2013-2018 Adiscon GmbH.
+ * Copyright 2013-2023 Adiscon GmbH.
  *
  * This file is part of the rsyslog runtime library.
  *
@@ -75,6 +75,7 @@
 static void
 lookupStopReloader(lookup_ref_t *pThis);
 
+
 /* create a new lookup table object AND include it in our list of
  * lookup tables.
  */
@@ -83,24 +84,12 @@
 {
 	lookup_ref_t *pThis = NULL;
 	lookup_t *t = NULL;
-	int initialized = 0;
 	DEFiRet;
 
 	CHKmalloc(pThis = calloc(1, sizeof(lookup_ref_t)));
 	CHKmalloc(t = calloc(1, sizeof(lookup_t)));
-	CHKiConcCtrl(pthread_rwlock_init(&pThis->rwlock, NULL));
-	initialized++; /*1*/
-	CHKiConcCtrl(pthread_mutex_init(&pThis->reloader_mut, NULL));
-	initialized++; /*2*/
-	CHKiConcCtrl(pthread_cond_init(&pThis->run_reloader, NULL));
-	initialized++; /*3*/
-	CHKiConcCtrl(pthread_attr_init(&pThis->reloader_thd_attr));
-	initialized++; /*4*/
 	pThis->do_reload = pThis->do_stop = 0;
 	pThis->reload_on_hup = 1; /*DO reload on HUP (default)*/
-	CHKiConcCtrl(pthread_create(&pThis->reloader, &pThis->reloader_thd_attr,
-		lookupTableReloader, pThis));
-	initialized++; /*5*/
 
 	pThis->next = NULL;
 	if(loadConf->lu_tabs.root == NULL) {
@@ -115,7 +104,38 @@
 	*ppThis = pThis;
 finalize_it:
 	if(iRet != RS_RET_OK) {
-		LogError(errno, iRet, "a lookup table could not be initialized: "
+		LogError(errno, iRet, "a lookup table could not be initialized");
+		free(t);
+		free(pThis);
+	}
+	RETiRet;
+}
+
+/* activate a lookup table entry once rsyslog is ready to do so */
+static rsRetVal
+lookupActivateTable(lookup_ref_t *pThis)
+{
+	DEFiRet;
+	int initialized = 0;
+
+	DBGPRINTF("lookupActivateTable called\n");
+	CHKiConcCtrl(pthread_rwlock_init(&pThis->rwlock, NULL));
+	initialized++; /*1*/
+	CHKiConcCtrl(pthread_mutex_init(&pThis->reloader_mut, NULL));
+	initialized++; /*2*/
+	CHKiConcCtrl(pthread_cond_init(&pThis->run_reloader, NULL));
+	initialized++; /*3*/
+	CHKiConcCtrl(pthread_attr_init(&pThis->reloader_thd_attr));
+	initialized++; /*4*/
+	pThis->do_reload = pThis->do_stop = 0;
+	CHKiConcCtrl(pthread_create(&pThis->reloader, &pThis->reloader_thd_attr,
+		lookupTableReloader, pThis));
+	initialized++; /*5*/
+
+
+finalize_it:
+	if(iRet != RS_RET_OK) {
+		LogError(errno, iRet, "a lookup table could not be activated: "
 			"failed at init-step %d (please enable debug logs for details)",
 			initialized);
 		/* Can not happen with current code, but might occur in the future when
@@ -128,8 +148,6 @@
 		if (initialized > 2) pthread_cond_destroy(&pThis->run_reloader);
 		if (initialized > 1) pthread_mutex_destroy(&pThis->reloader_mut);
 		if (initialized > 0) pthread_rwlock_destroy(&pThis->rwlock);
-		free(t);
-		free(pThis);
 	}
 	RETiRet;
 }
@@ -846,8 +864,8 @@
 		if (pThis->do_stop) {
 			break;
 		} else if (pThis->do_reload) {
-			pThis->do_reload = 0;
 			lookupDoReload(pThis);
+			pThis->do_reload = 0;
 		} else {
 			pthread_cond_wait(&pThis->run_reloader, &pThis->reloader_mut);
 		}
@@ -868,6 +886,22 @@
 	}
 }
 
+/* activate lookup table system config
+ * most importantly, this means tarting the lookup table reloader thread in the
+ * right process space - it is a difference if we fork or not!
+ */
+void
+lookupActivateConf(void)
+{
+	DBGPRINTF("lookup tables: activate config \n");
+	lookup_ref_t *luref;
+	for(luref = runConf->lu_tabs.root ; luref != NULL ; luref = luref->next) {
+		DBGPRINTF("lookup actiate: processing %p\n", luref);
+		lookupActivateTable(luref);
+	}
+	DBGPRINTF("lookup tables: activate done\n");
+}
+
 uint
 lookupPendingReloadCount(void)
 {
@@ -1003,11 +1037,18 @@
 			  "param '%s'\n", modpblk.descri.name);
 		}
 	}
+	const uchar *const lu_name = lu->name; /* we need a const to keep TSAN happy :-( */
+	const uchar *const lu_filename = lu->filename; /* we need a const to keep TSAN happy :-( */
+	if(lu_name == NULL || lu_filename == NULL) {
+		iRet = RS_RET_INTERNAL_ERROR;
+		LogError(0, iRet, "internal error: lookup table name not set albeit being mandatory");
+		ABORT_FINALIZE(iRet);
+	}
 #ifdef HAVE_PTHREAD_SETNAME_NP
-	thd_name_len = ustrlen(lu->name) + strlen(reloader_prefix) + 1;
+	thd_name_len = ustrlen(lu_name) + strlen(reloader_prefix) + 1;
 	CHKmalloc(reloader_thd_name = malloc(thd_name_len));
 	strcpy(reloader_thd_name, reloader_prefix);
-	strcpy(reloader_thd_name + strlen(reloader_prefix), (char*) lu->name);
+	strcpy(reloader_thd_name + strlen(reloader_prefix), (char*) lu_name);
 	reloader_thd_namethd_name_len - 1 = '\0';
 #if defined(__NetBSD__)
 	pthread_setname_np(lu->reloader, "%s", reloader_thd_name);
@@ -1017,9 +1058,9 @@
 	pthread_setname_np(lu->reloader, reloader_thd_name);
 #endif
 #endif
-	CHKiRet(lookupReadFile(lu->self, lu->name, lu->filename));
+	CHKiRet(lookupReadFile(lu->self, lu_name, lu_filename));
 	LogMsg(0, RS_RET_OK, LOG_INFO, "lookup table '%s' loaded from file '%s'",
-		lu->name, lu->filename);
+		lu_name, lu->filename);
 
 finalize_it:
 #ifdef HAVE_PTHREAD_SETNAME_NP

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/lookup.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/lookup.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/modules.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/modules.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/msg.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/msg.c Changed

@@ -7,7 +7,7 @@
  * of the "old" message code without any modifications. However, it
  * helps to have things at the right place one we go to the meat of it.
  *
- * Copyright 2007-2022 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2007-2023 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of the rsyslog runtime library.
  *
@@ -1618,13 +1618,22 @@
 /* note: libuuid seems not to be thread-safe, so we need
  * to get some safeguards in place.
  */
+static pthread_mutex_t mutUUID = PTHREAD_MUTEX_INITIALIZER;
+
+static void call_uuid_generate(uuid_t uuid)
+{
+	pthread_mutex_lock(&mutUUID);
+	pthread_cleanup_push(mutexCancelCleanup, &mutUUID);
+	uuid_generate(uuid);
+	pthread_cleanup_pop(1);
+}
+
 static void msgSetUUID(smsg_t * const pM)
 {
 	size_t lenRes = sizeof(uuid_t) * 2 + 1;
 	char hex_char  = "0123456789ABCDEF";
 	unsigned int byte_nbr;
 	uuid_t uuid;
-	static pthread_mutex_t mutUUID = PTHREAD_MUTEX_INITIALIZER;
 
 	dbgprintf("MsgSetUUID START, lenRes %llu\n", (long long unsigned) lenRes);
 	assert(pM != NULL);
@@ -1632,9 +1641,7 @@
 	if((pM->pszUUID = (uchar*) malloc(lenRes)) == NULL) {
 		pM->pszUUID = (uchar *)"";
 	} else {
-		pthread_mutex_lock(&mutUUID);
-		uuid_generate(uuid);
-		pthread_mutex_unlock(&mutUUID);
+		call_uuid_generate(uuid);
 		for (byte_nbr = 0; byte_nbr < sizeof (uuid_t); byte_nbr++) {
 			pM->pszUUIDbyte_nbr * 2 + 0 = hex_charuuid byte_nbr >> 4;
 			pM->pszUUIDbyte_nbr * 2 + 1 = hex_charuuid byte_nbr & 15;
@@ -2545,12 +2552,15 @@
 void ATTR_NONNULL(2,3)
 getTAG(smsg_t * const pM, uchar **const ppBuf, int *const piLen, const sbool bLockMutex)
 {
+	if(bLockMutex == LOCK_MUTEX)
+		MsgLock(pM);
+
 	if(pM == NULL) {
 		*ppBuf = UCHAR_CONSTANT("");
 		*piLen = 0;
 	} else {
 		if(pM->iLenTAG == 0)
-			tryEmulateTAG(pM, bLockMutex);
+			tryEmulateTAG(pM, MUTEX_ALREADY_LOCKED);
 		if(pM->iLenTAG == 0) {
 			*ppBuf = UCHAR_CONSTANT("");
 			*piLen = 0;
@@ -2559,6 +2569,9 @@
 			*piLen = pM->iLenTAG;
 		}
 	}
+
+	if(bLockMutex == LOCK_MUTEX)
+		MsgUnlock(pM);
 }
 
 
@@ -4241,8 +4254,15 @@
 			/* need to zero-base to and from (they are 1-based!) */
 			if(iFrom > 0)
 				--iFrom;
-			if(iTo > 0)
+			if(iTo > 0) {
 				--iTo;
+			} else if(iTo < 0) {
+				/* note: we ADD negative value, 0-based (-1)! */
+				iTo = bufLen - 1 + iTo;
+				if(iTo < 0) {
+					iTo = 0;
+				}
+			}
 		}
 		if(iFrom >= bufLen) {
 			DBGPRINTF("msgGetProp: iFrom %d >= buflen %d, returning empty string\n",
@@ -5454,5 +5474,3 @@
 	INIT_ATOMIC_HELPER_MUT(mutTrimCtr);
 #	endif
 ENDObjClassInit(msg)
-/* vim:set ai:
- */

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/net.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/net.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/net.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/net.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/netstrm.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/netstrm.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/netstrm.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/netstrm.h Changed

@@ -89,10 +89,11 @@
 
 	/* v15 -- Tls cert functions */
 	rsRetVal (*SetDrvrTlsCAFile)(netstrm_t *pThis, const uchar* file);
+	rsRetVal (*SetDrvrTlsCRLFile)(netstrm_t *pThis, const uchar* file);
 	rsRetVal (*SetDrvrTlsKeyFile)(netstrm_t *pThis, const uchar* file);
 	rsRetVal (*SetDrvrTlsCertFile)(netstrm_t *pThis, const uchar* file);
 ENDinterface(netstrm)
-#define netstrmCURR_IF_VERSION 15 /* increment whenever you change the interface structure! */
+#define netstrmCURR_IF_VERSION 16 /* increment whenever you change the interface structure! */
 /* interface version 3 added GetRemAddr()
  * interface version 4 added EnableKeepAlive() -- rgerhards, 2009-06-02
  * interface version 5 changed return of CheckConnection from void to rsRetVal -- alorbach, 2012-09-06
@@ -101,6 +102,7 @@
  * interface version 8 changed signature of Connect() -- dsa, 2016-11-14
  * interface version 9 added SetGnutlsPriorityString -- PascalWithopf, 2017-08-08
  * interface version 10 added oserr parameter to Rcv() -- rgerhards, 2017-09-04
+ * interface version 16 CRL file -- Oracle, 2022-01-16
  * */
 
 /* prototypes */

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/netstrms.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/netstrms.c Changed

@@ -116,6 +116,8 @@
 	}
 	free((void*)pThis->pszDrvrCAFile);
 	pThis->pszDrvrCAFile = NULL;
+	free((void*)pThis->pszDrvrCRLFile);
+	pThis->pszDrvrCRLFile = NULL;
 	free((void*)pThis->pszDrvrKeyFile);
 	pThis->pszDrvrKeyFile = NULL;
 	free((void*)pThis->pszDrvrCertFile);
@@ -251,6 +253,18 @@
 }
 
 static rsRetVal
+SetDrvrTlsCRLFile(netstrms_t *pThis, const uchar *mode)
+{
+	DEFiRet;
+	ISOBJ_TYPE_assert(pThis, netstrms);
+	if (mode != NULL) {
+		CHKmalloc(pThis->pszDrvrCRLFile = (uchar*) strdup((char*)mode));
+	}
+finalize_it:
+	RETiRet;
+}
+
+static rsRetVal
 SetDrvrTlsKeyFile(netstrms_t *pThis, const uchar *mode)
 {
 	DEFiRet;
@@ -394,6 +408,12 @@
 	return pThis->pszDrvrCAFile;
 }
 static const uchar *
+GetDrvrTlsCRLFile(netstrms_t *pThis)
+{
+	ISOBJ_TYPE_assert(pThis, netstrms);
+	return pThis->pszDrvrCRLFile;
+}
+static const uchar *
 GetDrvrTlsKeyFile(netstrms_t *pThis)
 {
 	ISOBJ_TYPE_assert(pThis, netstrms);
@@ -471,9 +491,11 @@
 	pIf->SetDrvrTlsVerifyDepth = SetDrvrTlsVerifyDepth;
 	pIf->GetDrvrTlsVerifyDepth = GetDrvrTlsVerifyDepth;
 	pIf->GetDrvrTlsCAFile = GetDrvrTlsCAFile;
+	pIf->GetDrvrTlsCRLFile = GetDrvrTlsCRLFile;
 	pIf->GetDrvrTlsKeyFile = GetDrvrTlsKeyFile;
 	pIf->GetDrvrTlsCertFile = GetDrvrTlsCertFile;
 	pIf->SetDrvrTlsCAFile = SetDrvrTlsCAFile;
+	pIf->SetDrvrTlsCRLFile = SetDrvrTlsCRLFile;
 	pIf->SetDrvrTlsKeyFile = SetDrvrTlsKeyFile;
 	pIf->SetDrvrTlsCertFile = SetDrvrTlsCertFile;
 finalize_it:

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/netstrms.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/netstrms.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/nsd.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/nsd.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/nsd_gtls.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/nsd_gtls.c Changed

@@ -55,10 +55,6 @@
 #include "unicode-helper.h"
 #include "rsconf.h"
 
-/* things to move to some better place/functionality - TODO */
-#define CRLFILE "crl.pem"
-
-
 #if GNUTLS_VERSION_NUMBER <= 0x020b00
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif
@@ -707,11 +703,14 @@
 gtlsInitCred(nsd_gtls_t *const pThis )
 {
 	int gnuRet;
-	const uchar *cafile;
+	const uchar *cafile, *crlfile;
 	DEFiRet;
 
 	/* X509 stuff */
-	CHKgnutls(gnutls_certificate_allocate_credentials(&pThis->xcred));
+	if (pThis->xcred == NULL) {
+		/* Allocate only ONCE */
+		CHKgnutls(gnutls_certificate_allocate_credentials(&pThis->xcred));
+	}
 
 	/* sets the trusted cas file */
 	cafile = (pThis->pszCAFile == NULL) ? glbl.GetDfltNetstrmDrvrCAF(runConf) : pThis->pszCAFile;
@@ -729,13 +728,35 @@
 		} else if(gnuRet < 0) {
 			/* TODO; a more generic error-tracking function (this one based on CHKgnutls()) */
 			uchar *pErr = gtlsStrerror(gnuRet);
-			LogError(0, RS_RET_GNUTLS_ERR, "unexpected GnuTLS error %d in %s:%d: %s\n",
+			LogError(0, RS_RET_GNUTLS_ERR,
+				"unexpected GnuTLS error reading CA certificate file %d in %s:%d: %s\n",
 			gnuRet, __FILE__, __LINE__, pErr);
 			free(pErr);
 			ABORT_FINALIZE(RS_RET_GNUTLS_ERR);
 		}
 	}
 
+	crlfile = (pThis->pszCRLFile == NULL) ? glbl.GetDfltNetstrmDrvrCRLF(runConf) : pThis->pszCRLFile;
+	if(crlfile == NULL) {
+		dbgprintf("Certificate revocation list (CRL) file not set.");
+	} else {
+		dbgprintf("GTLS CRL file: '%s'\n", crlfile);
+		gnuRet = gnutls_certificate_set_x509_crl_file(pThis->xcred, (char*)crlfile, GNUTLS_X509_FMT_PEM);
+		if(gnuRet == GNUTLS_E_FILE_ERROR) {
+			LogError(0, RS_RET_GNUTLS_ERR,
+				"error reading Certificate revocation list (CRL) '%s' - a common cause is that the "
+				"file  does not exist", crlfile);
+			ABORT_FINALIZE(RS_RET_GNUTLS_ERR);
+		} else if(gnuRet < 0) {
+			/* TODO; a more generic error-tracking function (this one based on CHKgnutls()) */
+			uchar *pErr = gtlsStrerror(gnuRet);
+			LogError(0, RS_RET_GNUTLS_ERR,
+				"unexpected GnuTLS error reading Certificate revocation list (CRL) %d in %s:%d: %s\n",
+			gnuRet, __FILE__, __LINE__, pErr);
+			free(pErr);
+			ABORT_FINALIZE(RS_RET_GNUTLS_ERR);
+		}
+	}
 
 finalize_it:
 	RETiRet;
@@ -1114,10 +1135,13 @@
 
 	if(list_size < 1) {
 		if(pThis->bReportAuthErr == 1) {
+			uchar *fromHost = NULL;
 			errno = 0;
-			LogError(0, RS_RET_TLS_NO_CERT, "error: peer did not provide a certificate, "
-					"not permitted to talk to it");
 			pThis->bReportAuthErr = 0;
+			nsd_ptcp.GetRemoteHName((nsd_t*)pThis->pTcp, &fromHost);
+			LogError(0, RS_RET_TLS_NO_CERT, "error: peer %s did not provide a certificate, "
+					"not permitted to talk to it", fromHost);
+			free(fromHost);
 		}
 		ABORT_FINALIZE(RS_RET_TLS_NO_CERT);
 	}
@@ -1174,8 +1198,12 @@
 	cert_list = gnutls_certificate_get_peers(pThis->sess, &cert_list_size);
 	if(cert_list_size < 1) {
 		errno = 0;
+		uchar *fromHost = NULL;
+		nsd_ptcp.GetRemoteHName((nsd_t*)pThis->pTcp, &fromHost);
 		LogError(0, RS_RET_TLS_NO_CERT,
-			"peer did not provide a certificate, not permitted to talk to it");
+			"peer %s did not provide a certificate, not permitted to talk to it",
+			fromHost);
+		free(fromHost);
 		ABORT_FINALIZE(RS_RET_TLS_NO_CERT);
 	}
 #ifdef EXTENDED_CERT_CHECK_AVAILABLE
@@ -1227,6 +1255,7 @@
 		} else if(stateCert & GNUTLS_CERT_REVOKED) {
 			pszErrCause = "certificate revoked";
 			bAbort = RSTRUE;
+			iAbortCode = RS_RET_CERT_REVOKED;
 #ifdef EXTENDED_CERT_CHECK_AVAILABLE
 		} else if(stateCert & GNUTLS_CERT_PURPOSE_MISMATCH) {
 			pszErrCause = "key purpose OID does not match";
@@ -1241,8 +1270,11 @@
 	}
 
 	if (bAbort == RSTRUE) {
-		LogError(0, NO_ERRCODE, "not permitted to talk to peer, certificate invalid: %s",
-				pszErrCause);
+		uchar *fromHost = NULL;
+		nsd_ptcp.GetRemoteHName((nsd_t*)pThis->pTcp, &fromHost);
+		LogError(0, NO_ERRCODE, "not permitted to talk to peer '%s', certificate invalid: %s",
+				fromHost, pszErrCause);
+		free(fromHost);
 		gtlsGetCertInfo(pThis, &pStr);
 		LogError(0, NO_ERRCODE, "invalid cert info: %s", cstrGetSzStrNoNULL(pStr));
 		cstrDestruct(&pStr);
@@ -1264,8 +1296,11 @@
 		if(ttCert == -1)
 			ABORT_FINALIZE(RS_RET_TLS_CERT_ERR);
 		else if(ttCert > ttNow) {
-			LogError(0, RS_RET_CERT_NOT_YET_ACTIVE, "not permitted to talk to peer: "
-					"certificate %d not yet active", i);
+			uchar *fromHost = NULL;
+			nsd_ptcp.GetRemoteHName((nsd_t*)pThis->pTcp, &fromHost);
+			LogError(0, RS_RET_CERT_NOT_YET_ACTIVE, "not permitted to talk to peer '%s': "
+					"certificate %d not yet active", fromHost, i);
+			free(fromHost);
 			gtlsGetCertInfo(pThis, &pStr);
 			LogError(0, RS_RET_CERT_NOT_YET_ACTIVE,
 				"invalid cert info: %s", cstrGetSzStrNoNULL(pStr));
@@ -1391,6 +1426,7 @@
 	free(pThis->pszConnectHost);
 	free(pThis->pszRcvBuf);
 	free((void*) pThis->pszCAFile);
+	free((void*) pThis->pszCRLFile);
 
 	if(pThis->bOurCertIsInit)
 		for(unsigned i=0; i<pThis->nOurCerts; ++i) {
@@ -1416,12 +1452,13 @@
  * rgerhards, 2008-04-28
  */
 static rsRetVal
-SetMode(nsd_t *pNsd, int mode)
+SetMode(nsd_t *const pNsd, const int mode)
 {
 	DEFiRet;
 	nsd_gtls_t *pThis = (nsd_gtls_t*) pNsd;
 
 	ISOBJ_TYPE_assert((pThis), nsd_gtls);
+	dbgprintf("(tls) mode: %d\n", mode);
 	if(mode != 0 && mode != 1) {
 		LogError(0, RS_RET_INVALID_DRVR_MODE, "error: driver mode %d not supported by "
 				"gtls netstream driver", mode);
@@ -1634,6 +1671,23 @@
 }
 
 static rsRetVal
+SetTlsCRLFile(nsd_t *pNsd, const uchar *const crlFile)
+{
+	DEFiRet;
+	nsd_gtls_t *const pThis = (nsd_gtls_t*) pNsd;
+
+	ISOBJ_TYPE_assert((pThis), nsd_gtls);
+	if(crlFile == NULL) {
+		pThis->pszCRLFile = NULL;
+	} else {
+		CHKmalloc(pThis->pszCRLFile = (const uchar*) strdup((const char*) crlFile));
+	}
+
+finalize_it:
+	RETiRet;
+}
+
+static rsRetVal
 SetTlsKeyFile(nsd_t *pNsd, const uchar *const pszFile)
 {
 	DEFiRet;
@@ -2276,7 +2330,12 @@
 		if(pThis->bHaveSess) {
 			gnutls_deinit(pThis->sess);
 			pThis->bHaveSess = 0;
+			/* Free memory using gnutls api first*/
+			gnutls_certificate_free_credentials(pThis->xcred);
 			pThis->xcred = NULL;
+			/* Free other memory */
+			free(pThis->pszConnectHost);
+			pThis->pszConnectHost = NULL;
 		}
 	}
 
@@ -2323,6 +2382,7 @@
 	pIf->SetPrioritizeSAN = SetPrioritizeSAN;
 	pIf->SetTlsVerifyDepth = SetTlsVerifyDepth;
 	pIf->SetTlsCAFile = SetTlsCAFile;
+	pIf->SetTlsCRLFile = SetTlsCRLFile;
 	pIf->SetTlsKeyFile = SetTlsKeyFile;
 	pIf->SetTlsCertFile = SetTlsCertFile;
 finalize_it:

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/nsd_gtls.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/nsd_gtls.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/nsd_ossl.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/nsd_ossl.c Changed

@@ -58,9 +58,6 @@
 #include "nsd_ossl.h"
 #include "unicode-helper.h"
 #include "rsconf.h"
-/* things to move to some better place/functionality - TODO */
-// #define CRLFILE "crl.pem"
-
 
 MODULE_TYPE_LIB
 MODULE_TYPE_KEEP
@@ -86,6 +83,7 @@
 #endif
 
 static rsRetVal applyGnutlsPriorityString(nsd_ossl_t *const pNsd);
+static rsRetVal osslChkPeerCertValidity(nsd_ossl_t *pThis);
 
 /*--------------------------------------MT OpenSSL helpers ------------------------------------------*/
 static MUTEX_TYPE *mutex_buf = NULL;
@@ -147,7 +145,9 @@
 	for (i = 0; i < CRYPTO_num_locks( ); i++)
 		MUTEX_SETUP(mutex_bufi);
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	CRYPTO_set_id_callback(id_function);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
 	CRYPTO_set_locking_callback(locking_function);
 	/* The following three CRYPTO_... functions are the OpenSSL functions
 	for registering the callbacks we implemented above */
@@ -168,7 +168,9 @@
 	if (!mutex_buf)
 		return 0;
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	CRYPTO_set_id_callback(NULL);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
 	CRYPTO_set_locking_callback(NULL);
 	CRYPTO_set_dynlock_create_callback(NULL);
 	CRYPTO_set_dynlock_lock_callback(NULL);
@@ -186,16 +188,32 @@
 /*-------------------------------------- MT OpenSSL helpers -----------------------------------------*/
 
 /*--------------------------------------OpenSSL helpers ------------------------------------------*/
-void osslLastSSLErrorMsg(int ret, SSL *ssl, int severity, const char* pszCallSource, const char* pszOsslApi)
+void osslLastSSLErrorMsg(nsd_ossl_t const *pThis, const int ret, SSL *ssl, int severity,
+	const char* pszCallSource, const char* pszOsslApi)
 {
 	unsigned long un_error = 0;
 	int iSSLErr = 0;
+	uchar *fromHost = NULL;
+
+	if(pThis != NULL) {
+		nsd_ptcp.GetRemoteHName((nsd_t*)pThis->pTcp, &fromHost);
+	}
+
 	if (ssl == NULL) {
 		/* Output Error Info*/
-		dbgprintf("osslLastSSLErrorMsg: Error in '%s' with ret=%d\n", pszCallSource, ret);
+		DBGPRINTF("osslLastSSLErrorMsg: Error in '%s' with ret=%d\n", pszCallSource, ret);
 	} else {
 		/* if object is set, get error code */
 		iSSLErr = SSL_get_error(ssl, ret);
+		/* Output Debug as well */
+		DBGPRINTF("osslLastSSLErrorMsg: %s Error in '%s': '%s(%d)' with ret=%d, errno=%d, sslapi='%s'\n",
+			(iSSLErr == SSL_ERROR_SSL ? "SSL_ERROR_SSL" :
+			(iSSLErr == SSL_ERROR_SYSCALL ? "SSL_ERROR_SYSCALL" : "SSL_ERROR_UNKNOWN")),
+			pszCallSource, ERR_error_string(iSSLErr, NULL),
+			iSSLErr,
+			ret,
+			errno,
+			pszOsslApi);
 
 		/* Output error message */
 		LogMsg(0, RS_RET_NO_ERRCODE, severity,
@@ -212,8 +230,10 @@
 	/* Loop through ERR_get_error */
 	while ((un_error = ERR_get_error()) > 0){
 		LogMsg(0, RS_RET_NO_ERRCODE, severity,
-			"nsd_ossl:OpenSSL Error Stack: %s", ERR_error_string(un_error, NULL) );
+			"nsd_ossl:remote '%s' OpenSSL Error Stack: %s", fromHost, ERR_error_string(un_error, NULL) );
 	}
+
+	free(fromHost);
 }
 
 int verify_callback(int status, X509_STORE_CTX *store)
@@ -238,6 +258,9 @@
 		X509_NAME_oneline(X509_get_issuer_name(cert), szdbgdata1, sizeof(szdbgdata1));
 		X509_NAME_oneline(RSYSLOG_X509_NAME_oneline(cert), szdbgdata2, sizeof(szdbgdata2));
 
+		uchar *fromHost = NULL;
+		nsd_ptcp.GetRemoteHName((nsd_t*)pThis->pTcp, &fromHost);
+
 		if (iVerifyMode != SSL_VERIFY_NONE) {
 			/* Handle expired Certificates **/
 			if (err == X509_V_OK || err == X509_V_ERR_CERT_HAS_EXPIRED) {
@@ -252,34 +275,47 @@
 					status = 1;
 				}
 				else if (pThis->permitExpiredCerts == OSSL_EXPIRED_WARN) {
-					LogMsg(0, RS_RET_NO_ERRCODE, LOG_WARNING,
+					LogMsg(0, RS_RET_CERT_EXPIRED, LOG_WARNING,
 						"Certificate EXPIRED warning at depth: %d \n\t"
 						"issuer  = %s\n\t"
 						"subject = %s\n\t"
-						"err %d:%s",
+						"err %d:%s peer '%s'",
 						depth, szdbgdata1, szdbgdata2,
-						err, X509_verify_cert_error_string(err));
+						err, X509_verify_cert_error_string(err), fromHost);
 
 					/* Set Status to OK*/
 					status = 1;
 				}
 				else /* also default - if (pThis->permitExpiredCerts == OSSL_EXPIRED_DENY)*/ {
-					LogMsg(0, RS_RET_NO_ERRCODE, LOG_ERR,
+					LogMsg(0, RS_RET_CERT_EXPIRED, LOG_ERR,
 						"Certificate EXPIRED at depth: %d \n\t"
 						"issuer  = %s\n\t"
 						"subject = %s\n\t"
-						"err %d:%s",
+						"err %d:%s\n\t"
+						"not permitted to talk to peer '%s', certificate invalid: "
+						"certificate expired",
 						depth, szdbgdata1, szdbgdata2,
-						err, X509_verify_cert_error_string(err));
+						err, X509_verify_cert_error_string(err), fromHost);
 				}
+			} else if (err == X509_V_ERR_CERT_REVOKED) {
+				LogMsg(0, RS_RET_CERT_REVOKED, LOG_ERR,
+					"Certificate REVOKED at depth: %d \n\t"
+					"issuer  = %s\n\t"
+					"subject = %s\n\t"
+					"err %d:%s\n\t"
+					"not permitted to talk to peer '%s', certificate invalid: "
+					"certificate revoked",
+					depth, szdbgdata1, szdbgdata2,
+					err, X509_verify_cert_error_string(err), fromHost);
 			} else {
 				/* all other error codes cause failure */
 				LogMsg(0, RS_RET_NO_ERRCODE, LOG_ERR,
 					"Certificate error at depth: %d \n\t"
 					"issuer  = %s\n\t"
 					"subject = %s\n\t"
-					"err %d:%s",
-					depth, szdbgdata1, szdbgdata2, err, X509_verify_cert_error_string(err));
+					"err %d:%s - peer '%s'",
+					depth, szdbgdata1, szdbgdata2,
+					err, X509_verify_cert_error_string(err), fromHost);
 			}
 		} else {
 			/* do not verify certs in ANON mode, just log into debug */
@@ -292,6 +328,7 @@
 			/* Set Status to OK*/
 			status = 1;
 		}
+		free(fromHost);
 	}
 
 	return status;
@@ -420,8 +457,15 @@
 	DEFiRet;
 	DBGPRINTF("openssl: entering osslGlblInit\n");
 
-	/* Setup OpenSSL library */
-	if((opensslh_THREAD_setup() == 0) || !SSL_library_init()) {
+	if((opensslh_THREAD_setup() == 0) ||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+		/* Setup OpenSSL library  < 1.1.0 */
+		!SSL_library_init()
+#else
+		/* Setup OpenSSL library >= 1.1.0 with system default settings */
+		OPENSSL_init_ssl(0, NULL) == 0
+#endif
+		) {
 		LogError(0, RS_RET_NO_ERRCODE, "Error: OpenSSL initialization failed!");
 	}
 
@@ -495,7 +539,7 @@
 		}
 		else if(err == SSL_ERROR_SYSCALL) {
 			/* Output error and abort */
-			osslLastSSLErrorMsg(lenRcvd, pThis->ssl, LOG_INFO, "osslRecordRecv", "SSL_read");
+			osslLastSSLErrorMsg(pThis, lenRcvd, pThis->ssl, LOG_INFO, "osslRecordRecv", "SSL_read");
 			iRet = RS_RET_NO_ERRCODE;
 			/* Check for underlaying socket errors **/
 			if (	errno == ECONNRESET) {
@@ -512,7 +556,7 @@
 			err != SSL_ERROR_WANT_WRITE) {
 			DBGPRINTF("osslRecordRecv: SSL_get_error #1 = %d, lenRcvd=%zd\n", err, lenRcvd);
 			/* Output OpenSSL error*/
-			osslLastSSLErrorMsg(lenRcvd, pThis->ssl, LOG_ERR, "osslRecordRecv", "SSL_read");
+			osslLastSSLErrorMsg(pThis, lenRcvd, pThis->ssl, LOG_ERR, "osslRecordRecv", "SSL_read");
 			ABORT_FINALIZE(RS_RET_NO_ERRCODE);
 		} else {
 			DBGPRINTF("osslRecordRecv: SSL_get_error #2 = %d, lenRcvd=%zd\n", err, lenRcvd);
@@ -540,7 +584,7 @@
 
 	if(!(pThis->ssl = SSL_new(pThis->ctx))) {
 		pThis->ssl = NULL;
-		osslLastSSLErrorMsg(0, pThis->ssl, LOG_ERR, "osslInitSession", "SSL_new");

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/nsd_ossl.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/nsd_ossl.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/nsd_ptcp.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/nsd_ptcp.c Changed

@@ -254,6 +254,19 @@
 }
 
 static rsRetVal
+SetTlsCRLFile(nsd_t __attribute__((unused)) *pNsd, const uchar *const pszFile)
+{
+	DEFiRet;
+	if(pszFile != NULL) {
+		LogError(0, RS_RET_VALUE_NOT_SUPPORTED, "error: CRL File setting not supported by "
+				"ptcp netstream driver - value %s", pszFile);
+		ABORT_FINALIZE(RS_RET_VALUE_NOT_SUPPORTED);
+	}
+finalize_it:
+	RETiRet;
+}
+
+static rsRetVal
 SetTlsKeyFile(nsd_t __attribute__((unused)) *pNsd, const uchar *const pszFile)
 {
 	DEFiRet;
@@ -705,6 +718,7 @@
 		CHKiRet(pNS->Drvr.SetCheckExtendedKeyUsage(pNewNsd, netstrms.GetDrvrCheckExtendedKeyUsage(pNS)));
 		CHKiRet(pNS->Drvr.SetPrioritizeSAN(pNewNsd, netstrms.GetDrvrPrioritizeSAN(pNS)));
 		CHKiRet(pNS->Drvr.SetTlsCAFile(pNewNsd, netstrms.GetDrvrTlsCAFile(pNS)));
+		CHKiRet(pNS->Drvr.SetTlsCRLFile(pNewNsd, netstrms.GetDrvrTlsCRLFile(pNS)));
 		CHKiRet(pNS->Drvr.SetTlsKeyFile(pNewNsd, netstrms.GetDrvrTlsKeyFile(pNS)));
 		CHKiRet(pNS->Drvr.SetTlsCertFile(pNewNsd, netstrms.GetDrvrTlsCertFile(pNS)));
 		CHKiRet(pNS->Drvr.SetTlsVerifyDepth(pNewNsd, netstrms.GetDrvrTlsVerifyDepth(pNS)));
@@ -1069,6 +1083,7 @@
 	pIf->SetPrioritizeSAN = SetPrioritizeSAN;
 	pIf->SetTlsVerifyDepth = SetTlsVerifyDepth;
 	pIf->SetTlsCAFile = SetTlsCAFile;
+	pIf->SetTlsCRLFile = SetTlsCRLFile;
 	pIf->SetTlsKeyFile = SetTlsKeyFile;
 	pIf->SetTlsCertFile = SetTlsCertFile;
 finalize_it:

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/nsdsel_ptcp.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/nsdsel_ptcp.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/queue.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/queue.c Changed

@@ -770,8 +770,12 @@
 /* The following function is used to "save" ourself from being killed by
  * a fatally failed disk queue. A fatal failure is, for example, if no
  * data can be read or written. In that case, the disk support is disabled,
- * with all on-disk structures kept as-is as much as possible. Instead, the
- * queue is switched to direct mode, so that at least
+ * with all on-disk structures kept as-is as much as possible. However,
+ * we do not really stop or destruct the in-memory disk queue object.
+ * Practice has shown that this may cause races during destruction which
+ * themselfs can lead to segfault. So we prefer to was some ressources by
+ * keeping the queue active.
+ * Instead, the queue is switched to direct mode, so that at least
  * some processing can happen. Of course, this may still have lots of
  * undesired side-effects, but is probably better than aborting the
  * syslogd. Note that this function *must* succeed in one way or another, as
@@ -784,7 +788,6 @@
 {
 	pThis->iQueueSize = 0;
 	pThis->nLogDeq = 0;
-	qDestructDisk(pThis); /* free disk structures */
 
 	pThis->qType = QUEUETYPE_DIRECT;
 	pThis->qConstruct = qConstructDirect;

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/rsconf.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/rsconf.c Changed

@@ -2,7 +2,7 @@
  *
  * Module begun 2011-04-19 by Rainer Gerhards
  *
- * Copyright 2011-2022 Adiscon GmbH.
+ * Copyright 2011-2023 Adiscon GmbH.
  *
  * This file is part of the rsyslog runtime library.
  *
@@ -159,6 +159,10 @@
 
 static void cnfSetDefaults(rsconf_t *pThis)
 {
+#ifdef ENABLE_LIBCAPNG
+	pThis->globals.bAbortOnFailedLibcapngSetup = 1;
+	pThis->globals.bCapabilityDropEnabled = 1;
+#endif
 	pThis->globals.bAbortOnUncleanConfig = 0;
 	pThis->globals.bAbortOnFailedQueueStartup = 0;
 	pThis->globals.bReduceRepeatMsgs = 0;
@@ -182,6 +186,7 @@
 	pThis->globals.iGnuTLSLoglevel = 0;
 	pThis->globals.debugOnShutdown = 0;
 	pThis->globals.pszDfltNetstrmDrvrCAF = NULL;
+	pThis->globals.pszDfltNetstrmDrvrCRLF = NULL;
 	pThis->globals.pszDfltNetstrmDrvrCertFile = NULL;
 	pThis->globals.pszDfltNetstrmDrvrKeyFile = NULL;
 	pThis->globals.pszDfltNetstrmDrvr = NULL;
@@ -336,6 +341,7 @@
 	free(pThis->globals.pszWorkDir);
 	free(pThis->globals.operatingStateFile);
 	free(pThis->globals.pszDfltNetstrmDrvrCAF);
+	free(pThis->globals.pszDfltNetstrmDrvrCRLF);
 	free(pThis->globals.pszDfltNetstrmDrvrCertFile);
 	free(pThis->globals.pszDfltNetstrmDrvrKeyFile);
 	free(pThis->globals.pszDfltNetstrmDrvr);
@@ -668,9 +674,10 @@
 	res = setgid(cnf->globals.gidDropPriv);
 	if(res) {
 		LogError(errno, RS_RET_ERR_DROP_PRIV,
-				"could not set requested group id %d", cnf->globals.gidDropPriv);
+				"could not set requested group id %d via setgid()", cnf->globals.gidDropPriv);
 		ABORT_FINALIZE(RS_RET_ERR_DROP_PRIV);
 	}
+
 	DBGPRINTF("setgid(%d): %d\n", cnf->globals.gidDropPriv, res);
 	snprintf((char*)szBuf, sizeof(szBuf), "rsyslogd's groupid changed to %d",
 		 cnf->globals.gidDropPriv);
@@ -711,6 +718,7 @@
 		perror("could not set requested userid");
 		exit(1);
 	}
+
 	DBGPRINTF("setuid(%d): %d\n", cnf->globals.uidDropPriv, res);
 	snprintf((char*)szBuf, sizeof(szBuf), "rsyslogd's userid changed to %d", cnf->globals.uidDropPriv);
 	logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, szBuf, 0);
@@ -1031,6 +1039,7 @@
 
 	CHKiRet(dropPrivileges(cnf));
 
+	lookupActivateConf();
 	tellModulesActivateConfig();
 	startInputModules();
 	CHKiRet(activateActions());

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/rsconf.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/rsconf.h Changed

@@ -1,6 +1,6 @@
 /* The rsconf object. It models a complete rsyslog configuration.
  *
- * Copyright 2011-2022 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2011-2023 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of the rsyslog runtime library.
  *
@@ -84,6 +84,10 @@
  * be re-set as often as the user likes).
  */
 struct globals_s {
+#ifdef ENABLE_LIBCAPNG
+	int bAbortOnFailedLibcapngSetup;
+	int bCapabilityDropEnabled;
+#endif
 	int bDebugPrintTemplateList;
 	int bDebugPrintModuleList;
 	int bDebugPrintCfSysLineHandlerList;
@@ -107,6 +111,7 @@
 	int debugOnShutdown; /* start debug log when we are shut down */
 	int iGnuTLSLoglevel;/* Sets GNUTLS Debug Level */
 	uchar *pszDfltNetstrmDrvrCAF; /* default CA file for the netstrm driver */
+	uchar *pszDfltNetstrmDrvrCRLF; /* default CRL file for the netstrm driver */
 	uchar *pszDfltNetstrmDrvrCertFile;/* default cert file for the netstrm driver (server) */
 	uchar *pszDfltNetstrmDrvrKeyFile; /* default key file for the netstrm driver (server) */
 	uchar *pszDfltNetstrmDrvr; /* module name of default netstream driver */

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/rsyslog.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/rsyslog.h Changed

@@ -3,7 +3,7 @@
  *
  * Begun 2005-09-15 RGerhards
  *
- * Copyright (C) 2005-2019 by Rainer Gerhards and Adiscon GmbH
+ * Copyright (C) 2005-2023 by Rainer Gerhards and Adiscon GmbH
  *
  * This file is part of the rsyslog runtime library.
  *
@@ -547,6 +547,9 @@
 	RS_RET_CA_CERT_MISSING = -2329,/**< a CA cert is missing where one is required (e.g. TLS) */
 	RS_RET_CERT_MISSING = -2330,/**< a cert is missing where one is required (e.g. TLS) */
 	RS_RET_CERTKEY_MISSING = -2331,/**< a cert (private) key is missing where one is required (e.g. TLS) */
+	RS_RET_CRL_MISSING = -2332,/**< a CRL file is missing but not required (e.g. TLS) */
+	RS_RET_CRL_INVALID = -2333, /**< a CRL file PEM file failed validation */
+	RS_RET_CERT_REVOKED = -2334, /**< a certificate has been revoked */
 	RS_RET_STRUC_DATA_INVLD = -2349,/**< structured data is malformed */
 
 	/* up to 2350 reserved for 7.4 */
@@ -604,6 +607,7 @@
 	RS_RET_REDIS_ERROR = -2452, /**< redis-specific error. See message foe details. */
 	RS_RET_REDIS_AUTH_FAILED = -2453, /**< redis authentication failure */
 	RS_RET_FAUP_INIT_OPTIONS_FAILED = -2454, /**< could not initialize faup options */
+	RS_RET_LIBCAPNG_ERR = -2455, /**< error during dropping the capabilities */
 
 	/* RainerScript error messages (range 1000.. 1999) */
 	RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */
@@ -778,7 +782,7 @@
 int rsrtIsInit(void);
 void rsrtSetErrLogger(void (*errLogger)(const int, const int, const uchar*));
 void dfltErrLogger(const int, const int, const uchar *errMsg);
-rsRetVal queryLocalHostname(void);
+rsRetVal queryLocalHostname(rsconf_t *const);
 
 
 /* this define below is (later) intended to be used to implement empty

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/stream.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/stream.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/strgen.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/strgen.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/stringbuf.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/stringbuf.c Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/stringbuf.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/stringbuf.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/tcpsrv.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/tcpsrv.c Changed

@@ -1058,6 +1058,7 @@
 	 * when param is NULL default handling for ExpiredCerts is set! */
 	CHKiRet(netstrms.SetDrvrPermitExpiredCerts(pThis->pNS, pThis->pszDrvrPermitExpiredCerts));
 	CHKiRet(netstrms.SetDrvrTlsCAFile(pThis->pNS, pThis->pszDrvrCAFile));
+	CHKiRet(netstrms.SetDrvrTlsCRLFile(pThis->pNS, pThis->pszDrvrCRLFile));
 	CHKiRet(netstrms.SetDrvrTlsKeyFile(pThis->pNS, pThis->pszDrvrKeyFile));
 	CHKiRet(netstrms.SetDrvrTlsCertFile(pThis->pNS, pThis->pszDrvrCertFile));
 	if(pThis->pPermPeers != NULL)
@@ -1096,6 +1097,7 @@
 	free(pThis->pszDrvrAuthMode);
 	free(pThis->pszDrvrPermitExpiredCerts);
 	free(pThis->pszDrvrCAFile);
+	free(pThis->pszDrvrCRLFile);
 	free(pThis->pszDrvrKeyFile);
 	free(pThis->pszDrvrCertFile);
 	free(pThis->ppLstn);
@@ -1447,6 +1449,18 @@
 }
 
 static rsRetVal
+SetDrvrCRLFile(tcpsrv_t *const pThis, uchar *const mode)
+{
+	DEFiRet;
+	ISOBJ_TYPE_assert(pThis, tcpsrv);
+	if (mode != NULL) {
+		CHKmalloc(pThis->pszDrvrCRLFile = ustrdup(mode));
+	}
+finalize_it:
+	RETiRet;
+}
+
+static rsRetVal
 SetDrvrKeyFile(tcpsrv_t *pThis, uchar *mode)
 {
 	DEFiRet;
@@ -1610,6 +1624,7 @@
 	pIf->SetDrvrAuthMode = SetDrvrAuthMode;
 	pIf->SetDrvrPermitExpiredCerts = SetDrvrPermitExpiredCerts;
 	pIf->SetDrvrCAFile = SetDrvrCAFile;
+	pIf->SetDrvrCRLFile = SetDrvrCRLFile;
 	pIf->SetDrvrKeyFile = SetDrvrKeyFile;
 	pIf->SetDrvrCertFile = SetDrvrCertFile;
 	pIf->SetDrvrName = SetDrvrName;

_service:tar_scm:rsyslog-8.2210.0.tar.gz/runtime/tcpsrv.h -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/runtime/tcpsrv.h Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/template.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/template.c Changed

@@ -163,6 +163,7 @@
 	unsigned short bMustBeFreed = 0;
 	uchar *pVal;
 	rs_size_t iLenVal = 0;
+	int need_comma = 0;
 
 	if(pTpl->pStrgen != NULL) {
 		CHKiRet(pTpl->pStrgen(pMsg, iparam));
@@ -230,15 +231,24 @@
 			if(iBuf + iLenVal + extra_space >= iparam->lenBuf) /* we reserve one char for the final \0! */
 				CHKiRet(ExtendBuf(iparam, iBuf + iLenVal + 1));
 
+			if(need_comma) {
+				memcpy(iparam->param + iBuf, ", ", 2);
+				iBuf += 2;
+			}
 			memcpy(iparam->param + iBuf, pVal, iLenVal);
 			iBuf += iLenVal;
 			if(pTpl->optFormatEscape == JSONF) {
-				memcpy(iparam->param + iBuf,
-					(pTpe->pNext == NULL) ? "}\n" : ", ", 2);
-				iBuf += 2;
+				need_comma = 1;
 			}
 		}
 
+		if((pTpl->optFormatEscape == JSONF) && (pTpe->pNext == NULL)) {
+			/* space was reserved while processing field above
+			   (via extra_space in ExtendBuf() new size formula. */
+			memcpy(iparam->param + iBuf, "}\n", 2);
+			iBuf += 2;
+		}
+
 		if(bMustBeFreed) {
 			free(pVal);
 			bMustBeFreed = 0;
@@ -1461,7 +1471,8 @@
 	int spifno1stsp = 0;
 	int mandatory = 0;
 	int frompos = -1;
-	int topos = -1;
+	int topos = 0;
+	int topos_set = 0;
 	int fieldnum = -1;
 	int fielddelim = 9; /* default is HT (USACSII 9) */
 	int fixedwidth = 0;
@@ -1545,6 +1556,7 @@
 			bComplexProcessing = 1;
 		} else if(!strcmp(pblkProperty.descri.name, "position.to")) {
 			topos = pvalsi.val.d.n;
+			topos_set = 1;
 			bComplexProcessing = 1;
 		} else if(!strcmp(pblkProperty.descri.name, "position.relativetoend")) {
 			bPosRelativeToEnd = pvalsi.val.d.n;
@@ -1726,9 +1738,9 @@
 	}
 
 	/* sanity check */
-	if(topos == -1 && frompos != -1)
+	if(topos_set == 0 && frompos != -1)
 		topos = 2000000000; /* large enough ;) */
-	if(frompos == -1 && topos != -1)
+	if(frompos == -1 && topos_set != 0)
 		frompos = 0;
 	if(bPosRelativeToEnd) {
 		if(topos > frompos) {
@@ -1737,7 +1749,7 @@
 			ABORT_FINALIZE(RS_RET_ERR);
 		}
 	} else {
-		if(topos < frompos) {
+		if((topos >= 0) && (topos < frompos)) {
 			LogError(0, RS_RET_ERR, "position.to=%d is lower than postion.from=%d\n",
 				topos, frompos);
 			ABORT_FINALIZE(RS_RET_ERR);

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/Makefile.am -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/Makefile.am Changed

@@ -184,6 +184,10 @@
 	hostname-with-slash-pmrfc5424.sh \
 	hostname-with-slash-pmrfc3164.sh \
 	hostname-with-slash-dflt-invld.sh \
+	func-substring-invld-startpos.sh \
+	func-substring-large-endpos.sh \
+	func-substring-large-neg-endpos.sh \
+	func-substring-relative-endpos.sh \
 	hostname-with-slash-dflt-slash-valid.sh \
 	empty-app-name.sh \
 	stop-localvar.sh \
@@ -230,6 +234,7 @@
 	privdropabortonidfail.sh \
 	privdropabortonidfaillegacy.sh \
 	json-nonstring.sh \
+        json-onempty-at-end.sh \
 	template-json.sh \
 	template-pure-json.sh \
 	template-pos-from-to.sh \
@@ -238,6 +243,7 @@
 	template-pos-from-to-oversize-lowercase.sh \
 	template-pos-from-to-missing-jsonvar.sh \
 	template-const-jsonf.sh \
+	template-topos-neg.sh \
 	fac_authpriv.sh \
 	fac_local0.sh \
 	fac_local7.sh \
@@ -474,6 +480,7 @@
 	incltest_dir_empty_wildcard.sh \
 	linkedlistqueue.sh \
 	lookup_table.sh \
+	lookup_table-hup-backgrounded.sh \
 	lookup_table_no_hup_reload.sh \
 	key_dereference_on_uninitialized_variable_space.sh \
 	array_lookup_table.sh \
@@ -575,6 +582,7 @@
 	badqi.sh \
 	threadingmq.sh \
 	threadingmqaq.sh \
+	func-substring-invld-startpos-vg.sh \
 	rscript_trim-vg.sh
 if ENABLE_LIBGCRYPT
 TESTS +=  \
@@ -979,6 +987,21 @@
 endif
 endif
 
+if ENABLE_OMAZUREEVENTHUBS
+if ENABLE_OMAZUREEVENTHUBS_TESTS
+TESTS += \
+	omazureeventhubs-basic.sh \
+	omazureeventhubs-list.sh \
+	omazureeventhubs-stress.sh \
+	omazureeventhubs-interrupt.sh
+if HAVE_VALGRIND
+TESTS += \
+	omazureeventhubs-basic-vg.sh \
+	omazureeventhubs-interrupt-vg.sh
+endif
+endif
+endif
+
 if ENABLE_IMDOCKER
 if ENABLE_IMDOCKER_TESTS
 TESTS += \
@@ -1048,6 +1071,74 @@
 endif # HAVE_VALGRIND
 endif # ENABLE_OMRABBITMQ
 
+if ENABLE_REDIS_TESTS
+if ENABLE_IMHIREDIS
+TESTS +=  \
+	imhiredis-queue.sh \
+	imhiredis-queue-lpop.sh \
+	imhiredis-redis-restart.sh \
+	imhiredis-redis-start-after.sh \
+	imhiredis-subscribe.sh \
+	imhiredis-stream.sh \
+	imhiredis-stream-from-beginning.sh \
+	imhiredis-stream-consumerGroup-ack.sh \
+	imhiredis-stream-consumerGroup-noack.sh \
+	imhiredis-stream-consumerGroup-reclaim.sh
+if HAVE_VALGRIND
+TESTS += \
+	imhiredis-queue-vg.sh \
+	imhiredis-queue-lpop-vg.sh \
+	imhiredis-redis-restart-vg.sh \
+	imhiredis-redis-start-after-vg.sh \
+	imhiredis-subscribe-vg.sh \
+	imhiredis-stream-vg.sh \
+	imhiredis-stream-from-beginning-vg.sh \
+	imhiredis-stream-consumerGroup-ack-vg.sh \
+	imhiredis-stream-consumerGroup-noack-vg.sh \
+	imhiredis-stream-consumerGroup-reclaim-vg.sh
+endif # HAVE_VALGRIND
+endif # ENABLE_IMHIREDIS
+
+if ENABLE_OMHIREDIS
+TESTS +=  \
+	mmdb-reload.sh \
+	omhiredis-dynakey.sh \
+	omhiredis-publish.sh \
+	omhiredis-queue-rpush.sh \
+	omhiredis-queue.sh \
+	omhiredis-set.sh \
+	omhiredis-setex.sh \
+	omhiredis-template.sh \
+	omhiredis-withpass.sh \
+	omhiredis-wrongpass.sh \
+	omhiredis-stream-ack.sh \
+	omhiredis-stream-capped.sh \
+	omhiredis-stream-del.sh \
+	omhiredis-stream-dynack.sh \
+	omhiredis-stream-outfield.sh \
+	omhiredis-stream.sh
+if HAVE_VALGRIND
+TESTS += \
+	mmdb-reload-vg.sh \
+	omhiredis-dynakey-vg.sh \
+	omhiredis-publish-vg.sh \
+	omhiredis-queue-rpush-vg.sh \
+	omhiredis-queue-vg.sh \
+	omhiredis-set-vg.sh \
+	omhiredis-setex-vg.sh \
+	omhiredis-template-vg.sh \
+	omhiredis-withpass-vg.sh \
+	omhiredis-wrongpass-vg.sh \
+	omhiredis-stream-ack-vg.sh \
+	omhiredis-stream-capped-vg.sh \
+	omhiredis-stream-del-vg.sh \
+	omhiredis-stream-dynack-vg.sh \
+	omhiredis-stream-outfield-vg.sh \
+	omhiredis-stream-vg.sh
+endif # HAVE_VALGRIND
+endif # ENABLE_OMHIREDIS
+endif # ENABLE_REDIS_TESTS
+
 if ENABLE_IMPSTATS
 TESTS +=  \
 	impstats-hup.sh \
@@ -1107,6 +1198,7 @@
 	rscript_hash32.sh \
 	rscript_hash64.sh \
 	rscript_replace.sh \
+	omfile-sizelimitcmd-many.sh \
 	omfile-outchannel-many.sh
 if HAVE_VALGRIND
 TESTS +=  \
@@ -1327,6 +1419,8 @@
 	sndrcv_tls_certvalid_action_level.sh \
 	sndrcv_tls_certvalid_expired.sh \
 	sndrcv_tls_certvalid_expired_defaultmode.sh \
+	sndrcv_tls_certvalid_revoked.sh \
+	sndrcv_tls_client_missing_cert.sh \
 	imtcp-tls-no-lstn-startup.sh \
 	imtcp-tls-gtls-x509fingerprint-invld.sh \
 	imtcp-tls-gtls-x509fingerprint.sh \
@@ -1367,6 +1461,7 @@
 	sndrcv_tls_ossl_certvalid_expired.sh \
 	sndrcv_tls_ossl_certvalid_tlscommand.sh \
 	sndrcv_tls_ossl_certvalid_ciphers.sh \
+	sndrcv_tls_ossl_certvalid_revoked.sh \
 	imtcp-tls-ossl-x509valid.sh \
 	imtcp-tls-ossl-x509name.sh \
 	imtcp-tls-ossl-x509fingerprint.sh \
@@ -1565,6 +1660,7 @@
 	imfile-rename.sh \
 	imfile-symlink.sh \
 	imfile-symlink-multi.sh \
+	imfile-symlink-ext-tmp-dir-tree.sh \
 	imfile-logrotate.sh \
 	imfile-logrotate-async.sh \
 	imfile-logrotate-multiple.sh \
@@ -1717,6 +1813,11 @@
 	config_enabled-off.sh \
 	empty-app-name.sh \
 	empty-hostname.sh \
+	func-substring-invld-startpos.sh \
+	func-substring-invld-startpos-vg.sh \
+	func-substring-large-endpos.sh \
+	func-substring-large-neg-endpos.sh \
+	func-substring-relative-endpos.sh \
 	hostname-with-slash-pmrfc5424.sh \
 	hostname-with-slash-pmrfc3164.sh \
 	pmrfc3164-msgFirstSpace.sh \
@@ -1777,6 +1878,23 @@
 	tls-certs/ca-fail.pem \
 	tls-certs/cert-fail.pem \
 	tls-certs/key-fail.pem \
+	testsuites/x.509/ca.srl \
+	testsuites/x.509/client-cert-new.pem \
+	testsuites/x.509/client-new.csr \
+	testsuites/x.509/client-revoked-key.pem \
+	testsuites/x.509/client-revoked-valid.pem \
+	testsuites/x.509/client-revoked.csr \
+	testsuites/x.509/client-revoked.pem \
+	testsuites/x.509/crl.pem \
+	testsuites/x.509/index.txt \
+	testsuites/x.509/index.txt.attr \
+	testsuites/x.509/newcerts/01.pem \

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/Makefile.in Changed

@@ -130,7 +130,7 @@
 @ENABLE_TESTBENCH_TRUE@	$(am__append_48) $(am__append_49) \
 @ENABLE_TESTBENCH_TRUE@	$(am__append_50) $(am__append_51) \
 @ENABLE_TESTBENCH_TRUE@	$(am__append_52) $(am__append_53) \
-@ENABLE_TESTBENCH_TRUE@	$(am__append_55) $(am__append_56) \
+@ENABLE_TESTBENCH_TRUE@	$(am__append_54) $(am__append_55) \
 @ENABLE_TESTBENCH_TRUE@	$(am__append_57) $(am__append_58) \
 @ENABLE_TESTBENCH_TRUE@	$(am__append_59) $(am__append_60) \
 @ENABLE_TESTBENCH_TRUE@	$(am__append_61) $(am__append_62) \
@@ -160,7 +160,10 @@
 @ENABLE_TESTBENCH_TRUE@	$(am__append_109) $(am__append_110) \
 @ENABLE_TESTBENCH_TRUE@	$(am__append_111) $(am__append_112) \
 @ENABLE_TESTBENCH_TRUE@	$(am__append_113) $(am__append_114) \
-@ENABLE_TESTBENCH_TRUE@	$(am__append_115) $(am__append_116)
+@ENABLE_TESTBENCH_TRUE@	$(am__append_115) $(am__append_116) \
+@ENABLE_TESTBENCH_TRUE@	$(am__append_117) $(am__append_118) \
+@ENABLE_TESTBENCH_TRUE@	$(am__append_119) $(am__append_120) \
+@ENABLE_TESTBENCH_TRUE@	$(am__append_121) $(am__append_122)
 # the following test need to be serialized:
 
 # special "test" for stopping ES once all ES tests are done
@@ -229,6 +232,10 @@
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	hostname-with-slash-pmrfc5424.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	hostname-with-slash-pmrfc3164.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	hostname-with-slash-dflt-invld.sh \
+@ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	func-substring-invld-startpos.sh \
+@ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	func-substring-large-endpos.sh \
+@ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	func-substring-large-neg-endpos.sh \
+@ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	func-substring-relative-endpos.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	hostname-with-slash-dflt-slash-valid.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	empty-app-name.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	stop-localvar.sh \
@@ -275,6 +282,7 @@
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	privdropabortonidfail.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	privdropabortonidfaillegacy.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	json-nonstring.sh \
+@ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@        json-onempty-at-end.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	template-json.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	template-pure-json.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	template-pos-from-to.sh \
@@ -283,6 +291,7 @@
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	template-pos-from-to-oversize-lowercase.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	template-pos-from-to-missing-jsonvar.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	template-const-jsonf.sh \
+@ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	template-topos-neg.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	fac_authpriv.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	fac_local0.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	fac_local7.sh \
@@ -519,6 +528,7 @@
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	incltest_dir_empty_wildcard.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	linkedlistqueue.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	lookup_table.sh \
+@ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	lookup_table-hup-backgrounded.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	lookup_table_no_hup_reload.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	key_dereference_on_uninitialized_variable_space.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	array_lookup_table.sh \
@@ -615,6 +625,7 @@
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	badqi.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	threadingmq.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	threadingmqaq.sh \
+@ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	func-substring-invld-startpos-vg.sh \
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	rscript_trim-vg.sh
 
 @ENABLE_DEFAULT_TESTS_TRUE@@ENABLE_LIBGCRYPT_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_14 = \
@@ -868,19 +879,29 @@
 @ENABLE_IMKAFKA_TRUE@@ENABLE_KAFKA_TESTS_TRUE@@ENABLE_OMKAFKA_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omkafka-vg.sh \
 @ENABLE_IMKAFKA_TRUE@@ENABLE_KAFKA_TESTS_TRUE@@ENABLE_OMKAFKA_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imkafka-vg.sh
 
-@ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_50 = \
+@ENABLE_OMAZUREEVENTHUBS_TESTS_TRUE@@ENABLE_OMAZUREEVENTHUBS_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_50 = \
+@ENABLE_OMAZUREEVENTHUBS_TESTS_TRUE@@ENABLE_OMAZUREEVENTHUBS_TRUE@@ENABLE_TESTBENCH_TRUE@	omazureeventhubs-basic.sh \
+@ENABLE_OMAZUREEVENTHUBS_TESTS_TRUE@@ENABLE_OMAZUREEVENTHUBS_TRUE@@ENABLE_TESTBENCH_TRUE@	omazureeventhubs-list.sh \
+@ENABLE_OMAZUREEVENTHUBS_TESTS_TRUE@@ENABLE_OMAZUREEVENTHUBS_TRUE@@ENABLE_TESTBENCH_TRUE@	omazureeventhubs-stress.sh \
+@ENABLE_OMAZUREEVENTHUBS_TESTS_TRUE@@ENABLE_OMAZUREEVENTHUBS_TRUE@@ENABLE_TESTBENCH_TRUE@	omazureeventhubs-interrupt.sh
+
+@ENABLE_OMAZUREEVENTHUBS_TESTS_TRUE@@ENABLE_OMAZUREEVENTHUBS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_51 = \
+@ENABLE_OMAZUREEVENTHUBS_TESTS_TRUE@@ENABLE_OMAZUREEVENTHUBS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omazureeventhubs-basic-vg.sh \
+@ENABLE_OMAZUREEVENTHUBS_TESTS_TRUE@@ENABLE_OMAZUREEVENTHUBS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omazureeventhubs-interrupt-vg.sh
+
+@ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_52 = \
 @ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@	imdocker-basic.sh \
 @ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@	imdocker-long-logline.sh \
 @ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@	imdocker-new-logs-from-start.sh \
 @ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@	imdocker-multi-line.sh
 
-@ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_51 = \
+@ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_53 = \
 @ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imdocker-basic-vg.sh \
 @ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imdocker-long-logline-vg.sh \
 @ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imdocker-new-logs-from-start-vg.sh \
 @ENABLE_IMDOCKER_TESTS_TRUE@@ENABLE_IMDOCKER_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imdocker-multi-line-vg.sh
 
-@ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_52 = \
+@ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_54 = \
 @ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@	imhttp-post-payload.sh \
 @ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@	imhttp-post-payload-basic-auth.sh \
 @ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@	imhttp-post-payload-query-params.sh \
@@ -890,7 +911,7 @@
 @ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@	imhttp-post-payload-compress.sh \
 @ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@	imhttp-getrequest-file.sh
 
-@ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_53 = \
+@ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_55 = \
 @ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhttp-post-payload-vg.sh \
 @ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhttp-post-payload-basic-auth-vg.sh \
 @ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhttp-post-payload-query-params-vg.sh \
@@ -900,8 +921,8 @@
 @ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhttp-post-payload-compress-vg.sh \
 @ENABLE_IMHTTP_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhttp-getrequest-file-vg.sh
 
-@ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_54 = miniamqpsrvr
-@ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_55 = \
+@ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_56 = miniamqpsrvr
+@ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_57 = \
 @ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@	omrabbitmq_no_params.sh \
 @ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@	omrabbitmq_params_missing0.sh \
 @ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@	omrabbitmq_params_missing1.sh \
@@ -919,10 +940,70 @@
 @ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@	omrabbitmq_json.sh \
 @ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@	omrabbitmq_raw.sh
 
-@ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_56 = \
+@ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_58 = \
 @ENABLE_OMRABBITMQ_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omrabbitmq_data_1server-vg.sh
 
-@ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_57 = \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_59 = \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	imhiredis-queue.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	imhiredis-queue-lpop.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	imhiredis-redis-restart.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	imhiredis-redis-start-after.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	imhiredis-subscribe.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	imhiredis-stream.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	imhiredis-stream-from-beginning.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	imhiredis-stream-consumerGroup-ack.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	imhiredis-stream-consumerGroup-noack.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	imhiredis-stream-consumerGroup-reclaim.sh
+
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_60 = \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhiredis-queue-vg.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhiredis-queue-lpop-vg.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhiredis-redis-restart-vg.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhiredis-redis-start-after-vg.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhiredis-subscribe-vg.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhiredis-stream-vg.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhiredis-stream-from-beginning-vg.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhiredis-stream-consumerGroup-ack-vg.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhiredis-stream-consumerGroup-noack-vg.sh \
+@ENABLE_IMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	imhiredis-stream-consumerGroup-reclaim-vg.sh
+
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_61 = \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	mmdb-reload.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-dynakey.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-publish.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-queue-rpush.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-queue.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-set.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-setex.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-template.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-withpass.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-wrongpass.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-stream-ack.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-stream-capped.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-stream-del.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-stream-dynack.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-stream-outfield.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@	omhiredis-stream.sh
+
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_62 = \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	mmdb-reload-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-dynakey-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-publish-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-queue-rpush-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-queue-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-set-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-setex-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-template-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-withpass-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-wrongpass-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-stream-ack-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-stream-capped-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-stream-del-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-stream-dynack-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-stream-outfield-vg.sh \
+@ENABLE_OMHIREDIS_TRUE@@ENABLE_REDIS_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	omhiredis-stream-vg.sh
+
+@ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_63 = \
 @ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@	impstats-hup.sh \
 @ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@	perctile-simple.sh \
 @ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@	dynstats.sh \
@@ -942,7 +1023,7 @@
 @ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@	omfwd_impstats-udp.sh \
 @ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@	omfwd_impstats-tcp.sh
 
-@ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_58 = \
+@ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@am__append_64 = \
 @ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	perctile-simple-vg.sh \
 @ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	dynstats-vg.sh \
 @ENABLE_IMPSTATS_TRUE@@ENABLE_TESTBENCH_TRUE@@HAVE_VALGRIND_TRUE@	dynstats_reset-vg.sh \
@@ -955,7 +1036,7 @@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/README -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/README Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/diag.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/diag.sh Changed

@@ -130,6 +130,20 @@
 
 }
 
+# function to skip a test if TSAN is enabled
+# This is necessary as TSAN does not properly handle thread creation
+# after fork() - which happens regularly in rsyslog if backgrounding
+# is activated.
+# $1 is the reason why TSAN is not supported
+# note: we depend on CFLAGS to properly reflect build options (what
+#       usually is the case when the testbench is run)
+skip_TSAN() {
+	if  "$CFLAGS" == *"sanitize=thread"* ; then
+		printf 'test incompatible with TSAN because of %s\n' "$1"
+		exit 77
+	fi
+}
+
 
 # a consistent format to output testbench timestamps
 tb_timestamp() {
@@ -486,7 +500,7 @@
 	echo "$(tb_timestamp) rsyslogd$1 startup msg seen, pid " $(cat $RSYSLOG_PIDBASE$1.pid)
 	wait_file_exists $RSYSLOG_DYNNAME.imdiag$1.port
 	eval export IMDIAG_PORT$1=$(cat $RSYSLOG_DYNNAME.imdiag$1.port)
-	eval PORT=$IMDIAG_PORT$1
+	eval PORT='$IMDIAG_PORT'$1
 	echo "imdiag$1 port: $PORT"
 	if  "$PORT" == "" ; then
 		echo "TESTBENCH ERROR: imdiag port not found!"
@@ -649,8 +663,8 @@
 # inject messages in INSTANCE 2 via our inject interface (imdiag)
 injectmsg2() {
 	msgs=${2:-$NUMMESSAGES}
-	echo injecting $2 messages into instance 2
-	echo injectmsg "$1:-0" "$msgs" $3 $4 | $TESTTOOL_DIR/diagtalker -p$IMDIAG_PORT2 || error_exit  $?
+	echo injecting $msgs messages into instance 2
+	echo injectmsg "${1:-0}" "$msgs" $3 $4 | $TESTTOOL_DIR/diagtalker -p$IMDIAG_PORT2 || error_exit  $?
 	# TODO: some return state checking? (does it really make sense here?)
 }
 
@@ -893,6 +907,39 @@
 	fi;
 }
 
+# checks that among the open files found in /proc/<PID>/fd/*
+# there is or is not, depending on the calling mode,
+# a link with the specified suffix in the target name
+check_fd_for_pid() {
+  local pid="$1" mode="$2" suffix="$3" target seen
+  seen="false"
+  for fd in $(echo /proc/$pid/fd/*); do
+    target="$(readlink -m "$fd")"
+    if  "$target" != *$RSYSLOG_DYNNAME* ; then
+      continue
+    fi
+    if ((i % 10 == 0)); then
+      echo "INFO: check target='$target'"
+    fi
+    if  "$target" == *$suffix ; then
+      seen="true"
+      if  "$mode" == "exists" ; then
+        echo "PASS: check fd for pid=$pid mode='$mode' suffix='$suffix'"
+        return 0
+      fi
+    fi
+  done
+  if  "$seen" == "false"  &&  "$mode" == "absent" ; then
+    echo "PASS: check fd for pid=$pid mode='$mode' suffix='$suffix'"
+    return 0
+  fi
+  echo "FAIL: check fd for pid=$pid mode='$mode' suffix='$suffix'"
+  if  "$mode" != "ignore" ; then
+    return 1
+  fi
+  return 0
+}
+
 # wait for main message queue to be empty. $1 is the instance.
 # we run in a loop to ensure rsyslog is *really* finished when a
 # function for the "finished predicate" is defined. This is done
@@ -986,6 +1033,19 @@
 }
 
 
+# wait for HUP to complete. $1 is the instance
+# note: there is a slight chance HUP was not completed. This can happen if it takes
+# the system very long (> 500ms) to receive the HUP and set the internal flag
+# variable. aka "very very low probability".
+await_HUP_processed() {
+	if  "$1" == "2" ; then
+		echo AwaitHUPComplete | $TESTTOOL_DIR/diagtalker -pIMDIAG_PORT2 || error_exit  $?
+	else
+		echo AwaitHUPComplete | $TESTTOOL_DIR/diagtalker -p$IMDIAG_PORT || error_exit  $?
+	fi
+}
+
+
 # wait for all pending lookup table reloads to complete $1 is the instance.
 await_lookup_table_reload() {
 	if  "$1" == "2" ; then
@@ -1020,6 +1080,16 @@
 		count_function="$2"
 		shift 2
 	fi
+	interrupt_connection=NO
+	if  "$1" == "--interrupt-connection" ; then
+		interrupt_connection="YES"
+		interrupt_host="$2"
+		interrupt_port="$3"
+		interrupt_tick="$4"
+		shift 4
+		lastcurrent_time=0
+	fi
+
 	timeout=${3:-$TB_TEST_TIMEOUT}
 	timeoutbegin=$(date +%s)
 	timeoutend=$(( timeoutbegin + timeout ))
@@ -1061,6 +1131,15 @@
 				error_exit 1
 			else
 				echo $(date +%H:%M:%S) wait_file_lines waiting, expected $waitlines, current $count lines
+
+				current_time=$(date +%s)
+				if  $interrupt_connection == "YES"  &&  $current_time -gt $lastcurrent_time  &&  $((current_time % $interrupt_tick)) -eq 0  &&  ${count} -gt 1 ; then
+					# Interrupt Connection - requires root and linux kernel >= 4.9 in order to work!
+					echo wait_file_lines Interrupt Connection on ${interrupt_host}:${interrupt_port}
+					sudo ss -K dst ${interrupt_host} dport = ${interrupt_port}
+				fi
+				lastcurrent_time=$current_time
+
 				$TESTTOOL_DIR/msleep $delay
 			fi
 		fi
@@ -1170,8 +1249,10 @@
 		sleeptime=1000
 	fi
 	kill -HUP $(cat $RSYSLOG_PIDBASE$1.pid)
-	printf 'HUP issued to pid %d\n' $(cat $RSYSLOG_PIDBASE$1.pid)
-	$TESTTOOL_DIR/msleep $sleeptime
+	printf 'HUP issued to pid %d - waiting for it to become processed\n' \
+		$(cat $RSYSLOG_PIDBASE$1.pid)
+	await_HUP_processed
+	#$TESTTOOL_DIR/msleep $sleeptime
 }
 
 
@@ -1316,6 +1397,11 @@
 	# Extended Exit handling for kafka / zookeeper instances 
 	kafka_exit_handling "false"
 
+	# Ensure redis instance is stopped
+	if  -n "$REDIS_DYN_DIR" ; then
+		stop_redis
+	fi
+
 	error_stats $1 # Report error to rsyslog testbench stats
 	do_cleanup
 
@@ -1535,6 +1621,9 @@
 	# Extended Exit handling for kafka / zookeeper instances 
 	kafka_exit_handling "true"
 
+	# Ensure redis is stopped
+	stop_redis
+
 	printf '%s Test %s SUCCESSFUL (took %s seconds)\n' "$(tb_timestamp)" "$0" "$(( $(date +%s) - TB_STARTTEST ))"
 	echo  -------------------------------------------------------------------------------
 	exit 0
@@ -1629,9 +1718,9 @@
 
 #START: ext kafka config
 #dep_cache_dir=$(readlink -f .dep_cache)
-export RS_ZK_DOWNLOAD=apache-zookeeper-3.6.3-bin.tar.gz
+export RS_ZK_DOWNLOAD=apache-zookeeper-3.9.1-bin.tar.gz
 dep_cache_dir=$(pwd)/.dep_cache
-dep_zk_url=https://downloads.apache.org/zookeeper/zookeeper-3.6.3/$RS_ZK_DOWNLOAD
+dep_zk_url=https://downloads.apache.org/zookeeper/zookeeper-3.9.1/$RS_ZK_DOWNLOAD
 dep_zk_cached_file=$dep_cache_dir/$RS_ZK_DOWNLOAD
 
 export RS_KAFKA_DOWNLOAD=kafka_2.13-2.8.0.tgz
@@ -2311,7 +2400,7 @@
     omhttp_server_logfile="${omhttp_work_dir}/omhttp_server.log"
     mkdir -p ${omhttp_work_dir}
 
-    server_args="-p $omhttp_server_port ${*:2}"
+    server_args="-p $omhttp_server_port ${*:2} --port-file $RSYSLOG_DYNNAME.omhttp_server_lstnport.file"
 
     timeout 30m $PYTHON ${omhttp_server_py} ${server_args} >> ${omhttp_server_logfile} 2>&1 &
     if  ! $? -eq 0 ; then
@@ -2319,10 +2408,12 @@
         rm -rf $omhttp_work_dir
         error_exit 1
     fi
-
     omhttp_server_pid=$!
+
+    wait_file_exists "$RSYSLOG_DYNNAME.omhttp_server_lstnport.file"
+    omhttp_server_lstnport="$(cat $RSYSLOG_DYNNAME.omhttp_server_lstnport.file)"
     echo ${omhttp_server_pid} > ${omhttp_server_pidfile}

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/es-execOnlyWhenPreviousSuspended.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/es-execOnlyWhenPreviousSuspended.sh Changed

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/func-substring-invld-startpos-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/func-substring-invld-startpos.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/func-substring-large-endpos.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/func-substring-large-neg-endpos.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/func-substring-relative-endpos.sh Added

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-basic-legacy.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-basic-legacy.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endmsg.regex-vg.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endmsg.regex-vg.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endmsg.regex-with-example-vg.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endmsg.regex-with-example-vg.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endmsg.regex-with-example.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endmsg.regex-with-example.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endmsg.regex.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endmsg.regex.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endregex-save-lf-persist.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endregex-save-lf-persist.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endregex-save-lf.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endregex-save-lf.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endregex-timeout-none-polling.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endregex-timeout-none-polling.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endregex-timeout-none.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endregex-timeout-none.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endregex-timeout-polling.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endregex-timeout-polling.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endregex-timeout-with-shutdown-polling.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endregex-timeout-with-shutdown-polling.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endregex-timeout.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endregex-timeout.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endregex-vg.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endregex-vg.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-endregex.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-endregex.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-logrotate-async.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-logrotate-async.sh Changed

@@ -6,6 +6,10 @@
 export NUMMESSAGES=10000
 export RETRIES=50
 
+# Uncomment fdor debuglogs
+#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction"
+#export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.debuglog"
+
 # Write logrotate config file
 echo '"./'$RSYSLOG_DYNNAME'.input*.log"
 {
@@ -41,27 +45,30 @@
 '
 startup
 
-./inputfilegen -m $NUMMESSAGES -S 5 -B 500 -f $RSYSLOG_DYNNAME.input.log &
+./inputfilegen -m $NUMMESSAGES -S 5 -B 100 -I 1000 -f $RSYSLOG_DYNNAME.input.log &
 INPUTFILEGEN_PID=$!
 echo "$INPUTFILEGEN_PID" > $RSYSLOG_DYNNAME.inputfilegen_pid
 
-
-
 ./msleep 1
 logrotate --state $RSYSLOG_DYNNAME.logrotate.state -f $RSYSLOG_DYNNAME.logrotate
 ./msleep 20
-echo INPUT FILES:
+echo ======================:
+echo ROTATE 1	INPUT FILES:
 ls -li $RSYSLOG_DYNNAME.input*
 logrotate --state $RSYSLOG_DYNNAME.logrotate.state -f $RSYSLOG_DYNNAME.logrotate
 ./msleep 20
-echo INPUT FILES:
+echo ======================:
+echo ROTATE 2	INPUT FILES:
 ls -li $RSYSLOG_DYNNAME.input*
 logrotate --state $RSYSLOG_DYNNAME.logrotate.state -f $RSYSLOG_DYNNAME.logrotate
-echo INPUT FILES:
+echo ======================:
+echo ROTATE 3	INPUT FILES:
 ls -li $RSYSLOG_DYNNAME.input*
+echo ======================:
 echo ls ${RSYSLOG_DYNNAME}.spool:
 ls -li ${RSYSLOG_DYNNAME}.spool
-echo INPUT FILES:
+echo ======================:
+echo FINAL	INPUT FILES:
 ls -li $RSYSLOG_DYNNAME.input*
 
 # generate more input after logrotate into new logfile
@@ -70,6 +77,25 @@
 
 #msgcount=$((2* TESTMESSAGES))
 #wait_file_lines $RSYSLOG_OUT_LOG $msgcount $RETRIES
+# Output extra information
+./msleep 1000
+echo ======================:
+echo LINES:	$(wc -l $RSYSLOG_DYNNAME.input.log)
+echo TAIL	$RSYSLOG_DYNNAME.input.log:
+tail $RSYSLOG_DYNNAME.input.log
+echo ""
+echo LINES:	$(wc -l $RSYSLOG_DYNNAME.input.log.1)
+echo TAIL	$RSYSLOG_DYNNAME.input.log.1:
+tail $RSYSLOG_DYNNAME.input.log.1
+echo ""
+echo LINES:	$(wc -l $RSYSLOG_DYNNAME.input.log.2)
+echo TAIL	$RSYSLOG_DYNNAME.input.log.2:
+tail $RSYSLOG_DYNNAME.input.log.2
+echo ""
+echo LINES:	$(wc -l $RSYSLOG_DYNNAME.inpt.log.3)
+echo TAIL	$RSYSLOG_DYNNAME.input.log.3:
+tail $RSYSLOG_DYNNAME.input.log.3
+echo ""
 wait_file_lines
 
 touch $RSYSLOG_DYNNAME.input.log

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-symlink-ext-tmp-dir-tree.sh Added

@@ -0,0 +1,80 @@
+#!/bin/bash
+# This test creates multiple symlinks (all watched by rsyslog via wildcard)
+# chained to target files via additional symlinks and checks that all files
+# are recorded with correct corresponding metadata (name of symlink
+# matching configuration).
+# This is part of the rsyslog testbench, released under ASL 2.0
+. "${srcdir:=.}"/diag.sh init
+. "$srcdir"/diag.sh check-inotify
+
+# #define FILE_DELETE_DELAY 5 /* how many seconds to wait before finally deleting a gone file */
+export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout"
+export RSYSLOG_DEBUGLOG="log"
+export TEST_TIMEOUT=30
+
+# generate input files first. Note that rsyslog processes it as
+# soon as it start up (so the file should exist at that point).
+generate_conf
+add_conf '
+# comment out if you need more debug info:
+global( debug.whitelist="on" debug.files="imfile.c"
+  workDirectory="./'"$RSYSLOG_DYNNAME"'.work"
+)
+module(load="../plugins/imfile/.libs/imfile" mode="inotify")
+input(type="imfile" File="./'"$RSYSLOG_DYNNAME"'.links/*.log" Tag="file:"
+	Severity="error" Facility="local7" addMetadata="on")
+template(name="outfmt" type="list") {
+	constant(value="HEADER ")
+	property(name="msg" format="json")
+	constant(value=", filename: ")
+	property(name="$!metadata!filename")
+	constant(value=", fileoffset: ")
+	property(name="$!metadata!fileoffset")
+	constant(value="\n")
+}
+if $msg contains "msgnum:" then
+	action( type="omfile" file="'"$RSYSLOG_DYNNAME.out/$RSYSLOG_OUT_LOG"'" template="outfmt")
+'
+
+mkdir "$RSYSLOG_DYNNAME".links "$RSYSLOG_DYNNAME".work "$RSYSLOG_DYNNAME".out
+
+printf '\ncreating %s\n' "$RSYSLOG_DYNNAME".targets/container-1/logs/0.log
+mkdir -p "$RSYSLOG_DYNNAME".targets/container-1/logs
+./inputfilegen -m 1 >"$RSYSLOG_DYNNAME".targets/container-1/logs/0.log
+ls -l "$RSYSLOG_DYNNAME".targets/container-1/logs/0.log
+ln -sv "$PWD/$RSYSLOG_DYNNAME".targets/container-1/logs/0.log "$PWD/$RSYSLOG_DYNNAME".links/container-1.log
+printf '%s generated link %s\n' "$(tb_timestamp)" "container-1"
+ls -l "$RSYSLOG_DYNNAME".links/container-1.log
+
+# Start rsyslog now
+startup
+
+PID=$(cat "$RSYSLOG_PIDBASE".pid)
+echo "Rsyslog pid $RSYSLOG_PIDBASE.pid=$PID"
+if  "$PID" == "" ; then
+	error_exit 1
+fi
+
+echo "INFO: check files"
+# wait until this files has been opened
+check_fd_for_pid "$PID" exists "container-1/logs/0.log"
+check_fd_for_pid "$PID" exists "container-1/logs"
+
+echo "INFO: remove watched files"
+rm -vr "$RSYSLOG_DYNNAME".targets/container-1
+rm -v "$RSYSLOG_DYNNAME".links/container-1.log
+
+until check_fd_for_pid "$PID" absent "container-1/logs (deleted)"; do
+	if ((_wait_for_absent++ > TEST_TIMEOUT)); then
+		error_exit 1
+	fi
+	echo "INFO: trigger fd unlinking"
+	./inputfilegen -m 1 >"$RSYSLOG_DYNNAME".links/gogogo.log
+	./msleep 1000
+	rm -v "$RSYSLOG_DYNNAME".links/gogogo.log
+	./msleep 10
+done
+
+shutdown_when_empty
+wait_shutdown
+exit_test

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-symlink-multi.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-symlink-multi.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-symlink.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-symlink.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-wildcards-dirs-multi.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-wildcards-dirs-multi.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-wildcards-dirs-multi2.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-wildcards-dirs-multi2.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-wildcards-dirs-multi3.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-wildcards-dirs-multi3.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-wildcards-dirs-multi4.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-wildcards-dirs-multi4.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-wildcards-dirs-multi5-polling.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-wildcards-dirs-multi5-polling.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-wildcards-dirs-multi5.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-wildcards-dirs-multi5.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-wildcards-dirs.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-wildcards-dirs.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-wildcards-dirs2.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-wildcards-dirs2.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imfile-wildcards.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imfile-wildcards.sh Changed

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-queue-lpop-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-queue-lpop.sh Added

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# added 2023-04-20 by Théo Bertin, released under ASL 2.0
+## Uncomment for debugging
+#export RS_REDIR=-d
+
+. ${srcdir:=.}/diag.sh init
+
+start_redis
+
+redis_command "RPUSH mykey message1"
+redis_command "RPUSH mykey message2"
+redis_command "RPUSH mykey message3"
+
+generate_conf
+add_conf '
+global(localhostname="server")
+module(load="../contrib/imhiredis/.libs/imhiredis")
+template(name="outfmt" type="string" string="%$/num% %msg%\n")
+
+
+input(type="imhiredis"
+        server="127.0.0.1"
+        port="'$REDIS_RANDOM_PORT'"
+        key="mykey"
+        mode="queue"
+        uselpop="on"
+        ruleset="redis")
+
+ruleset(name="redis") {
+  set $/num = cnum($/num + 1);
+  action(type="omfile"
+            file="'$RSYSLOG_OUT_LOG'"
+            template="outfmt")
+}
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
+'
+startup
+shutdown_when_empty
+wait_shutdown
+
+stop_redis
+
+# Same order
+content_check '1 message1'
+content_check '2 message2'
+content_check '3 message3'
+
+# Removes generated configuration file, log and pid files
+cleanup_redis
+
+exit_test

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-queue-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-queue.sh Added

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+# added 2023-04-20 by Théo Bertin, released under ASL 2.0
+## Uncomment for debugging
+#export RS_REDIR=-d
+
+. ${srcdir:=.}/diag.sh init
+
+start_redis
+
+redis_command "RPUSH mykey message1"
+redis_command "RPUSH mykey message2"
+redis_command "RPUSH mykey message3"
+
+generate_conf
+add_conf '
+global(localhostname="server")
+module(load="../contrib/imhiredis/.libs/imhiredis")
+template(name="outfmt" type="string" string="%$/num% %msg%\n")
+
+
+input(type="imhiredis"
+        server="127.0.0.1"
+        port="'$REDIS_RANDOM_PORT'"
+        key="mykey"
+        mode="queue"
+        ruleset="redis")
+
+ruleset(name="redis") {
+  set $/num = cnum($/num + 1);
+  action(type="omfile"
+            file="'$RSYSLOG_OUT_LOG'"
+            template="outfmt")
+}
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
+'
+startup
+shutdown_when_empty
+wait_shutdown
+
+stop_redis
+
+# Opposite order
+content_check '1 message3'
+content_check '2 message2'
+content_check '3 message1'
+
+# Removes generated configuration file, log and pid files
+cleanup_redis
+
+exit_test

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-redis-restart-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-redis-restart.sh Added

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+# added 2023-04-20 by Théo Bertin, released under ASL 2.0
+## Uncomment for debugging
+#export RS_REDIR=-d
+
+. ${srcdir:=.}/diag.sh init
+
+# Start redis once to be able to generate configuration
+start_redis
+
+redis_command "RPUSH mykey message1"
+redis_command "RPUSH mykey message2"
+redis_command "RPUSH mykey message3"
+
+generate_conf
+add_conf '
+global(localhostname="server")
+module(load="../contrib/imhiredis/.libs/imhiredis")
+template(name="outfmt" type="string" string="%$/num% %msg%\n")
+
+
+input(type="imhiredis"
+        server="127.0.0.1"
+        port="'$REDIS_RANDOM_PORT'"
+        key="mykey"
+        mode="queue"
+        ruleset="redis")
+
+ruleset(name="redis") {
+  set $/num = cnum($/num + 1);
+  action(type="omfile"
+            file="'$RSYSLOG_OUT_LOG'"
+            template="outfmt")
+}
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
+'
+startup
+
+wait_content '3 message1'
+
+# Stop Redis and wait a short moment for imhiredis to notice Redis went down
+stop_redis
+rst_msleep 1500
+start_redis
+
+redis_command "RPUSH mykey message4"
+redis_command "RPUSH mykey message5"
+redis_command "RPUSH mykey message6"
+
+wait_content '4 message6'
+
+shutdown_when_empty
+wait_shutdown
+
+stop_redis
+
+content_check '1 message3'
+content_check '2 message2'
+content_check '3 message1'
+content_check 'sleeping 10 seconds before retrying'
+content_check '4 message6'
+content_check '5 message5'
+content_check '6 message4'
+
+# Removes generated configuration file, log and pid files
+cleanup_redis
+
+exit_test

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-redis-start-after-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-redis-start-after.sh Added

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+# added 2023-04-20 by Théo Bertin, released under ASL 2.0
+## Uncomment for debugging
+#export RS_REDIR=-d
+. ${srcdir:=.}/diag.sh init
+
+# Start redis once to be able to generate configuration
+start_redis
+stop_redis
+
+generate_conf
+add_conf '
+global(localhostname="server")
+module(load="../contrib/imhiredis/.libs/imhiredis")
+template(name="outfmt" type="string" string="%$/num% %msg%\n")
+
+
+input(type="imhiredis"
+        server="127.0.0.1"
+        port="'$REDIS_RANDOM_PORT'"
+        key="mykey"
+        mode="queue"
+        ruleset="redis")
+
+ruleset(name="redis") {
+  set $/num = cnum($/num + 1);
+  action(type="omfile"
+            file="'$RSYSLOG_OUT_LOG'"
+            template="outfmt")
+}
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
+'
+startup
+
+start_redis
+redis_command "RPUSH mykey message1"
+redis_command "RPUSH mykey message2"
+redis_command "RPUSH mykey message3"
+
+wait_content '1 message3'
+
+shutdown_when_empty
+wait_shutdown
+
+stop_redis
+
+content_check '1 message3'
+content_check '2 message2'
+content_check '3 message1'
+
+# Removes generated configuration file, log and pid files
+cleanup_redis
+
+exit_test

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-stream-consumerGroup-ack-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-stream-consumerGroup-ack.sh Added

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+# added 2023-04-20 by Théo Bertin, released under ASL 2.0
+## Uncomment for debugging
+#export RS_REDIR=-d
+
+. ${srcdir:=.}/diag.sh init
+
+start_redis
+
+generate_conf
+add_conf '
+global(localhostname="server")
+module(load="../contrib/imhiredis/.libs/imhiredis")
+template(name="outfmt" type="string" string="%$/num% %$!msg%\n")
+
+
+input(type="imhiredis"
+        server="127.0.0.1"
+        port="'$REDIS_RANDOM_PORT'"
+        key="mystream"
+        mode="stream"
+        stream.consumerGroup="mygroup"
+        stream.consumerName="myName"
+        ruleset="redis")
+
+ruleset(name="redis") {
+  set $/num = cnum($/num + 1);
+  action(type="omfile"
+            file="'$RSYSLOG_OUT_LOG'"
+            template="outfmt")
+}
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
+'
+startup
+
+redis_command "XADD mystream * msg message1"
+redis_command "XADD mystream * msg message2"
+redis_command "XADD mystream * msg message3"
+
+shutdown_when_empty
+wait_shutdown
+
+output="$(redis_command 'hello 3\nXINFO groups mystream' | grep 'pending')"
+
+if  -z "$output" ; then
+    echo "Could not get group result from redis, cannot tell if entries ware acknowledged!"
+    error_exit 1
+fi
+
+if ! echo "$output" | grep -q "pending 0"; then
+    echo "ERROR: entries werent acknowledged!"
+    echo "ERROR: output from Redis is '$output'"
+    echo "ERROR: expected 'pending 0'"
+    error_exit 1
+fi
+
+stop_redis
+
+content_check '1 message1'
+content_check '2 message2'
+content_check '3 message3'
+
+# Removes generated configuration file, log and pid files
+cleanup_redis
+
+exit_test

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-stream-consumerGroup-noack-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-stream-consumerGroup-noack.sh Added

@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+# added 2023-04-20 by Théo Bertin, released under ASL 2.0
+## Uncomment for debugging
+#export RS_REDIR=-d
+
+. ${srcdir:=.}/diag.sh init
+
+start_redis
+
+generate_conf
+add_conf '
+global(localhostname="server")
+module(load="../contrib/imhiredis/.libs/imhiredis")
+template(name="outfmt" type="string" string="%$/num% %$!msg%\n")
+
+
+input(type="imhiredis"
+        server="127.0.0.1"
+        port="'$REDIS_RANDOM_PORT'"
+        key="mystream"
+        mode="stream"
+        stream.consumerGroup="mygroup"
+        stream.consumerName="myName"
+        stream.consumerACK="off"
+        ruleset="redis")
+
+ruleset(name="redis") {
+  set $/num = cnum($/num + 1);
+  action(type="omfile"
+            file="'$RSYSLOG_OUT_LOG'"
+            template="outfmt")
+}
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
+'
+startup
+
+redis_command "XADD mystream * msg message1"
+redis_command "XADD mystream * msg message2"
+redis_command "XADD mystream * msg message3"
+
+shutdown_when_empty
+wait_shutdown
+
+output="$(redis_command 'hello 3\nXINFO groups mystream' | grep 'pending')"
+
+if  -z "$output" ; then
+    echo "Could not get group result from redis, cannot tell if entries ware acknowledged!"
+    error_exit 1
+fi
+
+if ! echo "$output" | grep -q "pending 3"; then
+    echo "ERROR: entries were acknowledged, they shouldn't have!"
+    echo "ERROR: output from Redis is '$output'"
+    echo "ERROR: expected 'pending 3'"
+    error_exit 1
+fi
+
+stop_redis
+
+content_check '1 message1'
+content_check '2 message2'
+content_check '3 message3'
+
+# Removes generated configuration file, log and pid files
+cleanup_redis
+
+exit_test

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-stream-consumerGroup-reclaim-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-stream-consumerGroup-reclaim.sh Added

@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+# added 2023-04-20 by Théo Bertin, released under ASL 2.0
+## Uncomment for debugging
+#export RS_REDIR=-d
+
+. ${srcdir:=.}/diag.sh init
+
+start_redis
+
+generate_conf
+add_conf '
+global(localhostname="server")
+module(load="../contrib/imhiredis/.libs/imhiredis")
+template(name="outfmt" type="string" string="%$/num% %$!msg%\n")
+
+
+input(type="imhiredis"
+        server="127.0.0.1"
+        port="'$REDIS_RANDOM_PORT'"
+        key="mystream"
+        mode="stream"
+        stream.consumerGroup="mygroup"
+        stream.consumerName="myName"
+        stream.autoclaimIdleTime="5000" #5 seconds
+        ruleset="redis")
+
+ruleset(name="redis") {
+  set $/num = cnum($/num + 1);
+  action(type="omfile"
+            file="'$RSYSLOG_OUT_LOG'"
+            template="outfmt")
+}
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
+'
+
+redis_command "XADD mystream * msg message1"
+redis_command "XADD mystream * msg message2"
+redis_command "XADD mystream * msg message3"
+redis_command "XADD mystream * msg message4"
+redis_command "XADD mystream * msg message5"
+redis_command "XADD mystream * msg message6"
+
+redis_command "XGROUP CREATE mystream mygroup 0-0"
+# Read and claim message1 and message2
+redis_command "XREADGROUP GROUP mygroup otherConsumer COUNT 2 STREAMS mystream >"
+rst_msleep 5500
+# Read and claim message3 and message4
+redis_command "XREADGROUP GROUP mygroup otherConsumer COUNT 2 STREAMS mystream >"
+
+startup
+
+shutdown_when_empty
+wait_shutdown
+
+output="$(redis_command 'hello 3\nXINFO groups mystream' | grep 'pending')"
+
+if  -z "$output" ; then
+    echo "Could not get group result from redis, cannot tell if entries ware acknowledged!"
+    error_exit 1
+fi
+
+# Should still have 2 pending messages: message3 and message4
+if ! echo "$output" | grep -q "pending 2"; then
+    echo "ERROR: entries weren't acknowledged!"
+    echo "ERROR: output from Redis is '$output'"
+    echo "ERROR: expected 'pending 2'"
+    error_exit 1
+fi
+
+stop_redis
+
+# Should reclaim message1 and message2
+# then claim and acknowledge message5 and message6 normally
+content_check '1 message1'
+content_check '2 message2'
+content_check '3 message5'
+content_check '4 message6'
+
+# Removes generated configuration file, log and pid files
+cleanup_redis
+
+exit_test

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-stream-from-beginning-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-stream-from-beginning.sh Added

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# added 2023-04-20 by Théo Bertin, released under ASL 2.0
+## Uncomment for debugging
+#export RS_REDIR=-d
+
+. ${srcdir:=.}/diag.sh init
+
+start_redis
+
+# WILL be logged by Rsyslog
+redis_command "XADD mystream * msg message1"
+redis_command "XADD mystream * msg message2"
+redis_command "XADD mystream * msg message3"
+
+generate_conf
+add_conf '
+global(localhostname="server")
+module(load="../contrib/imhiredis/.libs/imhiredis")
+template(name="outfmt" type="string" string="%$/num% %$!msg%\n")
+
+
+input(type="imhiredis"
+        server="127.0.0.1"
+        port="'$REDIS_RANDOM_PORT'"
+        key="mystream"
+        mode="stream"
+        stream.readFrom="0-0"
+        ruleset="redis")
+
+ruleset(name="redis") {
+  set $/num = cnum($/num + 1);
+  action(type="omfile"
+            file="'$RSYSLOG_OUT_LOG'"
+            template="outfmt")
+}
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
+'
+startup
+
+redis_command "XADD mystream * msg message4"
+redis_command "XADD mystream * msg message5"
+redis_command "XADD mystream * msg message6"
+
+shutdown_when_empty
+wait_shutdown
+
+stop_redis
+
+content_check '1 message1'
+content_check '2 message2'
+content_check '3 message3'
+content_check '4 message4'
+content_check '5 message5'
+content_check '6 message6'
+
+# Removes generated configuration file, log and pid files
+cleanup_redis
+
+exit_test

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-stream-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-stream.sh Added

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# added 2023-04-20 by Théo Bertin, released under ASL 2.0
+## Uncomment for debugging
+#export RS_REDIR=-d
+
+. ${srcdir:=.}/diag.sh init
+
+start_redis
+
+# Won't be logged by Rsyslog
+redis_command "XADD mystream * msg message1"
+redis_command "XADD mystream * msg message2"
+redis_command "XADD mystream * msg message3"
+
+generate_conf
+add_conf '
+global(localhostname="server")
+module(load="../contrib/imhiredis/.libs/imhiredis")
+template(name="outfmt" type="string" string="%$/num% %$!msg%\n")
+
+
+input(type="imhiredis"
+        server="127.0.0.1"
+        port="'$REDIS_RANDOM_PORT'"
+        key="mystream"
+        mode="stream"
+        ruleset="redis")
+
+ruleset(name="redis") {
+  set $/num = cnum($/num + 1);
+  action(type="omfile"
+            file="'$RSYSLOG_OUT_LOG'"
+            template="outfmt")
+}
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
+'
+startup
+
+redis_command "XADD mystream * msg message4"
+redis_command "XADD mystream * msg message5"
+redis_command "XADD mystream * msg message6"
+
+shutdown_when_empty
+wait_shutdown
+
+stop_redis
+
+check_not_present "message1"
+check_not_present "message2"
+check_not_present "message3"
+
+content_check '1 message4'
+content_check '2 message5'
+content_check '3 message6'
+
+# Removes generated configuration file, log and pid files
+cleanup_redis
+
+exit_test

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-subscribe-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imhiredis-subscribe.sh Added

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# added 2023-04-20 by Théo Bertin, released under ASL 2.0
+## Uncomment for debugging
+#export RS_REDIR=-d
+
+. ${srcdir:=.}/diag.sh init
+
+start_redis
+
+# Won't be logged by Rsyslog
+redis_command "PUBLISH mychannel message1"
+redis_command "PUBLISH mychannel message2"
+redis_command "PUBLISH mychannel message3"
+
+generate_conf
+add_conf '
+global(localhostname="server")
+module(load="../contrib/imhiredis/.libs/imhiredis")
+template(name="outfmt" type="string" string="%$/num% %msg%\n")
+
+
+input(type="imhiredis"
+        server="127.0.0.1"
+        port="'$REDIS_RANDOM_PORT'"
+        key="mychannel"
+        mode="subscribe"
+        ruleset="redis")
+
+ruleset(name="redis") {
+  set $/num = cnum($/num + 1);
+  action(type="omfile"
+            file="'$RSYSLOG_OUT_LOG'"
+            template="outfmt")
+}
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'" template="outfmt")
+'
+startup
+
+redis_command "PUBLISH mychannel message4"
+redis_command "PUBLISH mychannel message5"
+redis_command "PUBLISH mychannel message6"
+
+shutdown_when_empty
+wait_shutdown
+
+stop_redis
+
+check_not_present "message1"
+check_not_present "message2"
+check_not_present "message3"
+
+content_check '1 message4'
+content_check '2 message5'
+content_check '3 message6'
+
+# Removes generated configuration file, log and pid files
+cleanup_redis
+
+exit_test

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imjournal-basic.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imjournal-basic.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imptcp-oversize-message-display.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imptcp-oversize-message-display.sh Changed

@@ -17,20 +17,27 @@
 shutdown_when_empty
 wait_shutdown
 
-grep "imptcp: message received.*150 byte larger.*will be split.*\"ghijkl"  $RSYSLOG_OUT_LOG > /dev/null
-if  $? -ne 0 ; then
+if ! grep "imptcp: message received.*150 byte larger.*will be split.*\"ghijkl"  $RSYSLOG_OUT_LOG > /dev/null
+then
         echo
         echo "FAIL: expected error message from imptcp truncation not found.  $RSYSLOG_OUT_LOG is:"
         cat $RSYSLOG_OUT_LOG
         error_exit 1
 fi
 
-grep "imptcp: message received.*22 byte larger.*will be split.*\"sstets"  $RSYSLOG_OUT_LOG > /dev/null
-if  $? -ne 0 ; then
+if ! grep "imptcp: message received.*22 byte larger.*will be split.*\"sstets"  $RSYSLOG_OUT_LOG > /dev/null
+then
         echo
         echo "FAIL: expected error message from imptcp truncation not found.  $RSYSLOG_OUT_LOG is:"
         cat $RSYSLOG_OUT_LOG
         error_exit 1
 fi
+if grep "imptcp: message received.*21 byte larger"  $RSYSLOG_OUT_LOG > /dev/null
+then
+        echo
+        echo "FAIL: UNEXPECTED error message from imptcp truncation found.  $RSYSLOG_OUT_LOG is:"
+        cat $RSYSLOG_OUT_LOG
+        error_exit 1
+fi
 
 exit_test

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imptcp_maxsessions.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imptcp_maxsessions.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/imtcp-tls-gtls-x509name-legacy.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/imtcp-tls-gtls-x509name-legacy.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/inputfilegen.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/inputfilegen.c Changed

@@ -52,7 +52,7 @@
 static void
 hdlr_sighup(int sig)
 {
-	fprintf(stderr, "had hup, sig %d\n", sig);
+	fprintf(stderr, "inputfilegen: had hup, sig %d\n", sig);
 	bHadHUP = 1;
 }
 static void
@@ -95,6 +95,7 @@
 	int c, i;
 	long long nmsgs = DEFMSGS;
 	long long nmsgstart = 0;
+	int nfinishedidle = 0;
 	int nchars = NOEXTRADATA;
 	int errflg = 0;
 	long long filesize = -1;
@@ -102,11 +103,12 @@
 	const char *msgcntfile = NULL;
 	const char *outputfile = "-";
 	FILE *fh_output;
-	int sleep_ms = 0;
-	int sleep_msgs = 0; /* messages to xmit between sleeps (if configured) */
+	int sleep_ms = 0;		/* How long to sleep between message writes */
+	int sleep_msgs = 0;		/* messages to xmit between sleeps (if configured) */
+	int sleep_hubreopen_ms = 5;	/* Wait until new file is being reopened, logrotate may need some time */
 	int ctr = 0;
 
-	while((c=getopt(argc, argv, "m:M:i:d:s:f:S:B:")) != -1) {
+	while((c=getopt(argc, argv, "m:M:i:I:h:d:s:f:S:B:")) != -1) {
 		switch(c) {
 		case 'm':
 			nmsgs = atoi(optarg);
@@ -117,6 +119,9 @@
 		case 'i':
 			nmsgstart = atoi(optarg);
 			break;
+		case 'I':
+			nfinishedidle = atoi(optarg);
+			break;
 		case 'd':
 			nchars = atoi(optarg);
 			break;
@@ -129,6 +134,9 @@
 		case 'B':
 			sleep_msgs = atoi(optarg);
 			break;
+		case 'h':
+			sleep_hubreopen_ms = atoi(optarg);
+			break;
 		case 'f':
 			outputfile = optarg;
 			sighup_enable();
@@ -138,7 +146,7 @@
 			errflg++;
 			break;
 		case '?':
-			fprintf(stderr, "Unrecognized option: -%c\n", optopt);
+			fprintf(stderr, "inputfilegen: Unrecognized option: -%c\n", optopt);
 			errflg++;
 			break;
 		}
@@ -151,11 +159,11 @@
 	if(filesize != -1) {
 		const int linesize = (17 + nchars); /* 17 is std line size! */
 		nmsgs = filesize / linesize;
-		fprintf(stderr, "file size requested %lld, actual %lld with "
+		fprintf(stderr, "inputfilegen: file size requested %lld, actual %lld with "
 			"%lld lines, %lld bytes less\n",
 			filesize, nmsgs * linesize, nmsgs, filesize - nmsgs * linesize);
 		if(nmsgs > 100000000) {
-			fprintf(stderr, "number of lines exhaust 8-digit line numbers "
+			fprintf(stderr, "inputfilegen: number of lines exhaust 8-digit line numbers "
 				"which are standard inside the testbench.\n"
 				"Use -d switch to add extra data (e.g. -d111 for "
 				"128 byte lines or -d47 for 64 byte lines)\n");
@@ -185,14 +193,20 @@
 		extradatanchars = '\0';
 	}
 	for(i = nmsgstart; i < (nmsgs+nmsgstart); ++i) {
-		if(sleep_ms > 0 && ctr++ >= sleep_msgs) {
+		if(	sleep_ms > 0 &&
+			ctr++ >= sleep_msgs) {
 			msleep(sleep_ms);
 			ctr = 0;
 		}
 		if(bHadHUP) {
 			fclose(fh_output);
+			if(sleep_hubreopen_ms > 0) {
+				/* Extra Sleep so logrotate or whatever can take place */
+				msleep(sleep_hubreopen_ms);
+			}
 			fh_output = open_output(outputfile);
-			fprintf(stderr, "%s reopened\n", outputfile);
+			fprintf(stderr, "inputfilegen: %s reopened\n", outputfile);
+			fprintf(stderr, "inputfilegen: current message number %d\n", i);
 			bHadHUP = 0;
 		}
 		fprintf(fh_output, "msgnum:%8.8d:", i);
@@ -201,6 +215,20 @@
 		}
 		fprintf(fh_output, "\n");
 	}
+	if (nfinishedidle > 0) {
+		/* Keep process open for nfinishedidle ms */
+		for(int x = 0; x < nfinishedidle; ++x) {
+			if(bHadHUP) {
+				/* Create empty file */
+				fh_output = open_output(outputfile);
+				fclose(fh_output);
+				fprintf(stderr, "inputfilegen: last message number was %d\n", i);
+				bHadHUP = 0;
+			}
+			msleep(1);
+		}
+	}
+
 	free(extradata);
 	return 0;
 }

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/json-onempty-at-end.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/lookup_table-hup-backgrounded.sh Added

@@ -0,0 +1,51 @@
+#!/bin/bash
+# test for lookup-table and HUP based reloading of it
+# added 2015-09-30 by singh.janmejay
+# This file is part of the rsyslog project, released under ASL 2.0
+. ${srcdir:=.}/diag.sh init
+skip_TSAN
+generate_conf
+add_conf '
+lookup_table(name="xlate" file="'$RSYSLOG_DYNNAME'.xlate.lkp_tbl" reloadOnHUP="on")
+
+template(name="outfmt" type="string" string="- %msg% %$.lkp%\n")
+
+set $.lkp = lookup("xlate", $msg);
+
+action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="outfmt")
+'
+cp -f $srcdir/testsuites/xlate.lkp_tbl $RSYSLOG_DYNNAME.xlate.lkp_tbl
+export RSTB_DAEMONIZE="YES"
+startup
+injectmsg  0 3
+wait_queueempty
+content_check "msgnum:00000000: foo_old"
+content_check "msgnum:00000001: bar_old"
+assert_content_missing "baz"
+cp -f $srcdir/testsuites/xlate_more.lkp_tbl $RSYSLOG_DYNNAME.xlate.lkp_tbl
+issue_HUP
+await_lookup_table_reload
+injectmsg  0 3
+wait_queueempty
+content_check "msgnum:00000000: foo_new"
+content_check "msgnum:00000001: bar_new"
+content_check "msgnum:00000002: baz"
+cp -f $srcdir/testsuites/xlate_more_with_duplicates_and_nomatch.lkp_tbl $RSYSLOG_DYNNAME.xlate.lkp_tbl
+issue_HUP
+await_lookup_table_reload
+injectmsg  0 10
+echo doing shutdown
+shutdown_when_empty
+echo wait on shutdown
+wait_shutdown
+content_check "msgnum:00000000: foo_latest"
+content_check "msgnum:00000001: quux"
+content_check "msgnum:00000002: baz_latest"
+content_check "msgnum:00000003: foo_latest"
+content_check "msgnum:00000004: foo_latest"
+content_check "msgnum:00000005: baz_latest"
+content_check "msgnum:00000006: foo_latest"
+content_check "msgnum:00000007: baz_latest"
+content_check "msgnum:00000008: baz_latest"
+content_check "msgnum:00000009: quux"
+exit_test

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/mmexternal-SegFault-empty-jroot-vg.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/mmexternal-SegFault-empty-jroot-vg.sh Changed

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omazureeventhubs-basic-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omazureeventhubs-basic.sh Added

@@ -0,0 +1,123 @@
+#!/bin/bash
+# This file is part of the rsyslog project, released under ASL 2.0
+. ${srcdir:=.}/diag.sh init
+
+export NUMMESSAGES=100
+export NUMMESSAGESFULL=$NUMMESSAGES
+export WAITTIMEOUT=20
+
+# REQUIRES EXTERNAL ENVIRONMENT VARIABLES
+if  -z "${AZURE_HOST}" ; then
+	echo "SKIP: AZURE_HOST environment variable not SET! Example: <yourname>.servicebus.windows.net - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_PORT}" ; then
+	echo "SKIP: AZURE_PORT environment variable not SET! Example: 5671 - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_KEY_NAME}" ; then
+	echo "SKIP: AZURE_KEY_NAME environment variable not SET! Example: <yourkeyname> - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_KEY}" ; then
+	echo "SKIP: AZURE_KEY environment variable not SET! Example: <yourlongkey> - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_CONTAINER}" ; then
+	echo "SKIP: AZURE_CONTAINER environment variable not SET! Example: <youreventhubsname> - SKIPPING"
+	exit 77
+fi
+
+export AMQPS_ADRESS="amqps://$AZURE_KEY_NAME:$AZURE_KEY@$AZURE_HOST:$AZURE_PORT/$AZURE_NAME"
+export AZURE_ENDPOINT="Endpoint=sb://$AZURE_HOST/;SharedAccessKeyName=$AZURE_KEY_NAME;SharedAccessKey=$AZURE_KEY;EntityPath=$AZURE_NAME"
+
+# --- Create/Start omazureeventhubs sender config 
+
+generate_conf
+add_conf '
+global(
+	debug.whitelist="on"
+	debug.files="omazureeventhubs.c", "modules.c", "errmsg.c", "action.c"
+)
+
+# impstats in order to gain insight into error cases
+module(load="../plugins/impstats/.libs/impstats"
+	log.file="'$RSYSLOG_DYNNAME.pstats'"
+	interval="1" log.syslog="off")
+$imdiagInjectDelayMode full
+
+# Load mods
+module(load="../plugins/omazureeventhubs/.libs/omazureeventhubs")
+
+# templates
+template(name="outfmt" type="string" string="%msg:F,58:2%\n")
+
+local4.* {
+	action(	name="omazureeventhubs"
+	type="omazureeventhubs"
+	azurehost="'$AZURE_HOST'"
+	azureport="'$AZURE_PORT'"
+	azure_key_name="'$AZURE_KEY_NAME'"
+	azure_key="'$AZURE_KEY'"
+	container="'$AZURE_CONTAINER'"
+#	amqp_address="amqps://'$AZURE_KEY_NAME':'$AZURE_KEY'@'$AZURE_HOST'/'$AZURE_NAME'"
+	template="outfmt"
+	action.resumeInterval="1"
+	action.resumeRetryCount="2"
+	)
+
+	action( type="omfile" file="'$RSYSLOG_OUT_LOG'")
+	stop
+}
+
+action( type="omfile" file="'$RSYSLOG_DYNNAME.othermsg'")
+'
+echo Starting sender instance omazureeventhubs
+startup
+
+echo Inject messages into rsyslog sender instance  
+injectmsg 1 $NUMMESSAGES
+
+wait_file_lines $RSYSLOG_OUT_LOG $NUMMESSAGESFULL 100
+
+# experimental: wait until kafkacat receives everything
+timeoutend=$WAITTIMEOUT
+timecounter=0
+
+echo "CHECK $RSYSLOG_DYNNAME.pstats"
+while  $timecounter -lt $timeoutend ; do
+	(( timecounter++ ))
+
+	if  -f "$RSYSLOG_DYNNAME.pstats"  ; then
+		# Read IMPSTATS for verification
+		IMPSTATSLINE=$(cat $RSYSLOG_DYNNAME.pstats | grep "origin\=omazureeventhubs" | tail -1 | cut -d: -f5)
+		SUBMITTED_MSG=$(echo $IMPSTATSLINE | grep "submitted" | cut -d" " -f2 | cut -d"=" -f2)
+		FAILED_MSG=$(echo $IMPSTATSLINE | grep "failures" | cut -d" " -f3 | cut -d"=" -f2)
+		ACCEPTED_MSG=$(echo $IMPSTATSLINE | grep "accepted" | cut -d" " -f4 | cut -d"=" -f2)
+
+		if !  $SUBMITTED_MSG =~ $re  ; then
+			echo "**** omazureeventhubs WAITING FOR IMPSTATS"
+		else
+			if  "$SUBMITTED_MSG" -ge "$NUMMESSAGESFULL" ; then
+				if  "$ACCEPTED_MSG" -eq "$NUMMESSAGESFULL" ; then
+					echo "**** omazureeventhubs SUCCESS: NUMMESSAGESFULL: $NUMMESSAGESFULL, SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+					shutdown_when_empty
+					wait_shutdown
+					#cp $RSYSLOG_DEBUGLOG DEBUGDEBUG.log
+					exit_test
+				else
+					echo "**** omazureeventhubs FAIL: NUMMESSAGESFULL: $NUMMESSAGESFULL, SUBMITTED/WAITING: SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+				fi
+			else
+				echo "**** omazureeventhubs WAITING: SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+			fi
+		fi
+	fi
+
+	$TESTTOOL_DIR/msleep 1000
+done
+unset count
+
+shutdown_when_empty
+wait_shutdown
+error_exit 1

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omazureeventhubs-interrupt-vg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omazureeventhubs-interrupt.sh Added

@@ -0,0 +1,165 @@
+#!/bin/bash
+# This file is part of the rsyslog project, released under ASL 2.0
+echo This test must be run as root raw socket access required
+if  "$EUID" -ne 0 ; then
+    exit 77 # Not root, skip this test
+fi
+. ${srcdir:=.}/diag.sh init
+
+# ---	If test is needed, create helper script to store environment variables for 
+#	éventhubs access:
+#	export AZURE_HOST=""
+#	export AZURE_PORT=""
+#	export AZURE_KEY_NAME=""
+#	export AZURE_KEY=""
+#	export AZURE_CONTAINER=""
+# ---
+source omazureeventhubs-env.sh
+
+export NUMMESSAGES=10000
+export NUMMESSAGESFULL=$NUMMESSAGES
+export WAITTIMEOUT=60
+
+export QUEUESIZE=100000
+export DEQUEUESIZE=64
+export DEQUEUESIZEMIN=32
+export TESTWORKERTHREADS=3
+
+export interrupt_host="$AZURE_HOST"
+export interrupt_port="$AZURE_PORT"
+export interrupt_tick="10"
+
+
+# REQUIRES EXTERNAL ENVIRONMENT VARIABLES
+if  -z "${AZURE_HOST}" ; then
+	echo "SKIP: AZURE_HOST environment variable not SET! Example: <yourname>.servicebus.windows.net - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_PORT}" ; then
+	echo "SKIP: AZURE_PORT environment variable not SET! Example: 5671 - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_KEY_NAME}" ; then
+	echo "SKIP: AZURE_KEY_NAME environment variable not SET! Example: <yourkeyname> - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_KEY}" ; then
+	echo "SKIP: AZURE_KEY environment variable not SET! Example: <yourlongkey> - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_CONTAINER}" ; then
+	echo "SKIP: AZURE_CONTAINER environment variable not SET! Example: <youreventhubsname> - SKIPPING"
+	exit 77
+fi
+
+export AMQPS_ADRESS="amqps://$AZURE_KEY_NAME:$AZURE_KEY@$AZURE_HOST:$AZURE_PORT/$AZURE_NAME"
+export AZURE_ENDPOINT="Endpoint=sb://$AZURE_HOST/;SharedAccessKeyName=$AZURE_KEY_NAME;SharedAccessKey=$AZURE_KEY;EntityPath=$AZURE_NAME"
+
+# --- Create/Start omazureeventhubs sender config 
+
+generate_conf
+add_conf '
+global(
+#	debug.whitelist="on"
+#	debug.files="omazureeventhubs.c", "modules.c", "errmsg.c", "action.c", "queue.c", "ruleset.c"
+)
+
+# impstats in order to gain insight into error cases
+module(load="../plugins/impstats/.libs/impstats"
+	log.file="'$RSYSLOG_DYNNAME.pstats'"
+	interval="1" log.syslog="off")
+$imdiagInjectDelayMode full
+
+# Load mods
+module(load="../plugins/omazureeventhubs/.libs/omazureeventhubs")
+
+# templates
+template(name="outfmt" type="string" string="%msg:F,58:2%\n")
+
+local4.* {
+	action(	name="omazureeventhubs"
+	type="omazureeventhubs"
+	azurehost="'$AZURE_HOST'"
+	azureport="'$AZURE_PORT'"
+	azure_key_name="'$AZURE_KEY_NAME'"
+	azure_key="'$AZURE_KEY'"
+	container="'$AZURE_CONTAINER'"
+#	amqp_address="amqps://'$AZURE_KEY_NAME':'$AZURE_KEY'@'$AZURE_HOST'/'$AZURE_NAME'"
+	template="outfmt"
+	queue.type="FixedArray"
+	queue.size="'$QUEUESIZE'"
+	queue.saveonshutdown="on"
+	queue.dequeueBatchSize="'$DEQUEUESIZE'"
+	queue.minDequeueBatchSize="'$DEQUEUESIZEMIN'"
+	queue.minDequeueBatchSize.timeout="1000" # 1 sec
+	queue.workerThreads="'$TESTWORKERTHREADS'"
+	queue.workerThreadMinimumMessages="'$DEQUEUESIZEMIN'"
+	queue.timeoutWorkerthreadShutdown="60000"
+	queue.timeoutEnqueue="2000"
+	queue.timeoutshutdown="1000"
+	action.resumeInterval="1"
+	action.resumeRetryCount="2"
+	)
+
+	action( type="omfile" file="'$RSYSLOG_OUT_LOG'")
+	stop
+}
+
+action( type="omfile" file="'$RSYSLOG_DYNNAME.othermsg'")
+'
+echo Starting sender instance omazureeventhubs
+startup
+
+echo Inject messages into rsyslog sender instance  
+injectmsg 1 $NUMMESSAGES
+
+wait_file_lines --interrupt-connection $interrupt_host $interrupt_port $interrupt_tick $RSYSLOG_OUT_LOG $NUMMESSAGESFULL 100
+
+timeoutend=$WAITTIMEOUT
+timecounter=0
+lastcurrent_time=0
+
+echo "CHECK $RSYSLOG_DYNNAME.pstats"
+while  $timecounter -lt $timeoutend ; do
+	(( timecounter++ ))
+
+	if  -f "$RSYSLOG_DYNNAME.pstats"  ; then
+		# Read IMPSTATS for verification
+		IMPSTATSLINE=$(cat $RSYSLOG_DYNNAME.pstats | grep "origin\=omazureeventhubs" | tail -1 | cut -d: -f5)
+		SUBMITTED_MSG=$(echo $IMPSTATSLINE | grep "submitted" | cut -d" " -f2 | cut -d"=" -f2)
+		FAILED_MSG=$(echo $IMPSTATSLINE | grep "failures" | cut -d" " -f3 | cut -d"=" -f2)
+		ACCEPTED_MSG=$(echo $IMPSTATSLINE | grep "accepted" | cut -d" " -f4 | cut -d"=" -f2)
+
+		if !  $SUBMITTED_MSG =~ $re  ; then
+			echo "**** omazureeventhubs WAITING FOR IMPSTATS"
+		else
+			if  "$SUBMITTED_MSG" -ge "$NUMMESSAGESFULL" ; then
+				if  "$ACCEPTED_MSG" -ge "$NUMMESSAGESFULL" ; then
+					echo "**** omazureeventhubs SUCCESS: NUMMESSAGESFULL: $NUMMESSAGESFULL, SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+					shutdown_when_empty
+					wait_shutdown
+					#cp $RSYSLOG_DEBUGLOG DEBUGDEBUG.log
+					exit_test
+				else
+					echo "**** omazureeventhubs FAIL: NUMMESSAGESFULL: $NUMMESSAGESFULL, SUBMITTED/WAITING: SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+				fi
+			else
+				echo "**** omazureeventhubs WAITING: SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+				current_time=$(date +%s)
+				if  $interrupt_connection == "YES"  &&  $current_time -gt $lastcurrent_time  &&  $((current_time % $interrupt_tick)) -eq 0  &&  ${count} -gt 1 ; then
+					# Interrupt Connection - requires root and linux kernel >= 4.9 in order to work!
+					echo "**** omazureeventhubs WAITING: Interrupt Connection on ${interrupt_host}:${interrupt_port}"
+					sudo ss -K dst ${interrupt_host} dport = ${interrupt_port}
+				fi
+				lastcurrent_time=$current_time
+			fi
+		fi
+	fi
+
+	$TESTTOOL_DIR/msleep 1000
+done
+unset count
+
+shutdown_when_empty
+wait_shutdown
+error_exit 1

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omazureeventhubs-list.sh Added

@@ -0,0 +1,137 @@
+#!/bin/bash
+# This file is part of the rsyslog project, released under ASL 2.0
+. ${srcdir:=.}/diag.sh init
+
+export NUMMESSAGES=100
+export NUMMESSAGESFULL=$NUMMESSAGES
+export WAITTIMEOUT=20
+
+# REQUIRES EXTERNAL ENVIRONMENT VARIABLES
+if  -z "${AZURE_HOST}" ; then
+	echo "SKIP: AZURE_HOST environment variable not SET! Example: <yourname>.servicebus.windows.net - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_PORT}" ; then
+	echo "SKIP: AZURE_PORT environment variable not SET! Example: 5671 - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_KEY_NAME}" ; then
+	echo "SKIP: AZURE_KEY_NAME environment variable not SET! Example: <yourkeyname> - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_KEY}" ; then
+	echo "SKIP: AZURE_KEY environment variable not SET! Example: <yourlongkey> - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_CONTAINER}" ; then
+	echo "SKIP: AZURE_CONTAINER environment variable not SET! Example: <youreventhubsname> - SKIPPING"
+	exit 77
+fi
+
+export AMQPS_ADRESS="amqps://$AZURE_KEY_NAME:$AZURE_KEY@$AZURE_HOST:$AZURE_PORT/$AZURE_NAME"
+export AZURE_ENDPOINT="Endpoint=sb://$AZURE_HOST/;SharedAccessKeyName=$AZURE_KEY_NAME;SharedAccessKey=$AZURE_KEY;EntityPath=$AZURE_NAME"
+
+# --- Create/Start omazureeventhubs sender config 
+generate_conf
+add_conf '
+# impstats in order to gain insight into error cases
+module(load="../plugins/impstats/.libs/impstats"
+	log.file="'$RSYSLOG_DYNNAME.pstats'"
+	interval="1" log.syslog="off")
+$imdiagInjectDelayMode full
+
+# Load mods
+module(load="../plugins/imtcp/.libs/imtcp")
+module(load="../plugins/omazureeventhubs/.libs/omazureeventhubs")
+
+# imtcp
+input(	type="imtcp" 
+	port="0"
+	ruleset="default"
+	listenPortFileName="'$RSYSLOG_DYNNAME'.tcpflood_port")
+
+# templates
+template(name="outfmt" type="string" string="%msg:F,58:2%\n")
+template(name="generic" type="list" option.jsonf="on") {
+	property(outname="timestamp" name="timereported" dateFormat="rfc3339" format="jsonf")
+	constant(value="\"source\": \"EventHubMessage\", ")
+	property(outname="host" name="hostname" format="jsonf")
+	property(outname="severity" name="syslogseverity" caseConversion="upper" format="jsonf" datatype="number")
+	property(outname="facility" name="syslogfacility" format="jsonf" datatype="number")
+	property(outname="appname" name="syslogtag" format="jsonf")
+	property(outname="message" name="msg" format="jsonf" )
+	property(outname="etlsource" name="$myhostname" format="jsonf")}
+
+# ruleset
+ruleset(name="default") {
+	if $msg contains "msgnum:" then {
+		action(type="omfile" template="outfmt" file="'$RSYSLOG_OUT_LOG'")
+		action(type="omfile" template="generic" file="'$RSYSLOG_OUT_LOG'-generic.log")
+		action(name="omazureeventhubs"
+			type="omazureeventhubs"
+			azurehost="'$AZURE_HOST'"
+			azureport="'$AZURE_PORT'"
+			azure_key_name="'$AZURE_KEY_NAME'"
+			azure_key="'$AZURE_KEY'"
+			container="'$AZURE_CONTAINER'"
+			template="generic"
+			eventproperties=	"Table=TestTable",
+						"Format=JSON"
+		)
+	} else {
+		action( type="omfile" file="'$RSYSLOG_DYNNAME.othermsg'")
+	}
+	stop
+}
+
+'
+echo Starting sender instance omazureeventhubs
+startup
+
+echo Inject messages into rsyslog sender instance  
+# injectmsg 1 $NUMMESSAGES
+tcpflood -m$NUMMESSAGES -i1
+
+wait_file_lines $RSYSLOG_OUT_LOG $NUMMESSAGESFULL 100
+
+# experimental: wait until kafkacat receives everything
+timeoutend=$WAITTIMEOUT
+timecounter=0
+
+echo "CHECK $RSYSLOG_DYNNAME.pstats"
+while  $timecounter -lt $timeoutend ; do
+	(( timecounter++ ))
+
+	if  -f "$RSYSLOG_DYNNAME.pstats"  ; then
+		# Read IMPSTATS for verification
+		IMPSTATSLINE=$(cat $RSYSLOG_DYNNAME.pstats | grep "origin\=omazureeventhubs" | tail -1 | cut -d: -f5)
+		SUBMITTED_MSG=$(echo $IMPSTATSLINE | grep "submitted" | cut -d" " -f2 | cut -d"=" -f2)
+		FAILED_MSG=$(echo $IMPSTATSLINE | grep "failures" | cut -d" " -f3 | cut -d"=" -f2)
+		ACCEPTED_MSG=$(echo $IMPSTATSLINE | grep "accepted" | cut -d" " -f4 | cut -d"=" -f2)
+
+		if !  $SUBMITTED_MSG =~ $re  ; then
+			echo "**** omazureeventhubs WAITING FOR IMPSTATS"
+		else
+			if  "$SUBMITTED_MSG" -ge "$NUMMESSAGESFULL" ; then
+				if  "$ACCEPTED_MSG" -eq "$NUMMESSAGESFULL" ; then
+					echo "**** omazureeventhubs SUCCESS: NUMMESSAGESFULL: $NUMMESSAGESFULL, SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+					shutdown_when_empty
+					wait_shutdown
+					#cp $RSYSLOG_DEBUGLOG DEBUGDEBUG.log
+					exit_test
+				else
+					echo "**** omazureeventhubs FAIL: NUMMESSAGESFULL: $NUMMESSAGESFULL, SUBMITTED/WAITING: SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+				fi
+			else
+				echo "**** omazureeventhubs WAITING: SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+			fi
+		fi
+	fi
+
+	$TESTTOOL_DIR/msleep 1000
+done
+unset count
+
+shutdown_when_empty
+wait_shutdown
+error_exit 1

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omazureeventhubs-stress.sh Added

@@ -0,0 +1,137 @@
+#!/bin/bash
+# This file is part of the rsyslog project, released under ASL 2.0
+. ${srcdir:=.}/diag.sh init
+
+export NUMMESSAGES=50000
+export NUMMESSAGESFULL=$NUMMESSAGES
+export WAITTIMEOUT=60
+
+export QUEUESIZE=100000
+export DEQUEUESIZE=1000
+export DEQUEUESIZEMIN=1000
+export TESTWORKERTHREADS=10
+
+# REQUIRES EXTERNAL ENVIRONMENT VARIABLES
+if  -z "${AZURE_HOST}" ; then
+	echo "SKIP: AZURE_HOST environment variable not SET! Example: <yourname>.servicebus.windows.net - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_PORT}" ; then
+	echo "SKIP: AZURE_PORT environment variable not SET! Example: 5671 - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_KEY_NAME}" ; then
+	echo "SKIP: AZURE_KEY_NAME environment variable not SET! Example: <yourkeyname> - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_KEY}" ; then
+	echo "SKIP: AZURE_KEY environment variable not SET! Example: <yourlongkey> - SKIPPING"
+	exit 77
+fi
+if  -z "${AZURE_CONTAINER}" ; then
+	echo "SKIP: AZURE_CONTAINER environment variable not SET! Example: <youreventhubsname> - SKIPPING"
+	exit 77
+fi
+
+export AMQPS_ADRESS="amqps://$AZURE_KEY_NAME:$AZURE_KEY@$AZURE_HOST:$AZURE_PORT/$AZURE_NAME"
+export AZURE_ENDPOINT="Endpoint=sb://$AZURE_HOST/;SharedAccessKeyName=$AZURE_KEY_NAME;SharedAccessKey=$AZURE_KEY;EntityPath=$AZURE_NAME"
+
+# --- Create/Start omazureeventhubs sender config 
+
+generate_conf
+add_conf '
+global(
+	debug.whitelist="on"
+	debug.files="omazureeventhubs.c", "modules.c", "errmsg.c", "action.c"
+)
+# impstats in order to gain insight into error cases
+module(load="../plugins/impstats/.libs/impstats"
+	log.file="'$RSYSLOG_DYNNAME.pstats'"
+	interval="1" log.syslog="off")
+$imdiagInjectDelayMode full
+
+# main_queue(queue.dequeueBatchSize="2048")
+
+# Load mods
+module(load="../plugins/omazureeventhubs/.libs/omazureeventhubs")
+
+# templates
+template(name="outfmt" type="string" string="%msg:F,58:2%\n")
+
+local4.* {
+	action(	name="omazureeventhubs"
+		type="omazureeventhubs"
+		azurehost="'$AZURE_HOST'"
+		azureport="'$AZURE_PORT'"
+		azure_key_name="'$AZURE_KEY_NAME'"
+		azure_key="'$AZURE_KEY'"
+		container="'$AZURE_CONTAINER'"
+		template="outfmt"
+		queue.type="FixedArray"
+		queue.size="'$QUEUESIZE'"
+		queue.saveonshutdown="on"
+		queue.dequeueBatchSize="'$DEQUEUESIZE'"
+		queue.minDequeueBatchSize.timeout="1000" # 1 sec
+		queue.workerThreads="'$TESTWORKERTHREADS'"
+		queue.workerThreadMinimumMessages="'$DEQUEUESIZEMIN'"
+		queue.timeoutWorkerthreadShutdown="10000"
+		queue.timeoutshutdown="1000"
+		action.resumeInterval="1"
+		action.resumeRetryCount="2"
+	)
+
+	stop
+}
+
+action( type="omfile" file="'$RSYSLOG_DYNNAME.othermsg'")
+'
+echo Starting sender instance omazureeventhubs
+startup
+
+echo Inject messages into rsyslog sender instance  
+injectmsg 1 $NUMMESSAGES
+
+# experimental: wait until kafkacat receives everything
+timeoutend=$WAITTIMEOUT
+timecounter=0
+
+echo "CHECK $RSYSLOG_DYNNAME.pstats"
+LAST_ACCEPTED_MSG=0
+while  $timecounter -lt $timeoutend ; do
+	(( timecounter++ ))
+
+	if  -f "$RSYSLOG_DYNNAME.pstats"  ; then
+		# Read IMPSTATS for verification
+		IMPSTATSLINE=$(cat $RSYSLOG_DYNNAME.pstats | grep "origin\=omazureeventhubs" | tail -1 | cut -d: -f5)
+		SUBMITTED_MSG=$(echo $IMPSTATSLINE | grep "submitted" | cut -d" " -f2 | cut -d"=" -f2)
+		FAILED_MSG=$(echo $IMPSTATSLINE | grep "failures" | cut -d" " -f3 | cut -d"=" -f2)
+		ACCEPTED_MSG=$(echo $IMPSTATSLINE | grep "accepted" | cut -d" " -f4 | cut -d"=" -f2)
+		MSG_PER_SEC=$(($ACCEPTED_MSG-$LAST_ACCEPTED_MSG))
+		LAST_ACCEPTED_MSG=$ACCEPTED_MSG
+
+		if !  $SUBMITTED_MSG =~ $re  ; then
+			echo "**** omazureeventhubs WAITING FOR IMPSTATS"
+		else
+			if  "$SUBMITTED_MSG" -ge "$NUMMESSAGESFULL" ; then
+				if  "$ACCEPTED_MSG" -ge "$NUMMESSAGESFULL" ; then
+					echo "**** omazureeventhubs SUCCESS: NUMMESSAGESFULL: $NUMMESSAGESFULL, SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+					shutdown_when_empty
+					wait_shutdown
+					#cp $RSYSLOG_DEBUGLOG DEBUGDEBUG.log
+					exit_test
+				else
+					echo "**** omazureeventhubs FAIL: NUMMESSAGESFULL: $NUMMESSAGESFULL, SUBMITTED/WAITING: SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG"
+				fi
+			else
+				echo "**** omazureeventhubs WAITING: SUBMITTED_MSG:$SUBMITTED_MSG, ACCEPTED_MSG: $ACCEPTED_MSG, FAILED_MSG: $FAILED_MSG, MSG_PER_SEC: $MSG_PER_SEC"
+			fi
+		fi
+	fi
+
+	$TESTTOOL_DIR/msleep 1000
+done
+unset count
+
+shutdown_when_empty
+wait_shutdown
+error_exit 1

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omfile-sizelimitcmd-many.sh Added

@@ -0,0 +1,36 @@
+#!/bin/bash
+# addd 2023-01-11 by RGerhards, released under ASL 2.0
+. ${srcdir:=.}/diag.sh init
+export NUMMESSAGES=50000
+echo "ls -l $RSYSLOG_DYNNAME.channel.*
+mv -f $RSYSLOG_DYNNAME.channel.log.prev.9 $RSYSLOG_DYNNAME.channel.log.prev.10 2>/dev/null
+mv -f $RSYSLOG_DYNNAME.channel.log.prev.8 $RSYSLOG_DYNNAME.channel.log.prev.9 2>/dev/null
+mv -f $RSYSLOG_DYNNAME.channel.log.prev.7 $RSYSLOG_DYNNAME.channel.log.prev.8 2>/dev/null
+mv -f $RSYSLOG_DYNNAME.channel.log.prev.6 $RSYSLOG_DYNNAME.channel.log.prev.7 2>/dev/null
+mv -f $RSYSLOG_DYNNAME.channel.log.prev.5 $RSYSLOG_DYNNAME.channel.log.prev.6 2>/dev/null
+mv -f $RSYSLOG_DYNNAME.channel.log.prev.4 $RSYSLOG_DYNNAME.channel.log.prev.5 2>/dev/null
+mv -f $RSYSLOG_DYNNAME.channel.log.prev.3 $RSYSLOG_DYNNAME.channel.log.prev.4 2>/dev/null
+mv -f $RSYSLOG_DYNNAME.channel.log.prev.2 $RSYSLOG_DYNNAME.channel.log.prev.3 2>/dev/null
+mv -f $RSYSLOG_DYNNAME.channel.log.prev.1 $RSYSLOG_DYNNAME.channel.log.prev.2 2>/dev/null
+mv -f $RSYSLOG_DYNNAME.channel.log.prev   $RSYSLOG_DYNNAME.channel.log.prev.1 2>/dev/null
+mv -f $RSYSLOG_DYNNAME.channel.log $RSYSLOG_DYNNAME.channel.log.prev
+"   > $RSYSLOG_DYNNAME.rotate.sh
+chmod +x $RSYSLOG_DYNNAME.rotate.sh
+generate_conf
+add_conf '
+template(name="outfmt" type="string" string="%msg:F,58:2%\n")
+
+if $msg contains "msgnum:" then {
+	action(type="omfile" file="'$RSYSLOG_DYNNAME.channel.log'" template="outfmt"
+		rotation.sizeLimit="50k"
+		rotation.sizeLimitCommand="./'$RSYSLOG_DYNNAME.rotate.sh'")
+}
+'
+startup
+injectmsg
+shutdown_when_empty
+wait_shutdown
+ls -l $RSYSLOG_DYNNAME.channel.*
+cat $RSYSLOG_DYNNAME.channel.* > $RSYSLOG_OUT_LOG
+seq_check
+exit_test

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-auth.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-auth.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-basic.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-basic.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-batch-dynrestpath.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-batch-dynrestpath.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-batch-fail-with-400.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-batch-fail-with-400.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-batch-jsonarray-compress.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-batch-jsonarray-compress.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-batch-jsonarray-retry.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-batch-jsonarray-retry.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-batch-jsonarray.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-batch-jsonarray.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-batch-kafkarest-retry.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-batch-kafkarest-retry.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-batch-kafkarest.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-batch-kafkarest.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-batch-lokirest-retry.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-batch-lokirest-retry.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-batch-lokirest.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-batch-lokirest.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-batch-newline.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-batch-newline.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-dynrestpath.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-dynrestpath.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-httpheaderkey.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-httpheaderkey.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-multiplehttpheaders.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-multiplehttpheaders.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp-retry.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp-retry.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/omhttp_server.py -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/omhttp_server.py Changed

@@ -110,6 +110,7 @@
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Archive and delete core app log files')
     parser.add_argument('-p', '--port', action='store', type=int, default=8080, help='port')
+    parser.add_argument('--port-file', action='store', type=str, default='', help='file to store listen port number')
     parser.add_argument('-i', '--interface', action='store', type=str, default='localhost', help='port')
     parser.add_argument('--fail-after', action='store', type=int, default=0, help='start failing after n posts')
     parser.add_argument('--fail-every', action='store', type=int, default=-1, help='fail every n posts')
@@ -123,7 +124,12 @@
     metadata'decompress' = args.decompress
     metadata'userpwd' = args.userpwd
     server = HTTPServer((args.interface, args.port), MyHandler)
+    lstn_port = server.server_address1
     pid = os.getpid()
     print('starting omhttp test server at {interface}:{port} with pid {pid}'
-          .format(interface=args.interface, port=args.port, pid=pid))
+          .format(interface=args.interface, port=lstn_port, pid=pid))
+    if args.port_file != '':
+        f = open(args.port_file, "w")
+        f.write(str(lstn_port))
+        f.close()
     server.serve_forever()

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_failover.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_failover.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_gzip.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_gzip.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_relp_dflt_pt.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_relp_dflt_pt.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_relp_rebind.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_relp_rebind.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_relp_tls.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_relp_tls.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_relp_tls_certvalid.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_relp_tls_certvalid.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_relp_tls_prio.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_relp_tls_prio.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_anon_hostname.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_anon_hostname.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_anon_ipv4.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_anon_ipv4.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_anon_ipv6.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_anon_ipv6.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_certvalid.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_certvalid.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_certvalid_expired.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_certvalid_expired.sh Changed

@@ -1,10 +1,10 @@
 #!/bin/bash
 # This file is part of the rsyslog project, released under ASL 2.0
-
-# uncomment for debugging support:
 . ${srcdir:=.}/diag.sh init
+printf 'using TLS driver: %s\n' ${RS_TLS_DRIVER:=gtls}
+
 # start up the instances
-#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction"
+# export RSYSLOG_DEBUG="debug nostdout noprintmutexaction"
 export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.receiver.debuglog"
 generate_conf
 add_conf '
@@ -12,13 +12,13 @@
 	defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
 	defaultNetstreamDriverCertFile="'$srcdir/testsuites/x.509/client-cert.pem'"
 	defaultNetstreamDriverKeyFile="'$srcdir/testsuites/x.509/client-key.pem'"
-	defaultNetstreamDriver="gtls"
+	defaultNetstreamDriver="'$RS_TLS_DRIVER'"
 #	debug.whitelist="on"
 #	debug.files="nsd_ossl.c", "tcpsrv.c", "nsdsel_ossl.c", "nsdpoll_ptcp.c", "dnscache.c"
 )
 
 module(	load="../plugins/imtcp/.libs/imtcp"
-	StreamDriver.Name="gtls"
+	StreamDriver.Name="'$RS_TLS_DRIVER'"
 	StreamDriver.Mode="1"
 	StreamDriver.AuthMode="x509/certvalid"
 	StreamDriver.PermitExpiredCerts="off"
@@ -37,7 +37,7 @@
 	defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
 	defaultNetstreamDriverCertFile="'$srcdir/testsuites/x.509/client-expired-cert.pem'"
 	defaultNetstreamDriverKeyFile="'$srcdir/testsuites/x.509/client-expired-key.pem'"
-	defaultNetstreamDriver="gtls"
+	defaultNetstreamDriver="'$RS_TLS_DRIVER'"
 )
 
 # set up the action
@@ -49,7 +49,7 @@
 
 # now inject the messages into instance 2. It will connect to instance 1,
 # and that instance will record the data.
-injectmsg
+injectmsg2
 
 # shut down sender when everything is sent, receiver continues to run concurrently
 shutdown_when_empty 2
@@ -58,6 +58,6 @@
 shutdown_when_empty
 wait_shutdown
 
-content_check "not permitted to talk to peer, certificate invalid: certificate expired"
+content_check --regex "not permitted to talk to peer '.*', certificate invalid: certificate expired"
 
 exit_test

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_certvalid_expired_defaultmode.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_certvalid_expired_defaultmode.sh Changed

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_certvalid_revoked.sh Added

@@ -0,0 +1,67 @@
+#!/bin/bash
+# This file is part of the rsyslog project, released under ASL 2.0
+. ${srcdir:=.}/diag.sh init
+printf 'using TLS driver: %s\n' ${RS_TLS_DRIVER:=gtls}
+
+# start up the instances
+#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction"
+export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.receiver.debuglog"
+generate_conf
+add_conf '
+global(
+	defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
+	defaultnetstreamdriverCRLfile="'$srcdir/testsuites/x.509/crl.pem'"
+	defaultNetstreamDriverCertFile="'$srcdir/testsuites/x.509/client-cert-new.pem'"
+	defaultNetstreamDriverKeyFile="'$srcdir/testsuites/x.509/client-key.pem'"
+	defaultNetstreamDriver="'$RS_TLS_DRIVER'"
+#	debug.whitelist="on"
+#	debug.files="nsd_ossl.c", "tcpsrv.c", "nsdsel_ossl.c", "nsdpoll_ptcp.c", "dnscache.c"
+)
+
+module(	load="../plugins/imtcp/.libs/imtcp"
+	StreamDriver.Name="'$RS_TLS_DRIVER'"
+	StreamDriver.Mode="1"
+	StreamDriver.AuthMode="x509/certvalid"
+	StreamDriver.PermitExpiredCerts="off"
+	)
+input(type="imtcp" port="0" listenPortFileName="'$RSYSLOG_DYNNAME'.tcpflood_port")
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'")
+'
+startup
+export PORT_RCVR=$TCPFLOOD_PORT
+export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.sender.debuglog"
+generate_conf 2
+add_conf '
+global(
+	defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
+	defaultnetstreamdriverCRLfile="'$srcdir/testsuites/x.509/crl.pem'"
+	defaultNetstreamDriverCertFile="'$srcdir/testsuites/x.509/client-revoked.pem'"
+	defaultNetstreamDriverKeyFile="'$srcdir/testsuites/x.509/client-revoked-key.pem'"
+	defaultNetstreamDriver="'$RS_TLS_DRIVER'"
+)
+
+# set up the action
+$ActionSendStreamDriverMode 1 # require TLS for the connection
+$ActionSendStreamDriverAuthMode anon
+*.*	@@127.0.0.1:'$PORT_RCVR'
+' 2
+startup 2
+
+# now inject the messages into instance 2. It will connect to instance 1,
+# and that instance will record the data.
+injectmsg2
+
+# shut down sender when everything is sent, receiver continues to run concurrently
+shutdown_when_empty 2
+wait_shutdown 2
+# now it is time to stop the receiver as well
+shutdown_when_empty
+wait_shutdown
+
+if  -z "$TEXT_TO_CHECK" ; then
+	TEXT_TO_CHECK="not permitted to talk to peer '.*', certificate invalid: certificate revoked"
+fi
+content_check --regex "$TEXT_TO_CHECK"
+
+exit_test

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_client_missing_cert.sh Added

@@ -0,0 +1,65 @@
+#!/bin/bash
+# This file is part of the rsyslog project, released under ASL 2.0
+. ${srcdir:=.}/diag.sh init
+printf 'using TLS driver: %s\n' ${RS_TLS_DRIVER:=gtls}
+
+# start up the instances
+# export RSYSLOG_DEBUG="debug nostdout noprintmutexaction"
+export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.receiver.debuglog"
+generate_conf
+add_conf '
+global(
+	defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
+	defaultNetstreamDriverCertFile="'$srcdir/testsuites/x.509/client-cert.pem'"
+	defaultNetstreamDriverKeyFile="'$srcdir/testsuites/x.509/client-key.pem'"
+	defaultNetstreamDriver="'$RS_TLS_DRIVER'"
+#	debug.whitelist="on"
+#	debug.files="nsd_ossl.c", "tcpsrv.c", "nsdsel_ossl.c", "nsdpoll_ptcp.c", "dnscache.c"
+)
+
+module(	load="../plugins/imtcp/.libs/imtcp"
+	StreamDriver.Name="'$RS_TLS_DRIVER'"
+	StreamDriver.Mode="1"
+	StreamDriver.AuthMode="x509/certvalid"
+	StreamDriver.PermitExpiredCerts="off"
+	)
+input(type="imtcp" port="0" listenPortFileName="'$RSYSLOG_DYNNAME'.tcpflood_port")
+
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'")
+'
+startup
+export PORT_RCVR=$TCPFLOOD_PORT
+export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.sender.debuglog"
+#valgrind="valgrind"
+generate_conf 2
+add_conf '
+global(
+/*
+	defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
+	defaultNetstreamDriverCertFile="'$srcdir/testsuites/x.509/client-expired-cert.pem'"
+	defaultNetstreamDriverKeyFile="'$srcdir/testsuites/x.509/client-expired-key.pem'"
+*/
+	defaultNetstreamDriver="'$RS_TLS_DRIVER'"
+)
+
+# set up the action
+$ActionSendStreamDriverMode 1 # require TLS for the connection
+$ActionSendStreamDriverAuthMode anon
+*.*	@@127.0.0.1:'$PORT_RCVR'
+' 2
+startup 2
+
+# now inject the messages into instance 2. It will connect to instance 1,
+# and that instance will record the data.
+injectmsg2
+
+# shut down sender when everything is sent, receiver continues to run concurrently
+shutdown_when_empty 2
+wait_shutdown 2
+# now it is time to stop the receiver as well
+shutdown_when_empty
+wait_shutdown
+
+content_check --regex "peer .* did not provide a certificate,"
+
+exit_test

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_gtls_serveranon_gtls_clientanon.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_gtls_serveranon_gtls_clientanon.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_gtls_servercert_gtls_clientanon.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_gtls_servercert_gtls_clientanon.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_ossl_anon_ipv4.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_ossl_anon_ipv4.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_ossl_anon_rebind.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_ossl_anon_rebind.sh Changed

@@ -17,7 +17,6 @@
 #receiver
 export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.receiver.debuglog"
 generate_conf
-export PORT_RCVR="$(get_free_port)"
 add_conf '
 global(	
 	defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
@@ -45,24 +44,19 @@
 #sender
 export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.sender.debuglog"
 #valgrind="valgrind"
-export PORT_RCVR=$TCPFLOOD_PORT
+export PORT_RCVR=$TCPFLOOD_PORT # save TCPFLOOD_PORT, generate_conf will overwrite it!
 generate_conf 2
-export TCPFLOOD_PORT="$(get_free_port)" # TODO: move to diag.sh
-echo TCPFLOOD_PORT new: $TCPFLOOD_PORT 
 add_conf '
 global(	
-	defaultNetstreamDriverCAFile="'$srcdir/tls-certs/ca.pem'"
-	defaultNetstreamDriverCertFile="'$srcdir/tls-certs/cert.pem'"
-	defaultNetstreamDriverKeyFile="'$srcdir/tls-certs/key.pem'"
+	defaultNetstreamDriverCAFile="'$srcdir/testsuites/x.509/ca.pem'"
+	defaultNetstreamDriverCertFile="'$srcdir/testsuites/x.509/client-cert.pem'"
+	defaultNetstreamDriverKeyFile="'$srcdir/testsuites/x.509/client-key.pem'"
 	defaultNetstreamDriver="ossl"
-	debug.whitelist="on"
-	debug.files="nsd_ossl.c", "tcpsrv.c", "nsdsel_ossl.c", "nsdpoll_ptcp.c", "dnscache.c"
 )
 
-
 # set up the action
-$DefaultNetstreamDriver ossl # use gtls netstream driver
-$ActionSendStreamDriverMode 1 # require TLS for the connection
+$DefaultNetstreamDriver ossl
+$ActionSendStreamDriverMode 1
 $ActionSendStreamDriverAuthMode anon
 $ActionSendTCPRebindInterval 100
 *.*	@@127.0.0.1:'$PORT_RCVR'
@@ -71,7 +65,7 @@
 
 # now inject the messages into instance 2. It will connect to instance 1,
 # and that instance will record the data.
-injectmsg
+injectmsg2
 shutdown_when_empty 2
 wait_shutdown 2
 # now it is time to stop the receiver as well
@@ -81,5 +75,4 @@
 export SEQ_CHECK_OPTIONS=-d
 seq_check
 
-unset PORT_RCVR
 exit_test

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_ossl_certvalid_expired.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_ossl_certvalid_expired.sh Changed

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_ossl_certvalid_revoked.sh Added

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_tls_ossl_certvalid_tlscommand.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_tls_ossl_certvalid_tlscommand.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/sndrcv_udp_nonstdpt.sh -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/sndrcv_udp_nonstdpt.sh Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tests/tcpflood.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/tcpflood.c Changed

@@ -63,6 +63,7 @@
  * -z	private key file for TLS mode
  * -Z	cert (public key) file for TLS mode
  * -a	Authentication Mode for relp-tls
+ * -A	do NOT abort if an error occured during sending messages
  * -E	Permitted Peer for relp-tls
  * -L	loglevel to use for GnuTLS troubleshooting (0-off to 10-all, 0 default)
  * -j	format message in json, parameter is JSON cookie
@@ -208,6 +209,7 @@
 static int waittime = 0;
 static int runMultithreaded = 0; /* run tests in multithreaded mode */
 static int numThrds = 1;	/* number of threads to use */
+static int abortOnSendFail = 1;	/* abort run if sending fails? */
 static char *tlsCAFile = NULL;
 static char *tlsCertFile = NULL;
 static char *tlsKeyFile = NULL;
@@ -266,7 +268,7 @@
 
 /* forward definitions */
 static void initTLSSess(int);
-static int sendTLS(int i, char *buf, int lenBuf);
+static int sendTLS(int i, char *buf, size_t lenBuf);
 static void closeTLSSess(int __attribute__((unused)) i);
 
 #ifdef ENABLE_RELP
@@ -579,7 +581,7 @@
  * of constructing test messages. -- rgerhards, 2010-03-31
  */
 static void
-genMsg(char *buf, size_t maxBuf, int *pLenBuf, struct instdata *inst)
+genMsg(char *buf, size_t maxBuf, size_t *pLenBuf, struct instdata *inst)
 {
 	int edLen; /* actual extra data length to use */
 	char extraDataMAX_EXTRADATA_LEN + 1;
@@ -650,7 +652,7 @@
 		*pLenBuf = snprintf(buf, maxBuf, "%s%c", MsgToSend, frameDelim);
 	}
 	if (octateCountFramed == 1) {
-		snprintf(payloadLen, sizeof(payloadLen), "%d ", *pLenBuf);
+		snprintf(payloadLen, sizeof(payloadLen), "%zd ", *pLenBuf);
 		payloadStringLen = strlen(payloadLen);
 		memmove(buf + payloadStringLen, buf, *pLenBuf);
 		memcpy(buf, payloadLen, payloadStringLen);
@@ -661,6 +663,29 @@
 finalize_it: /*EMPTY to keep the compiler happy */;
 }
 
+
+static int
+sendPlainTCP(const int socknum, const char *const buf, const size_t lenBuf, int *const ret_errno)
+{
+	size_t lenSent;
+	int r;
+
+	lenSent = 0;
+	while(lenSent != lenBuf) {
+		r = send(sockArraysocknum, buf + lenSent, lenBuf - lenSent, 0);
+		if(r > 0) {
+			lenSent += r;
+		} else {
+			*ret_errno = errno;
+			goto finalize_it;
+		}
+	}
+
+finalize_it:
+	return lenSent;
+}
+
+
 /* send messages to the tcp connections we keep open. We use
  * a very basic format that helps identify the message
  * (via msgnum:<number>: e.g. msgnum:00000001:). This format is suitable
@@ -673,8 +698,8 @@
 {
 	unsigned i = 0;
 	int socknum;
-	int lenBuf;
-	int lenSend = 0;
+	size_t lenBuf;
+	size_t lenSend = 0;
 	char *statusText = "";
 	char bufMAX_EXTRADATA_LEN + 1024;
 	char sendBufMAX_SENDBUF;
@@ -722,8 +747,7 @@
 					exit(1);
 				}
 			}
-			lenSend = send(sockArraysocknum, buf, lenBuf, 0);
-			error_number = errno;
+			lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number);
 		} else if(transport == TP_UDP) {
 			lenSend = sendto(udpsock, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr));
 			error_number = errno;
@@ -771,11 +795,21 @@
 			printf("\r%5.5u\n", i);
 			fflush(stdout);
 			test_rs_strerror_r(error_number, errStr, sizeof(errStr));
-			printf("send() failed \"%s\" at socket %d, index %u, msgNum %lld\n",
-				   errStr, sockArraysocknum, i, inst->numSent);
+			if(lenSend == 0) {
+				printf("tcpflood: socket %d, index %u, msgNum %lld CLOSED REMOTELY\n",
+					sockArraysocknum, i, inst->numSent);
+			} else {
+				printf("tcpflood: send() failed \"%s\" at socket %d, index %u, "
+					"msgNum %lld, lenSend %zd, lenBuf %zd\n",
+					errStr, sockArraysocknum, i, inst->numSent, lenSend,
+					lenBuf);
+			}
 			fflush(stderr);
 
-			return(1);
+			if(abortOnSendFail) {
+				printf("tcpflood terminates due to send failure\n");
+				return(1);
+			}
 		}
 		if(i % show_progress_interval == 0) {
 			if(bShowProgress)
@@ -792,7 +826,7 @@
 					lenSend = sendTLS(socknum, sendBuf, offsSendBuf);
 					if(lenSend != offsSendBuf) {
 						fprintf(stderr, "tcpflood: error in send function causes potential "
-						"data loss lenSend %d, offsSendBuf %d\n",
+						"data loss lenSend %zd, offsSendBuf %d\n",
 						lenSend, offsSendBuf);
 					}
 					offsSendBuf = 0;
@@ -1184,8 +1218,13 @@
 initTLS(void)
 {
 
-	/* Setup OpenSSL library */
-	if( /*(opensslh_THREAD_setup() == 0) || */ !SSL_library_init()) {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+	/* Setup OpenSSL library  < 1.1.0 */
+	if( !SSL_library_init()) {
+#else
+	/* Setup OpenSSL library >= 1.1.0 with system default settings */
+	if( OPENSSL_init_ssl(0, NULL) == 0) {
+#endif
 		printf("tcpflood: error openSSL initialization failed!\n");
 		exit(1);
 	}
@@ -1195,8 +1234,12 @@
 	ERR_load_BIO_strings();
 	ERR_load_crypto_strings();
 
-	/* Create main CTX Object */
+	/* Create main CTX Object. Use SSLv23_method for < Openssl 1.1.0 and TLS_method for all newer versions! */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	ctx = SSL_CTX_new(SSLv23_method());
+#else
+	ctx = SSL_CTX_new(TLS_method());
+#endif
 
 	if(tlsCAFile != NULL && SSL_CTX_load_verify_locations(ctx, tlsCAFile, NULL) != 1) {
 		printf("tcpflood: Error, Failed loading CA certificate"
@@ -1370,9 +1413,9 @@
 
 
 static int
-sendTLS(int i, char *buf, int lenBuf)
+sendTLS(int i, char *buf, size_t lenBuf)
 {
-	int lenSent;
+	size_t lenSent;
 	int r, err;
 
 	lenSent = 0;
@@ -1520,7 +1563,7 @@
 
 
 static int
-sendTLS(int i, char *buf, int lenBuf)
+sendTLS(int i, char *buf, size_t lenBuf)
 {
 	int lenSent;
 	int r;
@@ -1547,7 +1590,7 @@
 static void exitTLS(void) {}
 static void initTLSSess(int __attribute__((unused)) i) {}
 static int sendTLS(int __attribute__((unused)) i, char __attribute__((unused)) *buf,
-	int __attribute__((unused)) lenBuf) { return 0; }
+	size_t __attribute__((unused)) lenBuf) { return 0; }
 static void closeTLSSess(int __attribute__((unused)) i) {}
 #	endif
 
@@ -1596,7 +1639,7 @@
 
 	setvbuf(stdout, buf, _IONBF, 48);
 
-	while((opt = getopt(argc, argv, "a:Bb:c:C:d:DeE:f:F:i:I:j:k:l:L:m:M:n:OP:p:rR:sS:t:T:u:vW:x:XyYz:Z:")) != -1) {
+	while((opt = getopt(argc, argv, "a:ABb:c:C:d:DeE:f:F:i:I:j:k:l:L:m:M:n:OP:p:rR:sS:t:T:u:vW:x:XyYz:Z:")) != -1) {
 		switch (opt) {
 		case 'b':	batchsize = atoll(optarg);
 				break;
@@ -1704,6 +1747,8 @@
 				break;
 		case 'a':	relpAuthMode = optarg;

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/template-topos-neg.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/ca.srl Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/client-cert-new.pem Added

@@ -0,0 +1,102 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4 (0x4)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=someName, OU=rsyslog, O=SomeOrg, C=US
+        Validity
+            Not Before: Jul  6 13:52:50 2023 GMT
+            Not After : Jun 12 13:52:50 2123 GMT
+        Subject: C=US, ST=CA, O=SomeComp, OU=SomeUnit, CN=rsyslog/emailAddress=alorbach@adiscon.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (3072 bit)
+                Modulus:
+                    00:9d:91:da:d8:2e:3d:9d:ae:85:c3:c5:a7:f6:a4:
+                    66:f8:c8:91:91:b8:70:20:dc:ed:e8:23:ca:53:f7:
+                    b8:52:43:f3:a7:eb:fb:df:8a:3b:2c:b0:13:fa:62:
+                    d3:a1:53:a4:51:71:1f:68:d9:fd:bc:39:4a:fb:c9:
+                    6a:df:f3:88:84:b0:80:bc:c0:f5:1b:42:11:f6:4c:
+                    1a:d8:2c:62:0b:5d:50:64:30:9a:d3:db:c1:d5:7f:
+                    39:53:e4:bd:e8:1e:04:9d:c9:12:e0:e4:57:29:29:
+                    01:b9:f1:e5:bc:74:a6:e7:4b:61:e6:67:5c:6c:4e:
+                    ee:ee:22:0c:1b:14:6d:e8:0c:6f:ee:ee:c3:b8:dd:
+                    df:15:ed:7a:96:5b:cc:85:e5:e3:50:c4:ce:2b:bf:
+                    b6:37:e6:20:fc:6e:45:7e:09:bd:84:7a:af:07:27:
+                    f4:99:23:41:df:36:d8:29:31:a0:96:84:2f:fd:45:
+                    2e:d4:b4:f9:fa:dc:8f:23:c0:e0:06:ad:ad:0a:72:
+                    da:f4:3b:a1:cb:d6:a6:3b:ec:46:c4:95:f2:71:a5:
+                    ad:08:1f:e7:06:18:0e:db:80:51:96:ba:24:f6:64:
+                    02:6b:d3:f0:76:01:34:3a:72:02:e9:cb:d0:aa:62:
+                    51:0c:8f:83:be:c0:47:99:d2:92:72:ed:53:a5:49:
+                    05:d4:c9:a1:f4:4d:de:12:9d:1a:c8:17:84:f3:a2:
+                    7c:67:47:82:4b:86:1e:73:86:e2:26:26:10:94:a3:
+                    99:9b:08:99:78:9d:3d:33:5d:85:c2:46:65:94:ab:
+                    70:b4:3b:c1:26:8b:11:b6:66:27:88:22:84:03:b5:
+                    08:45:32:8c:81:23:be:62:dc:6f:a0:aa:5e:9f:03:
+                    f7:a7:f5:03:70:3c:78:09:d0:84:44:8c:19:af:76:
+                    f7:93:fc:af:c6:fd:db:d9:4c:cb:20:79:44:71:cb:
+                    e6:55:61:a9:7a:af:0b:a3:a6:ed:e9:a9:11:af:fa:
+                    a3:5d:ac:97:e7:ef:2b:b6:a8:37
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6E:15:7E:C4:62:2B:92:6D:22:EE:0C:E4:C5:36:29:38:16:62:BE:89
+            X509v3 Authority Key Identifier: 
+                keyid:B0:9F:67:33:2C:88:88:89:1F:44:62:74:9D:25:FF:C0:06:13:5D:D6
+
+    Signature Algorithm: sha256WithRSAEncryption
+         64:b0:45:6b:0c:7c:2d:09:14:8e:78:93:85:ef:d2:31:aa:c3:
+         59:2e:85:bf:29:e1:46:59:38:d4:fe:ea:c4:c1:83:a7:4a:1b:
+         92:5e:e8:11:9c:21:48:9d:1e:cc:31:d8:31:00:72:fe:7b:c1:
+         18:c4:f5:37:f3:3b:0e:1a:f6:3f:19:47:22:c9:87:01:e0:4c:
+         f4:5d:36:0a:87:46:42:fc:6c:ab:26:ff:7d:ca:2c:19:97:ca:
+         25:fc:70:66:4e:49:86:3e:81:0f:ee:e2:5c:3b:69:07:8b:c2:
+         52:09:46:d8:67:af:84:54:bb:4f:f3:e0:da:07:c5:64:56:2d:
+         fb:f9:55:13:53:1d:c6:78:63:40:22:23:4f:63:59:37:05:c7:
+         46:b6:36:53:30:fe:9b:e6:01:0a:54:5b:be:1b:a4:72:c3:27:
+         1b:c5:21:5d:d3:0c:06:56:d9:df:45:83:e7:06:6d:47:53:72:
+         ea:6c:e7:db:5e:bd:14:47:19:0c:18:13:73:6b:14:dc:29:6c:
+         c0:60:fa:4c:02:74:45:e7:8d:12:bd:1f:cb:77:2c:72:19:ef:
+         e8:85:5c:cf:77:04:b7:d4:08:a8:7e:d1:1d:20:7b:76:27:ca:
+         8a:5a:2a:a5:e7:15:6c:2d:50:9c:c2:b4:83:45:c2:f7:a5:f0:
+         6b:d5:45:6b:88:4c:db:00:26:2f:8e:0a:3c:42:4e:0c:64:18:
+         41:a0:6b:4b:d0:78:89:b4:64:34:5b:76:cb:dd:b9:be:6e:28:
+         82:ba:6e:11:99:86:88:b6:0d:22:2b:a6:eb:5f:0b:ca:77:5b:
+         2e:28:b7:f3:96:c3:8c:9d:0d:2b:59:98:d4:20:87:3a:2e:f4:
+         e3:bf:a2:ff:67:4f:3f:1e:ce:ec:59:76:5a:67:81:ba:44:96:
+         29:af:05:ce:55:02:b4:d6:68:f0:25:61:8c:91:83:03:fd:e4:
+         2c:06:91:b4:32:d8:5b:47:d6:20:55:44:a6:0c:9b:97:bb:94:
+         66:25:8c:35:e0:32
+-----BEGIN CERTIFICATE-----
+MIIEszCCAxugAwIBAgIBBDANBgkqhkiG9w0BAQsFADBEMREwDwYDVQQDEwhzb21l
+TmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMHU29tZU9yZzELMAkGA1UE
+BhMCVVMwIBcNMjMwNzA2MTM1MjUwWhgPMjEyMzA2MTIxMzUyNTBaMHcxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJDQTERMA8GA1UECgwIU29tZUNvbXAxETAPBgNVBAsM
+CFNvbWVVbml0MRAwDgYDVQQDDAdyc3lzbG9nMSMwIQYJKoZIhvcNAQkBFhRhbG9y
+YmFjaEBhZGlzY29uLmNvbTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGB
+AJ2R2tguPZ2uhcPFp/akZvjIkZG4cCDc7egjylP3uFJD86fr+9+KOyywE/pi06FT
+pFFxH2jZ/bw5SvvJat/ziISwgLzA9RtCEfZMGtgsYgtdUGQwmtPbwdV/OVPkvege
+BJ3JEuDkVykpAbnx5bx0pudLYeZnXGxO7u4iDBsUbegMb+7uw7jd3xXtepZbzIXl
+41DEziu/tjfmIPxuRX4JvYR6rwcn9JkjQd822CkxoJaEL/1FLtS0+frcjyPA4Aat
+rQpy2vQ7ocvWpjvsRsSV8nGlrQgf5wYYDtuAUZa6JPZkAmvT8HYBNDpyAunL0Kpi
+UQyPg77AR5nSknLtU6VJBdTJofRN3hKdGsgXhPOifGdHgkuGHnOG4iYmEJSjmZsI
+mXidPTNdhcJGZZSrcLQ7wSaLEbZmJ4gihAO1CEUyjIEjvmLcb6CqXp8D96f1A3A8
+eAnQhESMGa9295P8r8b929lMyyB5RHHL5lVhqXqvC6Om7empEa/6o12sl+fvK7ao
+NwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUbhV+xGIrkm0i7gzkxTYpOBZi
+vokwHwYDVR0jBBgwFoAUsJ9nMyyIiIkfRGJ0nSX/wAYTXdYwDQYJKoZIhvcNAQEL
+BQADggGBAGSwRWsMfC0JFI54k4Xv0jGqw1kuhb8p4UZZONT+6sTBg6dKG5Je6BGc
+IUidHswx2DEAcv57wRjE9TfzOw4a9j8ZRyLJhwHgTPRdNgqHRkL8bKsm/33KLBmX
+yiX8cGZOSYY+gQ/u4lw7aQeLwlIJRthnr4RUu0/z4NoHxWRWLfv5VRNTHcZ4Y0Ai
+I09jWTcFx0a2NlMw/pvmAQpUW74bpHLDJxvFIV3TDAZW2d9Fg+cGbUdTcups59te
+vRRHGQwYE3NrFNwpbMBg+kwCdEXnjRK9H8t3LHIZ7+iFXM93BLfUCKh+0R0ge3Yn
+yopaKqXnFWwtUJzCtINFwvel8GvVRWuITNsAJi+OCjxCTgxkGEGga0vQeIm0ZDRb
+dsvdub5uKIK6bhGZhoi2DSIrputfC8p3Wy4ot/OWw4ydDStZmNQghzou9OO/ov9n
+Tz8ezuxZdlpngbpElimvBc5VArTWaPAlYYyRgwP95CwGkbQy2FtH1iBVRKYMm5e7
+lGYljDXgMg==
+-----END CERTIFICATE-----

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/client-new.csr Added

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIID0DCCAjgCAQAwgYoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTERMA8GA1UE
+BwwIU29tZUNpdHkxETAPBgNVBAoMCFNvbWVDb21wMREwDwYDVQQLDAhTb21lVW5p
+dDEQMA4GA1UEAwwHcnN5c2xvZzEjMCEGCSqGSIb3DQEJARYUYWxvcmJhY2hAYWRp
+c2Nvbi5jb20wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCdkdrYLj2d
+roXDxaf2pGb4yJGRuHAg3O3oI8pT97hSQ/On6/vfijsssBP6YtOhU6RRcR9o2f28
+OUr7yWrf84iEsIC8wPUbQhH2TBrYLGILXVBkMJrT28HVfzlT5L3oHgSdyRLg5Fcp
+KQG58eW8dKbnS2HmZ1xsTu7uIgwbFG3oDG/u7sO43d8V7XqWW8yF5eNQxM4rv7Y3
+5iD8bkV+Cb2Eeq8HJ/SZI0HfNtgpMaCWhC/9RS7UtPn63I8jwOAGra0Kctr0O6HL
+1qY77EbElfJxpa0IH+cGGA7bgFGWuiT2ZAJr0/B2ATQ6cgLpy9CqYlEMj4O+wEeZ
+0pJy7VOlSQXUyaH0Td4SnRrIF4TzonxnR4JLhh5zhuImJhCUo5mbCJl4nT0zXYXC
+RmWUq3C0O8EmixG2ZieIIoQDtQhFMoyBI75i3G+gql6fA/en9QNwPHgJ0IREjBmv
+dveT/K/G/dvZTMsgeURxy+ZVYal6rwujpu3pqRGv+qNdrJfn7yu2qDcCAwEAAaAA
+MA0GCSqGSIb3DQEBCwUAA4IBgQBhQ5VEn10CTlB6GSLwyHPfq5jAYaH+lUcIrN4C
+cOPCGs/GDB6erAED/KYlKOseD/KYNH5PguecuVnS7ZndfzN+nlukd8dE6qTe/fTG
+6zjPDhh7HuoVtjdh6tDqMUteBA8p7I3kSf/fmK2JYVp3nszYek8/RQoeBI7UZxEE
+Y2X2GvwOJK0FdqJUJS288rRh+aqGNJ23CFGUV36YJ/oBIS+0FQjyPIM9uEI/O1lf
+VLqlJ3uWKeb875QXey5IvgG7S37Wkf1IVEWxLXxv90Py515TsBeC4R8ttmo9jEUV
+l+ihbs+fxgCN6YD4/saVeXhso59IZFy/rVjq6vDYX4PW/T4kZMHjP+Zq/zRXul1S
+Ft0u25Pn4ffCtFuQ+lxLk5NID/uhSGznjFV/l4Q+uvQinNbFyoB/3VNQC1PvkSsg
+90BTYQSyn59un1R6wt4dkR51B+Hxk7uMlQIL/xY4PYTJrUBBk+ovbQG1wZGmla+X
+tZ1y+qWCh7Dh7NE6qulhdijgydE=
+-----END CERTIFICATE REQUEST-----

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/client-revoked-key.pem Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC//hRd6ZxsZxU8
+1EmdWyrqQ8K8ntA6XlUvaAArC9rcz/fZpxugozHdqAcTntw2dbg06hca9h3bMx5F
+NoCunJOmAk4m+AfeHM6e508l11kkSV40RFSHq+BtWiRBGb8zw6UR1lDA920tEgPM
+C7nqsoVdka2Ezr6bC8LrAZe4OtwcuNJD6JZe8ITimBh7FcavDLuOmJYhe81vDZ+E
+Wb+RqLpqybxfSvMSTTPn3LA46XHY79D9nh/QWrupOpHYHqee+qwTW6Ot6IcL9LX4
+qA2nsVlAJkJ6BeQxZvgF0f2XX66TCtlFbKPfMu4ReIMvujYXdpiD1gj7MQ6BfVeA
+EDzeDUsNAgMBAAECggEAQWSXJ02Ue8+4ihl8YV5WBajCwWAOaHMM7LKtq/vDtgYX
+00h5voMXTvoWPvaS5vG9pjg9Wm+Nx8VngAeKWO7300lhuSAt/dcuAS2j5a2trRBY
+R9EmQXenX1eelZXhbA4tQSAQLUmZJArIxE0SLABWMIKX6W5JuaGN6GGIfbV+l0E9
+RjQoj+k/XmlrUm11/KcRoL83JqL6wNuxi+AiHnFYEpaxdi/+U9RpVegiRzfS4OH7
+COOm+WEbjJSqyON4BRLGwEJaTcyFOozumyCRNnQIJJx7XW1m5RV+eowDdLcfbdma
+dqGDlPqKSwcr8kZhqXlmnOIgiuxUwGI6WhOjAMAOuQKBgQDe9QPX48Fvw5Yaenp4
+kvEU3lzb6JPYz07ECZ3yz7mfSbJmArj/nDqSiX1UdYInD2dMYw4gPdTX9iIMExXk
+dRTo72ipuNzC3w97GkLDHMKNlCnPrSIFWrh0JqQBI+uQOTXqp0kU25SMzp1AtDlW
+UhtXnt+FdKQDYwXyuFrYkfTnSwKBgQDcckTXY9YSfL4IauNG1mPsJM/+UvAmrKdp
+PDAi7ODVT0zq6h7kn30RUg+4Ebtyag9APdH9W8ta4kZVxID2/r5tY9bHxPAGD6Yd
+8cl0Bii6Rzd3NI5+xddqtZyz/A9PCPeKW3v0mLU16kemGq651bLHtwL5o6AEHXIn
+1T3U6d3oBwKBgQCfJU2FAPHGkVnHtL1O67RiLQcjgbRnAjM7A5JXC6d35+cLoc3j
+xuSYTMPFUcuBjiEyCVK/+OLA9NQAwm7SEDDIxHt1CpuqDgbC3E/jbdgBr0zZDMBI
+CiW34w0WM0mmPPAbeyVTWhmDGMhuszZqQ1l5BdKPNF8Oe9R3GNjf1e92WQKBgQCd
+I2cnEid6rijX3zl7OT+pCOSqqXw+VTxQq3K0sp3h79EocxLqbTW9rv09fIZdnHSa
+mnahX1mpwznX0WcMqbIcT9q+NAfUijsjhULQzcMiZbmH45Lfky9nBWZadgaDlCTA
+H05QoLorYIEKSmLaXRY/fplEUfqydDr3Ye3dY4em6QKBgQC0Heucqyw9THbnmHsr
+wIIb/L0eagI8BReJ+CWRAuhid0BmsRtIZf6mmdQl+vwrt4+O8PtCyJoeiI3qrht6
+SL65po9ERpSijV5lL6TS7VI22xNPtzd1Xf/ACg6/An/qSJeqYKn1DEqznSai8zXx
+PLz21hIcNxaxmTG34HMq+h4BGw==
+-----END PRIVATE KEY-----

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/client-revoked-valid.pem Added

@@ -0,0 +1,92 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 3 (0x3)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=someName, OU=rsyslog, O=SomeOrg, C=US
+        Validity
+            Not Before: Jul  6 13:38:06 2023 GMT
+            Not After : Jun 12 13:38:06 2123 GMT
+        Subject: C=DE, ST=NRW, O=Adiscon GmbH, OU=rsyslog, CN=rsyslog revoked certificate test/emailAddress=alorbach@adiscon.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:bf:fe:14:5d:e9:9c:6c:67:15:3c:d4:49:9d:5b:
+                    2a:ea:43:c2:bc:9e:d0:3a:5e:55:2f:68:00:2b:0b:
+                    da:dc:cf:f7:d9:a7:1b:a0:a3:31:dd:a8:07:13:9e:
+                    dc:36:75:b8:34:ea:17:1a:f6:1d:db:33:1e:45:36:
+                    80:ae:9c:93:a6:02:4e:26:f8:07:de:1c:ce:9e:e7:
+                    4f:25:d7:59:24:49:5e:34:44:54:87:ab:e0:6d:5a:
+                    24:41:19:bf:33:c3:a5:11:d6:50:c0:f7:6d:2d:12:
+                    03:cc:0b:b9:ea:b2:85:5d:91:ad:84:ce:be:9b:0b:
+                    c2:eb:01:97:b8:3a:dc:1c:b8:d2:43:e8:96:5e:f0:
+                    84:e2:98:18:7b:15:c6:af:0c:bb:8e:98:96:21:7b:
+                    cd:6f:0d:9f:84:59:bf:91:a8:ba:6a:c9:bc:5f:4a:
+                    f3:12:4d:33:e7:dc:b0:38:e9:71:d8:ef:d0:fd:9e:
+                    1f:d0:5a:bb:a9:3a:91:d8:1e:a7:9e:fa:ac:13:5b:
+                    a3:ad:e8:87:0b:f4:b5:f8:a8:0d:a7:b1:59:40:26:
+                    42:7a:05:e4:31:66:f8:05:d1:fd:97:5f:ae:93:0a:
+                    d9:45:6c:a3:df:32:ee:11:78:83:2f:ba:36:17:76:
+                    98:83:d6:08:fb:31:0e:81:7d:57:80:10:3c:de:0d:
+                    4b:0d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                20:CE:A2:54:99:CF:22:9A:5C:BB:D4:1E:B0:1E:43:73:63:72:AA:DE
+            X509v3 Authority Key Identifier: 
+                keyid:B0:9F:67:33:2C:88:88:89:1F:44:62:74:9D:25:FF:C0:06:13:5D:D6
+
+    Signature Algorithm: sha256WithRSAEncryption
+         65:ac:7c:30:d0:01:ce:d7:ff:28:61:6c:8d:99:15:ce:45:22:
+         8a:39:70:a4:a6:ce:48:94:e3:4b:8c:be:55:c4:66:96:49:49:
+         4b:e0:4c:95:fd:73:02:54:3a:df:34:2f:96:16:48:ec:c2:23:
+         3d:ee:b4:5a:dd:a0:c9:eb:85:f4:fd:e8:d5:8f:f3:dc:ce:4a:
+         88:bb:be:19:81:3f:8b:0f:09:23:46:14:c9:f5:35:5a:cf:25:
+         7c:92:df:b9:90:5d:ff:4f:21:40:9c:24:7c:0f:1f:3f:62:d1:
+         7b:cc:40:7d:c6:61:49:f3:84:26:78:ed:87:70:06:9c:93:05:
+         a5:c4:7e:60:3d:d0:4a:2c:e4:d6:e5:33:f8:07:dd:5a:0e:9a:
+         93:17:50:29:1a:ff:66:61:d9:40:a7:fb:cc:7b:62:b7:9d:29:
+         1a:2a:3d:7b:93:87:eb:52:4e:00:19:19:3c:4d:73:fc:3d:ed:
+         eb:9d:92:30:bc:b0:ed:51:15:ce:b7:3c:00:09:0c:9d:6d:8b:
+         2b:c9:f5:66:d4:49:44:58:3d:e7:61:3d:6b:21:05:ff:1d:55:
+         59:dd:e4:a6:2f:e5:96:82:eb:24:33:2e:47:61:a5:f8:4d:ab:
+         ad:fc:64:f8:8b:9e:0e:62:8c:16:1d:79:18:74:18:9c:a2:19:
+         c3:24:0d:6e:45:63:f9:08:92:7d:44:0b:96:c7:48:84:72:97:
+         22:23:bf:10:0a:d7:4e:43:8a:db:60:cd:5d:80:5e:71:fa:c2:
+         b6:68:10:ee:cc:29:86:15:d3:d9:93:2a:cc:73:88:be:9f:ad:
+         d0:c5:9c:a4:e4:86:38:e7:41:84:3a:d0:f3:67:1f:2c:40:d7:
+         04:b1:ea:32:13:49:a5:82:1a:a5:6c:3f:5f:dc:fd:55:14:03:
+         8b:d7:bd:01:9e:bc:c5:e4:a1:a8:a8:9d:bc:cd:1f:5b:fc:df:
+         59:b7:0d:aa:47:a0:08:cd:6e:f7:c8:9d:d3:dd:4e:8b:aa:cc:
+         54:20:a0:2b:63:96
+-----BEGIN CERTIFICATE-----
+MIIEUTCCArmgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBEMREwDwYDVQQDEwhzb21l
+TmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMHU29tZU9yZzELMAkGA1UE
+BhMCVVMwIBcNMjMwNzA2MTMzODA2WhgPMjEyMzA2MTIxMzM4MDZaMIGUMQswCQYD
+VQQGEwJERTEMMAoGA1UECAwDTlJXMRUwEwYDVQQKDAxBZGlzY29uIEdtYkgxEDAO
+BgNVBAsMB3JzeXNsb2cxKTAnBgNVBAMMIHJzeXNsb2cgcmV2b2tlZCBjZXJ0aWZp
+Y2F0ZSB0ZXN0MSMwIQYJKoZIhvcNAQkBFhRhbG9yYmFjaEBhZGlzY29uLmNvbTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+FF3pnGxnFTzUSZ1bKupD
+wrye0DpeVS9oACsL2tzP99mnG6CjMd2oBxOe3DZ1uDTqFxr2HdszHkU2gK6ck6YC
+Tib4B94czp7nTyXXWSRJXjREVIer4G1aJEEZvzPDpRHWUMD3bS0SA8wLueqyhV2R
+rYTOvpsLwusBl7g63By40kPoll7whOKYGHsVxq8Mu46YliF7zW8Nn4RZv5GoumrJ
+vF9K8xJNM+fcsDjpcdjv0P2eH9Bau6k6kdgep576rBNbo63ohwv0tfioDaexWUAm
+QnoF5DFm+AXR/ZdfrpMK2UVso98y7hF4gy+6Nhd2mIPWCPsxDoF9V4AQPN4NSw0C
+AwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5l
+cmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCDOolSZzyKaXLvUHrAeQ3Njcqre
+MB8GA1UdIwQYMBaAFLCfZzMsiIiJH0RidJ0l/8AGE13WMA0GCSqGSIb3DQEBCwUA
+A4IBgQBlrHww0AHO1/8oYWyNmRXORSKKOXCkps5IlONLjL5VxGaWSUlL4EyV/XMC
+VDrfNC+WFkjswiM97rRa3aDJ64X0/ejVj/PczkqIu74ZgT+LDwkjRhTJ9TVazyV8
+kt+5kF3/TyFAnCR8Dx8/YtF7zEB9xmFJ84QmeO2HcAackwWlxH5gPdBKLOTW5TP4
+B91aDpqTF1ApGv9mYdlAp/vMe2K3nSkaKj17k4frUk4AGRk8TXP8Pe3rnZIwvLDt
+URXOtzwACQydbYsryfVm1ElEWD3nYT1rIQX/HVVZ3eSmL+WWguskMy5HYaX4Taut
+/GT4i54OYowWHXkYdBicohnDJA1uRWP5CJJ9RAuWx0iEcpciI78QCtdOQ4rbYM1d
+gF5x+sK2aBDuzCmGFdPZkyrMc4i+n63QxZyk5IY450GEOtDzZx8sQNcEseoyE0ml
+ghqlbD9f3P1VFAOL170BnrzF5KGoqJ28zR9b/N9Ztw2qR6AIzW73yJ3T3U6LqsxU
+IKArY5Y=
+-----END CERTIFICATE-----

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/client-revoked.csr Added

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIC9DCCAdwCAQAwga4xCzAJBgNVBAYTAkRFMQwwCgYDVQQIDANOUlcxGDAWBgNV
+BAcMD0dyb3NzcmluZGVyZmVsZDEVMBMGA1UECgwMQWRpc2NvbiBHbWJIMRAwDgYD
+VQQLDAdyc3lzbG9nMSkwJwYDVQQDDCByc3lzbG9nIHJldm9rZWQgY2VydGlmaWNh
+dGUgdGVzdDEjMCEGCSqGSIb3DQEJARYUYWxvcmJhY2hAYWRpc2Nvbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC//hRd6ZxsZxU81EmdWyrqQ8K8
+ntA6XlUvaAArC9rcz/fZpxugozHdqAcTntw2dbg06hca9h3bMx5FNoCunJOmAk4m
++AfeHM6e508l11kkSV40RFSHq+BtWiRBGb8zw6UR1lDA920tEgPMC7nqsoVdka2E
+zr6bC8LrAZe4OtwcuNJD6JZe8ITimBh7FcavDLuOmJYhe81vDZ+EWb+RqLpqybxf
+SvMSTTPn3LA46XHY79D9nh/QWrupOpHYHqee+qwTW6Ot6IcL9LX4qA2nsVlAJkJ6
+BeQxZvgF0f2XX66TCtlFbKPfMu4ReIMvujYXdpiD1gj7MQ6BfVeAEDzeDUsNAgMB
+AAGgADANBgkqhkiG9w0BAQsFAAOCAQEASfTlG7UDUb9bgIerIn2kUYTFxZOnvy/M
+cfDM/iH5m3v7IjHV61mI7x7/P+COG6E9MOSS4+VLFjfc8YlQ67zkyrZxa4LMBqUF
+i+oOvTGvTO4ocBlHcoZ53EE5q3sy/yu67ih8jlTbCjtJ6mUOdXDclJimwKir4e+b
+GPpOvLENDfJ5RShJL5cdGXJqv+ZYuZnh4+zq8h4+EQI1BSzPudomSE6d+gf6Ysyg
+lb1YvhlP2phApgHS+3QeLLW8rTgPheFJcQbg6Sc+m44jysqjOVKc0+RYCdhqI7a7
+Dk/V/eD1VFOoRrIY2WnpvzE39gpV1fl4bUrrcsMCIBe7F2svdFHMog==
+-----END CERTIFICATE REQUEST-----

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/client-revoked.pem Added

@@ -0,0 +1,92 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=someName, OU=rsyslog, O=SomeOrg, C=US
+        Validity
+            Not Before: Jul  6 12:59:25 2023 GMT
+            Not After : Jun 12 12:59:25 2123 GMT
+        Subject: C=DE, ST=NRW, O=Adiscon GmbH, OU=rsyslog, CN=rsyslog revoked certificate test/emailAddress=alorbach@adiscon.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:bf:fe:14:5d:e9:9c:6c:67:15:3c:d4:49:9d:5b:
+                    2a:ea:43:c2:bc:9e:d0:3a:5e:55:2f:68:00:2b:0b:
+                    da:dc:cf:f7:d9:a7:1b:a0:a3:31:dd:a8:07:13:9e:
+                    dc:36:75:b8:34:ea:17:1a:f6:1d:db:33:1e:45:36:
+                    80:ae:9c:93:a6:02:4e:26:f8:07:de:1c:ce:9e:e7:
+                    4f:25:d7:59:24:49:5e:34:44:54:87:ab:e0:6d:5a:
+                    24:41:19:bf:33:c3:a5:11:d6:50:c0:f7:6d:2d:12:
+                    03:cc:0b:b9:ea:b2:85:5d:91:ad:84:ce:be:9b:0b:
+                    c2:eb:01:97:b8:3a:dc:1c:b8:d2:43:e8:96:5e:f0:
+                    84:e2:98:18:7b:15:c6:af:0c:bb:8e:98:96:21:7b:
+                    cd:6f:0d:9f:84:59:bf:91:a8:ba:6a:c9:bc:5f:4a:
+                    f3:12:4d:33:e7:dc:b0:38:e9:71:d8:ef:d0:fd:9e:
+                    1f:d0:5a:bb:a9:3a:91:d8:1e:a7:9e:fa:ac:13:5b:
+                    a3:ad:e8:87:0b:f4:b5:f8:a8:0d:a7:b1:59:40:26:
+                    42:7a:05:e4:31:66:f8:05:d1:fd:97:5f:ae:93:0a:
+                    d9:45:6c:a3:df:32:ee:11:78:83:2f:ba:36:17:76:
+                    98:83:d6:08:fb:31:0e:81:7d:57:80:10:3c:de:0d:
+                    4b:0d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                20:CE:A2:54:99:CF:22:9A:5C:BB:D4:1E:B0:1E:43:73:63:72:AA:DE
+            X509v3 Authority Key Identifier: 
+                keyid:B0:9F:67:33:2C:88:88:89:1F:44:62:74:9D:25:FF:C0:06:13:5D:D6
+
+    Signature Algorithm: sha256WithRSAEncryption
+         33:65:28:98:94:9b:f5:57:0d:bf:02:c2:67:93:8e:8e:77:03:
+         9b:c7:7a:47:53:29:a4:dd:a6:a1:5e:2a:0a:ed:19:02:80:90:
+         b3:97:1f:06:4c:9c:c5:5f:6c:16:f9:12:fb:dd:da:29:88:b7:
+         2c:91:0b:ab:53:79:7a:6e:76:20:fe:fa:b1:99:c2:2b:50:26:
+         7b:cc:8c:75:98:35:95:79:56:43:90:a0:95:5e:98:09:10:4d:
+         ea:c0:1c:bb:c0:7b:a7:8a:9b:21:70:85:65:83:4d:ee:65:ef:
+         10:d3:63:95:fd:51:9d:6c:41:7b:af:af:9c:e7:34:74:a1:7a:
+         86:0a:8e:f2:2a:06:68:77:76:fa:fc:64:bc:28:1d:8b:53:7a:
+         cf:62:0f:87:a9:85:54:8c:a5:41:c3:61:0b:cf:96:c1:fa:81:
+         a5:31:63:f3:cb:17:37:58:6e:d9:30:97:fb:57:2f:31:63:e8:
+         26:0e:82:49:e2:a9:9b:ed:39:7b:24:4e:42:8d:34:74:3a:dc:
+         b7:c5:d6:15:e9:66:28:2d:3c:e0:26:44:76:66:4a:32:94:11:
+         c8:1f:1c:b2:dc:44:69:63:f7:2d:87:b5:89:4a:40:fb:e4:14:
+         68:dc:8a:76:40:93:35:e2:ac:9a:4b:bc:af:c5:8a:8a:38:54:
+         ef:69:01:4c:92:af:c0:07:d0:2f:7a:3c:9e:40:ac:56:07:d0:
+         2b:1f:5f:d0:44:f9:70:e1:44:44:34:ba:fb:3d:54:85:4b:1d:
+         ba:ea:ea:6a:91:0c:08:30:2d:bc:b8:ea:22:c1:16:7b:53:fe:
+         40:2c:8d:f5:c6:c2:39:e6:11:1d:e2:2f:50:a6:76:9c:fd:b9:
+         fa:d5:10:79:0e:e5:02:87:7d:96:e3:81:05:79:c9:a3:d8:f2:
+         a0:b1:8b:0e:8d:33:73:15:6f:27:88:85:03:8a:c5:7a:77:f4:
+         3f:7f:b8:65:97:5b:a0:a6:21:48:67:2c:a2:73:a2:ec:d6:6a:
+         bd:d6:f2:e2:b1:5b
+-----BEGIN CERTIFICATE-----
+MIIEUTCCArmgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBEMREwDwYDVQQDEwhzb21l
+TmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMHU29tZU9yZzELMAkGA1UE
+BhMCVVMwIBcNMjMwNzA2MTI1OTI1WhgPMjEyMzA2MTIxMjU5MjVaMIGUMQswCQYD
+VQQGEwJERTEMMAoGA1UECAwDTlJXMRUwEwYDVQQKDAxBZGlzY29uIEdtYkgxEDAO
+BgNVBAsMB3JzeXNsb2cxKTAnBgNVBAMMIHJzeXNsb2cgcmV2b2tlZCBjZXJ0aWZp
+Y2F0ZSB0ZXN0MSMwIQYJKoZIhvcNAQkBFhRhbG9yYmFjaEBhZGlzY29uLmNvbTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+FF3pnGxnFTzUSZ1bKupD
+wrye0DpeVS9oACsL2tzP99mnG6CjMd2oBxOe3DZ1uDTqFxr2HdszHkU2gK6ck6YC
+Tib4B94czp7nTyXXWSRJXjREVIer4G1aJEEZvzPDpRHWUMD3bS0SA8wLueqyhV2R
+rYTOvpsLwusBl7g63By40kPoll7whOKYGHsVxq8Mu46YliF7zW8Nn4RZv5GoumrJ
+vF9K8xJNM+fcsDjpcdjv0P2eH9Bau6k6kdgep576rBNbo63ohwv0tfioDaexWUAm
+QnoF5DFm+AXR/ZdfrpMK2UVso98y7hF4gy+6Nhd2mIPWCPsxDoF9V4AQPN4NSw0C
+AwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5l
+cmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCDOolSZzyKaXLvUHrAeQ3Njcqre
+MB8GA1UdIwQYMBaAFLCfZzMsiIiJH0RidJ0l/8AGE13WMA0GCSqGSIb3DQEBCwUA
+A4IBgQAzZSiYlJv1Vw2/AsJnk46OdwObx3pHUymk3aahXioK7RkCgJCzlx8GTJzF
+X2wW+RL73dopiLcskQurU3l6bnYg/vqxmcIrUCZ7zIx1mDWVeVZDkKCVXpgJEE3q
+wBy7wHunipshcIVlg03uZe8Q02OV/VGdbEF7r6+c5zR0oXqGCo7yKgZod3b6/GS8
+KB2LU3rPYg+HqYVUjKVBw2ELz5bB+oGlMWPzyxc3WG7ZMJf7Vy8xY+gmDoJJ4qmb
+7Tl7JE5CjTR0Oty3xdYV6WYoLTzgJkR2ZkoylBHIHxyy3ERpY/cth7WJSkD75BRo
+3Ip2QJM14qyaS7yvxYqKOFTvaQFMkq/AB9AvejyeQKxWB9ArH1/QRPlw4URENLr7
+PVSFSx266upqkQwIMC28uOoiwRZ7U/5ALI31xsI55hEd4i9Qpnac/bn61RB5DuUC
+h32W44EFecmj2PKgsYsOjTNzFW8niIUDisV6d/Q/f7hll1ugpiFIZyyic6Ls1mq9
+1vLisVs=
+-----END CERTIFICATE-----

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/crl.pem Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/index.txt Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/index.txt.attr Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/newcerts Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/newcerts/01.pem Added

@@ -0,0 +1,92 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=someName, OU=rsyslog, O=SomeOrg, C=US
+        Validity
+            Not Before: Jul  6 12:57:29 2023 GMT
+            Not After : Jun 12 12:57:29 2123 GMT
+        Subject: C=DE, ST=NRW, O=Adiscon GmbH, OU=rsyslog, CN=rsyslog revoked certificate test/emailAddress=alorbach@adiscon.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:bf:fe:14:5d:e9:9c:6c:67:15:3c:d4:49:9d:5b:
+                    2a:ea:43:c2:bc:9e:d0:3a:5e:55:2f:68:00:2b:0b:
+                    da:dc:cf:f7:d9:a7:1b:a0:a3:31:dd:a8:07:13:9e:
+                    dc:36:75:b8:34:ea:17:1a:f6:1d:db:33:1e:45:36:
+                    80:ae:9c:93:a6:02:4e:26:f8:07:de:1c:ce:9e:e7:
+                    4f:25:d7:59:24:49:5e:34:44:54:87:ab:e0:6d:5a:
+                    24:41:19:bf:33:c3:a5:11:d6:50:c0:f7:6d:2d:12:
+                    03:cc:0b:b9:ea:b2:85:5d:91:ad:84:ce:be:9b:0b:
+                    c2:eb:01:97:b8:3a:dc:1c:b8:d2:43:e8:96:5e:f0:
+                    84:e2:98:18:7b:15:c6:af:0c:bb:8e:98:96:21:7b:
+                    cd:6f:0d:9f:84:59:bf:91:a8:ba:6a:c9:bc:5f:4a:
+                    f3:12:4d:33:e7:dc:b0:38:e9:71:d8:ef:d0:fd:9e:
+                    1f:d0:5a:bb:a9:3a:91:d8:1e:a7:9e:fa:ac:13:5b:
+                    a3:ad:e8:87:0b:f4:b5:f8:a8:0d:a7:b1:59:40:26:
+                    42:7a:05:e4:31:66:f8:05:d1:fd:97:5f:ae:93:0a:
+                    d9:45:6c:a3:df:32:ee:11:78:83:2f:ba:36:17:76:
+                    98:83:d6:08:fb:31:0e:81:7d:57:80:10:3c:de:0d:
+                    4b:0d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                20:CE:A2:54:99:CF:22:9A:5C:BB:D4:1E:B0:1E:43:73:63:72:AA:DE
+            X509v3 Authority Key Identifier: 
+                keyid:B0:9F:67:33:2C:88:88:89:1F:44:62:74:9D:25:FF:C0:06:13:5D:D6
+
+    Signature Algorithm: sha256WithRSAEncryption
+         60:37:92:c5:17:64:ed:64:a3:28:c2:81:60:a2:20:ac:e4:2d:
+         ce:bd:4b:4c:6e:ea:70:a1:2c:2d:d9:1c:94:cb:d1:81:ca:53:
+         c2:51:24:af:da:af:90:11:98:52:da:25:2b:19:59:82:58:d6:
+         84:a5:63:d4:89:05:a9:12:bf:5d:8b:c8:1f:27:b0:a7:65:7e:
+         0c:18:b7:3d:4e:ec:c5:34:b3:d3:92:f7:de:e5:19:1b:b9:e8:
+         47:a7:ca:22:13:c4:63:4f:44:09:70:e2:90:f3:a7:5e:e0:5d:
+         9c:f7:be:ea:1e:88:e7:c2:d3:b6:35:6d:b0:3b:84:8f:03:94:
+         a8:c0:c1:ed:27:17:9a:4d:f7:33:23:1e:76:3a:63:38:f0:59:
+         39:98:ce:89:4b:2a:89:0e:12:bf:25:b5:d6:04:20:88:f0:65:
+         9d:70:90:67:e8:28:8e:09:fa:d9:ab:c9:a9:0f:28:63:10:bb:
+         24:2d:44:2f:6b:fb:7c:d2:38:01:ab:d2:33:2d:50:f4:75:80:
+         9e:4f:d2:26:6c:31:23:44:8e:d5:a3:51:56:cf:d9:38:f6:d0:
+         84:c0:fb:6f:c1:66:9c:e7:dd:51:4f:42:bb:d7:cc:ba:35:e1:
+         c6:a2:5c:4b:f2:1e:b7:e2:52:a5:83:97:ab:42:09:54:04:ed:
+         4f:01:2d:cf:ee:44:b4:da:39:5c:da:30:d5:92:b6:04:11:8b:
+         04:d7:6a:3a:28:6e:54:97:97:99:a3:ba:3a:48:1a:17:ef:49:
+         05:fd:c5:e6:3f:c1:7c:ac:b0:45:62:ff:15:fd:13:1b:04:ba:
+         72:23:32:0a:b8:4d:39:9a:31:15:4c:0a:d0:ef:a2:82:8f:2e:
+         ad:3c:23:dd:59:12:08:6f:e0:5b:5e:5c:29:db:74:ff:8c:08:
+         43:59:6a:a1:57:df:37:02:53:16:14:f7:c5:4b:47:61:1e:86:
+         aa:2d:46:4d:b3:85:8a:ac:c3:8c:b5:87:90:01:4c:33:91:96:
+         38:95:06:a7:36:90
+-----BEGIN CERTIFICATE-----
+MIIEUTCCArmgAwIBAgIBATANBgkqhkiG9w0BAQsFADBEMREwDwYDVQQDEwhzb21l
+TmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMHU29tZU9yZzELMAkGA1UE
+BhMCVVMwIBcNMjMwNzA2MTI1NzI5WhgPMjEyMzA2MTIxMjU3MjlaMIGUMQswCQYD
+VQQGEwJERTEMMAoGA1UECAwDTlJXMRUwEwYDVQQKDAxBZGlzY29uIEdtYkgxEDAO
+BgNVBAsMB3JzeXNsb2cxKTAnBgNVBAMMIHJzeXNsb2cgcmV2b2tlZCBjZXJ0aWZp
+Y2F0ZSB0ZXN0MSMwIQYJKoZIhvcNAQkBFhRhbG9yYmFjaEBhZGlzY29uLmNvbTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+FF3pnGxnFTzUSZ1bKupD
+wrye0DpeVS9oACsL2tzP99mnG6CjMd2oBxOe3DZ1uDTqFxr2HdszHkU2gK6ck6YC
+Tib4B94czp7nTyXXWSRJXjREVIer4G1aJEEZvzPDpRHWUMD3bS0SA8wLueqyhV2R
+rYTOvpsLwusBl7g63By40kPoll7whOKYGHsVxq8Mu46YliF7zW8Nn4RZv5GoumrJ
+vF9K8xJNM+fcsDjpcdjv0P2eH9Bau6k6kdgep576rBNbo63ohwv0tfioDaexWUAm
+QnoF5DFm+AXR/ZdfrpMK2UVso98y7hF4gy+6Nhd2mIPWCPsxDoF9V4AQPN4NSw0C
+AwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5l
+cmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCDOolSZzyKaXLvUHrAeQ3Njcqre
+MB8GA1UdIwQYMBaAFLCfZzMsiIiJH0RidJ0l/8AGE13WMA0GCSqGSIb3DQEBCwUA
+A4IBgQBgN5LFF2TtZKMowoFgoiCs5C3OvUtMbupwoSwt2RyUy9GBylPCUSSv2q+Q
+EZhS2iUrGVmCWNaEpWPUiQWpEr9di8gfJ7CnZX4MGLc9TuzFNLPTkvfe5RkbuehH
+p8oiE8RjT0QJcOKQ86de4F2c977qHojnwtO2NW2wO4SPA5SowMHtJxeaTfczIx52
+OmM48Fk5mM6JSyqJDhK/JbXWBCCI8GWdcJBn6CiOCfrZq8mpDyhjELskLUQva/t8
+0jgBq9IzLVD0dYCeT9ImbDEjRI7Vo1FWz9k49tCEwPtvwWac591RT0K718y6NeHG
+olxL8h634lKlg5erQglUBO1PAS3P7kS02jlc2jDVkrYEEYsE12o6KG5Ul5eZo7o6
+SBoX70kF/cXmP8F8rLBFYv8V/RMbBLpyIzIKuE05mjEVTArQ76KCjy6tPCPdWRII
+b+BbXlwp23T/jAhDWWqhV983AlMWFPfFS0dhHoaqLUZNs4WKrMOMtYeQAUwzkZY4
+lQanNpA=
+-----END CERTIFICATE-----

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/newcerts/02.pem Added

@@ -0,0 +1,92 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=someName, OU=rsyslog, O=SomeOrg, C=US
+        Validity
+            Not Before: Jul  6 12:59:25 2023 GMT
+            Not After : Jun 12 12:59:25 2123 GMT
+        Subject: C=DE, ST=NRW, O=Adiscon GmbH, OU=rsyslog, CN=rsyslog revoked certificate test/emailAddress=alorbach@adiscon.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:bf:fe:14:5d:e9:9c:6c:67:15:3c:d4:49:9d:5b:
+                    2a:ea:43:c2:bc:9e:d0:3a:5e:55:2f:68:00:2b:0b:
+                    da:dc:cf:f7:d9:a7:1b:a0:a3:31:dd:a8:07:13:9e:
+                    dc:36:75:b8:34:ea:17:1a:f6:1d:db:33:1e:45:36:
+                    80:ae:9c:93:a6:02:4e:26:f8:07:de:1c:ce:9e:e7:
+                    4f:25:d7:59:24:49:5e:34:44:54:87:ab:e0:6d:5a:
+                    24:41:19:bf:33:c3:a5:11:d6:50:c0:f7:6d:2d:12:
+                    03:cc:0b:b9:ea:b2:85:5d:91:ad:84:ce:be:9b:0b:
+                    c2:eb:01:97:b8:3a:dc:1c:b8:d2:43:e8:96:5e:f0:
+                    84:e2:98:18:7b:15:c6:af:0c:bb:8e:98:96:21:7b:
+                    cd:6f:0d:9f:84:59:bf:91:a8:ba:6a:c9:bc:5f:4a:
+                    f3:12:4d:33:e7:dc:b0:38:e9:71:d8:ef:d0:fd:9e:
+                    1f:d0:5a:bb:a9:3a:91:d8:1e:a7:9e:fa:ac:13:5b:
+                    a3:ad:e8:87:0b:f4:b5:f8:a8:0d:a7:b1:59:40:26:
+                    42:7a:05:e4:31:66:f8:05:d1:fd:97:5f:ae:93:0a:
+                    d9:45:6c:a3:df:32:ee:11:78:83:2f:ba:36:17:76:
+                    98:83:d6:08:fb:31:0e:81:7d:57:80:10:3c:de:0d:
+                    4b:0d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                20:CE:A2:54:99:CF:22:9A:5C:BB:D4:1E:B0:1E:43:73:63:72:AA:DE
+            X509v3 Authority Key Identifier: 
+                keyid:B0:9F:67:33:2C:88:88:89:1F:44:62:74:9D:25:FF:C0:06:13:5D:D6
+
+    Signature Algorithm: sha256WithRSAEncryption
+         33:65:28:98:94:9b:f5:57:0d:bf:02:c2:67:93:8e:8e:77:03:
+         9b:c7:7a:47:53:29:a4:dd:a6:a1:5e:2a:0a:ed:19:02:80:90:
+         b3:97:1f:06:4c:9c:c5:5f:6c:16:f9:12:fb:dd:da:29:88:b7:
+         2c:91:0b:ab:53:79:7a:6e:76:20:fe:fa:b1:99:c2:2b:50:26:
+         7b:cc:8c:75:98:35:95:79:56:43:90:a0:95:5e:98:09:10:4d:
+         ea:c0:1c:bb:c0:7b:a7:8a:9b:21:70:85:65:83:4d:ee:65:ef:
+         10:d3:63:95:fd:51:9d:6c:41:7b:af:af:9c:e7:34:74:a1:7a:
+         86:0a:8e:f2:2a:06:68:77:76:fa:fc:64:bc:28:1d:8b:53:7a:
+         cf:62:0f:87:a9:85:54:8c:a5:41:c3:61:0b:cf:96:c1:fa:81:
+         a5:31:63:f3:cb:17:37:58:6e:d9:30:97:fb:57:2f:31:63:e8:
+         26:0e:82:49:e2:a9:9b:ed:39:7b:24:4e:42:8d:34:74:3a:dc:
+         b7:c5:d6:15:e9:66:28:2d:3c:e0:26:44:76:66:4a:32:94:11:
+         c8:1f:1c:b2:dc:44:69:63:f7:2d:87:b5:89:4a:40:fb:e4:14:
+         68:dc:8a:76:40:93:35:e2:ac:9a:4b:bc:af:c5:8a:8a:38:54:
+         ef:69:01:4c:92:af:c0:07:d0:2f:7a:3c:9e:40:ac:56:07:d0:
+         2b:1f:5f:d0:44:f9:70:e1:44:44:34:ba:fb:3d:54:85:4b:1d:
+         ba:ea:ea:6a:91:0c:08:30:2d:bc:b8:ea:22:c1:16:7b:53:fe:
+         40:2c:8d:f5:c6:c2:39:e6:11:1d:e2:2f:50:a6:76:9c:fd:b9:
+         fa:d5:10:79:0e:e5:02:87:7d:96:e3:81:05:79:c9:a3:d8:f2:
+         a0:b1:8b:0e:8d:33:73:15:6f:27:88:85:03:8a:c5:7a:77:f4:
+         3f:7f:b8:65:97:5b:a0:a6:21:48:67:2c:a2:73:a2:ec:d6:6a:
+         bd:d6:f2:e2:b1:5b
+-----BEGIN CERTIFICATE-----
+MIIEUTCCArmgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBEMREwDwYDVQQDEwhzb21l
+TmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMHU29tZU9yZzELMAkGA1UE
+BhMCVVMwIBcNMjMwNzA2MTI1OTI1WhgPMjEyMzA2MTIxMjU5MjVaMIGUMQswCQYD
+VQQGEwJERTEMMAoGA1UECAwDTlJXMRUwEwYDVQQKDAxBZGlzY29uIEdtYkgxEDAO
+BgNVBAsMB3JzeXNsb2cxKTAnBgNVBAMMIHJzeXNsb2cgcmV2b2tlZCBjZXJ0aWZp
+Y2F0ZSB0ZXN0MSMwIQYJKoZIhvcNAQkBFhRhbG9yYmFjaEBhZGlzY29uLmNvbTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+FF3pnGxnFTzUSZ1bKupD
+wrye0DpeVS9oACsL2tzP99mnG6CjMd2oBxOe3DZ1uDTqFxr2HdszHkU2gK6ck6YC
+Tib4B94czp7nTyXXWSRJXjREVIer4G1aJEEZvzPDpRHWUMD3bS0SA8wLueqyhV2R
+rYTOvpsLwusBl7g63By40kPoll7whOKYGHsVxq8Mu46YliF7zW8Nn4RZv5GoumrJ
+vF9K8xJNM+fcsDjpcdjv0P2eH9Bau6k6kdgep576rBNbo63ohwv0tfioDaexWUAm
+QnoF5DFm+AXR/ZdfrpMK2UVso98y7hF4gy+6Nhd2mIPWCPsxDoF9V4AQPN4NSw0C
+AwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5l
+cmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCDOolSZzyKaXLvUHrAeQ3Njcqre
+MB8GA1UdIwQYMBaAFLCfZzMsiIiJH0RidJ0l/8AGE13WMA0GCSqGSIb3DQEBCwUA
+A4IBgQAzZSiYlJv1Vw2/AsJnk46OdwObx3pHUymk3aahXioK7RkCgJCzlx8GTJzF
+X2wW+RL73dopiLcskQurU3l6bnYg/vqxmcIrUCZ7zIx1mDWVeVZDkKCVXpgJEE3q
+wBy7wHunipshcIVlg03uZe8Q02OV/VGdbEF7r6+c5zR0oXqGCo7yKgZod3b6/GS8
+KB2LU3rPYg+HqYVUjKVBw2ELz5bB+oGlMWPzyxc3WG7ZMJf7Vy8xY+gmDoJJ4qmb
+7Tl7JE5CjTR0Oty3xdYV6WYoLTzgJkR2ZkoylBHIHxyy3ERpY/cth7WJSkD75BRo
+3Ip2QJM14qyaS7yvxYqKOFTvaQFMkq/AB9AvejyeQKxWB9ArH1/QRPlw4URENLr7
+PVSFSx266upqkQwIMC28uOoiwRZ7U/5ALI31xsI55hEd4i9Qpnac/bn61RB5DuUC
+h32W44EFecmj2PKgsYsOjTNzFW8niIUDisV6d/Q/f7hll1ugpiFIZyyic6Ls1mq9
+1vLisVs=
+-----END CERTIFICATE-----

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/newcerts/03.pem Added

@@ -0,0 +1,92 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 3 (0x3)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=someName, OU=rsyslog, O=SomeOrg, C=US
+        Validity
+            Not Before: Jul  6 13:38:06 2023 GMT
+            Not After : Jun 12 13:38:06 2123 GMT
+        Subject: C=DE, ST=NRW, O=Adiscon GmbH, OU=rsyslog, CN=rsyslog revoked certificate test/emailAddress=alorbach@adiscon.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:bf:fe:14:5d:e9:9c:6c:67:15:3c:d4:49:9d:5b:
+                    2a:ea:43:c2:bc:9e:d0:3a:5e:55:2f:68:00:2b:0b:
+                    da:dc:cf:f7:d9:a7:1b:a0:a3:31:dd:a8:07:13:9e:
+                    dc:36:75:b8:34:ea:17:1a:f6:1d:db:33:1e:45:36:
+                    80:ae:9c:93:a6:02:4e:26:f8:07:de:1c:ce:9e:e7:
+                    4f:25:d7:59:24:49:5e:34:44:54:87:ab:e0:6d:5a:
+                    24:41:19:bf:33:c3:a5:11:d6:50:c0:f7:6d:2d:12:
+                    03:cc:0b:b9:ea:b2:85:5d:91:ad:84:ce:be:9b:0b:
+                    c2:eb:01:97:b8:3a:dc:1c:b8:d2:43:e8:96:5e:f0:
+                    84:e2:98:18:7b:15:c6:af:0c:bb:8e:98:96:21:7b:
+                    cd:6f:0d:9f:84:59:bf:91:a8:ba:6a:c9:bc:5f:4a:
+                    f3:12:4d:33:e7:dc:b0:38:e9:71:d8:ef:d0:fd:9e:
+                    1f:d0:5a:bb:a9:3a:91:d8:1e:a7:9e:fa:ac:13:5b:
+                    a3:ad:e8:87:0b:f4:b5:f8:a8:0d:a7:b1:59:40:26:
+                    42:7a:05:e4:31:66:f8:05:d1:fd:97:5f:ae:93:0a:
+                    d9:45:6c:a3:df:32:ee:11:78:83:2f:ba:36:17:76:
+                    98:83:d6:08:fb:31:0e:81:7d:57:80:10:3c:de:0d:
+                    4b:0d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                20:CE:A2:54:99:CF:22:9A:5C:BB:D4:1E:B0:1E:43:73:63:72:AA:DE
+            X509v3 Authority Key Identifier: 
+                keyid:B0:9F:67:33:2C:88:88:89:1F:44:62:74:9D:25:FF:C0:06:13:5D:D6
+
+    Signature Algorithm: sha256WithRSAEncryption
+         65:ac:7c:30:d0:01:ce:d7:ff:28:61:6c:8d:99:15:ce:45:22:
+         8a:39:70:a4:a6:ce:48:94:e3:4b:8c:be:55:c4:66:96:49:49:
+         4b:e0:4c:95:fd:73:02:54:3a:df:34:2f:96:16:48:ec:c2:23:
+         3d:ee:b4:5a:dd:a0:c9:eb:85:f4:fd:e8:d5:8f:f3:dc:ce:4a:
+         88:bb:be:19:81:3f:8b:0f:09:23:46:14:c9:f5:35:5a:cf:25:
+         7c:92:df:b9:90:5d:ff:4f:21:40:9c:24:7c:0f:1f:3f:62:d1:
+         7b:cc:40:7d:c6:61:49:f3:84:26:78:ed:87:70:06:9c:93:05:
+         a5:c4:7e:60:3d:d0:4a:2c:e4:d6:e5:33:f8:07:dd:5a:0e:9a:
+         93:17:50:29:1a:ff:66:61:d9:40:a7:fb:cc:7b:62:b7:9d:29:
+         1a:2a:3d:7b:93:87:eb:52:4e:00:19:19:3c:4d:73:fc:3d:ed:
+         eb:9d:92:30:bc:b0:ed:51:15:ce:b7:3c:00:09:0c:9d:6d:8b:
+         2b:c9:f5:66:d4:49:44:58:3d:e7:61:3d:6b:21:05:ff:1d:55:
+         59:dd:e4:a6:2f:e5:96:82:eb:24:33:2e:47:61:a5:f8:4d:ab:
+         ad:fc:64:f8:8b:9e:0e:62:8c:16:1d:79:18:74:18:9c:a2:19:
+         c3:24:0d:6e:45:63:f9:08:92:7d:44:0b:96:c7:48:84:72:97:
+         22:23:bf:10:0a:d7:4e:43:8a:db:60:cd:5d:80:5e:71:fa:c2:
+         b6:68:10:ee:cc:29:86:15:d3:d9:93:2a:cc:73:88:be:9f:ad:
+         d0:c5:9c:a4:e4:86:38:e7:41:84:3a:d0:f3:67:1f:2c:40:d7:
+         04:b1:ea:32:13:49:a5:82:1a:a5:6c:3f:5f:dc:fd:55:14:03:
+         8b:d7:bd:01:9e:bc:c5:e4:a1:a8:a8:9d:bc:cd:1f:5b:fc:df:
+         59:b7:0d:aa:47:a0:08:cd:6e:f7:c8:9d:d3:dd:4e:8b:aa:cc:
+         54:20:a0:2b:63:96
+-----BEGIN CERTIFICATE-----
+MIIEUTCCArmgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBEMREwDwYDVQQDEwhzb21l
+TmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMHU29tZU9yZzELMAkGA1UE
+BhMCVVMwIBcNMjMwNzA2MTMzODA2WhgPMjEyMzA2MTIxMzM4MDZaMIGUMQswCQYD
+VQQGEwJERTEMMAoGA1UECAwDTlJXMRUwEwYDVQQKDAxBZGlzY29uIEdtYkgxEDAO
+BgNVBAsMB3JzeXNsb2cxKTAnBgNVBAMMIHJzeXNsb2cgcmV2b2tlZCBjZXJ0aWZp
+Y2F0ZSB0ZXN0MSMwIQYJKoZIhvcNAQkBFhRhbG9yYmFjaEBhZGlzY29uLmNvbTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+FF3pnGxnFTzUSZ1bKupD
+wrye0DpeVS9oACsL2tzP99mnG6CjMd2oBxOe3DZ1uDTqFxr2HdszHkU2gK6ck6YC
+Tib4B94czp7nTyXXWSRJXjREVIer4G1aJEEZvzPDpRHWUMD3bS0SA8wLueqyhV2R
+rYTOvpsLwusBl7g63By40kPoll7whOKYGHsVxq8Mu46YliF7zW8Nn4RZv5GoumrJ
+vF9K8xJNM+fcsDjpcdjv0P2eH9Bau6k6kdgep576rBNbo63ohwv0tfioDaexWUAm
+QnoF5DFm+AXR/ZdfrpMK2UVso98y7hF4gy+6Nhd2mIPWCPsxDoF9V4AQPN4NSw0C
+AwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5l
+cmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCDOolSZzyKaXLvUHrAeQ3Njcqre
+MB8GA1UdIwQYMBaAFLCfZzMsiIiJH0RidJ0l/8AGE13WMA0GCSqGSIb3DQEBCwUA
+A4IBgQBlrHww0AHO1/8oYWyNmRXORSKKOXCkps5IlONLjL5VxGaWSUlL4EyV/XMC
+VDrfNC+WFkjswiM97rRa3aDJ64X0/ejVj/PczkqIu74ZgT+LDwkjRhTJ9TVazyV8
+kt+5kF3/TyFAnCR8Dx8/YtF7zEB9xmFJ84QmeO2HcAackwWlxH5gPdBKLOTW5TP4
+B91aDpqTF1ApGv9mYdlAp/vMe2K3nSkaKj17k4frUk4AGRk8TXP8Pe3rnZIwvLDt
+URXOtzwACQydbYsryfVm1ElEWD3nYT1rIQX/HVVZ3eSmL+WWguskMy5HYaX4Taut
+/GT4i54OYowWHXkYdBicohnDJA1uRWP5CJJ9RAuWx0iEcpciI78QCtdOQ4rbYM1d
+gF5x+sK2aBDuzCmGFdPZkyrMc4i+n63QxZyk5IY450GEOtDzZx8sQNcEseoyE0ml
+ghqlbD9f3P1VFAOL170BnrzF5KGoqJ28zR9b/N9Ztw2qR6AIzW73yJ3T3U6LqsxU
+IKArY5Y=
+-----END CERTIFICATE-----

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/newcerts/04.pem Added

@@ -0,0 +1,102 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4 (0x4)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=someName, OU=rsyslog, O=SomeOrg, C=US
+        Validity
+            Not Before: Jul  6 13:52:50 2023 GMT
+            Not After : Jun 12 13:52:50 2123 GMT
+        Subject: C=US, ST=CA, O=SomeComp, OU=SomeUnit, CN=rsyslog/emailAddress=alorbach@adiscon.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (3072 bit)
+                Modulus:
+                    00:9d:91:da:d8:2e:3d:9d:ae:85:c3:c5:a7:f6:a4:
+                    66:f8:c8:91:91:b8:70:20:dc:ed:e8:23:ca:53:f7:
+                    b8:52:43:f3:a7:eb:fb:df:8a:3b:2c:b0:13:fa:62:
+                    d3:a1:53:a4:51:71:1f:68:d9:fd:bc:39:4a:fb:c9:
+                    6a:df:f3:88:84:b0:80:bc:c0:f5:1b:42:11:f6:4c:
+                    1a:d8:2c:62:0b:5d:50:64:30:9a:d3:db:c1:d5:7f:
+                    39:53:e4:bd:e8:1e:04:9d:c9:12:e0:e4:57:29:29:
+                    01:b9:f1:e5:bc:74:a6:e7:4b:61:e6:67:5c:6c:4e:
+                    ee:ee:22:0c:1b:14:6d:e8:0c:6f:ee:ee:c3:b8:dd:
+                    df:15:ed:7a:96:5b:cc:85:e5:e3:50:c4:ce:2b:bf:
+                    b6:37:e6:20:fc:6e:45:7e:09:bd:84:7a:af:07:27:
+                    f4:99:23:41:df:36:d8:29:31:a0:96:84:2f:fd:45:
+                    2e:d4:b4:f9:fa:dc:8f:23:c0:e0:06:ad:ad:0a:72:
+                    da:f4:3b:a1:cb:d6:a6:3b:ec:46:c4:95:f2:71:a5:
+                    ad:08:1f:e7:06:18:0e:db:80:51:96:ba:24:f6:64:
+                    02:6b:d3:f0:76:01:34:3a:72:02:e9:cb:d0:aa:62:
+                    51:0c:8f:83:be:c0:47:99:d2:92:72:ed:53:a5:49:
+                    05:d4:c9:a1:f4:4d:de:12:9d:1a:c8:17:84:f3:a2:
+                    7c:67:47:82:4b:86:1e:73:86:e2:26:26:10:94:a3:
+                    99:9b:08:99:78:9d:3d:33:5d:85:c2:46:65:94:ab:
+                    70:b4:3b:c1:26:8b:11:b6:66:27:88:22:84:03:b5:
+                    08:45:32:8c:81:23:be:62:dc:6f:a0:aa:5e:9f:03:
+                    f7:a7:f5:03:70:3c:78:09:d0:84:44:8c:19:af:76:
+                    f7:93:fc:af:c6:fd:db:d9:4c:cb:20:79:44:71:cb:
+                    e6:55:61:a9:7a:af:0b:a3:a6:ed:e9:a9:11:af:fa:
+                    a3:5d:ac:97:e7:ef:2b:b6:a8:37
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6E:15:7E:C4:62:2B:92:6D:22:EE:0C:E4:C5:36:29:38:16:62:BE:89
+            X509v3 Authority Key Identifier: 
+                keyid:B0:9F:67:33:2C:88:88:89:1F:44:62:74:9D:25:FF:C0:06:13:5D:D6
+
+    Signature Algorithm: sha256WithRSAEncryption
+         64:b0:45:6b:0c:7c:2d:09:14:8e:78:93:85:ef:d2:31:aa:c3:
+         59:2e:85:bf:29:e1:46:59:38:d4:fe:ea:c4:c1:83:a7:4a:1b:
+         92:5e:e8:11:9c:21:48:9d:1e:cc:31:d8:31:00:72:fe:7b:c1:
+         18:c4:f5:37:f3:3b:0e:1a:f6:3f:19:47:22:c9:87:01:e0:4c:
+         f4:5d:36:0a:87:46:42:fc:6c:ab:26:ff:7d:ca:2c:19:97:ca:
+         25:fc:70:66:4e:49:86:3e:81:0f:ee:e2:5c:3b:69:07:8b:c2:
+         52:09:46:d8:67:af:84:54:bb:4f:f3:e0:da:07:c5:64:56:2d:
+         fb:f9:55:13:53:1d:c6:78:63:40:22:23:4f:63:59:37:05:c7:
+         46:b6:36:53:30:fe:9b:e6:01:0a:54:5b:be:1b:a4:72:c3:27:
+         1b:c5:21:5d:d3:0c:06:56:d9:df:45:83:e7:06:6d:47:53:72:
+         ea:6c:e7:db:5e:bd:14:47:19:0c:18:13:73:6b:14:dc:29:6c:
+         c0:60:fa:4c:02:74:45:e7:8d:12:bd:1f:cb:77:2c:72:19:ef:
+         e8:85:5c:cf:77:04:b7:d4:08:a8:7e:d1:1d:20:7b:76:27:ca:
+         8a:5a:2a:a5:e7:15:6c:2d:50:9c:c2:b4:83:45:c2:f7:a5:f0:
+         6b:d5:45:6b:88:4c:db:00:26:2f:8e:0a:3c:42:4e:0c:64:18:
+         41:a0:6b:4b:d0:78:89:b4:64:34:5b:76:cb:dd:b9:be:6e:28:
+         82:ba:6e:11:99:86:88:b6:0d:22:2b:a6:eb:5f:0b:ca:77:5b:
+         2e:28:b7:f3:96:c3:8c:9d:0d:2b:59:98:d4:20:87:3a:2e:f4:
+         e3:bf:a2:ff:67:4f:3f:1e:ce:ec:59:76:5a:67:81:ba:44:96:
+         29:af:05:ce:55:02:b4:d6:68:f0:25:61:8c:91:83:03:fd:e4:
+         2c:06:91:b4:32:d8:5b:47:d6:20:55:44:a6:0c:9b:97:bb:94:
+         66:25:8c:35:e0:32
+-----BEGIN CERTIFICATE-----
+MIIEszCCAxugAwIBAgIBBDANBgkqhkiG9w0BAQsFADBEMREwDwYDVQQDEwhzb21l
+TmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMHU29tZU9yZzELMAkGA1UE
+BhMCVVMwIBcNMjMwNzA2MTM1MjUwWhgPMjEyMzA2MTIxMzUyNTBaMHcxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJDQTERMA8GA1UECgwIU29tZUNvbXAxETAPBgNVBAsM
+CFNvbWVVbml0MRAwDgYDVQQDDAdyc3lzbG9nMSMwIQYJKoZIhvcNAQkBFhRhbG9y
+YmFjaEBhZGlzY29uLmNvbTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGB
+AJ2R2tguPZ2uhcPFp/akZvjIkZG4cCDc7egjylP3uFJD86fr+9+KOyywE/pi06FT
+pFFxH2jZ/bw5SvvJat/ziISwgLzA9RtCEfZMGtgsYgtdUGQwmtPbwdV/OVPkvege
+BJ3JEuDkVykpAbnx5bx0pudLYeZnXGxO7u4iDBsUbegMb+7uw7jd3xXtepZbzIXl
+41DEziu/tjfmIPxuRX4JvYR6rwcn9JkjQd822CkxoJaEL/1FLtS0+frcjyPA4Aat
+rQpy2vQ7ocvWpjvsRsSV8nGlrQgf5wYYDtuAUZa6JPZkAmvT8HYBNDpyAunL0Kpi
+UQyPg77AR5nSknLtU6VJBdTJofRN3hKdGsgXhPOifGdHgkuGHnOG4iYmEJSjmZsI
+mXidPTNdhcJGZZSrcLQ7wSaLEbZmJ4gihAO1CEUyjIEjvmLcb6CqXp8D96f1A3A8
+eAnQhESMGa9295P8r8b929lMyyB5RHHL5lVhqXqvC6Om7empEa/6o12sl+fvK7ao
+NwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUbhV+xGIrkm0i7gzkxTYpOBZi
+vokwHwYDVR0jBBgwFoAUsJ9nMyyIiIkfRGJ0nSX/wAYTXdYwDQYJKoZIhvcNAQEL
+BQADggGBAGSwRWsMfC0JFI54k4Xv0jGqw1kuhb8p4UZZONT+6sTBg6dKG5Je6BGc
+IUidHswx2DEAcv57wRjE9TfzOw4a9j8ZRyLJhwHgTPRdNgqHRkL8bKsm/33KLBmX
+yiX8cGZOSYY+gQ/u4lw7aQeLwlIJRthnr4RUu0/z4NoHxWRWLfv5VRNTHcZ4Y0Ai
+I09jWTcFx0a2NlMw/pvmAQpUW74bpHLDJxvFIV3TDAZW2d9Fg+cGbUdTcups59te
+vRRHGQwYE3NrFNwpbMBg+kwCdEXnjRK9H8t3LHIZ7+iFXM93BLfUCKh+0R0ge3Yn
+yopaKqXnFWwtUJzCtINFwvel8GvVRWuITNsAJi+OCjxCTgxkGEGga0vQeIm0ZDRb
+dsvdub5uKIK6bhGZhoi2DSIrputfC8p3Wy4ot/OWw4ydDStZmNQghzou9OO/ov9n
+Tz8ezuxZdlpngbpElimvBc5VArTWaPAlYYyRgwP95CwGkbQy2FtH1iBVRKYMm5e7
+lGYljDXgMg==
+-----END CERTIFICATE-----

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/openssl-cmds.sh Added

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/openssl.cnf Added

@@ -0,0 +1,41 @@
+ ca 
+default_ca = CA_default
+
+ CA_default 
+dir              = ./
+certs            = $dir/certs
+crl_dir          = $dir/crl
+database         = $dir/index.txt
+new_certs_dir    = $dir/newcerts
+
+certificate      = $dir/ca.pem
+serial           = $dir/serial
+crl              = $dir/crl.pem
+private_key      = $dir/ca-key.pem
+
+x509_extensions  = usr_cert
+name_opt         = ca_default
+cert_opt         = ca_default
+default_days     = 36500
+default_md       = sha256
+
+# How long before next CRL, default is 1 but for testing we need no expire, so 100 years is fine.
+default_crl_days = 36500
+
+preserve         = no
+policy           = policy_match
+
+ policy_match 
+countryName             = supplied
+stateOrProvinceName     = supplied
+organizationName        = supplied
+organizationalUnitName  = optional
+commonName              = supplied
+emailAddress            = optional
+
+ usr_cert 
+basicConstraints=CA:FALSE
+nsComment="OpenSSL Generated Certificate"
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+

_service:tar_scm:rsyslog-8.2312.0.tar.gz/tests/testsuites/x.509/serial Added

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tools/Makefile.in -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tools/Makefile.in Changed

@@ -339,6 +339,10 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
 LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
 LIBDBI_LIBS = @LIBDBI_LIBS@
 LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
@@ -407,6 +411,8 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PROTON_CFLAGS = @PROTON_CFLAGS@
 PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
 PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
 PTHREADS_LIBS = @PTHREADS_LIBS@
 PYTHON = @PYTHON@
@@ -418,6 +424,7 @@
 RABBITMQ_LIBS = @RABBITMQ_LIBS@
 RANLIB = @RANLIB@
 READLINK = @READLINK@
+REDIS = @REDIS@
 RELP_CFLAGS = @RELP_CFLAGS@
 RELP_LIBS = @RELP_LIBS@
 RSRT_CFLAGS = @RSRT_CFLAGS@
@@ -513,7 +520,6 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tools/omfile.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tools/omfile.c Changed

@@ -17,7 +17,7 @@
  * pipes. These have been moved to ompipe, to reduced the entanglement
  * between the two different functionalities. -- rgerhards
  *
- * Copyright 2007-2022 Adiscon GmbH.
+ * Copyright 2007-2023 Adiscon GmbH.
  *
  * This file is part of rsyslog.
  *
@@ -282,6 +282,8 @@
 	{ "sig.provider", eCmdHdlrGetWord, 0 },
 	{ "cry.provider", eCmdHdlrGetWord, 0 },
 	{ "closetimeout", eCmdHdlrPositiveInt, 0 },
+	{ "rotation.sizelimit", eCmdHdlrSize, 0 },
+	{ "rotation.sizelimitcommand", eCmdHdlrString, 0 },
 	{ "template", eCmdHdlrGetWord, 0 }
 };
 static struct cnfparamblk actpblk =
@@ -1132,6 +1134,8 @@
 	pData->useSigprov = 0;
 	pData->useCryprov = 0;
 	pData->iCloseTimeout = -1;
+	pData->iSizeLimit = 0;
+	pData->pszSizeLimitCmd = NULL;
 }
 
 
@@ -1345,6 +1349,10 @@
 			pData->cryprovName = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
 		} else if(!strcmp(actpblk.descri.name, "closetimeout")) {
 			pData->iCloseTimeout = (int) pvalsi.val.d.n;
+		} else if(!strcmp(actpblk.descri.name, "rotation.sizelimit")) {
+			pData->iSizeLimit = (int) pvalsi.val.d.n;
+		} else if(!strcmp(actpblk.descri.name, "rotation.sizelimitcommand")) {
+			pData->pszSizeLimitCmd = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
 		} else {
 			dbgprintf("omfile: program error, non-handled "
 			  "param '%s'\n", actpblk.descri.name);

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tools/omfwd.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tools/omfwd.c Changed

@@ -90,6 +90,7 @@
 	int iStrmDrvrSANPreference; /* ignore CN when any SAN set */
 	int iStrmTlsVerifyDepth; /**< Verify Depth for certificate chains */
 	const uchar *pszStrmDrvrCAFile;
+	const uchar *pszStrmDrvrCRLFile;
 	const uchar *pszStrmDrvrKeyFile;
 	const uchar *pszStrmDrvrCertFile;
 	char	*target;
@@ -434,6 +435,7 @@
 	free(pData->address);
 	free(pData->device);
 	free((void*)pData->pszStrmDrvrCAFile);
+	free((void*)pData->pszStrmDrvrCRLFile);
 	free((void*)pData->pszStrmDrvrKeyFile);
 	free((void*)pData->pszStrmDrvrCertFile);
 	net.DestructPermittedPeers(&pData->pPermPeers);
@@ -827,6 +829,7 @@
 		CHKiRet(netstrm.SetDrvrPermitExpiredCerts(pWrkrData->pNetstrm,
 			pData->pszStrmDrvrPermitExpiredCerts));
 		CHKiRet(netstrm.SetDrvrTlsCAFile(pWrkrData->pNetstrm, pData->pszStrmDrvrCAFile));
+		CHKiRet(netstrm.SetDrvrTlsCRLFile(pWrkrData->pNetstrm, pData->pszStrmDrvrCRLFile));
 		CHKiRet(netstrm.SetDrvrTlsKeyFile(pWrkrData->pNetstrm, pData->pszStrmDrvrKeyFile));
 		CHKiRet(netstrm.SetDrvrTlsCertFile(pWrkrData->pNetstrm, pData->pszStrmDrvrCertFile));
 
@@ -1214,6 +1217,7 @@
 	pData->iStrmDrvrSANPreference = 0;
 	pData->iStrmTlsVerifyDepth = 0;
 	pData->pszStrmDrvrCAFile = NULL;
+	pData->pszStrmDrvrCRLFile = NULL;
 	pData->pszStrmDrvrKeyFile = NULL;
 	pData->pszStrmDrvrCertFile = NULL;
 	pData->iRebindInterval = 0;
@@ -1376,6 +1380,8 @@
 			}
 		} else if(!strcmp(actpblk.descri.name, "streamdriver.cafile")) {
 			pData->pszStrmDrvrCAFile = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
+		} else if(!strcmp(actpblk.descri.name, "streamdriver.crlfile")) {
+			pData->pszStrmDrvrCRLFile = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
 		} else if(!strcmp(actpblk.descri.name, "streamdriver.keyfile")) {
 			pData->pszStrmDrvrKeyFile = (uchar*)es_str2cstr(pvalsi.val.d.estr, NULL);
 		} else if(!strcmp(actpblk.descri.name, "streamdriver.certfile")) {

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tools/omusrmsg.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tools/omusrmsg.c Changed

@@ -56,6 +56,11 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
+#ifdef HAVE_LIBSYSTEMD
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-login.h>
+#include <pwd.h>
+#endif
 #include "rsyslog.h"
 #include "srUtils.h"
 #include "stringbuf.h"
@@ -201,6 +206,42 @@
 #endif  /* #ifdef OS_BSD */
 
 
+static void sendwallmsg(const char *tty, uchar* pMsg)
+{
+	uchar szErr512;
+	int errnoSave;
+	char psizeof(_PATH_DEV) + UNAMESZ;
+	int ttyf;
+	struct stat statb;
+	int wrRet;
+
+	/* compute the device name */
+	strcpy(p, _PATH_DEV);
+	strncat(p, tty, UNAMESZ);
+
+	/* we must be careful when writing to the terminal. A terminal may block
+	 * (for example, a user has pressed <ctl>-s). In that case, we can not
+	 * wait indefinitely. So we need to use non-blocking I/O. In case we would
+	 * block, we simply do not send the message, because that's the best we can
+	 * do. -- rgerhards, 2008-07-04
+	 */
+
+	/* open the terminal */
+	if((ttyf = open(p, O_WRONLY|O_NOCTTY|O_NONBLOCK)) >= 0) {
+	  if(fstat(ttyf, &statb) == 0 && (statb.st_mode & S_IWRITE)) {
+	    wrRet = write(ttyf, pMsg, strlen((char*)pMsg));
+	    if(Debug && wrRet == -1) {
+	      /* we record the state to the debug log */
+	      errnoSave = errno;
+	      rs_strerror_r(errno, (char*)szErr, sizeof(szErr));
+	      dbgprintf("write to terminal '%s' failed with %d:%s\n",
+			p, errnoSave, szErr);
+	    }
+	  }
+	  close(ttyf);
+	}
+}
+
 /*  WALLMSG -- Write a message to the world at large
  *
  *	Write the specified message to either the entire
@@ -215,20 +256,78 @@
  */
 static rsRetVal wallmsg(uchar* pMsg, instanceData *pData)
 {
-
-	uchar szErr512;
-	char psizeof(_PATH_DEV) + UNAMESZ;
 	register int i;
-	int errnoSave;
-	int ttyf;
-	int wrRet;
 	STRUCTUTMP ut;
 	STRUCTUTMP *uptr;
-	struct stat statb;
 	DEFiRet;
 
 	assert(pMsg != NULL);
 
+#ifdef HAVE_LIBSYSTEMD
+	if (sd_booted() > 0) {
+	        register int j;
+		int sdRet;
+		char **sessions_list;
+		int sessions = sd_get_sessions(&sessions_list);
+
+		for (j = 0; j < sessions; j++) {
+	                uchar szErr512;
+			char *user = NULL, *tty;
+			uid_t uid;
+			struct passwd *pws;
+
+			sdRet = sd_session_get_uid(sessions_listj, &uid);
+			if (sdRet >= 0) {
+				pws = getpwuid(uid);
+				user = pws->pw_name;
+
+				if (user == NULL) {
+					dbgprintf("failed to get username for userid '%d'\n", uid);
+					continue;
+				}
+			} else {
+		                /* we record the state to the debug log */
+		                rs_strerror_r(-sdRet, (char*)szErr, sizeof(szErr));
+				dbgprintf("get userid for session '%s' failed with %d:%s\n",
+					  sessions_listj, -sdRet, szErr);
+				continue; /* try next session */
+			}
+			/* should we send the message to this user? */
+			if(pData->bIsWall == 0) {
+			        for(i = 0; i < MAXUNAMES; i++) {
+				        if(!pData->unamei0) {
+					        i = MAXUNAMES;
+						break;
+					}
+					if(strncmp(pData->unamei, user, UNAMESZ) == 0)
+					        break;
+				}
+				if(i == MAXUNAMES) { /* user not found? */
+				        free(user);
+					free(sessions_listj);
+					continue; /* on to next user! */
+				}
+			}
+			if ((sdRet = sd_session_get_tty(sessions_listj, &tty)) < 0) {
+		                /* we record the state to the debug log */
+		                rs_strerror_r(-sdRet, (char*)szErr, sizeof(szErr));
+				dbgprintf("get tty for session '%s' failed with %d:%s\n",
+					  sessions_listj, -sdRet, szErr);
+				free(user);
+				free(sessions_listj);
+				continue; /* try next session */
+			}
+
+			sendwallmsg(tty, pMsg);
+
+			free(user);
+			free(tty);
+			free(sessions_listj);
+		}
+		free(sessions_list);
+	} else {
+#endif
+
 	/* open the user login file */
 	setutent();
 
@@ -259,35 +358,14 @@
 				continue; /* on to next user! */
 		}
 
-		/* compute the device name */
-		strcpy(p, _PATH_DEV);
-		strncat(p, ut.ut_line, UNAMESZ);
-
-		/* we must be careful when writing to the terminal. A terminal may block
-		 * (for example, a user has pressed <ctl>-s). In that case, we can not
-		 * wait indefinitely. So we need to use non-blocking I/O. In case we would
-		 * block, we simply do not send the message, because that's the best we can
-		 * do. -- rgerhards, 2008-07-04
-		 */
-
-		/* open the terminal */
-		if((ttyf = open(p, O_WRONLY|O_NOCTTY|O_NONBLOCK)) >= 0) {
-			if(fstat(ttyf, &statb) == 0 && (statb.st_mode & S_IWRITE)) {
-				wrRet = write(ttyf, pMsg, strlen((char*)pMsg));
-				if(Debug && wrRet == -1) {
-					/* we record the state to the debug log */
-					errnoSave = errno;
-					rs_strerror_r(errno, (char*)szErr, sizeof(szErr));
-					dbgprintf("write to terminal '%s' failed with %d:%s\n",
-						  p, errnoSave, szErr);
-				}
-			}
-			close(ttyf);
-		}
+		sendwallmsg(ut.ut_line, pMsg);
 	}
 
 	/* close the user login file */
 	endutent();
+#ifdef HAVE_LIBSYSTEMD
+	}
+#endif
 	RETiRet;
 }

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tools/rsyslog.conf.5 -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tools/rsyslog.conf.5 Changed

@@ -207,6 +207,29 @@
 you use both extensions then the exclamation mark must occur before the equals
 sign, just use it intuitively.
 
+However, please note that there are some restrictions over the traditional
+BSD syslog behaviour. These restrictions stem back to sysklogd, exist
+probably since at least the 1990's and as such have always been in
+rsyslog.
+
+Namely, in BSD syslogd you can craft a selector like this:
+
+*.debug;local6.err
+
+The intent is to log all facilities at debug or higher, except for local6,
+which should only log at err or higher.
+
+Unfortunately, local6.err will permit error severity and higher, but will
+not exclude lower severity messages from facility local6.
+
+As an alternative, you can explicitly exclude all severities that you do
+not want to match. For the above case, this selector is equivalent to the
+BSD syslog selector:
+
+*.debug;local6.!=info;local6.!=notice;local6.!=warn
+
+An easier approach is probably to do if ... then based matching in script.
+
 .SH ACTIONS
 The action field of a rule describes what to do with the message. In general, message content 
 is written to a kind of "logfile". But also other actions might be done, like writing to a

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tools/rsyslogd.8 -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tools/rsyslogd.8 Changed

_service:tar_scm:rsyslog-8.2210.0.tar.gz/tools/rsyslogd.c -> _service:tar_scm:rsyslog-8.2312.0.tar.gz/tools/rsyslogd.c Changed

@@ -3,7 +3,7 @@
  * because it was either written from scratch by me (rgerhards) or
  * contributors who agreed to ASL 2.0.
  *
- * Copyright 2004-2022 Rainer Gerhards and Adiscon
+ * Copyright 2004-2023 Rainer Gerhards and Adiscon
  *
  * This file is part of rsyslog.
  *
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <dirent.h>
 #include <unistd.h>
 #include <errno.h>
 #ifdef ENABLE_LIBLOGGING_STDLOG
@@ -37,6 +38,12 @@
 #ifdef HAVE_LIBSYSTEMD
 #	include <systemd/sd-daemon.h>
 #endif
+#ifdef ENABLE_LIBCAPNG
+	#include <cap-ng.h>
+#endif
+#if defined(HAVE_LINUX_CLOSE_RANGE_H)
+#	include <linux/close_range.h>
+#endif
 
 #include "rsyslog.h"
 #include "wti.h"
@@ -229,16 +236,35 @@
 }
 #endif
 
+/* helper for imdiag. Returns if HUP processing has been requested or
+ * is not yet finished. We know this is racy, but imdiag handles this
+ * part by repeating operations. The mutex look is primarily to force
+ * a memory barrier, so that we have a change to see changes already
+ * written, but not present in the core's cache.
+ * 2023-07-26 Rainer Gerhards
+ */
+int
+get_bHadHUP(void)
+{
+	pthread_mutex_lock(&mutHadHUP);
+	const int ret = bHadHUP;
+	pthread_mutex_unlock(&mutHadHUP);
+	/* note: at this point ret can already be invalid */
+	return ret;
+}
 
+/* we need a pointer to the conf, because in early startup stage we
+ * need to use loadConf, later on runConf.
+ */
 rsRetVal
-queryLocalHostname(void)
+queryLocalHostname(rsconf_t *const pConf)
 {
 	uchar *LocalHostName = NULL;
 	uchar *LocalDomain = NULL;
 	uchar *LocalFQDNName;
 	DEFiRet;
 
-	CHKiRet(net.getLocalHostname(&LocalFQDNName));
+	CHKiRet(net.getLocalHostname(pConf, &LocalFQDNName));
 	uchar *dot = (uchar*) strstr((char*)LocalFQDNName, ".");
 	if(dot == NULL) {
 		CHKmalloc(LocalHostName = (uchar*) strdup((char*)LocalFQDNName));
@@ -349,6 +375,36 @@
 	RETiRet;
 }
 
+
+
+/* note: this function is specific to OS'es which provide
+ * the ability to read open file descriptors via /proc.
+ * returns 0 - success, something else otherwise
+ */
+static int
+close_unneeded_open_files(const char *const procdir,
+	const int beginClose, const int parentPipeFD)
+{
+	DIR *dir;
+	struct dirent *entry;
+
+	dir = opendir(procdir);
+	if (dir == NULL) {
+		dbgprintf("closes unneeded files: opendir failed for %s\n", procdir);
+		return 1;
+	}
+
+	while ((entry = readdir(dir)) != NULL) {
+		const int fd = atoi(entry->d_name);
+		if(fd >= beginClose && (((fd != dbgGetDbglogFd()) && (fd != parentPipeFD)))) {
+			close(fd);
+		}
+	}
+
+	closedir(dir);
+	return 0;
+}
+
 /* prepares the background processes (if auto-backbrounding) for
  * operation.
  */
@@ -394,12 +450,37 @@
 	}
 #endif
 
-	/* close unnecessary open files */
-	const int endClose = getdtablesize();
-	close(0);
-	for(int i = beginClose ; i <= endClose ; ++i) {
-		if((i != dbgGetDbglogFd()) && (i != parentPipeFD)) {
-			  aix_close_it(i); /* AIXPORT */
+	/* close unnecessary open files - first try to use /proc file system,
+	 * if that is not possible iterate through all potentially open file
+	 * descriptors. This can be lenghty, but in practice /proc should work
+	 * for almost all current systems, and the fallback is primarily for
+	 * Solaris and AIX, where we do expect a decent max numbers of fds.
+	 */
+	close(0); /* always close stdin, we do not need it */
+
+	/* try Linux, Cygwin, NetBSD */
+	if(close_unneeded_open_files("/proc/self/fd", beginClose, parentPipeFD) != 0) {
+		/* try MacOS, FreeBSD */
+		if(close_unneeded_open_files("/proc/fd", beginClose, parentPipeFD) != 0) {
+			/* did not work out, so let's close everything... */
+			int endClose = (parentPipeFD > dbgGetDbglogFd()) ? parentPipeFD : dbgGetDbglogFd();
+			for(int i = beginClose ; i <= endClose ; ++i) {
+				if((i != dbgGetDbglogFd()) && (i != parentPipeFD)) {
+					aix_close_it(i); /* AIXPORT */
+				}
+			}
+			beginClose = endClose + 1;
+			endClose = getdtablesize();
+#if defined(HAVE_CLOSE_RANGE)
+			if(close_range(beginClose, endClose, 0) !=0) {
+				dbgprintf("errno %d after close_range(), fallback to loop\n", errno);
+#endif
+				for(int i = beginClose ; i <= endClose ; ++i) {
+					aix_close_it(i); /* AIXPORT */
+				}
+#if defined(HAVE_CLOSE_RANGE)
+			}
+#endif
 		}
 	}
 	seedRandomNumberForChild();
@@ -1562,6 +1643,94 @@
 	resetErrMsgsFlag();
 	localRet = rsconf.Load(&ourConf, ConfFile);
 
+#ifdef ENABLE_LIBCAPNG
+	if (loadConf->globals.bCapabilityDropEnabled) {
+		/*
+		* Drop capabilities to the necessary set
+		*/
+		int capng_rc, capng_failed = 0;
+		typedef struct capabilities_s {
+			int capability; /* capability code */
+			const char *name; /* name of the capability to be displayed */
+			/* is the capability present that is needed by rsyslog? if so we do not drop it */
+			sbool present;
+			capng_type_t type;
+		} capabilities_t;
+
+		capabilities_t capabilities = {
+			#define CAP_FIELD(code, type) { code, #code,  0 , type}
+			CAP_FIELD(CAP_BLOCK_SUSPEND, CAPNG_EFFECTIVE | CAPNG_PERMITTED),
+			CAP_FIELD(CAP_NET_RAW, CAPNG_EFFECTIVE | CAPNG_PERMITTED ),
+			CAP_FIELD(CAP_CHOWN, CAPNG_EFFECTIVE | CAPNG_PERMITTED ),
+			CAP_FIELD(CAP_IPC_LOCK, CAPNG_EFFECTIVE | CAPNG_PERMITTED ),
+			CAP_FIELD(CAP_LEASE, CAPNG_EFFECTIVE | CAPNG_PERMITTED),
+			CAP_FIELD(CAP_NET_ADMIN, CAPNG_EFFECTIVE | CAPNG_PERMITTED),
+			CAP_FIELD(CAP_NET_BIND_SERVICE, CAPNG_EFFECTIVE | CAPNG_PERMITTED),
+			CAP_FIELD(CAP_DAC_OVERRIDE, CAPNG_EFFECTIVE | CAPNG_PERMITTED | CAPNG_BOUNDING_SET),
+			CAP_FIELD(CAP_SETGID, CAPNG_EFFECTIVE | CAPNG_PERMITTED),
+			CAP_FIELD(CAP_SETUID, CAPNG_EFFECTIVE | CAPNG_PERMITTED),
+			CAP_FIELD(CAP_SYS_ADMIN, CAPNG_EFFECTIVE | CAPNG_PERMITTED),
+			CAP_FIELD(CAP_SYS_CHROOT, CAPNG_EFFECTIVE | CAPNG_PERMITTED),
+			CAP_FIELD(CAP_SYS_RESOURCE, CAPNG_EFFECTIVE | CAPNG_PERMITTED),
+			CAP_FIELD(CAP_SYSLOG, CAPNG_EFFECTIVE | CAPNG_PERMITTED)
+			#undef CAP_FIELD
+		};
+
+		if (capng_have_capabilities(CAPNG_SELECT_CAPS) > CAPNG_NONE) {
+			/* Examine which capabilities are available to us, so we do not try to
+				drop something that is not present. We need to do this in two steps,
+				because capng_clear clears the capability set. In the second step,
+				we add back those caps, which were present before clearing the selected
+				posix capabilities set.
+			*/
+			unsigned long caps_len = sizeof(capabilities) / sizeof(capabilities_t);
+			for (unsigned long i = 0; i < caps_len; i++) {
+				if (capng_have_capability(CAPNG_EFFECTIVE, capabilitiesi.capability)) {
+					capabilitiesi.present = 1;
+				}
+			}
+

_service:tar_scm:rsyslog-doc-8.2210.0.tar.gz -> _service:tar_scm:rsyslog-doc-8.2312.0.tar.gz Changed

_service:tar_scm:rsyslog.log Changed

Changes of Revision 3