Please merge systemtap 1.6-1 (universe) from Debian testing

1.6-1 has been pretty stable for me so far in debian so I agree. Who on the ubuntu side is usually handling such updates?

Hi Leo,

are you planning to sync systemtap 1.6-1 from debian to ubuntu? If you need to make some ubuntu specific changes it'd be interesting to hear about them.

Hi Timo,

I would like to understand what we can drop from last ubuntu delta and apply changes at debian package.

You can download Ubuntu patch here:
http://patches.ubuntu.com/s/systemtap/systemtap_1.4-1ubuntu2.patch

adding-ifdef-CLONE_STOPPED-to-stop-module-compilatio.patch
* included upstream since 1.5, can be dropped

fix-compile-warning
* included upstream since 1.6, can be dropped

no-werror.patch
* is not needed in debian. are the ubuntu builds done using stricter compiler defaults that cause extra warnings? I don't have ubuntu pbuilder setup right now, only debian so I can't easily test.

Updated-__ip_sock_daddr-for-2.6.38-kernels.patch
* included upstream since 1.5, can be dropped

There are some changes that are not in named patches, I did not investigate those yet.

> There are some changes that are not in named patches, I did not investigate those yet.

Really, not.

I rebuilt last version of Ubuntu, 'quilt popping' all patches imported in Ubuntu. There are no more changes in debdiff.

I assume that we only need to update patches.

systemtap (1.6-1ubuntu1) precise; urgency=low

  * Merge from debian unstable (LP: #876855). Remaining changes:
    - Refreshed no-werror.patch. Remove -Werror from CFLAGS to avoid
      new variable-set-but-not-used errors when building.
  * Drop changes:
    + All these patches were picked from upstream:
      - Updated-__ip_sock_daddr-for-2.6.38-kernels.patch included
        upstream since 1.5
      - fix-compile-warning now included upstream since 1.6,
      - adding-ifdef-CLONE_STOPPED-to-stop-module-compilatio.patch
        included upstream since 1.5

 -- Leo Iannacone <email address hidden> Sat, 17 Dec 2011 13:04:49 +0100

I just heard that upstream 1.7 release is possible happening already next week. you might want to postpone 1.6

Yes... That's a good idea :).

Thanks for your help Timo.

Well.. since a moth has gone, I'm going to request merge again.

Yep upstream is still trying to fix some last bugs before 1.7 release.

This bug was fixed in the package systemtap - 1.6-1ubuntu1

---------------
systemtap (1.6-1ubuntu1) precise; urgency=low

  * Merge from debian unstable (LP: #876855). Remaining changes:
    - Refreshed no-werror.patch. Remove -Werror from CFLAGS to avoid
      new variable-set-but-not-used errors when building.
  * Drop changes:
    - Updated-__ip_sock_daddr-for-2.6.38-kernels.patch it was a patch picked
      from upstream, and this version has those changes
    - debian/patches/fix-compile-warning: Fix for failure to compile tapsets
      due to kernel change. Now in upstream.
    - adding-ifdef-CLONE_STOPPED-to-stop-module-compilatio.patch patch was
      taken from upstream.

systemtap (1.6-1) unstable; urgency=low

  [ Lucas Nussbaum ]
  * Refresh all patches.

  [ Ritesh Raj Sarraf ]
  * [ab3b78a] Imported Upstream version 1.6
  * New upstream release (Closes: #625414, #635542, #628819)
    - Fixes vulnerability: CVE-2011-1769, CVE-2011-1781, CVE-2011-2502
      and CVE-2011-2503
 -- Leo Iannacone <email address hidden> Sat, 17 Dec 2011 02:59:13 +0100