From 5585c1f0749cc725e5c7d957a17fb7619f015640 Mon Sep 17 00:00:00 2001
From: Konstantin Demin <rockdrilla@gmail.com>
Date: Fri, 29 Aug 2025 17:04:21 +0300
Subject: [PATCH] sync with Debian

version: 2.45-5 (released to unstable)
commit: f6740cbcc3c6e89bcc6b9350570bf8f36332138e
---
 debian/control                      |  4 ++--
 debian/control.in                   |  4 ++--
 debian/patches/gas-sframe-warn.diff | 13 +++++++++++++
 debian/patches/series               |  1 +
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 debian/patches/gas-sframe-warn.diff

diff --git a/debian/control b/debian/control
index ea9e38a..2e0d720 100644
--- a/debian/control
+++ b/debian/control
@@ -144,8 +144,8 @@ Multi-Arch: same
 Priority: optional
 Section: libdevel
 Depends: libsframe2 (= ${binary:Version}), ${shlibs:Depends}
-Conflicts: binutils (<< 2.45-1~)
-Replaces: binutils (<< 2.45-1~)
+Conflicts: binutils (<< 2.45-3~)
+Replaces: binutils (<< 2.45-3~)
 Description: Library to handle the SFrame format (development files)
  SFrame stands for Simple Frame format.  SFrame format keeps track
  of the minimal necessary information needed for generating stack traces.
diff --git a/debian/control.in b/debian/control.in
index 41410b1..63cf2f0 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -144,8 +144,8 @@ Multi-Arch: same
 Priority: optional
 Section: libdevel
 Depends: libsframe2 (= ${binary:Version}), ${shlibs:Depends}
-Conflicts: binutils (<< 2.45-1~)
-Replaces: binutils (<< 2.45-1~)
+Conflicts: binutils (<< 2.45-3~)
+Replaces: binutils (<< 2.45-3~)
 Description: Library to handle the SFrame format (development files)
  SFrame stands for Simple Frame format.  SFrame format keeps track
  of the minimal necessary information needed for generating stack traces.
diff --git a/debian/patches/gas-sframe-warn.diff b/debian/patches/gas-sframe-warn.diff
new file mode 100644
index 0000000..1aa63ae
--- /dev/null
+++ b/debian/patches/gas-sframe-warn.diff
@@ -0,0 +1,13 @@
+--- a/gas/gen-sframe.c
++++ b/gas/gen-sframe.c
+@@ -1586,8 +1586,10 @@ sframe_xlate_do_cfi_escape (const struct
+ 	 OS-specific CFI opcodes), skip inspecting the DWARF expression.
+ 	 This may impact the asynchronicity due to loss of coverage.
+ 	 Continue to warn the user and bail out.  */
++      /* Disabled for Debian/Ubuntu, shows up in autopkg tests:
+       as_warn (_("no SFrame FDE emitted; .cfi_escape with op (%#lx)"),
+ 	       (unsigned long)firstop);
++      */
+       err = SFRAME_XLATE_ERR_NOTREPRESENTED;
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7f8a441..a103663 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,3 +35,4 @@ armhf-64k-alignment.diff
 
 gprofng-examples-tgz-deterministic.diff
 gprofng-cross-build.diff
+gas-sframe-warn.diff