Add some required explicit scopes to fix ambiguity errors on

NetBSD/current.

7 files changed, 105 insertions, 1 deletions

diff --git a/net/powerdns/distinfo b/net/powerdns/distinfo
index f3229b82c4a..5a8db8ba8f5 100644
--- a/net/powerdns/distinfo
+++ b/net/powerdns/distinfo
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.5 2008/08/26 12:32:18 ghen Exp $
+$NetBSD: distinfo,v 1.6 2008/09/18 13:03:38 joerg Exp $
 
 SHA1 (pdns-2.9.21.1/pdns-2.9.21.1.tar.gz) = d2f9f55223411114ce229b4728228f6739f2e708
 RMD160 (pdns-2.9.21.1/pdns-2.9.21.1.tar.gz) = 4d02e732fb7348f6eeb44090d641abd9d0cee9dd
 Size (pdns-2.9.21.1/pdns-2.9.21.1.tar.gz) = 1002905 bytes
 SHA1 (patch-aa) = 034845af3a9b66f57e482e3b43e43b61c17f51ab
 SHA1 (patch-ab) = d47887faff80330122ccf1cfd047c11e114c1153
+SHA1 (patch-ac) = 14c743d41ccb35ee2b47d1692b8812abd360494e
+SHA1 (patch-ad) = 19e80581f7962602ed9e3ccfdb3efcc170afaad6
+SHA1 (patch-ae) = a94cd5c45c0bff80b7736dc545248b44978cf70d
+SHA1 (patch-af) = 75c9a106a5d97cae0a010407f5f97753f63e7abb
+SHA1 (patch-ag) = 28335941b5a92a5889b294a949cefd1173be2401
+SHA1 (patch-ah) = a28bfc9395900e73195f90dd6d9f2c1210a639b4
diff --git a/net/powerdns/patches/patch-ac b/net/powerdns/patches/patch-ac
new file mode 100644
index 00000000000..00b3d1d44bd
--- /dev/null
+++ b/net/powerdns/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.3 2008/09/18 13:04:30 joerg Exp $
+
+--- pdns/backends/bind/bindbackend2.cc.orig	2008-09-18 14:20:43.000000000 +0200
++++ 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
new file mode 100644
index 00000000000..61d0b61b52f
--- /dev/null
+++ b/net/powerdns/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2008/09/18 13:04:30 joerg Exp $
+
+--- pdns/backends/bind/zone2sql.cc.orig	2008-09-18 14:27:23.000000000 +0200
++++ 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
new file mode 100644
index 00000000000..43dd125cc94
--- /dev/null
+++ b/net/powerdns/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2008/09/18 13:04:30 joerg Exp $
+
+--- pdns/dnspacket.cc.orig	2008-09-18 14:28:48.000000000 +0200
++++ 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
new file mode 100644
index 00000000000..b76afc5c06a
--- /dev/null
+++ b/net/powerdns/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2008/09/18 13:04:30 joerg Exp $
+
+--- pdns/tcpreceiver.cc.orig	2008-09-18 14:49:07.000000000 +0200
++++ 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
new file mode 100644
index 00000000000..c19f8ac2da0
--- /dev/null
+++ b/net/powerdns/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2008/09/18 13:04:30 joerg Exp $
+
+--- pdns/receiver.cc.orig	2008-09-18 14:51:59.000000000 +0200
++++ 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
new file mode 100644
index 00000000000..438bf285acd
--- /dev/null
+++ b/net/powerdns/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2008/09/18 13:04:30 joerg Exp $
+
+--- pdns/communicator.cc.orig	2008-09-18 14:53:45.000000000 +0200
++++ 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);
+   }