- rebased to 2.36.0 (RHEL-50026)

- cpacfinfo: new tool to provide CPACF information (RHEL-50020)
- chpstat: Additional Channel Measurements (RHEL-50023)
- zPCI: Optics Monitoring for PF Access Mode (RHEL-50024)
- KVM: Support extended attestation for Secure Execution (RHEL-50009)
- KVM: genprotimg: validate if SE image can run on particular host(s) (RHEL-50008)
- Vertical CPU Polarization Support Stage 2 (RHEL-64705)
- KVM: Support unencrypted SE images by exposing resp. SE header flag (RHEL-70853)
- KVM: Rewrite genprotimg in Rust (RHEL-72023)
- Provide genprotimg / pvimg info command to display encrypted & unencrypted SE image information (RHEL-71819)
- KVM: Support retrievable secrets in Secure Execution guests (RHEL-50019)
- zkey key support for dm-crypt with XTS keys (RHEL-50010)
- Resolves: RHEL-50026 RHEL-50020 RHEL-50023 RHEL-50024 RHEL-50009 RHEL-50008 RHEL-64705 RHEL-70853 RHEL-72023 RHEL-71819 RHEL-50019 RHEL-50010
This commit is contained in:
Dan Horák 2025-01-14 14:39:38 +01:00
parent 944eb481a9
commit bde35a63e4
4 changed files with 9777 additions and 7 deletions

9730
s390utils-2.36.0-rhel.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,7 @@
Name: s390utils Name: s390utils
Summary: Utilities and daemons for IBM z Systems Summary: Utilities and daemons for IBM z Systems
Version: 2.35.0 Version: 2.36.0
Release: 1%{?dist} Release: 1%{?dist}
Epoch: 2 Epoch: 2
License: MIT License: MIT
@ -47,7 +47,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch
Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch
# upstream fixes/updates # upstream fixes/updates
#Patch100: s390utils-%%{version}-rhel.patch Patch100: s390utils-%{version}-rhel.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86} ExcludeArch: %{ix86}
@ -121,7 +121,7 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
%patch -P 1 -p1 -b .blscfg-rpm-nvr-sort %patch -P 1 -p1 -b .blscfg-rpm-nvr-sort
# upstream fixes/updates # upstream fixes/updates
#%%patch -P 100 -p1 %patch -P 100 -p1
# remove --strip from install # remove --strip from install
find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g' find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
@ -141,6 +141,7 @@ rm -rf ./rust/Cargo.lock
%build %build
make \ make \
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \ CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
RUSTFLAGS="%{build_rustflags}" \
%if %{without rust} %if %{without rust}
HAVE_CARGO=0 \ HAVE_CARGO=0 \
%endif %endif
@ -156,6 +157,7 @@ make \
%install %install
make install \ make install \
RUSTFLAGS="%{build_rustflags}" \
%if %{without rust} %if %{without rust}
HAVE_CARGO=0 \ HAVE_CARGO=0 \
%endif %endif
@ -253,25 +255,33 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf
%{_bindir}/pvattest %{_bindir}/pvattest
%{_bindir}/pvextract-hdr %{_bindir}/pvextract-hdr
%if %{with rust} %if %{with rust}
%{_bindir}/pvimg
%{_bindir}/pvsecret %{_bindir}/pvsecret
%endif %endif
%{_mandir}/man1/genprotimg.1* %{_mandir}/man1/genprotimg.1*
%{_mandir}/man1/pvattest.1* %{_mandir}/man1/pvattest.1*
%{_mandir}/man1/pvattest-check.1*
%{_mandir}/man1/pvattest-create.1* %{_mandir}/man1/pvattest-create.1*
%{_mandir}/man1/pvattest-perform.1* %{_mandir}/man1/pvattest-perform.1*
%{_mandir}/man1/pvattest-verify.1* %{_mandir}/man1/pvattest-verify.1*
%if %{with rust} %if %{with rust}
%{_mandir}/man1/pvimg.1*
%{_mandir}/man1/pvimg-create.1*
%{_mandir}/man1/pvimg-info.1*
%{_mandir}/man1/pvimg-test.1*
%{_mandir}/man1/pvsecret-add.1* %{_mandir}/man1/pvsecret-add.1*
%{_mandir}/man1/pvsecret-create-association.1* %{_mandir}/man1/pvsecret-create-association.1*
%{_mandir}/man1/pvsecret-create-meta.1* %{_mandir}/man1/pvsecret-create-meta.1*
%{_mandir}/man1/pvsecret-create-retrievable.1*
%{_mandir}/man1/pvsecret-create.1* %{_mandir}/man1/pvsecret-create.1*
%{_mandir}/man1/pvsecret-list.1* %{_mandir}/man1/pvsecret-list.1*
%{_mandir}/man1/pvsecret-lock.1* %{_mandir}/man1/pvsecret-lock.1*
%{_mandir}/man1/pvsecret-retrieve.1*
%{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret-verify.1*
%{_mandir}/man1/pvsecret.1* %{_mandir}/man1/pvsecret.1*
%endif %endif
%dir %{_datadir}/s390-tools %dir %{_datadir}/s390-tools
%{_datadir}/s390-tools/genprotimg/ %{_datadir}/s390-tools/pvimg/
# #
# enf of multi-arch section # enf of multi-arch section
@ -397,6 +407,7 @@ BuildRequires: cryptsetup-devel >= 2.0.3
BuildRequires: json-c-devel BuildRequires: json-c-devel
BuildRequires: rpm-devel BuildRequires: rpm-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: libnl3-devel
%description base %description base
@ -571,6 +582,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_sbindir}/lstape %{_sbindir}/lstape
%{_sbindir}/lszcrypt %{_sbindir}/lszcrypt
%{_sbindir}/lszfcp %{_sbindir}/lszfcp
%{_sbindir}/opticsmon
%{_sbindir}/pai %{_sbindir}/pai
%{_sbindir}/qetharp %{_sbindir}/qetharp
%{_sbindir}/qethconf %{_sbindir}/qethconf
@ -591,8 +603,11 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_sbindir}/zipl-switch-to-blscfg %{_sbindir}/zipl-switch-to-blscfg
%{_sbindir}/znetconf %{_sbindir}/znetconf
%{_sbindir}/zpcictl %{_sbindir}/zpcictl
%{_bindir}/cpacfinfo
%{_bindir}/dump2tar %{_bindir}/dump2tar
%{_bindir}/genprotimg %{_bindir}/genprotimg
%{_bindir}/pvapconfig
%{_bindir}/pvimg
%{_bindir}/mk-s390image %{_bindir}/mk-s390image
%if %{with rust} %if %{with rust}
%{_bindir}/pvapconfig %{_bindir}/pvapconfig
@ -605,6 +620,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_bindir}/zkey %{_bindir}/zkey
%{_bindir}/zkey-cryptsetup %{_bindir}/zkey-cryptsetup
%{_unitdir}/dumpconf.service %{_unitdir}/dumpconf.service
%{_unitdir}/opticsmon.service
%ghost %config(noreplace) %{_sysconfdir}/zipl.conf %ghost %config(noreplace) %{_sysconfdir}/zipl.conf
%config(noreplace) %{_sysconfdir}/sysconfig/dumpconf %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
%{_sysconfdir}/mdevctl.d/* %{_sysconfdir}/mdevctl.d/*
@ -624,22 +640,30 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%dir %{_libdir}/zkey %dir %{_libdir}/zkey
%{_libdir}/zkey/zkey-ekmfweb.so %{_libdir}/zkey/zkey-ekmfweb.so
%{_libdir}/zkey/zkey-kmip.so %{_libdir}/zkey/zkey-kmip.so
%{_mandir}/man1/cpacfinfo.1*
%{_mandir}/man1/dump2tar.1* %{_mandir}/man1/dump2tar.1*
%{_mandir}/man1/genprotimg.1* %{_mandir}/man1/genprotimg.1*
%if %{with rust} %if %{with rust}
%{_mandir}/man1/pvapconfig.1* %{_mandir}/man1/pvapconfig.1*
%endif %endif
%{_mandir}/man1/pvattest.1* %{_mandir}/man1/pvattest.1*
%{_mandir}/man1/pvattest-check.1*
%{_mandir}/man1/pvattest-create.1* %{_mandir}/man1/pvattest-create.1*
%{_mandir}/man1/pvattest-perform.1* %{_mandir}/man1/pvattest-perform.1*
%{_mandir}/man1/pvattest-verify.1* %{_mandir}/man1/pvattest-verify.1*
%if %{with rust} %if %{with rust}
%{_mandir}/man1/pvimg.1*
%{_mandir}/man1/pvimg-create.1*
%{_mandir}/man1/pvimg-info.1*
%{_mandir}/man1/pvimg-test.1*
%{_mandir}/man1/pvsecret-add.1* %{_mandir}/man1/pvsecret-add.1*
%{_mandir}/man1/pvsecret-create-association.1* %{_mandir}/man1/pvsecret-create-association.1*
%{_mandir}/man1/pvsecret-create-meta.1* %{_mandir}/man1/pvsecret-create-meta.1*
%{_mandir}/man1/pvsecret-create-retrievable.1*
%{_mandir}/man1/pvsecret-create.1* %{_mandir}/man1/pvsecret-create.1*
%{_mandir}/man1/pvsecret-list.1* %{_mandir}/man1/pvsecret-list.1*
%{_mandir}/man1/pvsecret-lock.1* %{_mandir}/man1/pvsecret-lock.1*
%{_mandir}/man1/pvsecret-retrieve.1*
%{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret-verify.1*
%{_mandir}/man1/pvsecret.1* %{_mandir}/man1/pvsecret.1*
%endif %endif
@ -677,6 +701,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_mandir}/man8/lstape.8* %{_mandir}/man8/lstape.8*
%{_mandir}/man8/lszcrypt.8* %{_mandir}/man8/lszcrypt.8*
%{_mandir}/man8/lszfcp.8* %{_mandir}/man8/lszfcp.8*
%{_mandir}/man8/opticsmon.8*
%{_mandir}/man8/pai.8* %{_mandir}/man8/pai.8*
%{_mandir}/man8/qetharp.8* %{_mandir}/man8/qetharp.8*
%{_mandir}/man8/qethconf.8* %{_mandir}/man8/qethconf.8*
@ -715,7 +740,7 @@ BuildArch: noarch
%files se-data %files se-data
%dir %{_datadir}/s390-tools %dir %{_datadir}/s390-tools
%{_datadir}/s390-tools/genprotimg/ %{_datadir}/s390-tools/pvimg/
# #
# *********************** s390-tools osasnmpd package *********************** # *********************** s390-tools osasnmpd package ***********************
@ -1060,6 +1085,21 @@ User-space development files for the s390/s390x architecture.
%changelog %changelog
* Fri Jan 17 2025 Dan Horák <dhorak@redhat.com> - 2:2.36.0-1
- rebased to 2.36.0 (RHEL-50026)
- cpacfinfo: new tool to provide CPACF information (RHEL-50020)
- chpstat: Additional Channel Measurements (RHEL-50023)
- zPCI: Optics Monitoring for PF Access Mode (RHEL-50024)
- KVM: Support extended attestation for Secure Execution (RHEL-50009)
- KVM: genprotimg: validate if SE image can run on particular host(s) (RHEL-50008)
- Vertical CPU Polarization Support Stage 2 (RHEL-64705)
- KVM: Support unencrypted SE images by exposing resp. SE header flag (RHEL-70853)
- KVM: Rewrite genprotimg in Rust (RHEL-72023)
- Provide genprotimg / pvimg info command to display encrypted & unencrypted SE image information (RHEL-71819)
- KVM: Support retrievable secrets in Secure Execution guests (RHEL-50019)
- zkey key support for dm-crypt with XTS keys (RHEL-50010)
- Resolves: RHEL-50026 RHEL-50020 RHEL-50023 RHEL-50024 RHEL-50009 RHEL-50008 RHEL-64705 RHEL-70853 RHEL-72023 RHEL-71819 RHEL-50019 RHEL-50010
* Tue Oct 08 2024 Dan Horák <dhorak@redhat.com> - 2:2.35.0-1 * Tue Oct 08 2024 Dan Horák <dhorak@redhat.com> - 2:2.35.0-1
- rebased to 2.35.0 (RHEL-50026) - rebased to 2.35.0 (RHEL-50026)
- cpacfstats: support MSA 10 and MSA 11 (RHEL-50030) - cpacfstats: support MSA 10 and MSA 11 (RHEL-50030)

View File

@ -1,2 +1,2 @@
SHA512 (s390-tools-2.35.0.tar.gz) = 1ee6e7dc5a0c504bb23bde00e5e6a2ed333e7712677056075caf68a02eb222cd9c00d16fcf17e0a7c9f89609901d343b55953b0036c0d2cab35830ea8eb53fea SHA512 (s390-tools-2.36.0.tar.gz) = 5704dcbfc88972ff74b5d81acf549e719b90f2ce60b66ca6935c16c0b266ca6728adca72133aa51e1a5acfbabfd6f121b7f9b5023be498c5a203217adc4f5c46
SHA512 (s390-tools-2.35.0-rust-vendor.tar.xz) = 116adeac121c56d7d5bc37b3a7972a78e1ce86fd53f919d293d4bfe92999449ce6f30a592fdb3f4d48fda64817c9b19587a038bf832c7b745a715b9b469e1ee4 SHA512 (s390-tools-2.36.0-rust-vendor.tar.xz) = 2e4f53b64e71307e79a3a433c7bd2a6304b0c4e6e34cb84c57e459e86ec25c14b64eab870f0081f2f31d5b8003b071e8f45cf639111a1e759f0dfa070a96d765