From 3db73d93b5ac54084e919cdbabadac278c3b9a51 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 3 Nov 2020 06:57:00 -0500
Subject: [PATCH] import crash-trace-command-2.0-17.el8

---
 SOURCES/ftrace_event_call_rh_data.patch | 43 +++++++++++++++++++++++++
 SPECS/crash-trace-command.spec          | 16 +++++++--
 2 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 SOURCES/ftrace_event_call_rh_data.patch

diff --git a/SOURCES/ftrace_event_call_rh_data.patch b/SOURCES/ftrace_event_call_rh_data.patch
new file mode 100644
index 0000000..4c38597
--- /dev/null
+++ b/SOURCES/ftrace_event_call_rh_data.patch
@@ -0,0 +1,43 @@
+
+Fix the extension trace.so for RHEL7.6, which moved
+ftrace_event_call.data into an anonymous union, and the
+previous offset has changed, so the trace.so extension
+module fails to load, indicating "no commands registered:
+shared object unloaded".
+
+--- crash-trace-command-2.0/trace.c.orig
++++ crash-trace-command-2.0/trace.c
+@@ -853,8 +853,18 @@ static int syscall_get_enter_fields(ulon
+ 	inited = 1;
+ 	data_offset = MAX(MEMBER_OFFSET("ftrace_event_call", "data"), 
+ 		MEMBER_OFFSET("trace_event_call", "data"));
+-	if (data_offset < 0)
+-		return -1;
++	if (data_offset < 0) {
++		/*
++		 *  rhel-7.6 moved the .data member into an anonymous union.
++		 */
++		if (MEMBER_EXISTS("ftrace_event_call", "rh_data") &&
++		    MEMBER_EXISTS("ftrace_event_data", "data")) {
++			data_offset = MEMBER_OFFSET("ftrace_event_call", "rh_data") +
++				MEMBER_OFFSET("ftrace_event_data", "data");
++			inited = 2;
++		} else
++			return -1;
++	}
+ 
+ 	enter_fields_offset = MEMBER_OFFSET("syscall_metadata", "enter_fields");
+ 	if (enter_fields_offset < 0)
+@@ -868,6 +878,12 @@ work:
+ 			"read ftrace_event_call data", RETURN_ON_ERROR))
+ 		return -1;
+ 
++	if (inited == 2) {
++		if (!readmem(metadata, KVADDR, &metadata, sizeof(metadata),
++		    "read ftrace_event_call data (indirect rh_data)", RETURN_ON_ERROR))
++			return -1;
++	}
++
+ 	*fields = metadata + enter_fields_offset;
+ 	return 0;
+ }
diff --git a/SPECS/crash-trace-command.spec b/SPECS/crash-trace-command.spec
index de12e57..ea53a24 100644
--- a/SPECS/crash-trace-command.spec
+++ b/SPECS/crash-trace-command.spec
@@ -4,11 +4,11 @@
 Summary: Trace extension module for the crash utility
 Name: crash-trace-command
 Version: 2.0
-Release: 15%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 Group: Development/Debuggers
-Source: %{name}-%{version}.tar.gz
-URL: http://people.redhat.com/anderson/extensions/%{name}-%{version}.tar.gz
+Source: https://github.com/crash-utility/crash-extensions/blob/master/%{name}-%{version}.tar.gz
+URL: https://crash-utility.github.io/extensions.html
 # Vendor: Fujitsu Limited
 # Packager: Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
 ExclusiveOS: Linux
@@ -30,6 +30,7 @@ Patch8: TRACE_EVENT_FL_TRACEPOINT_flag.patch
 Patch9: big_endian_nr_pages.patch
 Patch10: ppc64_ring_buffer_read.patch
 Patch11: rhel8_build.patch
+Patch12: ftrace_event_call_rh_data.patch
 
 %description
 Command for reading ftrace data from a dumpfile.
@@ -48,6 +49,7 @@ Command for reading ftrace data from a dumpfile.
 %patch9 -p1 -b big_endian_nr_pages.patch
 %patch10 -p1 -b ppc64_ring_buffer_read.patch
 %patch11 -p1 -b rhel8_build.patch
+%patch12 -p1 -b ftrace_event_call_rh_data.patch
 
 %build
 make
@@ -65,6 +67,14 @@ rm -rf %{buildroot}
 %doc COPYING
 
 %changelog
+* Mon Jul 27 2020 Bhupesh Sharma <bhsharma@redhat.com> - 2.0-17
+- Chnage Source/URL to point to the latest github location
+  Resolves: rhbz#1851746
+
+* Tue Apr 28 2019 Dave Anderson <anderson@redhat.com> - 2.0-16
+- Fix for RHEL7 ftrace_event_call data structure change
+  Resolves: rhbz#1827734
+
 * Wed Sep 19 2018 Dave Anderson <anderson@redhat.com> - 2.0-15
 - annocheck: link with -Wl,-z,now
   Resolves: rhbz#1630558