From cb604a16014887a3030f2a0d3a16722ab0cd15ff Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Jun 11 2013 10:23:20 +0000
Subject: use _hardened_build macro instead of hardcoded flags


Signed-off-by: Tomas Hozza <thozza@redhat.com>

---

diff --git a/dnsmasq.spec b/dnsmasq.spec
index 91af9a6..70903df 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -9,9 +9,11 @@
   %define extraversion rc5
 %endif
 
+%define _hardened_build 1
+
 Name:           dnsmasq
 Version:        2.66
-Release:        6%{?extraversion}%{?dist}
+Release:        7%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -112,10 +114,6 @@ sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g' dnsmasq.conf.examp
 
 
 %build
-# We need to compile the daemon with PIE, PIC and FULL RELRO
-RPM_LD_FLAGS="-Wl,-z,relro,-z,now -pie"
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE -DPIE -fPIC"
-
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 make -C contrib/wrt %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
@@ -179,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Tue Jun 11 2013 Tomas Hozza <thozza@redhat.com> - 2.66-7
+- use _hardened_build macro instead of hardcoded flags
+
 * Fri May 17 2013 Tomas Hozza <thozza@redhat.com> - 2.66-6
 - include several fixies from upstream repo:
   - Tighten hostname checks in legal hostname() function