8 changed files with 124 additions and 45 deletions
--- a/.dyninst.metadata
+++ b/.dyninst.metadata
@ -1,2 +1,2 @@
-cdbbb6ded567874409f9a6903f4a794e827c7436 SOURCES/dyninst-12.1.0.tar.gz
-16dd6c1cdb105dac43aaa78315b23b59c6f30d2f SOURCES/testsuite-12.1.0.tar.gz
+cdbbb6ded567874409f9a6903f4a794e827c7436 dyninst-12.1.0.tar.gz
+16dd6c1cdb105dac43aaa78315b23b59c6f30d2f testsuite-12.1.0.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,29 @@
-SOURCES/dyninst-12.1.0.tar.gz
-SOURCES/testsuite-12.1.0.tar.gz
+/dyninst-8.0.tar.gz
+/dyninst-docs-8.0.tar.gz
+/dyninst-8.1.1.tar.gz
+/dyninst-docs-8.1.1.tar.gz
+/dyninst-8.1.2.tar.gz
+/dyninst-8.2.0.1.tar.gz
+/dyninst-docs-8.2.0.1.tar.gz
+/dyninst-testsuite-8.2.0.1.tar.gz
+/dyninst-8.2.1.tar.gz
+/DyninstAPI-9.0.3.tgz
+/Testsuite-9.0.3.tgz
+/DyninstAPI-9.1.0.tgz
+/Testsuite-9.1.0.tgz
+/dyninst-9.2.0.tar.gz
+/Testsuite-9.2.0.zip
+/dyninst-9.3.0.tar.gz
+/testsuite-9.3.0.tar.gz
+/dyninst-9.3.1.tar.gz
+/dyninst-9.3.2.tar.gz
+/dyninst-10.0.0.tar.gz
+/testsuite-9.4.0.tar.gz
+/testsuite-10.1.0.tar.gz
+/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/SOURCES/dyninst-12.1.0-tbb.patch
+++ b/SOURCES/dyninst-12.1.0-tbb.patch
@ -1,14 +0,0 @@
--- dyninst-12.1.0/cmake/Boost.cmake.orig	2021-04-08 16:48:12.000000000 -0400
-+++ dyninst-12.1.0/cmake/Boost.cmake	2021-05-07 12:35:53.124203324 -0400
-@@ -53,3 +53,3 @@
- # Need at least Boost-1.67 because of deprecated headers
-set(_boost_min_version 1.70.0)
-+set(_boost_min_version 1.66.0)
- 
--- dyninst-12.1.0/cmake/ThreadingBuildingBlocks.cmake.orig	2021-04-08 16:48:12.000000000 -0400
-+++ dyninst-12.1.0/cmake/ThreadingBuildingBlocks.cmake	2021-05-07 12:40:13.092183538 -0400
-@@ -52,3 +52,3 @@
- else()
-  set(_tbb_min_version 2018.6)
-+  set(_tbb_min_version 2018.0)
- endif()
--- a/SOURCES/dyninst-12.1.0-dwarf.patch
+++ b/SOURCES/dyninst-12.1.0-dwarf.patch
--- a/SPECS/dyninst.spec
+++ b/SPECS/dyninst.spec
@ -12,7 +12,6 @@ Source0: https://github.com/dyninst/dyninst/archive/v%{version}/dyninst-%{versio
 Source1: https://github.com/dyninst/testsuite/archive/%{__testsuite_version}/testsuite-%{__testsuite_version}.tar.gz

 Patch1: dyninst-12.1.0-dwarf.patch
-Patch2: dyninst-12.1.0-tbb.patch

 %global dyninst_base dyninst-%{version}
 %global testsuite_base testsuite-%{__testsuite_version}
@ -30,7 +29,7 @@ BuildRequires: tex-latex
 BuildRequires: make

 # Extra requires just for the testsuite
-BuildRequires: gcc-gfortran glibc-static libstdc++-static libxml2-devel
+BuildRequires: gcc-gfortran libxml2-devel

 # Testsuite files should not provide/require anything
 %{?filter_setup:
@ -67,20 +66,11 @@ dyninst-devel includes the C header files that specify the Dyninst user-space
 libraries and interfaces. This is required for rebuilding any program
 that uses Dyninst.

-%package static
-Summary: Static libraries for the compiling programs with Dyninst
-Group: Development/System
-Requires: dyninst-devel = %{version}-%{release}
-%description static
-dyninst-static includes the static versions of the library files for
-the dyninst user-space libraries and interfaces.
-
 %package testsuite
 Summary: Programs for testing Dyninst
 Group: Development/System
 Requires: dyninst = %{version}-%{release}
 Requires: dyninst-devel = %{version}-%{release}
-Requires: dyninst-static = %{version}-%{release}
 %description testsuite
 dyninst-testsuite includes the test harness and target programs for
 making sure that dyninst works properly.
@ -94,7 +84,6 @@ popd

 pushd %{dyninst_base}
 %patch1 -p1 -b .dwarf
-%patch2 -p1 -b .tbb
 popd

 # cotire seems to cause non-deterministic gcc errors
@ -116,7 +105,6 @@ CXXFLAGS="$CFLAGS"
 export CFLAGS CXXFLAGS LDFLAGS

 %cmake \
- -DENABLE_STATIC_LIBS=1 \
 -DENABLE_DEBUGINFOD=1 \
 -DINSTALL_LIB_DIR:PATH=%{_libdir}/dyninst \
 -DINSTALL_INCLUDE_DIR:PATH=%{_includedir}/dyninst \
@ -174,6 +162,7 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %{_libdir}/dyninst/*.so.*
 # dyninst mutators dlopen the runtime library
 %{_libdir}/dyninst/libdyninstAPI_RT.so
+%{_libdir}/dyninst/libdyninstAPI_RT.a

 %doc %{dyninst_base}/COPYRIGHT
 %doc %{dyninst_base}/LICENSE.md
@ -196,9 +185,6 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %{_libdir}/dyninst/*.so
 %{_libdir}/cmake/Dyninst

-%files static
-%{_libdir}/dyninst/*.a
-
 %files testsuite
 %{_bindir}/parseThat
 %dir %{_libdir}/dyninst/testsuite/
@ -209,36 +195,105 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 * Thu Apr 21 2022 Stan Cox <scox@redhat.com> - 12.1.0-1
 - Update to 12.1.0

-* Wed Jun 30 2021 Stan Cox <scox@redhat.com> - 11.0.0-3
- Related: rhbz1965455
+* Mon Nov 01 2021 Stan Cox <scox@redhat.com> - 11.0.0-5
+- Related: rhbz1993578

-* Mon Jun 28 2021 Stan Cox <scox@redhat.com> - 11.0.0-2
- Related: rhbz1965455, rhbz1965501
+* 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

-* Fri Nov 06 2020 Stan Cox <scox@redhat.com> - 10.2.1-2
+* 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
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 10.2.1-3
+- Rebuilt for Boost 1.75
+
+* Tue Nov 10 2020 Stan Cox <scox@redhat.com> - 10.2.1-2
 - Enable debuginfod

 * Wed Oct 28 2020 Stan Cox <scox@redhat.com> - 10.2.1-1
 - Update to 10.2.1

-* Tue Nov 19 2019 Stan Cox <scox@redhat.com> - 10.1.0-4
- Resolves: rhbz#963475 dyninst must be ported to aarch64
-  Remove Requires: glibc-static from %package testsuite
+* Tue Oct 27 2020 Jeff Law <law@redhat.com> - 10.2.0-2
+- Fix C++17 issue caught by gcc-11

-* Fri Nov 15 2019 Stan Cox <scox@redhat.com> - 10.1.0-3
+* Tue Sep 01 2020 Stan Cox <scox@redhat.com> - 10.2.0-1
+- Update to 10.2.0
+
+* Mon Aug 10 2020 Orion Poplawski <orion@nwra.com> - 10.1.0-10
+- Use new cmake macros (FTBFS bz#1863463)
+- Add BR tex-latex for doc build
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 10.1.0-9
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 10.1.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 15 2020 Stan Cox <scox@redhat.com> - 10.1.0-7
+- Do not build static versions of the dyninst libraries.
+
+* Fri May 29 2020 Jonathan Wakely <jwakely@redhat.com> - 10.1.0-6
+- Rebuilt for Boost 1.73
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 10.1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov 15 2019 Stan Cox <scox@redhat.com> - 10.1.0-4
 - Fix rhbz963475 dyninst must be ported to aarch64 

+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue Jun 04 2019 Stan Cox <scox@redhat.com> - 10.1.0-2
 - Use PRIx64 to fix i386 build

 * Wed May 29 2019 Stan Cox <scox@redhat.com> - 10.1.0-1
 - Update to 10.1.0

-* Wed May 16 2018 Frank Ch. Eigler <fche@redhat.com> - 9.3.2-12
- Rebuild with newer boost.
+* Mon Feb 4  2019 William Cohen <wcohen@redhat.com> - 10.0.0-7
+- Fix FTBFS due to move to boost 1.69 and tribool changes.
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 23 2019 Björn Esser <besser82@fedoraproject.org> - 10.0.0-5
+- Append curdir to CMake invokation. (#1668512)
+
+* Wed Dec 05 2018 Stan Cox <scox@redhat.com> - 10.0.0-4
+- Use PRIx64
+
+* Wed Dec 05 2018 Stan Cox <scox@redhat.com> - 10.0.0-3
+- Patch Result.h for i386.
+
+* Mon Dec 03 2018 Frank Ch. Eigler <fche@redhat.com> - 10.0.0-2
+- Add tbb-devel Requires:
+- Add ppc64le into ExclusiveArch:
+
+* Tue Nov 13 2018 Stan Cox <scox@redhat.com> - 10.0.0-1
+- Update to 10.0.0
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9.3.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

 * Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 9.3.2-11
 - Rebuild to fix GCC 8 mis-compilation
--- 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/2
+++ b/2
@ -0,0 +1,2 @@
+SHA512 (dyninst-12.1.0.tar.gz) = ec09b83f288afefd6a30a3253c91554d421305a43c2f2384435207dcabf523d5498d64873f876817c3108c3fc0a43fd4c48ce2c1ca873c73fb98a2d823446549
+SHA512 (testsuite-12.1.0.tar.gz) = 884a33c5b912249166acc0c52bd0ab02b578dcea2a24fbfa2abc7887b6a9c4f3a113934b96079653d60d9dba34c8870eff7d08388c906111a024ec92e629798a