From ea8f5ea85288e31c0718c6833face5d61189ec03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Tue, 5 Oct 2021 10:10:21 +0000
Subject: [PATCH] - rebased to 2.18.0

---
 s390-tools-zipl-blscfg-rpm-nvr-sort.patch |  4 ++--
 s390utils.spec                            | 12 ++++++++++--
 sources                                   |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/s390-tools-zipl-blscfg-rpm-nvr-sort.patch b/s390-tools-zipl-blscfg-rpm-nvr-sort.patch
index d69192f..2278c3f 100644
--- a/s390-tools-zipl-blscfg-rpm-nvr-sort.patch
+++ b/s390-tools-zipl-blscfg-rpm-nvr-sort.patch
@@ -8,8 +8,8 @@ diff -up s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort s390-tools-2.9.0
 -libs = $(rootdir)/libutil/libutil.a
 +libs = $(rootdir)/libutil/libutil.a -lrpmio -lrpm
  
- objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
- 	  install.o zipl.o $(rootdir)/zipl/boot/data.o
+ objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
+ 	  bootmap_header.o envblk.o install.o zipl.o $(rootdir)/zipl/boot/data.o
 diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/zipl/src/scan.c
 --- s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort	2019-05-21 09:13:36.000000000 -0400
 +++ s390-tools-2.9.0/zipl/src/scan.c	2019-05-22 08:16:17.317273801 -0400
diff --git a/s390utils.spec b/s390utils.spec
index e9b0e0e..961083e 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -5,8 +5,8 @@
 
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.17.0
-Release:        2%{?dist}
+Version:        2.18.0
+Release:        1%{?dist}
 Epoch:          2
 License:        MIT
 ExclusiveArch:  s390 s390x
@@ -181,10 +181,12 @@ This package provides minimal set of tools needed to system to boot.
 %{_sbindir}/fdasd
 %{_sbindir}/lszdev
 %{_sbindir}/zipl
+%{_sbindir}/zipl-editenv
 %dir /lib/s390-tools
 /lib/s390-tools/{zipl,chreipl}_helper.*
 /lib/s390-tools/cpictl
 /lib/s390-tools/stage3.bin
+/lib/s390-tools/zdev_id
 /lib/s390-tools/zdev-root-update
 /lib/s390-tools/zipl.conf
 %ghost %config(noreplace) %{_sysconfdir}/zipl.conf
@@ -200,6 +202,7 @@ This package provides minimal set of tools needed to system to boot.
 %{_mandir}/man8/fdasd.8*
 %{_mandir}/man8/lszdev.8*
 %{_mandir}/man8/zipl.8*
+%{_mandir}/man8/zipl-editenv.8*
 
 # Additional Fedora/RHEL specific stuff
 %ghost %config(noreplace) %{_sysconfdir}/dasd.conf
@@ -219,6 +222,7 @@ This package provides minimal set of tools needed to system to boot.
 %{_udevrulesdir}/59-dasd.rules
 %{_udevrulesdir}/60-readahead.rules
 %{_udevrulesdir}/81-ccw.rules
+%{_udevrulesdir}/81-dpm.rules
 %{_udevrulesdir}/90-cpi.rules
 %{_sysconfdir}/kernel/install.d/20-grubby.install
 %{_prefix}/lib/kernel/install.d/10-zfcpdump.install
@@ -430,6 +434,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/qethconf
 %{_sbindir}/qethqoat
 %{_sbindir}/scsi_logging_level
+%{_sbindir}/sclpdbf
 %{_sbindir}/start_hsnc.sh
 %{_sbindir}/tape390_crypt
 %{_sbindir}/tape390_display
@@ -821,6 +826,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Tue Oct 05 2021 Dan Horák <dan[at]danny.cz> - 2:2.18.0-1
+- rebased to 2.18.0
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.17.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index f999e3d..94bec67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (s390-tools-2.17.0.tar.gz) = 57d1c90e2a270c380fd7b4ac8efdd301299d9e8671a7ff10747557135b27a06e8124a49f50b8729b450550ced61599f392606bcbe5e499c5bd488b9e207945da
+SHA512 (s390-tools-2.18.0.tar.gz) = 498cbc55d7d84f72e9ec0f625267a26377a80f7be3bd967ec380531b6430d5ea0a192d92024ccd1f70acfe4a1c5aeaa9004110a158830972ca0a0204e7b9d328