Build iputils and ifenslave with correct flags

Resolves: #2144509
This commit is contained in:
Jan Macku 2022-11-25 12:08:02 +01:00
parent 1679b31803
commit 8d4b9abd63
4 changed files with 9 additions and 12 deletions

View File

@ -3,7 +3,7 @@
Summary: Network monitoring tools including ping Summary: Network monitoring tools including ping
Name: iputils Name: iputils
Version: 20210202 Version: 20210202
Release: 7%{?dist} Release: 8%{?dist}
# some parts are under the original BSD (ping.c) # some parts are under the original BSD (ping.c)
# some are under GPLv2+ (tracepath.c) # some are under GPLv2+ (tracepath.c)
License: BSD and GPLv2+ License: BSD and GPLv2+
@ -18,9 +18,9 @@ Source3: ninfod.service
Source4: bsd.txt Source4: bsd.txt
Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
Patch100: iputils-ifenslave.patch Patch100: 100-iputils-ifenslave.patch
Patch101: iputils-ifenslave-CWE-170.patch Patch101: 101-iputils-ifenslave-CWE-170.patch
Patch102: iputils-ifenslave-CWE-170-2.patch Patch102: 102-iputils-ifenslave-CWE-170-2.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: meson BuildRequires: meson
@ -61,16 +61,10 @@ cp %{SOURCE4} %{SOURCE5} .
%patch102 -p1 %patch102 -p1
%build %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 -DBUILD_TFTPD=false
%meson_build %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 %install
%meson_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 %attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
%changelog %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 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20210202-7
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688