From 97af018e7de3c98b41f2b653c845eb53834bcf13 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 30 Apr 2024 15:17:48 +0000 Subject: [PATCH] import UBI annobin-12.31-2.el9 --- .annobin.metadata | 2 +- .gitignore | 2 +- SOURCES/annobin-strings-no-attach.patch | 36 +++++++++++++++++++++++ SPECS/annobin.spec | 39 ++++++++++++++++++++++--- 4 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 SOURCES/annobin-strings-no-attach.patch diff --git a/.annobin.metadata b/.annobin.metadata index 882d8b2..aaac6f8 100644 --- a/.annobin.metadata +++ b/.annobin.metadata @@ -1 +1 @@ -d43ec0f2ebf560ca967be60536b1effb2a07a92c SOURCES/annobin-12.12.tar.xz +07f5617e6d0f8cb6c3efd66004e38f9081e6b8f5 SOURCES/annobin-12.31.tar.xz diff --git a/.gitignore b/.gitignore index b16130a..dffc1d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/annobin-12.12.tar.xz +SOURCES/annobin-12.31.tar.xz diff --git a/SOURCES/annobin-strings-no-attach.patch b/SOURCES/annobin-strings-no-attach.patch new file mode 100644 index 0000000..dc85ecf --- /dev/null +++ b/SOURCES/annobin-strings-no-attach.patch @@ -0,0 +1,36 @@ +--- annobin.orig/gcc-plugin/annobin.cc 2024-01-17 14:00:26.889983192 +0000 ++++ annobin-12.31/gcc-plugin/annobin.cc 2024-01-17 14:01:27.517055850 +0000 +@@ -3261,18 +3261,24 @@ plugin_init (struct plugin_name_args * + target_start_sym_bias = annobin_target_start_symbol_bias (); + if (annobin_attach_type == not_set) + { +- /* Choose a default attachment type. Link ordering is preferable +- as it is more resistant to changes in compiler section building. +- But it can only be used if the target assembler supports link_order sections +- and the target linker is sufficiently new that it implements them correctly. +- For now we use a test of the GCC version as an approximation to the binutils +- versions that are needed. (Note - 2.35.2, as used by RHEL-9, is insufficient). +- See BZ 2016458 for an example of where this solution is needed. */ ++ if (annobin_note_format == string) ++ /* String format notes do not need section groups. */ ++ annobin_attach_type = none; ++ else ++ { ++ /* Choose a default attachment type. Link ordering is preferable ++ as it is more resistant to changes in compiler section building. ++ But it can only be used if the target assembler supports link_order sections ++ and the target linker is sufficiently new that it implements them correctly. ++ For now we use a test of the GCC version as an approximation to the binutils ++ versions that are needed. (Note - 2.35.2, as used by RHEL-9, is insufficient). ++ See BZ 2016458 for an example of where this solution is needed. */ + #if GCCPLUGIN_VERSION_MAJOR >= 12 +- annobin_attach_type = link_order; ++ annobin_attach_type = link_order; + #else +- annobin_attach_type = group; ++ annobin_attach_type = group; + #endif ++ } + } + annobin_inform (INFORM_VERBOSE, "Attach mode: %s", attach_mode_name (annobin_attach_type)); + diff --git a/SPECS/annobin.spec b/SPECS/annobin.spec index ed82f38..d5b0b9c 100644 --- a/SPECS/annobin.spec +++ b/SPECS/annobin.spec @@ -1,9 +1,9 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 12.12 -Release: 1%{?dist} -License: GPLv3+ +Version: 12.31 +Release: 2%{?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 # Maintainer: nickc@redhat.com # Web Page: https://sourceware.org/annobin/ # Watermark Protocol: https://fedoraproject.org/wiki/Toolchain/Watermark @@ -62,7 +62,7 @@ Source: https://nickc.fedorapeople.org/%{annobin_sources} %global annobin_source_dir %{_usrsrc}/annobin # Insert patches here, if needed. Eg: -# Patch01: annobin-foo.patch +Patch01: annobin-strings-no-attach.patch #--------------------------------------------------------------------------------- @@ -366,6 +366,37 @@ exit $res #--------------------------------------------------------------------------------- %changelog +* Wed Jan 17 2024 Nick Clifron - 12.31-2 +- GCC Plugin: Do not use section groups with string notes. (RHEL-21772) + +* Wed Nov 15 2023 Nick Clifron - 12.31-1 +- Update glibc detection heuristics for PPC64. (RHEL-16453) +- Fix another atexit test failure. (#2247481) +- Fix atexit test failure. +- Notes: Add support for string format notes. + +* Mon Oct 09 2023 Nick Clifton - 12.28-1 +- Tests: Fix obsoleted syntax in plans/ci.fmf (RHEL-12194) +- Spec File: Use SPDX licensing. +- GCC Plugin: Record settings of -Wstrict-flex-arrays and -fstrict-flex-arrays +- Annobin: Add future test of these options. +- GCC Plugin: Record settings of -Wimplicit-int and -Wimplicit-function-declaration. +- Annobin: Add test for these warnings. +- LLVM Plugin: Fix building with LLVM version 17. +- GCC Plugin: Enable string note format by default. +- Annocheck: Change GO FIPS test to look for CGO_ENABLED markers. +- Annocheck: Add test for FIPS compliant GO binaries. +- Annocheck: Fix double free. (#2226749) +- Annocheck: Ignore AArch64 $x and $d symbols. (#2221192) +- GCC Plugin: Suppress active checks for fortran sources. Improve scanning of COLLECT_GCC_OPTIONS. +- Annocheck: Remove dependency upon binutils-devel. +- Annocheck: Add detection of known parts of libstdc++-nonshared.a that contain gaps. (#2217864) +- Annocheck: Ignore weak/undef function symbols when checking to see if a binary contains code. (#2217840) +- Annocheck: Add --suppress-version-warnings option. +- Annocheck: Do not ignore separate debuginfo files that do not contain any DWARF. (#2144553) +- Annocheck: Ignore /dev/null filename in string notes. +- Annocheck: More tweaks to glibc detection heuristics. (#2215968) + * Wed Jun 14 2023 Nick Clifton - 12.12-1 - Rebuild against LLVM-16. (#2212739) - Annocheck: Check for string notes in separate debug info files. (#2211694)