diff --git a/SOURCES/annobin-nop.patch b/SOURCES/annobin-nop.patch new file mode 100644 index 0000000..66210e8 --- /dev/null +++ b/SOURCES/annobin-nop.patch @@ -0,0 +1,11 @@ +--- 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, diff --git a/SOURCES/annobin-tmp-skip-libannocheck-test.patch b/SOURCES/annobin-tmp-skip-libannocheck-test.patch deleted file mode 100644 index 2a4aeb8..0000000 --- a/SOURCES/annobin-tmp-skip-libannocheck-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup annobin.orig/tests/libannocheck-test annobin-12.14/tests/libannocheck-test ---- annobin.orig/tests/libannocheck-test 2023-06-23 10:25:50.591952049 +0100 -+++ annobin-12.14/tests/libannocheck-test 2023-06-23 10:26:29.757972286 +0100 -@@ -16,6 +16,8 @@ TEST_NAME=libannocheck - . $srcdir/common.sh - - start_test -+end_test -+exit 0 - - LIBANNOCHECKDIR=${LIBANNOCHECKDIR:-../../annocheck/.libs} - INCDIR=${INCDIR:-$srcdir/../annocheck} diff --git a/SPECS/annobin.spec b/SPECS/annobin.spec index 532cc2a..2cf5b05 100644 --- a/SPECS/annobin.spec +++ b/SPECS/annobin.spec @@ -72,8 +72,8 @@ Source: https://nickc.fedorapeople.org/%{annobin_sources} # Insert patches here, if needed. Eg: # Patch01: annobin-foo.patch -Patch01: annobin-tmp-default-to-using-group-attach.patch -Patch02: annobin-tmp-skip-libannocheck-test.patch +Patch01: annobin-nop.patch +Patch02: annobin-tmp-default-to-using-group-attach.patch # This is where a copy of the sources will be installed. %global annobin_source_dir %{?_scl_root}/%{_usrsrc}/annobin @@ -84,7 +84,6 @@ Patch02: annobin-tmp-skip-libannocheck-test.patch %{?scl:Requires:%scl_require_package %{scl} gcc} BuildRequires: %{?scl_prefix}gcc -BuildRequires: %{?scl_prefix}annobin-plugin-gcc %define gcc_for_annobin %{?_scl_root}/usr/bin/gcc %define gxx_for_annobin %{?_scl_root}/usr/bin/g++ @@ -179,6 +178,7 @@ Summary: A tool for checking the security hardening status of binaries BuildRequires: elfutils elfutils-devel elfutils-libelf-devel rpm-devel make BuildRequires: %{?scl_prefix}gcc +BuildRequires: %{?scl_prefix}binutils-devel %if %{with debuginfod} BuildRequires: elfutils-debuginfod-client-devel @@ -197,12 +197,14 @@ Summary: A library for checking the security hardening status of binaries BuildRequires: elfutils elfutils-devel elfutils-libelf-devel rpm-devel make BuildRequires: %{?scl_prefix}gcc +BuildRequires: %{?scl_prefix}binutils-devel %if %{with debuginfod} BuildRequires: elfutils-debuginfod-client-devel %endif Requires: %{name}-docs = %{version}-%{release} +Requires: %{?scl_prefix}binutils-devel %description libannocheck Installs the libannocheck library which uses the notes generated by the @@ -553,15 +555,13 @@ make check GCC=%gcc_for_annobin * Mon Jul 17 2023 Nick Clifton - 12.20-1 - Annocheck: Ignore AArch64 $x and $d symbols. (#2221192) - GCC Plugin: Suppress active checks for fortran sources. Improve scanning of COLLECT_GCC_OPTIONS. - -* Mon Jul 03 2023 Nick Clifton - 12.18-1 - Annocheck: Remove dependency upon libiberty. * Fri Jun 30 2023 Nick Clifton - 12.17-1 -- Annocheck: Add detection of known parts of libstdc++-nonshared.a that contain gaps. (#2217864) +- Annocheck: Add detection of known parts of libstdc++-nonshared.a that contain gaps. (#2217868) * Tue Jun 27 2023 Nick Clifton - 12.16-1 -- Spec File: Rebuild with annobin annotation. (#2217814) +- Spec File: Rebuild with annobin annotation. (#2217812) - Annocheck: Ignore weak/undef function symbols when checking to see if a binary contains code. (#2217840) - Annocheck: Add --suppress-version-warnings option. @@ -569,16 +569,17 @@ make check GCC=%gcc_for_annobin - 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) +- Annocheck: Check for string notes in separate debug info files. (#2211694) +- Annocheck: Add support for el10 and rhel-10 profiles. (RHEL-526) -* Wed Jun 07 2023 Nick Clifton - 12.12-1 -- Rebuild against GTS-13 gcc. (#2196505) +* Tue May 09 2023 Nick Clifton - 12.10-2 +- Rebuild against GTS-13 gcc. (#2196506) -* Tue May 02 2023 Nick Clifton - 12.10-1 -- Add gating.yaml file. (#2192492) -- Annocheck: Suppress more tests for Rust binaries. +* Wed May 03 2023 Nick Clifton - 12.10-1 +- Add gating.yaml file. (#2192491) * Tue Apr 25 2023 Nick Clifton - 12.09-1 -- Rebase to 12.09 (#2144553) +- Rebase to 12.09 (#2188638) * Tue Apr 25 2023 Nick Clifton - 12.09-1 - Annocheck: Fix detection of missing plugin options. (#2189492)