diff --git a/0001-Fix-requirement-for-annobin-notes-from-LLVM-Clang.patch b/0001-Fix-requirement-for-annobin-notes-from-LLVM-Clang.patch new file mode 100644 index 0000000..7798148 --- /dev/null +++ b/0001-Fix-requirement-for-annobin-notes-from-LLVM-Clang.patch @@ -0,0 +1,28 @@ +From 916e17ce74aeadc54cadd473f4a33cf4b7a5a784 Mon Sep 17 00:00:00 2001 +From: Tulio Magno Quites Machado Filho +Date: Tue, 17 Jun 2025 11:39:12 -0300 +Subject: [PATCH] Fix requirement for annobin notes from LLVM/Clang + +The LLVM and Clang plugins do not support annobin notes yet. +Disable this test for LLVM and Clang until this feature gets implemented +in order to stop reporting false positives downstream. +--- + annocheck/hardened.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/annocheck/hardened.c b/annocheck/hardened.c +index 643e324..aadf291 100644 +--- a/annocheck/hardened.c ++++ b/annocheck/hardened.c +@@ -9419,6 +9419,8 @@ finish (annocheck_data * data) + + if (RUST_compiler_seen ()) + skip (data, TEST_NOTES, SOURCE_FINAL_SCAN, "RUST compiler does not generate annobin notes"); ++ if (LLVM_compiler_seen ()) ++ skip (data, TEST_NOTES, SOURCE_FINAL_SCAN, "LLVM compiler does not generate annobin notes"); + else if (does_not_contain_code (data)) + skip (data, TEST_NOTES, SOURCE_FINAL_SCAN, "no code detected, therefore no need for annobin notes"); + else if (is_comboot_module (data)) +-- +2.49.0 + diff --git a/annobin.spec b/annobin.spec index df1b587..f7cdd15 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 12.93 -Release: 2%{?dist} +Release: 3%{?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/ # Maintainer: nickc@redhat.com @@ -75,6 +75,9 @@ Source: https://nickc.fedorapeople.org/%{annobin_sources} # Patch01: annobin-plugin-default-string-notes.patch # Patch01: annobin-gcc-plugin-input-filename.patch +# Backport of 916e17ce74aea from upstream. +Patch01: 0001-Fix-requirement-for-annobin-notes-from-LLVM-Clang.patch + #--------------------------------------------------------------------------------- # Make sure that the necessary sub-packages are built. @@ -537,6 +540,9 @@ make check #--------------------------------------------------------------------------------- %changelog +* Mon Jun 23 2025 Tulio Magno Quites Machado Filho - 12.93-3 +- Annocheck: Fix requirement for annobin notes from LLVM/Clang (RHEL-93213) + * Tue May 06 2025 Nick Clifton - 12.93-2 - NVR bump in order to rebuild with LLVM 20. (RHEL-82000)