Source: systemtap Version: 2.6-0.1 Severity: wishlist I have just NMU'd systemtap_2.6.0-0.1 in order to get #747090 fixed. Here are the patches that I applied after adding the new upstream sources.
Cheers, -Hilko
>From 971d2b246c0edaafbfaabef7feb36a039f12a51a Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Wed, 24 Sep 2014 11:51:08 +0200 Subject: [PATCH 1/3] Rebased patches --- ...nels-handle-cpufreq_register_notifier-fai.patch | 53 ---------------------- ...filter-tolerate-absent-context-when-colle.patch | 32 ------------- debian/patches/dtrace-no-std-include-path.diff | 16 +++---- debian/patches/series | 2 - debian/patches/suggest-readme.debian.diff | 2 +- 5 files changed, 9 insertions(+), 96 deletions(-) delete mode 100644 debian/patches/0001-For-xen-kernels-handle-cpufreq_register_notifier-fai.patch delete mode 100644 debian/patches/0001-PR15803-netfilter-tolerate-absent-context-when-colle.patch diff --git a/debian/patches/0001-For-xen-kernels-handle-cpufreq_register_notifier-fai.patch b/debian/patches/0001-For-xen-kernels-handle-cpufreq_register_notifier-fai.patch deleted file mode 100644 index 3844ff4..0000000 --- a/debian/patches/0001-For-xen-kernels-handle-cpufreq_register_notifier-fai.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2ea7af0997f817425c751b41601efb7fff2fb509 Mon Sep 17 00:00:00 2001 -From: Timo Juhani Lindfors <[email protected]> -Date: Fri, 2 Aug 2013 13:05:26 -0500 -Subject: [PATCH] For xen kernels, handle cpufreq_register_notifier() failure. - -* runtime/time.c (_stp_kill_time): If cpufreq_register_notifier() - suceeded, unregister the notifier. - (_stp_init_time): On xen kernels, cpufreq_register_notifier() can - fail. Just ignore the error. ---- - runtime/time.c | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/runtime/time.c b/runtime/time.c -index 34df72a..068db0a 100644 ---- a/runtime/time.c -+++ b/runtime/time.c -@@ -57,6 +57,9 @@ typedef struct __stp_time_t { - } stp_time_t; - - static void *stp_time = NULL; -+#ifdef CONFIG_CPU_FREQ -+static int __stp_cpufreq_notifier_registered = 0; -+#endif - - /* Try to estimate the number of CPU cycles in a millisecond - i.e. kHz. This - * relies heavily on the accuracy of udelay. By calling udelay twice, we -@@ -215,7 +218,7 @@ _stp_kill_time(void) - del_timer_sync(&time->timer); - } - #ifdef CONFIG_CPU_FREQ -- if (!__stp_constant_freq()) { -+ if (!__stp_constant_freq() && __stp_cpufreq_notifier_registered) { - cpufreq_unregister_notifier(&__stp_time_notifier, - CPUFREQ_TRANSITION_NOTIFIER); - } -@@ -253,10 +256,9 @@ _stp_init_time(void) - - #ifdef CONFIG_CPU_FREQ - if (!ret && !__stp_constant_freq()) { -- ret = cpufreq_register_notifier(&__stp_time_notifier, -- CPUFREQ_TRANSITION_NOTIFIER); -- -- if (!ret) { -+ if (!cpufreq_register_notifier(&__stp_time_notifier, -+ CPUFREQ_TRANSITION_NOTIFIER)) { -+ __stp_cpufreq_notifier_registered = 1; - for_each_online_cpu(cpu) { - unsigned long flags; - int freq_khz = cpufreq_get(cpu); --- -1.7.2.5 - diff --git a/debian/patches/0001-PR15803-netfilter-tolerate-absent-context-when-colle.patch b/debian/patches/0001-PR15803-netfilter-tolerate-absent-context-when-colle.patch deleted file mode 100644 index b13b3dd..0000000 --- a/debian/patches/0001-PR15803-netfilter-tolerate-absent-context-when-colle.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6b5871b006dfc6f714921838dfecd5e6cec9c943 Mon Sep 17 00:00:00 2001 -From: Frank Ch. Eigler <[email protected]> -Date: Tue, 30 Jul 2013 08:26:59 -0400 -Subject: [PATCH] PR15803: netfilter: tolerate absent context when collecting $verdict - -It is possible to skip from the prologue epilogue through to the -prologue for reasons such as shortage of available stack space. -In these cases, the context* c; pointer could remain NULL, which -is considered generally inappropriate to dereference. - -* tapset-netfilter.cxx (epilogue): Check for NULL c before extracting - $verdict. ---- - tapset-netfilter.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/tapset-netfilter.cxx b/tapset-netfilter.cxx -index af9fc3c..15a3180 100644 ---- a/tapset-netfilter.cxx -+++ b/tapset-netfilter.cxx -@@ -317,7 +317,7 @@ netfilter_derived_probe_group::emit_module_decls (systemtap_session& s) - common_probe_entryfn_epilogue (s, false); - - if (np->context_vars.find("__nf_verdict") != np->context_vars.end()) -- s.op->newline() << "nf_verdict = (int) "+c_p+"." + s.up->c_localname("__nf_verdict") + ";"; -+ s.op->newline() << "if (c != NULL) nf_verdict = (int) "+c_p+"." + s.up->c_localname("__nf_verdict") + ";"; - - s.op->newline() << "return nf_verdict;"; - s.op->newline(-1) << "}"; --- -1.7.2.5 - diff --git a/debian/patches/dtrace-no-std-include-path.diff b/debian/patches/dtrace-no-std-include-path.diff index 8077612..0666bae 100644 --- a/debian/patches/dtrace-no-std-include-path.diff +++ b/debian/patches/dtrace-no-std-include-path.diff @@ -2,12 +2,12 @@ Index: b/dtrace.in =================================================================== --- a/dtrace.in +++ b/dtrace.in -@@ -265,7 +265,7 @@ def main(): - CC = os.environ.get("CC", "gcc") - CFLAGS = "-g " + os.environ.get("CFLAGS", "") - retcode = call(shlex.split(CC) + defines + includes + shlex.split(CFLAGS) + -- ["-fPIC", "-I.", "-I@prefix@/include", "-c", fn, "-o", -+ ["-fPIC", "-I.", "-c", fn, "-o", +@@ -387,7 +387,7 @@ def main(): + cc1 = os.environ.get("CC", "gcc") + cflags = "-g " + os.environ.get("CFLAGS", "") + retcode = call(split(cc1) + defines + includes + split(cflags) + +- ["-fPIC", "-I.", "-I@prefix@/include", "-c", fname, "-o", ++ ["-fPIC", "-I.", "-c", fname, "-o", filename + suffix], shell=False) - if (retcode != 0): - print "\"gcc " + fn + "\" failed" + if retcode != 0: + print "\"gcc " + fname + "\" failed" diff --git a/debian/patches/series b/debian/patches/series index d78bc8d..01df263 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ debversion.diff suggest-readme.debian.diff -0001-For-xen-kernels-handle-cpufreq_register_notifier-fai.patch -0001-PR15803-netfilter-tolerate-absent-context-when-colle.patch dtrace-no-std-include-path.diff diff --git a/debian/patches/suggest-readme.debian.diff b/debian/patches/suggest-readme.debian.diff index 82c5586..db9cdab 100644 --- a/debian/patches/suggest-readme.debian.diff +++ b/debian/patches/suggest-readme.debian.diff @@ -3,7 +3,7 @@ Author: Timo Juhani Lindfors <[email protected]> Forwarded: not-needed --- a/main.cxx +++ b/main.cxx -@@ -1126,6 +1126,8 @@ +@@ -1226,6 +1226,8 @@ cleanup (s, rc); assert_no_interrupts(); -- 2.1.1
>From a3c2826e3dfba8a0680222daae4d94f600527013 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Thu, 25 Sep 2014 22:44:31 +0200 Subject: [PATCH 2/3] Changed dh-autoreconf build-dependency to autotools-dev as noticed by Lintian --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 755d135..8611026 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Ritesh Raj Sarraf <[email protected]> Uploaders: Timo Juhani Lindfors <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, libelf-dev (>= 0.148), +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libelf-dev (>= 0.148), libdw-dev (>= 0.148), libsqlite3-dev, texlive-latex-base, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended, libnss3-dev, libnspr4-dev, pkg-config, libnss3-tools, xmlto, latex2html, libavahi-client-dev -- 2.1.1
>From cbeaab6abc002463024b5a199ac1fc2f49a31738 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Thu, 25 Sep 2014 22:44:57 +0200 Subject: [PATCH 3/3] 2.6-0.1 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index cb1c3ad..1e7169c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +systemtap (2.6-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream release + - No longer fails to compile with recent Debian kernels + (Closes: #747090) + - No longer fails to compile procfs probes (Closes: #761168) + * Rebased patches + * Changed dh-autoreconf build-dependency to autotools-dev as noticed by + Lintian + + -- Hilko Bengen <[email protected]> Thu, 25 Sep 2014 22:44:45 +0200 + systemtap (2.3-2.3) unstable; urgency=medium * Non-maintainer upload. -- 2.1.1
