import s390utils-2.19.0-1.el8

.gitignore

@@ -1,3 +1,3 @@
 SOURCES/cmsfs-1.1.8c.tar.gz
-SOURCES/s390-tools-2.16.0.tar.gz
+SOURCES/s390-tools-2.19.0.tar.gz
 SOURCES/src_vipa-2.1.0.tar.gz

.s390utils.metadata

@@ -1,3 +1,3 @@
 9c9a4e89bddb2b4e6e09ef6fc7c2e6f2ad6316de SOURCES/cmsfs-1.1.8c.tar.gz
-faf04b6d0bca264a65107d063674b06c9b4c03bf SOURCES/s390-tools-2.16.0.tar.gz
+5b4eeed3868297ca65b7d5720484786172dc11d1 SOURCES/s390-tools-2.19.0.tar.gz
 8ed8592a0a9370ce8422df9231ccb17f6cf49bed SOURCES/src_vipa-2.1.0.tar.gz

SOURCES/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 -lrpm
  
- objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
+ objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
- 	  install.o zipl.o $(rootdir)/zipl/boot/data.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

SPECS/s390utils.spec

@@ -8,8 +8,8 @@
 
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.16.0
+Version:        2.19.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Epoch:          2
 License:        MIT
 ExclusiveArch:  s390 s390x
@@ -43,7 +43,7 @@ Patch0:         s390-tools-zipl-invert-script-options.patch
 Patch1:         s390-tools-zipl-blscfg-rpm-nvr-sort.patch
 
 # backported fixes
-Patch100:       s390utils-2.16.0-rhel.patch
+Patch100:       s390utils-2.19.0-rhel.patch
 
 Patch1000:      cmsfs-1.1.8-warnings.patch
 Patch1001:      cmsfs-1.1.8-kernel26.patch
@@ -121,8 +121,10 @@ popd
 
 %build
 make \
-        CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" \
+        CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
+        HAVE_DRACUT=1 \
         BINDIR=/usr/sbin \
+        UDEVRUNDIR=/run/udev \
         DISTRELEASE=%{release} \
         V=1
 
@@ -142,6 +144,7 @@ make install \
         DESTDIR=%{buildroot} \
         BINDIR=/usr/sbin \
         SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
+        UDEVRUNDIR=/run/udev \
         DISTRELEASE=%{release} \
         V=1
 
@@ -217,6 +220,10 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules
 # zipl.conf to be ghosted
 touch %{buildroot}%{_sysconfdir}/zipl.conf
 
+# fixups
+# https://bugzilla.redhat.com/show_bug.cgi?id=2024102
+chmod 755 %{buildroot}/lib/s390-tools/cpictl
+
 
 %files
 %doc README.md
@@ -261,11 +268,14 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
 %{_sbindir}/dasdinfo
 %{_sbindir}/fdasd
 %{_sbindir}/lszdev
+%{_sbindir}/vmcp
 %{_sbindir}/zipl
-%dir /lib/s390-tools/
+%{_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
@@ -280,7 +290,9 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
 %{_mandir}/man8/dasdinfo.8*
 %{_mandir}/man8/fdasd.8*
 %{_mandir}/man8/lszdev.8*
+%{_mandir}/man8/vmcp.8*
 %{_mandir}/man8/zipl.8*
+%{_mandir}/man8/zipl-editenv.8*
 
 # Additional Fedora/RHEL specific stuff
 %ghost %config(noreplace) %{_sysconfdir}/dasd.conf
@@ -300,6 +312,7 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
 %{_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/00-zipl-prepare.install
@@ -331,6 +344,7 @@ BuildRequires:  cryptsetup-devel >= 2.0.3
 BuildRequires:  json-c-devel
 BuildRequires:  rpm-devel
 BuildRequires:  glib2-devel
+BuildRequires:  libxml2-devel
 
 
 %description base
@@ -490,6 +504,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/dasdstat
 %{_sbindir}/dasdview
 %{_sbindir}/dbginfo.sh
+%{_sbindir}/hsavmcore
 %{_sbindir}/hsci
 %{_sbindir}/hyptop
 %{_sbindir}/ip_watcher.pl
@@ -511,12 +526,12 @@ 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
 %{_sbindir}/ttyrun
 %{_sbindir}/tunedasd
-%{_sbindir}/vmcp
 %{_sbindir}/vmur
 %{_sbindir}/xcec-bridge
 %{_sbindir}/zcryptctl
@@ -541,7 +556,10 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 /lib/s390-tools/zfcpdump/zfcpdump-initrd
 /lib/s390-tools/znetcontrolunits
 %{_libdir}/libekmfweb.so.*
+%{_libdir}/libkmipclient.so.*
+%dir %{_libdir}/zkey
 %{_libdir}/zkey/zkey-ekmfweb.so
+%{_libdir}/zkey/zkey-kmip.so
 %{_mandir}/man1/dbginfo.sh.1*
 %{_mandir}/man1/dump2tar.1*
 %{_mandir}/man1/lscpumf.1*
@@ -552,7 +570,9 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man1/zkey.1*
 %{_mandir}/man1/zkey-cryptsetup.1*
 %{_mandir}/man1/zkey-ekmfweb.1*
+%{_mandir}/man1/zkey-kmip.1*
 %{_mandir}/man4/prandom.4*
+%{_mandir}/man5/hsavmcore.conf.5*
 %{_mandir}/man5/zipl.conf.5*
 %{_mandir}/man8/chccwdev.8*
 %{_mandir}/man8/chchp.8*
@@ -563,6 +583,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man8/dasdview.8*
 %{_mandir}/man8/dumpconf.8*
 %{_mandir}/man8/genprotimg.8.*
+%{_mandir}/man8/hsavmcore.8*
 %{_mandir}/man8/hsci.8*
 %{_mandir}/man8/hyptop.8*
 %{_mandir}/man8/lschp.8*
@@ -584,17 +605,19 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man8/tape390_display.8*
 %{_mandir}/man8/ttyrun.8*
 %{_mandir}/man8/tunedasd.8*
-%{_mandir}/man8/vmcp.8*
 %{_mandir}/man8/vmur.8*
 %{_mandir}/man8/zcryptctl.8*
 %{_mandir}/man8/zcryptstats.8*
 %{_mandir}/man8/zgetdump.8*
 %{_mandir}/man8/znetconf.8*
 %{_mandir}/man8/zpcictl.8*
-%dir %{_datadir}/s390-tools/
+%dir %{_datadir}/s390-tools
 %{_datadir}/s390-tools/genprotimg/
 %{_datadir}/s390-tools/netboot/
 %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey
+%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip
+%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip/profiles
+%config(noreplace) %attr(0660,root,zkeyadm)%{_sysconfdir}/zkey/kmip/profiles/*.profile
 %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/repository
 %config(noreplace) %attr(0660,root,zkeyadm)%{_sysconfdir}/zkey/kms-plugins.conf
 
@@ -901,6 +924,42 @@ getent group cpacfstats >/dev/null || groupadd -r cpacfstats
 %{_mandir}/man8/cpacfstatsd.8*
 %{_unitdir}/cpacfstatsd.service
 
+#
+# *********************** chreipl-fcp-mpath package  ***********************
+#
+%package chreipl-fcp-mpath
+Summary:          Use multipath information for re-IPL path failover
+BuildRequires:    make
+BuildRequires:    bash
+BuildRequires:    coreutils
+BuildRequires:    gawk
+BuildRequires:    gzip
+BuildRequires:    sed
+Requires:         bash
+Requires:         coreutils
+Requires:         util-linux
+Requires:         systemd-udev
+Requires:         device-mapper-multipath
+Requires:         dracut
+
+%description chreipl-fcp-mpath
+The chreipl-fcp-mpath toolset monitors udev events about paths to the re-IPL
+volume. If the currently configured FCP re-IPL path becomes unavailable, the
+toolset checks for operational paths to the same volume. If available, it
+reconfigures the FCP re-IPL settings to use an operational path.
+
+%files chreipl-fcp-mpath
+%doc chreipl-fcp-mpath/README.md
+%dir %{_prefix}/lib/chreipl-fcp-mpath/
+%{_prefix}/lib/chreipl-fcp-mpath/*
+%{_prefix}/lib/dracut/dracut.conf.d/70-chreipl-fcp-mpath.conf
+%{_prefix}/lib/udev/chreipl-fcp-mpath-is-ipl-tgt
+%{_prefix}/lib/udev/chreipl-fcp-mpath-is-ipl-vol
+%{_prefix}/lib/udev/chreipl-fcp-mpath-is-reipl-zfcp
+%{_prefix}/lib/udev/chreipl-fcp-mpath-record-volume-identifier
+%{_prefix}/lib/udev/chreipl-fcp-mpath-try-change-ipl-path
+%{_udevrulesdir}/70-chreipl-fcp-mpath.rules
+
 #
 # *********************** devel package  ***********************
 #
@@ -915,10 +974,17 @@ User-space development files for the s390/s390x architecture.
 %files devel
 %{_includedir}/%{name}/
 %{_includedir}/ekmfweb/
+%{_includedir}/kmipclient/
 %{_libdir}/libekmfweb.so
+%{_libdir}/libkmipclient.so
 
 
 %changelog
+* Thu Nov 18 2021 Dan Horák <dhorak@redhat.com> - 2:2.19.0-1
+- rebased to 2.19.0 (#1984976)
+- move vmcp to core (#2021071)
+- Resolves: #1984976 #2021071
+
 * Tue Jul 20 2021 Dan Horák <dhorak@redhat.com> - 2:2.16.0-2
 - add support for NM keyfile format to ccw_init/device_cio_free (#1980708)
 - s390-tools: Add support for complete counter set extraction (#1981264)