Upgrade to PowerDNS 2.9.22.5, including a fix for CVE-2012-0206.

10 files changed, 22 insertions, 137 deletions

diff --git a/net/powerdns/Makefile.common b/net/powerdns/Makefile.common
index 9c99e8a600e..3e0fe201053 100644
--- a/net/powerdns/Makefile.common
+++ b/net/powerdns/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.5 2008/12/08 12:26:57 ghen Exp $
+# $NetBSD: Makefile.common,v 1.6 2012/01/13 12:12:48 ghen Exp $
 
-PDNS_VERSION=		2.9.21.2
+PDNS_VERSION=		2.9.22.5
 DISTNAME=		pdns-${PDNS_VERSION}
 CATEGORIES=		net
 MASTER_SITES=		http://downloads.powerdns.com/releases/
-DIST_SUBDIR=		${DISTNAME}
 
 MAINTAINER=		ghen@NetBSD.org
 HOMEPAGE=		http://www.powerdns.com/
diff --git a/net/powerdns/distinfo b/net/powerdns/distinfo
index 69555a1e3ea..851c4229234 100644
--- a/net/powerdns/distinfo
+++ b/net/powerdns/distinfo
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.8 2011/11/23 23:32:17 joerg Exp $
+$NetBSD: distinfo,v 1.9 2012/01/13 12:12:48 ghen Exp $
 
-SHA1 (pdns-2.9.21.2/pdns-2.9.21.2.tar.gz) = 9088361071ddb6c2bd32eb90c6c166736e8a229d
-RMD160 (pdns-2.9.21.2/pdns-2.9.21.2.tar.gz) = e28a31c6816a382502124726a5fe9ac66dd2df94
-Size (pdns-2.9.21.2/pdns-2.9.21.2.tar.gz) = 1008111 bytes
-SHA1 (patch-aa) = 267582a8fd78ce826f99c819d3d8d590c8b4fdf4
+SHA1 (pdns-2.9.22.5.tar.gz) = 7a514fe624c110afb8a262f4d76376d0f8e17bea
+RMD160 (pdns-2.9.22.5.tar.gz) = 8be76a7a63c3366d55724815245e2f955ec0adda
+Size (pdns-2.9.22.5.tar.gz) = 1077617 bytes
+SHA1 (patch-aa) = e31080087d9369349e912c94e7dbfce72c9fc629
 SHA1 (patch-ab) = f54ace6ff60162e50119eb11bcb2f5db5e1ea480
-SHA1 (patch-ac) = 22ba9d28dc5a499a4ed1a1f67ebaec239d11eb4b
-SHA1 (patch-ad) = a7ed0be1a9bd4e8978d1b23ea0755c03893b7f73
-SHA1 (patch-ae) = 3797190c3e5bec9bcfa48288895125411e2a180e
-SHA1 (patch-af) = c7a3e88a4d8eae098e2370bd91e91d9876ee4fd6
-SHA1 (patch-ag) = 5639c080e166457b1a170ce3017987b05bdf51fc
-SHA1 (patch-ah) = 385b397e9bab8a730827d9fad6cb4029065df627
 SHA1 (patch-pdns_dynmessenger.cc) = df89ba91abc96319b323fc19b413b127112f4afb
-SHA1 (patch-pdns_misc.hh) = ca3109fdf0bc8faf60c95b1fe5985eda065993d9
diff --git a/net/powerdns/patches/patch-aa b/net/powerdns/patches/patch-aa
index b7db74a12d8..e6e9b41a7eb 100644
--- a/net/powerdns/patches/patch-aa
+++ b/net/powerdns/patches/patch-aa
@@ -1,20 +1,23 @@
-$NetBSD: patch-aa,v 1.2 2011/11/23 23:32:17 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2012/01/13 12:12:48 ghen Exp $
 
---- pdns/Makefile.in.orig	2008-08-07 07:04:53.000000000 +0000
+--- pdns/Makefile.in.orig	2012-01-05 14:27:41.000000000 +0000
 +++ pdns/Makefile.in
-@@ -796,12 +796,12 @@ distclean-libtool:
- uninstall-info-am:
+@@ -1012,15 +1012,15 @@ clean-libtool:
+ 	-rm -rf .libs _libs
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-+	test -z "$(EGDIR)" || $(mkdir_p) "$(DESTDIR)$(EGDIR)"
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
+-	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
++	test -z "$(EGDIR)" || $(MKDIR_P) "$(DESTDIR)$(EGDIR)"
+ 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+ 	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EGDIR)/$$f'"; \
-+	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EGDIR)/$$f"; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(EGDIR)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(EGDIR)" || exit $$?; \
  	done
  
  uninstall-sysconfDATA:
diff --git a/net/powerdns/patches/patch-ac b/net/powerdns/patches/patch-ac
deleted file mode 100644
index 267429f48b6..00000000000
--- a/net/powerdns/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2011/11/23 23:32:17 joerg Exp $
-
---- pdns/backends/bind/bindbackend2.cc.orig	2007-04-21 13:56:36.000000000 +0000
-+++ pdns/backends/bind/bindbackend2.cc
-@@ -600,7 +600,7 @@ void Bind2Backend::loadConfig(string* st
- 	    L<<Logger::Warning<<d_logprefix<<msg.str()<<endl;
- 	    rejected++;
- 	  }
--	  catch(exception &ae) {
-+	  catch(std::exception &ae) {
- 	    ostringstream msg;
- 	    msg<<" error at "+nowTime()+" parsing '"<<i->name<<"' from file '"<<i->filename<<"': "<<ae.what();
- 
-@@ -715,7 +715,7 @@ void Bind2Backend::queueReload(BB2Domain
-     msg<<" error at "+nowTime()+" parsing '"<<bbd->d_name<<"' from file '"<<bbd->d_filename<<"': "<<ae.reason;
-     bbd->d_status=msg.str();
-   }
--  catch(exception &ae) {
-+  catch(std::exception &ae) {
-     ostringstream msg;
-     msg<<" error at "+nowTime()+" parsing '"<<bbd->d_name<<"' from file '"<<bbd->d_filename<<"': "<<ae.what();
-     bbd->d_status=msg.str();
diff --git a/net/powerdns/patches/patch-ad b/net/powerdns/patches/patch-ad
deleted file mode 100644
index 99740907113..00000000000
--- a/net/powerdns/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2011/11/23 23:32:17 joerg Exp $
-
---- pdns/backends/bind/zone2sql.cc.orig	2007-04-21 13:56:36.000000000 +0000
-+++ pdns/backends/bind/zone2sql.cc
-@@ -302,7 +302,7 @@ int main(int argc, char **argv)
-     cerr<<"\nFatal error: "<<ae.reason<<endl;
-     return 0;
-   }
--  catch(exception &e) {
-+  catch(std::exception &e) {
-     cerr<<"died because of STL error: "<<e.what()<<endl;
-     exit(0);
-   }
diff --git a/net/powerdns/patches/patch-ae b/net/powerdns/patches/patch-ae
deleted file mode 100644
index 5fbde477204..00000000000
--- a/net/powerdns/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2011/11/23 23:32:17 joerg Exp $
-
---- pdns/dnspacket.cc.orig	2007-04-21 13:56:36.000000000 +0000
-+++ pdns/dnspacket.cc
-@@ -320,7 +320,7 @@ void DNSPacket::wrapup(void)
-       }
-       pw.commit();
-     }
--    catch(exception& e) {
-+    catch(std::exception& e) {
-       L<<Logger::Error<<"Exception: "<<e.what()<<endl;
-       throw;
-     }
-@@ -424,7 +424,7 @@ try
-   qclass=mdp.d_qclass;
-   return 0;
- }
--catch(exception& e) {
-+catch(std::exception& e) {
-   return -1;
- }
- 
diff --git a/net/powerdns/patches/patch-af b/net/powerdns/patches/patch-af
deleted file mode 100644
index 1d05bfb01ee..00000000000
--- a/net/powerdns/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2011/11/23 23:32:17 joerg Exp $
-
---- pdns/tcpreceiver.cc.orig	2007-04-21 13:56:36.000000000 +0000
-+++ pdns/tcpreceiver.cc
-@@ -322,7 +322,7 @@ void *TCPNameserver::doConnection(void *
-     s_P = 0; // on next call, backend will be recycled
-     L<<Logger::Error<<"TCP nameserver had error, cycling backend: "<<ae.reason<<endl;
-   }
--  catch(exception &e) {
-+  catch(std::exception &e) {
-     L<<Logger::Error<<"TCP Connection Thread died because of STL error: "<<e.what()<<endl;
-   }
-   catch( ... )
diff --git a/net/powerdns/patches/patch-ag b/net/powerdns/patches/patch-ag
deleted file mode 100644
index 81ebdc827d3..00000000000
--- a/net/powerdns/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2011/11/23 23:32:17 joerg Exp $
-
---- pdns/receiver.cc.orig	2008-08-07 07:02:53.000000000 +0000
-+++ pdns/receiver.cc
-@@ -566,8 +566,8 @@ int main(int argc, char **argv)
-     if(!arg().mustDo("daemon"))
-       cerr<<"Exiting because: "<<AE.reason<<endl;
-     L<<Logger::Error<<"Exiting because: "<<AE.reason<<endl;
--  }      
--  catch(exception &e) {
-+  }
-+  catch(std::exception &e) {
-     if(!arg().mustDo("daemon"))
-       cerr<<"Exiting because of STL error: "<<e.what()<<endl;
-     L<<Logger::Error<<"Exiting because of STL error: "<<e.what()<<endl;
diff --git a/net/powerdns/patches/patch-ah b/net/powerdns/patches/patch-ah
deleted file mode 100644
index dfbd122a456..00000000000
--- a/net/powerdns/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2011/11/23 23:32:17 joerg Exp $
-
---- pdns/communicator.cc.orig	2007-04-21 13:56:36.000000000 +0000
-+++ pdns/communicator.cc
-@@ -461,7 +461,7 @@ void CommunicatorClass::mainloop(void)
-     Utility::sleep(1);
-     exit(0);
-   }
--  catch(exception &e) {
-+  catch(std::exception &e) {
-     L<<Logger::Error<<"Communicator thread died because of STL error: "<<e.what()<<endl;
-     exit(0);
-   }
diff --git a/net/powerdns/patches/patch-pdns_misc.hh b/net/powerdns/patches/patch-pdns_misc.hh
deleted file mode 100644
index aadd138b795..00000000000
--- a/net/powerdns/patches/patch-pdns_misc.hh
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-pdns_misc.hh,v 1.1 2011/11/23 23:32:17 joerg Exp $
-
---- pdns/misc.hh.orig	2011-11-23 15:48:44.000000000 +0000
-+++ pdns/misc.hh
-@@ -19,6 +19,7 @@
- #ifndef MISC_HH
- #define MISC_HH
- #include <stdint.h>
-+#include <string.h>
- 
- #if 0
- #define RDTSC(qp) \