development/systemtap: Updated for version 4.5.

Patched for the newer gcc (thanks to Lockywolf!)

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 59 insertions, 4 deletions

diff --git a/development/systemtap/int.patch b/development/systemtap/int.patch
new file mode 100644
index 0000000000..b412a51894
--- /dev/null
+++ b/development/systemtap/int.patch
@@ -0,0 +1,48 @@
+Lockywolf <lockywolf@gmail.com>
+
+diff -Naur systemtap-4.5.orig/staprun/monitor.c systemtap-4.5/staprun/monitor.c
+--- systemtap-4.5.orig/staprun/monitor.c	2021-05-07 21:20:39.000000000 +0200
++++ systemtap-4.5/staprun/monitor.c	2021-10-15 11:57:04.770964000 +0200
+@@ -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));
diff --git a/development/systemtap/systemtap.SlackBuild b/development/systemtap/systemtap.SlackBuild
index cc31dbd3be..62eff9de5b 100644
--- a/development/systemtap/systemtap.SlackBuild
+++ b/development/systemtap/systemtap.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=systemtap
-VERSION=${VERSION:-4.1}
+VERSION=${VERSION:-4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -80,6 +80,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/int.patch
+
+export PYTHON=python3
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -95,6 +99,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+# stap-server is not supported by this build
+rm -fR $PKG/var/run
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/development/systemtap/systemtap.info b/development/systemtap/systemtap.info
index 916de83df8..e8be62cd34 100644
--- a/development/systemtap/systemtap.info
+++ b/development/systemtap/systemtap.info
@@ -1,8 +1,8 @@
 PRGNAM="systemtap"
-VERSION="4.1"
+VERSION="4.5"
 HOMEPAGE="https://sourceware.org/systemtap/"
-DOWNLOAD="https://sourceware.org/systemtap/ftp/releases/systemtap-4.1.tar.gz"
-MD5SUM="0cc7403c7b5e442a2fa92fe01ea3a636"
+DOWNLOAD="https://sourceware.org/systemtap/ftp/releases/systemtap-4.5.tar.gz"
+MD5SUM="39369e2aa08636ea6600464e9fdc5185"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""