Compare commits

..

No commits in common. "c8s" and "c10s" have entirely different histories.
c8s ... c10s

7 changed files with 30 additions and 127 deletions

2
.gitignore vendored
View File

@ -3,5 +3,3 @@
/annobin-12.67.tar.xz
/annobin-12.69.tar.xz
/annobin-12.70.tar.xz
/annobin-12.87.tar.xz
/annobin-12.88.tar.xz

View File

@ -1,36 +0,0 @@
--- annobin.orig/annocheck/hardened.c 2025-01-30 12:36:09.369783992 +0000
+++ annobin-12.87/annocheck/hardened.c 2025-01-30 12:47:26.063549239 +0000
@@ -8186,11 +8186,11 @@ interesting_seg (annocheck_data * dat
{
fail (data, TEST_LOAD_SEGMENTS, SOURCE_SEGMENT_HEADERS, "there is a gap between LOAD segments of more than one page");
einfo (VERBOSE, "debug: prev LOAD seg (%u) ends at %lx", per_file.prev_load_seg_number, (long) next_addr);
- einfo (VERBOSE, "debug: this LOAD seg (%u) starts at %lx leaving a gap of %u %#x sized page(s)",
+ einfo (VERBOSE, "debug: this LOAD seg (%u) starts at %lx leaving a gap of %u %#lx sized page(s)",
seg->number,
(long) seg->phdr->p_vaddr,
(uint) ((page_align_down (seg->phdr->p_vaddr) - page_align_up (next_addr + 1)) / get_page_size ()),
- get_page_size ());
+ (long) get_page_size ());
}
}
}
--- annobin.orig/annocheck/annocheck.c 2025-01-30 12:36:09.369783992 +0000
+++ annobin-12.87/annocheck/annocheck.c 2025-01-30 13:07:37.681713537 +0000
@@ -2852,7 +2852,7 @@ process_command_line (uint argc, const c
const char * dash;
einfo (VERBOSE2, "Looking for a debuginfo rpm associated with %s", f);
- while (dash = strchr (f, '-'))
+ while ((dash = strchr (f, '-')) != NULL)
{
if (isdigit (dash[1]))
break;
@@ -2865,7 +2865,7 @@ process_command_line (uint argc, const c
struct stat statbuf;
char * test = xmalloc (strlen (files[0]) + strlen (extension) + 1);
- sprintf (test, "%.*s%s%s", (dash - files[0]) + 1, files[0], extension, dash+1);
+ sprintf (test, "%.*s%s%s", (int) (dash - files[0]) + 1, files[0], extension, dash+1);
einfo (VERBOSE2, "Possible associated debuginfo rpm: %s\n", test);

View File

@ -1,11 +0,0 @@
--- annobin.orig/gcc-plugin/annobin.cc 2023-04-28 09:58:05.487156290 +0100
+++ annobin-12.09/gcc-plugin/annobin.cc 2023-04-28 09:58:36.434248542 +0100
@@ -2104,7 +2104,7 @@ annobin_emit_start_sym_and_version_note
Ensure that we do not have empty special text sections so that the
annobin start symbols are never beyond the end of the sections. */
#ifndef ANNOBIN_NOP_INSN
-#define ANNOBIN_NOP_INSN ".nop"
+#define ANNOBIN_NOP_INSN "nop"
#endif
if (* suffix && enable_ppc64_nops)
annobin_emit_asm (ANNOBIN_NOP_INSN,

View File

@ -1,12 +0,0 @@
diff -rup annobin.orig/gcc-plugin/annobin.cc annobin-12.52/gcc-plugin/annobin.cc
--- annobin.orig/gcc-plugin/annobin.cc 2024-05-02 12:11:35.628517293 +0100
+++ annobin-12.52/gcc-plugin/annobin.cc 2024-05-02 12:12:35.471570222 +0100
@@ -3300,7 +3300,7 @@ plugin_init (struct plugin_name_args *
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 = group;
#else
annobin_attach_type = group;
#endif

View File

@ -8,8 +8,8 @@ BuildRequires: scl-utils-build
Name: %{?scl_prefix}annobin
Summary: Annotate and examine compiled binary files
Version: 12.88
Release: 1%{?dist}
Version: 12.70
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
URL: https://sourceware.org/annobin/
# Maintainer: nickc@redhat.com
@ -85,10 +85,8 @@ Source: https://nickc.fedorapeople.org/%{annobin_sources}
# For the latest sources use: git clone git://sourceware.org/git/annobin.git
# Insert patches here, if needed.
Patch01: annobin-nop.patch
Patch02: annobin-tmp-default-to-using-group-attach.patch
%if %{bootstrapping}
Patch03: annobin-gcc-plugin-ignore-major-version-diffs.patch
Patch01: annobin-gcc-plugin-ignore-major-version-diffs.patch
%endif
# This is where a copy of the sources will be installed.
@ -103,17 +101,17 @@ BuildRequires: gcc gcc-c++
%else
BuildRequires: %{?scl_prefix}gcc
BuildRequires: %{?scl_prefix}gcc-c++
BuildRequires: %{?scl_prefix}annobin-plugin-gcc
BuildRequires: %{scl_prefix}gcc
BuildRequires: %{scl_prefix}gcc-c++
BuildRequires: %{scl_prefix}annobin-plugin-gcc
%{?scl:BuildRequires:%scl_runtime}
%{?scl:Requires:%scl_runtime}
# We need the gcc-toolset-N version of gcc in order to run annobin, as otherwise the versions will not match.
%{?scl:Requires:%scl_require_package %{scl} gcc}
%define gcc_for_annobin %{?_scl_root}/usr/bin/gcc
%define gxx_for_annobin %{?_scl_root}/usr/bin/g++
%define gcc_for_annobin %{_scl_root}/usr/bin/gcc
%define gxx_for_annobin %{_scl_root}/usr/bin/g++
%endif
@ -393,7 +391,7 @@ fi
echo "Requires: (%{?scl_prefix}gcc >= %{gcc_major} and %{?scl_prefix}gcc < %{gcc_next})"
# NB/ Do not add {?scl_prefix} to the -n option below. The annobin sources
# unpack into a directory called annobin-VERSION not gcc-toolset-N-annobin-VERSION.
# unpack into a directory called annobin-VERSION not gcc-toolset-14-annobin-VERSION.
%autosetup -p1 -n annobin-%{version}
# The plugin has to be configured with the same arcane configure
@ -504,13 +502,13 @@ rm %{_tmppath}/tmp_annobin.so
%if %{with clangplugin}
cp clang-plugin/annobin-for-clang.so %{_tmppath}/tmp_annobin.so
# To enable verbose more in the plugin append the following: ANNOBIN="verbose"
make -C clang-plugin clean all CLANG_TARGET_OPTIONS="$CLANG_TARGET_OPTIONS $BUILD_FLAGS" PLUGIN_INSTALL_DIR=%{clang_plugin_dir}
make -C clang-plugin clean all CLANG_TARGET_OPTIONS="$CLANG_TARGET_OPTIONS $BUILD_FLAGS" PLUGIN_INSTALL_DIR=%{buildroot}/%{clang_plugin_dir}
%endif
%if %{with llvmplugin}
cp llvm-plugin/annobin-for-llvm.so %{_tmppath}/tmp_annobin.so
# To enable verbose more in the plugin append the following: ANNOBIN_VERBOSE="true"
make -C llvm-plugin clean all CLANG_TARGET_OPTIONS="$CLANG_TARGET_OPTIONS $BUILD_FLAGS" PLUGIN_INSTALL_DIR=%{llvm_plugin_dir}
make -C llvm-plugin clean all CLANG_TARGET_OPTIONS="$CLANG_TARGET_OPTIONS $BUILD_FLAGS" PLUGIN_INSTALL_DIR=%{buildroot}/%{llvm_plugin_dir}
%endif
# endif for %%if {with_plugin_rebuild}
@ -564,7 +562,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 CC=%gcc_for_annobin || :
make check GCC=%gcc_for_annobin || :
if [ -f tests/test-suite.log ]; then
cat tests/test-suite.log
fi
@ -573,7 +571,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 CC=%gcc_for_annobin
make check GCC=%gcc_for_annobin
%endif
#---------------------------------------------------------------------------------
@ -635,58 +633,27 @@ make check GCC=%gcc_for_annobin CC=%gcc_for_annobin
#---------------------------------------------------------------------------------
%changelog
* Mon Feb 03 2025 Nick Clifton <nickc@redhat.com> - 12.88-1
- Annocheck: Look for -fstack-clash-protection in DW_AT_producer string. (RHEL-77142)
* Thu Aug 22 2024 Nick Clifton <nickc@redhat.com> - 12.87-1
- Rebase for GTS 14.1 release. (RHEL-76929)
- 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.
* Thu Aug 22 2024 Nick Clifton <nickc@redhat.com> - 12.70-3
* Thu Aug 22 2024 Nick Clifton <nickc@redhat.com> - 12.70-2
- NVR Bump to allow rebuilding with annotation.
* Tue Aug 13 2024 Nick Clifton <nickc@redhat.com> - 12.70-2
- Clang & LLVM Plugins: Remove buildroot from plugin install directory. (RHEL-54178)
* Tue Aug 13 2024 Nick Clifton <nickc@redhat.com> - 12.70-1
- Clang & LLVM Plugins: Include install directory in binary. (RHEL-54178)
- Clang & LLVM Plugins: Include install directory in binary. (RHEL-54069)
* Mon Aug 12 2024 Nick Clifton <nickc@redhat.com> - 12.69-1
- BuiltBy: Fix seg-fault when comparing language version strings. (RHEL-53497)
- Spec File: Use correct names for the symlinks. (RHEL-53210)
- Spec File: Use correct names for the symlinks. (RHEL-53209)
* Fri Aug 09 2024 Nick Clifton <nickc@redhat.com> - 12.67-5
- Spec File: Use correct names for the symlinks. (RHEL-53210)
- Spec File: Use correct names for the symlinks. (RHEL-53209)
* Thu Aug 08 2024 Nick Clifton <nickc@redhat.com> - 12.67-4
- Spec File: Use correct names for the plugins. (RHEL-53210)
- Spec File: Use correct names for the plugins. (RHEL-53209)
* Thu Aug 08 2024 Nick Clifton <nickc@redhat.com> - 12.67-3
- Spec File: Disable bootstrapping.
- Spec File: Disable bootstrapping. (RHEL-53543)
* Thu Aug 08 2024 Nick Clifton <nickc@redhat.com> - 12.67-2
- Spec File: Use correct directory for plugin installation. (RHEL-53210)
- Spec File: Use correct directory for plugin installation. (RHEL-53209)
- Spec File: Disable plugin when running on wrong major version of the compiler.
* Wed Aug 07 2024 Nick Clifton <nickc@redhat.com> - 12.67-1
@ -694,14 +661,11 @@ make check GCC=%gcc_for_annobin CC=%gcc_for_annobin
- Annocheck: Stop warnings about known gaps. (RHEL-53218)
- Annocheck: Fix stack realign test. (#2302427)
* Wed Aug 07 2024 Nick Clifton <nickc@redhat.com> - 12.65-5
- Spec File: Change bootstrap gcc version to 14. (RHEL-53210)
* Thu Aug 01 2024 Nick Clifton <nickc@redhat.com> - 12.65-4
- Spec File: Remove scl-runtime requirement when bootstrapping.
* Wed Aug 07 2024 Nick Clifton <nickc@redhat.com> - 12.65-4
- Spec File: Change bootstrap gcc version to 14. (RHEL-53209)
* Thu Aug 01 2024 Nick Clifton <nickc@redhat.com> - 12.65-3
- Spec File: Enable bootstrapping.
- Spec File: Remove scl-runtime requirement when bootstrapping.
* Thu Aug 01 2024 Nick Clifton <nickc@redhat.com> - 12.65-2
- Spec File: Remove spurious dash from install path of gcc plugin. (RHEL-51183)
@ -728,11 +692,11 @@ make check GCC=%gcc_for_annobin CC=%gcc_for_annobin
* Fri Jul 26 2024 Nick Clifton <nickc@redhat.com> - 12.52-5
- Spec File: Hard code the gcc plugin directory when boostrapping. (RHEL-50148)
* Tue May 07 2024 Nick Clifton <nickc@redhat.com> - 12.52-3
- Disable bootstrapping. (RHEL-29850)
* Mon Jul 22 2024 Nick Clifton <nickc@redhat.com> - 12.52-4
- Rebuild with LLVM 18. (RHEL-49955)
* Fri May 03 2024 Nick Clifton <nickc@redhat.com> - 12.52-2
- Disable version checks in gcc plugin. (RHEL-29850)
- Disable version checks in gcc plugin.
* Fri Apr 26 2024 Nick Clifton <nickc@redhat.com> - 12.52-1
- Initial import of sources.

View File

@ -1,7 +1,7 @@
--- !Policy
product_versions:
- rhel-8
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build.rebuild.validation}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.other.functional}

View File

@ -1 +1 @@
SHA512 (annobin-12.88.tar.xz) = 2523617393c2f8a7f61f863eecc49f94ab53b71c15522543bb2a6ddbdead6dc306dd67e0df73765b881fcbb4617af940e0fc5865cccb5b4940b11ce2cd27f816
SHA512 (annobin-12.70.tar.xz) = 50a29a630ab93577c6d79328595248f54f3da050208defe08432e5663e81050d64ca7079d30d2b5b48c3ce86048b631b81d09ff5081abde90ce9137216f1a93e