From 88ebe411483e0fae57104ac66e256cd0e918574e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 26 Apr 2022 14:22:18 +0200 Subject: [PATCH] - rebased to 2.21.0 (#2044205) - cpictl: Suppress messages for unwritable sysfs files (#1985745) - KVM: Secure Execution guest dump encryption with customer keys (#2044204) - zcrypt DD: Exploitation Support of new IBM Z Crypto Hardware (#2044206) - Add new CPU-MF Counters for new IBM Z Hardware (#2047722) - Long Kernel Commmand Line for s390x (#2060826) - zcryptctl support for control domains (#2076920) - Resolves: #2044205 #1985745 #2044204 #2044206 #2047722 #2060826 #2076920 --- ...-rhel.patch => s390utils-2.21.0-rhel.patch | 0 s390utils.spec | 52 ++++++++++++++----- sources | 2 +- 3 files changed, 40 insertions(+), 14 deletions(-) rename s390utils-2.19.0-rhel.patch => s390utils-2.21.0-rhel.patch (100%) diff --git a/s390utils-2.19.0-rhel.patch b/s390utils-2.21.0-rhel.patch similarity index 100% rename from s390utils-2.19.0-rhel.patch rename to s390utils-2.21.0-rhel.patch diff --git a/s390utils.spec b/s390utils.spec index 3ac4191..3946175 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -3,10 +3,14 @@ %global signzipl 1 %endif +%if 0%{?fedora} +%global with_pandoc 1 +%endif + Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.19.0 -Release: 2%{?dist} +Version: 2.21.0 +Release: 1%{?dist} Epoch: 2 License: MIT ExclusiveArch: s390 s390x @@ -34,7 +38,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch # backported fixes -Patch100: s390utils-2.19.0-rhel.patch +Patch100: s390utils-%{version}-rhel.patch Requires: s390utils-core = %{epoch}:%{version}-%{release} Requires: s390utils-base = %{epoch}:%{version}-%{release} @@ -64,6 +68,9 @@ be used together with the zSeries (s390) Linux kernel and device drivers. %patch100 -p1 +# 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' @@ -72,6 +79,9 @@ find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g' make \ CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \ HAVE_DRACUT=1 \ +%if 0%{?with_pandoc} + ENABLE_DOC=1 \ +%endif NO_PIE_LDFLAGS="" \ BINDIR=/usr/sbin \ UDEVRUNDIR=/run/udev \ @@ -82,6 +92,9 @@ make \ %install make install \ HAVE_DRACUT=1 \ +%if 0%{?with_pandoc} + ENABLE_DOC=1 \ +%endif DESTDIR=%{buildroot} \ BINDIR=/usr/sbin \ SYSTEMDSYSTEMUNITDIR=%{_unitdir} \ @@ -149,10 +162,6 @@ 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 @@ -737,8 +746,8 @@ fi # %package cmsfs-fuse Summary: CMS file system based on FUSE -BuildRequires: fuse-devel -Requires: fuse +BuildRequires: fuse3-devel +Requires: fuse3 Requires: glibc-gconv-extra Obsoletes: %{name}-cmsfs < 2:2.7.0-3 @@ -756,9 +765,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. @@ -772,8 +781,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 @@ -827,6 +836,9 @@ Summary: Use multipath information for re-IPL path failover BuildRequires: make BuildRequires: bash BuildRequires: coreutils +%if 0%{?with_pandoc} +BuildRequires: pandoc +%endif BuildRequires: gawk BuildRequires: gzip BuildRequires: sed @@ -845,6 +857,9 @@ reconfigures the FCP re-IPL settings to use an operational path. %files chreipl-fcp-mpath %doc chreipl-fcp-mpath/README.md +%if 0%{?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 @@ -854,6 +869,7 @@ reconfigures the FCP re-IPL settings to use an operational path. %{_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 *********************** @@ -875,6 +891,16 @@ User-space development files for the s390/s390x architecture. %changelog +* Tue Apr 26 2022 Dan Horák - 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) +- zcrypt DD: Exploitation Support of new IBM Z Crypto Hardware (#2044206) +- Add new CPU-MF Counters for new IBM Z Hardware (#2047722) +- Long Kernel Commmand Line for s390x (#2060826) +- zcryptctl support for control domains (#2076920) +- Resolves: #2044205 #1985745 #2044204 #2044206 #2047722 #2060826 #2076920 + * Tue Dec 14 2021 Dan Horák - 2:2.19.0-2 - update ccw udev rules for synthetic events (#2027357) - Resolves: #2027357 diff --git a/sources b/sources index 9d62e20..f3ddb38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (s390-tools-2.19.0.tar.gz) = 16c67d74e657e3c7653c7618bfcd80625991f6cc748d8c5863a891ce6148397439e2fb245d424c470d929be57baf99433f733df12db9c6eb080e746ef5ac8079 +SHA512 (s390-tools-2.21.0.tar.gz) = 3f37e2c58cc2b7cdb4c7e51b0344e190cd5c6551ee310c6602238e2eeba0a29c6b95a3b20a582e6b4c4654108f9426ebc6b56c8a2f923a2539830b3e5341b5ca