27 changed files with 270 additions and 6259 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,9 @@
-SOURCES/cmsfs-1.1.8c.tar.gz
-SOURCES/s390-tools-2.29.0-rust-vendor.tar.xz
-SOURCES/s390-tools-2.29.0.tar.gz
-SOURCES/src_vipa-2.1.0.tar.gz
+s390-tools-1.8.2.tar.bz2
+cmsfs-1.1.8c.tar.gz
+lib-zfcp-hbaapi-2.0.tar.gz
+src_vipa-2.0.4.tar.gz
+/lib-zfcp-hbaapi-2.1.tar.gz
+/src_vipa-2.1.0.tar.gz
+/s390-tools-*.tar.bz2
+/s390-tools-*.tar.gz
+/s390-tools-*-rust-vendor.tar.xz
--- a/SOURCES/20-zipl-kernel.install
+++ b/SOURCES/20-zipl-kernel.install
@ -54,21 +54,25 @@ EOF
 case "$COMMAND" in
    add)
        if [[ "${KERNEL_DIR}" != "/boot" ]]; then
+            # rename to match the name used in the pseudo-BLS snippet above
+            cp --remove-destination --preserve=timestamps -T "${KERNEL_IMAGE}" "/boot/vmlinuz-${KERNEL_VERSION}"
+            command -v restorecon &>/dev/null && \
+                restorecon -R "/boot/vmlinuz-${KERNEL_VERSION}"
+
            for i in \
-                "$KERNEL_IMAGE" \
                    "$KERNEL_DIR"/System.map \
                    "$KERNEL_DIR"/config \
                    "$KERNEL_DIR"/zImage.stub
            do
                [[ -e "$i" ]] || continue
-                cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
+                cp --preserve=timestamps -T "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
                command -v restorecon &>/dev/null && \
                    restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}"
            done
            # hmac is .vmlinuz-<version>.hmac so needs a special treatment
            i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
            if [[ -e "$i" ]]; then
-                cp -a "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
+                cp --preserve=timestamps "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
                command -v restorecon &>/dev/null && \
                    restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
            fi
@ -88,16 +92,10 @@ case "$COMMAND" in
                done
            fi

-            if ! [[ ${BOOT_OPTIONS[*]} ]]; then
-                echo "Could not determine the kernel command line parameters." >&2
-                echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
-                exit 1
-            fi
-
            [[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
            BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
            if [[ -f "${KERNEL_DIR}/bls.conf" ]]; then
-                cp -aT "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
+                cp --preserve=timestamps -T "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
                sed -i -e "s,^linux.*,linux /boot/vmlinuz-${KERNEL_VERSION},g" "${BLS_TARGET}"
                sed -i -e "s,^initrd.*,initrd /boot/initramfs-${KERNEL_VERSION}.img,g" "${BLS_TARGET}"
                sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}#g" "${BLS_TARGET}"
@ -118,7 +116,7 @@ case "$COMMAND" in

            if [ "x${MAKEDEBUG}" = "xyes" ]; then
                BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
-                cp -aT  "${BLS_TARGET}" "${BLS_DEBUG}"
+                cp --preserve=timestamps -T  "${BLS_TARGET}" "${BLS_DEBUG}"
                TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
 		VERSION="$(grep '^version[ \t]' "${BLS_DEBUG}" | sed -e 's/^version[ \t]*//')"
                BLSID="$(grep '^id[ \t]' "${BLS_DEBUG}" | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
--- a/SOURCES/52-zipl-rescue.install
+++ b/SOURCES/52-zipl-rescue.install
@ -29,12 +29,6 @@ case "$COMMAND" in
                done
            fi

-            if ! [[ ${BOOT_OPTIONS[*]} ]]; then
-                echo "Could not determine the kernel command line parameters." >&2
-                echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
-                exit 1
-            fi
-
            BLS_RESCUE="${BLS_DIR}/${MACHINE_ID}-0-rescue.conf"
            if [[ -f "${BLS_RESCUE}" ]] && grep -q '^options.*$kernelopts' "${BLS_RESCUE}"; then
               sed -i -e "s,^linux.*,linux /boot/vmlinuz-0-rescue-${MACHINE_ID},g" "${BLS_RESCUE}"
--- a/SOURCES/91-zipl.install
+++ b/SOURCES/91-zipl.install
--- a/SOURCES/00-zipl-prepare.install
+++ b/SOURCES/00-zipl-prepare.install
@ -1,9 +0,0 @@
-#!/bin/bash
-
-COMMAND="$1"
-KERNEL_VERSION="$2"
-BOOT_DIR_ABS="$3"
-KERNEL_IMAGE="$4"
-
-# Remove it, since for zipl the images are always installed in /boot
-rm -rf "${BOOT_DIR_ABS%/*}"
--- a/SOURCES/ccw.udev
+++ b/SOURCES/ccw.udev
@ -1,13 +0,0 @@
-ACTION!="add|change", GOTO="ccw_end"
-SUBSYSTEM!="ccw", GOTO="ccw_end"
-ATTRS{cutype}=="1731/01", RUN+="ccw_init"
-ATTRS{cutype}=="1731/02", RUN+="ccw_init"
-ATTRS{cutype}=="1731/05", RUN+="ccw_init"
-ATTRS{cutype}=="1731/06", RUN+="ccw_init"
-ATTRS{cutype}=="3088/01", RUN+="ccw_init"
-ATTRS{cutype}=="3088/08", RUN+="ccw_init"
-ATTRS{cutype}=="3088/60", RUN+="ccw_init"
-ATTRS{cutype}=="3088/61", RUN+="ccw_init"
-ATTRS{cutype}=="3088/1e", RUN+="ccw_init"
-ATTRS{cutype}=="3088/1f", RUN+="ccw_init"
-LABEL="ccw_end"
--- a/SOURCES/cmsfs-1.1.8-args.patch
+++ b/SOURCES/cmsfs-1.1.8-args.patch
@ -1,12 +0,0 @@
-diff -up cmsfs-1.1.8c/cmsfslst.c.orig cmsfs-1.1.8c/cmsfslst.c
--- cmsfs-1.1.8c/cmsfslst.c.orig	2020-08-19 09:47:36.459063820 +0000
-+++ cmsfs-1.1.8c/cmsfslst.c	2020-08-19 09:47:45.619063820 +0000
-@@ -49,7 +49,7 @@ int main(int argc,unsigned char *argv[])
-       }
- 
-     /*  sanity check  */
-    if (*devname == 0x00)
-+    if ((devname == NULL) || (*devname == 0x00))
-       {
-         (void) fprintf(stderr,"Please specify a CMS volume.\n");
-         (void) fprintf(stderr,USAGE,argv[0]);
--- a/SOURCES/cmsfs-1.1.8-kernel26.patch
+++ b/SOURCES/cmsfs-1.1.8-kernel26.patch
@ -1,12 +0,0 @@
-diff -aruN cmsfs-1.1.8c/cmsfssed.sh cmsfs-1.1.8c.alma/cmsfssed.sh
--- cmsfs-1.1.8c/cmsfssed.sh	2006-01-29 07:04:32
-+++ cmsfs-1.1.8c.alma/cmsfssed.sh	2023-11-01 10:57:10
-@@ -85,7 +85,7 @@
-         DRIVER_SOURCE="cmsfs22x.c"
-         MODULES_DIRECTORY="/lib/modules/`uname -r`/fs"
-         ;;
-    2.4*|2.5*)
-+    2.4*|2.5*|2.6*|3.*|4.*|5.*)
-         LINUX_RELEASE="2.4"
- #       ln -s cmsfs24x.c cmsfsvfs.c
-         INCLUDES="-I/lib/modules/`uname -r`/build/include"
--- a/SOURCES/cmsfs-1.1.8-use-detected-filesystem-block-size-on-FBA-devices.patch
+++ b/SOURCES/cmsfs-1.1.8-use-detected-filesystem-block-size-on-FBA-devices.patch
@ -1,31 +0,0 @@
-From 25442f958a12b428b7d063b927ac48965dcd8164 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Fri, 28 Jan 2011 16:11:19 +0100
-Subject: [PATCH] use detected filesystem block size on FBA devices
-
-If a FBA device is not properly formated, then the CMS file system can
-have a different block size. The cmsfs tools were able to detect the file
-system block size, but in fact they still used default 512 instead. And
-using the default was causing crashes. Now the detected value is used.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=651012
---
- cmsfsany.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/cmsfsany.c b/cmsfsany.c
-index 55bcfdc..18efffb 100644
--- a/cmsfsany.c
-+++ b/cmsfsany.c
-@@ -102,7 +102,7 @@ int cmsfs_find_label(struct CMSSUPER *vol,struct CMSFSADT *adt)
-             cmsfs_error(cmsfs_ermsg);
-           }
-         vol->flags = CMSFSFBA;
-        vol->blksz = 512;
-+        vol->blksz = blksz;
-         return vol->blksz;
-       } }
- 
-- 
-1.7.3.5
-
--- a/SOURCES/cmsfs-1.1.8-warnings.patch
+++ b/SOURCES/cmsfs-1.1.8-warnings.patch
@ -1,11 +0,0 @@
--- cmsfs-1.1.8/cmsfsvol.c.warnings	2003-07-18 01:38:57.000000000 +0200
-+++ cmsfs-1.1.8/cmsfsvol.c	2005-09-06 16:57:15.000000000 +0200
-@@ -52,7 +52,7 @@
- 
-     /*  print a header;  looks like CMS  */
-     (void) printf("LABEL  VDEV M  STAT   CYL TYPE \
-BLKSZ   FILES  BLKS USED-(%) BLKS LEFT  BLK TOTAL\n");
-+BLKSZ   FILES  BLKS USED-(%%) BLKS LEFT  BLK TOTAL\n");
- 
-     for (      ; i < argc ; i++)
-       {
--- a/SOURCES/s390utils-2.29.0-rhel.patch
+++ b/SOURCES/s390utils-2.29.0-rhel.patch
--- a/SOURCES/src_vipa-2.1.0-deprecate.patch
+++ b/SOURCES/src_vipa-2.1.0-deprecate.patch
@ -1,12 +0,0 @@
-diff -up s390-tools-2.2.0/src_vipa-2.1.0/Makefile.orig s390-tools-2.2.0/src_vipa-2.1.0/Makefile
--- s390-tools-2.2.0/src_vipa-2.1.0/Makefile.orig	2020-02-21 13:51:23.502305796 +0100
-+++ s390-tools-2.2.0/src_vipa-2.1.0/Makefile	2020-02-21 13:53:51.353817181 +0100
-@@ -44,6 +44,8 @@ src_vipa.sh:
- 	echo '#!/bin/bash' > src_vipa.sh
- 	echo 'export LD_LIBRARY_PATH=$(LIBDIR):$$LD_LIBRARY_PATH' >> src_vipa.sh
- 	echo 'export LD_PRELOAD=$(LIBDIR)/src_vipa.so' >> src_vipa.sh
-+	echo 'echo "WARNING: The src_vipa (flexible source address selection) feature is DEPRECATED"' >> src_vipa.sh
-+	echo 'echo "WARNING: It will be removed in the future."' >> src_vipa.sh
- 	echo 'exec $$@' >> src_vipa.sh
- 	chmod 755 src_vipa.sh
- 
--- a/ccw.udev
+++ b/ccw.udev
@ -0,0 +1,4 @@
+ACTION!="add|bind|change", GOTO="ccw_end"
+SUBSYSTEM!="ccw", GOTO="ccw_end"
+DRIVER=="ctcm|lcs|qeth", RUN+="ccw_init"
+LABEL="ccw_end"
--- a/SOURCES/ccw_init
+++ b/SOURCES/ccw_init
--- a/SOURCES/dasd.udev
+++ b/SOURCES/dasd.udev
--- a/SOURCES/dasdconf.sh
+++ b/SOURCES/dasdconf.sh
--- a/SOURCES/device_cio_free
+++ b/SOURCES/device_cio_free
--- a/SOURCES/device_cio_free.service
+++ b/SOURCES/device_cio_free.service
@ -7,7 +7,6 @@ Before=sysinit.target systemd-udev-trigger.service
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/sbin/device_cio_free
-StandardOutput=syslog

 [Install]
 WantedBy=sysinit.target
--- a/SOURCES/normalize_dasd_arg
+++ b/SOURCES/normalize_dasd_arg
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,8 @@
+---
+pathmigration:
+    excluded_paths:
+        - /lib/s390-tools
+
+badfuncs:
+    ignore:
+        - /usr/sbin/qethqoat
--- a/SOURCES/s390-tools-zipl-blscfg-rpm-nvr-sort.patch
+++ b/SOURCES/s390-tools-zipl-blscfg-rpm-nvr-sort.patch
--- a/SOURCES/s390-tools-zipl-invert-script-options.patch
+++ b/SOURCES/s390-tools-zipl-invert-script-options.patch
--- a/s390utils-2.31.0-fedora.patch
+++ b/s390utils-2.31.0-fedora.patch
--- a/SPECS/s390utils.spec
+++ b/SPECS/s390utils.spec
@ -1,6 +1,3 @@
-%define cmsfsver 1.1.8c
-%define vipaver 2.1.0
-
 # secure boot support is for RHEL only
 %if 0%{?rhel} >= 8
 %bcond_without signzipl
@ -13,39 +10,33 @@
 %else
 %bcond_with pandoc
 %endif
-%bcond_without rust

 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.29.0
-Release:        3%{?dist}
+Version:        2.31.0
+Release:        2%{?dist}
 Epoch:          2
-License:        MIT
-#URL:            http://www.ibm.com/developerworks/linux/linux390/s390-tools.html
-URL:            https://github.com/ibm-s390-tools/s390-tools
-Source0:        https://github.com/ibm-s390-tools/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
+# MIT covers nearly all the files, except init files
+License:        MIT AND LGPL-2.1-or-later
+URL:            https://github.com/ibm-s390-linux/s390-tools
+Source0:        https://github.com/ibm-s390-linux/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
 # To create the vendor tarball:
-#   tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust/pvsecret ; \
+#   tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust ; \
 #   rm -f Cargo.lock && cargo vendor && \
-#   tar Jvcf ../../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd
+#   tar Jvcf ../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd
 Source1:        s390-tools-%{version}-rust-vendor.tar.xz
-Source4:        http://www.linuxvm.org/Patches/S390/cmsfs-%{cmsfsver}.tar.gz
-Source5:        zfcpconf.sh
-# http://www.ibm.com/developerworks/linux/linux390/src_vipa-%%{vipaver}.html
-Source6:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/src_vipa-%{vipaver}.tar.gz
-Source7:        zfcp.udev
-# files for DASD initialization
-Source12:       dasd.udev
-Source13:       dasdconf.sh
-Source14:       device_cio_free
-Source15:       device_cio_free.service
-Source16:       ccw_init
-Source17:       ccw.udev
-Source21:       normalize_dasd_arg
-Source23:       00-zipl-prepare.install
-Source24:       20-zipl-kernel.install
-Source25:       52-zipl-rescue.install
-Source26:       91-zipl.install
+Source5:        https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcpconf.sh
+Source7:        https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcp.udev
+Source12:       https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasd.udev
+Source13:       https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasdconf.sh
+Source14:       https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/device_cio_free
+Source15:       https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/device_cio_free.service
+Source16:       https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/ccw_init
+Source17:       https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/ccw.udev
+Source21:       https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/normalize_dasd_arg
+Source23:       20-zipl-kernel.install
+Source24:       52-zipl-rescue.install
+Source25:       91-zipl.install

 %if %{with signzipl}
 %define pesign_name redhatsecureboot302
@ -56,14 +47,7 @@ Patch0:         s390-tools-zipl-invert-script-options.patch
 Patch1:         s390-tools-zipl-blscfg-rpm-nvr-sort.patch

 # upstream fixes/updates
-Patch100:       s390utils-%{version}-rhel.patch
-
-Patch1000:      cmsfs-1.1.8-warnings.patch
-Patch1001:      cmsfs-1.1.8-kernel26.patch
-Patch1002:      cmsfs-1.1.8-use-detected-filesystem-block-size-on-FBA-devices.patch
-Patch1003:      cmsfs-1.1.8-args.patch
-
-Patch2000:      src_vipa-2.1.0-deprecate.patch
+#Patch100:       s390utils-%%{version}-fedora.patch

 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
@ -79,7 +63,6 @@ Requires:       s390utils-cpuplugd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-mon_statd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-iucvterm = %{epoch}:%{version}-%{release}
 Requires:       s390utils-ziomon = %{epoch}:%{version}-%{release}
-Requires:       s390utils-cmsfs = %{epoch}:%{version}-%{release}
 %else
 #
 # multiarch package structure
@ -87,9 +70,9 @@ Requires:       s390utils-cmsfs = %{epoch}:%{version}-%{release}
 Requires:       s390utils-se-data = %{epoch}:%{version}-%{release}
 %endif

+BuildRequires:  make
 BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel
-%if %{with rust}
 %if 0%{?rhel}
 BuildRequires:  libcurl-devel
 BuildRequires:  openssl-devel
@ -106,12 +89,15 @@ BuildRequires:  crate(clap_derive)
 BuildRequires:  crate(colorchoice)
 BuildRequires:  crate(curl)
 BuildRequires:  crate(is-terminal)
+BuildRequires:  crate(lazy_static)
 BuildRequires:  crate(libc)
 BuildRequires:  crate(log)
+BuildRequires:  crate(mockito)
 BuildRequires:  crate(openssl)
 BuildRequires:  crate(openssl-probe)
 BuildRequires:  crate(serde)
 BuildRequires:  crate(serde_derive)
+BuildRequires:  crate(serde_test)
 BuildRequires:  crate(serde_yaml)
 BuildRequires:  crate(strsim)
 BuildRequires:  crate(terminal_size)
@ -119,7 +105,6 @@ BuildRequires:  crate(thiserror)
 BuildRequires:  crate(zerocopy)
 BuildRequires:  rust-packaging
 %endif
-%endif

 %description
 This is a meta package for installing the default s390-tools sub packages.
@ -130,44 +115,8 @@ The s390utils packages contain a set of user space utilities that should to
 be used together with the zSeries (s390) Linux kernel and device drivers.

 %prep
-%setup -q -n s390-tools-%{version} -a 4 -a 6
+%autosetup -n s390-tools-%{version} -p1

-# Fedora/RHEL changes
-%patch0 -p1 -b .zipl-invert-script-options
-%patch1 -p1 -b .blscfg-rpm-nvr-sort
-
-# upstream fixes/updates
-%patch100 -p1
-
-#
-# cmsfs
-#
-pushd cmsfs-%{cmsfsver}
-# Patch to fix a couple of code bugs
-%patch1000 -p1 -b .warnings
-
-# build on kernel-2.6, too
-%patch1001 -p1 -b .cmsfs26
-
-# use detected filesystem block size (#651012)
-%patch1002 -p1 -b .use-detected-block-size
-
-# fix args processing (#1866872)
-%patch1003 -p1 -b .args
-popd
-
-#
-# src_vipa
-#
-pushd src_vipa-%{vipaver}
-# mark as deprecated
-%patch2000 -p2
-popd
-
-# remove --strip from install
-find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
-
-%if %{with rust}
 %if 0%{?rhel}
 pushd rust
 %cargo_prep -V 1
@ -175,26 +124,11 @@ popd
 %else
 %cargo_prep
 %endif
-rm -rf ./rust/Cargo.lock
-%endif
-
-pushd cmsfs-%{cmsfsver}
-# cmdfs: fix encoding
-iconv -f ISO8859-1 -t UTF-8 -o README.new README
-touch -r README README.new
-mv README.new README
-# prepare docs
-mv README README.cmsfs
-mv CREDITS CREDITS.cmsfs
-popd
-
+rm ./rust/Cargo.lock

 %build
 make \
        CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
-%if %{without rust}
-        HAVE_CARGO=0 \
-%endif
        HAVE_DRACUT=1 \
 %if %{with pandoc}
        ENABLE_DOC=1 \
@ -204,26 +138,9 @@ make \
        DISTRELEASE=%{release} \
        V=1

-%ifarch s390x
-#
-# s390x/native specific %%build section
-#
-pushd cmsfs-%{cmsfsver}
-./configure
-make CC="gcc %{build_cflags} -fno-strict-aliasing %{build_ldflags}"
-popd
-
-pushd src_vipa-%{vipaver}
-make CC_FLAGS="%{build_cflags} -fPIC" LD_FLAGS="%{build_ldflags} -shared" LIBDIR=%{_libdir}
-popd
-%endif
-

 %install
 make install \
-%if %{without rust}
-        HAVE_CARGO=0 \
-%endif
        HAVE_DRACUT=1 \
 %if %{with pandoc}
        ENABLE_DOC=1 \
@ -275,21 +192,9 @@ install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ zfcpdump/10-z
 install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE23}
 install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE24}
 install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE25}
-install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE26}
 install -d -m 0755 %{buildroot}%{_sysconfdir}/kernel/install.d/
 install -m 0644 /dev/null %{buildroot}%{_sysconfdir}/kernel/install.d/20-grubby.install

-# cmsfs tools must be available in /sbin
-for f in cat lst vol cp ck; do
-    install -p -m 755 cmsfs-%{cmsfsver}/cmsfs${f} %{buildroot}%{_sbindir}
-    install -p -m 644 cmsfs-%{cmsfsver}/cmsfs${f}.8 %{buildroot}%{_mandir}/man8
-done
-
-# src_vipa
-pushd src_vipa-%{vipaver}
-make install LIBDIR=%{_libdir} SBINDIR=%{_bindir} INSTROOT=%{buildroot} LDCONFIG=/bin/true
-popd
-
 # install usefull headers for devel subpackage
 mkdir -p %{buildroot}%{_includedir}/%{name}
 install -p -m 644 include/lib/vtoc.h %{buildroot}%{_includedir}/%{name}
@ -327,32 +232,24 @@ 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*
 %{_mandir}/man1/pvattest-verify.1*
-%if %{with rust}
 %{_mandir}/man1/pvsecret-add.1*
 %{_mandir}/man1/pvsecret-create-association.1*
 %{_mandir}/man1/pvsecret-create-meta.1*
 %{_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
 %{_datadir}/s390-tools/genprotimg/

@ -380,13 +277,7 @@ Requires:       coreutils
 This package provides minimal set of tools needed to system to boot.

 %post core
-%if 0
-# enable in F-31
 %systemd_post device_cio_free.service
-%else
-# explicit enable for upgrade patch from s390utils-base < 2.6.0-4
-systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
-%endif
 %systemd_post cpi.service

 %preun core
@ -398,7 +289,7 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :

 %files core
 %doc README.md zdev/src/chzdev_usage.txt
-%doc LICENSE
+%license LICENSE
 %{_sbindir}/chreipl
 %{_sbindir}/chzdev
 %{_sbindir}/cio_ignore
@ -414,7 +305,10 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
 /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
@ -455,20 +349,18 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
 %{_udevrulesdir}/81-dpm.rules
 %{_udevrulesdir}/90-cpi.rules
 %{_sysconfdir}/kernel/install.d/20-grubby.install
-%{_prefix}/lib/kernel/install.d/00-zipl-prepare.install
 %{_prefix}/lib/kernel/install.d/10-zfcpdump.install
 %{_prefix}/lib/kernel/install.d/20-zipl-kernel.install
 %{_prefix}/lib/kernel/install.d/52-zipl-rescue.install
 %{_prefix}/lib/kernel/install.d/91-zipl.install
 %{_prefix}/lib/modules-load.d/s390-pkey.conf

+#
+# *********************** s390-tools base package  ***********************
+#

-#
-# ************************* s390-tools base package  *************************
-#
 %package base
-# src_vipa is CPL
-License:        MIT and CPL
+License:        MIT AND LGPL-2.1-or-later
 Summary:        S390 base tools
 Requires:       gawk sed coreutils
 Requires:       sg3_utils
@ -601,11 +493,11 @@ s390 base tools. This collection provides the following utilities:
     - chshut:  Change actions which should be done in case of halt, poff,
                reboot or panic.

-    * cpi:
+   * cpi:
    Allows to set the system and sysplex names from the Linux guest to
    the HMC/SE using the Control Program Identification feature.

-    * genprotimg:
+   * genprotimg:
    Tool for the creation of PV images. The image consists of a concatenation of
    a plain text boot loader, the encrypted components for kernel, initrd, and
    cmdline, and the integrity-protected PV header, containing metadata necessary for
@ -648,8 +540,9 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/lscss
 %{_sbindir}/lsdasd
 %{_sbindir}/lshwc
-%{_sbindir}/lsqeth
 %{_sbindir}/lsluns
+%{_sbindir}/lsqeth
+%{_sbindir}/lspai
 %{_sbindir}/lsreipl
 %{_sbindir}/lsscm
 %{_sbindir}/lsshut
@ -679,15 +572,11 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/zpcictl
 %{_bindir}/dump2tar
 %{_bindir}/genprotimg
-%{_bindir}/mk-s390image
-%if %{with rust}
 %{_bindir}/pvapconfig
-%endif
+%{_bindir}/mk-s390image
 %{_bindir}/pvattest
 %{_bindir}/pvextract-hdr
-%if %{with rust}
 %{_bindir}/pvsecret
-%endif
 %{_bindir}/zkey
 %{_bindir}/zkey-cryptsetup
 %{_unitdir}/dumpconf.service
@ -712,30 +601,25 @@ 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*
 %{_mandir}/man1/pvattest-verify.1*
-%if %{with rust}
 %{_mandir}/man1/pvsecret-add.1*
 %{_mandir}/man1/pvsecret-create-association.1*
 %{_mandir}/man1/pvsecret-create-meta.1*
 %{_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*
 %{_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*
 %{_mandir}/man8/chcpumf.8*
@ -754,6 +638,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man8/lsdasd.8*
 %{_mandir}/man8/lshwc.8*
 %{_mandir}/man8/lsluns.8*
+%{_mandir}/man8/lspai.8*
 %{_mandir}/man8/lsqeth.8*
 %{_mandir}/man8/lsreipl.8*
 %{_mandir}/man8/lsscm.8*
@ -790,11 +675,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 # Additional Fedora/RHEL specific stuff
 /boot/tape0

-# src_vipa
-%{_bindir}/src_vipa.sh
-%{_libdir}/src_vipa.so
-%{_mandir}/man8/src_vipa.8*
-
 %package se-data
 License:        MIT
 Summary:        Data for Secure Execution
@ -993,29 +873,6 @@ fi
 %{_unitdir}/iucvtty-login@.service
 %{_unitdir}/ttyrun-getty@.service

-#
-# *********************** cmsfs package  ***********************
-#
-%package cmsfs
-License:        GPLv2
-Summary:        CMS file system tools
-URL:            http://www.casita.net/pub/cmsfs/cmsfs.html
-# Requires:
-
-%description cmsfs
-This package contains the CMS file system tools.
-
-%files cmsfs
-%{_sbindir}/cmsfscat
-%{_sbindir}/cmsfsck
-%{_sbindir}/cmsfscp
-%{_sbindir}/cmsfslst
-%{_sbindir}/cmsfsvol
-%{_mandir}/man8/cmsfscat.8*
-%{_mandir}/man8/cmsfsck.8*
-%{_mandir}/man8/cmsfscp.8*
-%{_mandir}/man8/cmsfslst.8*
-%{_mandir}/man8/cmsfsvol.8*

 #
 # *********************** cmsfs-fuse package  ***********************
@ -1024,6 +881,8 @@ This package contains the CMS file system tools.
 Summary:        CMS file system based on FUSE
 BuildRequires:  fuse3-devel
 Requires:       fuse3
+Requires:       glibc-gconv-extra
+Obsoletes:      %{name}-cmsfs < 2:2.7.0-3

 %description cmsfs-fuse
 This package contains the CMS file system based on FUSE.
@ -1171,305 +1030,266 @@ User-space development files for the s390/s390x architecture.


 %changelog
-* Mon Jan 29 2024 Dan Horák <dhorak@redhat.com> - 2:2.29.0-3
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2:2.31.0-2
+- Bump release for June 2024 mass rebuild
+
+* 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
- Resolves: RHEL-10568

-* Fri Jan 19 2024 Dan Horák <dhorak@redhat.com> - 2:2.29.0-2
- SE: Secure guest tool to bind and associate APQNs (RHEL-10575)
- Resolves: RHEL-10575
+* Tue Jan 02 2024 Dan Horák <dan[at]danny.cz> - 2:2.30.0-1
+- rebased to 2.30.0 (rhbz#2252519)

-* Mon Dec 04 2023 Dan Horák <dhorak@redhat.com> - 2:2.29.0-1
- rebased to 2.29.0 (RHEL-11409)
- KVM: Support AP Bindings in SE Header (RHEL-10573)
- KVM: Userspace Tool for IBK Request Generation and Insertion (RHEL-10579)
- zkey: support for key type PKEY_TYPE_EP11_AES (RHEL-11441)
- vmur: fix handling of option -t (RHEL-11479)
- dbginfo.sh: global original Input Field Separator (IFS) (RHEL-16526)
- enable multi-arch build (RHEL-10568)
- Resolves: RHEL-11409 RHEL-10573 RHEL-10579 RHEL-11441 RHEL-11479 RHEL-16526 RHEL-10568
+* Fri Dec 01 2023 Fabio Valentini <decathorpe@gmail.com> - 2:2.29.0-6
+- Rebuild for openssl crate >= v0.10.60 (RUSTSEC-2023-0044, RUSTSEC-2023-0072)

-* Mon Aug 07 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-3
- zdev/dracut: fix kdump build to integrate with site support (#2229178)
- Resolves: #2229178
+* Fri Nov 10 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-5
+- enable multi-arch build

-* Fri Jul 21 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-2
- Secure Execution APQN binding and IBK association (#2110510)
- Resolves: #2110510
+* Fri Nov 10 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-4
+- fix upstream kernel installations

-* Tue Jun 06 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-1.1
- rebuild
- Related: #2159698
+* Mon Oct 23 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2:2.29.0-3
+- Use vendored dependencies in RHEL builds

-* Mon Jun 05 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-1
- rebased to 2.27.0 (#2159698)
- lszcrypt fails when querying a specific domain (#2177613)
- DASD autoquiesce support (#2196510)
- zcrypt DD: AP command filtering (#2170362)
- vmconvert and zgetdump consolidation (#2173925)
- Support for List-Directed dump from ECKD DASD (#2159694)
- Support for List-Directed IPL and re-IPL from ECKD DASD (#2159691)
- Resolves: #2159698 #2177613 #2196510 #2170362 #2173925 #2159694 #2159691
+* Thu Aug 31 2023 Jakub Čajka <jcajka[at]redhat.com> - 2:2.29.0-2
+- enable rust based tools

-* Fri Feb 03 2023 Dan Horák <dhorak@redhat.com> - 2:2.25.0-2
- zkey: Support EP11 host library version 4 (#2165811)
- Resolves: #2165811
-* Tue Dec 13 2022 Dan Horák <dhorak@redhat.com> - 2:2.25.0-1
- rebased to 2.25.0 (#2110312)
- KVM: Tool to process encrypted Secure Execution guest dumps (#2043851)
- zipl: Support for Secure Boot IPL and Dump from ECKD DASD (#2043852)
- zdev: Site-aware device configuration (#2043858)
- Display Processor Activity Instrumentation CPACF counters (#2111013)
- Transparent DASD PPRC (Peer-to-Peer Remote Copy) handling (#2126618)
- zipl: Add secure boot trailer (#2142884)
- Resolves: #2110312 #2043851 #2043852 #2043858 #2111013 #2126618 #2142884
+* Mon Aug 07 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-1
+- rebased to 2.29.0

-* Fri Aug 05 2022 Dan Horák <dhorak@redhat.com> - 2:2.22.0-2
- zipl: Add missing check for a nullpointer (#2113976)
- Resolves: #2113976
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.28.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

-* Tue Jul 12 2022 Dan Horák <dhorak@redhat.com> - 2:2.22.0-1
- rebased to 2.22.0 (#2043846)
- add tool to persistently configure vfio-ap devices (#1660911)
- NVMe stand-alone dump support (#1847462)
- KVM: Secure Execution Attestation Userspace Tool (#1984908)
- KVM: Allow long kernel command lines for Secure Execution guests (#2043831)
- KVM: Secure Execution guest dump encryption with customer keys (#2043833)
- zcrypt DD: Exploitation Support of new IBM Z Crypto Hardware (#2043857)
- zipl: Site-aware environment block (#2043913)
- Add additional information to SCLP CPI (#2046681)
- Add new CPU-MF Counters for IBM z16 Hardware (#2047727)
- Long Kernel Commmand Line for s390x (#2060829)
- zkey: Fix re-enciphering of EP11 identity key of KMIP plugin (#2075011)
- genprotimg/check_hostkeydoc: cert. verification is too strict (#2075013)
- Resolves: #2043846 #1660911 #1847462 #1984908 #2043831 #2043833 #2043857 #2043913 #2046681 #2047727 #2060829 #2075011 #2075013
+* Tue Jul 11 2023 Dan Horák <dan[at]danny.cz> - 2:2.28.0-1
+- rebased to 2.28.0

-* 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
+* Wed May 31 2023 Dan Horák <dan[at]danny.cz> - 2:2.27.0-1
+- rebased to 2.27.0

-* 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)
- Resolves: #1980708 #1981264
+* Fri May 19 2023 Petr Pisar <ppisar@redhat.com> - 2:2.26.0-2
+- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)

-* Fri Jul 02 2021 Dan Horák <dhorak@redhat.com> - 2:2.16.0-1
- rebased to 2.16.0 (#1919241)
- move fdasd and lszdev to core
- ttyrun-getty: Avoid conflicts with serial-getty@ (#1907781)
- mk-s390image script requires file (#1973239)
+* Fri Mar 03 2023 Dan Horák <dan[at]danny.cz> - 2:2.26.0-1
+- rebased to 2.26.0
+
+* Tue Jan 31 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-4
+- add post GA fixes
+
+* Mon Jan 23 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-3
+- revert the kernel install script change
+
+* Thu Jan 19 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-2
+- update kernel install script to write /etc/kernel/cmdline
+
+* Fri Dec 09 2022 Dan Horák <dan[at]danny.cz> - 2:2.25.0-1
+- rebased to 2.25.0
+
+* Tue Nov 22 2022 Dan Horák <dan[at]danny.cz> - 2:2.24.0-2
+- update for Transparent DASD PPRC (Peer-to-Peer Remote Copy) handling
+
+* Thu Nov 10 2022 Dan Horák <dan[at]danny.cz> - 2:2.24.0-1
+- rebased to 2.24.0
+
+* Fri Aug 19 2022 Dan Horák <dan[at]danny.cz> - 2:2.23.0-1
+- rebased to 2.23.0
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.22.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 20 2022 Dan Horák <dan[at]danny.cz> - 2:2.22.0-1
+- rebased to 2.22.0
+
+* Tue May 31 2022 Dan Horák <dan[at]danny.cz> - 2:2.21.0-2
+- do not fail on emtpy /proc/cmdline when installing kernel (#1899759)
+
+* Fri Apr 22 2022 Dan Horák <dan[at]danny.cz> - 2:2.21.0-1
+- rebased to 2.21.0
+
+* Mon Feb 07 2022 Dan Horák <dan[at]danny.cz> - 2:2.20.0-1
+- rebased to 2.20.0
+- switch to fuse3
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.19.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Nov 26 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-2
+- update ccw udev rules
+
+* Fri Nov 12 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-1
+- rebased to 2.19.0
+- cmsfs-fuse Requires glibc-gconv-extra (#2022652)
+
+* Wed Oct 20 2021 Dan Horák <dan[at]danny.cz> - 2:2.18.0-2
+- move vmcp to core (#1931287)
+
+* 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
+
+* Wed Jul 07 2021 Dan Horák <dan[at]danny.cz> - 2:2.17.0-1
+- rebased to 2.17.0
 - zfcpconf: set exit code explicitly (#1977434)
- dbginfo.sh: Collect /proc/kallsyms, issue additional commands (#1972041)
- dasd: change default scheduler to reduce CPU consumption (#1972038)
- zdsfs: transparent dataset conversion (#1919238)
- Resolves: #1919241 #1907781 #1973239 #1977434 #1972041 #1972038 #1919238
+- mk-s390image script requires file (#1973239)
+- drop obsolete setting from device_cio_free.service (#1972449)

-* Mon Dec 07 2020 Dan Horák <dhorak@redhat.com> - 2:2.15.1-4
- zkey: Fix KMS plugin configuration to store APQNs correctly. (#1901968)
- dasdfmt: Fix bad file descriptor error when running on symlinks (#1901963)
- zcryptstats: Fix handling of partial results with many domains (#1901962)
- s390-tools: add hsci tool (#1847434)
- genprotimg: add host-key document verification support (#1845925)
- genprotimg: require argument for 'ramdisk' and 'parmfile' options (#1845925)
- genprotimg: fix two memory leaks (#1845925)
- genprotimg: abort if one of the recursive targets is failing (#1845925)
- zdev/lsdasd: Add FC Endpoint Security information (#1723844)
- Resolves: #1723844 #1845925 #1847434 #1901962 #1901963 #1901968
+* Mon Mar 01 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-2
+- drop superfluous Require from s390utils-base

-* Fri Nov 27 2020 Javier Martinez Canillas <javierm@redhat.com> - 2:2.15.1-2
- add again the 00-zipl-prepare.install script that got dropped (#1902273)
-  Resolves: #1902273
+* Wed Feb 24 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-1
+- rebased to 2.16.0

-* Wed Nov 04 2020 Dan Horák <dhorak@redhat.com> - 2:2.15.1-2
- rebased to 2.15.1 (#1851111)
- implement improved auto LUN scan (#1552697)
- fix crash when device is missing in cmsfslst (#1866872)
- introduce s390utils-core to avoid dependency on Perl (#1886201)
- Resolves: #1851111 #1552697 #1866872 #1886201
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.15.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

-* Fri Jul 31 2020 Dan Horák <dhorak@redhat.com> - 2:2.6.0-33
- cpacfstats: Bugfix to remove libpfm from cpacfstats (#1861779)
- Resolves: (#1861779)
+* Tue Jan 05 2021 Dan Horák <dan[at]danny.cz> - 2:2.15.1-4
+- move lszdev to core

-* Fri Jul 24 2020 Dan Horák <dhorak@redhat.com> - 2:2.6.0-32
- vmcp: Change sequence of failed exit (#1858839)
- zipl: Fix KVM IPL without bootindex (#1858842, #1846960)
- Resolves: #1858839, #1846960
+* Mon Jan 04 2021 Dan Horák <dan[at]danny.cz> - 2:2.15.1-3
+- move fdasd to core

-* Fri Jul 03 2020 Javier Martinez Canillas <javierm@redhat.com> - 2:2.6.0-31
+* Thu Oct 29 2020 Petr Šabata <contyk@redhat.com> - 2:2.15.1-2
+- Fix the development package dependency by adding epoch
+
+* Thu Oct 29 2020 Dan Horák <dan[at]danny.cz> - 2:2.15.1-1
+- rebased to 2.15.1
+
+* Wed Oct 28 2020 Dan Horák <dan[at]danny.cz> - 2:2.15.0-2
+- move mk-s390image to /usr/bin
+
+* Tue Oct 27 2020 Dan Horák <dan[at]danny.cz> - 2:2.15.0-1
+- rebased to 2.15.0
+
+* Wed Oct 07 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-4
+- update scripts for https://fedoraproject.org/wiki/Changes/NetworkManager_keyfile_instead_of_ifcfg_rh
+
+* Mon Sep 21 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-3
+- rebuilt for net-snmp 5.9
+
+* Wed Aug 26 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-2
+- add support for auto LUN scan to zfcpconf.sh (#1552697)
+
+* Tue Aug 25 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-1
+- rebased to 2.14.0
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.13.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 03 2020 Javier Martinez Canillas <javierm@redhat.com> - 2:2.13.0-4
 - add a default entry in zipl.conf if there isn't one present (#1698363)
- Resolves: #1698363

-* Mon Jun 22 2020 Dan Horák <dhorak@redhat.com> - 2:2.6.0-30
- avoid dependency on network-scripts (#1847388)
- Resolves: #1847388
+* Tue Jun 09 2020 Jakub Čajka <jcajka@redhat.com> - 2:2.13.0-3
+- split off core package with basic functionalities and reduced deps from base sub-package

-* Thu May 28 2020 Dan Horák <dhorak@redhat.com> - 2:2.6.0-29
- zkey: Add support for EP11 secure keys (#1723845)
- ipl-tools: Add nvme device support to zipl, lsreipl/chreipl (#1525178)
- zipl: Rebase to 2.13.0 (#1821250)
- ipl_tools: support clear attribute for FCP and CCW re-IPL (#1812983)
- lscpumf: New z15 CPU-MF counters not available (#1821591)
- dbginfo.sh: Extend data collection (#1814323)
- zpcictl: Initiate recover after reset (#1814303)
- zipl: fix secure boot config handling (#1814322)
- zkey: Fix display of clear key size for CCA-AESCIPHER keys (#1808492)
- zkey: Fix display of XTS attribute for validate command (#1808494)
- dasdview: Fix exit status in error cases (#1783288)
- zipl/libc: Fix potential buffer overflow in printf (#1807973)
- src_vipa feature is deprecated (#1780648)
- zdev: report FC Endpoint Security of zfcp device (#1723843)
- Resolves: #1723845 #1525178 #1821250 #1812983 #1821591 #1814323 #1814303 #1814322 #1808492 #1808494 #1783288 #1807973 #1780648 #1723843
+* Mon Jun 01 2020 Dan Horák <dan[at]danny.cz> - 2:2.13.0-2
+- avoid dependency on network-scripts (part of PR #4)

-* Mon Jan 27 2020 Dan Horák <dhorak@redhat.com> - 2:2.6.0-28
- zkey: Fix listing of keys on file systems reporting DT_UNKNOWN (#1792957)
- Resolves: #1792957
+* Mon May 11 2020 Dan Horák <dan[at]danny.cz> - 2:2.13.0-1
+- rebased to 2.13.0

-* Mon Jan 27 2020 Dan Horák <dhorak@redhat.com> - 2:2.6.0-27
- zkey: Fix display of clear key size for XTS keys (#1794375)
- Resolves: #1794375
+* Wed Apr 22 2020 Dan Horák <dan@danny.cz> - 2:2.12.0-4
+- rebuilt for json-c soname bump

-* Wed Jan 15 2020 Dan Horák <dhorak@redhat.com> - 2:2.6.0-26
- fix service order after switching to real root file system (#1790790)
- Resolves: #1790790
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.12.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

-* Fri Dec 13 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-25
- kernel-install: skip BOOT_IMAGE param when copying the cmdline to BLS snippets (#1782321)
- Resolves: #1782321
+* Tue Jan 14 2020 Dan Horák <dan[at]danny.cz> - 2:2.12.0-2
+- fix service order after switching to real root file system (#1790496, #1790790)

-* Wed Dec 11 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-24.1
- rebuild
+* Mon Jan 06 2020 Dan Horák <dan[at]danny.cz> - 2:2.12.0-1
+- rebased to 2.12.0

-* Tue Dec 10 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-24
- zipl: fix handling of values with load address in BLS (#1772054)
- kernel-install: fix /tmp being deleted when kernel-core is installed in a container (#1778771)
- kernel-install: fix BLS-related decision logic (#1778243)
- Resolves: #1772054 #1778771 #1778243
+* Fri Dec 13 2019 Dan Horák <dan[at]danny.cz> - 2:2.11.0-4
+- drop src_vipa (#1781683)
+- kernel-install: skip BOOT_IMAGE param when copying the cmdline to BLS snippets

-* Thu Nov 07 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-23
- zipl: config file handling improvements for CoreOS (#1764706)
- zipl: fix the scanned tokens array size calculation (#1751587)
- lstape, lsluns: handle non-zfcp; lin_tape multiple paths (#1766569)
- zcrypt: CEX7S exploitation support (#1723837)
- zkey: Add support for CCA AES CIPHER keys (#1719623)
- zkey: check master key consistency (#1753153)
- zkey: various enhancements (#1725881)
- zipl: set correct secure IPL default value (#1750326)
- zipl: Fix error message printed with --dumptofs (#1750307)
- zdev: add zfcp dix parameter handling (#1723852)
- zdsfs: add online vtoc refresh (#1685536)
- dasdfmt/lsdasd: Add Thin provisioning base support (#1651733)
- Resolves: #1651733 #1685536 #1723852 #1750307 #1750326 #1725881 #1753153
- Resolves: #1719623 #1723837 #1766569 #1751587 #1764706
+* Mon Dec 02 2019 Dan Horák <dan[at]danny.cz> - 2:2.11.0-3
+- apply kernel install/update script fixes from #1755899, #1778243

-* Thu Sep 26 2019 Javier Martinez Canillas <javierm@redhat.com> - 2:2.6.0-22
- force a BLS config if /boot/loader/entries directory exists (#1755899)
- Resolves: #1755899
+* Mon Dec 02 2019 Dan Horák <dan[at]danny.cz> - 2:2.11.0-2
+- apply kernel install/update script fixes from #1600480, #1665060
+- merge stage3 signing support from RHEL

-* Thu Sep 12 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-21.1
- rebuild
+* Mon Sep 09 2019 Dan Horák <dan[at]danny.cz> - 2:2.11.0-1
+- rebased to 2.11.0

-* Wed Sep 04 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-21
- sign bootloader stage3 (#1739496)
- Resolves: #1739496
+* Mon Aug 05 2019 Dan Horák <dan[at]danny.cz> - 2:2.10.0-1
+- rebased to 2.10.0

-* Tue Aug 13 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-20
- zipl: fix zfcp dump image location (#1730707)
- Resolves: #1730707
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

-* Wed Aug 07 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-19
- fdasd: Fix exit status in error cases (#1734816)
- zipl: do not overwrite BOOT_IMAGE entry (#1728677)
- Resolves: #1734816 #1728677
+* Tue Jul 02 2019 Dan Horák <dan[at]danny.cz> - 2:2.9.0-3
+- fix /tmp being deleted when kernel-core is installed in a container (#1726286) (javierm)

-* Wed Jul 24 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-18
- zdev: Do not export inacceptable attribute values (#1731960)
- Resolves: #1731960
+* Tue Jun 11 17:21:59 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2:2.9.0-2
+- Rebuild for RPM 4.15

-* Fri Jul 19 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-17
- ziomon: fix utilization recording with multi-digit scsi hosts (#1731203)
- Resolves: #1731203
+* Wed May 22 2019 Dan Horák <dan[at]danny.cz> - 2:2.9.0-1
+- rebased to 2.9.0

-* Thu Jul 18 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-16
- cpumf: Add support for CPU-Measurement Facility counters SVN 6 (#1683276)
- Resolves: #1683276
+* Thu May 02 2019 Dan Horák <dan[at]danny.cz> - 2:2.8.0-3
+- dbginfo.sh needs tar (#1705628)

-* Tue May 21 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-15
- zpcictl: Check for regular directory (#1695001)
- s390-tools: Add zcryptstats tool (#1658756)
- zipl: Secure Boot support for SCSI IPL (#1659401)
- Resolves: #1659401 #1658756 #1695001
+* Sat Mar 09 2019 Dan Horák <dan[at]danny.cz> - 2:2.8.0-2
+- fix building zipl with gcc9 (#1687085)

-* Wed Feb 27 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-14
- pkey: Support autoloading kernel pkey module (#1664632)
- Related: #1664632
+* Mon Feb 18 2019 Dan Horák <dan[at]danny.cz> - 2:2.8.0-1
+- rebased to 2.8.0

-* Fri Feb 01 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-13
- create cpacfstats group needed by cpacfstatsd (#1670076)
- Resolves: #1670076
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.7.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

-* Tue Jan 29 2019 Dan Horák <dhorak@redhat.com> - 2:2.6.0-12
- zfcpdump: add install script for zfcpdump kernel (#1600480)
- pkey: Support autoloading kernel pkey module (#1664632)
- Make kernel-install to update default if present in zipl.conf (#1665060)
- Resolves: #1600480 #1664632 #1665060
+* Mon Jan 28 2019 Dan Horák <dan[at]danny.cz> - 2:2.7.1-3
+- create cpacfstats group needed by cpacfstatsd

-* Tue Dec 11 2018 Dan Horák <dhorak@redhat.com> - 2:2.6.0-11
- zkey: Fails to run commands generated by 'zkey cryptsetup' (#1650628)
- zkey: Enhance error message about missing CCA library (#1655134)
- Resolves: #1650628 #1655134
+* Thu Jan 10 2019 Dan Horák <dan[at]danny.cz> - 2:2.7.1-2
+- load protected key support kernel module early on boot

-* Mon Nov 19 2018 Dan Horák <dhorak@redhat.com> - 2:2.6.0-10
- lszcrypt: support for alternate zcrypt device drivers (#1646355)
- zcryptctl: add zcryptctl to manage multiple zcrypt nodes (#1646354)
- qethqoat: add OSA-Express7S support (#1644384)
- zdev: qeth BridgePort and VNICC attribute conflict (#1643452)
- zpcictl: Change wording of man-page and help output (#1643451)
- zpcictl: Read device link to obtain device address (#1639220)
- zpcictl: Add tool to manage PCI devices (#1525409)
- Resolves: #1525409 #1639220 #1643451 #1643452 #1644384 #1646354 #1646355
+* Wed Jan 02 2019 Dan Horák <dan[at]danny.cz> - 2:2.7.1-1
+- rebased to 2.7.1

-* Tue Nov 06 2018 Javier Martinez Canillas <javierm@redhat.com> - 2.6.0-9
+* Wed Dec 05 2018 Dan Horák <dan[at]danny.cz> - 2:2.7.0-4
+- fix deps for dropped cmsfs subpackage
+
+* Mon Nov 19 2018 Dan Horák <dan[at]danny.cz> - 2:2.7.0-3
+- drop the original cmsfs subpackage
+
+* Tue Nov 06 2018 Javier Martinez Canillas <javierm@redhat.com> - 2:2.7.0-2
 - Make zipl to use the BLS title field as the IPL section name
- Resolves: #1645200
+
+* Wed Oct 31 2018 Dan Horák <dan[at]danny.cz> - 2:2.7.0-1
+- rebased to 2.7.0

 * Mon Oct 22 2018 Dan Horák <dan[at]danny.cz> - 2:2.6.0-8
 - don't relink the zkey tools
- Resolves: #1624169

 * Mon Oct 15 2018 Peter Jones <pjones@redhat.com> - 2.6.0-7
 - Make the blscfg sort order match what grub2 and grubby do. (pjones)
 - Add a ~debug suffix instead of -debug to sort it correctly. (javierm)
- Resolves: #1640968

 * Mon Oct 01 2018 Dan Horák <dan[at]danny.cz> - 2:2.6.0-6
- Fix kernel-install scripts issues (#1634803)
- Resolves: #1634803
+- Fix kernel-install scripts issues

 * Fri Sep 21 2018 Dan Horák <dan[at]danny.cz> - 2:2.6.0-5
- Makefile cleanups (#1624169)
- Resolves: #1624169
+- Makefile cleanups

 * Mon Sep 17 2018 Dan Horák <dan[at]danny.cz> - 2:2.6.0-4
- drop redundant systemd services installation (#1631682)
- Resolves #1631682
+- drop redundant systemd services installation

 * Fri Sep 14 2018 Dan Horák <dan[at]danny.cz> - 2:2.6.0-3
- add FIEMAP support into zipl (#1623163)
- Resolves: #1623163
+- add FIEMAP support into zipl

 * Tue Aug 14 2018 Dan Horák <dan[at]danny.cz> - 2:2.6.0-2
 - fix R:/BR: perl

 * Fri Aug 10 2018 Dan Horák <dan[at]danny.cz> - 2:2.6.0-1
- rebased to 2.6.0 (#1584283)
+- rebased to 2.6.0
 - include zdev dracut module
- Resolves: #1584283
-
-* Fri Aug 10 2018 Josh Boyer <jwboyer@redhat.com> - 2:2.5.0-6
- Rebuild against net-snmp 5.8
- Resolves: #1584510

 * Tue Jul 31 2018 Dan Horák <dan[at]danny.cz> - 2:2.5.0-5
 - add missing zkey infrastructure (#1610242)
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+SHA512 (s390-tools-2.31.0.tar.gz) = d05722dff760605baad92b25a7a9264b3c936ff851b87a02ab39604a74d02ae4e14632d9b3d83eb9cb82a14bfcbb0d40bb4797896051ed3dd36d7690abfb1c64
+SHA512 (s390-tools-2.31.0-rust-vendor.tar.xz) = f9dc2887bb2502ba6f71ef7ea807380c322a46df8c65f0fc7993f3fb4eec4da120369d3e380dbcca9b6250307da0f6236a649504d542f44730e8009ace8ed450
--- a/SOURCES/zfcp.udev
+++ b/SOURCES/zfcp.udev
--- a/SOURCES/zfcpconf.sh
+++ b/SOURCES/zfcpconf.sh