From b14e6ad40905ddc17c831620a5844ccd45772938 Mon Sep 17 00:00:00 2001
From: roy <roy@pkgsrc.org>
Date: Fri, 29 Jan 2010 13:26:45 +0000
Subject: Update to recursor-3.1.7.2 Changes from 3.1.7 include: * Fixed
 CVE-2009-4009 and CVE-2009-4010 * Improved error messages when parsing zones
 * Resilience against whitespace in configuration * Performance increase

---
 net/powerdns-recursor/Makefile         |  4 ++--
 net/powerdns-recursor/distinfo         | 14 ++++++--------
 net/powerdns-recursor/patches/patch-ac | 15 ---------------
 net/powerdns-recursor/patches/patch-ae | 24 ++++++++++--------------
 net/powerdns-recursor/patches/patch-af | 24 ++++++++++--------------
 5 files changed, 28 insertions(+), 53 deletions(-)
 delete mode 100644 net/powerdns-recursor/patches/patch-ac

(limited to 'net')

diff --git a/net/powerdns-recursor/Makefile b/net/powerdns-recursor/Makefile
index d219deaded2..d3ab83fc530 100644
--- a/net/powerdns-recursor/Makefile
+++ b/net/powerdns-recursor/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2009/12/23 13:00:41 ghen Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/29 13:26:45 roy Exp $
 #
 
-DISTNAME=		pdns-recursor-3.1.7
+DISTNAME=		pdns-recursor-3.1.7.2
 CATEGORIES=		net
 MASTER_SITES=		http://downloads.powerdns.com/releases/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/powerdns-recursor/distinfo b/net/powerdns-recursor/distinfo
index b8c4939b51a..0625aff18af 100644
--- a/net/powerdns-recursor/distinfo
+++ b/net/powerdns-recursor/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.3 2009/06/24 20:44:21 hasso Exp $
+$NetBSD: distinfo,v 1.4 2010/01/29 13:26:45 roy Exp $
 
-SHA1 (pdns-recursor-3.1.7.tar.bz2) = 3e9c46e432d57edd58f767311247e750350883e9
-RMD160 (pdns-recursor-3.1.7.tar.bz2) = 359b3e3fff942f9fd14bebe4bc16b9d6cd23d0e3
-Size (pdns-recursor-3.1.7.tar.bz2) = 174424 bytes
+SHA1 (pdns-recursor-3.1.7.2.tar.bz2) = 9dcaca50fe0c373d601e135a78f24f5b85480020
+RMD160 (pdns-recursor-3.1.7.2.tar.bz2) = 2a1118763ab630646b9ba25273d6066e380e55c6
+Size (pdns-recursor-3.1.7.2.tar.bz2) = 174082 bytes
 SHA1 (patch-aa) = 8ea6d7bd6e4b1625ca5df7fb115085223f8fb147
 SHA1 (patch-ab) = b8607622c082d2168aecf06586818760f1a6035c
-SHA1 (patch-ac) = 618d18ddc212c6aa417d16454a784854f7a327a4
-SHA1 (patch-ad) = a28cdd1a6e860c1c9460c36e2e8acece4b163436
-SHA1 (patch-ae) = 54ce9208671928bf4b63331f2a248b601325541e
-SHA1 (patch-af) = 23b8dbad8f7f69652d7417ca6dcca4dde4a6fe57
+SHA1 (patch-ae) = d832951abad18a429e7d567563af61b77f61c179
+SHA1 (patch-af) = 5a7ba19325f37922c0fcc8a8b23cc023c2b28789
 SHA1 (patch-ag) = 952182b856fa0ec995d9ba307124e069c1831049
 SHA1 (patch-ah) = 1d8c62313b730afed492b12e6e28c1c0757e9c24
diff --git a/net/powerdns-recursor/patches/patch-ac b/net/powerdns-recursor/patches/patch-ac
deleted file mode 100644
index 3553eaddfb5..00000000000
--- a/net/powerdns-recursor/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/04/21 14:16:47 roy Exp $
-
-Taken from FreeBSD Ports
-
---- 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/net/powerdns-recursor/patches/patch-ae b/net/powerdns-recursor/patches/patch-ae
index 10156adfb75..0d7e2cb1e11 100644
--- a/net/powerdns-recursor/patches/patch-ae
+++ b/net/powerdns-recursor/patches/patch-ae
@@ -1,15 +1,11 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/04/21 14:16:47 roy Exp $
-
-Taken from FreeBSD ports
-
---- pdns_recursor.1.orig	2008-03-30 22:41:26.000000000 +0200
-+++ pdns_recursor.1	2008-04-02 00:15:05.000000000 +0200
+--- pdns_recursor.1.orig	2010-01-03 14:26:42.000000000 +0000
++++ pdns_recursor.1	2010-01-29 13:11:15.000000000 +0000
 @@ -5,7 +5,7 @@
  .\"    Manual: 
  .\"    Source: 
  .\"
--.TH "PDNS_RECURSOR" "1" "03/22/2008" "" ""
-+.TH "PDNS_RECURSOR" "8" "03/22/2008" "" ""
+-.TH "PDNS_RECURSOR" "1" "12/29/2009" "" ""
++.TH "PDNS_RECURSOR" "8" "12/29/2009" "" ""
  .\" disable hyphenation
  .nh
  .\" disable justification (adjust text to left margin only)
@@ -17,17 +13,17 @@ Taken from FreeBSD ports
  \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
+@@ -242,7 +242,7 @@
+ Website: http://wiki\&.powerdns\&.com, http://www\&.powerdns\&.com
  .sp
  .SH "SEE ALSO"
 -rec_control(1)
 +rec_control(8)
  .sp
  .SH "COPYING"
- Copyright \(co 2006 PowerDNS.COM BV. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2.
+ Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&.
diff --git a/net/powerdns-recursor/patches/patch-af b/net/powerdns-recursor/patches/patch-af
index d64629a8748..c85a9eefc55 100644
--- a/net/powerdns-recursor/patches/patch-af
+++ b/net/powerdns-recursor/patches/patch-af
@@ -1,33 +1,29 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/04/21 14:16:47 roy Exp $
-
-Taken from FreeBSD ports
-
---- rec_control.1.orig	2008-03-30 22:41:26.000000000 +0200
-+++ rec_control.1	2008-04-02 00:15:23.000000000 +0200
+--- rec_control.1.orig	2010-01-03 14:26:42.000000000 +0000
++++ rec_control.1	2010-01-29 13:12:27.000000000 +0000
 @@ -5,7 +5,7 @@
  .\"    Manual: 
  .\"    Source: 
  .\"
--.TH "REC_CONTROL" "1" "03/16/2008" "" ""
-+.TH "REC_CONTROL" "8" "03/16/2008" "" ""
+-.TH "REC_CONTROL" "1" "12/29/2009" "" ""
++.TH "REC_CONTROL" "8" "12/29/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
+ Website: http://wiki\&.powerdns\&.com, http://www\&.powerdns\&.com
  .sp
  .SH "SEE ALSO"
 -pdns_recursor(1)
 +pdns_recursor(8)
  .sp
  .SH "COPYING"
- Copyright \(co 2006 PowerDNS.COM BV. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2.
+ Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&.
-- 
cgit v1.2.3