- rebased to 2.30.0 (rhbz#2252519)

This commit is contained in:
Dan Horák 2024-01-02 14:26:47 +00:00
parent 0f03699129
commit ad9e1ad7a0
6 changed files with 51 additions and 39 deletions

View File

@ -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 <openssl/ssl.h>
#include <json-c/json.h>
+#include <libxml/parser.h>
#include <libxml/tree.h>
#include <curl/curl.h>

View File

@ -0,0 +1,33 @@
From 6274294bc5cca34d626125072eb5befdd80d381f Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
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 <yselkowi@redhat.com>
Reviewed-by: Ingo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
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 <openssl/ssl.h>
#include <json-c/json.h>
+#include <libxml/parser.h>
#include <libxml/tree.h>
#include <curl/curl.h>

View File

@ -15,17 +15,17 @@
Name: s390utils Name: s390utils
Summary: Utilities and daemons for IBM z Systems Summary: Utilities and daemons for IBM z Systems
Version: 2.29.0 Version: 2.30.0
Release: 6%{?dist} Release: 1%{?dist}
Epoch: 2 Epoch: 2
# MIT covers nearly all the files, except init files # MIT covers nearly all the files, except init files
License: MIT AND LGPL-2.1-or-later License: MIT AND LGPL-2.1-or-later
URL: https://github.com/ibm-s390-linux/s390-tools 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 Source0: https://github.com/ibm-s390-linux/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
# To create the vendor tarball: # 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 && \ # 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 Source1: s390-tools-%{version}-rust-vendor.tar.xz
Source5: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcpconf.sh 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 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 # change the defaults to match Fedora environment
Patch0: s390-tools-zipl-invert-script-options.patch 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
# 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 # upstream fixes/updates
#Patch100: s390utils-%%{version}-fedora.patch Patch100: s390utils-%{version}-fedora.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86} ExcludeArch: %{ix86}
@ -92,17 +87,20 @@ BuildRequires: crate(clap_derive)
BuildRequires: crate(colorchoice) BuildRequires: crate(colorchoice)
BuildRequires: crate(curl) BuildRequires: crate(curl)
BuildRequires: crate(is-terminal) BuildRequires: crate(is-terminal)
BuildRequires: crate(lazy_static)
BuildRequires: crate(libc) BuildRequires: crate(libc)
BuildRequires: crate(log) BuildRequires: crate(log)
BuildRequires: crate(mockito)
BuildRequires: crate(openssl) BuildRequires: crate(openssl)
BuildRequires: crate(openssl-probe) BuildRequires: crate(openssl-probe)
BuildRequires: crate(serde) BuildRequires: crate(serde)
BuildRequires: crate(serde_derive) BuildRequires: crate(serde_derive)
BuildRequires: crate(serde_test)
BuildRequires: crate(serde_yaml) BuildRequires: crate(serde_yaml)
BuildRequires: crate(strsim) BuildRequires: crate(strsim)
BuildRequires: crate(terminal_size) BuildRequires: crate(terminal_size)
BuildRequires: crate(thiserror) BuildRequires: crate(thiserror)
BuildRequires: crate(zerocopy) = 0.6.5 BuildRequires: crate(zerocopy) = 0.6.6
BuildRequires: rust-packaging BuildRequires: rust-packaging
%endif %endif
%endif %endif
@ -126,7 +124,7 @@ popd
%else %else
%cargo_prep %cargo_prep
%endif %endif
rm -rf ./rust/pvsecret/Cargo.lock rm ./rust/Cargo.lock
%endif %endif
%build %build
@ -547,8 +545,9 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_sbindir}/lscss %{_sbindir}/lscss
%{_sbindir}/lsdasd %{_sbindir}/lsdasd
%{_sbindir}/lshwc %{_sbindir}/lshwc
%{_sbindir}/lsqeth
%{_sbindir}/lsluns %{_sbindir}/lsluns
%{_sbindir}/lsqeth
%{_sbindir}/lspai
%{_sbindir}/lsreipl %{_sbindir}/lsreipl
%{_sbindir}/lsscm %{_sbindir}/lsscm
%{_sbindir}/lsshut %{_sbindir}/lsshut
@ -646,6 +645,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_mandir}/man8/lsdasd.8* %{_mandir}/man8/lsdasd.8*
%{_mandir}/man8/lshwc.8* %{_mandir}/man8/lshwc.8*
%{_mandir}/man8/lsluns.8* %{_mandir}/man8/lsluns.8*
%{_mandir}/man8/lspai.8*
%{_mandir}/man8/lsqeth.8* %{_mandir}/man8/lsqeth.8*
%{_mandir}/man8/lsreipl.8* %{_mandir}/man8/lsreipl.8*
%{_mandir}/man8/lsscm.8* %{_mandir}/man8/lsscm.8*
@ -1026,6 +1026,9 @@ User-space development files for the s390/s390x architecture.
%changelog %changelog
* Tue Jan 02 2024 Dan Horák <dan[at]danny.cz> - 2:2.30.0-1
- rebased to 2.30.0 (rhbz#2252519)
* Fri Dec 01 2023 Fabio Valentini <decathorpe@gmail.com> - 2:2.29.0-6 * Fri Dec 01 2023 Fabio Valentini <decathorpe@gmail.com> - 2:2.29.0-6
- Rebuild for openssl crate >= v0.10.60 (RUSTSEC-2023-0044, RUSTSEC-2023-0072) - Rebuild for openssl crate >= v0.10.60 (RUSTSEC-2023-0044, RUSTSEC-2023-0072)

View File

@ -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 */

View File

@ -1,2 +1,2 @@
SHA512 (s390-tools-2.29.0.tar.gz) = 3eeaab0e0c6559b9fb0b4c7cca49358a7cc7fe0cb11684d2d761fe105cc2bfd791d33ecc2070e3dfd877039b68e868699cd3cea318e64aee1cc0f348c7b41617 SHA512 (s390-tools-2.30.0.tar.gz) = 414ce95a0952b7b48aea94661e7a95a26d426ce27136800a91bd1cced46998741229c5d058a9c55484491c771a112e4c1401b569c67a5d52d7ba8d33b1a0cba1
SHA512 (s390-tools-2.29.0-rust-vendor.tar.xz) = 7ee717c5848e7b59c3e11ef6b461122e5f1195e67d11e378352b297926b498180222bfc23719d952fb11677a3fd440d299e0035ca6ab0c6d784573e9a5698594 SHA512 (s390-tools-2.30.0-rust-vendor.tar.xz) = a20a8da5e134883309a88ee1e796dcdd60a191917307fc3d129e1d3a6363117fc6f95c2319cd4b451ea7d3fbd599227a3ae53a8871076613877e15e0a4eda5dd