Accepting request 1298746 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1298746
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/s390-tools?expand=0&rev=99

_service

@@ -1,8 +1,11 @@
 <services>
+  <service name="download_files" mode="manual" />
   <service name="cargo_vendor" mode="manual">
-     <param name="srctar">s390-tools-2.29.0.tar.gz</param>
+     <param name="src">s390-tools*.tar.gz</param>
-     <param name="compression">zst</param>
+	 <param name="update">true</param>
-     <param name="update">true</param>
+	 <param name="compression">zst</param>
+	 <param name="no-root-manifest">true</param>
+         <param name="cargotoml">rust/Cargo.toml</param>
   </service>
   <service name="cargo_audit" mode="manual" />
 </services>

cargo_config

@@ -1,5 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor/"

cputype

@@ -2,7 +2,7 @@
 #
 # cputype
 #
-# Copyright (c) 2014-2017, 2019, 2023 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2014-2017, 2019, 2023-2025 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # Based on the IBM machine model, returns a (hopefully) human understandable
 # string that identifies the processor.
@@ -64,6 +64,7 @@ case "${machine}" in
   8562) echo "${machine} = z15 T02 IBM z15 T02" ;;
   3931) echo "${machine} = z16 A01 IBM z16 A01" ;;
   3932) echo "${machine} = z16 A02 IBM z16 A02" ;;
+  9175) echo "${machine} = z17     IBM z17    " ;;
   *) echo "An unknown machine type was reported: ${machine}" >&2
      echo "Please file a bug report with this output:" >&2
      /bin/cat /proc/cpuinfo >&2

ctc_configure

@@ -44,6 +44,14 @@ debug_mesg () {
     esac
 }
 
+add_cio_channel() {
+	echo "$* # ${DATE}" >> /boot/zipl/active_devices.txt
+}
+
+remove_cio_channel() {
+	[ -w /boot/zipl/active_devices.txt ] && sed -i -e "/^${1}/d" /boot/zipl/active_devices.txt
+}
+
 usage(){
   echo "Usage: ${0} <read channel> <write channel> <online> [<protocol>]"
   echo "	read/write channel = x.y.ssss where"
@@ -112,3 +120,9 @@ RC=${?}
 if [ ${RC} -ne 0 ]; then
   exit ${RC}
 fi
+
+if [ ${ON_OFF} == 1 ]; then
+  add_cio_channel "${CTC_READ_CHAN},${CTC_WRITE_CHAN}"
+else remove_cio_channel "${CTC_READ_CHAN}"
+     remove_cio_channel "${CTC_WRITE_CHAN}"
+fi

dasd_configure.opensuse

@@ -43,6 +43,14 @@ debug_mesg () {
     esac
 }
 
+add_cio_channel() {
+	echo "$* # ${DATE}" >> /boot/zipl/active_devices.txt
+}
+
+remove_cio_channel() {
+	[ -w /boot/zipl/active_devices.txt ] && sed -i -e "/^${1}/d" /boot/zipl/active_devices.txt
+}
+
 usage(){
   echo "Usage: ${0} [-f -t <dasd_type> ] <ccwid> <online> [use_diag]"
   echo
@@ -157,4 +165,9 @@ elif [ ${ON_OFF} == 1 ]; then
     fi
 fi
 
+if [ ${ON_OFF} == 1 ]; then
+  add_cio_channel "${CCW_CHAN_ID}"
+else remove_cio_channel "${CCW_CHAN_ID}"
+fi
+
 exit ${exitcode}

dasd_configure.suse

@@ -43,6 +43,14 @@ debug_mesg () {
     esac
 }
 
+add_cio_channel() {
+	echo "$* # ${DATE}" >> /boot/zipl/active_devices.txt
+}
+
+remove_cio_channel() {
+	[ -w /boot/zipl/active_devices.txt ] && sed -i -e "/^${1}/d" /boot/zipl/active_devices.txt
+}
+
 usage(){
   echo "Usage: ${0} [-f -t <dasd_type> ] <ccwid> <online> [use_diag]"
   echo
@@ -157,4 +165,9 @@ elif [ ${ON_OFF} == 1 ]; then
     fi
 fi
 
+if [ ${ON_OFF} == 1 ]; then
+  add_cio_channel "${CCW_CHAN_ID}"
+else remove_cio_channel "${CCW_CHAN_ID}"
+fi
+
 exit ${exitcode}

pkey.conf

@@ -1,7 +1,10 @@
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018-2024 SUSE LINUX GmbH, Nuernberg, Germany.
 # All rights reserved.
 #
 
 # load pkey module at boot time
 pkey
+pkey_cca
+pkey_ep11
+pkey_pckmo

qeth_configure

@@ -48,6 +48,14 @@ debug_mesg () {
     esac
 }
 
+add_cio_channel() {
+	echo "$* # ${DATE}" >> /boot/zipl/active_devices.txt
+}
+
+remove_cio_channel() {
+	[ -w /boot/zipl/active_devices.txt ] && sed -i -e "/^${1}/d" /boot/zipl/active_devices.txt
+}
+
 usage(){
   echo "Usage: ${0} [options] <read chan> <write chan> <data chan> <online>"
   echo "      -i Configure IP takeover"
@@ -157,3 +165,10 @@ RC=${?}
 if [ ${RC} -ne 0 ]; then
   exit ${RC}
 fi
+
+if [ ${ON_OFF} == 1 ]; then
+  add_cio_channel "${QETH_READ_CHAN},${QETH_WRITE_CHAN},${QETH_DATA_CHAN}"
+else remove_cio_channel "${QETH_READ_CHAN}"
+     remove_cio_channel "${QETH_WRITE_CHAN}"
+     remove_cio_channel "${QETH_DATA_CHAN}"
+fi

read_values.c

@@ -37,9 +37,9 @@ enum datatypes {
 #define	WITHOUT_KEY	0
 #define	WITH_KEY	1
 
-static char *versionstring	= "Version 1.0.5 2024-06-20 14:30";
+static char *versionstring	= "Version 1.0.6 2025-05-07 08:30";
 
-static char *version	   	= "1.0.5";
+static char *version	   	= "1.0.6";
 
 void	*configuration_handle	= NULL;
 int	layers			= -1;
@@ -80,6 +80,8 @@ struct machinetype {
 	{ QC_TYPE_FAMILY_LINUXONE, "3931", "3931 = IBM LinuxONE Emperor 4" },
 	{ QC_TYPE_FAMILY_IBMZ,     "3932", "3932 = z16 A02 IBM z16 A02" },
 	{ QC_TYPE_FAMILY_LINUXONE, "3932", "3932 = IBM LinuxONE Rockhopper 4" },
+        { QC_TYPE_FAMILY_IBMZ,     "9175", "9175 = z17     IBM z17    " },
+        { QC_TYPE_FAMILY_LINUXONE, "9175", "9175 = IBM LinuxONE 5" },
 	};
 
 int	debug = 0;
@@ -281,7 +283,7 @@ return;
 
 int check_model (const char *cpu) {
 
-        #define     IBM_Models    6    /* Number of IBM models listed below   */
+        #define     IBM_Models    7    /* Number of IBM models listed below   */
         char *types[IBM_Models] = {
                "3906",
                "3907",
@@ -289,6 +291,7 @@ int check_model (const char *cpu) {
                "8562",
                "3931",
                "3932",
+               "9175",
        };
 
        int i;

s390-tools-2.34-Fix-Rust-compilation-errors.patch

@@ -1,51 +0,0 @@
-From 6a55d0c2e57952600164822dd100e8247b4b010f Mon Sep 17 00:00:00 2001
-From: Steffen Eiden <seiden@linux.ibm.com>
-Date: Fri, 23 Aug 2024 09:16:26 +0200
-Subject: [PATCH] rust/pv: Lower most lints to warn
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Lower the lint level to warn for the styling lints.
-This avoids compile issues during packaging for newer tooling with
-potential more lint findings.
-Still deny compiling if a public symbol has no documentation.
-
-Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/173
-Reviewed-by: Jan Höppner <hoeppner@linux.ibm.com>
-Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
----
- rust/pv/src/lib.rs      | 4 ++--
- rust/pv_core/src/lib.rs | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/rust/pv/src/lib.rs b/rust/pv/src/lib.rs
-index 9a647617..1084f8e8 100644
---- a/rust/pv/src/lib.rs
-+++ b/rust/pv/src/lib.rs
-@@ -2,8 +2,8 @@
- //
- // Copyright IBM Corp. 2023, 2024
- 
--#![deny(
--    missing_docs,
-+#![deny(missing_docs)]
-+#![warn(
-     missing_debug_implementations,
-     trivial_numeric_casts,
-     unstable_features,
-diff --git a/rust/pv_core/src/lib.rs b/rust/pv_core/src/lib.rs
-index 1356c1b7..b617b8f9 100644
---- a/rust/pv_core/src/lib.rs
-+++ b/rust/pv_core/src/lib.rs
-@@ -1,8 +1,8 @@
- // SPDX-License-Identifier: MIT
- //
- // Copyright IBM Corp. 2023, 2024
--#![deny(
--    missing_docs,
-+#![deny(missing_docs)]
-+#![warn(
-     missing_debug_implementations,
-     trivial_numeric_casts,
-     unstable_features,

s390-tools-2.34.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea4758c4e460d7f7e040e6aedf68b1be32d63fecb733358b08182f6b9b7440a2
-size 2114507

s390-tools.changes

@@ -1,3 +1,330 @@
+-------------------------------------------------------------------
+Mon Aug 11 06:47:00 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Amended the .spec file (bsc#1246792) 
+  * Changed '%{release}' to '%{rbrelease}' in "DISTRELEASE=" 
+    to remove embedded build counters from the binaries
+- Re-vendor-ed vendor.tar.zst
+
+-------------------------------------------------------------------
+Mon Jul 28 08:47:52 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Amended the .spec file for opticsmon.service (bsc#1246669)
+- Re-vendored vendor.tar.zst
+
+-------------------------------------------------------------------
+Mon Jun 30 09:17:50 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Upgrade s390-tools to version 2.38 (jsc#PED-10303)
+  * Add new tools
+    - udev: New rule to set newly hotplugged CPUs online
+    - zmemtopo: Display memory topology information
+    - zpwr: Display power readings of a partition and CPC
+  * Removed tools / features
+    - check_hostkeydoc: Remove installation target
+    - scsi_logging_level: Delete SCSI logging script (available in sg3_utils)
+    - zdump: Drop build_arch for s390 DASD dumps
+    - zdump: Drop non-extended multi-volume DASD dump support
+    - zdump: Drop support of 32-bit dump architecture
+    - zdump: Drop support of non-extended single volume DASD dumpers
+    - zdump: Drop support of obsolete dumps and dumpers
+  * Changes of existing tools / libraries
+    - Various man-pages fixes
+    - check_hostkeydoc: Add deprecation warning
+    - check_hostkeydoc: Move to scripts directory
+    - cpuplugd: Allow cpu hotplugging on systems without polarization
+    - dbginfo.sh: Add Ubuntu snap tool
+    - dbginfo.sh: Add missing config data and logs
+    - dbginfo.sh: Reworking the container section
+    - dbginfo.sh: Update for network commands
+    - dbginfo.sh: Updating info for disks and lvm
+    - libutil: Add machine type definition for machines 9175 and 9176
+    - lscpumf: Add support for IBM z17 counter sets
+    - lshwc: Add command line flag for run time
+    - lshwc: Add flags to display counter values in hex
+    - lshwc: Add output '--format' option
+    - lshwc: Add support for delta counter value display
+    - lspai: Add output '--format' option
+    - lsreipl: Add secure boot state to output
+    - lswhc: Add short names to lshwc output
+    - pv_tools: Add Bash and Zsh completions
+    - pvapconfig: Add '--unbind' option
+    - pvimg/boot: Print error messages from stage3a bootloader
+    - pvimg: Add support for CCK update
+    - pvsecret: Add support for CCK update
+    - pvsecret: Allow retrieving secrets by index & warn for duplicated entries
+    - pvsecret: Deny adding secrets with duplicated secret IDs
+    - zdev: Add support for virtio devices
+    - zipl: Enhance mirror support
+    - zipl: Implement '--dry-run' option for all dump jobs
+    - zipl_helper.device-mapper: Support mirrors over NVMe devices
+    - zkey/dracut: Add a dracut config file for zkey
+    - zkey/initramfs: Update initramfs hook to correct drivers and include zkey plugins
+    - zkey: Add support for converting a clear-key LUKS2 volume to use a secure key
+  * Bug Fixes
+    - chpstat: Add missing CMG 5 data fields
+    - chpstat: Fix DPU utilization calculation
+    - libutil/util_file: Handle over-read in util_file_read_fd()
+    - pvattest: Fix successful 'check' evaluation
+    - pvsecret: Fix some edge cases for plaintext keys
+    - zipl_helper.device-mapper: Fix imprecise is_device_mapper() predicate
+    - zkey: Fix EP11 secure key reencipher function
+    - zpcictl: Fix command line parsing for invalid options 
+  * Re-vendored vendor.tar.zst
+  * Amended the .spec file
+  * Removed obsolete patches
+    - s390-tools-01-Add-zpwr-tool.patch
+    - s390-tools-02-zpwr-Add-man-page-for-zpwr-tool.patch
+    - s390-tools-chpstat-Fix-DPU-utilization-calculation.patch
+    - s390-tools-chpstat-Add-missing-CMG-5-data-fields.patch
+
+-------------------------------------------------------------------
+Mon Jun 23 13:04:47 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Applied patches(bsc#1244473, bsc#1244469)
+  * s390-tools-chpstat-Add-missing-CMG-5-data-fields.patch
+  * s390-tools-chpstat-Fix-DPU-utilization-calculation.patch
+- Re-vendored vendor.tar.zst
+- Updated read_values.c, added IBM z17 in Secure Boot Support Models
+
+-------------------------------------------------------------------
+Fri May 23 17:19:07 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Revendored vendor.tar.zst (bsc#1242622 (CVE-2025-3416))
+- Updated 'cputype' and 'read_value.c'
+ * Added the new IBM z17 (9175) processor type
+
+-------------------------------------------------------------------
+Fri May  2 12:08:25 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Amended the .spec file
+- Removed unnecessary source file - 'cargo_config'
+- Updated the '_service' file
+- Changed the compression method from 'gz' to 'zst'
+- 'vendor.tar.gz' is now renamed to 'vendor.tar.zst'
+
+-------------------------------------------------------------------
+Mon Feb 24 06:51:08 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Applied additional patches (jsc#PED-10303 (IBM-1575))
+ * s390-tools-01-Add-zpwr-tool.patch
+ * s390-tools-02-zpwr-Add-man-page-for-zpwr-tool.patch
+
+-------------------------------------------------------------------
+Mon Feb 10 07:36:08 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Upgrade s390-tools to 2.37 (jsc#PED-9591, jsc#PED-10303, jesc#PED-11870 (jsc#IBM-1062)) 
+  * Changes of existing tools:
+    dbginfo.sh: Add details on CPU-measurement
+    dbginfo.sh: Add new crypto command
+    dbginfo.sh: Add overview commands and crypto update
+    dbginfo.sh: Adding kdump info
+    dbginfo.sh: Removing outdated email references
+    dbginfo.sh: Rework network section
+    dbginfo.sh: Update copyright 2nd year
+    pvimg: Add '--(enable|disable)-image-encryption' flags to 'pvimg create'
+    pvimg: Add '--cck ' command line option and make '--comm-key' an alias
+    pvimg: Add '--hdr-key' command line option to 'pvimg create'
+    pvimg: Rename '--key' into '--hdr-key' and use '--key' as an alias (for 'pvimg info')
+    pvsecret: Add support for retrievable secrets
+    ziorep_config: Add PCHID field to adapter report
+    ziorep_traffic: Add DEVBUSID column to traffic report
+    ziorep_utilization: Add --fcp-device parameter to print virtual adapter report
+    ziorep_utilization: Add PCHID column to physical adapter report
+    ziorep_utilization: Now prints only physical adapter report by default
+    ziorep_utilization: Swap Bus-ID and CHPID columns in virtual adapter report
+    zipl/boot: Increase section size for eckd_mv dumper
+    zkey: Add support for listing and importing protected virtualization secrets
+  * Bug Fixes:
+    chpstat: Fix invalid utilization data on older kernels
+    opticsmon: Fix runaway loop in on_link_change()
+    zipl: Update inline assembly for GCC 15
+    zipl_helper.device-mapper: Add missed step in logical device resolution
+- Revendored vendor.tar.gz
+- Removed obsolete patches:
+  * s390-tools-01-zipl_helper.device-mapper-add-missed-step-in-logical.patch
+  * s390-tools-02-zipl-src-fix-imprecise-check-that-file-is-on-specifi.patch
+  * s390-tools-General-update-01.patch
+  * s390-tools-General-update-02.patch
+  * s390-tools-General-update-03.patch
+  * s390-tools-General-update-04.patch
+  * s390-tools-General-update-05.patch
+  * s390-tools-General-update-06.patch
+  * s390-tools-General-update-07.patch
+  * s390-tools-General-update-08.patch
+  * s390-tools-General-update-09.patch
+  * s390-tools-General-update-10.patch
+  * s390-tools-General-update-11.patch
+  * s390-tools-General-update-12.patch
+  * s390-tools-Additional-update-01.patch
+  * s390-tools-Additional-update-02.patch
+  * s390-tools-pvimg-info-command-01.patch
+  * s390-tools-pvimg-info-command-02.patch
+  * s390-tools-pvimg-info-command-03.patch
+  * s390-tools-Support-unencrypted-SE-images-01.patch
+  * s390-tools-pvimg-info-command-04.patch
+  * s390-tools-pvimg-additional-01.patch
+  * s390-tools-01-zkey-Add-support-for-retrieving-a-list-of-ultravisor-secrets.patch
+  * s390-tools-02-zkey-Add-the--pvsecrets-list-command.patch
+  * s390-tools-03-zkey-Add-PVSECRETS-AES-key-type.patch
+  * s390-tools-04-zkey-Add-the-pvsecrets-import-command.patch
+  * s390-tools-05-zkey-Reject-key-generation-and-APQN-association-for-PVSECRET-AES-keys.patch
+  * s390-tools-06-zkey-Reject-re-enciphering-of-PVSECRET-AES-keys.patch
+  * s390-tools-07-zkey-Support-validation-of-key-of-type-PVSECRET-AES.patch
+  * s390-tools-08-rust-pvimg-Fix-flag-parsing-for-allowing-dump.patch
+  * s390-tools-09-rust-pvimg-Document-the-change-from--comm-key-to--cck.patch
+
+-------------------------------------------------------------------
+Mon Feb  3 07:51:27 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Applied more additional patches (jsc#PED-11870, jec#PED-11958)
+  * s390-tools-08-rust-pvimg-Fix-flag-parsing-for-allowing-dump.patch
+  * s390-tools-09-rust-pvimg-Document-the-change-from--comm-key-to--cck.patch
+
+-------------------------------------------------------------------
+Thu Jan 30 08:19:47 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Applied additional patches ( jsc#PED-9561 ( jsc#IBM-1447 ) )
+  * s390-tools-01-zkey-Add-support-for-retrieving-a-list-of-ultravisor-secrets.patch
+  * s390-tools-02-zkey-Add-the--pvsecrets-list-command.patch
+  * s390-tools-03-zkey-Add-PVSECRETS-AES-key-type.patch
+  * s390-tools-04-zkey-Add-the-pvsecrets-import-command.patch
+  * s390-tools-05-zkey-Reject-key-generation-and-APQN-association-for-PVSECRET-AES-keys.patch
+  * s390-tools-06-zkey-Reject-re-enciphering-of-PVSECRET-AES-keys.patch
+  * s390-tools-07-zkey-Support-validation-of-key-of-type-PVSECRET-AES.patch
+- Revendored vendor.tar.gz
+
+-------------------------------------------------------------------
+Thu Jan  9 07:05:53 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Applied backport patches from s390-tools 2.37 to 2.36  ( jsc#PED-11870 )
+    ( jsc#IBM-1447, jsc#IBM-1062 )
+  * s390-tools-General-update-01.patch
+  * s390-tools-General-update-02.patch
+  * s390-tools-General-update-03.patch
+  * s390-tools-General-update-04.patch
+  * s390-tools-General-update-05.patch
+  * s390-tools-General-update-06.patch
+  * s390-tools-General-update-07.patch
+  * s390-tools-General-update-08.patch
+  * s390-tools-General-update-09.patch
+  * s390-tools-General-update-10.patch
+  * s390-tools-General-update-11.patch
+  * s390-tools-General-update-12.patch
+  * s390-tools-Additional-update-01.patch
+  * s390-tools-Additional-update-02.patch
+    ( jsc#IBM-1570, jsc#IBM-1571 )
+  * s390-tools-Support-unencrypted-SE-images-01.patch
+    ( jsc#IBM-1572, jsc#IBM-1573 )
+  * s390-tools-pvimg-info-command-01.patch
+  * s390-tools-pvimg-info-command-02.patch
+  * s390-tools-pvimg-info-command-03.patch
+  * s390-tools-pvimg-info-command-04.patch
+    ( jsc#IBM-1576, jsc#IBM-1577 )
+  * s390-tools-pvimg-additional-01.patch
+- Renamed patches from - to
+  * s390-tools-01-opticsmon-Fix-runaway-loop-in-on_link_change.patch 
+      to
+      s390-tools-Additional-update-01.patch
+  * s390-tools-02-libzpci-opticsmon-Refactor-on_link_change-using-new.patch
+      to
+      s390-tools-Additional-update-02.patch
+  * s390-tools-03-rust-pvimg-Add-enable-disable-image-encryption-flags-to-pvimg-create.patch
+      to
+      s390-tools-Support-unencrypted-SE-images-01.patch
+- Revendored vendor.tar.gz
+
+-------------------------------------------------------------------
+Tue Jan  7 08:59:16 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Applied a patch for '--(enable|disable)-image-encryption' flags for 'pvimg create' (jsc#PED-11870) 
+  * s390-tools-03-rust-pvimg-Add-enable-disable-image-encryption-flags-to-pvimg-create.patch 
+
+-------------------------------------------------------------------
+Tue Dec 31 09:59:27 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Applied patches (jsc#PED-9591, jsc#PED-10303)
+  * s390-tools-01-opticsmon-Fix-runaway-loop-in-on_link_change.patch 
+  * s390-tools-02-libzpci-opticsmon-Refactor-on_link_change-using-new.patch 
+
+-------------------------------------------------------------------
+Mon Dec  9 09:49:52 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Upgrade s390-tools to version 2.36 (jsc#PED-10303, jsc#PED-9591)
+  * s390-tools: Define Rust MSRV as 1.75.0
+  * Add new tools / libraries:
+    - cpacfinfo: Tool to provide CPACF information
+    - opticsmon: Tools to monitor optical modules for directly attached PCI based NICs
+    - pvimg: Rust rewrite of genprotimg
+  * Changes of existing tools:
+    - chpstat: Add data bandwidth utilization column
+    - chpstat: Add support for full CMCB
+    - chpstat: Add support for new CMG types
+    - dbginfo.sh: add overview commands and crypto update
+    - hyptop: Support for structured output (json, json-seq, csv)
+    - lszfcp: Add missing fallback marker for non-good fc_host port_state
+    - lszfcp: Improve speed with many SCSI devices
+    - pvattest: Add attestation policy check command
+    - zipl: Add support of partitions of mirror md-devices
+  * Bug Fixes:
+    - lszcrypt: Fix wrong state showing up for removed AP queue within SE guest
+    - lszfcp: Show device names line for zfcp_units without SCSI device
+- Revendored vendor.tar.gz
+- Applied additional patch (bsc#1233889, bsc#1233079)
+  * s390-tools-02-zipl-src-fix-imprecise-check-that-file-is-on-specifi.patch
+
+-------------------------------------------------------------------
+Thu Dec  5 15:13:49 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Applied a patch (bsc#1233889)
+  * s390-tools-01-zipl_helper.device-mapper-add-missed-step-in-logical.patch
+- Amended the /usr/lib/modules-load.d/pkey.conf (bsc#1233233). Added
+  * pkey_cca
+  * pkey_ep11
+  * pkey_pckmo
+
+-------------------------------------------------------------------
+Tue Nov  5 07:39:58 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Amended the *_configure scripts to update again the SUSE's specific file
+  '/boot/zipl/active_devices.txt' (bsc#1232474, bsc#1216257)
+  * ctc_configure
+  * dasd_configure
+  * qeth_configure
+  * zfcp_host_configure 
+
+-------------------------------------------------------------------
+Tue Oct  8 10:35:04 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+* Upgrade s390-tools to version 2.35 (jsc#PED-9591, jsc#PED-10303)
+* Changes of existing tools:
+  - cpacfstats: Add support for FULL XTS (MSA 10) and HMAC (MSA 11) PAI counter
+  - cpuplugd: Make cpuplugd compatible with hiperdispatch
+  - dbginfo.sh: Add network sockstat info
+  - pvapconfig: s390x exclusive build
+  - zdev: Add option to select IPL device
+  - zdump/dfo_s390: Support s390 DFO for vr-kernel dumps
+  - zipl: Add support of mirror devices
+* Bug Fixes:
+  - (genprotimg|zipl)/boot: discard .note.package ELF section to save memory
+  - netboot/mk-s390image: Fix size when argument is a symlink
+  - ziorep_config: Fix warning message when multipath device is not there.
+  - zipl: Fix problems when target parameters are specified by user
+  - zipl: Fix segfault when creating device-based dumps with '--dry-run'
+* Removed obsolete patches
+  - s390-tools-2.34-Fix-Rust-compilation-errors.patch
+  - s390-tools-01-zipl-src-add-basic-support-for-multiple-target-base-disks.patch
+  - s390-tools-02-zipl-src-add-basic-support-for-multiple-target-base-disks.patch
+* Revendored vendor.tar.gz
+
+-------------------------------------------------------------------
+Mon Sep 16 12:49:55 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+* Applied patches (bsc#1230345)
+  - zipl/src: add basic support for multiple target base disks
+  - s390-tools-01-zipl-src-add-basic-support-for-multiple-target-base-disks.patch
+  - s390-tools-02-zipl-src-add-basic-support-for-multiple-target-base-disks.patch
+
 -------------------------------------------------------------------
 Mon Aug 26 09:17:17 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
 

s390-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package s390-tools
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,8 @@
 # needssslcertforbuild
 
 
-#Compat macro for new _fillupdir macro introduced in Nov 2017
+%define rbrelease $(echo %{release} | sed 's/\.[0-9][0-9]*$//' )
+
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
@@ -33,7 +34,7 @@
 %endif
 
 Name:           s390-tools
-Version:        2.34.0
+Version:        2.38.0
 Release:        0
 Summary:        S/390 tools like zipl and dasdfmt for s390x (plus selected tools for x86_64)
 License:        MIT
@@ -127,8 +128,7 @@ Source97:       qeth_configure.8
 Source98:       zfcp_disk_configure.8
 Source99:       zfcp_host_configure.8
 ###
-Source200:      cargo_config
+Source200:      vendor.tar.zst
-Source201:      vendor.tar.gz
 ###
 
 ###
@@ -153,20 +153,21 @@ Patch910:       s390-tools-sles15sp1-11-zdev-Do-not-call-zipl-on-initrd-update.p
 Patch911:       s390-tools-sles15sp5-remove-no-pie-link-arguments.patch
 Patch912:       s390-tools-ALP-zdev-live.patch
 Patch913:       s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch
-Patch914:       s390-tools-slfo-01-parse-ipl-device-for-activation.patch
+###
-Patch915:       s390-tools-2.34-Fix-Rust-compilation-errors.patch
+Patch990:       s390-tools-slfo-01-parse-ipl-device-for-activation.patch
 ###
 
 BuildRequires:  curl-devel
 BuildRequires:  dracut
 BuildRequires:  fuse3-devel
-BuildRequires:  gcc13
+BuildRequires:  gcc
-BuildRequires:  gcc13-c++
+BuildRequires:  gcc-c++
 BuildRequires:  gettext-tools
 BuildRequires:  glib2-devel
 BuildRequires:  glibc-devel-static
 BuildRequires:  libcryptsetup-devel > 2.0.3
 BuildRequires:  libjson-c-devel
+BuildRequires:  libnl3-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  mdevctl
 BuildRequires:  ncurses-devel
@@ -225,12 +226,13 @@ zipl     - boot loader and dump DASD initializer
 zgetdump - tool to get linux system dumps from DASD
 
  - x86_64
-genprotimg - create a protected virtualization image
+pvimg      - create a protected virtualization image (genprotimg)
 pvattest   - create, perform, and verify protected virtualization attestation measurements
 pvsecret   - manage secrets for IBM Secure Execution guests.
-pvapconfig - used to automatically set up the AP configuration within an IBM Secure Execution guest.
 
-Note: Auxiliary data package - s390-tools-genprotimg-data
+Warning: There is an auxiliary data package - s390-tools-genprotimg-data.
+         To install s390-tools properly, please use:
+         'sudo zypper install s390-tools s390-tools-genprotimg-data'
 
 %package -n osasnmpd
 Summary:        OSA-Express SNMP subagent
@@ -349,23 +351,20 @@ BuildArch:      noarch
 Requires(pre):  filesystem
 
 %description genprotimg-data
-The genprotimg allows preparing and analyzing boot images
+The pvimg (genprotimg) allows preparing and analyzing boot images
 in the realm of IBM Secure Execution on a trusted environment,
 such as the laptop of an admin by limiting the build targets
 depending on the defined or detected host architecture.
-This package provides auxiliary data used by genprotimg.
+This package provides auxiliary data used by pvimg(genprotimg).
 
 ### *** s390x ************************************************************************* ###
 %ifarch s390x
 
 %prep
-%autosetup -p1
+%autosetup -p1 -a200
 
 cp -vi %{SOURCE22} CAUTION
 
-install -D -m 0644 %{SOURCE200} .cargo/config
-tar -xzf %{SOURCE201}
-
 %build
 
 # The "DISTRELEASE=%%{release}" needs to be on both the make and make install
@@ -377,27 +376,25 @@ export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
 
 %make_build \
      ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \
-     DISTRELEASE=%{release} \
+     DISTRELEASE=%{rbrelease} \
      UDEVRUNDIR=/run/udev \
      HAVE_CARGO=1 \
      HAVE_DRACUT=1 \
-     CC=gcc-13 \
+     HAVE_LIBNL3=1
-     CXX=g++-13
 ###     all
-gcc-13 -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc
+gcc -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc
 
 %install
 mkdir -p %{buildroot}/boot/zipl
 mkdir -p %{buildroot}%{_sysconfdir}/zkey/repository
 %make_install \
      ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \
-     DISTRELEASE=%{release} \
+     DISTRELEASE=%{rbrelease} \
      SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
      UDEVRUNDIR=/run/udev \
      HAVE_CARGO=1 \
      HAVE_DRACUT=1 \
-     CC=gcc-13 \
+     HAVE_LIBNL3=1
-     CXX=g++-13
 ###     all
 
 # The make install command puts things in /etc/sysconfig and not the
@@ -480,6 +477,7 @@ fi
 (cd %{buildroot}%{_sbindir}; ln -s service rcmon_fsstatd)
 (cd %{buildroot}%{_sbindir}; ln -s service rcmon_procd)
 (cd %{buildroot}%{_sbindir}; ln -s service rcvirtsetup)
+(cd %{buildroot}%{_sbindir}; ln -s service rcopticsmon)
 
 if [ ! -d %{_bindir} ]; then
     rm -f %{_bindir}
@@ -494,6 +492,8 @@ install -m644 -t %{buildroot}/%{_mandir}/man8 %{SOURCE25}
 # align with the openSUSE "usrmerge" project
 %if 0%{?suse_version} >= 1550
 mv -vi %{buildroot}/sbin/* %{buildroot}%{_mysbindir}/
+%else
+cp -r %{buildroot}/sbin/opticsmon %{buildroot}/usr/sbin/
 %endif
 
 ### Obsolete scripts and man pages to be removed once changes in other tools are made
@@ -554,6 +554,7 @@ getent group cpacfstats >/dev/null 2>&1 || groupadd -r cpacfstats
 %service_add_pre hsnc.service
 %service_add_pre mon_fsstatd.service
 %service_add_pre mon_procd.service
+%service_add_pre opticsmon.service
 %service_add_pre virtsetup.service
 %service_add_pre vmlogrdr.service
 %service_add_pre xpram.service
@@ -582,6 +583,7 @@ fi
 %service_add_post hsnc.service
 %service_add_post mon_fsstatd.service
 %service_add_post mon_procd.service
+%service_add_post opticsmon.service
 %service_add_post virtsetup.service
 %service_add_post vmlogrdr.service
 %service_add_post xpram.service
@@ -594,6 +596,7 @@ fi
 %{fillup_only -n mon_fsstatd}
 %{fillup_only -n mon_procd}
 %{fillup_only -n mon_statd}
+%{fillup_only -n opticsmon}
 %{fillup_only -n virtsetup}
 %{fillup_only -n xpram}
 
@@ -625,6 +628,7 @@ ldconfig
 %service_del_preun hsnc.service
 %service_del_preun mon_fsstatd.service
 %service_del_preun mon_procd.service
+%service_del_preun opticsmon.service
 %service_del_preun virtsetup.service
 %service_del_preun vmlogrdr.service
 %service_del_preun xpram.service
@@ -639,6 +643,7 @@ ldconfig
 %service_del_postun hsnc.service
 %service_del_postun mon_fsstatd.service
 %service_del_postun mon_procd.service
+%service_del_postun opticsmon.service
 %service_del_postun virtsetup.service
 %service_del_postun vmlogrdr.service
 %service_del_postun xpram.service
@@ -719,11 +724,11 @@ done
 %dir %{_prefix}/lib/systemd/scripts
 %dir %{_datadir}/s390-tools
 %dir %{_datadir}/s390-tools/netboot
-%dir %{_datadir}/s390-tools/genprotimg
 %dir %{_prefix}/lib/dracut/modules.d/95zdev
 %dir %{_prefix}/lib/dracut/modules.d/95zdev-kdump
 %dir %{_prefix}/lib/dracut/modules.d/96zdev-live
 %dir %{_prefix}/lib/dracut/modules.d/99ngdump
+%{_prefix}/lib/dracut/dracut.conf.d/99-pkey.conf
 %dir /boot/zipl
 %dir %{_libdir}/zkey
 %{_libdir}/zkey/zkey-ekmfweb.so
@@ -742,8 +747,8 @@ done
 %dir /etc/mdevctl.d/scripts.d/callouts/
 ###
 %exclude /lib/s390-tools/stage3.bin
-%exclude %{_datadir}/s390-tools/genprotimg/stage3a.bin
+%exclude %{_datadir}/s390-tools/pvimg/stage3a.bin
-%exclude %{_datadir}/s390-tools/genprotimg/stage3b_reloc.bin
+%exclude %{_datadir}/s390-tools/pvimg/stage3b_reloc.bin
 ###
 
 %files -n osasnmpd -f %{_builddir}/%{name}.osasnmp
@@ -794,8 +799,9 @@ done
 ### genprotimg
 %files genprotimg-data
 /lib/s390-tools/stage3.bin
-%{_datadir}/s390-tools/genprotimg/stage3a.bin
+%dir %{_datadir}/s390-tools/pvimg
-%{_datadir}/s390-tools/genprotimg/stage3b_reloc.bin
+%{_datadir}/s390-tools/pvimg/stage3a.bin
+%{_datadir}/s390-tools/pvimg/stage3b_reloc.bin
 
 ### _endif
 ### *** !s390x ************************************************************************* ###
@@ -803,23 +809,22 @@ done
 %else
 
 %prep
-%autosetup -p1
+%autosetup -p1 -a200
-
-install -D -m 0644 %{SOURCE200} .cargo/config
-tar -xzf %{SOURCE201}
 
 %build
 export OPT_FLAGS="%{optflags}"
 export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
+
 %make_build \
-     DISTRELEASE=%{release} \
+     DISTRELEASE=%{rbrelease} \
      UDEVRUNDIR=/run/udev \
      HAVE_CARGO=1 \
      HAVE_DRACUT=1
 
 %install
+
 %make_install \
-     DISTRELEASE=%{release} \
+     DISTRELEASE=%{rbrelease} \
      SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
      UDEVRUNDIR=/run/udev \
      HAVE_CARGO=1 \
@@ -828,8 +833,15 @@ export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
 %files
 %{_prefix}/bin/*
 %dir %{_datadir}/s390-tools
-%dir %{_datadir}/s390-tools/genprotimg
+%dir %{_datadir}/s390-tools/pvimg
-%{_datadir}/s390-tools/genprotimg/check_hostkeydoc
+%{_datadir}/bash-completion/completions/genprotimg.bash
+%{_datadir}/bash-completion/completions/pvattest.bash
+%{_datadir}/bash-completion/completions/pvimg.bash
+%{_datadir}/bash-completion/completions/pvsecret.bash
+%{_datadir}/zsh/site-functions/_genprotimg
+%{_datadir}/zsh/site-functions/_pvattest
+%{_datadir}/zsh/site-functions/_pvimg
+%{_datadir}/zsh/site-functions/_pvsecret
 %{_mandir}/man1/*
 
 %endif

vendor.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14f5559f64640cf3876d41f0168294afefd444ee28a9a0a5175ca61787a481e9
-size 43464873

vendor.tar.zst

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6ec5fd57a5a8e11373c0071fb82e6e0eeb929041e4424eea3191ef8944f3a29
+size 18290635

zfcp_host_configure

@@ -38,6 +38,14 @@ debug_mesg () {
     esac
 }
 
+add_cio_channel() {
+	echo "$* # ${DATE}" >> /boot/zipl/active_devices.txt
+}
+
+remove_cio_channel() {
+	[ -w /boot/zipl/active_devices.txt ] && sed -i -e "/^${1}/d" /boot/zipl/active_devices.txt
+}
+
 usage(){
   echo "Usage: ${0}  <ccwid> <online>"
   echo "	ccwid = x.y.ssss where"
@@ -80,3 +88,8 @@ RC=${?}
 if [ ${RC} -ne 0 ]; then
   exit ${RC}
 fi
+
+if [ ${ON_OFF} == 1 ]; then
+  add_cio_channel "${CCW_CHAN_ID}"
+else remove_cio_channel "${CCW_CHAN_ID}"
+fi