From 4bb26998b0efe2f34922b7aa1677a70466f5c44b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 11 2019 09:30:43 +0000
Subject: import devtoolset-8-dyninst-9.3.2-6.el7


---

diff --git a/SOURCES/shared-cmake.patch b/SOURCES/shared-cmake.patch
new file mode 100644
index 0000000..8d72b92
--- /dev/null
+++ b/SOURCES/shared-cmake.patch
@@ -0,0 +1,13 @@
+# BZ1503116 possible soname clashes between base rhel- and devtoolset- dyninst 
+
+--- ./dyninst-9.3.2/cmake/shared.cmake.sv	2018-01-04 00:08:30.309490754 -0500
++++ ./dyninst-9.3.2/cmake/shared.cmake	2018-01-03 22:21:00.660870105 -0500
+@@ -7,7 +7,7 @@
+ 
+ add_definitions(-DBOOST_ALL_NO_LIB=1)
+ set (SOVERSION "${DYNINST_MAJOR_VERSION}.${DYNINST_MINOR_VERSION}")
+-set (LIBVERSION "${SOVERSION}.${DYNINST_PATCH_VERSION}")
++set (LIBVERSION "dts.${SOVERSION}.${DYNINST_PATCH_VERSION}")
+ set (DYNINST_VERSION "${LIBVERSION}")
+ 
+ if(CMAKE_CONFIGURATION_TYPES)
diff --git a/SPECS/dyninst.spec b/SPECS/dyninst.spec
index 51feed6..757dba1 100644
--- a/SPECS/dyninst.spec
+++ b/SPECS/dyninst.spec
@@ -4,7 +4,7 @@ Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: %{?scl_prefix}dyninst
 Group: Development/Libraries
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.dyninst.org
 Version: 9.3.2
 Exclusiveos: linux
@@ -23,6 +23,7 @@ Patch3: Object-elf.patch
 Patch4: dyninst-9.3.2-sstream.patch
 Patch5: dyninst-9.3.2-gcc8.patch
 Patch6: dyninst-9.3.2-glibc-rpc.patch
+Patch7: shared-cmake.patch
 
 %global dyninst_base dyninst-%{version}
 # Explicit version since it does not match the source version
@@ -116,6 +117,7 @@ making sure that dyninst works properly.
 %patch4 -p0 -b .sstream
 %patch5 -p1 -b .gcc8
 %patch6 -p1 -b .glibc-rpc
+%patch7 -p1 -b .shcmake
 
 # XXX: bundled libdwarf
 %setup -q -T -D -b 3
@@ -183,12 +185,13 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
 # echo "%{_libdir}/dyninst" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 
+# we now strip debuginfo so this is not required
 # Ugly hack to mask testsuite files from debuginfo extraction.  Running the
 # testsuite requires debuginfo, so extraction is useless.  However, debuginfo
 # extraction is still nice for the main libraries, so we don't want to disable
 # it package-wide.  The permissions are restored by attr(755,-,-) in files.
-find %{buildroot}%{_libdir}/dyninst/testsuite/ \
-  -type f '!' -name '*.a' -execdir chmod 644 '{}' '+'
+# find %{buildroot}%{_libdir}/dyninst/testsuite/ \
+#   -type f '!' -name '*.a' -execdir chmod 644 '{}' '+'
 
 # %post -p /sbin/ldconfig
 # %postun -p /sbin/ldconfig
@@ -198,6 +201,8 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 
 %dir %{_libdir}/dyninst
 %{_libdir}/dyninst/*.so.*
+# dyninst mutators dlopen the runtime library
+%{_libdir}/dyninst/libdyninstAPI_RT.so
 
 %doc %{dyninst_base}/COPYRIGHT
 %doc %{dyninst_base}/LGPL
@@ -231,11 +236,15 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %defattr(-,root,root,-)
 %{_bindir}/parseThat
 %dir %{_libdir}/dyninst/testsuite/
-# Restore the permissions that were hacked out above, during install.
 %attr(755,root,root) %{_libdir}/dyninst/testsuite/*[!a]
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
+* Tue Jan 8 2019 Stan Cox <scox@redhat.com> - 9.3.2-6
+- rhbz1498558 Needs dyninst-devtoolset installed
+- rhbz1470149 Use separate debuginfo for dyninst-testsuite
+- rhbz1647471 so name clashes
+
 * Tue Jul 17 2018 William Cohen <wcohen@redhat.com> - 9.3.2-5
 - Avoid conditional patching of source files.