From 9949e1805494ab239f5c2813261df7d0f63bccc6 Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Sun, 18 Aug 2019 17:33:14 -0400
Subject: [PATCH] Update bundled libipt copy to v2.0.1.

---
 .gitignore |  2 +-
 gdb.spec   | 23 +++++++++++++----------
 sources    |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 625593d..5f27409 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
-/v2.0.tar.gz
 /gdb-8.3.50.20190816.tar.xz
+/v2.0.1.tar.gz
diff --git a/gdb.spec b/gdb.spec
index 98797c4..16dbd14 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -35,7 +35,7 @@ Version: 8.3.50.%{snapsrc}
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 23%{?dist}
+Release: 24%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
 # Do not provide URL for snapshots as the file lasts there only for 2 days.
@@ -182,7 +182,7 @@ Source5: %{libstdcxxpython}.tar.xz
 Source6: gdbtui
 
 # libipt: Intel Processor Trace Decoder Library
-%global libipt_version 2.0
+%global libipt_version 2.0.1
 #=fedora
 Source7: v%{libipt_version}.tar.gz
 #=fedora
@@ -442,7 +442,7 @@ tar xJf %{SOURCE5}
 %if 0%{have_libipt} && 0%{?el7:1} && 0%{?scl:1}
 tar xzf %{SOURCE7}
 (
- cd processor-trace-%{libipt_version}
+ cd libipt-%{libipt_version}
 %patch1142 -p1
 )
 %endif
@@ -649,21 +649,21 @@ CFLAGS="$CFLAGS -DNEED_DETACH_SIGSTOP"
 
 %if 0%{have_libipt} && 0%{?el7:1} && 0%{?scl:1}
 (
- mkdir processor-trace-%{libipt_version}-root
- mkdir processor-trace-%{libipt_version}-build
- cd    processor-trace-%{libipt_version}-build
+ mkdir libipt-%{libipt_version}-root
+ mkdir libipt-%{libipt_version}-build
+ cd    libipt-%{libipt_version}-build
  # -DPTUNIT:BOOL=ON has no effect on ctest.
  %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DPTUNIT:BOOL=OFF \
 	-DDEVBUILD:BOOL=ON \
-	../../processor-trace-%{libipt_version}
+	../../libipt-%{libipt_version}
  make VERBOSE=1 %{?_smp_mflags}
  ctest -V %{?_smp_mflags}
- make install DESTDIR=../processor-trace-%{libipt_version}-root
+ make install DESTDIR=../libipt-%{libipt_version}-root
 )
 # There is also: --with-libipt-prefix
-CFLAGS="$CFLAGS -I$PWD/processor-trace-%{libipt_version}-root%{_includedir}"
-LDFLAGS="$LDFLAGS -L$PWD/processor-trace-%{libipt_version}-root%{_libdir}"
+CFLAGS="$CFLAGS -I$PWD/libipt-%{libipt_version}-root%{_includedir}"
+LDFLAGS="$LDFLAGS -L$PWD/libipt-%{libipt_version}-root%{_libdir}"
 %endif
 
 export CXXFLAGS="$CFLAGS"
@@ -1141,6 +1141,9 @@ fi
 %endif
 
 %changelog
+* Sun Aug 18 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 8.3.50.20190816-24
+- Update bundled libipt copy to v2.0.1.
+
 * Fri Aug 16 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 8.3.50.20190816-23
 - Rebase to FSF GDB 8.3.50.20190816 (8.4pre).
 - Drop 'gdb-testsuite-readline63-sigint.patch'.
diff --git a/sources b/sources
index 15119b7..e98d8d7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz) = a8b1c54dd348cfeb37da73f968742896be3dd13a4215f8d8519870c2abea915f5176c3fa6989ddd10f20020a16f0fab20cbae68ee8d58a82234d8778023520f8
-SHA512 (v2.0.tar.gz) = ec63151e842c81cc73ea11ba560b63e005cefbe19d98de24ae5c8caa4de7c9c1d71d1ec5b6214a347592eac675b75a3d2b26d4691ca86f91020ebfea8e912939
 SHA512 (gdb-8.3.50.20190816.tar.xz) = 03f7572bbceead6f1739d981cb89c38830b55432f3f5012d9d72f7c4bf296bed2d9bd3523ea724b097dfbf0d563cb96c637ee8a6efa8f232330dfe9a5e14bb42
+SHA512 (v2.0.1.tar.gz) = e38e93908c3fbf1f2384cfca381eaf4bf667033de678041bd440adac8bbce4757b77304868896256ed72c202ee22ba1646aada90125029f14f5bffaf828a7df4