Compare commits

...

2 Commits

Author SHA1 Message Date
eabdullin a1e9f6467d import CS gcc-toolset-13-annobin-12.32-2.el8 2024-03-27 19:42:43 +00:00
eabdullin 640e8afd15 import CS gcc-toolset-13-annobin-12.20-1.el8 2023-10-13 08:27:39 +00:00
5 changed files with 56 additions and 30 deletions

View File

@ -1 +1 @@
3d7ea3aa7fee6f680b0c45433af6cef146fc062e SOURCES/annobin-12.20.tar.xz
c77f60d6064617958a3c35bcd930b33e5567ac78 SOURCES/annobin-12.32.tar.xz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/annobin-12.20.tar.xz
SOURCES/annobin-12.32.tar.xz

11
SOURCES/annobin-nop.patch Normal file
View File

@ -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,

View File

@ -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}

View File

@ -8,9 +8,9 @@ BuildRequires: scl-utils-build
Name: %{?scl_prefix}annobin
Summary: Annotate and examine compiled binary files
Version: 12.20
Release: 1%{?dist}
License: GPLv3+
Version: 12.32
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
# Web Page: https://sourceware.org/annobin/
@ -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
@ -529,9 +531,16 @@ make check GCC=%gcc_for_annobin
%if %{with gccplugin}
%files plugin-gcc
%dir %{ANNOBIN_GCC_PLUGIN_DIR}
%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so
%verify(owner) %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so
%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0
%verify(owner) %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0
%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0
%verify(owner) %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0
%{ANNOBIN_GCC_PLUGIN_DIR}/%{aver}
%{annobin_source_dir}/latest-annobin.tar.xz
%endif
@ -550,18 +559,35 @@ make check GCC=%gcc_for_annobin
#---------------------------------------------------------------------------------
%changelog
* Tue Nov 28 2023 Nick Clifton <nickc@redhat.com> - 12.32-2
- GCC Plugin: Add %%verify tokens to show that the default plugin names are symbolic links. (RHEL-17505)
* Mon Nov 27 2023 Nick Clifton <nickc@redhat.com> - 12.32-1
- LLVM Plugin: Fix building with LLVM version 17. (RHEL-17311)
- GCC Plugin: Add support for -fhardended.
- 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.
- 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.
- 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)
* Mon Jul 17 2023 Nick Clifton <nickc@redhat.com> - 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 <nickc@redhat.com> - 12.18-1
- Annocheck: Remove dependency upon libiberty.
* Fri Jun 30 2023 Nick Clifton <nickc@redhat.com> - 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 <nickc@redhat.com> - 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 +595,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 <nickc@redhat.com> - 12.12-1
- Rebuild against GTS-13 gcc. (#2196505)
* Tue May 09 2023 Nick Clifton <nickc@redhat.com> - 12.10-2
- Rebuild against GTS-13 gcc. (#2196506)
* Tue May 02 2023 Nick Clifton <nickc@redhat.com> - 12.10-1
- Add gating.yaml file. (#2192492)
- Annocheck: Suppress more tests for Rust binaries.
* Wed May 03 2023 Nick Clifton <nickc@redhat.com> - 12.10-1
- Add gating.yaml file. (#2192491)
* Tue Apr 25 2023 Nick Clifton <nickc@redhat.com> - 12.09-1
- Rebase to 12.09 (#2144553)
- Rebase to 12.09 (#2188638)
* Tue Apr 25 2023 Nick Clifton <nickc@redhat.com> - 12.09-1
- Annocheck: Fix detection of missing plugin options. (#2189492)