diff -pruN 8.0.6-1/debian/Makefile.ori 8.0.6-1ubuntu2/debian/Makefile.ori
--- 8.0.6-1/debian/Makefile.ori	2024-12-08 19:32:27.000000000 +0000
+++ 8.0.6-1ubuntu2/debian/Makefile.ori	2025-09-23 10:38:50.000000000 +0000
@@ -678,7 +678,7 @@ extensions: make_configure
 	@$(MAKE) do_extensions
 
 do_extensions:
-	@$(MAKE) -C extensions -i TARGET=$(TARGET) TARGET_CFLAGS="$(TARGET_CFLAGS)" GDB=$(GDB) GDB_FLAGS=$(GDB_FLAGS)
+	@$(MAKE) -C extensions -i TARGET=$(TARGET) TARGET_CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" GDB=$(GDB) GDB_FLAGS=$(GDB_FLAGS)
 
 memory_driver: make_configure 
 	@$(MAKE) -C memory_driver -i
diff -pruN 8.0.6-1/debian/changelog 8.0.6-1ubuntu2/debian/changelog
--- 8.0.6-1/debian/changelog	2024-12-08 19:32:27.000000000 +0000
+++ 8.0.6-1ubuntu2/debian/changelog	2025-09-23 10:38:50.000000000 +0000
@@ -1,3 +1,26 @@
+crash (8.0.6-1ubuntu2) questing; urgency=medium
+
+  * d/rules: add -std=gnu17 to build it with gcc-15 on questing (LP: #2125394)
+
+ -- Nishit Majithia <nishit.majithia@canonical.com>  Tue, 23 Sep 2025 16:08:50 +0530
+
+crash (8.0.6-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - 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.
+    - Pass CFLAGS when building extensions.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 31 Dec 2024 11:02:15 +0100
+
 crash (8.0.6-1) unstable; urgency=medium
 
   * New upstream release 8.0.6
@@ -100,6 +123,39 @@ crash (8.0.5-1) unstable; urgency=medium
 
  -- Troy Heber <troyh@debian.org>  Tue, 30 Apr 2024 15:04:19 -0600
 
+crash (8.0.4-1ubuntu3) oracular; urgency=medium
+
+  * Pass CFLAGS when building extensions (LP: #2072745)
+
+ -- Shengjing Zhu <shengjing.zhu@canonical.com>  Thu, 11 Jul 2024 16:09:38 +0800
+
+crash (8.0.4-1ubuntu2) noble; urgency=high
+
+  * No change rebuild for 64-bit time_t and frame pointers.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 08 Apr 2024 17:55:38 +0200
+
+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 <mfo@canonical.com>  Tue, 02 Jan 2024 19:09:28 -0300
+
 crash (8.0.4-1) unstable; urgency=medium
 
   * New upstream (Closes: #1057009)
@@ -175,6 +231,31 @@ crash (8.0.4-1) unstable; urgency=medium
 
  -- Troy Heber <troyh@debian.org>  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 <mfo@canonical.com>  Tue, 07 Nov 2023 15:00:36 -0300
+
 crash (8.0.3+ds1-3) unstable; urgency=medium
 
   * New upload to resolve missing gdb
@@ -194,6 +275,16 @@ crash (8.0.3-1) unstable; urgency=medium
 
  -- Troy Heber <troyh@debian.org>  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 <doko@ubuntu.com>  Thu, 06 Jul 2023 16:49:16 +0200
+
 crash (8.0.2-1) unstable; urgency=medium
   * New upstream
   * commit f1cd581d1c4afa5b8ffdfaa6a3ea9f545fe4ec91
@@ -2344,6 +2435,18 @@ crash (8.0.1-1) UNRELEASED; urgency=medi
 
  -- Troy Heber <troyh@debian.org>  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 <doko@ubuntu.com>  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
@@ -3476,6 +3579,17 @@ crash (8.0.0-1) unstable; urgency=medium
 
  -- Troy Heber <troyh@debian.org>  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 <dann.frazier@canonical.com>  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.
@@ -3657,6 +3771,27 @@ crash (7.3.0-1) experimental; urgency=me
 
  -- Troy Heber <troyh@debian.org>  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 <doko@ubuntu.com>  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 <doko@ubuntu.com>  Thu, 25 Mar 2021 10:04:06 +0100
+
+crash (7.2.9-2ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+
+ -- Matthias Klose <doko@ubuntu.com>  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:
@@ -3912,6 +4047,17 @@ crash (7.2.9-1) unstable; urgency=medium
 
  -- Troy Heber <troyh@debian.org>  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 <cascardo@canonical.com>  Wed, 12 Feb 2020 22:12:51 +0000
+
 crash (7.2.8-1) unstable; urgency=medium
 
   * New upstream (Closes: #950544)
@@ -4241,6 +4387,40 @@ crash (7.2.7-1) UNRELEASED; urgency=medi
 
  -- Troy Heber <troyh@debian.org>  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 <doko@ubuntu.com>  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 <dannf@ubuntu.com>  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 <dannf@ubuntu.com>  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 <dannf@ubuntu.com>  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 <doko@ubuntu.com>  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 -pruN 8.0.6-1/debian/control 8.0.6-1ubuntu2/debian/control
--- 8.0.6-1/debian/control	2024-12-08 19:32:27.000000000 +0000
+++ 8.0.6-1ubuntu2/debian/control	2025-09-23 10:38:50.000000000 +0000
@@ -1,7 +1,8 @@
 Source: crash
 Section: utils
 Priority: optional
-Maintainer: Troy Heber <troyh@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Troy Heber <troyh@debian.org>
 Uploaders:
 Build-Depends: debhelper (>= 13), dpkg-dev (>= 1.16.1), quilt (>= 0.47), binutils, binutils-dev, bison, gawk, flex, zlib1g-dev, libncurses-dev, liblzo2-dev, libsnappy-dev, libzstd-dev, texinfo
 Standards-Version: 4.7.0
diff -pruN 8.0.6-1/debian/patches/0002-pass-CFLAGS-when-building-extensions.patch 8.0.6-1ubuntu2/debian/patches/0002-pass-CFLAGS-when-building-extensions.patch
--- 8.0.6-1/debian/patches/0002-pass-CFLAGS-when-building-extensions.patch	1970-01-01 00:00:00.000000000 +0000
+++ 8.0.6-1ubuntu2/debian/patches/0002-pass-CFLAGS-when-building-extensions.patch	2025-09-23 10:38:50.000000000 +0000
@@ -0,0 +1,24 @@
+From: Shengjing Zhu <shengjing.zhu@canonical.com>
+Date: Thu, 11 Jul 2024 16:05:10 +0800
+Subject: pass CFLAGS when building extensions
+
+Bug-Ubuntu: https://launchpad.net/bugs/2072745
+Forwarded: https://github.com/crash-utility/crash/pull/186
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index a94a243..39e5033 100644
+--- a/Makefile
++++ b/Makefile
+@@ -668,7 +668,7 @@ extensions: make_configure
+ 	@$(MAKE) do_extensions
+ 
+ do_extensions:
+-	@$(MAKE) -C extensions -i TARGET=$(TARGET) TARGET_CFLAGS="$(TARGET_CFLAGS)" GDB=$(GDB) GDB_FLAGS=$(GDB_FLAGS)
++	@$(MAKE) -C extensions -i TARGET=$(TARGET) TARGET_CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" GDB=$(GDB) GDB_FLAGS=$(GDB_FLAGS)
+ 
+ memory_driver: make_configure 
+ 	@$(MAKE) -C memory_driver -i
diff -pruN 8.0.6-1/debian/patches/series 8.0.6-1ubuntu2/debian/patches/series
--- 8.0.6-1/debian/patches/series	2024-12-08 19:32:27.000000000 +0000
+++ 8.0.6-1ubuntu2/debian/patches/series	2025-09-23 10:38:50.000000000 +0000
@@ -1 +1,2 @@
 0001-dont-git-clone-eppic-extension.patch
+0002-pass-CFLAGS-when-building-extensions.patch
diff -pruN 8.0.6-1/debian/rules 8.0.6-1ubuntu2/debian/rules
--- 8.0.6-1/debian/rules	2024-12-08 19:32:27.000000000 +0000
+++ 8.0.6-1ubuntu2/debian/rules	2025-09-23 10:38:50.000000000 +0000
@@ -5,6 +5,7 @@ export DH_VERBOSE=1
 export DEB_BUILD_HARDENING=1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 export EXTDIR=/usr/lib/crash/extensions
+export DEB_CFLAGS_MAINT_APPEND = -std=gnu17
 DPKG_EXPORT_BUILDFLAGS=1
 include /usr/share/dpkg/buildflags.mk
 
diff -pruN 8.0.6-1/debian/tests/control 8.0.6-1ubuntu2/debian/tests/control
--- 8.0.6-1/debian/tests/control	2024-12-08 19:32:27.000000000 +0000
+++ 8.0.6-1ubuntu2/debian/tests/control	2025-09-23 10:38:50.000000000 +0000
@@ -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 -pruN 8.0.6-1/debian/tests/live 8.0.6-1ubuntu2/debian/tests/live
--- 8.0.6-1/debian/tests/live	2024-12-08 19:32:27.000000000 +0000
+++ 8.0.6-1ubuntu2/debian/tests/live	2025-09-23 10:38:50.000000000 +0000
@@ -18,5 +18,21 @@ elif [ "$(lsb_release -is)" = "Ubuntu" ]
     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
