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

modify backport patch to fix compile error

Browse Source 
Signed-off-by: linzhuorong <linzhuorong@huawei.com>
This commit is contained in:
linzhuorong 2023-06-27 06:32:17 +00:00 committed by Gitee
parent 19dfa6e69c
commit de9827dd67
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backport-GNUTls-Driver-Fix-memory-leaks-in-gtlsInitC.patch
View File

@ -1,4 +1,4 @@
From e7ad250f51bba571c9861c4ab7df2df135be9ea3 Mon Sep 17 00:00:00 2001 From 0f06a850ced79244774734ed525b289f2930d9c7 Mon Sep 17 00:00:00 2001
From: Andre lorbach <alorbach@adiscon.com> From: Andre lorbach <alorbach@adiscon.com>
Date: Thu, 11 May 2023 16:49:11 +0200 Date: Thu, 11 May 2023 16:49:11 +0200
Subject: [PATCH] [backport] GNUTls Driver: Fix memory leaks in gtlsInitCred Subject: [PATCH] [backport] GNUTls Driver: Fix memory leaks in gtlsInitCred
@ -21,7 +21,7 @@ Reference:https://github.com/rsyslog/rsyslog/commit/3401d687d2d5f9556165b53be79f
1 file changed, 9 insertions(+), 1 deletion(-) 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c
index bbda5c5bc..da549d728 100644 index e003d85d3..91cffb500 100644
--- a/runtime/nsd_gtls.c --- a/runtime/nsd_gtls.c
+++ b/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c
@@ -711,7 +711,10 @@ gtlsInitCred(nsd_gtls_t *const pThis ) @@ -711,7 +711,10 @@ gtlsInitCred(nsd_gtls_t *const pThis )
@ -35,8 +35,8 @@ index bbda5c5bc..da549d728 100644
+ } + }
/* sets the trusted cas file */ /* sets the trusted cas file */
cafile = (pThis->pszCAFile == NULL) ? glbl.GetDfltNetstrmDrvrCAF() : pThis->pszCAFile; cafile = (pThis->pszCAFile == NULL) ? glbl.GetDfltNetstrmDrvrCAF(runConf) : pThis->pszCAFile;
@@ -2264,7 +2267,12 @@ finalize_it: @@ -2277,7 +2280,12 @@ finalize_it:
if(pThis->bHaveSess) { if(pThis->bHaveSess) {
gnutls_deinit(pThis->sess); gnutls_deinit(pThis->sess);
pThis->bHaveSess = 0; pThis->bHaveSess = 0;
@ -50,5 +50,5 @@ index bbda5c5bc..da549d728 100644
} }
-- --
2.12.3 2.33.0

4
backport-core-bugfix-using-uuid-msg-prop-can-deadloc.patch
View File

@ -16,7 +16,7 @@ closes https://github.com/rsyslog/rsyslog/issues/5104
--- ---
Conflict:runtime/msg.c Conflict:NA
Type:bugfix Type:bugfix
Reference:https://github.com/rsyslog/rsyslog/commit/82687e14fbf3d854e8cc954efb9fb0efa69a28d2 Reference:https://github.com/rsyslog/rsyslog/commit/82687e14fbf3d854e8cc954efb9fb0efa69a28d2
@ -33,7 +33,7 @@ index 73b7cec80..a3ddb8684 100644
* of the "old" message code without any modifications. However, it * 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. * helps to have things at the right place one we go to the meat of it.
* *
- * Copyright 2007-2020 Rainer Gerhards and Adiscon GmbH. - * Copyright 2007-2022 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2007-2023 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2023 Rainer Gerhards and Adiscon GmbH.
* *
* This file is part of the rsyslog runtime library. * This file is part of the rsyslog runtime library.

11
rsyslog.spec
View File

@ -7,7 +7,7 @@
Name: rsyslog Name: rsyslog
Version: 8.2210.0 Version: 8.2210.0
Release: 1 Release: 2
Summary: The rocket-fast system for log processing Summary: The rocket-fast system for log processing
License: (GPLv3+ and ASL 2.0) License: (GPLv3+ and ASL 2.0)
URL: http://www.rsyslog.com/ URL: http://www.rsyslog.com/
@ -511,6 +511,15 @@ done
%{_mandir}/man1/rscryutil.1.gz %{_mandir}/man1/rscryutil.1.gz
%changelog %changelog
* Sun Jun 25 2023 linzhuorong <linzhuorong@huawei.com> - 8.2210.0-2
- Type:NA
- ID:NA
- SUG:NA
- DESC: imjournal: add second fallback to _COMM
bugfix: prevent pot. segfault when switchung to
core/bugfix: using $uuid msg prop can deadlock rsyslog on shutdown
GNUTls Driver: Fix memory leaks in gtlsInitCred
* Sat Feb 4 2023 pengyi <pengyi37@huawei.com> - 8.2210.0-1 * Sat Feb 4 2023 pengyi <pengyi37@huawei.com> - 8.2210.0-1
- Type:NA - Type:NA
- ID:NA - ID:NA