From 7a57a945c5761adee7a0e814132f375db01ab755 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 28 2020 10:44:30 +0000
Subject: import systemtap-4.3-1.el8


---

diff --git a/.gitignore b/.gitignore
index 6ba9fd6..adcfb77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/systemtap-4.2.tar.gz
+SOURCES/systemtap-4.3.tar.gz
diff --git a/.systemtap.metadata b/.systemtap.metadata
index e0f0963..8c485f1 100644
--- a/.systemtap.metadata
+++ b/.systemtap.metadata
@@ -1 +1 @@
-efdb0d6e09ebdfa2acbfdb725542885db2195bb6 SOURCES/systemtap-4.2.tar.gz
+14769266f6591b85895a5f40e516f8228e83476e SOURCES/systemtap-4.3.tar.gz
diff --git a/SPECS/systemtap.spec b/SPECS/systemtap.spec
index 90f51be..5c262d7 100644
--- a/SPECS/systemtap.spec
+++ b/SPECS/systemtap.spec
@@ -10,7 +10,6 @@
 %{!?with_crash: %global with_crash 1}
 %endif
 %{!?with_rpm: %global with_rpm 1}
-%{!?with_bundled_elfutils: %global with_bundled_elfutils 0}
 %{!?elfutils_version: %global elfutils_version 0.142}
 %{!?pie_supported: %global pie_supported 1}
 %{!?with_boost: %global with_boost 0}
@@ -87,7 +86,7 @@
 %define __brp_mangle_shebangs_exclude_from .stp$
 
 Name: systemtap
-Version: 4.2
+Version: 4.3
 Release: 1%{?release_override}%{?dist}
 # for version, see also configure.ac
 
@@ -154,14 +153,7 @@ BuildRequires: crash-devel zlib-devel
 %if %{with_rpm}
 BuildRequires: rpm-devel
 %endif
-%if %{with_bundled_elfutils}
-Source1: elfutils-%{elfutils_version}.tar.gz
-Patch1: elfutils-portability.patch
-BuildRequires: m4
-%global setup_elfutils -a1
-%else
 BuildRequires: elfutils-devel >= %{elfutils_version}
-%endif
 %if %{with_docs}
 BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@@ -514,35 +506,10 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
 # ------------------------------------------------------------------------
 
 %prep
-%setup -q %{?setup_elfutils}
-
-%if %{with_bundled_elfutils}
-cd elfutils-%{elfutils_version}
-%patch1 -p1
-sleep 1
-find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch
-sleep 1
-find . \( -name configure -o -name config.h.in \) -print | xargs touch
-cd ..
-%endif
+%setup -q
 
 %build
 
-%if %{with_bundled_elfutils}
-# Build our own copy of elfutils.
-%global elfutils_config --with-elfutils=elfutils-%{elfutils_version}
-
-# We have to prevent the standard dependency generation from identifying
-# our private elfutils libraries in our provides and requires.
-%global _use_internal_dependency_generator	0
-%global filter_eulibs() /bin/sh -c "%{1} | sed '/libelf/d;/libdw/d;/libebl/d'"
-%global __find_provides %{filter_eulibs /usr/lib/rpm/find-provides}
-%global __find_requires %{filter_eulibs /usr/lib/rpm/find-requires}
-
-# This will be needed for running stap when not installed, for the test suite.
-%global elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils
-%endif
-
 # Enable/disable the dyninst pure-userspace backend
 %if %{with_dyninst}
 %global dyninst_config --with-dyninst
@@ -638,12 +605,9 @@ cd ..
 # We don't ship compileworthy python code, just oddball samples
 %global py_auto_byte_compile 0
 
-%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
+%configure %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
 make %{?_smp_mflags}
 
-%if %{with_emacsvim}
-%{_emacs_bytecompile} emacs/systemtap-mode.el
-%endif
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -1090,10 +1054,6 @@ done
 %dir %{_libexecdir}/systemtap
 %{_libexecdir}/systemtap/libHelperSDT_*.so
 %endif
-%if %{with_bundled_elfutils}
-%dir %{_libdir}/systemtap
-%{_libdir}/systemtap/lib*.so*
-%endif
 %if %{with_emacsvim}
 %{_emacs_sitelispdir}/*.el*
 %{_emacs_sitestartdir}/systemtap-init.el
@@ -1266,6 +1226,24 @@ done
 
 # PRERELEASE
 %changelog
+* Thu Jun 11 2020 Stan Cox <scox@redhat.com> - 4.3-1
+- rhbz1804319: Upstream release.
+
+* Tue Feb 11 2020 Frank Ch. Eigler <fche@redhat.com> - 4.2-6
+- rhbz1795196 cont'd: autoconf fix for kernel change to stack_trace_save_regs
+
+* Tue Jan 28 2020 Frank Ch. Eigler <fche@redhat.com> - 4.2-5
+- rhbz1795196: kallsyms vs. elfutils/vmlinuz
+
+* Thu Jan 23 2020 Frank Ch. Eigler <fche@redhat.com> - 4.2-4
+- rhbz1788662: check for rcu_is_watching() during prologue
+
+* Fri Jan 10 2020 Frank Ch. Eigler <fche@redhat.com> - 4.2-3
+- rhbz1788544: stop bytecompiling systemtap-mode.el
+
+* Fri Jan 10 2020 Frank Ch. Eigler <fche@redhat.com> - 4.2-2
+- rhbz1788648: aarch64 sdt.h parse [x0, x1]
+
 * Tue Nov 19 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-1
 - rhbz1744989: Upstream release.