Revert "Enable hardening flags by building the static 'init' specially before the main build."

This reverts commit 8c0345898b.
This commit is contained in:
Richard W.M. Jones 2015-03-20 13:54:08 +00:00
parent 5d053a5189
commit 17b162d2a0

View File

@ -1,7 +1,12 @@
# _hardened_build breaks building the static 'init' binary.
# https://bugzilla.redhat.com/show_bug.cgi?id=1202091
# https://bugzilla.redhat.com/show_bug.cgi?id=1204162
%undefine _hardened_build
Summary: Tool for creating supermin appliances Summary: Tool for creating supermin appliances
Name: supermin Name: supermin
Version: 5.1.12 Version: 5.1.12
Release: 6%{?dist} Release: 7%{?dist}
License: GPLv2+ License: GPLv2+
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
@ -75,11 +80,6 @@ from supermin appliances.
%build %build
%configure --disable-network-tests %configure --disable-network-tests
# Build the static init without any special hardening flags.
# https://bugzilla.redhat.com/show_bug.cgi?id=1202091
make -C src init CFLAGS="-g -O2" LDFLAGS="-g -O2"
# Build the rest of the program with hardening flags.
make %{?_smp_mflags} make %{?_smp_mflags}
@ -118,6 +118,9 @@ make check || {
%changelog %changelog
* Fri Mar 20 2015 Richard W.M. Jones <rjones@redhat.com> - 5.1.12-7
- Disable hardened build again. See RHBZ#1202091 RHBZ#1204162.
* Mon Mar 16 2015 Richard W.M. Jones <rjones@redhat.com> - 5.1.12-6 * Mon Mar 16 2015 Richard W.M. Jones <rjones@redhat.com> - 5.1.12-6
- Enable hardening flags by building the static 'init' specially - Enable hardening flags by building the static 'init' specially
before the main build. before the main build.