Merge ~mfo/ubuntu/+source/crash:merge-lp2047861-noble into ubuntu/+source/crash:debian/sid

[Mauricio Faria de Oliveira]

Build/tests from PPA in bug 2047861.

[Mauricio Faria de Oliveira (mfo)]

Autopkgtests (live system form) and manual tests (dump file form) PASS in amd64, arm64, ppc64el, and s390x (bug 2047861 comment #8).

Packages in ppa:mfo/lp2047861-noble-crash

[Sergio Durigan Junior (sergiodj)]

Thanks, Mauricio.

The merge LGTM. Autopkgtest results are OK, and your manual test results make me very confident that no apparent regression is being introduced. Thanks for those!

I'm leaving a small comment regarding the changelog entry, but otherwise this is good to be uploaded. Let me know when you address the comment and I can upload right away.

Thanks again.

review: Needs Information

[Mauricio Faria de Oliveira (mfo)]

Thanks for the review, Sergio!

The changelog entry now has 'included upstream in 8.0.4' for the dropped patches.

Thanks for catching and explaining that; I incorrectly assumed it could be taken as a default reason for dropping patches on merges, and will make sure to always address that in the future.

I amended the changelog commit and force pushed.

Thanks again!

[Sergio Durigan Junior (sergiodj)]

Thanks, Mauricio. That's perfect now!

Uploaded:

$ dput crash_8.0.4-1ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/crash/crash_8.0.4-1ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/crash/crash_8.0.4-1ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading crash_8.0.4-1ubuntu1.dsc: done.
  Uploading crash_8.0.4.orig.tar.gz: done.
  Uploading crash_8.0.4-1ubuntu1.debian.tar.xz: done.
  Uploading crash_8.0.4-1ubuntu1_source.buildinfo: done.
  Uploading crash_8.0.4-1ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

Unmerged commits

e65e59e... by Mauricio Faria de Oliveira on 2024-01-02

changelog

4b126a0... by Mauricio Faria de Oliveira on 2024-01-02

update-maintainer

e66561b... by Mauricio Faria de Oliveira on 2024-01-02

reconstruct-changelog

2c01457... by Mauricio Faria de Oliveira on 2024-01-02

merge-changelogs

3e12e6a... by Mauricio Faria de Oliveira on 2023-11-07

d/t/control: Run autopkg test with allow-stderr.

[8.0.0-1ubuntu1]

f1c6eb3... by Mauricio Faria de Oliveira on 2023-11-07

d/t/control: Add linux-libc-dev dependency for the autopkg test. This package gets usually broken with kernel upgrades, so let it already show in the autopkg test.

[7.2.9-2ubuntu3]

97d45ae... by Mauricio Faria de Oliveira on 2023-11-07

d/t/live: Fix test, as if will return 0 when no cases were true.

[7.2.8-1ubuntu1]

f5cd9e8... by Mauricio Faria de Oliveira on 2023-11-07

d/t/live: Fix logic issue in "live" autopkgtest introduced in the last upload.

[7.2.6-1ubuntu2]

389dbd7... by Mauricio Faria de Oliveira on 2023-11-07

d/t/live: If the "live" autopkgtest fails with a recommendation to try /proc/kcore instead of the default, attempt that before failing the test. LP: #1858958.

[7.2.6-1ubuntu1]

diff --git a/debian/changelog b/debian/changelog
index fa99cd7..591c4c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+crash (8.0.4-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes: (LP: #2047861)
+    - d/t/live: If the "live" autopkgtest fails with a recommendation to
+      try /proc/kcore instead of the default, attempt that before
+      failing the test. LP 1858958.
+    - d/t/live: Fix logic issue in "live" autopkgtest introduced in the
+      last upload.
+    - d/t/live: Fix test, as if will return 0 when no cases were true.
+    - d/t/control: Add linux-libc-dev dependency for the autopkg test.
+      This package gets usually broken with kernel upgrades, so let it
+      already show in the autopkg test.
+    - d/t/control: Run autopkg test with allow-stderr.
+  * Drop changes:
+    - d/p/0002-Fix-compilation-error-due-to-new-strlcpy-function.patch
+      [ included upstream in 8.0.4 ]
+    - d/p/0003-Support-module-memory-layout-change-on-Linux-6.4.patch
+      [ included upstream in 8.0.4 ]
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Tue, 02 Jan 2024 19:09:28 -0300
+
 crash (8.0.4-1) unstable; urgency=medium
 
   * New upstream (Closes: #1057009)
@@ -73,6 +94,31 @@ crash (8.0.4-1) unstable; urgency=medium
 
  -- Troy Heber <[e-mail]>  Mon, 27 Nov 2023 14:43:03 -0700
 
+crash (8.0.3+ds1-3ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes: (LP: #2042357)
+    - d/t/live: If the "live" autopkgtest fails with a recommendation to
+      try /proc/kcore instead of the default, attempt that before
+      failing the test. LP 1858958.
+    - d/t/live: Fix logic issue in "live" autopkgtest introduced in the
+      last upload.
+    - d/t/live: Fix test, as if will return 0 when no cases were true.
+    - d/t/control: Add linux-libc-dev dependency for the autopkg test.
+      This package gets usually broken with kernel upgrades, so let it
+      already show in the autopkg test.
+    - d/t/control: Run autopkg test with allow-stderr.
+  * Drop changes:
+    - d/rules: Build without lto. Fails to build gdb on ppc64el. That
+      should be fixed, once gdb is updated to a more recent version
+      (e.g. 10.x). [This line is already commented out since Mantic.]
+  * New changes:
+    - d/p/0002-Fix-compilation-error-due-to-new-strlcpy-function.patch:
+      Fix FTBFS due to strlcpy() introduced in glibc 2.38.
+    - d/p/0003-Support-module-memory-layout-change-on-Linux-6.4.patch:
+      Fix fatal 'crash: invalid structure member offset: module_core_size'
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Tue, 07 Nov 2023 15:00:36 -0300
+
 crash (8.0.3+ds1-3) unstable; urgency=medium
 
   * New upload to resolve missing gdb
@@ -92,6 +138,16 @@ crash (8.0.3-1) unstable; urgency=medium
 
  -- Troy Heber <[e-mail]>  Sat, 28 Oct 2023 12:21:36 -0600
 
+crash (8.0.2-1ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Add linux-libc-dev dependency for the autopkg test. This package
+      gets usually broken with kernel upgrades, so let it already show
+      in the autopkg test.
+    - Run autopkg test with allow-stderr.
+
+ -- Matthias Klose <[e-mail]>  Thu, 06 Jul 2023 16:49:16 +0200
+
 crash (8.0.2-1) unstable; urgency=medium
   * New upstream
   * commit f1cd581d1c4afa5b8ffdfaa6a3ea9f545fe4ec91
@@ -2242,6 +2298,18 @@ crash (8.0.1-1) UNRELEASED; urgency=medium
 
  -- Troy Heber <[e-mail]>  Thu, 17 Nov 2022 10:27:25 -0700
 
+crash (8.0.0-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build without lto. Fails to build gdb on ppc64el. That should be fixed,
+      once gdb is updated to a more recent version (e.g. 10.x).
+    - Add linux-libc-dev dependency for the autopkg test. This package
+      gets usually broken with kernel upgrades, so let it already show
+      in the autopkg test.
+  * Run autopkg test with allow-stderr.
+
+ -- Matthias Klose <[e-mail]>  Wed, 23 Mar 2022 15:07:01 +0100
+
 crash (8.0.0-1) unstable; urgency=medium
   * New upstream (Closes: #950544)
   * Add lintian override for zlib in embedded gdb
@@ -3374,6 +3442,17 @@ crash (8.0.0-1) unstable; urgency=medium
 
  -- Troy Heber <[e-mail]>  Wed, 02 Feb 2022 09:19:00 -0700
 
+crash (7.3.0-1ubuntu1) impish; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build without lto. Fails to build gdb on ppc64el. That should be fixed,
+      once gdb is updated to a more recent version (e.g. 10.x).
+    - Add linux-libc-dev dependency for the autopkg test. This package
+      gets usually broken with kernel upgrades, so let it already show
+      in the autopkg test.
+
+ -- dann frazier <[e-mail]>  Thu, 08 Jul 2021 09:16:21 -0600
+
 crash (7.3.0-1) experimental; urgency=medium
 
   * Add support for new lockless righbuffer that Linux 5.10 introduced.
@@ -3555,6 +3634,27 @@ crash (7.3.0-1) experimental; urgency=medium
 
  -- Troy Heber <[e-mail]>  Wed, 07 Jul 2021 15:31:12 -0600
 
+crash (7.2.9-2ubuntu3) impish; urgency=medium
+
+  * Add linux-libc-dev dependency for the autopkg test. This package
+    gets usually broken with kernel upgrades, so let it already show
+    in the autopkg test.
+
+ -- Matthias Klose <[e-mail]>  Mon, 21 Jun 2021 09:54:43 +0200
+
+crash (7.2.9-2ubuntu2) hirsute; urgency=medium
+
+  * Build without lto. Fails to build gdb on ppc64el. That should be fixed,
+    once gdb is updated to a more recent version (e.g. 10.x).
+
+ -- Matthias Klose <[e-mail]>  Thu, 25 Mar 2021 10:04:06 +0100
+
+crash (7.2.9-2ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+
+ -- Matthias Klose <[e-mail]>  Thu, 25 Mar 2021 09:08:04 +0100
+
 crash (7.2.9-2) unstable; urgency=medium
 
   * Backporting future patches to support printk in kernel 5.10+ based on:
@@ -3810,6 +3910,17 @@ crash (7.2.9-1) unstable; urgency=medium
 
  -- Troy Heber <[e-mail]>  Thu, 03 Dec 2020 09:53:49 -0700
 
+crash (7.2.8-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Update the maintainer field for Ubuntu.
+    - If the "live" autopkgtest fails with a recommendation to try
+      /proc/kcore instead of the default, attempt that before failing
+      the test. LP: #1858958.
+  * Fix test, as if will return 0 when no cases were true.
+
+ -- Thadeu Lima de Souza Cascardo <[e-mail]>  Wed, 12 Feb 2020 22:12:51 +0000
+
 crash (7.2.8-1) unstable; urgency=medium
 
   * New upstream (Closes: #950544)
@@ -4139,6 +4250,40 @@ crash (7.2.7-1) UNRELEASED; urgency=medium
 
  -- Troy Heber <[e-mail]>  Tue, 11 Feb 2020 19:19:28 -0700
 
+crash (7.2.6-1ubuntu4) focal; urgency=medium
+
+  * No-change rebuild with fixed binutils on arm64.
+
+ -- Matthias Klose <[e-mail]>  Sat, 08 Feb 2020 10:57:37 +0000
+
+crash (7.2.6-1ubuntu3) focal; urgency=medium
+
+  * Rebuild with updated binutils, fixing an "illegal insruction" crash
+    on arm64. LP: #1859226.
+  * Update the maintainer field for Ubuntu.
+
+ -- dann frazier <[e-mail]>  Sat, 11 Jan 2020 09:36:27 -0700
+
+crash (7.2.6-1ubuntu2) focal; urgency=medium
+
+  * Fix logic issue in "live" autopkgtest introduced in the last upload.
+
+ -- dann frazier <[e-mail]>  Thu, 09 Jan 2020 19:24:17 -0700
+
+crash (7.2.6-1ubuntu1) focal; urgency=medium
+
+  * If the "live" autopkgtest fails with a recommendation to try
+    /proc/kcore instead of the default, attempt that before failing
+    the test. LP: #1858958.
+
+ -- dann frazier <[e-mail]>  Thu, 09 Jan 2020 14:21:45 -0700
+
+crash (7.2.6-1build1) eoan; urgency=medium
+
+  * No-change upload with strops.h and sys/strops.h removed in glibc.
+
+ -- Matthias Klose <[e-mail]>  Thu, 05 Sep 2019 10:47:07 +0000
+
 crash (7.2.6-1) unstable; urgency=medium
 
   * Two fixes for the Xen hypervisor; the first fixes a bug seen with Xen
diff --git a/debian/control b/debian/control
index cd27d75..beb893f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: crash
 Section: utils
 Priority: optional
-Maintainer: Troy Heber <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Troy Heber <[e-mail]>
 Uploaders:
 Build-Depends: debhelper (>= 13), dpkg-dev (>= 1.16.1), quilt (>= 0.47), binutils, binutils-dev, bison, gawk, flex, zlib1g-dev, libncurses5-dev, liblzo2-dev, libsnappy-dev, libzstd-dev, texinfo
 Standards-Version: 4.6.2.0
diff --git a/debian/tests/control b/debian/tests/control
index 6a60b96..45bd121 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: live
-Restrictions: needs-root isolation-machine
-Depends: @, lsb-release, software-properties-common, sudo
+Restrictions: needs-root isolation-machine allow-stderr
+Depends: @, lsb-release, software-properties-common, sudo, linux-libc-dev
diff --git a/debian/tests/live b/debian/tests/live
index df59b62..b7e0cfc 100644
--- a/debian/tests/live
+++ b/debian/tests/live
@@ -18,5 +18,21 @@ elif [ "$(lsb_release -is)" = "Ubuntu" ]; then
     sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q linux-image-$(uname -r)-dbgsym
 fi
 
+crash_out="$(mktemp)"
+cleanup() {
+    rm -f $crash_out
+}
+trap cleanup EXIT
+
 echo "Testing crash on live kernel"
-crash -st /usr/lib/debug/boot/vmlinux-$(uname -r) 2>&1
+if crash -st /usr/lib/debug/boot/vmlinux-$(uname -r) > $crash_out 2>&1; then
+    exit 0
+else
+    ret=$?
+fi
+
+if ! grep -q "please use /proc/kcore" $crash_out; then
+    exit $ret
+fi
+echo "Retrying using /proc/kcore (LP: #1858958)"
+crash -st /usr/lib/debug/boot/vmlinux-$(uname -r) /proc/kcore 2>&1