Resolves: RHEL-52491

This commit is contained in:
Martin Cermak 2024-08-09 07:55:36 +02:00
parent 0a5fe0416d
commit f3305ca6bc
2 changed files with 28 additions and 1 deletions

22
RHEL-52491.patch Normal file
View File

@ -0,0 +1,22 @@
commit 470da664cc0afd4aac982806622dbb5d700a7904
Author: Martin Cermak <mcermak@redhat.com>
Date: Fri Aug 9 07:40:43 2024 +0200
RHEL-52491: NSS 3.101.0 compatibility
After NSS rebased to 3.101.0, systemtap stopped being able to grant
trust to stap-server: https://issues.redhat.com/browse/RHEL-52491 .
This patch fixes it.
diff --git a/client-nss.cxx b/client-nss.cxx
index 55266feb7..c09f99ca9 100644
--- a/client-nss.cxx
+++ b/client-nss.cxx
@@ -184,6 +184,7 @@ badCertHandler(void *arg, PRFileDesc *sslSocket)
break;
+ case SEC_ERROR_UNKNOWN_ISSUER:
case SEC_ERROR_CA_CERT_INVALID:
/* The server's certificate is not trusted. Should we trust it? */
secStatus = SECFailure; /* Do not trust by default. */

View File

@ -121,7 +121,7 @@ m stapdev stapdev
Name: systemtap Name: systemtap
# PRERELEASE # PRERELEASE
Version: 5.1 Version: 5.1
Release: 8%{?release_override}%{?dist} Release: 9%{?release_override}%{?dist}
# for version, see also configure.ac # for version, see also configure.ac
@ -163,6 +163,7 @@ Patch3: PR31495.patch
Patch4: RHEL-42605.patch Patch4: RHEL-42605.patch
Patch5: RHEL-50107.patch Patch5: RHEL-50107.patch
Patch6: RHEL-43481.patch Patch6: RHEL-43481.patch
Patch7: RHEL-52491.patch
# Build* # Build*
BuildRequires: make BuildRequires: make
@ -595,6 +596,7 @@ or within a container.
%patch -P4 -p1 %patch -P4 -p1
%patch -P5 -p1 %patch -P5 -p1
%patch -P6 -p1 %patch -P6 -p1
%patch -P7 -p1
%build %build
@ -1322,6 +1324,9 @@ exit 0
# PRERELEASE # PRERELEASE
%changelog %changelog
* Fri Aug 9 2024 Martin Cermak <mcermak@redhat.com> - 5.1-9
- RHEL-52491
* Fri Jul 26 2024 Martin Cermak <mcermak@redhat.com> - 5.1-8 * Fri Jul 26 2024 Martin Cermak <mcermak@redhat.com> - 5.1-8
- RHEL-43481 - RHEL-43481