From a7a4005ad46713e4de3b87f65d436f0ecb694275 Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Fri, 21 Jan 2022 10:43:25 +0100
Subject: [PATCH] Fix rhbz2027683 - python probing regression

Resolves: #2027683
---
 rhbz2027683.patch                    | 29 ++++++++++++++++++++++++++++
 bz2041526.patch => rhbz2041526.patch |  0
 systemtap.spec                       | 11 ++++++++---
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 rhbz2027683.patch
 rename bz2041526.patch => rhbz2041526.patch (100%)

diff --git a/rhbz2027683.patch b/rhbz2027683.patch
new file mode 100644
index 0000000..f766704
--- /dev/null
+++ b/rhbz2027683.patch
@@ -0,0 +1,29 @@
+commit 39b5233271b997811632871e1b6620a89b384fe8
+Author: Martin Cermak <mcermak@redhat.com>
+Date:   Thu Jan 20 18:18:00 2022 +0100
+
+    Fix python probing rhbz2027683
+
+diff --git a/tapset/python.stp b/tapset/python.stp
+new file mode 100644
+index 000000000..b5d06fcd9
+--- /dev/null
++++ b/tapset/python.stp
+@@ -0,0 +1,17 @@
++/* Systemtap tapset to make it easier to trace Python */
++
++/*
++   Define python.function.entry/return:
++*/
++probe python.function.entry = process("python").library("/usr/lib*/libpython*.so*").mark("function__entry")
++{
++    filename = user_string($arg1);
++    funcname = user_string($arg2);
++    lineno = $arg3;
++}
++probe python.function.return = process("python").library("/usr/lib*/libpython*.so*").mark("function__return")
++{
++    filename = user_string($arg1);
++    funcname = user_string($arg2);
++    lineno = $arg3;
++}
diff --git a/bz2041526.patch b/rhbz2041526.patch
similarity index 100%
rename from bz2041526.patch
rename to rhbz2041526.patch
diff --git a/systemtap.spec b/systemtap.spec
index 3276526..4cffb7f 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -118,7 +118,7 @@ m     stapdev  stapdev
 
 Name: systemtap
 Version: 4.6
-Release: 6%{?release_override}%{?dist}
+Release: 7%{?release_override}%{?dist}
 # for version, see also configure.ac
 
 
@@ -157,7 +157,8 @@ Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
 Patch1: rhbz2025054python3.patch
 Patch2: rhbz1972798.patch
 Patch3: sdt-asm-glibc.patch
-Patch4: bz2041526.patch
+Patch4: rhbz2041526.patch
+Patch5: rhbz2027683.patch
 
 # Build*
 BuildRequires: make
@@ -583,6 +584,7 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 
@@ -1279,8 +1281,11 @@ exit 0
 
 # PRERELEASE
 %changelog
+* Fri Jan 21 2022 Martin Cermak <mcermak@redhat.com> - 4.6-7
+- rhbz2027683: python tapset regression
+
 * Mon Jan 17 2022 Martin Cermak <mcermak@redhat.com> - 4.6-6
-- bz2041526/pr28634: move elevator.h to block/
+- rhbz2041526/pr28634: move elevator.h to block/
 
 * Tue Dec 07 2021 Stan Cox <scox@redhat.com> - 4.6.5
 - sys/sdt.h remove aarch64 and s390 float constraints