From 9e7ce82a6e8bab97b8c966feb0abbc19604484f5 Mon Sep 17 00:00:00 2001
From: Lianbo Jiang <lijiang@redhat.com>
Date: Thu, 16 Nov 2023 15:50:32 +0800
Subject: [PATCH] Rebase to upstream crash-8.0.4

Release: crash-8.0.4-1

Resolves: RHEL-9009

Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
---
 .gitignore                                         |  1 +
 crash-8.0.3_build.patch => crash-8.0.4_build.patch |  8 ++++----
 crash.spec                                         | 11 +++++++----
 lzo_snappy_zstd.patch                              |  8 ++++----
 sources                                            |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)
 rename crash-8.0.3_build.patch => crash-8.0.4_build.patch (91%)

diff --git a/.gitignore b/.gitignore
index 4d89d06..fec1d7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,5 +48,6 @@ crash-5.0.6.tar.gz
 /crash-8.0.1.tar.gz
 /crash-8.0.2.tar.gz
 /crash-8.0.3.tar.gz
+/crash-8.0.4.tar.gz
 /gdb-7.6.tar.gz
 /gdb-10.2.tar.gz
diff --git a/crash-8.0.3_build.patch b/crash-8.0.4_build.patch
similarity index 91%
rename from crash-8.0.3_build.patch
rename to crash-8.0.4_build.patch
index bb09e2b..3db6f47 100644
--- a/crash-8.0.3_build.patch
+++ b/crash-8.0.4_build.patch
@@ -1,5 +1,5 @@
---- crash-8.0.3/Makefile.orig
-+++ crash-8.0.3/Makefile
+--- crash-8.0.4/Makefile.orig
++++ crash-8.0.4/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.3/configure.c.orig
-+++ crash-8.0.3/configure.c
+--- crash-8.0.4/configure.c.orig
++++ crash-8.0.4/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 2217bc9..375ddc2 100644
--- a/crash.spec
+++ b/crash.spec
@@ -3,7 +3,7 @@
 #
 Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles
 Name: crash
-Version: 8.0.3
+Version: 8.0.4
 Release: 1%{?dist}
 License: GPLv3
 Source0: https://github.com/crash-utility/crash/archive/crash-%{version}.tar.gz
@@ -18,7 +18,7 @@ Requires: binutils
 Provides: bundled(libiberty)
 Provides: bundled(gdb) = 10.2
 Patch0: lzo_snappy_zstd.patch
-Patch1: crash-8.0.3_build.patch
+Patch1: crash-8.0.4_build.patch
 
 %description
 The core analysis suite is a self-contained tool that can be used to
@@ -38,8 +38,8 @@ offered by Mission Critical Linux, or the LKCD kernel patch.
 
 %prep
 %setup -n %{name}-%{version} -q
-%patch0 -p1 -b lzo_snappy_zstd.patch
-%patch1 -p1 -b crash-8.0.3_build.patch
+%patch -P 0 -p1 -b lzo_snappy_zstd.patch
+%patch -P 1 -p1 -b crash-8.0.4_build.patch
 
 
 %build
@@ -66,6 +66,9 @@ cp -p defs.h %{buildroot}%{_includedir}/crash
 %{_includedir}/*
 
 %changelog
+* Thu Nov 16 2023 Lianbo Jiang <lijiang@redhat.com> - 8.0.4-1
+- Rebase to upstream crash 8.0.4
+
 * Thu May 04 2023 Lianbo Jiang <lijiang@redhat.com> - 8.0.3-1
 - Rebase to upstream crash 8.0.3
 
diff --git a/lzo_snappy_zstd.patch b/lzo_snappy_zstd.patch
index 8d50246..67e4ad3 100644
--- a/lzo_snappy_zstd.patch
+++ b/lzo_snappy_zstd.patch
@@ -1,5 +1,5 @@
---- crash-8.0.3/Makefile.orig
-+++ crash-8.0.3/Makefile
+--- crash-8.0.4/Makefile.orig
++++ crash-8.0.4/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.3/diskdump.c.orig
-+++ crash-8.0.3/diskdump.c
+--- crash-8.0.4/diskdump.c.orig
++++ crash-8.0.4/diskdump.c
 @@ -23,6 +23,9 @@
   * GNU General Public License for more details.
   */
diff --git a/sources b/sources
index 29d88c0..5fb4c7b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (crash-8.0.3.tar.gz) = 1ce7fda89274051cea02a049a674f2ca43fc02e00121f951af0d4c23c7b74cc79949ec376bb6737f82b95fec0cbe495b53a09df7e5f1f31ee5a829c1d53d0ba0
+SHA512 (crash-8.0.4.tar.gz) = a08589026515990eee555af6eeba0457433fe41263512ed67dfcac1cf49a8f61dc794081f4984700d8dfed228440a1d7928fdd1f5cf4ae8a45cf39eb49d3470b
 SHA512 (gdb-10.2.tar.gz) = aa89caf47c1c84366020377d47e7c51ddbc48e5b7686f244e38797c8eb88411cf57fcdc37eb669961efb41ceeac4181747f429625fd1acce7712cb9a1fea9c41