packages/rsyslog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tls bugfix: parameter 'StreamDriver.CRLFile' not known

Browse Source 
Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com>
(cherry picked from commit f3f0adb249b766ab42f1501a08ed8750f3409585)
This commit is contained in:
Qiumiao Zhang 2024-06-21 03:10:43 +00:00 committed by openeuler-sync-bot
parent 936d341aa8
commit 5cb8c53963
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rsyslog.spec
View File

@ -7,7 +7,7 @@
Name: rsyslog
Version: 8.2312.0
Release: 4
Release: 5
Summary: The rocket-fast system for log processing
License: (GPLv3+ and ASL 2.0)
URL: http://www.rsyslog.com/
@ -33,6 +33,8 @@ Patch6000: backport-outchannel-eleminate-type-cast-for-compatibility-rea.pa
Patch6001: backport-fix-printing-of-time_t-values.patch
Patch6002: backport-omfile-do-not-carry-out-actual-action-when-writing-to-dev-null.patch
Patch9006: tls-bugfix-parameter-StreamDriver_CRLFile-not-known.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
BuildRequires: libfastjson-devel >= 0.99.8 libestr-devel >= 0.1.9 python-sphinx
@ -508,6 +510,12 @@ done
%{_mandir}/man1/rscryutil.1.gz
%changelog
* Fri Jun 21 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 8.2312.0-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:tls bugfix: parameter 'StreamDriver.CRLFile' not known
* Mon Jun 17 2024 zhangxingrong <zhangxingrong@uniontech.com> - 8.2312.0-4
- add patch from upstream
- omfile-do-not-carry-out-actual-action-when-writing-to-dev-null

43
tls-bugfix-parameter-StreamDriver_CRLFile-not-known.patch Normal file
View File

@ -0,0 +1,43 @@
From abc4f0a260c5f3ed84e59387633feb07013b0a9f Mon Sep 17 00:00:00 2001
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
Date: Fri, 21 Jun 2024 01:36:51 +0000
Subject: [PATCH] tls bugfix: parameter 'StreamDriver.CRLFile' not known
imtcp: fix parameter 'StreamDriver.CRLFile' cannot be recognized in input()
omfwd: fix parameter 'StreamDriver.CRLFile' cannot be recognized in action()
Fixes: 844d1795a2b1 ("TLS CRL Support Issue 5081")
Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com>
---
plugins/imtcp/imtcp.c | 1 +
tools/omfwd.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
index 0c31c93d2..51c4e1e00 100644
--- a/plugins/imtcp/imtcp.c
+++ b/plugins/imtcp/imtcp.c
@@ -257,6 +257,7 @@ static struct cnfparamdescr inppdescr[] = {
{ "streamdriver.PrioritizeSAN", eCmdHdlrBinary, 0 },
{ "streamdriver.TlsVerifyDepth", eCmdHdlrPositiveInt, 0 },
{ "streamdriver.cafile", eCmdHdlrString, 0 },
+ { "streamdriver.crlfile", eCmdHdlrString, 0 },
{ "streamdriver.keyfile", eCmdHdlrString, 0 },
{ "streamdriver.certfile", eCmdHdlrString, 0 },
{ "permittedpeer", eCmdHdlrArray, 0 },
diff --git a/tools/omfwd.c b/tools/omfwd.c
index d1eeeff2a..2acd9e586 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -213,6 +213,7 @@ static struct cnfparamdescr actpdescr[] = {
{ "streamdriver.PrioritizeSAN", eCmdHdlrBinary, 0 },
{ "streamdriver.TlsVerifyDepth", eCmdHdlrPositiveInt, 0 },
{ "streamdriver.cafile", eCmdHdlrString, 0 },
+ { "streamdriver.crlfile", eCmdHdlrString, 0 },
{ "streamdriver.keyfile", eCmdHdlrString, 0 },
{ "streamdriver.certfile", eCmdHdlrString, 0 },
{ "resendlastmsgonreconnect", eCmdHdlrBinary, 0 },
--
2.33.0