From ad9e1ad7a00beb32c07d1188ad2fd77bf1d88334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 2 Jan 2024 14:26:47 +0000 Subject: [PATCH] - rebased to 2.30.0 (rhbz#2252519) --- libxml2-parser.patch | 12 ------------ s390utils-2.28.0-fedora.patch | 0 s390utils-2.30.0-fedora.patch | 33 +++++++++++++++++++++++++++++++++ s390utils.spec | 29 ++++++++++++++++------------- snmp-semicolon.patch | 12 ------------ sources | 4 ++-- 6 files changed, 51 insertions(+), 39 deletions(-) delete mode 100644 libxml2-parser.patch delete mode 100644 s390utils-2.28.0-fedora.patch create mode 100644 s390utils-2.30.0-fedora.patch delete mode 100644 snmp-semicolon.patch diff --git a/libxml2-parser.patch b/libxml2-parser.patch deleted file mode 100644 index 920d86d..0000000 --- a/libxml2-parser.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libkmipclient/kmip.h b/libkmipclient/kmip.h -index e918577..3344cb0 100644 ---- a/libkmipclient/kmip.h -+++ b/libkmipclient/kmip.h -@@ -16,6 +16,7 @@ - #include - - #include -+#include - #include - #include - diff --git a/s390utils-2.28.0-fedora.patch b/s390utils-2.28.0-fedora.patch deleted file mode 100644 index e69de29..0000000 diff --git a/s390utils-2.30.0-fedora.patch b/s390utils-2.30.0-fedora.patch new file mode 100644 index 0000000..a4bb576 --- /dev/null +++ b/s390utils-2.30.0-fedora.patch @@ -0,0 +1,33 @@ +From 6274294bc5cca34d626125072eb5befdd80d381f Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Tue, 12 Dec 2023 19:44:05 -0500 +Subject: [PATCH] libkmipclient: Fix build with libxml2-2.12.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0 + +"Several cyclic dependencies in public header files were fixed. As a +result, certain headers won't include other headers as before." + +Closes: https://github.com/ibm-s390-linux/s390-tools/pull/160 +Signed-off-by: Yaakov Selkowitz +Reviewed-by: Ingo Franzki +Signed-off-by: Jan Höppner +--- + libkmipclient/kmip.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libkmipclient/kmip.h b/libkmipclient/kmip.h +index e91857761..3344cb016 100644 +--- a/libkmipclient/kmip.h ++++ b/libkmipclient/kmip.h +@@ -16,6 +16,7 @@ + #include + + #include ++#include + #include + #include + diff --git a/s390utils.spec b/s390utils.spec index 9111266..66d1b54 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -15,17 +15,17 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.29.0 -Release: 6%{?dist} +Version: 2.30.0 +Release: 1%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later URL: https://github.com/ibm-s390-linux/s390-tools Source0: https://github.com/ibm-s390-linux/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz # To create the vendor tarball: -# tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust/pvsecret ; \ +# tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust ; \ # rm -f Cargo.lock && cargo vendor && \ -# tar Jvcf ../../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd +# tar Jvcf ../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd Source1: s390-tools-%{version}-rust-vendor.tar.xz Source5: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcpconf.sh Source7: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcp.udev @@ -47,14 +47,9 @@ Source25: 91-zipl.install # change the defaults to match Fedora environment Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch -# https://github.com/ibm-s390-linux/s390-tools/pull/155 -Patch2: snmp-semicolon.patch -# fix build with libxml2-2.12.0 -# https://github.com/ibm-s390-linux/s390-tools/pull/160 -Patch3: libxml2-parser.patch # upstream fixes/updates -#Patch100: s390utils-%%{version}-fedora.patch +Patch100: s390utils-%{version}-fedora.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -92,17 +87,20 @@ BuildRequires: crate(clap_derive) BuildRequires: crate(colorchoice) BuildRequires: crate(curl) BuildRequires: crate(is-terminal) +BuildRequires: crate(lazy_static) BuildRequires: crate(libc) BuildRequires: crate(log) +BuildRequires: crate(mockito) BuildRequires: crate(openssl) BuildRequires: crate(openssl-probe) BuildRequires: crate(serde) BuildRequires: crate(serde_derive) +BuildRequires: crate(serde_test) BuildRequires: crate(serde_yaml) BuildRequires: crate(strsim) BuildRequires: crate(terminal_size) BuildRequires: crate(thiserror) -BuildRequires: crate(zerocopy) = 0.6.5 +BuildRequires: crate(zerocopy) = 0.6.6 BuildRequires: rust-packaging %endif %endif @@ -126,7 +124,7 @@ popd %else %cargo_prep %endif -rm -rf ./rust/pvsecret/Cargo.lock +rm ./rust/Cargo.lock %endif %build @@ -547,8 +545,9 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm %{_sbindir}/lscss %{_sbindir}/lsdasd %{_sbindir}/lshwc -%{_sbindir}/lsqeth %{_sbindir}/lsluns +%{_sbindir}/lsqeth +%{_sbindir}/lspai %{_sbindir}/lsreipl %{_sbindir}/lsscm %{_sbindir}/lsshut @@ -646,6 +645,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm %{_mandir}/man8/lsdasd.8* %{_mandir}/man8/lshwc.8* %{_mandir}/man8/lsluns.8* +%{_mandir}/man8/lspai.8* %{_mandir}/man8/lsqeth.8* %{_mandir}/man8/lsreipl.8* %{_mandir}/man8/lsscm.8* @@ -1026,6 +1026,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Tue Jan 02 2024 Dan Horák - 2:2.30.0-1 +- rebased to 2.30.0 (rhbz#2252519) + * Fri Dec 01 2023 Fabio Valentini - 2:2.29.0-6 - Rebuild for openssl crate >= v0.10.60 (RUSTSEC-2023-0044, RUSTSEC-2023-0072) diff --git a/snmp-semicolon.patch b/snmp-semicolon.patch deleted file mode 100644 index 131d2a0..0000000 --- a/snmp-semicolon.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruNp a/osasnmpd/ibmOSAMib.h b/osasnmpd/ibmOSAMib.h ---- a/osasnmpd/ibmOSAMib.h 2023-08-30 20:13:41.231150334 +0200 -+++ b/osasnmpd/ibmOSAMib.h 2023-08-30 20:13:27.414030798 +0200 -@@ -16,7 +16,7 @@ - - /* we may use header_generic and header_simple_table from the util_funcs module */ - --config_require(util_funcs) -+config_require(util_funcs); - - - /* function prototypes */ diff --git a/sources b/sources index cb9b8cc..8c0f1fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (s390-tools-2.29.0.tar.gz) = 3eeaab0e0c6559b9fb0b4c7cca49358a7cc7fe0cb11684d2d761fe105cc2bfd791d33ecc2070e3dfd877039b68e868699cd3cea318e64aee1cc0f348c7b41617 -SHA512 (s390-tools-2.29.0-rust-vendor.tar.xz) = 7ee717c5848e7b59c3e11ef6b461122e5f1195e67d11e378352b297926b498180222bfc23719d952fb11677a3fd440d299e0035ca6ab0c6d784573e9a5698594 +SHA512 (s390-tools-2.30.0.tar.gz) = 414ce95a0952b7b48aea94661e7a95a26d426ce27136800a91bd1cced46998741229c5d058a9c55484491c771a112e4c1401b569c67a5d52d7ba8d33b1a0cba1 +SHA512 (s390-tools-2.30.0-rust-vendor.tar.xz) = a20a8da5e134883309a88ee1e796dcdd60a191917307fc3d129e1d3a6363117fc6f95c2319cd4b451ea7d3fbd599227a3ae53a8871076613877e15e0a4eda5dd