Please merge 0.7.3-6.4 into noble

[Ravi Kant Sharma]

tracking bug

[Ubuntu Foundations Team Bug Bot (crichton)]

The attachment "debdiff between debian/sid and ubuntu/devel" seems to be a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. If the attachment isn't a patch, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are member of the ~ubuntu-sponsors, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issue please contact him.]

[Nick Rosbrook (enr0n)]

Thanks for the debdiffs, Ravi. A few comments below:

(1) In the changelog, you have:

- Include cdbs' autoreconf rules to generate new Makefiles

in remaining changes. However, Debian dropped CDBS support in 0.7.3-6.2, which obsoletes that change. Hence, there should be an entry like:

* Dropped changes, no longer needed:
  - Include cdbs' autoreconf rules to generate new Makefiles

(2) Your current diff shows a d/rules delta of:

diff -Nru ltrace-0.7.3/debian/rules ltrace-0.7.3/debian/rules
--- ltrace-0.7.3/debian/rules 2022-05-03 01:51:07.000000000 +0200
+++ ltrace-0.7.3/debian/rules 2024-02-02 13:11:39.000000000 +0100
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f

+cdbs_configure_flags := --with-libunwind=no
+
+# The configure logic for this is backwards. We need this before checking
+# for elfutils (ELF_C_READ_MMAP)
+CFLAGS=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+
 %:
  dh $@

@@ -8,5 +14,5 @@

 override_dh_install:
  dh_install
- rm -f debian/ltrace/usr/share/doc/ltrace/COPYING
- rm -f debian/ltrace/usr/share/doc/ltrace/INSTALL
+ rm -f debian/ltrace/usr/share/doc/ltrace/COPYING*
+ rm -f debian/ltrace/usr/share/doc/ltrace/INSTALL*

However, with Debian's move to debhelper, the cdbs_configure_flags change is obsolete, and I don't think that was ever our addition. Similarly, I don't think we should have any delta in `override_dh_install` (the asterisks were Debian's too, not our delta).

Therefore, I believe our only delta in d/rules should be the CFLAGS=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE bit (though this may be outdated, bonus points if you check that this is still needed).

[Ravi Kant Sharma (ravi-sharma)]

Thanks for the review, Nick. I have tried to address your comments.

(1) & (2) I've implemented the suggested changes. Thanks for pointing to 0.7.3-6.2, it made things clear.

The CFLAGS in d/rules are indeed transition related. I haven't looked thoroughly but given that we still support armhf, it is safer to keep them. I can explore this further by removing the flags and installing on armhf, but I do not have access to the architecture.

The following bit is from the changelog. It is not helpful in identifying if the configure script bug has been fixed.

Define _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE in debian/rules CFLAGS.
The configure script has a bug where it can't properly cope with the need
to define these before detecting the use of elfutils.

[Nick Rosbrook (enr0n)]

Thanks for the updated debdiffs. Two quick things I should have mentioned in my first review:

(1) In the future, remember to include (LP: #NNNNNNN) for the fixed bugs (i.e. this tracking bug in this case).
(2) With merges, it is convention to "strip" bug numbers for already-fixed bugs. The preferred way to do this is to change (LP: #NNNNNNN) -> (LP NNNNNNN). This prevents the bug from being added to the Launchpad-Bugs-Fixed: field in the .changes, but leaves enough human-readable context.

Since these are easy changes, I have gone ahead and made them myself prior to uploading. Thanks again!

[Launchpad Janitor (janitor)]

This bug was fixed in the package ltrace - 0.7.3-6.4ubuntu1

---------------
ltrace (0.7.3-6.4ubuntu1) noble; urgency=medium

   * Merge from Debian unstable (LP: #2052294). Remaining changes:
     - Set architecture to linux-any.
     - sysdeps/linux-gnu/trace.c: try to make PTRACE scope sysctl more
       discoverable.
     - Define _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE in debian/rules CFLAGS.
       The configure script has a bug where it can't properly cope with the need
       to define these before detecting the use of elfutils.
     - Add patch to support arm64.
     - Add patch to fix ltrace on binaries compiled on recent Ubuntu releases (LP 1992939)
     - Add various patches to support ppc64el.
   * Dropped changes, no longer needed:
     - Include cdbs' autoreconf rules to generate new Makefiles

ltrace (0.7.3-6.4) unstable; urgency=medium

  * Non-maintainer upload.
  * Stop building for MIPS, ltrace no longer works there.
    (Closes: #1023436)

ltrace (0.7.3-6.3) unstable; urgency=medium

  * Non-maintainer upload.
  * debian/rules: disabled use of -Werror to avoid a FTBFS in mipsel, alpha and
    ia64 when using DH level 13. Thanks to Paul Gevers <email address hidden>.
    (Closes: #1010493)

ltrace (0.7.3-6.2) unstable; urgency=medium

  * Non-maintainer upload.
  * Using new DH level format. Consequently:
      - debian/compat: removed.
      - debian/control: changed from 'debhelper' to 'debhelper-compat' in
        Build-Depends field and bumped level to 13.
      - Closes: #965705
  * Dropped CDBS in favor of the debhelper to allow the build system to use
    DH level greater than 11. Consequently:
      - debian/control: removed no longer needed cdbs and autotools-dev from
        Build-Depends field.
      - debian/rules: changed from CDBS to DH.

 -- Ravi Kant Sharma <email address hidden> Fri, 02 Feb 2024 13:13:08 +0100