From 17b162d2a0d13e4c5fbc8a03832539f521917d28 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 20 Mar 2015 13:54:08 +0000
Subject: [PATCH] Revert "Enable hardening flags by building the static 'init'
 specially before the main build."

This reverts commit 8c0345898be04eea1bc6ef6684ffd6a7d04ddd2c.
---
 supermin.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/supermin.spec b/supermin.spec
index 5b71571..6abf921 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -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
 Name:          supermin
 Version:       5.1.12
-Release:       6%{?dist}
+Release:       7%{?dist}
 License:       GPLv2+
 
 %if 0%{?rhel} >= 7
@@ -75,11 +80,6 @@ from supermin appliances.
 %build
 %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}
 
 
@@ -118,6 +118,9 @@ make check || {
 
 
 %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
 - Enable hardening flags by building the static 'init' specially
   before the main build.