SOURCES/dyninst-11.0.0-nullbuf.patch

@@ -1,25 +0,0 @@
-rhbz1965455
-
-commit 212576147 (refs/bisect/new)
-Author: Xiaozhu Meng <mxz297@gmail.com>
-Date:   Wed May 26 11:26:28 2021 -0500
-
-    Skip parsing of blocks whose code buffer is null (#1033)
-
---- dyninst-11.0.0/parseAPI/src/Parser.C.orig
-+++ dyninst-11.0.0/parseAPI/src/Parser.C
-@@ -1703,6 +1703,14 @@ Parser::parse_frame_one_iteration(ParseFrame &frame, bool recursive) {
-             cur->region()->offset() + cur->region()->length() - curAddr;
-         const unsigned char* bufferBegin =
-             (const unsigned char *)(func->region()->getPtrToInstruction(curAddr));
-+        if (bufferBegin == nullptr) {
-+            // This can happen if jump table is over-approxiated.
-+            // We ignore this block for now, and later the over-approximated block
-+            // will be removed.
-+            parsing_printf("\taddress %lx in a different region from the funcion entry at %lx, skip parsing\n", curAddr, func->addr());
-+            continue;
-+        }
-+
-         InstructionDecoder dec(bufferBegin,size,frame.codereg->getArch());
- 
-         if (!ahPtr)

SPECS/dyninst.spec

@@ -7,7 +7,7 @@ Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: %{?scl_prefix}dyninst
 Group: Development/Libraries
-Release: 2%{?dist}
+Release: 1%{?dist}
 URL: http://www.dyninst.org
 Version: 11.0.0
 Exclusiveos: linux
@@ -20,7 +20,6 @@ Patch1: testsuite-11.0.0-test12.patch
 Patch2: testsuite-11.0.0-386.patch
 Patch3: dyninst-11.0.0-dwarf.patch
 Patch4: dyninst-11.0.0-tbb.patch
-Patch5: dyninst-11.0.0-nullbuf.patch
 
 %global dyninst_base dyninst-%{version}
 %global testsuite_base testsuite-%{version}
@@ -111,9 +110,6 @@ making sure that dyninst works properly.
 %patch2 -p1 -b .386
 %patch3 -p1 -b .dwarf
 %patch4 -p1 -b .tbb
-pushd %{dyninst_base}
-%patch5 -p1 -b .null
-popd
 
 # cotire seems to cause non-deterministic gcc errors
 # https://bugzilla.redhat.com/show_bug.cgi?id=1420551
@@ -227,9 +223,6 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
-* Mon Aug 16 2021 Frank Ch. Eigler <fche@redhat.com> - 11.0.0-2
-- rhbz1993317, nullbuf disassembly errors
-
 * Wed May 19 2021 Stan Cox <scox@redhat.com> - 11.0.0
 - Update to 11.0.0