.gitignore

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

.s390utils.metadata

@@ -1,3 +1 @@
-9c9a4e89bddb2b4e6e09ef6fc7c2e6f2ad6316de SOURCES/cmsfs-1.1.8c.tar.gz
 e8e0d3f651179fd14dc4a40d53a1e4ef6edaae7d SOURCES/s390-tools-2.25.0.tar.gz
-8ed8592a0a9370ce8422df9231ccb17f6cf49bed SOURCES/src_vipa-2.1.0.tar.gz

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%/*}"

SOURCES/ccw.udev

@@ -1,13 +1,4 @@
-ACTION!="add|change", GOTO="ccw_end"
+ACTION!="add|bind|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"
+DRIVER=="ctcm|lcs|qeth", RUN+="ccw_init"
 LABEL="ccw_end"

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]);

SOURCES/cmsfs-1.1.8-kernel26.patch

@@ -1,12 +0,0 @@
-diff -urN cmsfs-1.1.8/cmsfssed.sh cmsfs-1.1.8_/cmsfssed.sh
---- cmsfs-1.1.8/cmsfssed.sh	2003-02-28 17:52:59.000000000 -0500
-+++ cmsfs-1.1.8_/cmsfssed.sh	2004-05-28 16:36:22.000000000 -0400
-@@ -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.*)
-         LINUX_RELEASE="2.4"
- #       ln -s cmsfs24x.c cmsfsvfs.c
-         INCLUDES="-I/lib/modules/`uname -r`/build/include"

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
-

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++)
-       {

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

SOURCES/s390-tools-zipl-blscfg-rpm-nvr-sort.patch

@@ -194,7 +194,7 @@ index 0cea1d4..9352f76 100644
  		return n;
  
 -- 
-2.38.1
+2.37.3
 
 
 From 7a51cfc15b870d90bffe1e24a1da922663ffe1d7 Mon Sep 17 00:00:00 2001
@@ -344,5 +344,5 @@ index 9352f76..3327e2d 100644
  static int
  scan_append_section_heading(struct scan_token* scan, int* index, char* name);
 -- 
-2.38.1
+2.37.3
 

SOURCES/s390utils-2.25.0-rhel.patch

@@ -1,177 +1,7 @@
-From 48324b579e825a30110abac0369e9d544350ead1 Mon Sep 17 00:00:00 2001
-From: Steffen Eiden <seiden@linux.ibm.com>
-Date: Wed, 14 Dec 2022 14:25:21 +0100
-Subject: [PATCH 1/4] zdump: replace atomic refcount with atomic int
-
-(Atomic) refcounting was introduced in glib2.58.
-We want to support v2.56 as well, so replace it with int and the atomic
-operations introduced in glib 2.4.
-
-Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/146
-Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
-Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
----
- zdump/pv_utils.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/zdump/pv_utils.c b/zdump/pv_utils.c
-index 6d9f0bb..a39bfc5 100644
---- a/zdump/pv_utils.c
-+++ b/zdump/pv_utils.c
-@@ -674,7 +674,7 @@ struct _storage_state_mmap {
- 	size_t mapped_size;
- 	pv_tweak_component_t *tweak_components;
- 	size_t num_tweaks;
--	gatomicrefcount ref_count;
-+	int ref_count;
- };
- 
- storage_state_mmap_t *storage_state_mmap_new(const int fd, const size_t file_size, const u64 offset,
-@@ -733,14 +733,14 @@ storage_state_mmap_t *storage_state_mmap_new(const int fd, const size_t file_siz
- 	ret->tweak_components = (pv_tweak_component_t *)(ptr + in_page_offset);
- 	ret->num_tweaks = tweak_components_cnt;
- 	ret->mapped_size = mmapped_size;
--	g_atomic_ref_count_init(&ret->ref_count);
-+	ret->ref_count = 1;
- 	return g_steal_pointer(&ret);
- }
- 
- storage_state_mmap_t *storage_state_mmap_ref(storage_state_mmap_t *storage_state)
- {
- 	g_assert(storage_state);
--	g_atomic_ref_count_inc(&storage_state->ref_count);
-+	g_atomic_int_inc(&storage_state->ref_count);
- 	return storage_state;
- }
- 
-@@ -748,7 +748,7 @@ void storage_state_mmap_unref(storage_state_mmap_t *storage_state)
- {
- 	if (!storage_state)
- 		return;
--	if (storage_state->ref_count && !g_atomic_ref_count_dec(&storage_state->ref_count))
-+	if (storage_state->ref_count && !g_atomic_int_dec_and_test(&storage_state->ref_count))
- 		return;
- 	if (storage_state->first_page_ptr) {
- 		int rc = munmap(storage_state->first_page_ptr, storage_state->mapped_size);
--- 
-2.39.1
-
-
-From 4007220d35a9e33186fdfe3a4b5c22cd2eea9bb9 Mon Sep 17 00:00:00 2001
-From: Steffen Eiden <seiden@linux.ibm.com>
-Date: Wed, 14 Dec 2022 13:53:29 +0100
-Subject: [PATCH 2/4] libpv: disallow glib features from after 2.56
-
-Enforce that the first glib.h include is done via glib-helper.h for libpv
-so that glib version checks are in place.
-
-Change zdump and pvattest such that they never include glibstuff before
-libpv/glib-helper.h
-
-Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
-Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
----
- include/libpv/glib-helper.h | 6 ++++++
- pvattest/src/common.h       | 2 +-
- zdump/dfi_pv_elf.c          | 1 -
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/include/libpv/glib-helper.h b/include/libpv/glib-helper.h
-index 5d3df50..9f90b28 100644
---- a/include/libpv/glib-helper.h
-+++ b/include/libpv/glib-helper.h
-@@ -18,6 +18,12 @@
- #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56
- #endif
- 
-+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_56
-+
-+#ifdef __G_LIB_H__
-+#error "glib.h must be included via libpv/glib-helper.h"
-+#endif
-+
- #include <glib.h>
- #include <gmodule.h>
- #include <stdio.h>
-diff --git a/pvattest/src/common.h b/pvattest/src/common.h
-index e2e3ef1..43d2ab9 100644
---- a/pvattest/src/common.h
-+++ b/pvattest/src/common.h
-@@ -11,10 +11,10 @@
- /* Must be included before any other header */
- #include "config.h"
- 
--#include <glib/gi18n.h>
- #include <stdio.h>
- 
- #include "libpv/glib-helper.h"
-+#include <glib/gi18n.h>
- #include "libpv/macros.h"
- #include "lib/zt_common.h"
- 
-diff --git a/zdump/dfi_pv_elf.c b/zdump/dfi_pv_elf.c
-index 8d1021e..9d33e8f 100644
---- a/zdump/dfi_pv_elf.c
-+++ b/zdump/dfi_pv_elf.c
-@@ -21,7 +21,6 @@
- #include <elf.h>
- #include <errno.h>
- 
--#include <glib.h>
- #include <openssl/bio.h>
- #include <openssl/crypto.h>
- 
--- 
-2.39.1
-
-
-From fb01fb45bb6a9e62313e9cdb79ad5ed39471cfe7 Mon Sep 17 00:00:00 2001
-From: Marc Hartmayer <mhartmay@linux.ibm.com>
-Date: Mon, 19 Dec 2022 09:51:51 +0000
-Subject: [PATCH 3/4] zgetdump/Makefile: don't use `.check_dep_zgetdump` as
- linker input
-
-The `.check_dep_zgetdump` file is used to cache the result of the
-dependency checks and should not be used as input for linking or
-anything else. Let's add it as dependency for the objects file. This
-shouldn't cause any problems since the Makefile rule for object files is
-defined in `common.mak` as follows:
-
-%.o: %.c
-	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
-
-Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/147
-Fixes: 8d8d5e9746a4 ("zdump: Fix Makefile dependencies")
-Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
-Signed-off-by: Jan Hoeppner <hoeppner@linux.ibm.com>
----
- zdump/Makefile | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/zdump/Makefile b/zdump/Makefile
-index ca8aadc..934dc47 100644
---- a/zdump/Makefile
-+++ b/zdump/Makefile
-@@ -119,7 +119,9 @@ libs = $(rootdir)/libutil/libutil.a $(LIBPV)
- 
- all: $(BUILD_TARGETS)
- 
--zgetdump: .check_dep_zgetdump $(OBJECTS) $(libs)
-+$(OBJECTS): .check_dep_zgetdump
-+
-+zgetdump: $(OBJECTS) $(libs)
- 
- skip-zgetdump:
- 	echo "  SKIP    zgetdump due to unresolved dependencies"
--- 
-2.39.1
-
-
-From 1ad208c17a0edc65e6abd47b68a7d9c206faf2a6 Mon Sep 17 00:00:00 2001
+From a9fed51fbf159a98fcd4a9dddf4fef243bb433af Mon Sep 17 00:00:00 2001
 From: Ingo Franzki <ifranzki@linux.ibm.com>
 Date: Fri, 20 Jan 2023 11:04:18 +0100
-Subject: [PATCH 4/4] zkey: Support EP11 host library version 4 (#2165811)
+Subject: [PATCH] zkey: Support EP11 host library version 4 (#2165812)
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

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
- 

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
 %global signzipl 1
@@ -13,30 +10,24 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
 Version:        2.25.0
-Release:        2%{?dist}
+Release:        4%{?dist}
 Epoch:          2
 License:        MIT
 ExclusiveArch:  s390 s390x
-#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
-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
+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
+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 0%{?signzipl}
 %define pesign_name redhatsecureboot302
@@ -49,13 +40,6 @@ 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
-
 Requires:       s390utils-core = %{epoch}:%{version}-%{release}
 Requires:       s390utils-base = %{epoch}:%{version}-%{release}
 Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
@@ -63,8 +47,8 @@ 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}
 
+BuildRequires:  make
 BuildRequires:  gcc-c++
 
 %description
@@ -76,53 +60,21 @@ 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
+%setup -q -n s390-tools-%{version}
 
 # Fedora/RHEL changes
 %patch0 -p1 -b .zipl-invert-script-options
 %patch1 -p1 -b .blscfg-rpm-nvr-sort
 
 # upstream fixes/updates
-%%patch100 -p1
+%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
+# drop -Werror from genprotimg to allow building with GCC 12
+sed -i.bak -e 's/-Werror//g' genprotimg/src/Makefile genprotimg/boot/Makefile
 
 # remove --strip from install
 find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
 
-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
-
 
 %build
 make \
@@ -136,15 +88,6 @@ make \
         DISTRELEASE=%{release} \
         V=1
 
-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
-
 
 %install
 make install \
@@ -195,21 +138,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}
@@ -234,6 +165,7 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf
 %files
 %doc README.md
 
+#
 # ************************* s390-tools core package  *************************
 #
 %package core
@@ -248,13 +180,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
@@ -322,20 +248,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
 Summary:        S390 base tools
 Requires:       gawk sed coreutils
 Requires:       sg3_utils
@@ -473,11 +397,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
@@ -590,7 +514,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_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*
@@ -646,11 +569,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*
-
 #
 # *********************** s390-tools osasnmpd package  ***********************
 #
@@ -837,29 +755,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  ***********************
@@ -868,6 +763,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.
@@ -1010,266 +907,261 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
-* 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
+* Thu Feb 02 2023 Dan Horák <dhorak@redhat.com> - 2:2.25.0-4
+- zkey: Support EP11 host library version 4 (#2165812)
+- Resolves: #2165812
+
+* Wed Jan 25 2023 Dan Horák <dhorak@redhat.com> - 2:2.25.0-3
+- revert the last change
+- Related: #2161740
+
+* Thu Jan 19 2023 Dan Horák <dhorak@redhat.com> - 2:2.25.0-2
+- update kernel install script to write /etc/kernel/cmdline (#2161740)
+- Resolves: #2161740
 
 * 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
+- rebased to 2.25.0 (#2110310)
+- zipl: Support for Secure Boot IPL and Dump from ECKD DASD (#2044200)
+- zipl: Add secure boot trailer (#2142883)
+- Resolves: #2110310 #2044200 #2142883
 
-* 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
+* Thu Nov 24 2022 Dan Horák <dhorak@redhat.com> - 2:2.24.0-1
+- rebased to 2.24.0 (#2110310)
+- KVM: Tool to process encrypted Secure Execution guest dumps (#2044198)
+- zdev: Site-aware device configuration (#2044202)
+- Support IBM z16 Processor-Activity-Instrumentation Facility (#2110298)
+- Transparent DASD PPRC (Peer-to-Peer Remote Copy) handling (#2126617)
+- Support IBM z16 Processor Activity Instrumentation Extension 1 (#2127435)
+- Display Processor Activity Instrumentation CPACF counters (#2111012)
+- Resolves: #2110310 #2044198 #2044202 #2110298 #2126617 #2127435 #2111012
 
-* 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
+* Thu Aug 04 2022 Dan Horák <dhorak@redhat.com> - 2:2.22.0-2
+- zipl: Add missing check for a nullpointer (#2113884)
+- Resolves: #2113884
 
-* 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
+* Mon Jul 11 2022 Dan Horák <dhorak@redhat.com> - 2:2.22.0-1
+- rebased to 2.22.0 (#2044205)
+- add tool to persistently configure vfio-ap devices (#1870699)
+- NVMe stand-alone dump support (#1878081)
+- zipl: Site-aware environment block (#2044199)
+- KVM: Secure Execution Attestation Userspace Tool (#2044203)
+- Add new CPU-MF Counters for IBM z16 Hardware (#2047722)
+- Resolves: #2044205 #1870699 #1878081 #2044199 #2044203 #2047722
 
-* 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
+* Tue Apr 26 2022 Dan Horák <dhorak@redhat.com> - 2:2.21.0-1
+- rebased to 2.21.0 (#2044205)
+- cpictl: Suppress messages for unwritable sysfs files (#1985745)
+- KVM: Secure Execution guest dump encryption with customer keys (#2044204)
+- KVM: Allow long kernel command lines for Secure Execution guests (#2044197)
+- zcrypt DD: Exploitation Support of new IBM Z Crypto Hardware (#2044206)
+- Long Kernel Commmand Line for s390x (#2060826)
+- zcryptctl support for control domains (#2076920)
+- Add additional information to SCLP CPI (#2046680)
+- Resolves: #2044205 #1985745 #2044204 #2044197 #2044206 #2060826 #2076920 #2046680
 
-* 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)
-- 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
+* Tue Dec 14 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-2
+- update ccw udev rules for synthetic events (#2027357)
+- Resolves: #2027357
 
-* 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
+* Tue Nov 23 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-1.1
+- rebuild
+- Related: #2022347
 
-* 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
+* Thu Nov 18 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-1
+- rebased to 2.19.0 (#2022347)
+- cmsfs-fuse Requires glibc-gconv-extra (#2022702)
+- cpictl: fix permissions (#2024102)
+- Resolves: #2022347 #2022702 #2024102
 
-* 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
+* Fri Nov 05 2021 Dan Horák <dan[at]danny.cz> - 2:2.18.0-1
+- move vmcp to core (#1931287)
+- rebased to 2.18.0 (#2011434)
+- Resolves: #2011434 #1931287
 
-* 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 Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2:2.17.0-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* 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
+* Fri Aug 06 2021 Dan Horák <dan[at]danny.cz> - 2:2.17.0-3
+- libkmipclient: Fix parsing of hex values for XML and JSON encoding (#1870700)
+- Resolves: #1870700
 
-* Fri Jul 03 2020 Javier Martinez Canillas <javierm@redhat.com> - 2:2.6.0-31
+* Thu Jul 22 2021 Dan Horák <dan[at]danny.cz> - 2:2.17.0-2
+- fix build
+- Related: #1869554
+
+* Thu Jul 15 2021 Dan Horák <dan[at]danny.cz> - 2:2.17.0-1
+- rebased to 2.17.0 (#1869554)
+- Resolves: #1869554
+
+* Wed Jul 07 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-6
+- update genprotimg for OpenSSL3 (#1964818)
+- Related: #1964818
+
+* Thu Jun 17 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-5
+- drop obsolete setting from device_cio_free.service (#1972449)
+- Resolves: #1972449
+
+* Wed Jun 02 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-4
+- omit genprotimg to allow build against OpenSSL 3.0 (#1964818)
+- Resolves: #1964818
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2:2.16.0-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 01 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-2
+- drop superfluous Require from s390utils-base
+
+* Wed Feb 24 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-1
+- rebased to 2.16.0
+
+* 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
+
+* Tue Jan 05 2021 Dan Horák <dan[at]danny.cz> - 2:2.15.1-4
+- move lszdev to core
+
+* Mon Jan 04 2021 Dan Horák <dan[at]danny.cz> - 2:2.15.1-3
+- move fdasd to core
+
+* 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)