- 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)
- Resolves: #2110310 #2044198 #2044202 #2110298 #2126617 #2127435
This commit is contained in:
Dan Horák 2022-11-24 11:54:28 +01:00
parent 1985de51da
commit c5faed242e
4 changed files with 1678 additions and 38 deletions

View File

@ -1,32 +0,0 @@
From 2844d07e4bba2301fef66f56574c92054bac7cac Mon Sep 17 00:00:00 2001
From: Steffen Eiden <seiden@linux.ibm.com>
Date: Mon, 25 Jul 2022 12:57:53 +0200
Subject: [PATCH] zipl: Add missing check for a nullpointer.
Fixes a bug that leads to a segmentation fault when no parmline is
provided.
Fixes: 11b401b5 ("zipl: move and make check for maximum command line length dynamic")
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
---
zipl/src/job.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zipl/src/job.c b/zipl/src/job.c
index ffdc297..b5bf5b2 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -790,7 +790,7 @@ check_common_ipl_data(struct job_common_ipl_data *common, const char *section,
if (!max_parm_size)
max_parm_size = LEGACY_MAXIMUM_PARMLINE_SIZE;
- len = strlen(common->parmline);
+ len = common->parmline ? strlen(common->parmline) : 0;
if (len > max_parm_size) {
error_text("The length of the parameters line "
"(%d bytes) exceeds the allowed maximum "
--
2.37.1

1665
s390utils-2.24.0-rhel.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -9,8 +9,8 @@
Name: s390utils Name: s390utils
Summary: Utilities and daemons for IBM z Systems Summary: Utilities and daemons for IBM z Systems
Version: 2.22.0 Version: 2.24.0
Release: 2%{?dist} Release: 1%{?dist}
Epoch: 2 Epoch: 2
License: MIT License: MIT
ExclusiveArch: s390 s390x ExclusiveArch: s390 s390x
@ -84,7 +84,6 @@ make \
%endif %endif
NO_PIE_LDFLAGS="" \ NO_PIE_LDFLAGS="" \
BINDIR=/usr/sbin \ BINDIR=/usr/sbin \
UDEVRUNDIR=/run/udev \
DISTRELEASE=%{release} \ DISTRELEASE=%{release} \
V=1 V=1
@ -98,7 +97,6 @@ make install \
DESTDIR=%{buildroot} \ DESTDIR=%{buildroot} \
BINDIR=/usr/sbin \ BINDIR=/usr/sbin \
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \ SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
UDEVRUNDIR=/run/udev \
DISTRELEASE=%{release} \ DISTRELEASE=%{release} \
V=1 V=1
@ -277,7 +275,6 @@ BuildRequires: json-c-devel
BuildRequires: rpm-devel BuildRequires: rpm-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: liblockfile-devel
%description base %description base
@ -816,6 +813,7 @@ Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
Requires(pre): shadow-utils Requires(pre): shadow-utils
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-devel
%description cpacfstatsd %description cpacfstatsd
The cpacfstats tools provide a client/server application set to monitor The cpacfstats tools provide a client/server application set to monitor
@ -903,6 +901,15 @@ User-space development files for the s390/s390x architecture.
%changelog %changelog
* 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)
- Resolves: #2110310 #2044198 #2044202 #2110298 #2126617 #2127435
* Thu Aug 04 2022 Dan Horák <dhorak@redhat.com> - 2:2.22.0-2 * Thu Aug 04 2022 Dan Horák <dhorak@redhat.com> - 2:2.22.0-2
- zipl: Add missing check for a nullpointer (#2113884) - zipl: Add missing check for a nullpointer (#2113884)
- Resolves: #2113884 - Resolves: #2113884

View File

@ -1 +1 @@
SHA512 (s390-tools-2.22.0.tar.gz) = ac613cddd6d85191f874d8d9eb014b9edc00868f7432a7ac057db0f7011d3ab3371b58a3881d78726e17c8e416d486e6fffb64264d5500abcaabcd56d9f181f6 SHA512 (s390-tools-2.24.0.tar.gz) = 5c681a031c2bab0ab167623ad08da67bfd236e4892f8a5de813ebfbbc1c60a842f0954bcbca6d2f6ab125ee089b2b5dcbfbb24152bcdde3401810232e21460f4