Related: rhbz2057675

Resolves: rhbz2044916
Resolves: #1993578
2023-05-18 10:56:19 +00:00 · 2022-01-25 12:17:27 -05:00 · 2021-11-02 09:48:44 -04:00 · 2021-08-10 14:11:32 -04:00 · 2021-08-09 19:52:49 +00:00 · 2021-06-30 16:00:48 -04:00
12 changed files with 76 additions and 423 deletions
--- a/.dyninst.metadata
+++ b/.dyninst.metadata
@ -0,0 +1,2 @@
+cdbbb6ded567874409f9a6903f4a794e827c7436 dyninst-12.1.0.tar.gz
+16dd6c1cdb105dac43aaa78315b23b59c6f30d2f testsuite-12.1.0.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -23,3 +23,7 @@
 /dyninst-10.1.0.tar.gz
 /dyninst-10.2.0.tar.gz
 /dyninst-10.2.1.tar.gz
+/dyninst-11.0.0.tar.gz
+/testsuite-11.0.0.tar.gz
+/dyninst-12.1.0.tar.gz
+/testsuite-12.1.0.tar.gz
--- a/dyninst-10.2.1-dbid.patch
+++ b/dyninst-10.2.1-dbid.patch
@ -1,317 +0,0 @@
-Debuginfod is a lightweight web service that indexes ELF/DWARF debugging
-resources by build-id and serves them over HTTP.
-
-This patch enables dyninst to query debuginfod servers for a file's
-separate debuginfo when it otherwise cannot be found.
-
-This patch also adds a cmake option -DENABLE_DEBUGINFOD to control
-whether dyninst is built with debuginfod support.
-
-This requires having the debuginfod client library (libdebuginfod)
-and header installed.
-
-Debuginfod is distributed with elfutils, for more information see
-https://sourceware.org/elfutils/Debuginfod.html
---
- cmake/ElfUtils.cmake                  | 37 ++++++++---
- cmake/Modules/FindLibDebuginfod.cmake | 76 +++++++++++++++++++++
- cmake/options.cmake                   |  2 +
- elf/CMakeLists.txt                    |  3 +
- elf/src/Elf_X.C                       | 95 ++++++++++++++++++++-------
- 5 files changed, 178 insertions(+), 35 deletions(-)
- create mode 100644 cmake/Modules/FindLibDebuginfod.cmake
-
--- dyninst-10.2.1/dyninst-10.2.1/cmake/ElfUtils.cmake
-+++ dyninst-10.2.1/dyninst-10.2.1/cmake/ElfUtils.cmake
-@@ -28,7 +28,7 @@
- #
- #======================================================================================
- 
-if(LibElf_FOUND AND LibDwarf_FOUND)
-+if(LibElf_FOUND AND LibDwarf_FOUND AND (LibDebuginfod_FOUND OR NOT ENABLE_DEBUGINFOD))
-   return()
- endif()
- 
-@@ -37,7 +37,12 @@ if(NOT UNIX)
- endif()
- 
- # Minimum acceptable version of elfutils
-set(_min_version 0.178)
-+if(ENABLE_DEBUGINFOD)
-+  set(_min_version 0.179)
-+else()
-+  set(_min_version 0.178)
-+endif()
-+
- set(ElfUtils_MIN_VERSION ${_min_version}
-     CACHE STRING "Minimum acceptable elfutils version")
- if(${ElfUtils_MIN_VERSION} VERSION_LESS ${_min_version})
-@@ -62,7 +67,7 @@ set(ElfUtils_LIBRARYDIR "${ElfUtils_ROOT_DIR}/lib"
-     CACHE PATH "Hint directory that contains the elfutils library files")
- 
- # libelf/dwarf-specific directory hints
-foreach(l LibElf LibDwarf)
-+foreach(l LibElf LibDwarf LibDebuginfod)
-   foreach(d ROOT_DIR INCLUDEDIR LIBRARYDIR)
-     set(${l}_${d} ${ElfUtils_${d}})
-   endforeach()
-@@ -72,18 +77,30 @@ endforeach()
- 
- find_package(LibElf ${ElfUtils_MIN_VERSION})
- 
-# Don't search for libdw if we didn't find a suitable libelf
-+# Don't search for libdw or libdebuginfod if we didn't find a suitable libelf
- if(LibElf_FOUND)
-   find_package(LibDwarf ${ElfUtils_MIN_VERSION})
-+  if (ENABLE_DEBUGINFOD)
-+    find_package(LibDebuginfod ${ElfUtils_MIN_VERSION})
-+  endif()
- endif()
- 
- # -------------- SOURCE BUILD -------------------------------------------------
-if(LibElf_FOUND AND LibDwarf_FOUND)
-  set(_eu_root ${ElfUtils_ROOT_DIR})
-  set(_eu_inc_dirs ${LibElf_INCLUDE_DIRS} ${LibDwarf_INCLUDE_DIRS})
-  set(_eu_lib_dirs ${LibElf_LIBRARY_DIRS} ${LibDwarf_LIBRARY_DIRS})
-  set(_eu_libs ${LibElf_LIBRARIES} ${LibDwarf_LIBRARIES})
-+if(LibElf_FOUND AND LibDwarf_FOUND AND (NOT ENABLE_DEBUGINFOD OR LibDebuginfod_FOUND))
-+  if(ENABLE_DEBUGINFOD AND LibDebuginfod_FOUND)
-+    set(_eu_root ${ElfUtils_ROOT_DIR})
-+    set(_eu_inc_dirs ${LibElf_INCLUDE_DIRS} ${LibDwarf_INCLUDE_DIRS} ${LibDebuginfod_INCLUDE_DIRS})
-+    set(_eu_lib_dirs ${LibElf_LIBRARY_DIRS} ${LibDwarf_LIBRARY_DIRS} ${LibDebuginfod_LIBRARY_DIRS})
-+    set(_eu_libs ${LibElf_LIBRARIES} ${LibDwarf_LIBRARIES} ${LibDebuginfod_LIBRARIES})
-+  else()
-+    set(_eu_root ${ElfUtils_ROOT_DIR})
-+    set(_eu_inc_dirs ${LibElf_INCLUDE_DIRS} ${LibDwarf_INCLUDE_DIRS})
-+    set(_eu_lib_dirs ${LibElf_LIBRARY_DIRS} ${LibDwarf_LIBRARY_DIRS})
-+    set(_eu_libs ${LibElf_LIBRARIES} ${LibDwarf_LIBRARIES})
-+  endif()
-   add_library(ElfUtils SHARED IMPORTED)
-+elseif(ENABLE_DEBUGINFOD AND NOT LibDebuginfod_FOUND)
-+  message(FATAL_ERROR "Debuginfod enabled but not found")
- elseif(NOT (LibElf_FOUND AND LibDwarf_FOUND) AND STERILE_BUILD)
-   message(FATAL_ERROR "Elfutils not found and cannot be downloaded because build is sterile.")
- else()
-
--- /dev/null
-+++ dyninst-10.2.1/dyninst-10.2.1/cmake/Modules/FindLibDebuginfod.cmake
-@@ -0,0 +1,76 @@
-+#========================================================================================
-+# FindDebuginfod
-+# -----------
-+#
-+# Find debuginfod library and headers
-+#
-+# The module defines the following variables:
-+#
-+# This module reads hints about search locations from variables::
-+#
-+#       LibDebuginfod_ROOT_DIR         - Base directory the of libdebuginfod installation
-+#       LibDebuginfod_INCLUDEDIR       - Hint directory that contains the libdebuginfod headers files
-+#       LibDebuginfod_LIBRARYDIR       - Hint directory that contains the libdebuginfod library files
-+#
-+# and saves search results persistently in CMake cache entries::
-+#
-+#       LibDebuginfod_FOUND            - True if headers and requested libraries were found
-+#       LibDebuginfod_INCLUDE_DIRS     - libdebuginfod include directories
-+#       LibDebuginfod_LIBRARY_DIRS     - Link directories for libdebuginfod libraries
-+#       LibDebuginfod_LIBRARIES        - libdebuginfod library files
-+#
-+# Utilize package config (e.g. /usr/lib64/pkgconfig/libdebuginfod.pc) to fetch
-+# version information.
-+#
-+#========================================================================================
-+
-+find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_Debuginfod QUIET REQUIRED libdebuginfod>=${ElfUtils_MIN_VERSION})
-+set(LibDebuginfod_VERSION "${PC_Debuginfod_VERSION}")
-+
-+find_path(LibDebuginfod_INCLUDE_DIRS
-+          NAMES
-+            debuginfod.h
-+          HINTS
-+            ${PC_Debuginfod_INCLUDEDIR}
-+            ${PC_Debuginfod_INCLUDE_DIRS}
-+            ${LibDebuginfod_ROOT_DIR}/include
-+            ${LibDebuginfod_ROOT_DIR}
-+            ${LibDebuginfod_INCLUDEDIR}
-+          PATHS
-+            ${DYNINST_SYSTEM_INCLUDE_PATHS}
-+          PATH_SUFFIXES
-+            ${_path_suffixes}
-+          DOC
-+            "libdebuginfod include directories")
-+
-+find_library(LibDebuginfod_LIBRARIES
-+             NAMES
-+               libdebuginfod.so.1 libdebuginfod.so
-+             HINTS
-+               ${PC_Debuginfod_LIBDIR}
-+               ${PC_Debuginfod_LIBRARY_DIRS}
-+               ${LibDebuginfod_ROOT_DIR}/lib
-+               ${LibDebuginfod_ROOT_DIR}
-+               ${LibDebuginfod_LIBRARYDIR}
-+             PATHS
-+               ${DYNINST_SYSTEM_LIBRARY_PATHS}
-+             PATH_SUFFIXES
-+               ${_path_suffixes})
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(LibDebuginfod
-+                                  FOUND_VAR
-+                                    LibDebuginfod_FOUND
-+                                  REQUIRED_VARS
-+                                    LibDebuginfod_INCLUDE_DIRS
-+                                    LibDebuginfod_LIBRARIES
-+                                  VERSION_VAR
-+                                    LibDebuginfod_VERSION)
-+
-+if(LibDebuginfod_FOUND)
-+  set(LibDebuginfod_INCLUDE_DIRS ${LibDebuginfod_INCLUDE_DIRS})
-+  set(LibDebuginfod_LIBRARIES ${LibDebuginfod_LIBRARIES})
-+  get_filename_component(_debuginfod_dir ${LibDebuginfod_LIBRARIES} DIRECTORY)
-+  set(LibDebuginfod_LIBRARY_DIRS ${_debuginfod_dir} "${_debuginfod_dir}/elfutils")
-+endif()
-
--- dyninst-10.2.1/dyninst-10.2.1/cmake/options.cmake
-+++ dyninst-10.2.1/dyninst-10.2.1/cmake/options.cmake
-@@ -16,6 +16,8 @@ option(USE_COTIRE "Enable Cotire precompiled headers")
- 
- option (ENABLE_LTO "Enable Link-Time Optimization" OFF)
- 
-+option(ENABLE_DEBUGINFOD "Enable debuginfod support" OFF)
-+
- # Some global on/off switches
- if (LIGHTWEIGHT_SYMTAB)
- add_definitions (-DWITHOUT_SYMTAB_API -DWITH_SYMLITE)
-
--- dyninst-10.2.1/dyninst-10.2.1/elf/CMakeLists.txt
-+++ dyninst-10.2.1/dyninst-10.2.1/elf/CMakeLists.txt
-@@ -27,5 +27,8 @@ endif()
- add_dependencies(dynElf ElfUtils)
- target_link_private_libraries(dynElf ${ElfUtils_LIBRARIES})
- 
-+if (ENABLE_DEBUGINFOD AND LibDebuginfod_FOUND)
-+  add_definitions(-DDEBUGINFOD_LIB)
-+endif()
- 
- add_definitions(-DDYNELF_LIB)
-
-
--- dyninst-10.2.1/dyninst-10.2.1/elf/src/Elf_X.C
-+++ dyninst-10.2.1/dyninst-10.2.1/elf/src/Elf_X.C
-@@ -47,6 +47,9 @@
- #include <sstream>
- #include <libelf.h>
- 
-+#if DEBUGINFOD_LIB
-+#include <elfutils/debuginfod.h>
-+#endif
- 
- using namespace std;
- using boost::crc_32_type;
-@@ -1722,37 +1725,79 @@ bool Elf_X::findDebugFile(std::string origfilename, string &output_name, char* &
-      }
-   }
- 
-  if (debugFileFromDebugLink.empty())
-     return false;
-+  if (!debugFileFromDebugLink.empty()) {
-+     char *mfPathNameCopy = strdup(origfilename.c_str());
-+     string objectFileDirName = dirname(mfPathNameCopy);
- 
-  char *mfPathNameCopy = strdup(origfilename.c_str());
-  string objectFileDirName = dirname(mfPathNameCopy);
-+     vector<string> fnames = list_of
-+       (objectFileDirName + "/" + debugFileFromDebugLink)
-+       (objectFileDirName + "/.debug/" + debugFileFromDebugLink)
-+       ("/usr/lib/debug/" + objectFileDirName + "/" + debugFileFromDebugLink);
- 
-  vector<string> fnames = list_of
-    (objectFileDirName + "/" + debugFileFromDebugLink)
-    (objectFileDirName + "/.debug/" + debugFileFromDebugLink)
-    ("/usr/lib/debug/" + objectFileDirName + "/" + debugFileFromDebugLink);
-+     free(mfPathNameCopy);
- 
-  free(mfPathNameCopy);
-+     for(unsigned i = 0; i < fnames.size(); i++) {
-+        bool result = loadDebugFileFromDisk(fnames[i], output_buffer, output_buffer_size);
-+        if (!result)
-+           continue;
- 
-  for(unsigned i = 0; i < fnames.size(); i++) {
-     bool result = loadDebugFileFromDisk(fnames[i], output_buffer, output_buffer_size);
-     if (!result)
-        continue;
-    
-    boost::crc_32_type crcComputer;
-    crcComputer.process_bytes(output_buffer, output_buffer_size);
-    if(crcComputer.checksum() != debugFileCrc) {
-       munmap(output_buffer, output_buffer_size);
-       continue;
-    }
-+        boost::crc_32_type crcComputer;
-+        crcComputer.process_bytes(output_buffer, output_buffer_size);
-+        if(crcComputer.checksum() != debugFileCrc) {
-+           munmap(output_buffer, output_buffer_size);
-+           continue;
-+        }
-+
-+        output_name = fnames[i];
-+        cached_debug_buffer = output_buffer;
-+        cached_debug_size = output_buffer_size;
-+        cached_debug_name = output_name;
-+        return true;
-+     }
-+  }
- 
-    output_name = fnames[i];
-    cached_debug_buffer = output_buffer;
-    cached_debug_size = output_buffer_size;
-    cached_debug_name = output_name;
-    return true;
-+#ifdef DEBUGINFOD_LIB
-+  if (!debugFileFromBuildID.empty()) {
-+     // Given /usr/lib/debug/.buildid/XX/YYYYYY.debug, isolate XXYYYYYY.
-+     size_t idx1 = debugFileFromBuildID.find_last_of("/");
-+     size_t idx2 = debugFileFromBuildID.find_last_of(".");
-+
-+     if (idx1 == string::npos || idx2 == string::npos
-+         || idx1 < 2 || idx1 > idx2)
-+        return false;
-+
-+     idx1 -= 2;
-+     string buildid(debugFileFromBuildID.substr(idx1, idx2 - idx1));
-+     buildid.erase(2, 1);
-+
-+     debuginfod_client *client = debuginfod_begin();
-+     if (client == NULL)
-+        return false;
-+
-+     char *filename;
-+     int fd = debuginfod_find_debuginfo(client,
-+                                        (const unsigned char *)buildid.c_str(),
-+                                        0, &filename);
-+     debuginfod_end(client);
-+
-+     if (fd >= 0) {
-+        string fname = string(filename);
-+        free(filename);
-+        close(fd);
-+
-+        bool result = loadDebugFileFromDisk(fname,
-+                                            output_buffer,
-+                                            output_buffer_size);
-+        if (result) {
-+           output_name = fname;
-+           cached_debug_buffer = output_buffer;
-+           cached_debug_size = output_buffer_size;
-+           cached_debug_name = output_name;
-+           return true;
-+        }
-+     }
-   }
-+#endif
- 
-   return false;
- }
--- a/dyninst-12.1.0-dwarf.patch
+++ b/dyninst-12.1.0-dwarf.patch
@ -0,0 +1,11 @@
+Remove extraneous error messages of the form:
+ err message: .debug_loclists section missing
+ err message: invalid DWARF
+which are repeated in some circumstances without adding useful context
+
+--- dyninst-12.1.0/symtabAPI/src/dwarfWalker.C.orig	2021-04-08 16:48:12.000000000 -0400
+++ dyninst-12.1.0/symtabAPI/src/dwarfWalker.C	2021-04-27 12:48:55.643978425 -0400
+@@ -1858,1 +1858,1 @@
+-                cerr << "err message: " << dwarf_errmsg(dwarf_errno()) << endl;
+	        dwarf_printf("(0x%lx) Error while decoding location: %s\n", id(), dwarf_errmsg(dwarf_errno()));
+
--- a/dyninst-gcc11.patch
+++ b/dyninst-gcc11.patch
@ -1,13 +0,0 @@
-diff --git a/testsuite-10.1.0/src/dyninst/test1_3.C b/testsuite-10.1.0/src/dyninst/test1_3.C
-index d32f630..b9bd0ba 100644
--- a/testsuite-10.1.0/src/dyninst/test1_3.C
-+++ b/testsuite-10.1.0/src/dyninst/test1_3.C
-@@ -134,7 +134,7 @@ test_results_t test1_3_Mutator::executeTest()
- 	}
- 
- 	// see if we can find the address
-	if (expr3_1->getBaseAddr() <= 0) 
-+	if (expr3_1->getBaseAddr() == 0)
- 	{
- 		logerror("*Error*: address %p for %s is not valid\n",
- 				expr3_1->getBaseAddr(), globalVar);
--- a/dyninst.spec
+++ b/dyninst.spec
@ -1,20 +1,17 @@
 Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
-Release: 5%{?dist}
+Group: Development/Libraries
+Release: 1%{?dist}
 URL: http://www.dyninst.org
-Version: 10.2.1
+Version: 12.1.0
 ExclusiveArch: %{ix86} x86_64 ppc64le aarch64

-%define __testsuite_version 10.1.0
+%define __testsuite_version 12.1.0
 Source0: https://github.com/dyninst/dyninst/archive/v%{version}/dyninst-%{version}.tar.gz
-Source1: https://github.com/dyninst/testsuite/archive/v10.1.0/testsuite-%{__testsuite_version}.tar.gz
+Source1: https://github.com/dyninst/testsuite/archive/%{__testsuite_version}/testsuite-%{__testsuite_version}.tar.gz

-Patch1: %{name}-gcc11.patch
-Patch2: %{name}-10.2.1-dbid.patch
-Patch3: testsuite-10.1.0-gettid.patch
-Patch4: testsuite-10.1.0-386.patch
-Patch5: testsuite-10.1.0-throw.patch
+Patch1: dyninst-12.1.0-dwarf.patch

 %global dyninst_base dyninst-%{version}
 %global testsuite_base testsuite-%{__testsuite_version}
@ -23,16 +20,16 @@ BuildRequires: gcc-c++
 BuildRequires: elfutils-devel
 BuildRequires: elfutils-libelf-devel
 BuildRequires: elfutils-debuginfod-client-devel
-BuildRequires: boost-devel >= 1.75
+BuildRequires: boost-devel
 BuildRequires: binutils-devel
 BuildRequires: cmake
 BuildRequires: libtirpc-devel
 BuildRequires: tbb tbb-devel
 BuildRequires: tex-latex
+BuildRequires: make

 # Extra requires just for the testsuite
 BuildRequires: gcc-gfortran libxml2-devel
-BuildRequires: make

 # Testsuite files should not provide/require anything
 %{?filter_setup:
@ -53,11 +50,13 @@ the creation of tools and applications that use run-time code patching.

 %package doc
 Summary: Documentation for using the Dyninst API
+Group: Documentation
 %description doc
 dyninst-doc contains API documentation for the Dyninst libraries.

 %package devel
 Summary: Header files for compiling programs with Dyninst
+Group: Development/System
 Requires: dyninst = %{version}-%{release}
 Requires: boost-devel
 Requires: tbb-devel
@ -69,6 +68,7 @@ that uses Dyninst.

 %package testsuite
 Summary: Programs for testing Dyninst
+Group: Development/System
 Requires: dyninst = %{version}-%{release}
 Requires: dyninst-devel = %{version}-%{release}
 %description testsuite
@ -79,11 +79,12 @@ making sure that dyninst works properly.
 %setup -q -n %{name}-%{version} -c
 %setup -q -T -D -a 1

-%patch1 -p1 -b .gcc11
-%patch2 -p1 -b .dbid
-%patch3 -p1 -b .gettid
-%patch4 -p1 -b .386
-%patch5 -p1 -b .throw
+pushd %{testsuite_base}
+popd
+
+pushd %{dyninst_base}
+%patch1 -p1 -b .dwarf
+popd

 # cotire seems to cause non-deterministic gcc errors
 # https://bugzilla.redhat.com/show_bug.cgi?id=1420551
@ -109,22 +110,26 @@ export CFLAGS CXXFLAGS LDFLAGS
 -DINSTALL_INCLUDE_DIR:PATH=%{_includedir}/dyninst \
 -DINSTALL_CMAKE_DIR:PATH=%{_libdir}/cmake/Dyninst \
 -DCMAKE_BUILD_TYPE=None \
- -DCMAKE_SKIP_RPATH:BOOL=YES
+ -DCMAKE_SKIP_RPATH:BOOL=YES \
+ .
 %cmake_build

 # Hack to install dyninst nearby, so the testsuite can use it
 DESTDIR="../install" %__cmake --install "%{__cmake_builddir}"
 find ../install -name '*.cmake' -execdir \
-     sed -i -e "s!%{_prefix}!$PWD/../install&!" '{}' '+'
+  sed -i -e "s!%{_prefix}!$PWD/../install&!" '{}' '+'
 # cmake mistakenly looks for libtbb.so in the dyninst install dir
 sed -i '/libtbb.so/ s/".*usr/"\/usr/' $PWD/../install%{_libdir}/cmake/Dyninst/commonTargets.cmake

 cd ../%{testsuite_base}
+# testsuite build sometimes encounters dependency issues with -jN
+%define _smp_mflags -j1
 %cmake \
 -DDyninst_DIR:PATH=$PWD/../install%{_libdir}/cmake/Dyninst \
 -DINSTALL_DIR:PATH=%{_libdir}/dyninst/testsuite \
 -DCMAKE_BUILD_TYPE:STRING=Debug \
 -DCMAKE_SKIP_RPATH:BOOL=YES \
+ .
 %cmake_build

 %install
@ -187,6 +192,31 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a

 %changelog
+* Thu Apr 21 2022 Stan Cox <scox@redhat.com> - 12.1.0-1
+- Update to 12.1.0
+
+* Mon Nov 01 2021 Stan Cox <scox@redhat.com> - 11.0.0-5
+- Related: rhbz1993578
+
+* Tue Aug 10 2021 Stan Cox <scox@redhat.com> - 11.0.0-4
+- Related: rhbz1991997
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 11.0.0-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 30 2021 Stan Cox <scox@redhat.com> - 11.0.1-2
+- Related: rhbz1973038
+
+* Fri Apr 30 2021 Stan Cox <scox@redhat.com> - 11.0.0-1
+- Update to 11.0.0
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 10.2.1-7
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 10.2.1-6
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
 * Fri Jan 29 2021 Frank Ch. Eigler <fche@redhat.com> - 10.2.1-5
 - Rebuilt for Boost 1.75 for sure, via buildrequire version constraints

--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,3 @@
+---
+annocheck:
+  - rhel-policy: --skip-property-note --ignore-unknown --verbose
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (dyninst-10.2.1.tar.gz) = 5666ffd888afdb9493bd495aa6027ca5b9f71fe811a6d88777d55b612c92f73dc6c008c1738be111175a31fb0a2ec804d8ffc3e79888d8366ae5b5b624537055
-SHA512 (testsuite-10.1.0.tar.gz) = 47b91ebc0623f672378086a5f8d84e3934bd6b22d8932b12aaad257ccf7eb109505edb63dfbc3eb15aa099fc488a517835412099a77e3e0dd1275b3e3f672b3b
+SHA512 (dyninst-12.1.0.tar.gz) = ec09b83f288afefd6a30a3253c91554d421305a43c2f2384435207dcabf523d5498d64873f876817c3108c3fc0a43fd4c48ce2c1ca873c73fb98a2d823446549
+SHA512 (testsuite-12.1.0.tar.gz) = 884a33c5b912249166acc0c52bd0ab02b578dcea2a24fbfa2abc7887b6a9c4f3a113934b96079653d60d9dba34c8870eff7d08388c906111a024ec92e629798a
--- a/testsuite-10.1.0-386.patch
+++ b/testsuite-10.1.0-386.patch
@ -1,44 +0,0 @@
--- dyninst-10.2.0/testsuite-10.1.0/CMakeLists.txt
-+++ dyninst-10.2.0/testsuite-10.1.0/CMakeLists.txt
-@@ -111,7 +111,8 @@
- if(UNIX)
-   enable_language(ASM-ATT)
-  if("${DYNINST_PLATFORM}" MATCHES "i386")
-    enable_language(ASM_NASM)
-  endif()
-+# nasm/yasm are deprecated
-+#  if("${DYNINST_PLATFORM}" MATCHES "i386")
-+#    enable_language(ASM_NASM)
-+#  endif()
- elseif(WIN32)
-   enable_language(ASM_MASM)
-
--- dyninst-10.2.0/testsuite-10.1.0/src/instruction/test_instruction_farcall.C
-+++ dyninst-10.2.0/testsuite-10.1.0/src/instruction/test_instruction_farcall.C
-@@ -96,21 +96,21 @@ test_results_t test_instruction_farcall_Mutator::executeTest()
-   if(decodedInsns.size() != expectedInsns) // six valid, one invalid
-   {
-     logerror("FAILED: Expected %d instructions, decoded %d\n", expectedInsns, decodedInsns.size());
-    for(std::vector<Instruction::Ptr>::iterator curInsn = decodedInsns.begin();
-+    for(std::vector<Instruction>::iterator curInsn = decodedInsns.begin();
- 	curInsn != decodedInsns.end();
- 	++curInsn)
-     {
-      logerror("\t%s\t", (*curInsn)->format().c_str());
-      for(unsigned j = 0; j < (*curInsn)->size(); ++j)
-+      logerror("\t%s\t", (*curInsn).format().c_str());
-+      for(unsigned j = 0; j < (*curInsn).size(); ++j)
-       {
-	logerror("%x ", (*curInsn)->rawByte(j));
-+	logerror("%x ", (*curInsn).rawByte(j));
-       }
-       logerror("\n");
-     }
-     
-     return FAILED;
-   }
-  if(decodedInsns.back() && decodedInsns.back()->isValid())
-+  if(decodedInsns.size() > 0 && decodedInsns.back().isValid())
-   {
-     logerror("FAILED: Expected instructions to end with an invalid instruction, but they didn't");
-     return FAILED;
--- a/testsuite-10.1.0-gettid.patch
+++ b/testsuite-10.1.0-gettid.patch
@ -1,15 +0,0 @@
--- dyninst-10.1.0/testsuite-10.1.0/src/proccontrol/pcontrol_mutatee_tools.c.orig	2019-05-31 05:20:00.492379706 +0200
-+++ dyninst-10.1.0/testsuite-10.1.0/src/proccontrol/pcontrol_mutatee_tools.c	2019-05-31 05:10:11.354826668 +0200
-@@ -62,9 +62,9 @@
- #if !defined(os_windows_test)
- #include <poll.h>
- 
-static unsigned int gettid(){
-    return (unsigned int)pthread_self();
-}
-+// static unsigned int gettid(){
-+//     return (unsigned int)pthread_self();
-+// }
- #endif
- 
- thread_t threads[MAX_POSSIBLE_THREADS];
--- a/testsuite-10.1.0-throw.patch
+++ b/testsuite-10.1.0-throw.patch
@ -1,14 +0,0 @@
--- dyninst-10.2.0/testsuite-10.1.0/src/test_lib.h
-+++ dyninst-10.2.0/testsuite-10.1.0/src/test_lib.h
-@@ -158,3 +158,3 @@
- 
-	TESTLIB_DLL_EXPORT virtual ~LocErr() THROW; 
-+	TESTLIB_DLL_EXPORT virtual ~LocErr() throw(); 
- 
--- dyninst-10.2.0/testsuite-10.1.0/src/test_lib.C
-+++ dyninst-10.2.0/testsuite-10.1.0/src/test_lib.C
-@@ -112,3 +112,3 @@
- 
-LocErr::~LocErr() THROW
-+LocErr::~LocErr() throw()
- {}
Author	SHA1	Message	Date
Stan Cox	bf52b99967	Related: rhbz2057675	2023-05-18 10:56:19 +00:00
Frank Ch. Eigler	b585954d50	Resolves: rhbz2044916	2022-01-25 12:17:27 -05:00
Stan Cox	a2921ce589	Resolves: #1993578	2021-11-02 09:48:44 -04:00
Stan Cox	4696c4e80e	Resolves: #1991997	2021-08-10 14:11:32 -04:00
Mohan Boddu	0fd400dcc1	Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2021-08-09 19:52:49 +00:00
Stan Cox	7ee8500bd1	Resolves: #1973038	2021-06-30 16:00:48 -04:00
Martin Cermak	9799cdda08	gating.yaml: Set up CI gating	2021-06-22 13:18:06 +02:00
Stan Cox	587de74415	Resolves: #1940826	2021-05-06 21:04:08 -04:00
Mohan Boddu	4bb23e4471	- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2021-04-15 23:10:13 +00:00
DistroBaker	ae6fe58c42	Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/dyninst.git#36f9c5a1f59da26c69ccfcb5efddfd5b6b0d5f29	2021-04-04 23:35:39 +00:00