[pdns-recursor] Update to 3.7.0-rc1

[Morten Stevens]

commit 73099c6565ce490f7c2bffb58cbefad46687fd38
Author: Morten Stevens <mstevens at imt-systems.com>
Date:   Thu Jan 22 14:40:36 2015 +0100

    Update to 3.7.0-rc1

 .gitignore                      |    1 +
 pdns-recursor-fixmakefile.patch |   12 ++++++------
 pdns-recursor.spec              |   15 ++++++++++-----
 sources                         |    2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4a2515e..98bde85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ pdns-recursor-3.2.tar.bz2
 /pdns-recursor-3.6.0.tar.bz2
 /pdns-recursor-3.6.1.tar.bz2
 /pdns-recursor-3.6.2.tar.bz2
+/pdns-recursor-3.7.0-rc1.tar.bz2
diff --git a/pdns-recursor-fixmakefile.patch b/pdns-recursor-fixmakefile.patch
index 0e46464..c83eeaf 100644
--- a/pdns-recursor-fixmakefile.patch
+++ b/pdns-recursor-fixmakefile.patch
@@ -1,5 +1,5 @@
---- pdns-recursor-3.6.0/Makefile.orig	2014-06-20 11:24:09.000000000 +0200
-+++ pdns-recursor-3.6.0/Makefile	2014-06-20 14:18:50.098999662 +0200
+--- pdns-recursor-3.7.0-rc1/Makefile.in.orig	2015-01-22 09:52:05.000000000 +0100
++++ pdns-recursor-3.7.0-rc1/Makefile.in	2015-01-22 14:07:24.785474774 +0100
 @@ -1,13 +1,13 @@
  # user editable stuff:
  SBINDIR=/usr/sbin/
@@ -8,15 +8,15 @@
 +SYSCONFDIR=/etc/pdns-recursor
  LOCALSTATEDIR=/var/run/
  OPTFLAGS?=-O3
- CXXFLAGS:= $(CXXFLAGS) -Iext/rapidjson/include -I$(CURDIR)/ext/polarssl-1.3.2/include -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread -Iext/yahttp
- CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -I$(CURDIR)/ext/polarssl-1.3.2/include -pthread
- LDFLAGS:=$(LDFLAGS) $(ARCHFLAGS) -pthread
+ CXXFLAGS:= $(CXXFLAGS) -Iext/rapidjson/include -I$(CURDIR)/ext/polarssl/include -Wall @CF_PIE@ @CF_FORTIFY@ @CF_STACK@ $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread -Iext/yahttp
+ CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) @CF_PIE@ @CF_FORTIFY@ @CF_STACK@ $(PROFILEFLAGS) $(ARCHFLAGS) -I$(CURDIR)/ext/polarssl/include -pthread
+ LDFLAGS:=$(LDFLAGS) $(ARCHFLAGS) -pthread @LD_RELRO@ @LD_PIE@
 -STRIP_BINARIES?=1
 +STRIP_BINARIES?=0
  
  LINKCC=$(CXX)
  CC?=gcc
-@@ -115,7 +115,6 @@ endif
+@@ -121,7 +121,6 @@ endif
  	$(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(SYSCONFDIR)/recursor.conf-dist
  	-mkdir -p $(DESTDIR)/usr/share/man/man1
  	cp pdns_recursor.1 rec_control.1 $(DESTDIR)/usr/share/man/man1
diff --git a/pdns-recursor.spec b/pdns-recursor.spec
index abe02fa..14a1c9b 100644
--- a/pdns-recursor.spec
+++ b/pdns-recursor.spec
@@ -1,13 +1,14 @@
 %global _hardened_build 1
+%global prever rc1
 
 Name: pdns-recursor
-Version: 3.6.2
-Release: 1%{?dist}
+Version: 3.7.0
+Release: 0.1.%{?prever}%{?dist}
 Summary: Modern, advanced and high performance recursing/non authoritative name server
 Group: System Environment/Daemons
 License: GPLv2
 URL: http://powerdns.com
-Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
+Source0: http://downloads.powerdns.com/releases/%{name}-%{version}-%{?prever}.tar.bz2
 Patch0: pdns-recursor-fixmakefile.patch
 
 Provides: powerdns-recursor = %{version}-%{release}
@@ -26,11 +27,12 @@ PowerDNS Recursor is a non authoritative/recursing DNS server. Use this
 package if you need a dns cache for your network.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{?prever}
 %patch0 -p1 -b .fixmakefile
 
 %build
-CXXFLAGS=-DPACKAGEVERSION='\"%{version}-%{release}.fedora\"' LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags}
+%configure
+LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} CONFIGDIR="%{_sysconfdir}/%{name}"
@@ -82,6 +84,9 @@ exit 0
 %doc COPYING README
 
 %changelog
+* Thu Jan 22 2015 Morten Stevens <mstevens at imt-systems.com> - 3.7.0-0.1.rc1
+- Update to 3.7.0-rc1
+
 * Fri Oct 31 2014 Morten Stevens <mstevens at imt-systems.com> - 3.6.2-1
 - Update to 3.6.2
 - Enable security status polling
diff --git a/sources b/sources
index 089f57a..39ff2d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6124b8cda94bc3495149d70ba0f6384b  pdns-recursor-3.6.2.tar.bz2
+4472b8e24ee2bb9ce7b79f66e5188d2b  pdns-recursor-3.7.0-rc1.tar.bz2