[knot] * Fri Apr 05 2013 Paul Wouters <pwouters at redhat.com> - 1.2.0-1 - Updated to 1.2.0-1 - Enabled harden

[Paul Wouters]

commit 402c5781a209bbcae19aba89a514cc0866f7ade5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Apr 5 13:05:45 2013 -0400

    * Fri Apr 05 2013 Paul Wouters <pwouters at redhat.com> - 1.2.0-1
    - Updated to 1.2.0-1
    - Enabled hardening/relro/pie protection

 .gitignore |    1 +
 knot.spec  |   19 ++++++++++++-------
 sources    |    2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27cd025..6f74995 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /knot-1.1.3.tar.gz
+/knot-1.2.0.tar.gz
diff --git a/knot.spec b/knot.spec
index f08ae85..87fb7d3 100644
--- a/knot.spec
+++ b/knot.spec
@@ -1,7 +1,9 @@
+%global _hardened_build 1
+
 Summary: An authoritative DNS daemon
 Name: knot
-Version: 1.1.3
-Release: 3%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.knot-dns.cz
@@ -24,11 +26,10 @@ KNOT DNS is a high-performance authoritative DNS server implementation.
 %setup -q -n %{name}-%{version}
 
 %build
-CFLAGS="%{optflags} -lgcc_eh" CXXFLAGS="%{optflags} -lgcc_eh" \
-./configure --prefix=%{_prefix} \
-	--sysconfdir=%{_sysconfdir}/%{name} \
-	--localstatedir=%{_sharedstatedir} \
-	--libdir=%{_libdir} --libexecdir=%{_libexecdir}/%{name}
+export CFLAGS="%{optflags} -fPIC -Wall -lgcc_eh" CXXFLAGS="%{optflags} -lgcc_eh"
+export DFLAGS="$RPM_OPT_FLAGS -g "
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+%configure --sysconfdir=%{_sysconfdir}/%{name} --libexecdir=%{_libexecdir}/%{name}
 make %{?_smp_mflags}
 
 %install
@@ -78,6 +79,10 @@ fi
 %doc %{_infodir}/knot.info.gz
 
 %changelog
+* Fri Apr 05 2013 Paul Wouters <pwouters at redhat.com> - 1.2.0-1
+- Updated to 1.2.0-1
+- Enabled hardening/relro/pie protection
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 28bb2f6..4a19565 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3b0eb91ce2e54fbb22a06b338e45161  knot-1.1.3.tar.gz
+c64f1078a37ff04c157e5ad458340ebc  knot-1.2.0.tar.gz