From 5291e715d3e5bf346b33fed6f5ef1bc73460e3a5 Mon Sep 17 00:00:00 2001 From: zhangxingrong Date: Mon, 17 Jun 2024 10:40:02 +0800 Subject: [PATCH] add some patchs from upstream Deleting duplicate patches --- ...tual-action-when-writing-to-dev-null.patch | 79 +++++++++++++++++++ rsyslog.spec | 7 +- 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 backport-omfile-do-not-carry-out-actual-action-when-writing-to-dev-null.patch diff --git a/backport-omfile-do-not-carry-out-actual-action-when-writing-to-dev-null.patch b/backport-omfile-do-not-carry-out-actual-action-when-writing-to-dev-null.patch new file mode 100644 index 0000000..cf810c0 --- /dev/null +++ b/backport-omfile-do-not-carry-out-actual-action-when-writing-to-dev-null.patch @@ -0,0 +1,79 @@ +From 25224fb536488ae63e6addd2c9005bc2b8dc126a Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards +Date: Wed, 21 Feb 2024 09:31:00 +0100 +Subject: [PATCH] omfile: do not carry out actual action when writing to + /dev/null + +In some use cases omfile is configured to write to /dev/null. This seems +primarily be done because of statistics gathering but maybe some other +scenarios. We now add conditional logic to not do any actual omfile +action when the target file is /dev/null. + +Note: this check only works on static file names. When /dev/null is +evaluated as part of dynafile, it will be handled just in the regular +case like before this patch. +--- + tools/omfile.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/tools/omfile.c b/tools/omfile.c +index 1702a30399..cf464cd1c1 100644 +--- a/tools/omfile.c ++++ b/tools/omfile.c +@@ -17,7 +17,7 @@ + * pipes. These have been moved to ompipe, to reduced the entanglement + * between the two different functionalities. -- rgerhards + * +- * Copyright 2007-2023 Adiscon GmbH. ++ * Copyright 2007-2024 Adiscon GmbH. + * + * This file is part of rsyslog. + * +@@ -139,6 +139,7 @@ typedef struct _instanceData { + strm_t *pStrm; /* our output stream */ + short nInactive; /* number of minutes not writen (STATIC files only) */ + char bDynamicName; /* 0 - static name, 1 - dynamic name (with properties) */ ++ int isDevNull; /* do we "write" to /dev/null? - if so, do nothing */ + int fCreateMode; /* file creation mode for open() */ + int fDirCreateMode; /* creation mode for mkdir() */ + int bCreateDirs; /* auto-create directories? */ +@@ -1081,6 +1082,11 @@ BEGINcommitTransaction + instanceData *__restrict__ const pData = pWrkrData->pData; + unsigned i; + CODESTARTcommitTransaction ++ ++ if(pData->isDevNull) { ++ goto terminate; ++ } ++ + pthread_mutex_lock(&pData->mutWrite); + + for(i = 0 ; i < nParams ; ++i) { +@@ -1105,6 +1111,8 @@ CODESTARTcommitTransaction + iRet = (pData->bDynamicName && runModConf->bDynafileDoNotSuspend) ? + RS_RET_OK : RS_RET_SUSPENDED; + } ++ ++terminate: + ENDcommitTransaction + + +@@ -1135,6 +1143,7 @@ setInstParamDefaults(instanceData *__restrict__ const pData) + pData->useCryprov = 0; + pData->iCloseTimeout = -1; + pData->iSizeLimit = 0; ++ pData->isDevNull = 0; + pData->pszSizeLimitCmd = NULL; + } + +@@ -1378,6 +1387,10 @@ CODESTARTnewActInst + ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS); + } + ++ if(!strcmp((const char*) pData->fname, "/dev/null")) { ++ pData->isDevNull = 1; ++ } ++ + if(pData->sigprovName != NULL) { + initSigprov(pData, lst); + } diff --git a/rsyslog.spec b/rsyslog.spec index 9915220..4ec79c4 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -7,7 +7,7 @@ Name: rsyslog Version: 8.2312.0 -Release: 3 +Release: 4 Summary: The rocket-fast system for log processing License: (GPLv3+ and ASL 2.0) URL: http://www.rsyslog.com/ @@ -31,6 +31,7 @@ Patch9005: print-main-queue-info-to-journal-when-receive-USR1-signal.patch Patch6000: backport-outchannel-eleminate-type-cast-for-compatibility-rea.patch Patch6001: backport-fix-printing-of-time_t-values.patch +Patch6002: backport-omfile-do-not-carry-out-actual-action-when-writing-to-dev-null.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 @@ -507,6 +508,10 @@ done %{_mandir}/man1/rscryutil.1.gz %changelog +* Mon Jun 17 2024 zhangxingrong - 8.2312.0-4 +- add patch from upstream +- omfile-do-not-carry-out-actual-action-when-writing-to-dev-null + * Wed May 22 2024 zhangyaqi - 8.2312.0-3 - Type:bugfix - ID:NA -- Gitee