From 9285dfc44f8032bc13e5ba8d6daae9d832a330f8 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 16 Jan 2024 11:32:07 +0000 Subject: [PATCH] Annocheck: Disable cf-protection test for i686 architecture. Resolves: #2258571 --- annobin.spec | 22 ++++++++++++++-------- sources | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/annobin.spec b/annobin.spec index 2426be9..8ec9385 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,8 +1,8 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 12.35 -Release: 4%{?dist} +Version: 12.36 +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/ # Maintainer: nickc@redhat.com @@ -36,9 +36,14 @@ URL: https://sourceware.org/annobin/ # Set this to zero to disable the requirement for a specific version of gcc. # This should only be needed if there is some kind of problem with the version # checking logic or when building on RHEL-7 or earlier. +# +# Update: now that we have gcc version checking support in redhat-rpm-config +# there is no longer a great need for a hard gcc version check here. Not +# enabling this check greatly simplifies the process of installing a new major +# version of gcc into the buildroot. %global with_hard_gcc_version_requirement 0 -%bcond_with plugin_rebuild +%bcond_without plugin_rebuild # Allow the building of annobin without using annobin itself. # This is because if we are bootstrapping a new build environment we can have # a new version of gcc installed, but without a new of annobin installed. @@ -53,11 +58,9 @@ URL: https://sourceware.org/annobin/ # to gcc breaks the version installed into the buildroot. Note however that # uncommenting the lines below will result in annocheck not passing the rpminspect # tests.... - -%if %{without plugin_rebuild} -%undefine _annotated_build -%endif - +# %%if %%{without plugin_rebuild} +# %%undefine _annotated_build +# %%endif #--------------------------------------------------------------------------------- @@ -531,6 +534,9 @@ make check #--------------------------------------------------------------------------------- %changelog +* Tue Jan 16 2024 Songsong Zhang - 12.36-1 +- Annocheck: Disable cf-protection test for i686 architecture. (#2258571) + * Mon Jan 15 2024 Songsong Zhang - 12.35-4 - Spec File: NVR bump in order to allow building in side tag. diff --git a/sources b/sources index 34dd97c..b4539cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-12.35.tar.xz) = 61f615e7ee69467be4bdac397e10e4dc5ecb6d20fb20569ba7fe35e11b18e8e018f5d366c6e184a71701785e83ab3be509f47f6e199b8a40aa5b95e9d7bf4dc0 +SHA512 (annobin-12.36.tar.xz) = 4e291427fe011774ac8b64647d26502cc9b1d9516ffbb12b3c428524de960a3f79fd9ad87043d0b6fe89d71fdf2b536c766676bfe2dda1af28246fb33518a93d