From aa8cfa0e9fca4a6ddc247fc719f2b1041659ebe4 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Tue, 12 Nov 2024 21:40:14 +0300
Subject: [PATCH] import annobin-12.74-1.el10

---
 .annobin.metadata                             |  2 +-
 .gitignore                                    |  2 +-
 .../annobin-gcc-plugin-input-filename.patch   | 21 -------------------
 SPECS/annobin.spec                            |  7 +++++--
 4 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 SOURCES/annobin-gcc-plugin-input-filename.patch

diff --git a/.annobin.metadata b/.annobin.metadata
index c07422a..6edc26c 100644
--- a/.annobin.metadata
+++ b/.annobin.metadata
@@ -1 +1 @@
-e2baf11dc6d4e5ea8745f810e1ea82586e621a80 SOURCES/annobin-12.72.tar.xz
+7086bc88593a2bdb9cfb5fdb63aaf4e5e3ecb366 SOURCES/annobin-12.74.tar.xz
diff --git a/.gitignore b/.gitignore
index 8b69f67..afadd3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/annobin-12.72.tar.xz
+SOURCES/annobin-12.74.tar.xz
diff --git a/SOURCES/annobin-gcc-plugin-input-filename.patch b/SOURCES/annobin-gcc-plugin-input-filename.patch
deleted file mode 100644
index f799e07..0000000
--- a/SOURCES/annobin-gcc-plugin-input-filename.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- annobin.orig/gcc-plugin/annobin.cc	2024-11-04 10:17:09.628685926 +0000
-+++ annobin-12.72/gcc-plugin/annobin.cc	2024-11-04 10:18:01.542935615 +0000
-@@ -540,7 +540,17 @@ annobin_gen_string_note (annobin_functio
- 
-   if (use_extended_string)
-     {
--      size_t len = strlen (annobin_note_buffer) + 1 + strlen (annobin_input_filename);
-+      // For some reason this is happening with RHEL-10 builds.
-+      if (annobin_input_filename == NULL)
-+	{
-+	  if (!init_annobin_input_filename ())
-+	    {
-+	      ice ("annobin_gen_string_note called without an input filename\n");
-+	      return;
-+	    }
-+	}
-+	
-+      size_t len = strlen (dst) + 1 + strlen (annobin_input_filename);
- 
-       if (! is_global (info))
- 	len += strlen (get_func_name (info)) + 1;
diff --git a/SPECS/annobin.spec b/SPECS/annobin.spec
index 15c90ab..096d05f 100644
--- a/SPECS/annobin.spec
+++ b/SPECS/annobin.spec
@@ -1,7 +1,7 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 12.72
+Version: 12.74
 Release: 1%{?dist}
 License: GPL-3.0-or-later AND LGPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND GFDL-1.3-or-later
 URL: https://sourceware.org/annobin/
@@ -73,7 +73,7 @@ Source: https://nickc.fedorapeople.org/%{annobin_sources}
 
 # Insert patches here, if needed.  Eg:
 # Patch01: annobin-plugin-default-string-notes.patch
-Patch01: annobin-gcc-plugin-input-filename.patch
+# Patch01: annobin-gcc-plugin-input-filename.patch
 
 #---------------------------------------------------------------------------------
 
@@ -533,6 +533,9 @@ make check
 #---------------------------------------------------------------------------------
 
 %changelog
+* Mon Nov 11 2024 Nick Clifton  <nickc@redhat.com> - 12.74-1
+- Annocheck: Add exceptions for GCC.  (RHEL-33365)
+
 * Fri Nov 01 2024 Nick Clifton  <nickc@redhat.com> - 12.72-1
 - Annocheck: Skip FORTIFY and GLIBC_ASSERTIONS tests for LLVM produced binaries with unparseable DW_AT_producer attributes in their DWARF debug info.  (RHEL-65411)
 - GCC Plugin: Change type of the .annobin.notes section from SHT_STRTAB to SHT_PROGBITS.