From de9827dd67eca7df24e53aea7e8b6f563f392950 Mon Sep 17 00:00:00 2001 From: linzhuorong Date: Tue, 27 Jun 2023 06:32:17 +0000 Subject: [PATCH] modify backport patch to fix compile error Signed-off-by: linzhuorong --- ...-GNUTls-Driver-Fix-memory-leaks-in-gtlsInitC.patch | 10 +++++----- ...-core-bugfix-using-uuid-msg-prop-can-deadloc.patch | 4 ++-- rsyslog.spec | 11 ++++++++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/backport-GNUTls-Driver-Fix-memory-leaks-in-gtlsInitC.patch b/backport-GNUTls-Driver-Fix-memory-leaks-in-gtlsInitC.patch index 0db0594..cc84204 100644 --- a/backport-GNUTls-Driver-Fix-memory-leaks-in-gtlsInitC.patch +++ b/backport-GNUTls-Driver-Fix-memory-leaks-in-gtlsInitC.patch @@ -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 Date: Thu, 11 May 2023 16:49:11 +0200 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(-) 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 +++ b/runtime/nsd_gtls.c @@ -711,7 +711,10 @@ gtlsInitCred(nsd_gtls_t *const pThis ) @@ -35,8 +35,8 @@ index bbda5c5bc..da549d728 100644 + } /* sets the trusted cas file */ - cafile = (pThis->pszCAFile == NULL) ? glbl.GetDfltNetstrmDrvrCAF() : pThis->pszCAFile; -@@ -2264,7 +2267,12 @@ finalize_it: + 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; @@ -50,5 +50,5 @@ index bbda5c5bc..da549d728 100644 } -- -2.12.3 +2.33.0 diff --git a/backport-core-bugfix-using-uuid-msg-prop-can-deadloc.patch b/backport-core-bugfix-using-uuid-msg-prop-can-deadloc.patch index 4924ae0..33136d1 100644 --- a/backport-core-bugfix-using-uuid-msg-prop-can-deadloc.patch +++ b/backport-core-bugfix-using-uuid-msg-prop-can-deadloc.patch @@ -16,7 +16,7 @@ closes https://github.com/rsyslog/rsyslog/issues/5104 --- -Conflict:runtime/msg.c +Conflict:NA Type:bugfix 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 * 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. * * This file is part of the rsyslog runtime library. diff --git a/rsyslog.spec b/rsyslog.spec index ad1f5b9..de26df9 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -7,7 +7,7 @@ Name: rsyslog Version: 8.2210.0 -Release: 1 +Release: 2 Summary: The rocket-fast system for log processing License: (GPLv3+ and ASL 2.0) URL: http://www.rsyslog.com/ @@ -511,6 +511,15 @@ done %{_mandir}/man1/rscryutil.1.gz %changelog +* Sun Jun 25 2023 linzhuorong - 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 - 8.2210.0-1 - Type:NA - ID:NA