From b6aaab90def60f3748d8110856577a7c332a93d2 Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Mon, 21 Feb 2022 19:51:16 +0100
Subject: [PATCH] Merge CFLAGS and LDFLAGS to get binaries with full RELRO

Resolves: #2044893
---
 sysstat.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sysstat.spec b/sysstat.spec
index 0457b37..d1c681e 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,7 +1,7 @@
 Summary: Collection of performance monitoring tools for Linux
 Name: sysstat
 Version: 12.5.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://sebastien.godard.pagesperso-orange.fr/
 Source: https://github.com/sysstat/sysstat/archive/v%{version}.tar.gz
@@ -39,6 +39,7 @@ The cifsiostat command reports I/O statistics for CIFS file systems.
 %autosetup -S git_am
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld"
 %configure \
     --enable-install-cron \
     --enable-copy-only \
@@ -85,6 +86,9 @@ fi
 %{_localstatedir}/log/sa
 
 %changelog
+* Mon Feb 21 2021 Michal Sekletar <msekleta@redhat.com> 12.5.4-3
+- sysstat's buildsystem doesn't really use LDFLAGS, we have to merge CFLAGS and LDFLAGS to get binaries with full RELRO (#2044893)
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 12.5.4-2
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688