SOURCES/propagate-gnutlsPriorityString.patch

@@ -1,11 +0,0 @@
-diff -up rsyslog-8.2102.0/runtime/nsd_ossl.c.orig rsyslog-8.2102.0/runtime/nsd_ossl.c
---- rsyslog-8.2102.0/runtime/nsd_ossl.c.orig	2024-08-26 15:27:50.528691153 +0200
-+++ rsyslog-8.2102.0/runtime/nsd_ossl.c	2024-08-26 15:28:06.950855632 +0200
-@@ -1544,6 +1544,7 @@ AcceptConnReq(nsd_t *pNsd, nsd_t **ppNew
- 	pNew->permitExpiredCerts = pThis->permitExpiredCerts;
- 	pNew->pPermPeers = pThis->pPermPeers;
- 	pNew->DrvrVerifyDepth = pThis->DrvrVerifyDepth;
-+	pNew->gnutlsPriorityString = pThis->gnutlsPriorityString;
- 	CHKiRet(osslInitSession(pNew, osslServer));
- 
- 	/* Store nsd_ossl_t* reference in SSL obj */

SPECS/rsyslog.spec

@@ -6,7 +6,7 @@
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
 Version: 8.2102.0
-Release: 15%{?dist}.1
+Release: 15%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
 ExcludeArch: i686
@@ -76,7 +76,6 @@ Patch24: rsyslog-8.2102.0-rhbz2192955-es-4.patch
 Patch25: rsyslog-8.2102.0-rhbz2192955-es-5.patch
 Patch26: rsyslog-8.2102.0-rhbz2192955-es-6.patch
 Patch27: rsyslog-8.2102.0-rhbz2192955-es-doc.patch
-Patch28: propagate-gnutlsPriorityString.patch
 
 %package crypto
 Summary: Encryption support
@@ -300,35 +299,34 @@ mv build doc
 %setup -q -D
 %setup -q -D -T -b 5
 
-%patch -P 0 -p1
+%patch0  -p1 -b .default-tag
-%patch -P 1 -p1
+%patch1  -p1 -b .fd-leak-on-fsync
-%patch -P 2 -p1
+%patch2  -p1 -b .timeout
-%patch -P 3 -p1
+%patch3  -p1 -b .unexpected-priority-length
-%patch -P 4 -p1
+%patch4  -p1 -b .imuxsock-rate-limit
-%patch -P 5 -p1
+%patch5  -p1 -b .abort-on-id-resolution-fail
-%patch -P 6 -p1
+%patch6  -p1 -b .prioritizeSAN
-%patch -P 7 -p1
+%patch7  -p1 -b .errfile-maxsize
-%patch -P 8 -p1
+%patch8  -p1 -b .state-file-leaking
-%patch -P 9 -p1
+%patch9  -p1 -b .state-file-leaking-doc
-%patch -P 10 -p1
+%patch10 -p1 -b .ossl-better-logs
-%patch -P 11 -p1
+%patch11 -p1 -b .imtcp-refactor-params
-%patch -P 12 -p1
+%patch12 -p1 -b .ossl-memory-leak
-%patch -P 13 -p1
+%patch13 -p1 -b .ossl-ciphers-behaviour
-%patch -P 14 -p1
+%patch14 -p1 -b .CVE-24903
-%patch -P 15 -p1
+%patch15 -p1 -b .gnutls-error-handling
-%patch -P 16 -p1
+%patch16 -p1 -b .extra-ca-files
-%patch -P 17 -p1
+%patch17 -p1 -b .extra-ca-files-doc
-%patch -P 18 -p1
+%patch18 -p1 -b .imklog-heap
-%patch -P 19 -p1
+%patch19 -p1 -b .cstrlen
-%patch -P 20 -p1
+%patch20 -p1 -b .es0
-%patch -P 21 -p1
+%patch21 -p1 -b .es1
-%patch -P 22 -p1
+%patch22 -p1 -b .es2
-%patch -P 23 -p1
+%patch23 -p1 -b .es3
-%patch -P 24 -p1
+%patch24 -p1 -b .es4
-%patch -P 25 -p1
+%patch25 -p1 -b .es5
-%patch -P 26 -p1
+%patch26 -p1 -b .es6
-%patch -P 27 -p1
+%patch27 -p1 -b .es-doc
-%patch -P 28 -p1
 
 %build
 %ifarch sparc64
@@ -573,10 +571,6 @@ done
 %{_libdir}/rsyslog/omudpspoof.so
 
 %changelog
-* Mon Aug 26 2024 Attila Lakatos <alakatos@redhat.com> - 8.2102.0-15.1
-- Propagate gnutlsPriorityString when accepting new connection
-  resolves: RHEL-54663
-
 * Thu May 11 2023 Attila Lakatos <alakatos@redhat.com> - 8.2102.0-15
 - omelasticsearch: make compatible with elasticsearch>=8
 - add new action specific parameter esversion.major