From 8d4b9abd639cf81af342ccb1839e92f71d26ebb7 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Fri, 25 Nov 2022 12:08:02 +0100
Subject: [PATCH] Build iputils and ifenslave with correct flags

Resolves: #2144509
---
 ...slave.patch => 100-iputils-ifenslave.patch |  0
 ...tch => 101-iputils-ifenslave-CWE-170.patch |  0
 ...h => 102-iputils-ifenslave-CWE-170-2.patch |  0
 iputils.spec                                  | 21 ++++++++-----------
 4 files changed, 9 insertions(+), 12 deletions(-)
 rename iputils-ifenslave.patch => 100-iputils-ifenslave.patch (100%)
 rename iputils-ifenslave-CWE-170.patch => 101-iputils-ifenslave-CWE-170.patch (100%)
 rename iputils-ifenslave-CWE-170-2.patch => 102-iputils-ifenslave-CWE-170-2.patch (100%)

diff --git a/iputils-ifenslave.patch b/100-iputils-ifenslave.patch
similarity index 100%
rename from iputils-ifenslave.patch
rename to 100-iputils-ifenslave.patch
diff --git a/iputils-ifenslave-CWE-170.patch b/101-iputils-ifenslave-CWE-170.patch
similarity index 100%
rename from iputils-ifenslave-CWE-170.patch
rename to 101-iputils-ifenslave-CWE-170.patch
diff --git a/iputils-ifenslave-CWE-170-2.patch b/102-iputils-ifenslave-CWE-170-2.patch
similarity index 100%
rename from iputils-ifenslave-CWE-170-2.patch
rename to 102-iputils-ifenslave-CWE-170-2.patch
diff --git a/iputils.spec b/iputils.spec
index e454f64..eb9dd86 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -3,7 +3,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20210202
-Release: 7%{?dist}
+Release: 8%{?dist}
 # some parts are under the original BSD (ping.c)
 # some are under GPLv2+ (tracepath.c)
 License: BSD and GPLv2+
@@ -18,9 +18,9 @@ Source3: ninfod.service
 Source4: bsd.txt
 Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
-Patch100: iputils-ifenslave.patch
-Patch101: iputils-ifenslave-CWE-170.patch
-Patch102: iputils-ifenslave-CWE-170-2.patch
+Patch100: 100-iputils-ifenslave.patch
+Patch101: 101-iputils-ifenslave-CWE-170.patch
+Patch102: 102-iputils-ifenslave-CWE-170-2.patch
 
 BuildRequires: gcc
 BuildRequires: meson
@@ -61,16 +61,10 @@ cp %{SOURCE4} %{SOURCE5} .
 %patch102 -p1
 
 %build
-%ifarch s390 s390x
-  export CFLAGS="-fPIE"
-%else
-  export CFLAGS="-fpie"
-%endif
-export LDFLAGS="-pie -Wl,-z,relro,-z,now"
-
 %meson -DBUILD_TFTPD=false
 %meson_build
-gcc -Wall $RPM_OPT_FLAGS $CFLAGS $RPM_LD_FLAGS $LDFLAGS ifenslave.c -o ifenslave
+
+gcc $RPM_OPT_FLAGS $CFLAGS $RPM_LD_FLAGS $LDFLAGS ifenslave.c -o ifenslave
 
 %install
 %meson_install
@@ -135,6 +129,9 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 %attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
 
 %changelog
+* Fri Nov 25 2022 Jan Macku <jamacku@redhat.com> - 20210202-8
+- Build iputils and ifenslave with correct flags (rhbz#2144509)
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20210202-7
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688