[pdns-recursor/el6] Update to 3.7.1

[Morten Stevens]

commit 496b34ed600c489f176dad028b99397a2b2eec83
Author: Morten Stevens <mstevens at imt-systems.com>
Date:   Tue Feb 17 19:39:39 2015 +0100

    Update to 3.7.1

 .gitignore                          |    2 ++
 pdns-recursor-disable-secpoll.patch |   11 +++++++++++
 pdns-recursor-fixmakefile.patch     |   12 ++++++------
 pdns-recursor.spec                  |   11 +++++++++--
 sources                             |    2 +-
 5 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4a2515e..4ad8a2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ 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
+/pdns-recursor-3.7.1.tar.bz2
diff --git a/pdns-recursor-disable-secpoll.patch b/pdns-recursor-disable-secpoll.patch
new file mode 100644
index 0000000..4cbb530
--- /dev/null
+++ b/pdns-recursor-disable-secpoll.patch
@@ -0,0 +1,11 @@
+--- pdns-recursor-3.7.1/pdns_recursor.cc.orig	2015-02-12 11:16:00.000000000 +0100
++++ pdns-recursor-3.7.1/pdns_recursor.cc	2015-02-12 13:30:15.173620593 +0100
+@@ -2321,7 +2321,7 @@ int main(int argc, char **argv)
+     ::arg().set("max-total-msec", "Maximum total wall-clock time per query in milliseconds, 0 for unlimited")="7000";
+ 
+     ::arg().set("include-dir","Include *.conf files from this directory")="";
+-    ::arg().set("security-poll-suffix","Domain name from which to query security update notifications")="secpoll.powerdns.com.";
++    ::arg().set("security-poll-suffix","Domain name from which to query security update notifications")="";
+ 
+     ::arg().setCmd("help","Provide a helpful message");
+     ::arg().setCmd("version","Print version string");
diff --git a/pdns-recursor-fixmakefile.patch b/pdns-recursor-fixmakefile.patch
index 0e46464..53ceecc 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.1/Makefile.in.orig	2015-02-12 11:16:00.000000000 +0100
++++ pdns-recursor-3.7.1/Makefile.in	2015-02-12 13:26:32.815135422 +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@ @CF_STACK@ @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 a2236bb..5c21988 100644
--- a/pdns-recursor.spec
+++ b/pdns-recursor.spec
@@ -1,5 +1,5 @@
 Name: pdns-recursor
-Version: 3.6.2
+Version: 3.7.1
 Release: 1%{?dist}
 Summary: Modern, advanced and high performance recursing/non authoritative name server
 Group: System Environment/Daemons
@@ -8,6 +8,7 @@ URL: http://powerdns.com
 Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
 Source1: pdns-recursor.init
 Patch0: pdns-recursor-fixmakefile.patch
+Patch1: pdns-recursor-disable-secpoll.patch
 
 Provides: powerdns-recursor = %{version}-%{release}
 BuildRequires: boost-devel
@@ -25,9 +26,11 @@ package if you need a dns cache for your network.
 %prep
 %setup -q
 %patch0 -p1 -b .fixmakefile
+%patch1 -p1 -b .disable-secpoll
 
 %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
 %{__rm} -rf %{buildroot}
@@ -78,6 +81,10 @@ fi
 %doc COPYING README
 
 %changelog
+* Tue Feb 17 2015 Morten Stevens <mstevens at imt-systems.com> - 3.7.1-1
+- Update to 3.7.1
+- Disable security status polling by default
+
 * 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..736f2e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6124b8cda94bc3495149d70ba0f6384b  pdns-recursor-3.6.2.tar.bz2
+9d7eeebbc58b7ef8c47faf0877330752  pdns-recursor-3.7.1.tar.bz2