rpms/s390utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import s390utils-2.19.0-1.el9.1

Browse Source
This commit is contained in:
CentOS Sources 2022-01-11 13:46:03 -05:00 committed by Stepan Oksanichenko
parent 851e0abbb0
commit 7fb3f540ad
6 changed files with 74 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/s390-tools-2.17.0.tar.gz
SOURCES/s390-tools-2.19.0.tar.gz

2
.s390utils.metadata
View File

@ -1 +1 @@
8030b5902653ba5910b9d0e8e8930b60af19765f SOURCES/s390-tools-2.17.0.tar.gz
5b4eeed3868297ca65b7d5720484786172dc11d1 SOURCES/s390-tools-2.19.0.tar.gz

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

@ -8,8 +8,8 @@ diff -up s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort s390-tools-2.9.0
-libs = $(rootdir)/libutil/libutil.a
+libs = $(rootdir)/libutil/libutil.a -lrpmio -lrpm
objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
install.o zipl.o $(rootdir)/zipl/boot/data.o
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 $(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

110
SOURCES/s390utils-2.17.0-rhel.patch
View File

@ -1,110 +0,0 @@
From 66cca7c6765be5a5207315a8df6de599bba306cb Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar@linux.ibm.com>
Date: Wed, 21 Jul 2021 17:22:29 +0200
Subject: [PATCH 1/2] hsavmcore: Avoid recompilation of overlay during install
step
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
overlay.o was being recompiled during the install step because
it depended on the target check-dep-fuse which is phony and,
therefore, always outdated. The solution is to create an empty file
for the target check-dep-fuse after its successful completion. This
prevents make from rebuilding overlay.o during installation.
Closes: https://github.com/ibm-s390-linux/s390-tools/pull/118
Fixes: 5a7d2a58c8b3 ("hsavmcore: Fix fuse dependency checking")
Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Suggested-by: Ingo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
(cherry picked from commit 80cb1553a30d7804d1521691e9b178c7613eaa8c)
---
hsavmcore/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hsavmcore/Makefile b/hsavmcore/Makefile
index 7c1d4fd..82e6abc 100644
--- a/hsavmcore/Makefile
+++ b/hsavmcore/Makefile
@@ -69,6 +69,7 @@ check-dep-fuse:
"fuse.h", \
"fuse-devel or libfuse-dev", \
"HAVE_FUSE=0")
+ touch check-dep-fuse
install: all
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 hsavmcore \
@@ -81,6 +82,6 @@ install: all
endif # HAVE_FUSE
clean:
- rm -f hsavmcore $(objects)
+ rm -f hsavmcore $(objects) check-dep-fuse
.PHONY: all install clean
--
2.31.1
From f6f24d191ed29a1c6d49c1339e09f21fe7d24c19 Mon Sep 17 00:00:00 2001
From: Ingo Franzki <ifranzki@linux.ibm.com>
Date: Mon, 12 Jul 2021 13:20:52 +0200
Subject: [PATCH 2/2] libkmipclient: Fix parsing of hex values for XML and JSON
encoding (#1870700)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
KMIP values of type BYTE-STRING are represented as hex values when XML
or JSON encoding is used. Do not drop any leading zero bytes, if the
value has them.
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
(cherry picked from commit d2a4a8b0f3f24a19bd0363b5a4f264b50ac4a885)
---
libkmipclient/utils.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/libkmipclient/utils.c b/libkmipclient/utils.c
index 4a88d0c..dbd03fd 100644
--- a/libkmipclient/utils.c
+++ b/libkmipclient/utils.c
@@ -125,7 +125,7 @@ int kmip_parse_hex(const char *str, bool has_prefix, unsigned char **val,
{
unsigned char *buf;
BIGNUM *b = NULL;
- int len, rc;
+ int len;
if (str == NULL)
return -EINVAL;
@@ -133,18 +133,20 @@ int kmip_parse_hex(const char *str, bool has_prefix, unsigned char **val,
if (has_prefix && strncmp(str, "0x", 2) != 0)
return -EBADMSG;
- rc = BN_hex2bn(&b, str + (has_prefix ? 2 : 0));
- if (rc <= 0)
+ len = BN_hex2bn(&b, str + (has_prefix ? 2 : 0));
+ if (len <= 0)
+ return -EBADMSG;
+ if (len < (int)strlen(str) - (has_prefix ? 2 : 0))
return -EBADMSG;
- len = BN_num_bytes(b);
+ len = len / 2 + (len % 2 > 0 ? 1 : 0);
buf = calloc(1, len);
if (buf == NULL) {
BN_free(b);
return -ENOMEM;
}
- if (BN_bn2bin(b, buf) != len) {
+ if (BN_bn2binpad(b, buf, len) != len) {
BN_free(b);
free(buf);
return -EIO;
--
2.31.1

0
SOURCES/s390utils-2.19.0-rhel.patch Normal file
View File

76
SPECS/s390utils.spec
View File

@ -5,8 +5,8 @@
Name: s390utils
Summary: Utilities and daemons for IBM z Systems
Version: 2.17.0
Release: 4%{?dist}
Version: 2.19.0
Release: 1%{?dist}.1
Epoch: 2
License: MIT
ExclusiveArch: s390 s390x
@ -34,7 +34,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch
Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch
# backported fixes
Patch100: s390utils-2.17.0-rhel.patch
Patch100: s390utils-2.19.0-rhel.patch
Requires: s390utils-core = %{epoch}:%{version}-%{release}
Requires: s390utils-base = %{epoch}:%{version}-%{release}
@ -70,9 +70,11 @@ find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
%build
make \
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" \
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
HAVE_DRACUT=1 \
NO_PIE_LDFLAGS="" \
BINDIR=/usr/sbin \
UDEVRUNDIR=/run/udev \
DISTRELEASE=%{release} \
V=1
@ -83,6 +85,7 @@ make install \
DESTDIR=%{buildroot} \
BINDIR=/usr/sbin \
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
UDEVRUNDIR=/run/udev \
DISTRELEASE=%{release} \
V=1
@ -146,6 +149,10 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules
# zipl.conf to be ghosted
touch %{buildroot}%{_sysconfdir}/zipl.conf
# fixups
# https://bugzilla.redhat.com/show_bug.cgi?id=2024102
chmod 755 %{buildroot}/lib/s390-tools/cpictl
%files
%doc README.md
@ -185,11 +192,14 @@ This package provides minimal set of tools needed to system to boot.
%{_sbindir}/dasdinfo
%{_sbindir}/fdasd
%{_sbindir}/lszdev
%{_sbindir}/vmcp
%{_sbindir}/zipl
%{_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
@ -204,7 +214,9 @@ This package provides minimal set of tools needed to system to boot.
%{_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
@ -224,6 +236,7 @@ This package provides minimal set of tools needed to system to boot.
%{_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/10-zfcpdump.install
@ -435,12 +448,12 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_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
@ -513,7 +526,6 @@ 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*
@ -727,6 +739,7 @@ fi
Summary: CMS file system based on FUSE
BuildRequires: fuse-devel
Requires: fuse
Requires: glibc-gconv-extra
Obsoletes: %{name}-cmsfs < 2:2.7.0-3
%description cmsfs-fuse
@ -806,6 +819,42 @@ 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
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
%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
#
# *********************** devel package ***********************
#
@ -826,6 +875,21 @@ User-space development files for the s390/s390x architecture.
%changelog
* Tue Nov 23 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-1.1
- rebuild
- Related: #2022347
* 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
* 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
* 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