- Update to 3.1.7.1

PR:		137722
Submitted by:	Ralf van der Enden <tremere@cainites.net>
Approved by:	maintainer

6 files changed, 15 insertions, 103 deletions

diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
index 3ad9c8e571b4..d21d675a7d1c 100644
--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	powerdns-recursor
-PORTVERSION=	3.1.7
-PORTREVISION=	1
+PORTVERSION=	3.1.7.1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/ \
 		http://mirrors.evolva.ro/powerdns.com/releases/
diff --git a/dns/powerdns-recursor/distinfo b/dns/powerdns-recursor/distinfo
index 8d455d0a596f..d484b2cb8fb7 100644
--- a/dns/powerdns-recursor/distinfo
+++ b/dns/powerdns-recursor/distinfo
@@ -1,3 +1,3 @@
-MD5 (pdns-recursor-3.1.7.tar.bz2) = e7521055f949ba8e9e77fe27411be2ed
-SHA256 (pdns-recursor-3.1.7.tar.bz2) = 2255ea25071f7ccb3e096e85c7fb38f860a02d29f277dfbef66c7a1f5735051f
-SIZE (pdns-recursor-3.1.7.tar.bz2) = 174424
+MD5 (pdns-recursor-3.1.7.1.tar.bz2) = e8d6d6f1ec477741a2c9b3bb2e297e18
+SHA256 (pdns-recursor-3.1.7.1.tar.bz2) = 8428ec7cdd7322d0d3b94b5bd7f586272db165145bb7a23937e745e96c759c33
+SIZE (pdns-recursor-3.1.7.1.tar.bz2) = 174715
diff --git a/dns/powerdns-recursor/files/patch-lwres.cc b/dns/powerdns-recursor/files/patch-lwres.cc
deleted file mode 100644
index 4655d4028a0d..000000000000
--- a/dns/powerdns-recursor/files/patch-lwres.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- lwres.cc.orig	2008-06-24 22:23:33.000000000 +0400
-+++ lwres.cc	2009-03-19 23:25:35.000000000 +0300
-@@ -181,7 +181,7 @@
-     
-     return 1;
-   }
--  catch(exception &mde) {
-+  catch(std::exception &mde) {
-     if(::arg().mustDo("log-common-errors"))
-       L<<Logger::Notice<<"Unable to parse packet from remote server "<<ip.toString()<<": "<<mde.what()<<endl;
-   }
diff --git a/dns/powerdns-recursor/files/patch-manpages b/dns/powerdns-recursor/files/patch-manpages
index e93099d46133..1ad824a3e7a0 100644
--- a/dns/powerdns-recursor/files/patch-manpages
+++ b/dns/powerdns-recursor/files/patch-manpages
@@ -4,8 +4,8 @@
  .\"    Manual: 
  .\"    Source: 
  .\"
--.TH "PDNS_RECURSOR" "1" "03/22/2008" "" ""
-+.TH "PDNS_RECURSOR" "8" "03/22/2008" "" ""
+-.TH "PDNS_RECURSOR" "1" "07/30/2009" "" ""
++.TH "PDNS_RECURSOR" "8" "07/30/2009" "" ""
  .\" disable hyphenation
  .nh
  .\" disable justification (adjust text to left margin only)
@@ -13,10 +13,10 @@
  \fIpdns_recursor\fR [\-\-daemon] [\-\-local\-address] [\-\-help, \-h] [\-\-allow\-from]
  .sp
  .SH "DESCRIPTION"
--pdns_recursor(1) is a high performance, simple and secure recursing nameserver. It currently powers over two million internet connections.
-+pdns_recursor(8) is a high performance, simple and secure recursing nameserver. It currently powers over two million internet connections.
+-pdns_recursor(1) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&.
++pdns_recursor(8) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&.
  .sp
- The recursor is configured via a configuration file, but each item in that file can be overridden on the command line.
+ The recursor is configured via a configuration file, but each item in that file can be overridden on the command line\&.
  .sp
 @@ -243,7 +243,7 @@
  Website: http://wiki.powerdns.com, http://www.powerdns.com
@@ -33,19 +33,19 @@
  .\"    Manual: 
  .\"    Source: 
  .\"
--.TH "REC_CONTROL" "1" "03/16/2008" "" ""
-+.TH "REC_CONTROL" "8" "03/16/2008" "" ""
+-.TH "REC_CONTROL" "1" "07/30/2009" "" ""
++.TH "REC_CONTROL" "8" "07/30/2009" "" ""
  .\" disable hyphenation
  .nh
  .\" disable justification (adjust text to left margin only)
 @@ -16,7 +16,7 @@
- \fIrec_control\fR [\-\-help] [\-\-socket\-dir] [\-\-socket\-pid] command ..
+ \fIrec_control\fR [\-\-help] [\-\-socket\-dir] [\-\-socket\-pid] command \&.\&.
  .sp
  .SH "DESCRIPTION"
--rec_control(1) allows the operator to control a running instance of the pdns_recursor.
-+rec_control(8) allows the operator to control a running instance of the pdns_recursor.
+-rec_control(1) allows the operator to control a running instance of the pdns_recursor\&.
++rec_control(8) allows the operator to control a running instance of the pdns_recursor\&.
  .sp
- The commands that can be passed to the recursor are described on http://doc.powerdns.com/rec\-control.html
+ The commands that can be passed to the recursor are described on http://doc\&.powerdns\&.com/rec\-control\&.html
  .sp
 @@ -105,7 +105,7 @@
  Website: http://wiki.powerdns.com, http://www.powerdns.com
diff --git a/dns/powerdns-recursor/files/patch-pdns_nameserver.cc b/dns/powerdns-recursor/files/patch-pdns_nameserver.cc
deleted file mode 100644
index 4e300d6b0594..000000000000
--- a/dns/powerdns-recursor/files/patch-pdns_nameserver.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- pdns_recursor.cc.orig	Wed Jan 17 23:45:51 2007
-+++ pdns_recursor.cc	Thu Jan 18 00:01:47 2007
-@@ -1691,7 +1691,7 @@
-     ::arg().set("client-tcp-timeout","Timeout in seconds when talking to TCP clients")="2";
-     ::arg().set("max-tcp-clients","Maximum number of simultaneous TCP clients")="128";
-     ::arg().set("hint-file", "If set, load root hints from this file")="";
--    ::arg().set("max-cache-entries", "If set, maximum number of entries in the main cache")="0";
-+    ::arg().set("max-cache-entries", "If set, maximum number of entries in the main cache")="500000";
-     ::arg().set("max-negative-ttl", "maximum number of seconds to keep a negative cached entry in memory")="3600";
-     ::arg().set("server-id", "Returned when queried for 'server.id' TXT, defaults to hostname")="";
-     ::arg().set("remotes-ringbuffer-entries", "maximum number of packets to store statistics for")="0";
diff --git a/dns/powerdns-recursor/files/patch-pdns_recursor.cc b/dns/powerdns-recursor/files/patch-pdns_recursor.cc
deleted file mode 100644
index 234ab9f95f7b..000000000000
--- a/dns/powerdns-recursor/files/patch-pdns_recursor.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- pdns_recursor.cc.orig	2008-06-24 22:23:33.000000000 +0400
-+++ pdns_recursor.cc	2009-03-19 23:27:01.000000000 +0300
-@@ -666,7 +666,7 @@
-   catch(MOADNSException& e) {
-     L<<Logger::Error<<"DNS parser error: "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl;
-   }
--  catch(exception& e) {
-+  catch(std::exception& e) {
-     L<<Logger::Error<<"STL error: "<<e.what()<<endl;
-   }
-   catch(...) {
-@@ -1183,7 +1183,7 @@
-     s_rcc.send(answer, &remote);
-     command();
-   }
--  catch(exception& e) {
-+  catch(std::exception& e) {
-     L<<Logger::Error<<"Error dealing with control socket request: "<<e.what()<<endl;
-   }
-   catch(AhuException& ae) {
-@@ -1486,7 +1486,7 @@
-     SyncRes::s_negcache.clear(); 
-     return "ok\n";
-   }
--  catch(exception& e) {
-+  catch(std::exception& e) {
-     L<<Logger::Error<<"Had error reloading zones, keeping original data: "<<e.what()<<endl;
-   }
-   catch(AhuException& ae) {
-@@ -1525,7 +1525,7 @@
- 	    string tmp=DNSRR2String(rr);
- 	    rr=String2DNSRR(rr.qname, rr.qtype, tmp, rr.ttl);
- 	  }
--	  catch(exception &e) {
-+	  catch(std::exception &e) {
- 	    throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"': "+e.what());
- 	  }
- 	  catch(...) {
-@@ -1647,7 +1647,7 @@
-       }
-     }
-   }
--  catch(exception& e) {
-+  catch(std::exception& e) {
-     L<<Logger::Error<<"Retaining current script, error from '"<<fname<<"': "<< e.what() <<endl;
-     return string("Retaining current script, error from '"+fname+"': "+string(e.what())+"\n");
-   }
-@@ -1771,7 +1771,7 @@
-     }
-     
-   }
--  catch(exception &e) {
-+  catch(std::exception &e) {
-     L<<Logger::Error<<"Failed to load 'lua' script from '"<<::arg()["lua-dns-script"]<<"': "<<e.what()<<endl;
-     exit(99);
-   }
-@@ -2060,7 +2060,7 @@
-     L<<Logger::Error<<"Exception: "<<ae.reason<<endl;
-     ret=EXIT_FAILURE;
-   }
--  catch(exception &e) {
-+  catch(std::exception &e) {
-     L<<Logger::Error<<"STL Exception: "<<e.what()<<endl;
-     ret=EXIT_FAILURE;
-   }