From 5bd2fbbdf65c050354fcb1916017ef79394f891c Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Mon, 5 May 2025 15:02:01 +1200 Subject: [PATCH] Rebase to upstream crash-9.0.0 Release: crash-9.0.0-1 Resolves: RHEL-76107 Signed-off-by: Tao Liu --- .gitignore | 2 ++ ...h-8.0.6_build.patch => crash-9.0.0_build.patch | 8 ++++---- crash.spec | 15 +++++++++------ lzo_snappy_zstd.patch | 8 ++++---- sources | 4 ++-- 5 files changed, 21 insertions(+), 16 deletions(-) rename crash-8.0.6_build.patch => crash-9.0.0_build.patch (91%) diff --git a/.gitignore b/.gitignore index 941a2a6..3ba8b9b 100644 --- a/.gitignore +++ b/.gitignore @@ -51,5 +51,7 @@ crash-5.0.6.tar.gz /crash-8.0.4.tar.gz /crash-8.0.5.tar.gz /crash-8.0.6.tar.gz +/crash-9.0.0.tar.gz /gdb-7.6.tar.gz /gdb-10.2.tar.gz +/gdb-16.2.tar.gz diff --git a/crash-8.0.6_build.patch b/crash-9.0.0_build.patch similarity index 91% rename from crash-8.0.6_build.patch rename to crash-9.0.0_build.patch index 4f01e74..37b08cf 100644 --- a/crash-8.0.6_build.patch +++ b/crash-9.0.0_build.patch @@ -1,5 +1,5 @@ ---- crash-8.0.6/Makefile.orig -+++ crash-8.0.6/Makefile +--- crash-9.0.0/Makefile.orig ++++ crash-9.0.0/Makefile @@ -204,7 +204,7 @@ GDB_FLAGS= # TARGET_CFLAGS will be configured automatically by configure TARGET_CFLAGS= @@ -18,8 +18,8 @@ @echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj @rm -f ${PROGRAM} @if [ ! -f ${GDB}/config.status ]; then \ ---- crash-8.0.6/configure.c.orig -+++ crash-8.0.6/configure.c +--- crash-9.0.0/configure.c.orig ++++ crash-9.0.0/configure.c @@ -810,7 +810,8 @@ build_configure(struct supported_gdb_version *sp) fprintf(fp2, "%s\n", sp->GDB); sprintf(target_data.gdb_version, "%s", &sp->GDB[4]); diff --git a/crash.spec b/crash.spec index 30223c5..4c68ce1 100644 --- a/crash.spec +++ b/crash.spec @@ -3,22 +3,22 @@ # Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles Name: crash -Version: 8.0.6 +Version: 9.0.0 Release: 1%{?dist} License: GPL-3.0-only Source0: https://github.com/crash-utility/crash/archive/crash-%{version}.tar.gz -Source1: http://ftp.gnu.org/gnu/gdb/gdb-10.2.tar.gz +Source1: http://ftp.gnu.org/gnu/gdb/gdb-16.2.tar.gz URL: https://crash-utility.github.io ExclusiveOS: Linux ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le BuildRequires: ncurses-devel zlib-devel lzo-devel snappy-devel bison wget patch texinfo libzstd-devel -BuildRequires: gcc gcc-c++ -BuildRequires: make +BuildRequires: make gcc gcc-c++ +BuildRequires: gmp-devel mpfr-devel Requires: binutils Provides: bundled(libiberty) -Provides: bundled(gdb) = 10.2 +Provides: bundled(gdb) = 16.2 Patch0: lzo_snappy_zstd.patch -Patch1: crash-8.0.6_build.patch +Patch1: crash-9.0.0_build.patch %description The core analysis suite is a self-contained tool that can be used to @@ -65,6 +65,9 @@ cp -p defs.h %{buildroot}%{_includedir}/crash %{_includedir}/* %changelog +* Mon May 5 2025 Tao Liu - 9.0.0-1 +- Rebase to upstream crash 9.0.0 + * Tue Nov 19 2024 Tao Liu - 8.0.6-1 - Rebase to upstream crash 8.0.6 diff --git a/lzo_snappy_zstd.patch b/lzo_snappy_zstd.patch index 36922d8..cc7a334 100644 --- a/lzo_snappy_zstd.patch +++ b/lzo_snappy_zstd.patch @@ -1,5 +1,5 @@ ---- crash-8.0.6/Makefile.orig -+++ crash-8.0.6/Makefile +--- crash-9.0.0/Makefile.orig ++++ crash-9.0.0/Makefile @@ -256,7 +256,7 @@ all: make_configure gdb_merge: force @if [ ! -f ${GDB}/README ]; then \ @@ -9,8 +9,8 @@ @echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj @rm -f ${PROGRAM} @if [ ! -f ${GDB}/config.status ]; then \ ---- crash-8.0.6/diskdump.c.orig -+++ crash-8.0.6/diskdump.c +--- crash-9.0.0/diskdump.c.orig ++++ crash-9.0.0/diskdump.c @@ -23,6 +23,9 @@ * GNU General Public License for more details. */ diff --git a/sources b/sources index f9c8c6a..611bbc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdb-10.2.tar.gz) = aa89caf47c1c84366020377d47e7c51ddbc48e5b7686f244e38797c8eb88411cf57fcdc37eb669961efb41ceeac4181747f429625fd1acce7712cb9a1fea9c41 -SHA512 (crash-8.0.6.tar.gz) = a569c0e9cb9dddbdd4bf54b6157b33eb2ed0fef143fd8128e660cf3a7156a23c25d17736fb0711781457d92a1ec8c153a6c020d1847adc57ecc0b5b085ddbfdc +SHA512 (crash-9.0.0.tar.gz) = 1093bc1f980e6df24e9d254ee86c4164a2283f82d3dff5a8feecb08caccec1639896712bb73e781fed7e21ab7f81e344a4d76566bfbe6615f3484816e3163306 +SHA512 (gdb-16.2.tar.gz) = c44a6cf6cdd6e92f1f4dda7d888ce3e7fdde65ca8736092e2b0a4c369ea09b499824a1d078f668f276fa6d00d311e9ec485231cb7b841479a4fabbfd65778084