diff --git a/.gcc-toolset-13-annobin.metadata b/.gcc-toolset-13-annobin.metadata index c531fb2..94eb25a 100644 --- a/.gcc-toolset-13-annobin.metadata +++ b/.gcc-toolset-13-annobin.metadata @@ -1 +1 @@ -de4a5bfdc997f5118274070b9cf895d78ea68f55 SOURCES/annobin-12.69.tar.xz +b0926901d5fc2e76b48a923cafc2fc06e59219c5 SOURCES/annobin-12.92.tar.xz diff --git a/.gitignore b/.gitignore index 668d5dd..019ca25 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/annobin-12.69.tar.xz \ No newline at end of file +SOURCES/annobin-12.92.tar.xz diff --git a/SOURCES/annobin-gcc-plugin-cl-vars.patch b/SOURCES/annobin-gcc-plugin-cl-vars.patch new file mode 100644 index 0000000..44a8bb3 --- /dev/null +++ b/SOURCES/annobin-gcc-plugin-cl-vars.patch @@ -0,0 +1,29 @@ +--- annobin-12.92/gcc-plugin/annobin.cc 2025-02-14 10:40:14.000000000 +0000 ++++ annobin.new/gcc-plugin/annobin.cc 2025-02-18 12:38:54.231135138 +0000 +@@ -909,7 +909,7 @@ const char * + annobin_get_str_option_by_name (const char * name ATTRIBUTE_UNUSED, + const char * default_return) + { +-#if GCCPLUGIN_VERSION_MAJOR >= 11 ++#if GCCPLUGIN_VERSION_MAJOR >= 14 + /* GCC version 11 introduced the cl_vars array which provides offsets for + fields in global_options which are not handled by cl_options. */ + const struct cl_var * var = cl_vars; +@@ -929,7 +929,7 @@ const int + annobin_get_int_option_by_name (const char * name ATTRIBUTE_UNUSED, + const int default_return) + { +-#if GCCPLUGIN_VERSION_MAJOR >= 11 ++#if GCCPLUGIN_VERSION_MAJOR >= 14 + /* GCC version 11 introduced the cl_vars array which provides offsets for + fields in global_options which are not handled by cl_options. */ + const struct cl_var * var = cl_vars; +@@ -3249,7 +3249,7 @@ multiple_annobin_plugins_present (const + return false; + } + +-#if GCCPLUGIN_VERSION_MAJOR > 11 ++#if GCCPLUGIN_VERSION_MAJOR > 14 + /* We used to call plugins_active_p() here but this only lets us know if + there are other active plugins. It does not tell us if they are + different versions of the annobin plugin. So instead we iterate diff --git a/SPECS/annobin.spec b/SPECS/annobin.spec index 4a0e932..2be0a73 100644 --- a/SPECS/annobin.spec +++ b/SPECS/annobin.spec @@ -8,7 +8,7 @@ BuildRequires: scl-utils-build Name: %{?scl_prefix}annobin Summary: Annotate and examine compiled binary files -Version: 12.69 +Version: 12.92 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,6 +73,7 @@ Source: https://nickc.fedorapeople.org/%{annobin_sources} # Insert patches here, if needed. Patch01: annobin-nop.patch Patch02: annobin-tmp-default-to-using-group-attach.patch +Patch03: annobin-gcc-plugin-cl-vars.patch # This is where a copy of the sources will be installed. %global annobin_source_dir %{?_scl_root}/%{_usrsrc}/annobin @@ -503,7 +504,7 @@ rm -f %{_mandir}/man1/annocheck.1.gz # The first "make check" is run with "|| :" so that we can capture any logs # from failed tests. The second "make check" is there so that the build # will fail if any of the tests fail. -make check GCC=%gcc_for_annobin || : +make check GCC=%gcc_for_annobin CC=%gcc_for_annobin || : if [ -f tests/test-suite.log ]; then cat tests/test-suite.log fi @@ -512,7 +513,7 @@ fi # uuencode tests/tmp_atexit/atexit.strip atexit.strip # Now repeat the tests so that we get the correct exit code. -make check GCC=%gcc_for_annobin +make check GCC=%gcc_for_annobin CC=%gcc_for_annobin %endif #--------------------------------------------------------------------------------- @@ -574,6 +575,39 @@ make check GCC=%gcc_for_annobin #--------------------------------------------------------------------------------- %changelog +* Tue Feb 18 2025 Nick Clifton - 12.92-1 +- Rebase to bring in improvements for locating string notes. (RHEL-79974) +- Annocheck: Do not rely upon libelf's ability to detect links to separate debuginfo files. (RHEL-79264) +- Annocheck: Fix resource leak. (RHEL-79253) +- Annocheck: Fix double free. Add special handling for COMBOOT modules. +- Annocheck: Improve diagnostics when a separate debug info file cannot be found. +- Annocheck: Look for -fstack-clash-protection in DW_AT_producer string. (RHEL-77328) +- Annocheck: Fix locating string notes (again). Add exception for glibc benchmark tests. (RHEL-76456) +- Annocheck: Add crtoffloadtableS.o to list of known gcc binaries. (RHEL-760404) +- Annocheck: Fix the --debug-dir option. +- Annocheck: Fix corrupt warning message when unable to locate separate debug info files. +- Annocheck: Remove spurious debugging messages. +- Annocheck: Always look for annobin notes in separate debug info files. (RHEL-75778) +- Annocheck: Support multiple --debug-rpm and --debug-file options. (RHEL-73349) +- Annocheck: Add support for sys-root'ed glibc packages. (RHEL-71296) +- GCC Plugin: Tidy up use of gcc's diagnoatic headers. (#32429) +- Testsuite: Use configured compiler when running tests. +- GCC Plugin: Fix building with gcc 15. (#32429) +- Annocheck: Fix overly long debug messages. +- Annocheck: Rename rwx-seg test to load-segments. Add more checks. Add check for gaps as a future fail. +- Annocheck: Add --no-allow-excpetions to disable exceptions for known special binaries. +- Annocheck: Add --enable-future to enable future fail components in normal tests. +- Annocheck: Fix bug preventing the inclusion of the rpm name in reports. +- Annocheck: Add more exceptions for gcc binaries. (RHEL-33365) +- Annocheck: Add --skip-passes option. +- Annocheck: Add exceptions for gcc binaries. (RHEL-33365) +- Annocheck: Skip property note test for i386 binaries created by LLVM. (#2323797) +- 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. + +* Mon Jan 06 2025 Nick Clifton - 12.69-2 +- NVR bump to allow rebuilding against LLVM version 18. (RHEL-50803) + * Mon Aug 12 2024 Nick Clifton - 12.69-1 - BuiltBy: Fix seg-fault when comparing language version strings. (RHEL-53497) - Spec File: Use correct names for the symlinks. (RHEL-53572)