diff --git a/SOURCES/rsyslog-8.24.0-rhbz1627799-cert-chains.patch b/SOURCES/rsyslog-8.24.0-rhbz1627799-cert-chains.patch index b90850e..f79ec26 100644 --- a/SOURCES/rsyslog-8.24.0-rhbz1627799-cert-chains.patch +++ b/SOURCES/rsyslog-8.24.0-rhbz1627799-cert-chains.patch @@ -213,12 +213,12 @@ diff -up rsyslog-8.24.0/runtime/nsd_gtls.c.v36tls rsyslog-8.24.0/runtime/nsd_gtl } \ } -@@ -192,9 +201,12 @@ gtlsLoadOurCertKey(nsd_gtls_t *pThis) +@@ -192,9 +201,13 @@ gtlsLoadOurCertKey(nsd_gtls_t *pThis) /* try load certificate */ CHKiRet(readFile(certFile, &data)); - CHKgnutls(gnutls_x509_crt_init(&pThis->ourCert)); -- pThis->bOurCertIsInit = 1; + pThis->bOurCertIsInit = 1; - CHKgnutls(gnutls_x509_crt_import(pThis->ourCert, &data, GNUTLS_X509_FMT_PEM)); + pThis->nOurCerts = sizeof(pThis->pOurCerts) / sizeof(gnutls_x509_crt_t); + gnuRet = gnutls_x509_crt_list_import(pThis->pOurCerts, &pThis->nOurCerts, diff --git a/SPECS/rsyslog.spec b/SPECS/rsyslog.spec index c3743e7..efa6efd 100644 --- a/SPECS/rsyslog.spec +++ b/SPECS/rsyslog.spec @@ -14,7 +14,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.24.0 -Release: 52%{?dist} +Release: 52%{?dist}.2 License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -705,6 +705,11 @@ done %{_libdir}/rsyslog/mmkubernetes.so %changelog +* Mon May 18 2020 Jiri Vymazal - 8.24.0-52.2 +RHEL 7.8.z ERRATUM +- edited cert chains patch to not cause memory leaks + resolves: rhbz#1836172 + * Wed Nov 27 2019 Jiri Vymazal - 8.24.0-52 RHEL 7.8 ERRATUM - edited patch file ID for imfile to not log useless errors