- rebased to 2.31.0 (rhbz#2262499)

s390utils-2.30.0-fedora.patch

@@ -1,33 +0,0 @@
-From 6274294bc5cca34d626125072eb5befdd80d381f Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Tue, 12 Dec 2023 19:44:05 -0500
-Subject: [PATCH] libkmipclient: Fix build with libxml2-2.12.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0
-
-"Several cyclic dependencies in public header files were fixed. As a
-result, certain headers won't include other headers as before."
-
-Closes: https://github.com/ibm-s390-linux/s390-tools/pull/160
-Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
-Reviewed-by: Ingo Franzki <ifranzki@linux.ibm.com>
-Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
----
- libkmipclient/kmip.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libkmipclient/kmip.h b/libkmipclient/kmip.h
-index e91857761..3344cb016 100644
---- a/libkmipclient/kmip.h
-+++ b/libkmipclient/kmip.h
-@@ -16,6 +16,7 @@
- #include <openssl/ssl.h>
- 
- #include <json-c/json.h>
-+#include <libxml/parser.h>
- #include <libxml/tree.h>
- #include <curl/curl.h>
- 

s390utils.spec

@@ -15,8 +15,8 @@
 
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.30.0
-Release:        2%{?dist}
+Version:        2.31.0
+Release:        1%{?dist}
 Epoch:          2
 # MIT covers nearly all the files, except init files
 License:        MIT AND LGPL-2.1-or-later
@@ -49,7 +49,7 @@ Patch0:         s390-tools-zipl-invert-script-options.patch
 Patch1:         s390-tools-zipl-blscfg-rpm-nvr-sort.patch
 
 # upstream fixes/updates
-Patch100:       s390utils-%{version}-fedora.patch
+#Patch100:       s390utils-%%{version}-fedora.patch
 
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
@@ -105,7 +105,7 @@ BuildRequires:  crate(serde_yaml)
 BuildRequires:  crate(strsim)
 BuildRequires:  crate(terminal_size)
 BuildRequires:  crate(thiserror)
-BuildRequires:  crate(zerocopy) = 0.6.6
+BuildRequires:  crate(zerocopy)
 BuildRequires:  rust-packaging
 %endif
 %endif
@@ -244,12 +244,18 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf
 %doc README.md
 %license LICENSE
 %{_bindir}/genprotimg
+%if %{with rust}
+%{_bindir}/pvapconfig
+%endif
 %{_bindir}/pvattest
 %{_bindir}/pvextract-hdr
 %if %{with rust}
 %{_bindir}/pvsecret
 %endif
 %{_mandir}/man1/genprotimg.1*
+%if %{with rust}
+%{_mandir}/man1/pvapconfig.1*
+%endif
 %{_mandir}/man1/pvattest.1*
 %{_mandir}/man1/pvattest-create.1*
 %{_mandir}/man1/pvattest-perform.1*
@@ -261,7 +267,7 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf
 %{_mandir}/man1/pvsecret-create.1*
 %{_mandir}/man1/pvsecret-list.1*
 %{_mandir}/man1/pvsecret-lock.1*
-%{_mandir}/man1/pvsecret-version.1*
+%{_mandir}/man1/pvsecret-verify.1*
 %{_mandir}/man1/pvsecret.1*
 %endif
 %dir %{_datadir}/s390-tools
@@ -319,7 +325,10 @@ This package provides minimal set of tools needed to system to boot.
 /lib/s390-tools/cpictl
 /lib/s390-tools/stage3.bin
 /lib/s390-tools/zdev_id
+/lib/s390-tools/zdev-from-dasd_mod.dasd
 /lib/s390-tools/zdev-root-update
+/lib/s390-tools/zdev-to-dasd_mod.dasd
+/lib/s390-tools/zdev-to-rd.znet
 /lib/s390-tools/zipl.conf
 %ghost %config(noreplace) %{_sysconfdir}/zipl.conf
 %config(noreplace) %{_sysconfdir}/ziplenv
@@ -583,6 +592,9 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/zpcictl
 %{_bindir}/dump2tar
 %{_bindir}/genprotimg
+%if %{with rust}
+%{_bindir}/pvapconfig
+%endif
 %{_bindir}/mk-s390image
 %{_bindir}/pvattest
 %{_bindir}/pvextract-hdr
@@ -613,6 +625,9 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_libdir}/zkey/zkey-kmip.so
 %{_mandir}/man1/dump2tar.1*
 %{_mandir}/man1/genprotimg.1*
+%if %{with rust}
+%{_mandir}/man1/pvapconfig.1*
+%endif
 %{_mandir}/man1/pvattest.1*
 %{_mandir}/man1/pvattest-create.1*
 %{_mandir}/man1/pvattest-perform.1*
@@ -624,7 +639,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man1/pvsecret-create.1*
 %{_mandir}/man1/pvsecret-list.1*
 %{_mandir}/man1/pvsecret-lock.1*
-%{_mandir}/man1/pvsecret-version.1*
+%{_mandir}/man1/pvsecret-verify.1*
 %{_mandir}/man1/pvsecret.1*
 %endif
 %{_mandir}/man1/zkey.1*
@@ -1043,6 +1058,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Mon Feb 05 2024 Dan Horák <dan[at]danny.cz> - 2:2.31.0-1
+- rebased to 2.31.0 (rhbz#2262499)
+
 * Thu Jan 25 2024 Dan Horák <dan[at]danny.cz> - 2:2.30.0-2
 - add s390utils-se-data as a noarch subpackage with Secure Execution data files
 

sources

@@ -1,2 +1,2 @@
-SHA512 (s390-tools-2.30.0.tar.gz) = 414ce95a0952b7b48aea94661e7a95a26d426ce27136800a91bd1cced46998741229c5d058a9c55484491c771a112e4c1401b569c67a5d52d7ba8d33b1a0cba1
-SHA512 (s390-tools-2.30.0-rust-vendor.tar.xz) = a20a8da5e134883309a88ee1e796dcdd60a191917307fc3d129e1d3a6363117fc6f95c2319cd4b451ea7d3fbd599227a3ae53a8871076613877e15e0a4eda5dd
+SHA512 (s390-tools-2.31.0.tar.gz) = d05722dff760605baad92b25a7a9264b3c936ff851b87a02ab39604a74d02ae4e14632d9b3d83eb9cb82a14bfcbb0d40bb4797896051ed3dd36d7690abfb1c64
+SHA512 (s390-tools-2.31.0-rust-vendor.tar.xz) = f9dc2887bb2502ba6f71ef7ea807380c322a46df8c65f0fc7993f3fb4eec4da120369d3e380dbcca9b6250307da0f6236a649504d542f44730e8009ace8ed450