.dyninst.metadata

@@ -1,2 +1,2 @@
-a946dd005c2b63ccc67e82d60e5359d7cc6492b0 SOURCES/dyninst-12.3.0.tar.gz
+cdbbb6ded567874409f9a6903f4a794e827c7436 SOURCES/dyninst-12.1.0.tar.gz
-ae0c4c1b8c0d3d49ff15641b349ca4105674d3da SOURCES/testsuite-12.3.0.tar.gz
+16dd6c1cdb105dac43aaa78315b23b59c6f30d2f SOURCES/testsuite-12.1.0.tar.gz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/dyninst-12.3.0.tar.gz
+SOURCES/dyninst-12.1.0.tar.gz
-SOURCES/testsuite-12.3.0.tar.gz
+SOURCES/testsuite-12.1.0.tar.gz

SOURCES/dyninst-12.1.0-dwarf.patch

@@ -3,8 +3,8 @@ Remove extraneous error messages of the form:
  err message: invalid DWARF
 which are repeated in some circumstances without adding useful context
 
---- dyninst-12.1.0/symtabAPI/src/dwarfWalker.C
+--- 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
++++ 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()));

SOURCES/dyninst-cmake3.27.patch

@@ -1,11 +0,0 @@
-diff -up dyninst-12.3.0/cmake/warnings.cmake.cmake3.27 dyninst-12.3.0/cmake/warnings.cmake
---- dyninst-12.3.0/cmake/warnings.cmake.cmake3.27	2023-02-22 14:39:56.000000000 -0700
-+++ dyninst-12.3.0/cmake/warnings.cmake	2023-06-09 19:59:32.831350952 -0600
-@@ -127,6 +127,7 @@ endif()
- 
- if(CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang)$")
-     include(CheckCXXCompilerFlag)
-+    include(CheckCXXSourceCompiles)
-     foreach(f IN LISTS REQUESTED_WARNING_FLAGS)
-         string(REGEX REPLACE "[^a-zA-Z0-9]" "_" v "HAS_CPP_FLAG_${f}")
-         set(CMAKE_REQUIRED_FLAGS "-${f}")

SOURCES/onetbb.patch

@@ -1,12 +0,0 @@
---- dyninst-12.2.0/cmake/Modules/FindTBB.cmake~	2023-06-27 22:52:25.396598265 +0100
-+++ dyninst-12.2.0/cmake/Modules/FindTBB.cmake	2023-06-27 22:52:27.776601825 +0100
-@@ -154,7 +154,8 @@
- if(TBB_INCLUDE_DIRS)
-     # Starting in 2020.1.1, tbb_stddef.h is replaced by version.h
-     set(_version_files "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h"
--                       "${TBB_INCLUDE_DIRS}/tbb/version.h")
-+                       "${TBB_INCLUDE_DIRS}/tbb/version.h"
-+                       "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h")
-     foreach(f IN ITEMS ${_version_files})
-         if(EXISTS ${f})
-             set(_version_file ${f})

SPECS/dyninst.spec

@@ -1,20 +1,17 @@
 Summary: An API for Run-time Code Generation
-License: LGPL-2.1-or-later AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LicenseRef-Fedora-Public-Domain AND BSD-3-Clause
+License: LGPLv2+
 Name: dyninst
 Group: Development/Libraries
-Release: 7%{?dist}
+Release: 1%{?dist}
 URL: http://www.dyninst.org
-Version: 12.3.0
+Version: 12.1.0
 ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
 
-%define __testsuite_version 12.3.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/v%{__testsuite_version}/testsuite-%{__testsuite_version}.tar.gz
+Source1: https://github.com/dyninst/testsuite/archive/%{__testsuite_version}/testsuite-%{__testsuite_version}.tar.gz
 
-Patch1: dwarf-error.patch
+Patch1: dyninst-12.1.0-dwarf.patch
-Patch2: onetbb.patch
-# Support cmake 3.27 - https://github.com/dyninst/dyninst/pull/1438
-Patch3: dyninst-cmake3.27.patch
 
 %global dyninst_base dyninst-%{version}
 %global testsuite_base testsuite-%{__testsuite_version}
@@ -29,10 +26,10 @@ 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:
@@ -56,7 +53,6 @@ Summary: Documentation for using the Dyninst API
 Group: Documentation
 %description doc
 dyninst-doc contains API documentation for the Dyninst libraries.
-License: LGPL-2.1-or-later
 
 %package devel
 Summary: Header files for compiling programs with Dyninst
@@ -64,8 +60,6 @@ Group: Development/System
 Requires: dyninst = %{version}-%{release}
 Requires: boost-devel
 Requires: tbb-devel
-License: LGPL-2.1-or-later AND BSD-3-Clause AND MIT
-# FindTBB.cmake: presumed MIT, removed in next version of dyninst
 
 %description devel
 dyninst-devel includes the C header files that specify the Dyninst user-space
@@ -77,9 +71,6 @@ Summary: Programs for testing Dyninst
 Group: Development/System
 Requires: dyninst = %{version}-%{release}
 Requires: dyninst-devel = %{version}-%{release}
-License: BSD-3-Clause AND LGPL-2.1-or-later
-
-
 %description testsuite
 dyninst-testsuite includes the test harness and target programs for
 making sure that dyninst works properly.
@@ -88,10 +79,11 @@ making sure that dyninst works properly.
 %setup -q -n %{name}-%{version} -c
 %setup -q -T -D -a 1
 
+pushd %{testsuite_base}
+popd
+
 pushd %{dyninst_base}
-%patch -P1 -p1 -b .dwerr
+%patch1 -p1 -b .dwarf
-%patch -P2 -p1 -b .onetbb
-%patch -P3 -p1 -b .cmake3.27
 popd
 
 # cotire seems to cause non-deterministic gcc errors
@@ -118,7 +110,8 @@ 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
@@ -135,7 +128,8 @@ cd ../%{testsuite_base}
  -DDyninst_DIR:PATH=$PWD/../install%{_libdir}/cmake/Dyninst \
  -DINSTALL_DIR:PATH=%{_libdir}/dyninst/testsuite \
  -DCMAKE_BUILD_TYPE:STRING=Debug \
- -DCMAKE_SKIP_RPATH:BOOL=YES
+ -DCMAKE_SKIP_RPATH:BOOL=YES \
+ .
 %cmake_build
 
 %install
@@ -143,6 +137,10 @@ cd ../%{testsuite_base}
 cd %{dyninst_base}
 %cmake_install
 
+# It doesn't install docs the way we want, so remove them.
+# We'll just grab the pdfs later, directly from the build dir.
+rm -v %{buildroot}%{_docdir}/*-%{version}.pdf
+
 cd ../%{testsuite_base}
 %cmake_install
 
@@ -194,88 +192,28 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 12.3.0-7
+* Thu Apr 21 2022 Stan Cox <scox@redhat.com> - 12.1.0-1
-- Rebuilt for MSVSphere 10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 12.3.0-7
-- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 12.3.0-4
-- Rebuilt for Boost 1.83
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 11 2023 Frank Ch. Eigler <fche@redhat.com> - 12.3.0-2
-- side-tag respin
-
-* Tue Jul 04 2023 Frank Ch. Eigler <fche@redhat.com> - 12.3.0-1
-- migrated to SPDX license
-
-* Tue Jul 04 2023 Orion Poplawski <orion@nwra.com> - 12.3.0-1
-- Update to 12.3.0
-- Add patch for cmake 3.27 support
-
-* Tue Jun 27 2023 Jonathan Wakely <jwakely@fedoraproject.org> - 12.2.0-5
-- Patch for oneTBB (#2036372)
-
-* Thu Feb 23 2023 Frank Ch. Eigler <fche@redhat.com> - 12.2.0-4
-- rhbz2173030: ftbfs with gcc 13
-
-* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 12.2.0-3
-- Rebuilt for Boost 1.81
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Oct 4 2022 William Cohen <wcohen@redhat.com> - 12.2.0-1
-- Update to 12.2.0
-
-* Wed Aug 03 2022 Stan Cox <scox@redhat.com> - 12.1.0-4
-- Explicitly include time.h as <string> no longer pulls it in
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 12.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 12.1.0-2
-- Rebuilt for Boost 1.78
-
-* Thu Mar 10 2022 William Cohen <wcohen@redhat.com> - 12.1.0-1
 - Update to 12.1.0
 
-* Sat Mar 05 2022 Orion Poplawski <orion@nwra.com> - 12.0.1-4
+* Mon Nov 01 2021 Stan Cox <scox@redhat.com> - 11.0.0-5
-- Fix cmake build dir
+- Related: rhbz1993578
-
-* Mon Feb 07 2022 Stan Cox <scox@redhat.com> - 12.0.1-3
-- Quiesce dwarf 5 warnings
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Mon Jan 10 2022 Stan Cox <scox@redhat.com> - 12.0.1-1
+* Tue Aug 10 2021 Stan Cox <scox@redhat.com> - 11.0.0-4
-- Update to 12.0.1
+- Related: rhbz1991997
 
-* Tue Nov 09 2021 Stan Cox <scox@redhat.com> - 11.0.1-4
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 11.0.0-3
-- Do not create reloc for aarch64 static calls
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 11.0.1-3
+* Wed Jun 30 2021 Stan Cox <scox@redhat.com> - 11.0.1-2
-- Rebuilt for Boost 1.76
+- Related: rhbz1973038
 
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.1-2
+* Fri Apr 30 2021 Stan Cox <scox@redhat.com> - 11.0.0-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jul 08 2021 Stan Cox <scox@redhat.com> - 11.0.1
-- Update to 11.0.1
-
-* Fri Apr 30 2021 Stan Cox <scox@redhat.com> - 11.0.0
 - 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)