[rpms/s390utils] rawhide: Fix detection of OpenSSL 4.0

[Stephen Gallagher <sgallagh@redhat.com>]

A new commit has been pushed.

Repo   : rpms/s390utils
Branch : rawhide
Commit : 727b9b4bb6b5f6c7275339657cb235baa35fa26f
Author : Stephen Gallagher <sgallagh@redhat.com>
Date   : 2026-06-08T15:43:26-04:00
Stats  : +66/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/s390utils/c/727b9b4bb6b5f6c7275339657cb235baa35fa26f?branch=rawhide

Log:
Fix detection of OpenSSL 4.0

---
diff --git a/s390utils-2.42.1-ossl4.patch b/s390utils-2.42.1-ossl4.patch
new file mode 100644
index 0000000..f96701d
--- /dev/null
+++ b/s390utils-2.42.1-ossl4.patch
@@ -0,0 +1,58 @@
+From 7807f95dafa8d2f2d7f68a2f65ccf1ba712052d7 Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh@redhat.com>
+Date: Mon, 8 Jun 2026 14:45:03 -0400
+Subject: [PATCH] Use EVP_PKEY_id() for OpenSSL 1.1 detection
+
+The previous function, EVP_PKEY_meth_remove(), was deprecated in OpenSSL
+3.0 and fully removed in OpenSSL 4.0. As a result, it fails detection of
+OpenSSL 1.1+ if OpenSSL 4 is present.
+
+Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
+---
+ libekmfweb/Makefile    | 2 +-
+ libkmipclient/Makefile | 2 +-
+ libseckey/Makefile     | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libekmfweb/Makefile b/libekmfweb/Makefile
+index f6c60eaa..4bc0fb76 100644
+--- a/libekmfweb/Makefile
++++ b/libekmfweb/Makefile
+@@ -43,7 +43,7 @@ detect-openssl-version.dep:
+ 	echo "  #error openssl version 1.1 is required" >> $(TMPFILE)
+ 	echo "#endif" >> $(TMPFILE)
+ 	echo "static void __attribute__((unused)) test(void) {" >> $(TMPFILE)
+-	echo "    EVP_PKEY_meth_remove(NULL);" >> $(TMPFILE)
++	echo "    EVP_PKEY_id(NULL);" >> $(TMPFILE)
+ 	echo "}" >> $(TMPFILE)
+ 	mv $(TMPFILE) $@
+ 
+diff --git a/libkmipclient/Makefile b/libkmipclient/Makefile
+index c37f8820..fe4532b8 100644
+--- a/libkmipclient/Makefile
++++ b/libkmipclient/Makefile
+@@ -46,7 +46,7 @@ detect-openssl-version.dep:
+ 	echo "  #error openssl version 1.1 is required" >> $(TMPFILE)
+ 	echo "#endif" >> $(TMPFILE)
+ 	echo "static void __attribute__((unused)) test(void) {" >> $(TMPFILE)
+-	echo "    EVP_PKEY_meth_remove(NULL);" >> $(TMPFILE)
++	echo "    EVP_PKEY_id(NULL);" >> $(TMPFILE)
+ 	echo "}" >> $(TMPFILE)
+ 	mv $(TMPFILE) $@
+ 
+diff --git a/libseckey/Makefile b/libseckey/Makefile
+index 66b94446..4ddcc8fd 100644
+--- a/libseckey/Makefile
++++ b/libseckey/Makefile
+@@ -28,7 +28,7 @@ detect-openssl-version.dep:
+ 	echo "  #error openssl version 1.1 is required" >> $(TMPFILE)
+ 	echo "#endif" >> $(TMPFILE)
+ 	echo "static void __attribute__((unused)) test(void) {" >> $(TMPFILE)
+-	echo "    EVP_PKEY_meth_remove(NULL);" >> $(TMPFILE)
++	echo "    EVP_PKEY_id(NULL);" >> $(TMPFILE)
+ 	echo "}" >> $(TMPFILE)
+ 	mv $(TMPFILE) $@
+ 
+-- 
+2.54.0
+

diff --git a/s390utils.spec b/s390utils.spec
index bdc90c3..21d104f 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -17,7 +17,7 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
 Version:        2.42.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 # MIT covers nearly all the files, except init files (LGPL-2.1-or-later)
 #
@@ -80,6 +80,10 @@ Patch1:         s390-tools-zipl-blscfg-rpm-nvr-sort.patch
 # upstream fixes/updates
 #Patch100:       s390utils-%%{version}-fedora.patch
 
+# Fix detection of OpenSSL 1.1+ when 4.0 is available
+# Upstream PR: https://github.com/ibm-s390-linux/s390-tools/pull/204
+Patch101:        s390utils-2.42.1-ossl4.patch
+
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
 
@@ -1141,6 +1145,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Mon Jun 08 2026 Stephen Gallagher <sgallagh@redhat.com> - 2:2.42.1-2
+- Fix detection of OpenSSL 4.0
+
 * Mon May 25 2026 Dan Horák <dan[at]danny.cz> - 2:2.42.1-1
 - rebased to 2.42.1 (rhbz#2464150)