[rpms/s390utils] rawhide: - rebased to 2.43.0 (rhbz#2493045)

[rpms/s390utils] rawhide: - rebased to 2.43.0 (rhbz#2493045)

[@ 2026-06-29 14:09 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/s390utils
Branch : rawhide
Commit : d9cda8ebf2d81eb5d1c79ee4d9e16ff9cfcdae63
Author : Dan Horák <dan@danny.cz>
Date   : 2026-06-29T14:07:58+00:00
Stats  : +7/-66 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/s390utils/c/d9cda8ebf2d81eb5d1c79ee4d9e16ff9cfcdae63?branch=rawhide

Log:
- rebased to 2.43.0 (rhbz#2493045)

---
diff --git a/s390utils-2.42.1-fedora.patch b/s390utils-2.42.1-fedora.patch
deleted file mode 100644
index e69de29..0000000
--- a/s390utils-2.42.1-fedora.patch
+++ /dev/null

diff --git a/s390utils-2.42.1-ossl4.patch b/s390utils-2.42.1-ossl4.patch
deleted file mode 100644
index f96701d..0000000
--- a/s390utils-2.42.1-ossl4.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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-2.43.0-fedora.patch b/s390utils-2.43.0-fedora.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/s390utils-2.43.0-fedora.patch

diff --git a/s390utils.spec b/s390utils.spec
index 7f8aab4..7fa4d3a 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -16,8 +16,8 @@
 
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.42.1
-Release:        3%{?dist}
+Version:        2.43.0
+Release:        1%{?dist}
 Epoch:          2
 # MIT covers nearly all the files, except init files (LGPL-2.1-or-later)
 #
@@ -80,10 +80,6 @@ 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}
 
@@ -1145,6 +1141,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Mon Jun 29 2026 Dan Horák <dan[at]danny.cz> - 2:2.43.0-1
+- rebased to 2.43.0 (rhbz#2493045)
+
 * Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 2:2.42.1-3
 - Rebuilt for openssl 4.0
 

diff --git a/sources b/sources
index dd5160a..2520f3a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (s390-tools-2.42.1.tar.gz) = 719b000ffc507837f579db8c395cd929151c77e36c598e872cef7cd76b6612f7cd5f8eba87de1df69a446a05ba3a6daa385a4bca2dfdb5b2b52e70cb5a7a197b
-SHA512 (s390-tools-2.42.1-rust-vendor.tar.xz) = 7fbae9b43d956e2a9b71b6a0a0928fca9506a191424d63f6df109ddc0ce4efa9df2d0e245ee231602a139642fe7fc25f13680eec27a4aa914be151a39876b945
+SHA512 (s390-tools-2.43.0.tar.gz) = c85af31335e7df6ac101f515b4b66eb5ca19762b7bcf4674ee90a35ac2e0d064a4bc71889287b45cca27baa83e9164d7d466c6c1c3b59ba3184f9a5643c8b5a7
+SHA512 (s390-tools-2.43.0-rust-vendor.tar.xz) = 6329a18787600c65c2aa5a6660e9f9a05b9090c90aeee4ac510feecc6d0389ac0351fe34a5f40ab3e6c6d4a6e435b41944d987895834aa2836e062c17b18b94e