From eee0f0668e44b789c022edace2199bdd1412ca59 Mon Sep 17 00:00:00 2001 From: Attila Lakatos Date: Thu, 12 Jun 2025 08:13:47 +0200 Subject: [PATCH 1/4] Rebase to 8.2506.0V Resolves: rhbz#2347628 --- .gitignore | 2 + disable-openssl-engine.patch | 60 ------ gnu23.patch | 354 ---------------------------------- openssl-engines-disable.patch | 62 ++++++ rsyslog.spec | 23 +-- sources | 4 +- 6 files changed, 78 insertions(+), 427 deletions(-) delete mode 100644 disable-openssl-engine.patch delete mode 100644 gnu23.patch create mode 100644 openssl-engines-disable.patch diff --git a/.gitignore b/.gitignore index ff0224a..b2767df 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-doc-8.2408.0.tar.gz /rsyslog-8.2412.0.tar.gz /rsyslog-doc-8.2412.0.tar.gz +/rsyslog-8.2506.0.tar.gz +/rsyslog-doc-8.2506.0.tar.gz diff --git a/disable-openssl-engine.patch b/disable-openssl-engine.patch deleted file mode 100644 index 20ba01e..0000000 --- a/disable-openssl-engine.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up rsyslog-8.2412.0/runtime/net_ossl.c.orig rsyslog-8.2412.0/runtime/net_ossl.c ---- rsyslog-8.2412.0/runtime/net_ossl.c.orig 2024-11-27 13:05:51.327988286 +0100 -+++ rsyslog-8.2412.0/runtime/net_ossl.c 2024-11-27 13:06:26.806335104 +0100 -@@ -220,6 +220,7 @@ osslGlblInit(void) - ERR_load_crypto_strings(); - #endif - -+#ifdef ENABLE_OPENSSL_ENGINES_DOWNSTREAM - PRAGMA_DIAGNOSTIC_PUSH - PRAGMA_IGNORE_Wdeprecated_declarations - -@@ -244,6 +245,8 @@ PRAGMA_IGNORE_Wdeprecated_declarations - // Free the engine reference when done - ENGINE_free(osslEngine); - PRAGMA_DIAGNOSTIC_POP -+#endif -+ - } - - /* globally de-initialize OpenSSL */ -@@ -251,7 +254,9 @@ void - osslGlblExit(void) - { - DBGPRINTF("openssl: entering osslGlblExit\n"); -+ #ifdef ENABLE_OPENSSL_ENGINES_DOWNSTREAM - ENGINE_cleanup(); -+ #endif - ERR_free_strings(); - EVP_cleanup(); - CRYPTO_cleanup_all_ex_data(); -@@ -1149,6 +1154,7 @@ net_ossl_init_engine(__attribute__((unus - const char *engine_id = NULL; - const char *engine_name = NULL; - -+#ifdef ENABLE_OPENSSL_ENGINES_DOWNSTREAM - PRAGMA_DIAGNOSTIC_PUSH - PRAGMA_IGNORE_Wdeprecated_declarations - // Get the default RSA engine -@@ -1189,7 +1195,7 @@ PRAGMA_IGNORE_Wdeprecated_declarations - DBGPRINTF("net_ossl_init_engine: use openssl default Engine"); - } - PRAGMA_DIAGNOSTIC_POP -- -+#endif // ENABLE_OPENSSL_ENGINES_DOWNSTREAM - RETiRet; - } - -diff -up rsyslog-8.2412.0/runtime/net_ossl.h.orig rsyslog-8.2412.0/runtime/net_ossl.h ---- rsyslog-8.2412.0/runtime/net_ossl.h.orig 2024-11-27 13:06:01.138084180 +0100 -+++ rsyslog-8.2412.0/runtime/net_ossl.h 2024-11-27 13:06:30.536372456 +0100 -@@ -31,7 +31,9 @@ - #if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER) - # include - #endif -+#ifdef ENABLE_OPENSSL_ENGINES_DOWNSTREAM - #include -+#endif - #include - #include - diff --git a/gnu23.patch b/gnu23.patch deleted file mode 100644 index d671459..0000000 --- a/gnu23.patch +++ /dev/null @@ -1,354 +0,0 @@ -diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c -index 06fdb4bb05..a9ba2684ec 100644 ---- a/runtime/cfsysline.c -+++ b/runtime/cfsysline.c -@@ -723,46 +723,46 @@ int *permitted) - static rsRetVal cslchCallHdlr(cslCmdHdlr_t *pThis, uchar **ppConfLine) - { - DEFiRet; -- rsRetVal (*pHdlr)() = NULL; -+ rsRetVal (*pHdlr)(void *, ...) = NULL; - assert(pThis != NULL); - assert(ppConfLine != NULL); - - switch(pThis->eType) { - case eCmdHdlrCustomHandler: -- pHdlr = doCustomHdlr; -+ pHdlr = (rsRetVal (*)(void *, ...)) doCustomHdlr; - break; - case eCmdHdlrUID: -- pHdlr = doGetUID; -+ pHdlr = (rsRetVal (*)(void *, ...)) doGetUID; - break; - case eCmdHdlrGID: -- pHdlr = doGetGID; -+ pHdlr = (rsRetVal (*)(void *, ...)) doGetGID; - break; - case eCmdHdlrBinary: -- pHdlr = doBinaryOptionLine; -+ pHdlr = (rsRetVal (*)(void *, ...)) doBinaryOptionLine; - break; - case eCmdHdlrFileCreateMode: -- pHdlr = doFileCreateMode; -+ pHdlr = (rsRetVal (*)(void *, ...)) doFileCreateMode; - break; - case eCmdHdlrInt: -- pHdlr = doGetInt; -+ pHdlr = (rsRetVal (*)(void *, ...)) doGetInt; - break; - case eCmdHdlrSize: -- pHdlr = doGetSize; -+ pHdlr = (rsRetVal (*)(void *, ...)) doGetSize; - break; - case eCmdHdlrGetChar: -- pHdlr = doGetChar; -+ pHdlr = (rsRetVal (*)(void *, ...)) doGetChar; - break; - case eCmdHdlrFacility: -- pHdlr = doFacility; -+ pHdlr = (rsRetVal (*)(void *, ...)) doFacility; - break; - case eCmdHdlrSeverity: -- pHdlr = doSeverity; -+ pHdlr = (rsRetVal (*)(void *, ...)) doSeverity; - break; - case eCmdHdlrGetWord: -- pHdlr = doGetWord; -+ pHdlr = (rsRetVal (*)(void *, ...)) doGetWord; - break; - case eCmdHdlrGoneAway: -- pHdlr = doGoneAway; -+ pHdlr = (rsRetVal (*)(void *, ...)) doGoneAway; - break; - /* some non-legacy handler (used in v6+ solely) */ - case eCmdHdlrInvalid: -@@ -827,7 +827,7 @@ static rsRetVal cslcConstruct(cslCmd_t **ppThis, int bChainingPermitted) - - pThis->bChainingPermitted = bChainingPermitted; - -- CHKiRet(llInit(&pThis->llCmdHdlrs, cslchDestruct, cslchKeyDestruct, cslchKeyCompare)); -+ CHKiRet(llInit(&pThis->llCmdHdlrs, cslchDestruct, cslchKeyDestruct, (int (*) (void*, void*)) cslchKeyCompare)); - - finalize_it: - *ppThis = pThis; -@@ -1074,7 +1074,7 @@ cfsyslineInit(void) - DEFiRet; - CHKiRet(objGetObjInterface(&obj)); - -- CHKiRet(llInit(&llCmdList, cslcDestruct, cslcKeyDestruct, strcasecmp)); -+ CHKiRet(llInit(&llCmdList, cslcDestruct, cslcKeyDestruct, (int (*)(void*, void*)) strcasecmp)); - - finalize_it: - RETiRet; -diff --git a/runtime/linkedlist.c b/runtime/linkedlist.c -index 70887379b2..499629399b 100644 ---- a/runtime/linkedlist.c -+++ b/runtime/linkedlist.c -@@ -43,7 +43,7 @@ - * pKey destructor may be zero to take care of non-keyed lists. - */ - rsRetVal llInit(linkedList_t *pThis, rsRetVal (*pEltDestructor)(void*), rsRetVal (*pKeyDestructor)(void*), --int (*pCmpOp)(void*,void*)) -+ int (*pCmpOp)(void*,void*)) - { - assert(pThis != NULL); - assert(pEltDestructor != NULL); -diff --git a/runtime/linkedlist.h b/runtime/linkedlist.h -index 1cd3a143f2..9894541889 100644 ---- a/runtime/linkedlist.h -+++ b/runtime/linkedlist.h -@@ -52,7 +52,8 @@ typedef struct linkedList_s linkedList_t; - typedef llElt_t* linkedListCookie_t; /* this type avoids exposing internals and keeps us flexible */ - - /* prototypes */ --rsRetVal llInit(linkedList_t *pThis, rsRetVal (*pEltDestructor)(), rsRetVal (*pKeyDestructor)(), int (*pCmpOp)()); -+rsRetVal llInit(linkedList_t *pThis, rsRetVal (*pEltDestructor)(void*), -+ rsRetVal (*pKeyDestructor)(void*), int (*pCmpOp)(void*,void*)); - rsRetVal llDestroy(linkedList_t *pThis); - rsRetVal llDestroyRootElt(linkedList_t *pThis); - rsRetVal llGetNextElt(linkedList_t *pThis, linkedListCookie_t *ppElt, void **ppUsr); -diff --git a/runtime/obj-types.h b/runtime/obj-types.h -index 21fb89bbe1..b708d6fc9e 100644 ---- a/runtime/obj-types.h -+++ b/runtime/obj-types.h -@@ -5,7 +5,7 @@ - * that loop somehow and I've done that by moving the typedefs - * into this file here. - * -- * Copyright 2008-2019 Rainer Gerhards and Adiscon GmbH. -+ * Copyright 2008-2024 Rainer Gerhards and Adiscon GmbH. - * - * This file is part of the rsyslog runtime library. - * -@@ -74,7 +74,7 @@ struct objInfo_s { - size_t lenID; /* length of the ID string */ - int iObjVers; - uchar *pszName; -- rsRetVal (*objMethods[OBJ_NUM_METHODS])(); -+ rsRetVal (*objMethods[OBJ_NUM_METHODS])(void*, ...); - rsRetVal (*QueryIF)(interface_t*); - struct modInfo_s *pModInfo; - }; -diff --git a/runtime/obj.c b/runtime/obj.c -index 03a56f7a3a..4fa39772f0 100644 ---- a/runtime/obj.c -+++ b/runtime/obj.c -@@ -48,7 +48,7 @@ - * - * File begun on 2008-01-04 by RGerhards - * -- * Copyright 2008-2019 Rainer Gerhards and Adiscon GmbH. -+ * Copyright 2008-2024 Rainer Gerhards and Adiscon GmbH. - * - * This file is part of the rsyslog runtime library. - * -@@ -125,7 +125,7 @@ static rsRetVal objInfoNotImplementedDummy(void __attribute__((unused)) *pThis) - * must be provided an objInfo_t pointer. - */ - #define objInfoIsImplemented(pThis, method) \ -- (pThis->objMethods[method] != objInfoNotImplementedDummy) -+ (pThis->objMethods[method] != (rsRetVal (*)(void *, ...)) objInfoNotImplementedDummy) - - /* construct an object Info object. Each class shall do this on init. The - * resulting object shall be cached during the lifetime of the class and each -@@ -154,10 +154,10 @@ InfoConstruct(objInfo_t **ppThis, uchar *pszID, int iObjVers, - pThis->QueryIF = pQueryIF; - pThis->pModInfo = pModInfo; - -- pThis->objMethods[0] = pConstruct; -- pThis->objMethods[1] = pDestruct; -+ pThis->objMethods[0] = (rsRetVal (*)(void *, ...)) pConstruct; -+ pThis->objMethods[1] = (rsRetVal (*)(void *, ...)) pDestruct; - for(i = 2 ; i < OBJ_NUM_METHODS ; ++i) { -- pThis->objMethods[i] = objInfoNotImplementedDummy; -+ pThis->objMethods[i] = (rsRetVal (*)(void *, ...)) objInfoNotImplementedDummy; - } - - *ppThis = pThis; -@@ -192,7 +192,7 @@ InfoDestruct(objInfo_t **ppThis) - static rsRetVal - InfoSetMethod(objInfo_t *pThis, objMethod_t objMethod, rsRetVal (*pHandler)(void*)) - { -- pThis->objMethods[objMethod] = pHandler; -+ pThis->objMethods[objMethod] = (rsRetVal (*)(void *, ...)) pHandler; - return RS_RET_OK; - } - -@@ -786,7 +786,7 @@ static rsRetVal objDeserializeTryRecover(strm_t *pStrm) - * of the trailer. Header must already have been processed. - * rgerhards, 2008-01-11 - */ --static rsRetVal objDeserializeProperties(obj_t *pObj, rsRetVal (*objSetProperty)(), strm_t *pStrm) -+static rsRetVal objDeserializeProperties(obj_t *pObj, rsRetVal (*objSetProperty)(void*, ...), strm_t *pStrm) - { - DEFiRet; - var_t *pVar = NULL; -@@ -867,7 +867,8 @@ Deserialize(void *ppObj, uchar *pszTypeExpected, strm_t *pStrm, rsRetVal (*fFixu - CHKiRet(pObjInfo->objMethods[objMethod_CONSTRUCT](&pObj)); - - /* we got the object, now we need to fill the properties */ -- CHKiRet(objDeserializeProperties(pObj, pObjInfo->objMethods[objMethod_SETPROPERTY], pStrm)); -+ CHKiRet(objDeserializeProperties(pObj, -+ (rsRetVal (*)(void*, ...)) pObjInfo->objMethods[objMethod_SETPROPERTY], pStrm)); - - /* check if we need to call a fixup function that modifies the object - * before it is finalized. -- rgerhards, 2008-01-13 -@@ -898,8 +899,10 @@ Deserialize(void *ppObj, uchar *pszTypeExpected, strm_t *pStrm, rsRetVal (*fFixu - */ - rsRetVal - objDeserializeWithMethods(void *ppObj, uchar *pszTypeExpected, int lenTypeExpected, strm_t *pStrm, --rsRetVal (*fFixup)(obj_t*,void*), void *pUsr, rsRetVal (*objConstruct)(), rsRetVal (*objConstructFinalize)(), --rsRetVal (*objDeserialize)()) -+ rsRetVal (*fFixup)(obj_t*,void*), void *pUsr, -+ rsRetVal (*objConstruct)(void *, ...), -+ rsRetVal (*objConstructFinalize)(void *, ...), -+ rsRetVal (*objDeserialize)(void *, ...)) - { - DEFiRet; - rsRetVal iRetLocal; -@@ -1007,7 +1010,8 @@ DeserializePropBag(obj_t *pObj, strm_t *pStrm) - CHKiRet(FindObjInfo((char*)cstrGetSzStrNoNULL(pstrID), &pObjInfo)); - - /* we got the object, now we need to fill the properties */ -- CHKiRet(objDeserializeProperties(pObj, pObjInfo->objMethods[objMethod_SETPROPERTY], pStrm)); -+ CHKiRet(objDeserializeProperties(pObj, -+ (rsRetVal (*)(void*, ...)) pObjInfo->objMethods[objMethod_SETPROPERTY], pStrm)); - - finalize_it: - if(pstrID != NULL) -diff --git a/runtime/obj.h b/runtime/obj.h -index 0efe6e7081..455cb873f5 100644 ---- a/runtime/obj.h -+++ b/runtime/obj.h -@@ -21,7 +21,7 @@ - * - * pThis always references to a pointer of the object. - * -- * Copyright 2008-2018 Adiscon GmbH. -+ * Copyright 2008-2024 Adiscon GmbH. - * - * This file is part of the rsyslog runtime library. - * -@@ -119,9 +119,12 @@ ENDinterface(obj) - rsRetVal objGetObjInterface(obj_if_t *pIf); - PROTOTYPEObjClassInit(obj); - PROTOTYPEObjClassExit(obj); --rsRetVal objDeserializeWithMethods(void *ppObj, uchar *pszTypeExpected, int lenTypeExpected, strm_t *pStrm, --rsRetVal (*fFixup)(obj_t*,void*), void *pUsr, rsRetVal (*objConstruct)(), rsRetVal (*objConstructFinalize)(), --rsRetVal (*objDeserialize)()); -+rsRetVal -+objDeserializeWithMethods(void *ppObj, uchar *pszTypeExpected, int lenTypeExpected, strm_t *pStrm, -+ rsRetVal (*fFixup)(obj_t*,void*), void *pUsr, -+ rsRetVal (*objConstruct)(void *, ...), -+ rsRetVal (*objConstructFinalize)(void *, ...), -+ rsRetVal (*objDeserialize)(void*, ...)); - rsRetVal objDeserializeProperty(var_t *pProp, strm_t *pStrm); - uchar *objGetName(obj_t *pThis); - -diff --git a/runtime/queue.c b/runtime/queue.c -index edc9d3513b..e17da6d7c3 100644 ---- a/runtime/queue.c -+++ b/runtime/queue.c -@@ -1063,7 +1063,8 @@ qDeqDisk(qqueue_t *pThis, smsg_t **ppMsg) - DEFiRet; - iRet = objDeserializeWithMethods(ppMsg, (uchar*) "msg", 3, - pThis->tVars.disk.pReadDeq, NULL, -- NULL, msgConstructForDeserializer, NULL, MsgDeserialize); -+ NULL, (rsRetVal (*)(void *, ...)) msgConstructForDeserializer, NULL, -+ (rsRetVal (*)(void *, ...)) MsgDeserialize); - if(iRet != RS_RET_OK) { - LogError(0, iRet, "%s: qDeqDisk error happened at around offset %lld", - obj.GetName((obj_t*)pThis), -diff --git a/runtime/rsconf.c b/runtime/rsconf.c -index 71b31be3cd..a0d735d423 100644 ---- a/runtime/rsconf.c -+++ b/runtime/rsconf.c -@@ -290,7 +290,7 @@ BEGINobjConstruct(rsconf) /* be sure to specify the object type also in END macr - CHKiRet(dynstats_initCnf(&pThis->dynstats_buckets)); - CHKiRet(perctile_initCnf(&pThis->perctile_buckets)); - CHKiRet(llInit(&pThis->rulesets.llRulesets, rulesetDestructForLinkedList, -- rulesetKeyDestruct, strcasecmp)); -+ rulesetKeyDestruct, (int (*)(void*, void*)) strcasecmp)); - finalize_it: - ENDobjConstruct(rsconf) - -diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h -index 94b6605e8b..f98a5db3c7 100644 ---- a/runtime/rsyslog.h -+++ b/runtime/rsyslog.h -@@ -52,7 +52,9 @@ - * being emitted where nobody knows what the mean and why they appear :-( - */ - #pragma GCC diagnostic ignored "-Wjump-misses-init" -- #endif /* if __GNUC__ >= 8 */ -+ #pragma GCC diagnostic ignored "-Wincompatible-pointer-types" -+ #pragma GCC diagnostic ignored "-Wcast-function-type" -+ #endif - - #if defined(__clang__) - #define ATTR_NO_SANITIZE_UNDEFINED __attribute__((no_sanitize("undefined"))) -diff --git a/runtime/ruleset.c b/runtime/ruleset.c -index c137ee3b01..228283c28c 100644 ---- a/runtime/ruleset.c -+++ b/runtime/ruleset.c -@@ -888,7 +888,7 @@ destructAllActions(rsconf_t *conf) - - CHKiRet(llDestroy(&(conf->rulesets.llRulesets))); - CHKiRet(llInit(&(conf->rulesets.llRulesets), rulesetDestructForLinkedList, -- rulesetKeyDestruct, strcasecmp)); -+ rulesetKeyDestruct, (int (*)(void*, void*)) strcasecmp)); - conf->rulesets.pDflt = NULL; - - finalize_it: -diff --git a/tests/sndrcv_tls_anon_rebind.sh b/tests/sndrcv_tls_anon_rebind.sh -index dcd1e6e985..e3ae592a10 100755 ---- a/tests/sndrcv_tls_anon_rebind.sh -+++ b/tests/sndrcv_tls_anon_rebind.sh -@@ -3,6 +3,7 @@ - # rgerhards, 2011-04-04 - # This file is part of the rsyslog project, released under GPLv3 - . ${srcdir:=.}/diag.sh init -+skip_platform "SunOS" "Test fails with environment-induced errors, which we cannot solve" - - export NUMMESSAGES=25000 #25000 - -diff --git a/tests/sndrcv_tls_client_missing_cert.sh b/tests/sndrcv_tls_client_missing_cert.sh -index aa0c320244..c0c651706d 100755 ---- a/tests/sndrcv_tls_client_missing_cert.sh -+++ b/tests/sndrcv_tls_client_missing_cert.sh -@@ -1,6 +1,9 @@ - #!/bin/bash - # This file is part of the rsyslog project, released under ASL 2.0 - . ${srcdir:=.}/diag.sh init -+echo "This test is under review - it seems to have some issues" -+exit 77 -+ - printf 'using TLS driver: %s\n' ${RS_TLS_DRIVER:=gtls} - - # start up the instances -diff --git a/threads.c b/threads.c -index 2fd4bbb86c..95e85c1926 100644 ---- a/threads.c -+++ b/threads.c -@@ -302,7 +302,7 @@ rsRetVal thrdCreate(rsRetVal (*thrdMain)(thrdInfo_t*), rsRetVal(*afterRun)(thrdI - rsRetVal thrdInit(void) - { - DEFiRet; -- iRet = llInit(&llThrds, thrdDestruct, NULL, NULL); -+ iRet = llInit(&llThrds, (rsRetVal (*)(void*)) thrdDestruct, NULL, NULL); - RETiRet; - } - -diff --git a/tools/iminternal.c b/tools/iminternal.c -index c4dd548cee..105cf9f903 100644 ---- a/tools/iminternal.c -+++ b/tools/iminternal.c -@@ -163,7 +163,7 @@ rsRetVal iminternalRemoveMsg(smsg_t **ppMsg) - rsRetVal modInitIminternal(void) - { - DEFiRet; -- iRet = llInit(&llMsgs, iminternalDestruct, NULL, NULL); -+ iRet = llInit(&llMsgs, (rsRetVal (*)(void*)) iminternalDestruct, NULL, NULL); - RETiRet; - } - diff --git a/openssl-engines-disable.patch b/openssl-engines-disable.patch new file mode 100644 index 0000000..877f0a4 --- /dev/null +++ b/openssl-engines-disable.patch @@ -0,0 +1,62 @@ +diff --git a/plugins/imdtls/imdtls.c b/plugins/imdtls/imdtls.c +index f90e8ad61c..bfb63452c7 100644 +--- a/plugins/imdtls/imdtls.c ++++ b/plugins/imdtls/imdtls.c +@@ -41,7 +41,9 @@ + #if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER) + # include + #endif +-#include ++#ifndef OPENSSL_NO_ENGINE ++# include ++#endif + // --- + + #include "rsyslog.h" +diff --git a/plugins/omdtls/omdtls.c b/plugins/omdtls/omdtls.c +index 2b28908030..693ff99c77 100644 +--- a/plugins/omdtls/omdtls.c ++++ b/plugins/omdtls/omdtls.c +@@ -52,7 +52,9 @@ + #if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER) + # include + #endif +-#include ++#ifndef OPENSSL_NO_ENGINE ++# include ++#endif + // --- + + // Include rsyslog headers +diff --git a/runtime/net_ossl.h b/runtime/net_ossl.h +index af36ffe488..d66a422d4d 100644 +--- a/runtime/net_ossl.h ++++ b/runtime/net_ossl.h +@@ -31,7 +31,9 @@ + #if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER) + # include + #endif +-#include ++#ifndef OPENSSL_NO_ENGINE ++# include ++#endif + #include + #include + +diff --git a/tests/tcpflood.c b/tests/tcpflood.c +index 4b2d98b2c8..7322aeb135 100644 +--- a/tests/tcpflood.c ++++ b/tests/tcpflood.c +@@ -129,8 +129,10 @@ + #ifdef ENABLE_OPENSSL + #include + #include +- #include +- #include ++ #include ++# ifndef OPENSSL_NO_ENGINE ++# include ++# endif + + /* OpenSSL API differences */ + #if OPENSSL_VERSION_NUMBER >= 0x10100000L diff --git a/rsyslog.spec b/rsyslog.spec index c9e2679..9716008 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -36,8 +36,8 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.2412.0 -Release: 3%{?dist} +Version: 8.2506.0 +Release: 1%{?dist} License: GPL-3.0-or-later AND Apache-2.0 URL: http://www.rsyslog.com/ Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz @@ -69,8 +69,7 @@ BuildRequires: systemd-rpm-macros BuildRequires: zlib-devel BuildRequires: libcap-ng-devel -Patch0: disable-openssl-engine.patch -Patch1: gnu23.patch +Patch0: openssl-engines-disable.patch Recommends: logrotate Obsoletes: rsyslog-logrotate < 8.2310.0-2 @@ -383,7 +382,6 @@ mv build doc # set up rsyslog sources %setup -q -D %patch -P 0 -p1 -%patch -P 1 -p1 %if %{with omamqp1} # Unpack qpid-proton @@ -406,14 +404,13 @@ export CFLAGS="$RPM_OPT_FLAGS -fpic" cd bld # Need ENABLE_FUZZ_TESTING=NO to avoid a link failure - # Find python include dir and python library from - # https://stackoverflow.com/questions/24174394/cmake-is-not-able-to-find-python-libraries + # Modern approach for Python discovery in CMake cmake .. \ -DBUILD_BINDINGS="" \ -DBUILD_STATIC_LIBS=YES \ -DENABLE_FUZZ_TESTING=NO \ - -DPYTHON_INCLUDE_DIR=$(python3 -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \ - -DPYTHON_LIBRARY=$(python3 -c "import distutils.sysconfig as sysconfig; print(sysconfig.get_config_var('LIBDIR'))") \ + -DPython_FIND_STRATEGY=LOCATION \ + -DPython_ROOT_DIR=/usr \ -DCMAKE_AR="/usr/bin/gcc-ar" -DCMAKE_NM="/usr/bin/gcc-nm" -DCMAKE_RANLIB="/usr/bin/gcc-ranlib" make -j8 ) @@ -463,7 +460,7 @@ autoreconf -if --enable-omrabbitmq \ %endif %if %{with omamqp1} - --enable-omamqp1 PROTON_LIBS="%{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-core-static.a %{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-proactor-static.a %{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-static.a -lssl -lsasl2 -lcrypto" PROTON_CFLAGS="-I%{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/include" \ + --enable-omamqp1 PROTON_PROACTOR_LIBS="%{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-core-static.a %{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-proactor-static.a %{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-static.a -lssl -lsasl2 -lcrypto" PROTON_PROACTOR_CFLAGS="-I%{_builddir}/qpid-proton-%{qpid_proton_v}/c/include -I%{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/include" PROTON_LIBS="%{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-core-static.a %{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-proactor-static.a %{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/libqpid-proton-static.a -lssl -lsasl2 -lcrypto" PROTON_CFLAGS="-I%{_builddir}/qpid-proton-%{qpid_proton_v}/c/include -I%{_builddir}/qpid-proton-%{qpid_proton_v}/bld/c/include" \ %endif --enable-elasticsearch \ --enable-generate-man-pages \ @@ -764,6 +761,10 @@ done %changelog +* Thu Jun 12 2025 Attila Lakatos - 8.2506.0-1 +- Rebase to 8.2506.0 + Resolves: rhbz#2347628 + * Tue Jan 21 2025 Attila Lakatos - 8.2412.0-3 - Fix build problem by resolving -Wincompatible-pointer-types error @@ -778,7 +779,7 @@ done * Fri Oct 04 2024 Attila Lakatos - 8.2408.0-2 - Rebuild package - Resolves: rhzb#2316361 + Resolves: rhbz#2316361 * Wed Aug 21 2024 Attila Lakatos - 8.2408.0-1 - Rebase to 8.2408.0 diff --git a/sources b/sources index 380a910..7e05396 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (qpid-proton-0.39.0.tar.gz) = df5c5469ee82ba02de62dce15b73b81aab2aae07c7db668182df690cea4ff7584111bd12143fe5e3569469a9ddf4950ac68d60b53d1a7815da4748052948cd1b -SHA512 (rsyslog-8.2412.0.tar.gz) = fdd8bb096c9578fe2c4ed8cdb13179d7b3333d0f9be1b2c921b5b040f1e1414c3f9f8106e44444aaefba22f235a44d17c0c5b80cd114fe540a2aebb30e3eba72 -SHA512 (rsyslog-doc-8.2412.0.tar.gz) = 9b5d453b5774b027a6a4ba232133953d8a8058df4bfff31f835504656d7b01008cec5c0d28667bed0052799cf7389c0bafea7c76c3190bdcdf3d8a2eedf19b4e +SHA512 (rsyslog-8.2506.0.tar.gz) = 82fd3a3e76217081c7903b0bdb8bdb46c23657593d84d5ff7f836efca4c76d7d2870706150a6473c0667f0c8571a3c8e5d237619a3ad3940701925efaec32941 +SHA512 (rsyslog-doc-8.2506.0.tar.gz) = 49db24f5905e4c48ab198358a646d105d0b10c23c7b9ea27d26baa533506e21420829a62acf52f4d34b56250d30988c1f8ab2d6798b3a416b0692c1fcf3c538d From 45a7896efd7190a7abc5872076ea7106cfd7c5b9 Mon Sep 17 00:00:00 2001 From: Attila Lakatos Date: Fri, 5 Sep 2025 08:25:56 +0200 Subject: [PATCH 2/4] Rebase to 8.2508.0 Resolves: rhbz#2392918 --- .gitignore | 2 + openssl-engines-disable.patch | 62 -------------------------- openssl3-compatibility.patch | 83 ----------------------------------- rsyslog.spec | 41 ++++++++--------- sources | 5 +-- 5 files changed, 23 insertions(+), 170 deletions(-) delete mode 100644 openssl-engines-disable.patch delete mode 100644 openssl3-compatibility.patch diff --git a/.gitignore b/.gitignore index b2767df..54d79dc 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-doc-8.2412.0.tar.gz /rsyslog-8.2506.0.tar.gz /rsyslog-doc-8.2506.0.tar.gz +/rsyslog-8.2508.0.tar.gz +/qpid-proton-0.40.0.tar.gz diff --git a/openssl-engines-disable.patch b/openssl-engines-disable.patch deleted file mode 100644 index 877f0a4..0000000 --- a/openssl-engines-disable.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/plugins/imdtls/imdtls.c b/plugins/imdtls/imdtls.c -index f90e8ad61c..bfb63452c7 100644 ---- a/plugins/imdtls/imdtls.c -+++ b/plugins/imdtls/imdtls.c -@@ -41,7 +41,9 @@ - #if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER) - # include - #endif --#include -+#ifndef OPENSSL_NO_ENGINE -+# include -+#endif - // --- - - #include "rsyslog.h" -diff --git a/plugins/omdtls/omdtls.c b/plugins/omdtls/omdtls.c -index 2b28908030..693ff99c77 100644 ---- a/plugins/omdtls/omdtls.c -+++ b/plugins/omdtls/omdtls.c -@@ -52,7 +52,9 @@ - #if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER) - # include - #endif --#include -+#ifndef OPENSSL_NO_ENGINE -+# include -+#endif - // --- - - // Include rsyslog headers -diff --git a/runtime/net_ossl.h b/runtime/net_ossl.h -index af36ffe488..d66a422d4d 100644 ---- a/runtime/net_ossl.h -+++ b/runtime/net_ossl.h -@@ -31,7 +31,9 @@ - #if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER) - # include - #endif --#include -+#ifndef OPENSSL_NO_ENGINE -+# include -+#endif - #include - #include - -diff --git a/tests/tcpflood.c b/tests/tcpflood.c -index 4b2d98b2c8..7322aeb135 100644 ---- a/tests/tcpflood.c -+++ b/tests/tcpflood.c -@@ -129,8 +129,10 @@ - #ifdef ENABLE_OPENSSL - #include - #include -- #include -- #include -+ #include -+# ifndef OPENSSL_NO_ENGINE -+# include -+# endif - - /* OpenSSL API differences */ - #if OPENSSL_VERSION_NUMBER >= 0x10100000L diff --git a/openssl3-compatibility.patch b/openssl3-compatibility.patch deleted file mode 100644 index c86fe23..0000000 --- a/openssl3-compatibility.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -up ./qpid-proton-0.34.0/c/src/ssl/openssl.c.orig ./qpid-proton-0.34.0/c/src/ssl/openssl.c ---- ./qpid-proton-0.34.0/c/src/ssl/openssl.c.orig 2021-06-01 09:29:27.976842727 +0200 -+++ ./qpid-proton-0.34.0/c/src/ssl/openssl.c 2021-06-01 09:31:05.232015887 +0200 -@@ -353,65 +353,6 @@ static int verify_callback(int preverify - return preverify_ok; - } - --// This was introduced in v1.1 --#if OPENSSL_VERSION_NUMBER < 0x10100000 --int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) --{ -- dh->p = p; -- dh->q = q; -- dh->g = g; -- return 1; --} --#endif -- --// this code was generated using the command: --// "openssl dhparam -C -2 2048" --static DH *get_dh2048(void) --{ -- static const unsigned char dhp_2048[]={ -- 0xAE,0xF7,0xE9,0x66,0x26,0x7A,0xAC,0x0A,0x6F,0x1E,0xCD,0x81, -- 0xBD,0x0A,0x10,0x7E,0xFA,0x2C,0xF5,0x2D,0x98,0xD4,0xE7,0xD9, -- 0xE4,0x04,0x8B,0x06,0x85,0xF2,0x0B,0xA3,0x90,0x15,0x56,0x0C, -- 0x8B,0xBE,0xF8,0x48,0xBB,0x29,0x63,0x75,0x12,0x48,0x9D,0x7E, -- 0x7C,0x24,0xB4,0x3A,0x38,0x7E,0x97,0x3C,0x77,0x95,0xB0,0xA2, -- 0x72,0xB6,0xE9,0xD8,0xB8,0xFA,0x09,0x1B,0xDC,0xB3,0x80,0x6E, -- 0x32,0x0A,0xDA,0xBB,0xE8,0x43,0x88,0x5B,0xAB,0xC3,0xB2,0x44, -- 0xE1,0x95,0x85,0x0A,0x0D,0x13,0xE2,0x02,0x1E,0x96,0x44,0xCF, -- 0xA0,0xD8,0x46,0x32,0x68,0x63,0x7F,0x68,0xB3,0x37,0x52,0xCE, -- 0x3A,0x4E,0x48,0x08,0x7F,0xD5,0x53,0x00,0x59,0xA8,0x2C,0xCB, -- 0x51,0x64,0x3D,0x5F,0xEF,0x0E,0x5F,0xE6,0xAF,0xD9,0x1E,0xA2, -- 0x35,0x64,0x37,0xD7,0x4C,0xC9,0x24,0xFD,0x2F,0x75,0xBB,0x3A, -- 0x15,0x82,0x76,0x4D,0xC2,0x8B,0x1E,0xB9,0x4B,0xA1,0x33,0xCF, -- 0xAA,0x3B,0x7C,0xC2,0x50,0x60,0x6F,0x45,0x69,0xD3,0x6B,0x88, -- 0x34,0x9B,0xE4,0xF8,0xC6,0xC7,0x5F,0x10,0xA1,0xBA,0x01,0x8C, -- 0xDA,0xD1,0xA3,0x59,0x9C,0x97,0xEA,0xC3,0xF6,0x02,0x55,0x5C, -- 0x92,0x1A,0x39,0x67,0x17,0xE2,0x9B,0x27,0x8D,0xE8,0x5C,0xE9, -- 0xA5,0x94,0xBB,0x7E,0x16,0x6F,0x53,0x5A,0x6D,0xD8,0x03,0xC2, -- 0xAC,0x7A,0xCD,0x22,0x98,0x8E,0x33,0x2A,0xDE,0xAB,0x12,0xC0, -- 0x0B,0x7C,0x0C,0x20,0x70,0xD9,0x0B,0xAE,0x0B,0x2F,0x20,0x9B, -- 0xA4,0xED,0xFD,0x49,0x0B,0xE3,0x4A,0xF6,0x28,0xB3,0x98,0xB0, -- 0x23,0x1C,0x09,0x33, -- }; -- static const unsigned char dhg_2048[]={ -- 0x02, -- }; -- DH *dh = DH_new(); -- BIGNUM *dhp_bn, *dhg_bn; -- -- if (dh == NULL) -- return NULL; -- dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL); -- dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL); -- if (dhp_bn == NULL || dhg_bn == NULL -- || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { -- DH_free(dh); -- BN_free(dhp_bn); -- BN_free(dhg_bn); -- return NULL; -- } -- return dh; --} -- - typedef struct { - char *id; - SSL_SESSION *session; -@@ -542,13 +483,6 @@ static bool pni_init_ssl_domain( pn_ssl_ - domain->default_seclevel = SSL_CTX_get_security_level(domain->ctx); - # endif - -- DH *dh = get_dh2048(); -- if (dh) { -- SSL_CTX_set_tmp_dh(domain->ctx, dh); -- DH_free(dh); -- SSL_CTX_set_options(domain->ctx, SSL_OP_SINGLE_DH_USE); -- } -- - return true; - } - diff --git a/rsyslog.spec b/rsyslog.spec index 9716008..c46477f 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -1,7 +1,7 @@ %define rsyslog_statedir %{_sharedstatedir}/rsyslog %define rsyslog_pkidir %{_sysconfdir}/pki/rsyslog %define rsyslog_docdir %{_docdir}/rsyslog -%define qpid_proton_v 0.39.0 +%define qpid_proton_v 0.40.0 # The following packages are not enabled on rhel: # hiredis, libdbi, mongodb, rabbitmq # The omamqp1 plugin is built differently as qpid-proton is not available on rhel @@ -36,19 +36,18 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.2506.0 +Version: 8.2508.0 Release: 1%{?dist} License: GPL-3.0-or-later AND Apache-2.0 URL: http://www.rsyslog.com/ Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz -Source1: http://www.rsyslog.com/files/download/rsyslog/%{name}-doc-%{version}.tar.gz -Source2: rsyslog.conf -Source3: rsyslog.sysconfig -Source4: rsyslog.log -Source5: rsyslog.service +Source1: rsyslog.conf +Source2: rsyslog.sysconfig +Source3: rsyslog.log +Source4: rsyslog.service # Add qpid-proton as another source, enable omamqp1 module in a # separatae sub-package with it statically linked(see rhbz#1713427) -Source6: https://archive.apache.org/dist/qpid/proton/%{qpid_proton_v}/qpid-proton-%{qpid_proton_v}.tar.gz +Source5: https://archive.apache.org/dist/qpid/proton/%{qpid_proton_v}/qpid-proton-%{qpid_proton_v}.tar.gz BuildRequires: make BuildRequires: gcc @@ -69,8 +68,6 @@ BuildRequires: systemd-rpm-macros BuildRequires: zlib-devel BuildRequires: libcap-ng-devel -Patch0: openssl-engines-disable.patch - Recommends: logrotate Obsoletes: rsyslog-logrotate < 8.2310.0-2 Provides: rsyslog-logrotate = %{version}-%{release} @@ -375,17 +372,12 @@ This module allows rsyslog to send messages to a RabbitMQ server. %endif %prep -# set up rsyslog-doc sources -%setup -q -a 1 -T -c -rm -r LICENSE README.md source build/objects.inv -mv build doc # set up rsyslog sources %setup -q -D -%patch -P 0 -p1 %if %{with omamqp1} # Unpack qpid-proton -%setup -q -D -T -b 6 +%setup -q -D -T -b 5 %endif %build @@ -541,10 +533,10 @@ install -d -m 700 %{buildroot}%{rsyslog_statedir} install -d -m 700 %{buildroot}%{rsyslog_pkidir} install -d -m 755 %{buildroot}%{rsyslog_docdir}/html -install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rsyslog.conf -install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/rsyslog -install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/rsyslog -install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/rsyslog.service +install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rsyslog.conf +install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/rsyslog +install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/rsyslog +install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/rsyslog.service %if %{with mysql} install -p -m 644 plugins/ommysql/createDB.sql %{buildroot}%{rsyslog_docdir}/mysql-createDB.sql @@ -583,8 +575,8 @@ done %{!?_licensedir:%global license %%doc} %license COPYING* %doc AUTHORS ChangeLog README.md -%{rsyslog_docdir} %exclude %{rsyslog_docdir}/html +%exclude %{rsyslog_docdir}/recover_qi.pl %if %{with mysql} %exclude %{rsyslog_docdir}/mysql-createDB.sql %endif @@ -652,7 +644,8 @@ done %{_libdir}/rsyslog/lmcry_ossl.so %files doc -%doc %{rsyslog_docdir}/html +%{rsyslog_docdir}/html +%{rsyslog_docdir}/recover_qi.pl %files elasticsearch %{_libdir}/rsyslog/omelasticsearch.so @@ -761,6 +754,10 @@ done %changelog +* Fri Sep 05 2025 Attila Lakatos - 8.2508.0-1 +- Rebase to 8.2508.0 + Resolves: rhbz#2392918 + * Thu Jun 12 2025 Attila Lakatos - 8.2506.0-1 - Rebase to 8.2506.0 Resolves: rhbz#2347628 diff --git a/sources b/sources index 7e05396..e23ea0e 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (qpid-proton-0.39.0.tar.gz) = df5c5469ee82ba02de62dce15b73b81aab2aae07c7db668182df690cea4ff7584111bd12143fe5e3569469a9ddf4950ac68d60b53d1a7815da4748052948cd1b -SHA512 (rsyslog-8.2506.0.tar.gz) = 82fd3a3e76217081c7903b0bdb8bdb46c23657593d84d5ff7f836efca4c76d7d2870706150a6473c0667f0c8571a3c8e5d237619a3ad3940701925efaec32941 -SHA512 (rsyslog-doc-8.2506.0.tar.gz) = 49db24f5905e4c48ab198358a646d105d0b10c23c7b9ea27d26baa533506e21420829a62acf52f4d34b56250d30988c1f8ab2d6798b3a416b0692c1fcf3c538d +SHA512 (rsyslog-8.2508.0.tar.gz) = 73d9cfa9e3260aacefc20acd2f30db2d6ea01fb2d309cebcc81802a9d6d756e719810572f330931027b2d21a9fb57deaadb8bf9bd0849be6da5794ff6d178a0c +SHA512 (qpid-proton-0.40.0.tar.gz) = 3e7fe56ca1423f45f71d81f5e1d6ec5f21c073cc580628e12a8dbd545a86805b7312834e0d1234dde43797633d575ed639f21a96239b217500cc0a824482aae3 From a8eeb46d6ca46be61dd402f98600cde06436313d Mon Sep 17 00:00:00 2001 From: Attila Lakatos Date: Mon, 20 Oct 2025 09:25:46 +0200 Subject: [PATCH 3/4] Rebase to 8.2510.0 Resolves: rhbz#2404131 imjournal open error handling fix Resolves: rhbz#2375742 --- .gitignore | 1 + rsyslog.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 54d79dc..cef7fab 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ rsyslog-4.6.3.tar.gz /rsyslog-doc-8.2506.0.tar.gz /rsyslog-8.2508.0.tar.gz /qpid-proton-0.40.0.tar.gz +/rsyslog-8.2510.0.tar.gz diff --git a/rsyslog.spec b/rsyslog.spec index c46477f..db2c924 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -36,7 +36,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.2508.0 +Version: 8.2510.0 Release: 1%{?dist} License: GPL-3.0-or-later AND Apache-2.0 URL: http://www.rsyslog.com/ @@ -754,6 +754,12 @@ done %changelog +* Mon Oct 20 2025 Attila Lakatos - 8.2510.0-1 +- Rebase to 8.2510.0 + Resolves: rhbz#2404131 +- imjournal open error handling fix + Resolves: rhbz#2375742 + * Fri Sep 05 2025 Attila Lakatos - 8.2508.0-1 - Rebase to 8.2508.0 Resolves: rhbz#2392918 diff --git a/sources b/sources index e23ea0e..1294997 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rsyslog-8.2508.0.tar.gz) = 73d9cfa9e3260aacefc20acd2f30db2d6ea01fb2d309cebcc81802a9d6d756e719810572f330931027b2d21a9fb57deaadb8bf9bd0849be6da5794ff6d178a0c +SHA512 (rsyslog-8.2510.0.tar.gz) = d2e693fd8c7112e4ccc36ea6fbb19909df885e7cb2778e95c04b7c5e9db8240224decfee52308a46865b7deffcf1e31ade0104c90d84b768a4dece15e5ea190e SHA512 (qpid-proton-0.40.0.tar.gz) = 3e7fe56ca1423f45f71d81f5e1d6ec5f21c073cc580628e12a8dbd545a86805b7312834e0d1234dde43797633d575ed639f21a96239b217500cc0a824482aae3 From 492f81bb7e954ace02b4ce7fd931c5b85a671f2e Mon Sep 17 00:00:00 2001 From: Attila Lakatos Date: Mon, 20 Oct 2025 09:47:39 +0200 Subject: [PATCH 4/4] Add mmleefparse module to base package --- rsyslog.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rsyslog.spec b/rsyslog.spec index db2c924..568237e 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -616,6 +616,7 @@ done %{_libdir}/rsyslog/mmanon.so %{_libdir}/rsyslog/mmcount.so %{_libdir}/rsyslog/mmexternal.so +%{_libdir}/rsyslog/mmleefparse.so %{_libdir}/rsyslog/mmutf8fix.so %{_libdir}/rsyslog/omhttp.so %{_libdir}/rsyslog/omjournal.so @@ -759,6 +760,7 @@ done Resolves: rhbz#2404131 - imjournal open error handling fix Resolves: rhbz#2375742 +- Add mmleefparse module to base package * Fri Sep 05 2025 Attila Lakatos - 8.2508.0-1 - Rebase to 8.2508.0