Attachment 94634 Details for Bug 132831 – powerdns-recursor-3.1.7_2.patch

[patch] powerdns-recursor-3.1.7_2.patch

powerdns-recursor-3.1.7_2.patch (text/plain), 3.50 KB, created by Dmitry Marakasov on 2009-03-20 01:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2009-03-20 01:10:06 UTC

Size: 3.50 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/dns/powerdns-recursor/Makefile,v
>retrieving revision 1.16
>diff -u -u -r1.16 Makefile
>--- Makefile	6 Aug 2008 20:48:41 -0000	1.16
>+++ Makefile	20 Mar 2009 01:02:23 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	powerdns-recursor
> PORTVERSION=	3.1.7
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://downloads.powerdns.com/releases/ \
> 		http://mirrors.evolva.ro/powerdns.com/releases/
>Index: files/patch-lwres.cc
>===================================================================
>RCS file: files/patch-lwres.cc
>diff -N files/patch-lwres.cc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-lwres.cc	19 Mar 2009 20:25:35 -0000
>@@ -0,0 +1,11 @@
>+--- 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;
>+   }
>Index: files/patch-pdns_recursor.cc
>===================================================================
>RCS file: files/patch-pdns_recursor.cc
>diff -N files/patch-pdns_recursor.cc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-pdns_recursor.cc	19 Mar 2009 20:27:01 -0000
>@@ -0,0 +1,65 @@
>+--- 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;
>+   }

Actions: View | Diff

Attachments on bug 132831: 94634