!39 Solve systemtap build problem in openEuler:MultiLanguage

From: @langfei295455 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229

0001-Add-init-type-cast-to-resolve-gcc-issue.patch

@@ -0,0 +1,53 @@
+From: Qiang Wei <qiang.wei@suse.com>
+Subject: [PATCH] Add int type cast to resolve gcc issue for option
+  Wformat=2.
+
+In ncruses 6.3 version, there is type complain for function wprintw
+  when gcc has option -Wformat=2.
+
+Signed-off-by: Qiang Wei <qiang.wei@suse.com>
+--- a/staprun/monitor.c	2022-03-09 06:45:30.534000000 +0000
++++ b/staprun/monitor.c	2022-03-09 06:48:49.804000000 +0000
+@@ -448,12 +448,12 @@
+       if (active_window == 0)
+         wattron(status, A_BOLD);
+       wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n",
+-              width[p_index], HIGHLIGHT("index", p_index, comp_fn_index),
+-              width[p_state], HIGHLIGHT("state", p_state, comp_fn_index),
+-              width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index),
+-              width[p_min], HIGHLIGHT("min", p_min, comp_fn_index),
+-              width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index),
+-              width[p_max], HIGHLIGHT("max", p_max, comp_fn_index),
++              (int)width[p_index], HIGHLIGHT("index", p_index, comp_fn_index),
++              (int)width[p_state], HIGHLIGHT("state", p_state, comp_fn_index),
++              (int)width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index),
++              (int)width[p_min], HIGHLIGHT("min", p_min, comp_fn_index),
++              (int)width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index),
++              (int)width[p_max], HIGHLIGHT("max", p_max, comp_fn_index),
+               HIGHLIGHT("name", p_name, comp_fn_index));
+       if (active_window == 0)
+         wattroff(status, A_BOLD);
+@@ -466,17 +466,17 @@
+           json_object *probe, *field;
+           probe = json_object_array_get_idx(jso_probe_list, i);
+           json_object_object_get_ex(probe, "index", &field);
+-          wprintw(status, "%*s\t", width[p_index], json_object_get_string(field));
++          wprintw(status, "%*s\t", (int)width[p_index], json_object_get_string(field));
+           json_object_object_get_ex(probe, "state", &field);
+-          wprintw(status, "%*s\t", width[p_state], json_object_get_string(field));
++          wprintw(status, "%*s\t", (int)width[p_state], json_object_get_string(field));
+           json_object_object_get_ex(probe, "hits", &field);
+-          wprintw(status, "%*s\t", width[p_hits], json_object_get_string(field));
++          wprintw(status, "%*s\t", (int)width[p_hits], json_object_get_string(field));
+           json_object_object_get_ex(probe, "min", &field);
+-          wprintw(status, "%*s\t", width[p_min], json_object_get_string(field));
++          wprintw(status, "%*s\t", (int)width[p_min], json_object_get_string(field));
+           json_object_object_get_ex(probe, "avg", &field);
+-          wprintw(status, "%*s\t", width[p_avg], json_object_get_string(field));
++          wprintw(status, "%*s\t", (int)width[p_avg], json_object_get_string(field));
+           json_object_object_get_ex(probe, "max", &field);
+-          wprintw(status, "%*s\t", width[p_max], json_object_get_string(field));
++          wprintw(status, "%*s\t", (int)width[p_max], json_object_get_string(field));
+           getyx(status, discard, cur_x);
+           json_object_object_get_ex(probe, "name", &field);
+           wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field));

0001-PR29094-Include-rpm-rpmcrypto.h-when-required.patch

@@ -0,0 +1,93 @@
+From d752cdd14eefd0dd0c81bb5b4d7787394335a49e Mon Sep 17 00:00:00 2001
+From: William Cohen <wcohen@redhat.com>
+Date: Wed, 27 Apr 2022 14:14:17 -0400
+Subject: [PATCH] PR29094: Include rpm/rpmcrypto.h when required
+
+rpm-4.18.0 moved the prototypes for rpmFreeCrypto() into a new header,
+/usr/include/rpm/rpmcrypto.h.  Have the configure check for it
+and include it when required.
+---
+ config.in      |  3 +++
+ configure      | 19 +++++++++++++++++++
+ configure.ac   |  6 ++++++
+ rpm_finder.cxx |  3 +++
+ 4 files changed, 31 insertions(+)
+
+diff --git a/config.in b/config.in
+index 64740c9..12cd394 100644
+--- a/config.in
++++ b/config.in
+@@ -88,6 +88,9 @@
+ /* have librpm */
+ #undef HAVE_LIBRPM
+ 
++/* have rpmcrypto.h */
++#undef HAVE_RPMCRYPTO_H
++
+ /* have librpmio */
+ #undef HAVE_LIBRPMIO
+ 
+diff --git a/configure b/configure
+index abc4e7f..3694dbb 100755
+--- a/configure
++++ b/configure
+@@ -11524,6 +11524,25 @@ $as_echo "$as_me: WARNING: cannot find librpmio" >&2;}
+   fi
+ fi
+ 
++for ac_header in rpm/rpmcrypto.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "rpm/rpmcrypto.h" "ac_cv_header_rpm_rpmcrypto_h" "$ac_includes_default"
++if test "x$ac_cv_header_rpm_rpmcrypto_h" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_RPM_RPMCRYPTO_H 1
++_ACEOF
++
++
++$as_echo "#define HAVE_RPMCRYPTO_H 1" >>confdefs.h
++
++                      have_rpmcrypto_h=yes
++		      { $as_echo "$as_me:${as_lineno-$LINENO}: separate rpm/rpmcrypto.h" >&5
++$as_echo "$as_me: separate rpm/rpmcrypto.h" >&6;}
++fi
++
++done
++
++
+ LIBS_no_readline=$LIBS
+ 
+ have_libreadline="no"
+diff --git a/configure.ac b/configure.ac
+index 4ef80b7..ccb4fe0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -490,6 +490,12 @@ if test "$with_rpm" != "no"; then
+   fi
+ fi
+ 
++dnl Look for rpmcrypto.h
++AC_CHECK_HEADERS([rpm/rpmcrypto.h], [
++		    AC_DEFINE([HAVE_RPMCRYPTO_H],[1],[have rpmcrypto_h])
++                      have_rpmcrypto_h=yes
++		      AC_MSG_NOTICE([separate rpm/rpmcrypto.h])])
++
+ dnl Look for readline.
+ dnl
+ dnl First save the orignal value of LIBS.
+diff --git a/rpm_finder.cxx b/rpm_finder.cxx
+index 206669b..052058a 100644
+--- a/rpm_finder.cxx
++++ b/rpm_finder.cxx
+@@ -26,6 +26,9 @@ extern "C" {
+ #include <rpm/rpmlib.h>
+ #include <rpm/rpmts.h>
+ #include <rpm/rpmdb.h>
++#ifdef HAVE_RPMCRYPTO_H
++#include <rpm/rpmcrypto.h>
++#endif
+ #include <rpm/header.h>
+ 
+ #ifndef xfree
+-- 
+1.8.3.1
+

systemtap-4.1-vs-4.3.yaml

@@ -0,0 +1,33 @@
+name: systemtap
+old_version: 4.1
+new_version: 4.3
+interface_differences:
+- type: 'feature'
+  item: 支持eBPF功能
+  diff: 新增
+  influence: 支持prometheus导出器、procfs探针等eBPF功能
+- type: 'feature'
+  item: 同名probe解析功能
+  diff: 新增
+  influence: 支持用不同的PC地址去区分多个同名的probe
+- type: 'feature'
+  item: 后端执行器支持try-catch捕获异常
+  diff: 新增
+  influence: 不影响
+- type: 'ABI'
+  item: 新增gettimeofday()
+  diff: 返回当前的时间
+  influence: 不影响
+- type: 'ABI'
+  item: 新增dump_stack()
+  diff: 打印内核调用栈
+  influence: 不影响
+- type: 'ABI'
+  item: gettimeofday_*
+  diff: 返回当前的时间
+  influence: 不影响
+- type: 'CLI'
+  item: 加强对$variable变量类型的检查
+  diff: 可能在解析和编译的时候输出更多的告警信息
+  influence: 尽可能的修正这些告警信息，虽然不会影响最终的执行结果
+remark: '功能增强，无影响;'

systemtap.spec

@@ -21,13 +21,16 @@
 %undefine __brp_mangle_shebangs
 
 Name: systemtap
-Version: 4.3
-Release: 1
+Version: 4.5
+Release: 5
 Summary: Linux trace and probe tool
 License: GPLv2+ and Public Domain
 URL: http://sourceware.org/systemtap
 Source: https://sourceware.org/systemtap/ftp/releases/%{name}-%{version}.tar.gz
 
+Patch1: 0001-Add-init-type-cast-to-resolve-gcc-issue.patch
+Patch2: 0001-PR29094-Include-rpm-rpmcrypto.h-when-required.patch
+
 BuildRequires: gcc-c++ emacs systemd python3-setuptools
 BuildRequires: gettext-devel rpm-devel readline-devel
 BuildRequires: pkgconfig(nss) pkgconfig(avahi-client)
@@ -44,7 +47,6 @@ BuildRequires: crash-devel zlib-devel
 %endif
 
 Requires: systemtap-client = %{version}-%{release}
-Requires: systemtap-devel = %{version}-%{release}
 
 %description
 SystemTap is an instrumentation system for systems running Linux.
@@ -55,7 +57,7 @@ the components needed to locally develop and execute systemtap scripts.
 %package devel
 Summary: Programmable system-wide instrumentation system - development headers, tools
 License: GPLv2+
-Requires: gcc make kernel-devel systemd
+Requires: make kernel-devel systemd
 
 %description devel
 This package contains the components needed to compile a systemtap
@@ -169,7 +171,7 @@ URL: http://sourceware.org/systemtap
 This package include systemtap manual
 
 %prep
-%setup -q %{?setup_elfutils}
+%autosetup -p1
 
 %build
 %configure \
@@ -325,8 +327,11 @@ fi
 exit 0
 
 %preun stap-exporter
+if [ "$1" -eq "0" ] ; then
 /bin/systemctl stop stap-exporter.service >/dev/null 2>&1 || :
 /bin/systemctl disable stap-exporter.service >/dev/null 2>&1 || :
+fi
+exit 0
 
 %post
 /bin/systemctl enable systemtap.service >/dev/null 2>&1 || :
@@ -452,7 +457,31 @@ exit 0
 %{_mandir}/man[1378]/*
 
 %changelog
-* Thu Jul 21 2020 jinzhimin <jinzhimin2@huawei.com> - 4.3-1
+* Mon Feb 6 2023 langfei<langfei@huawei.com> - 4.5-5
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:Solve systemtap build problem in openEuler:MultiLanguage
+
+* Mon Dec 5 2022 langfei<langfei@huawei.com> - 4.5-4
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:Resolve stap-exporter.service chenge to disable when upgraded systemtap-stap-exporter package
+
+* Fri Apr 8 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 4.5-3
+- Add int type cast to resolve gcc issue for option Wformat=2
+
+* Tue Feb 15 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 4.5-2
+- Remove requires on gcc and systemtap-devel
+
+* Thu Dec 2 2021 zhouwenpei <zhouwenpei1@huawei.com> - 4.5-1
+- upgrade to 4.5
+
+* Mon Feb 1 2021 xinghe <xinghe1@huawei.com> - 4.4-1
+- upgrade to 4.4
+
+* Tue Jul 21 2020 jinzhimin <jinzhimin2@huawei.com> - 4.3-1
 - upgrade to 4.3
 
 * Fri Mar 13 2020 yuxiangyang <yuxiangyang4@huawei.com> - 4.1.3