[FFe] Update Ringtail SystemTap to 2.1

[Björn Töpel]

The current version of SystemTap in Ringtail is 1.7, which is outdated. The latest version is 2.1, which should be included in Ringtail.

From Debian bug report: "It turns out that 1.7 can't cope with 3.6 kernels at all."

Sync from Debian experimental available - http://http.debian.net/debian/pool/main/s/systemtap/systemtap_2.1-1~experimental1.dsc

 systemtap (2.1-1~experimental1) experimental; urgency=low
 .
   * New upstream release (Closes: #690404, #701365, #701365)
     (LP: #803549, #1130626, #1075772).
   * Drop patches that are part of the new upstream release:
     - manpage-syntax1.diff
     - spelling-fixes1.diff
     - spelling-fixes2.diff
     - manpage-paths1.diff
     - fix.CVE-2012-0875.diff
   * Add patches that fix various lintian warnings. These have all
     been accepted upstream so we can get rid of them in the next
     release (thanks Frank Ch. Eigler!):
     - 0001-man-stap.1-escape-minus-sign-properly.patch
     - 0002-man-stap.1-fix-typo.patch
     - 0003-man-stapprobes.3stap-escape-minus-sign-properly.patch
     - 0005-Add-missing-usr-bin-env-stap-to-some-examples.patch
     - 0006-man-stappaths.7-properly-escape-dot-in-the-beginning.patch
     - 0008-man-escape-quote-properly-in-header.patch
     - 0001-configure.ac-remove-temporary-file-after-test.patch
     - 0002-Makefile.am-remove-temporary-symlinks-in-distclean.patch
     - 0003-configure-Makefile-regenerate.patch
     - 0001-tapset-test-adieu.patch
     - 0001-Makefile.am-don-t-install-html-.tmpl-files.patch
     - 0002-Makefile.in-regenerate.patch
     - 0001-manpager-fix-warnings-by-adding-breaks-between-SEE-A.patch
   * Add patch to partially fix #604453:
     - 0001-blacklist-more-unsafe-functions.patch
   * Backport patch to support unreadable System.map on Ubuntu:
     - 0001-translator-tolerate-unavailable-System.map.patch
   * Add patch to suggest reading README.Debian if anything
     fails. Usability testing shows that surprisingly few users
     will find it otherwise :-) This patch can not be forwarded
     upstream but it is very simple.
     - suggest-readme.debian.diff
   * Upload to experimental since wheezy is frozen.
   * Drop systemtap-grapher binary package as it has been
     removed by upstream. Remove its build-dependencies
     libgtkmm-2.4-dev, libboost-dev and libglademm-2.4-dev as well.
   * Add powerpcspe to the architecture list (Closes: #700161).
   * Ship stap-prep to help users figure out what
     debug symbol and header packages they need to install and mention
     this in README.Debian.
   * Add patches to make stap-prep work on Debian:
     - 0001-Prepare-stap-prep-for-support-for-non-rpm-systems.patch
     - 0002-stap-prep-add-support-for-deb-based-systems.patch
     - 0003-man-add-man-page-for-stap-prep-1.patch
     - 0004-man-stap.1-add-reference-to-stap-prep-1.patch
     - 0001-install-stap-prep.1-man-page.patch
     - 0002-man-Makefile.in-regenerate.patch
   * Add patch to improve error messages:
     - 0001-Suggest-running-stap-prep-after-all-failures.patch
   * Enable emacs addon that makes editing .stp files easier.
   * Ensure that build log shows full build commands.
   * Bump Standards-Version to 3.9.4, no changes were needed.

[Timo Juhani Lindfors (timo-lindfors)]

This is issue is also tracked in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690404

[Jarkko Sakkinen (jarkko-sakkinen)]

pbuilder log for http://ftp.de.debian.org/debian/pool/main/s/systemtap/systemtap_2.1-1~experimental1.dsc
built with commands:
pbuilder --create --distribution raring
pbuilder --build --logfile pbuilder.log systemtap_2.1-1~experimental1.dsc
.pbuilderrc has COMPONENTS="main restricted universe multiverse"

[Jarkko Sakkinen (jarkko-sakkinen)]

http://sourceware.org/ml/systemtap/2013-q1/msg00068.html

This is fixed in 2.1. Current version in universe is both old and broken..

[Jarkko Sakkinen (jarkko-sakkinen)]

Side-note: thing to consider for kernel team is whether to enable CONFIG_UPROBES or not. This would allow tracing user space code.

[Stefano Rivera (stefanor)]

Seems like a no-brainer if raring's kernel isn't supported.

I see there is are reverse-build-dependencies. Anyone tested building them against SystemTap 2.1?

Reverse-Build-Depends
=====================
* drizzle (for systemtap-sdt-dev)
* gearmand (for systemtap-sdt-dev)
* libguestfs (for systemtap-sdt-dev)
* ust (for systemtap-sdt-dev)

[Timo Juhani Lindfors (timo-lindfors)]

If I compare the binary packages systemtap-sdt-dev_1.7-1_amd64.deb and systemtap-sdt-dev_2.1-1~experimental1_amd64.deb I see that the changes are minimal:

diff -Nur ./systemtap-sdt-dev_1.7-1_amd64.deb.unpack/usr/bin/dtrace ./systemtap-sdt-dev_2.1-1~experimental1_amd64.deb.unpack/usr/bin/dtrace
--- ./systemtap-sdt-dev_1.7-1_amd64.deb.unpack/usr/bin/dtrace 2012-03-14 14:54:16.000000000 +0200
+++ ./systemtap-sdt-dev_2.1-1~experimental1_amd64.deb.unpack/usr/bin/dtrace 2013-03-07 18:35:49.000000000 +0200
@@ -267,7 +267,9 @@

         (d,fn) = mkstemp(suffix=".c")
         f = open(fn,mode='w')
- f.write("static __dtrace () {}\n")
+ # dummy declaration just to make the object file non-empty
+ f.write("static void __dtrace (void) __attribute__((unused));\n")
+ f.write("static void __dtrace (void) {}\n")
         f.write("\n#include <sys/sdt.h>\n\n")
         providers.semaphore_def_write(f)
         f.close()
diff -Nur ./systemtap-sdt-dev_1.7-1_amd64.deb.unpack/usr/include/sys/sdt.h ./systemtap-sdt-dev_2.1-1~experimental1_amd64.deb.unpack/usr/include/sys/sdt.h
--- ./systemtap-sdt-dev_1.7-1_amd64.deb.unpack/usr/include/sys/sdt.h 2012-03-14 14:54:18.000000000 +0200
+++ ./systemtap-sdt-dev_2.1-1~experimental1_amd64.deb.unpack/usr/include/sys/sdt.h 2013-03-07 18:35:51.000000000 +0200
@@ -130,7 +130,7 @@
   (!__extension__ \
    (__builtin_constant_p ((((unsigned long long) \
        (_SDT_ARGINTTYPE (x)) __sdt_unsp) \
- & (1ULL << (sizeof (unsigned long long) \
+ & ((unsigned long long)1 << (sizeof (unsigned long long) \
            * __CHAR_BIT__ - 1))) == 0) \
     || (_SDT_ARGINTTYPE (x)) -1 > (_SDT_ARGINTTYPE (x)) 0))
 # define _SDT_ARGSIZE(x) \

[Timo Juhani Lindfors (timo-lindfors)]

These changes correspond to the following upstream git commits:

commit d85f7afdbff8b6056ef5221575f6fa6c59b07533
Author: Frank Ch. Eigler <email address hidden>
Date: Fri Aug 10 13:56:36 2012 -0400

    PR14452: drop 1ULL literal from sys/sdt.h

    Use (unsigned long long) 1 instead, which is for some reason kosherer.

commit 69607fca94ea279881df9d8ebc0522793b4d60e2
Author: Frank Ch. Eigler <email address hidden>
Date: Tue Jan 22 16:03:45 2013 -0500

    BZ902739: make dtrace emit slightly cleaner C code

    When generating stub .c files, make sure that the dummy __dtrace() function is
    fully "-Wall -Wextra -pedantic" - clean by adding some decorations.

[Scott Kitterman (kitterman)]

Ack. Approved.

[Scott Kitterman (kitterman)]

I do agree with stefano though. Check and make sure the rdepends still build.

[Timo Juhani Lindfors (timo-lindfors)]

The packages

http://archive.ubuntu.com/ubuntu/pool/universe/d/drizzle/drizzle_7.1.36-stable-1ubuntu1.dsc
http://archive.ubuntu.com/ubuntu/pool/universe/g/gearmand/gearmand_0.33-2.dsc
http://archive.ubuntu.com/ubuntu/pool/universe/libg/libguestfs/libguestfs_1.18.10-1ubuntu2.dsc
http://archive.ubuntu.com/ubuntu/pool/universe/u/ust/ust_2.1.1-1.dsc

seem to build just fine with the new systemtap-sdt-dev. I'll attach build logs.

[Timo Jyrinki (timo-jyrinki)]

Filed the actual sync request (https://wiki.ubuntu.com/SyncRequestProcess) at bug #1154503 with the requestsync tool.

[Launchpad Janitor (janitor)]

This bug was fixed in the package systemtap - 2.1-1~experimental1

---------------
systemtap (2.1-1~experimental1) experimental; urgency=low

  * New upstream release (Closes: #690404, #701365, #701365)
    (LP: #803549, #1130626, #1075772).
  * Drop patches that are part of the new upstream release:
    - manpage-syntax1.diff
    - spelling-fixes1.diff
    - spelling-fixes2.diff
    - manpage-paths1.diff
    - fix.CVE-2012-0875.diff
  * Add patches that fix various lintian warnings. These have all
    been accepted upstream so we can get rid of them in the next
    release (thanks Frank Ch. Eigler!):
    - 0001-man-stap.1-escape-minus-sign-properly.patch
    - 0002-man-stap.1-fix-typo.patch
    - 0003-man-stapprobes.3stap-escape-minus-sign-properly.patch
    - 0005-Add-missing-usr-bin-env-stap-to-some-examples.patch
    - 0006-man-stappaths.7-properly-escape-dot-in-the-beginning.patch
    - 0008-man-escape-quote-properly-in-header.patch
    - 0001-configure.ac-remove-temporary-file-after-test.patch
    - 0002-Makefile.am-remove-temporary-symlinks-in-distclean.patch
    - 0003-configure-Makefile-regenerate.patch
    - 0001-tapset-test-adieu.patch
    - 0001-Makefile.am-don-t-install-html-.tmpl-files.patch
    - 0002-Makefile.in-regenerate.patch
    - 0001-manpager-fix-warnings-by-adding-breaks-between-SEE-A.patch
  * Add patch to partially fix #604453:
    - 0001-blacklist-more-unsafe-functions.patch
  * Backport patch to support unreadable System.map on Ubuntu:
    - 0001-translator-tolerate-unavailable-System.map.patch
  * Add patch to suggest reading README.Debian if anything
    fails. Usability testing shows that surprisingly few users
    will find it otherwise :-) This patch can not be forwarded
    upstream but it is very simple.
    - suggest-readme.debian.diff
  * Upload to experimental since wheezy is frozen.
  * Drop systemtap-grapher binary package as it has been
    removed by upstream. Remove its build-dependencies
    libgtkmm-2.4-dev, libboost-dev and libglademm-2.4-dev as well.
  * Add powerpcspe to the architecture list (Closes: #700161).
  * Ship stap-prep to help users figure out what
    debug symbol and header packages they need to install and mention
    this in README.Debian.
  * Add patches to make stap-prep work on Debian:
    - 0001-Prepare-stap-prep-for-support-for-non-rpm-systems.patch
    - 0002-stap-prep-add-support-for-deb-based-systems.patch
    - 0003-man-add-man-page-for-stap-prep-1.patch
    - 0004-man-stap.1-add-reference-to-stap-prep-1.patch
    - 0001-install-stap-prep.1-man-page.patch
    - 0002-man-Makefile.in-regenerate.patch
  * Add patch to improve error messages:
    - 0001-Suggest-running-stap-prep-after-all-failures.patch
  * Enable emacs addon that makes editing .stp files easier.
  * Ensure that build log shows full build commands.
  * Bump Standards-Version to 3.9.4, no changes were needed.

 -- Timo Juhani Lindfors <email address hidden> Sat, 23 Feb 2013 14:36:19 +0200