Attachment #98757 for bug #137722

View | Details | Raw Unified | Return to bug 137722
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/ports/dns/powerdns-recursor/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= powerdns-recursor	8	PORTNAME= powerdns-recursor
9	PORTVERSION= 3.1.7	9	PORTVERSION= 3.1.7.1
10	PORTREVISION= 1
11	CATEGORIES= dns ipv6	10	CATEGORIES= dns ipv6
12	MASTER_SITES= http://downloads.powerdns.com/releases/ \	11	MASTER_SITES= http://downloads.powerdns.com/releases/ \
13	http://mirrors.evolva.ro/powerdns.com/releases/	12	http://mirrors.evolva.ro/powerdns.com/releases/

Lines 1-3 Link Here

(-)/usr/ports/dns/powerdns-recursor/distinfo (-3 / +3 lines)
1	MD5 (pdns-recursor-3.1.7.tar.bz2) = e7521055f949ba8e9e77fe27411be2ed	1	MD5 (pdns-recursor-3.1.7.1.tar.bz2) = e8d6d6f1ec477741a2c9b3bb2e297e18
2	SHA256 (pdns-recursor-3.1.7.tar.bz2) = 2255ea25071f7ccb3e096e85c7fb38f860a02d29f277dfbef66c7a1f5735051f	2	SHA256 (pdns-recursor-3.1.7.1.tar.bz2) = 8428ec7cdd7322d0d3b94b5bd7f586272db165145bb7a23937e745e96c759c33
3	SIZE (pdns-recursor-3.1.7.tar.bz2) = 174424	3	SIZE (pdns-recursor-3.1.7.1.tar.bz2) = 174715

Lines 1-11 Link Here

(-)/usr/ports/dns/powerdns-recursor/files/patch-lwres.cc (-11 lines)
1	--- lwres.cc.orig 2008-06-24 22:23:33.000000000 +0400
2	+++ lwres.cc 2009-03-19 23:25:35.000000000 +0300
3	@@ -181,7 +181,7 @@
4
5	return 1;
6	}
7	- catch(exception &mde) {
8	+ catch(std::exception &mde) {
9	if(::arg().mustDo("log-common-errors"))
10	L<<Logger::Notice<<"Unable to parse packet from remote server "<<ip.toString()<<": "<<mde.what()<<endl;
11	}




 .\"    Manual: 
 .\"    Source: 
 .\"
-.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)

 \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\&.
 .sp
 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

 .\"    Manual: 
 .\"    Source: 
 .\"
-.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 \&.\&.
 .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\&.
 .sp
 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

Lines 1-11 Link Here

(-)/usr/ports/dns/powerdns-recursor/files/patch-pdns_nameserver.cc (-11 lines)
1	--- pdns_recursor.cc.orig Wed Jan 17 23:45:51 2007
2	+++ pdns_recursor.cc Thu Jan 18 00:01:47 2007
3	@@ -1691,7 +1691,7 @@
4	::arg().set("client-tcp-timeout","Timeout in seconds when talking to TCP clients")="2";
5	::arg().set("max-tcp-clients","Maximum number of simultaneous TCP clients")="128";
6	::arg().set("hint-file", "If set, load root hints from this file")="";
7	- ::arg().set("max-cache-entries", "If set, maximum number of entries in the main cache")="0";
8	+ ::arg().set("max-cache-entries", "If set, maximum number of entries in the main cache")="500000";
9	::arg().set("max-negative-ttl", "maximum number of seconds to keep a negative cached entry in memory")="3600";
10	::arg().set("server-id", "Returned when queried for 'server.id' TXT, defaults to hostname")="";
11	::arg().set("remotes-ringbuffer-entries", "maximum number of packets to store statistics for")="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;
   }

Return to bug 137722

Lines 4-11 Link Here

(-)/usr/ports/dns/powerdns-recursor/files/patch-manpages (-11 / +11 lines)
4	.\" Manual:	4	.\" Manual:
5	.\" Source:	5	.\" Source:
6	.\"	6	.\"
7	-.TH "PDNS_RECURSOR" "1" "03/22/2008" "" ""	7	-.TH "PDNS_RECURSOR" "1" "07/30/2009" "" ""
8	+.TH "PDNS_RECURSOR" "8" "03/22/2008" "" ""	8	+.TH "PDNS_RECURSOR" "8" "07/30/2009" "" ""
9	.\" disable hyphenation	9	.\" disable hyphenation
10	.nh	10	.nh
11	.\" disable justification (adjust text to left margin only)	11	.\" disable justification (adjust text to left margin only)
Lines 13-22 Link Here
13	\fIpdns_recursor\fR [\-\-daemon] [\-\-local\-address] [\-\-help, \-h] [\-\-allow\-from]	13	\fIpdns_recursor\fR [\-\-daemon] [\-\-local\-address] [\-\-help, \-h] [\-\-allow\-from]
14	.sp	14	.sp
15	.SH "DESCRIPTION"	15	.SH "DESCRIPTION"
16	-pdns_recursor(1) is a high performance, simple and secure recursing nameserver. It currently powers over two million internet connections.	16	-pdns_recursor(1) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&.
17	+pdns_recursor(8) is a high performance, simple and secure recursing nameserver. It currently powers over two million internet connections.	17	+pdns_recursor(8) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&.
18	.sp	18	.sp
19	The recursor is configured via a configuration file, but each item in that file can be overridden on the command line.	19	The recursor is configured via a configuration file, but each item in that file can be overridden on the command line\&.
20	.sp	20	.sp
21	@@ -243,7 +243,7 @@	21	@@ -243,7 +243,7 @@
22	Website: http://wiki.powerdns.com, http://www.powerdns.com	22	Website: http://wiki.powerdns.com, http://www.powerdns.com
Lines 33-51 Link Here
33	.\" Manual:	33	.\" Manual:
34	.\" Source:	34	.\" Source:
35	.\"	35	.\"
36	-.TH "REC_CONTROL" "1" "03/16/2008" "" ""	36	-.TH "REC_CONTROL" "1" "07/30/2009" "" ""
37	+.TH "REC_CONTROL" "8" "03/16/2008" "" ""	37	+.TH "REC_CONTROL" "8" "07/30/2009" "" ""
38	.\" disable hyphenation	38	.\" disable hyphenation
39	.nh	39	.nh
40	.\" disable justification (adjust text to left margin only)	40	.\" disable justification (adjust text to left margin only)
41	@@ -16,7 +16,7 @@	41	@@ -16,7 +16,7 @@
42	\fIrec_control\fR [\-\-help] [\-\-socket\-dir] [\-\-socket\-pid] command ..	42	\fIrec_control\fR [\-\-help] [\-\-socket\-dir] [\-\-socket\-pid] command \&.\&.
43	.sp	43	.sp
44	.SH "DESCRIPTION"	44	.SH "DESCRIPTION"
45	-rec_control(1) allows the operator to control a running instance of the pdns_recursor.	45	-rec_control(1) allows the operator to control a running instance of the pdns_recursor\&.
46	+rec_control(8) allows the operator to control a running instance of the pdns_recursor.	46	+rec_control(8) allows the operator to control a running instance of the pdns_recursor\&.
47	.sp	47	.sp
48	The commands that can be passed to the recursor are described on http://doc.powerdns.com/rec\-control.html	48	The commands that can be passed to the recursor are described on http://doc\&.powerdns\&.com/rec\-control\&.html
49	.sp	49	.sp
50	@@ -105,7 +105,7 @@	50	@@ -105,7 +105,7 @@
51	Website: http://wiki.powerdns.com, http://www.powerdns.com	51	Website: http://wiki.powerdns.com, http://www.powerdns.com

Lines 1-65 Link Here

(-)/usr/ports/dns/powerdns-recursor/files/patch-pdns_recursor.cc (-65 lines)
1	--- pdns_recursor.cc.orig 2008-06-24 22:23:33.000000000 +0400
2	+++ pdns_recursor.cc 2009-03-19 23:27:01.000000000 +0300
3	@@ -666,7 +666,7 @@
4	catch(MOADNSException& e) {
5	L<<Logger::Error<<"DNS parser error: "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl;
6	}
7	- catch(exception& e) {
8	+ catch(std::exception& e) {
9	L<<Logger::Error<<"STL error: "<<e.what()<<endl;
10	}
11	catch(...) {
12	@@ -1183,7 +1183,7 @@
13	s_rcc.send(answer, &remote);
14	command();
15	}
16	- catch(exception& e) {
17	+ catch(std::exception& e) {
18	L<<Logger::Error<<"Error dealing with control socket request: "<<e.what()<<endl;
19	}
20	catch(AhuException& ae) {
21	@@ -1486,7 +1486,7 @@
22	SyncRes::s_negcache.clear();
23	return "ok\n";
24	}
25	- catch(exception& e) {
26	+ catch(std::exception& e) {
27	L<<Logger::Error<<"Had error reloading zones, keeping original data: "<<e.what()<<endl;
28	}
29	catch(AhuException& ae) {
30	@@ -1525,7 +1525,7 @@
31	string tmp=DNSRR2String(rr);
32	rr=String2DNSRR(rr.qname, rr.qtype, tmp, rr.ttl);
33	}
34	- catch(exception &e) {
35	+ catch(std::exception &e) {
36	throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"': "+e.what());
37	}
38	catch(...) {
39	@@ -1647,7 +1647,7 @@
40	}
41	}
42	}
43	- catch(exception& e) {
44	+ catch(std::exception& e) {
45	L<<Logger::Error<<"Retaining current script, error from '"<<fname<<"': "<< e.what() <<endl;
46	return string("Retaining current script, error from '"+fname+"': "+string(e.what())+"\n");
47	}
48	@@ -1771,7 +1771,7 @@
49	}
50
51	}
52	- catch(exception &e) {
53	+ catch(std::exception &e) {
54	L<<Logger::Error<<"Failed to load 'lua' script from '"<<::arg()["lua-dns-script"]<<"': "<<e.what()<<endl;
55	exit(99);
56	}
57	@@ -2060,7 +2060,7 @@
58	L<<Logger::Error<<"Exception: "<<ae.reason<<endl;
59	ret=EXIT_FAILURE;
60	}
61	- catch(exception &e) {
62	+ catch(std::exception &e) {
63	L<<Logger::Error<<"STL Exception: "<<e.what()<<endl;
64	ret=EXIT_FAILURE;
65	}