From edeb62e65cd7ec1a6f569d8747f6c2494bd1b4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 22 Apr 2025 09:02:00 +0200 Subject: [PATCH] Add %_hardening_linker_errors back to GCC ldflags This was accidentally removed in fda90b0a420d46b3c98463492db31dbdb886f56b Resolves: RHEL-91948 (cherry picked from commit d76f8229fe34f544bf596993fcab9cf706600543) --- macros | 2 +- redhat-rpm-config.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/macros b/macros index fbdab63..94165a2 100644 --- a/macros +++ b/macros @@ -335,7 +335,7 @@ for k,_ in pairs(stripped_flags) do print(k .. " ") end %_hardened_linker_errors 1 # we don't escape symbols '~', '"', etc. so be careful when changing this -%_hardening_gcc_ldflags -specs=/usr/lib/rpm/redhat/redhat-hardened-ld +%_hardening_gcc_ldflags -specs=/usr/lib/rpm/redhat/redhat-hardened-ld %{?_hardened_linker_errors:%{_hardening_linker_errors}} %_hardening_clang_ldflags --config=/usr/lib/rpm/redhat/redhat-hardened-clang-ld.cfg %_hardening_ldflags -Wl,-z,now %{expand:%%{_hardening_%{toolchain}_ldflags}} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 98a0b03..b252e48 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, increment the version (in baserelease) by 1. # rpmdev-bumpspec and other tools update the macro below, which is used # in Version: to get the desired effect. -%global baserelease 290 +%global baserelease 291 Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config