From 4928c05a15ef83c39a04fdd6fdc3e59f68240dc2 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 28 May 2024 15:51:39 +0100 Subject: [PATCH] Fix execstack error patch. Resolves: RHEL-19865 --- binutils-execstack-error.patch | 32 -------------------------------- binutils.spec | 5 ++++- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/binutils-execstack-error.patch b/binutils-execstack-error.patch index 2ec975d..a87a795 100644 --- a/binutils-execstack-error.patch +++ b/binutils-execstack-error.patch @@ -1479,35 +1479,3 @@ diff -rupN binutils.orig/ld/testsuite/ld-x86-64/pr23189.d binutils-2.41/ld/tests #readelf: -r --wide There are no relocations in this file. ---- binutils.orig/bfd/elflink.c 2023-11-14 13:16:18.706749224 +0000 -+++ binutils-2.41/bfd/elflink.c 2023-11-14 13:17:27.584837271 +0000 -@@ -7150,14 +7150,6 @@ bfd_elf_size_dynamic_sections (bfd *outp - though the choice is the result of another command line option. */ - if (info->warn_execstack == 1) - { -- if (info->error_execstack) -- { -- _bfd_error_handler -- (_("\ --error: creating an executable stack because of -z execstack command line option")); -- return false; -- } -- - _bfd_error_handler - (_("\ - warning: enabling an executable stack because of -z execstack command line option")); -@@ -7219,14 +7211,6 @@ warning: enabling an executable stack be - on the command line. */ - if (noteobj) - { -- if (info->error_execstack) -- { -- _bfd_error_handler (_("\ --error: %s: is triggering the generation of an executable stack (because it has an executable .note.GNU-stack section)"), -- bfd_get_filename (noteobj)); -- return false; -- } -- - _bfd_error_handler (_("\ - warning: %s: requires executable stack (because the .note.GNU-stack section is executable)"), - bfd_get_filename (noteobj)); diff --git a/binutils.spec b/binutils.spec index e2dd2f8..2c4b4ee 100644 --- a/binutils.spec +++ b/binutils.spec @@ -2,7 +2,7 @@ Summary: A GNU collection of binary utilities Name: binutils%{?_with_debug:-debug} Version: 2.41 -Release: 38%{?dist} +Release: 39%{?dist} License: GPL-3.0-or-later AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND BSD-3-Clause AND GFDL-1.3-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later URL: https://sourceware.org/binutils @@ -1374,6 +1374,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Tue May 28 2024 Nick Clifton - 2.41-39 +- Fix execstack error patch. (RHEL-19865) + * Mon May 20 2024 Nick Clifton - 2.41-38 - Add section-ordering patch to bfd linker. (RHEL-36305)