diff --git a/fix-network-tcp-test.patch b/fix-network-tcp-test.patch deleted file mode 100644 index 48843d5..0000000 --- a/fix-network-tcp-test.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/tapset/linux/ipmib.stp -+++ b/tapset/linux/ipmib.stp -@@ -271,7 +271,7 @@ - * IPSTATS_MIB_INUNKNOWNPROTOS) - */ - /* icmp_send() is called by ip_local_deliver_finish() */ --probe ipmib.InUnknownProtos=kernel.function("icmp_send") -+probe ipmib.InUnknownProtos=kernel.function("__icmp_send") - { - skb = $skb_in; - op = 1; -@@ -360,7 +360,7 @@ - * counted in the global @ReasmTimeout (equivalent to SNMP's MIB - * IPSTATS_MIB_REASMTIMEOUT) - */ --probe ipmib.ReasmTimeout=kernel.function("icmp_send") -+probe ipmib.ReasmTimeout=kernel.function("__icmp_send") - { - skb = $skb_in; - op = 0; ---- a/tapset/linux/linuxmib.stp -+++ b/tapset/linux/linuxmib.stp -@@ -30,7 +30,7 @@ - - probe _linuxmib.DelayedACKs.A = kernel.function("tcp_send_ack") - { -- sk=$sk -+ sk=pointer_arg(1) - if ( !indelack_timer[sk] ) next - op=1 - key = linuxmib_filter_key(sk,op); ---- a/testsuite/systemtap.examples/network/tcp_trace.stp -+++ b/testsuite/systemtap.examples/network/tcp_trace.stp -@@ -192,7 +192,7 @@ - } - } - --probe kernel.function("tcp_transmit_skb") -+probe kernel.function("__tcp_transmit_skb") - { - sk = $sk - key = filter_key(sk) diff --git a/fix-py3example-script-run-fail-2.patch b/fix-py3example-script-run-fail-2.patch deleted file mode 100644 index d212f5e..0000000 --- a/fix-py3example-script-run-fail-2.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/testsuite/systemtap.examples/general/tapset/python3_local.stp -+++ b/testsuite/systemtap.examples/general/tapset/python3_local.stp -@@ -182,7 +182,7 @@ - n = @cast (dict, "PyDictObject", @PYTHON3_LIBRARY)->ma_used; - if (i > n || entries == 0) - return 0 -- return @cast (entries, "PyDictKeysObject", @PYTHON3_LIBRARY)->dk_entries[i]->me_hash -+ return @cast (@DK_ENTRIES(entries), "PyDictKeyEntry", @PYTHON3_LIBRARY)[i]->me_hash - } - - # FUNCTION P3_GET_DICT_KEY -@@ -195,7 +195,7 @@ - n = @cast (dict, "PyDictObject", @PYTHON3_LIBRARY)->ma_used; - if (i > n || entries == 0) - return 0 -- return @cast (entries, "PyDictKeysObject", @PYTHON3_LIBRARY)->dk_entries[i]->me_key -+ return @cast (@DK_ENTRIES(entries), "PyDictKeyEntry", @PYTHON3_LIBRARY)[i]->me_key - } - - # FUNCTION P3_GET_DICT_VALUE -@@ -214,7 +214,7 @@ - n = @cast (dict, "PyDictObject", @PYTHON3_LIBRARY)->ma_used; - if (i > n || entries == 0) - return 0 -- return @cast (entries, "PyDictKeysObject", @PYTHON3_LIBRARY)->dk_entries[i]->me_value -+ return @cast (@DK_ENTRIES(entries), "PyDictKeyEntry", @PYTHON3_LIBRARY)[i]->me_value - } - } - diff --git a/fix-py3example-script-run-fail.patch b/fix-py3example-script-run-fail.patch deleted file mode 100644 index bf02071..0000000 --- a/fix-py3example-script-run-fail.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/testsuite/systemtap.examples/general/tapset/python_local.stpm b/testsuite/systemtap.examples/general/tapset/python_local.stpm ---- a/testsuite/systemtap.examples/general/tapset/python_local.stpm -+++ b/testsuite/systemtap.examples/general/tapset/python_local.stpm -@@ -8,4 +8,39 @@ - @define PYTHON3_LIBRARY - %( -- "/usr/lib64/libpython3.4m.so.1.0" -+ "/usr/lib64/libpython3.7m.so.1.0" - %) -+ -+@define Py3DictKeysObject(object) %( -+ @cast(@object, "PyDictKeysObject", @PYTHON3_LIBRARY) -+ %) -+@define Py3DictKeyEntry(object) %( -+ @cast(@object, "PyDictKeyEntry", @PYTHON3_LIBRARY) -+ %) -+ -+@define DK_SIZE(dk) %( -+ @Py3DictKeysObject(@dk)->dk_size -+%) -+@define DK_IXSIZE(dk) %( -+ %( CONFIG_64BIT == "y" %? -+ %( CONFIG_COMPAT == "y" %? -+ (@__compat_task -+ ? (@DK_SIZE(@dk) <= 0xff ? 1 : (@DK_SIZE(@dk) <= 0xffff ? 2 -+: 4)) -+ : (@DK_SIZE(@dk) <= 0xff ? -+ 1 : (@DK_SIZE(@dk) <= 0xffff ? -+ 2 : (@DK_SIZE(@dk) <= 0xffffffff ? 4 : 8)))) -+ %: -+ (@DK_SIZE(@dk) <= 0xff ? -+ 1 : (@DK_SIZE(@dk) <= 0xffff ? -+ 2 : (@DK_SIZE(@dk) <= 0xffffffff ? 4 : 8))) -+ %) -+ %: -+ (@DK_SIZE(@dk) <= 0xff ? 1 : (@DK_SIZE(@dk) <= 0xffff ? 2 : 4)) -+ %) -+%) -+ -+@define DK_ENTRIES(dk) %( -+ (@choose_defined(@Py3DictKeysObject(@dk)->dk_entries, -+(&@Py3DictKeyEntry(&@Py3DictKeysObject(@dk)->dk_indices[@DK_SIZE(@dk) * -+@DK_IXSIZE(@dk)])))) -+%) diff --git a/systemtap-4.1.tar.gz b/systemtap-4.1.tar.gz deleted file mode 100644 index 666604a..0000000 Binary files a/systemtap-4.1.tar.gz and /dev/null differ diff --git a/systemtap-4.3.tar.gz b/systemtap-4.3.tar.gz new file mode 100644 index 0000000..26c5d88 Binary files /dev/null and b/systemtap-4.3.tar.gz differ diff --git a/systemtap.spec b/systemtap.spec index b00a3b2..ee4f176 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -21,17 +21,13 @@ %undefine __brp_mangle_shebangs Name: systemtap -Version: 4.1 -Release: 3 +Version: 4.3 +Release: 1 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 -Patch0: fix-py3example-script-run-fail.patch -Patch1: fix-py3example-script-run-fail-2.patch -Patch2: fix-network-tcp-test.patch - BuildRequires: gcc-c++ emacs systemd python3-setuptools BuildRequires: gettext-devel rpm-devel readline-devel BuildRequires: pkgconfig(nss) pkgconfig(avahi-client) @@ -456,6 +452,9 @@ exit 0 %{_mandir}/man[1378]/* %changelog +* Thu Jul 21 2020 jinzhimin - 4.3-1 +- upgrade to 4.3 + * Fri Mar 13 2020 yuxiangyang - 4.1.3 - remove java-runtime @@ -463,4 +462,4 @@ exit 0 - Delete the requirement of python2-pyparsing * Mon Aug 12 2019 openEuler Buildteam - 4.1.1 -- Package init \ No newline at end of file +- Package init