Import from AlmaLinux stable repository

.gitignore

@@ -1,3 +1,4 @@
 SOURCES/cmsfs-1.1.8c.tar.gz
-SOURCES/s390-tools-2.16.0.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

.s390utils.metadata

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

SOURCES/cmsfs-1.1.8-kernel26.patch

@@ -1,12 +1,12 @@
-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
+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.*)
++    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"

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

@@ -1,19 +1,234 @@
-diff -up s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort s390-tools-2.9.0/zipl/src/Makefile
---- s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort	2019-05-22 08:16:17.317273801 -0400
-+++ s390-tools-2.9.0/zipl/src/Makefile	2019-05-22 08:18:02.947273801 -0400
-@@ -7,7 +7,7 @@ ALL_CPPFLAGS += -I../include -I../boot \
- 	    -D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
- ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
+From b2daaa34776ba6afec879e362378f6f7563590a6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Mon, 20 Jun 2022 17:43:05 +0200
+Subject: [PATCH 1/2] Revert "zipl/src: Implement sorting bls entries by
+ versions"
+
+This reverts commit a0dba6bfdb50ff373fa710ffe2a307cc0748f18b.
+---
+ zipl/src/scan.c | 139 ++----------------------------------------------
+ 1 file changed, 3 insertions(+), 136 deletions(-)
+
+diff --git a/zipl/src/scan.c b/zipl/src/scan.c
+index 0cea1d4..9352f76 100644
+--- a/zipl/src/scan.c
++++ b/zipl/src/scan.c
+@@ -10,7 +10,6 @@
+  *
+  */
  
--libs = $(rootdir)/libutil/libutil.a
-+libs = $(rootdir)/libutil/libutil.a -lrpm
+-static const char *VERSION_KEYWORD = "version";
  
- objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.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
-@@ -33,6 +33,8 @@
+ /* Need ISOC99 function isblank() in ctype.h */
+ #ifndef __USE_ISOC99
+@@ -646,7 +645,7 @@ scan_file(const char* filename, struct scan_token** token)
+ 
+ 
+ static int
+-bls_filter_by_names(const struct dirent *ent)
++bls_filter(const struct dirent *ent)
+ {
+ 	int offset = strlen(ent->d_name) - strlen(".conf");
+ 
+@@ -656,111 +655,13 @@ bls_filter_by_names(const struct dirent *ent)
+ 	return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
+ }
+ 
+-struct version {
+-	char *line; /* pointer to a line with version keyword */
+-	int offset; /* offset of version value in the line */
+-};
+-
+-/*
+- * Locate version in bls file represented by ENT
+- */
+-static void get_version(const struct dirent *ent, struct version *v)
+-{
+-	char *line = NULL;
+-	size_t len = 0;
+-	char *d_name;
+-	FILE *stream;
+-	ssize_t read;
+-
+-	memset(v, 0, sizeof(*v));
+-	d_name = misc_make_path((char *)blsdir, (char *)ent->d_name);
+-	if (!d_name)
+-		return;
+-
+-	stream = fopen(d_name, "r");
+-	free(d_name);
+-	if (!stream)
+-		return;
+-
+-	while ((read = getline(&line, &len, stream)) != -1) {
+-		if (line[read - 1] == '\n') {
+-			line[read - 1] = '\0';
+-			read--;
+-		}
+-		if ((size_t)read <= strlen(VERSION_KEYWORD) + 1)
+-			continue;
+-		if (strcmp(VERSION_KEYWORD, line) > 0)
+-			continue;
+-		if (!isblank(line[strlen(VERSION_KEYWORD)]))
+-			continue;
+-		/* skip blanks */
+-		v->offset = strlen(VERSION_KEYWORD) + 1;
+-		while (v->offset < read - 1 && isblank(line[v->offset]))
+-			v->offset++;
+-		if (isblank(line[v->offset]))
+-			/*
+-			 * all characters after the keyword
+-			 * are blanks. Invalid version
+-			 */
+-			continue;
+-		v->line = line;
+-		fclose(stream);
+-		return;
+-	}
+-	free(line);
+-	fclose(stream);
+-}
+-
+-static void put_version(struct version *v)
+-{
+-	free(v->line);
+-}
+-
+-/**
+- * Check version in bls file represented by ENT.
+- * Return 1 if version is valid. Otherwise return 0
+- */
+-static int bls_filter_by_versions(const struct dirent *ent)
+-{
+-	struct version v;
+-
+-	if (bls_filter_by_names(ent) == 0)
+-		return 0;
+-
+-	get_version(ent, &v);
+-	if (v.line) {
+-		put_version(&v);
+-		return 1;
+-	}
+-	return 0;
+-}
+-
+ 
+ static int
+-bls_sort_by_names(const struct dirent **ent_a, const struct dirent **ent_b)
++bls_sort(const struct dirent **ent_a, const struct dirent **ent_b)
+ {
+ 	return strverscmp((*ent_a)->d_name, (*ent_b)->d_name);
+ }
+ 
+-static int
+-bls_sort_by_versions(const struct dirent **ent_a, const struct dirent **ent_b)
+-{
+-	struct version v1, v2;
+-	int ret;
+-
+-	get_version(*ent_a, &v1);
+-	get_version(*ent_b, &v2);
+-	/*
+-	 * Both versions are valid.
+-	 * It is guaranteed by bls_filter_by_versions()
+-	 */
+-	ret = strverscmp(v1.line + v1.offset, v2.line + v2.offset);
+-
+-	put_version(&v1);
+-	put_version(&v2);
+-
+-	return ret;
+-}
+ 
+ static int
+ scan_append_section_heading(struct scan_token* scan, int* index, char* name);
+@@ -1110,40 +1011,6 @@ scan_count_target_keywords(char* keyword[])
+ 	return num;
+ }
+ 
+-static int bls_scandir(struct dirent ***bls_entries)
+-{
+-	struct dirent **entries1;
+-	struct dirent **entries2;
+-	int n1, n2;
+-
+-	/* arrange by names */
+-	n1 = scandir(blsdir, &entries1,
+-		     bls_filter_by_names, bls_sort_by_names);
+-	if (n1 <= 0)
+-		return n1;
+-	/* arrange by versions */
+-	n2 = scandir(blsdir, &entries2,
+-		     bls_filter_by_versions, bls_sort_by_versions);
+-
+-	if (n2 <= 0 || n2 < n1) {
+-		/*
+-		 * failed to sort by versions,
+-		 * fall back to sorting by filenames
+-		 */
+-		*bls_entries = entries1;
+-		while (n2--)
+-			free(entries2[n2]);
+-		free(entries2);
+-		return n1;
+-	}
+-	/* use arrangement by versions */
+-	*bls_entries = entries2;
+-	while (n1--)
+-		free(entries1[n1]);
+-	free(entries1);
+-	return n2;
+-}
+-
+ int
+ scan_check_target_data(char* keyword[], int* line)
+ {
+@@ -1464,7 +1331,7 @@ int scan_bls(struct scan_token **token, int scan_size)
+ 	if (!(stat(blsdir, &sb) == 0 && S_ISDIR(sb.st_mode)))
+ 		return 0;
+ 
+-	n = bls_scandir(&bls_entries);
++	n = scandir(blsdir, &bls_entries, bls_filter, bls_sort);
+ 	if (n <= 0)
+ 		return n;
+ 
+-- 
+2.39.2
+
+
+From 692e70bcfc32a05e30146bd7077c41e0eaceff03 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 20 Jun 2022 17:46:59 +0200
+Subject: [PATCH 2/2] blscfg: sort like rpm nvr, not like a single version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Signed-off-by: Dan Horák <dan@danny.cz>
+---
+ zipl/src/Makefile |  1 +
+ zipl/src/scan.c   | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 95 insertions(+), 2 deletions(-)
+
+diff --git a/zipl/src/Makefile b/zipl/src/Makefile
+index cab5655..7ec215d 100644
+--- a/zipl/src/Makefile
++++ b/zipl/src/Makefile
+@@ -9,6 +9,7 @@ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
+ 
+ libs =  $(rootdir)/libutil/libutil.a \
+ 	$(rootdir)/libvtoc/libvtoc.a \
++	-lrpmio -lrpm
+ 
+ objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
+ 	  bootmap_header.o envblk.o install.o zipl.o
+diff --git a/zipl/src/scan.c b/zipl/src/scan.c
+index 9352f76..3327e2d 100644
+--- a/zipl/src/scan.c
++++ b/zipl/src/scan.c
+@@ -35,6 +35,8 @@
  
  #include "lib/util_base.h"
  
@@ -22,7 +237,7 @@ diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/z
  #include "boot.h"
  #include "error.h"
  #include "misc.h"
-@@ -653,13 +655,103 @@ bls_filter(const struct dirent *ent)
+@@ -655,13 +657,103 @@ bls_filter(const struct dirent *ent)
  	return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
  }
  
@@ -128,3 +343,6 @@ diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/z
  
  static int
  scan_append_section_heading(struct scan_token* scan, int* index, char* name);
+-- 
+2.39.2
+

SOURCES/s390-tools-zipl-invert-script-options.patch

@@ -61,10 +61,10 @@ index 871935c783f..d8d5eca5867 100755
  	    ;;
  	--)
  	    shift
-diff --git a/scripts/zipl-switch-to-blscfg.1 b/scripts/zipl-switch-to-blscfg.1
+diff --git a/scripts/zipl-switch-to-blscfg.8 b/scripts/zipl-switch-to-blscfg.8
 index 6bd14d00d14..71b904ffd1c 100644
---- a/scripts/zipl-switch-to-blscfg.1
-+++ b/scripts/zipl-switch-to-blscfg.1
+--- a/scripts/zipl-switch-to-blscfg.8
++++ b/scripts/zipl-switch-to-blscfg.8
 @@ -37,9 +37,9 @@ The DIRECTORY where the BLS fragments will be generated. The directory is create
  The FILE used for zipl configuration file, defaults to /etc/zipl.conf.
  

SPECS/s390utils.spec

@@ -3,19 +3,32 @@
 
 # secure boot support is for RHEL only
 %if 0%{?rhel} >= 8
-%global signzipl 1
+%bcond_without signzipl
+%else
+%bcond_with signzipl
 %endif
 
+%if 0%{?fedora}
+%bcond_without pandoc
+%else
+%bcond_with pandoc
+%endif
+%bcond_without rust
+
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.16.0
-Release:        2%{?dist}
+Version:        2.29.0
+Release:        3%{?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
+# To create the vendor tarball:
+#   tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust/pvsecret ; \
+#   rm -f Cargo.lock && cargo vendor && \
+#   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
@@ -34,7 +47,7 @@ Source24:       20-zipl-kernel.install
 Source25:       52-zipl-rescue.install
 Source26:       91-zipl.install
 
-%if 0%{?signzipl}
+%if %{with signzipl}
 %define pesign_name redhatsecureboot302
 %endif
 
@@ -42,8 +55,8 @@ Source26:       91-zipl.install
 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
+# upstream fixes/updates
+Patch100:       s390utils-%{version}-rhel.patch
 
 Patch1000:      cmsfs-1.1.8-warnings.patch
 Patch1001:      cmsfs-1.1.8-kernel26.patch
@@ -52,6 +65,13 @@ Patch1003:      cmsfs-1.1.8-args.patch
 
 Patch2000:      src_vipa-2.1.0-deprecate.patch
 
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch:    %{ix86}
+
+%ifarch s390x
+#
+# s390x/native package structure
+#
 Requires:       s390utils-core = %{epoch}:%{version}-%{release}
 Requires:       s390utils-base = %{epoch}:%{version}-%{release}
 Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
@@ -60,8 +80,46 @@ 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
+#
+Requires:       s390utils-se-data = %{epoch}:%{version}-%{release}
+%endif
 
 BuildRequires:  gcc-c++
+BuildRequires:  glib2-devel
+%if %{with rust}
+%if 0%{?rhel}
+BuildRequires:  libcurl-devel
+BuildRequires:  openssl-devel
+BuildRequires:  rust-toolset
+%else
+BuildRequires:  crate(anstream)
+BuildRequires:  crate(anstyle-query)
+BuildRequires:  crate(anyhow)
+BuildRequires:  crate(byteorder)
+BuildRequires:  crate(cfg-if)
+BuildRequires:  crate(clap)
+BuildRequires:  crate(clap_complete)
+BuildRequires:  crate(clap_derive)
+BuildRequires:  crate(colorchoice)
+BuildRequires:  crate(curl)
+BuildRequires:  crate(is-terminal)
+BuildRequires:  crate(libc)
+BuildRequires:  crate(log)
+BuildRequires:  crate(openssl)
+BuildRequires:  crate(openssl-probe)
+BuildRequires:  crate(serde)
+BuildRequires:  crate(serde_derive)
+BuildRequires:  crate(serde_yaml)
+BuildRequires:  crate(strsim)
+BuildRequires:  crate(terminal_size)
+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.
@@ -78,6 +136,7 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
 %patch0 -p1 -b .zipl-invert-script-options
 %patch1 -p1 -b .blscfg-rpm-nvr-sort
 
+# upstream fixes/updates
 %patch100 -p1
 
 #
@@ -108,6 +167,17 @@ 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
+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
@@ -121,11 +191,23 @@ popd
 
 %build
 make \
-        CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" \
+        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 \
+%endif
+        NO_PIE_LDFLAGS="" \
         BINDIR=/usr/sbin \
         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}"
@@ -134,19 +216,30 @@ 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 \
+%endif
         DESTDIR=%{buildroot} \
         BINDIR=/usr/sbin \
         SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
         DISTRELEASE=%{release} \
         V=1
 
+%ifarch s390x
+#
+# s390x/native specific %%install section
+#
 # sign the stage3 bootloader
-%if 0%{?signzipl}
+%if %{with signzipl}
 if [ -x /usr/bin/rpm-sign ]; then
     pushd %{buildroot}/lib/s390-tools/
         rpm-sign --key "%{pesign_name}" --lkmsign stage3.bin --output stage3.signed
@@ -216,11 +309,63 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules
 
 # zipl.conf to be ghosted
 touch %{buildroot}%{_sysconfdir}/zipl.conf
+%endif
 
-
+%ifarch s390x
+#
+# s390x/native main %%files section
+#
 %files
 %doc README.md
 
+%else
+#
+# multiarch %%files section
+#
+
+%files
+%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.1*
+%endif
+%dir %{_datadir}/s390-tools
+%{_datadir}/s390-tools/genprotimg/
+
+#
+# enf of multi-arch section
+#
+%endif
+
+%ifarch s390x
+#
+# s390x specific sub-packages
+#
+#
 # ************************* s390-tools core package  *************************
 #
 %package core
@@ -261,17 +406,22 @@ 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
+%config(noreplace) %{_sysconfdir}/ziplenv
 %{_unitdir}/cpi.service
 %config(noreplace) %{_sysconfdir}/sysconfig/cpi
 /usr/lib/dracut/modules.d/95zdev/
+/usr/lib/dracut/modules.d/95zdev-kdump/
 %{_mandir}/man5/zipl.conf.5*
 %{_mandir}/man8/chreipl.8*
 %{_mandir}/man8/chzdev.8*
@@ -280,7 +430,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 +452,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
@@ -323,6 +476,7 @@ Requires:       ethtool
 Requires:       tar
 Requires:       file
 Requires:       s390utils-core = %{epoch}:%{version}-%{release}
+Requires:       s390utils-se-data = %{epoch}:%{version}-%{release}
 %{?systemd_requires}
 BuildRequires:  perl-generators
 BuildRequires:  ncurses-devel
@@ -330,7 +484,7 @@ BuildRequires:  glibc-static
 BuildRequires:  cryptsetup-devel >= 2.0.3
 BuildRequires:  json-c-devel
 BuildRequires:  rpm-devel
-BuildRequires:  glib2-devel
+BuildRequires:  libxml2-devel
 
 
 %description base
@@ -395,11 +549,6 @@ s390 base tools. This collection provides the following utilities:
    * tunedasd:
      Adjust tunable parameters on DASD devices.
 
-   * vmconvert:
-     Convert system dumps created by the z/VM VMDUMP command into dumps with
-     LKCD format. These LKCD dumps can then be analyzed with the dump analysis
-     tool lcrash.
-
    * vmcp:
      Allows Linux users to send commands to the z/VM control program (CP).
      The normal usage is to invoke vmcp with the command you want to
@@ -490,6 +639,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
@@ -507,16 +657,17 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/lstape
 %{_sbindir}/lszcrypt
 %{_sbindir}/lszfcp
+%{_sbindir}/pai
 %{_sbindir}/qetharp
 %{_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
@@ -529,30 +680,61 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_bindir}/dump2tar
 %{_bindir}/genprotimg
 %{_bindir}/mk-s390image
-%{_bindir}/vmconvert
+%if %{with rust}
+%{_bindir}/pvapconfig
+%endif
+%{_bindir}/pvattest
+%{_bindir}/pvextract-hdr
+%if %{with rust}
+%{_bindir}/pvsecret
+%endif
 %{_bindir}/zkey
 %{_bindir}/zkey-cryptsetup
 %{_unitdir}/dumpconf.service
 %ghost %config(noreplace) %{_sysconfdir}/zipl.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
+%{_sysconfdir}/mdevctl.d/*
+/usr/lib/dracut/modules.d/99ngdump/
+# own the mdevctl dirs until new release is available
+%dir /usr/lib/mdevctl
+%dir /usr/lib/mdevctl/scripts.d
+%dir /usr/lib/mdevctl/scripts.d/callouts
+/usr/lib/mdevctl/scripts.d/callouts/ap-check
 /lib/s390-tools/dumpconf
 /lib/s390-tools/lsznet.raw
 %dir /lib/s390-tools/zfcpdump
 /lib/s390-tools/zfcpdump/zfcpdump-initrd
 /lib/s390-tools/znetcontrolunits
 %{_libdir}/libekmfweb.so.*
+%{_libdir}/libkmipclient.so.*
+%dir %{_libdir}/zkey
 %{_libdir}/zkey/zkey-ekmfweb.so
-%{_mandir}/man1/dbginfo.sh.1*
+%{_libdir}/zkey/zkey-kmip.so
 %{_mandir}/man1/dump2tar.1*
-%{_mandir}/man1/lscpumf.1*
-%{_mandir}/man1/lshwc.1*
-%{_mandir}/man1/vmconvert.1*
-%{_mandir}/man1/zfcpdbf.1*
-%{_mandir}/man1/zipl-switch-to-blscfg.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.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*
@@ -561,13 +743,16 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man8/chzcrypt.8*
 %{_mandir}/man8/dasdstat.8*
 %{_mandir}/man8/dasdview.8*
+%{_mandir}/man8/dbginfo.sh.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*
+%{_mandir}/man8/lscpumf.8*
 %{_mandir}/man8/lscss.8*
 %{_mandir}/man8/lsdasd.8*
+%{_mandir}/man8/lshwc.8*
 %{_mandir}/man8/lsluns.8*
 %{_mandir}/man8/lsqeth.8*
 %{_mandir}/man8/lsreipl.8*
@@ -577,6 +762,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man8/lstape.8*
 %{_mandir}/man8/lszcrypt.8*
 %{_mandir}/man8/lszfcp.8*
+%{_mandir}/man8/pai.8*
 %{_mandir}/man8/qetharp.8*
 %{_mandir}/man8/qethconf.8*
 %{_mandir}/man8/qethqoat.8*
@@ -584,17 +770,20 @@ 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/zfcpdbf.8*
 %{_mandir}/man8/zgetdump.8*
+%{_mandir}/man8/zipl-switch-to-blscfg.8*
 %{_mandir}/man8/znetconf.8*
 %{_mandir}/man8/zpcictl.8*
-%dir %{_datadir}/s390-tools/
-%{_datadir}/s390-tools/genprotimg/
+%dir %{_datadir}/s390-tools
 %{_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
 
@@ -606,6 +795,18 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_libdir}/src_vipa.so
 %{_mandir}/man8/src_vipa.8*
 
+%package se-data
+License:        MIT
+Summary:        Data for Secure Execution
+BuildArch:      noarch
+
+%description se-data
+%{summary}.
+
+%files se-data
+%dir %{_datadir}/s390-tools
+%{_datadir}/s390-tools/genprotimg/
+
 #
 # *********************** s390-tools osasnmpd package  ***********************
 #
@@ -821,8 +1022,8 @@ This package contains the CMS file system tools.
 #
 %package cmsfs-fuse
 Summary:        CMS file system based on FUSE
-BuildRequires:  fuse-devel
-Requires:       fuse
+BuildRequires:  fuse3-devel
+Requires:       fuse3
 
 %description cmsfs-fuse
 This package contains the CMS file system based on FUSE.
@@ -838,9 +1039,9 @@ This package contains the CMS file system based on FUSE.
 #
 %package zdsfs
 Summary:        z/OS data set access based on FUSE
-BuildRequires:  fuse-devel
+BuildRequires:  fuse3-devel
 BuildRequires:  libcurl-devel
-Requires:       fuse
+Requires:       fuse3
 
 %description zdsfs
 This package contains the z/OS data set access based on FUSE.
@@ -854,8 +1055,8 @@ This package contains the z/OS data set access based on FUSE.
 #
 %package hmcdrvfs
 Summary:       HMC drive file system based on FUSE
-BuildRequires: fuse-devel
-Requires:      fuse
+BuildRequires: fuse3-devel
+Requires:      fuse3
 
 %description hmcdrvfs
 This package contains a HMC drive file system based on FUSE and a tool
@@ -877,6 +1078,7 @@ Requires(preun): systemd
 Requires(postun): systemd
 Requires(pre): shadow-utils
 BuildRequires: systemd
+BuildRequires: systemd-devel
 
 %description cpacfstatsd
 The cpacfstats tools provide a client/server application set to monitor
@@ -901,6 +1103,49 @@ 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
+%if %{with pandoc}
+BuildRequires:    pandoc
+%endif
+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
+%if %{with pandoc}
+%doc chreipl-fcp-mpath/README.html
+%endif
+%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
+%{_mandir}/man7/chreipl-fcp-mpath.7*
+
 #
 # *********************** devel package  ***********************
 #
@@ -915,10 +1160,95 @@ User-space development files for the s390/s390x architecture.
 %files devel
 %{_includedir}/%{name}/
 %{_includedir}/ekmfweb/
+%{_includedir}/kmipclient/
 %{_libdir}/libekmfweb.so
+%{_libdir}/libkmipclient.so
+
+#
+# end of s390x specific sub-packages
+#
+%endif
 
 
 %changelog
+* Mon Jan 29 2024 Dan Horák <dhorak@redhat.com> - 2:2.29.0-3
+- 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
+
+* 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
+
+* 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 Jul 21 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-2
+- Secure Execution APQN binding and IBK association (#2110510)
+- Resolves: #2110510
+
+* Tue Jun 06 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-1.1
+- rebuild
+- Related: #2159698
+
+* 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
+
+* 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
+
+* 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
+
+* 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 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)