]> git.pld-linux.org Git - packages/pdns.git/blame - pdns-stdlib.patch
projects / packages / pdns.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- fixes compatibility with later boost and later stdlib
[packages/pdns.git] / pdns-stdlib.patch
CommitLineData
7f197265 1diff -Nur pdns-2.9.21.1.orig/pdns/backends/bind/bindbackend2.cc pdns-2.9.21.1.exception/pdns/backends/bind/bindbackend2.cc
2--- pdns-2.9.21.1.orig/pdns/backends/bind/bindbackend2.cc 2007-04-21 07:56:36.000000000 -0600
3+++ pdns-2.9.21.1.exception/pdns/backends/bind/bindbackend2.cc 2008-10-06 10:29:18.000000000 -0600
4@@ -600,7 +600,7 @@
5 L<<Logger::Warning<<d_logprefix<<msg.str()<<endl;
6 rejected++;
7 }
8- catch(exception &ae) {
9+ catch(std::exception &ae) {
10 ostringstream msg;
11 msg<<" error at "+nowTime()+" parsing '"<<i->name<<"' from file '"<<i->filename<<"': "<<ae.what();
12
13@@ -715,7 +715,7 @@
14 msg<<" error at "+nowTime()+" parsing '"<<bbd->d_name<<"' from file '"<<bbd->d_filename<<"': "<<ae.reason;
15 bbd->d_status=msg.str();
16 }
17- catch(exception &ae) {
18+ catch(std::exception &ae) {
19 ostringstream msg;
20 msg<<" error at "+nowTime()+" parsing '"<<bbd->d_name<<"' from file '"<<bbd->d_filename<<"': "<<ae.what();
21 bbd->d_status=msg.str();
22diff -Nur pdns-2.9.21.1.orig/pdns/backends/bind/zone2sql.cc pdns-2.9.21.1.exception/pdns/backends/bind/zone2sql.cc
23--- pdns-2.9.21.1.orig/pdns/backends/bind/zone2sql.cc 2007-04-21 07:56:36.000000000 -0600
24+++ pdns-2.9.21.1.exception/pdns/backends/bind/zone2sql.cc 2008-10-06 10:29:18.000000000 -0600
25@@ -302,7 +302,7 @@
26 cerr<<"\nFatal error: "<<ae.reason<<endl;
27 return 0;
28 }
29- catch(exception &e) {
30+ catch(std::exception &e) {
31 cerr<<"died because of STL error: "<<e.what()<<endl;
32 exit(0);
33 }
34diff -Nur pdns-2.9.21.1.orig/pdns/communicator.cc pdns-2.9.21.1.exception/pdns/communicator.cc
35--- pdns-2.9.21.1.orig/pdns/communicator.cc 2007-04-21 07:56:36.000000000 -0600
36+++ pdns-2.9.21.1.exception/pdns/communicator.cc 2008-10-06 10:44:05.000000000 -0600
37@@ -461,7 +461,7 @@
38 Utility::sleep(1);
39 exit(0);
40 }
41- catch(exception &e) {
42+ catch(std::exception &e) {
43 L<<Logger::Error<<"Communicator thread died because of STL error: "<<e.what()<<endl;
44 exit(0);
45 }
46diff -Nur pdns-2.9.21.1.orig/pdns/dnsdemog.cc pdns-2.9.21.1.exception/pdns/dnsdemog.cc
47--- pdns-2.9.21.1.orig/pdns/dnsdemog.cc 2007-04-21 07:56:36.000000000 -0600
48+++ pdns-2.9.21.1.exception/pdns/dnsdemog.cc 2008-10-06 10:44:05.000000000 -0600
49@@ -71,7 +71,7 @@
50 // cerr<<"error parsing packet: "<<mde.what()<<endl;
51 continue;
52 }
53- catch(exception& e) {
54+ catch(std::exception& e) {
55 cerr << e.what() << endl;
56 continue;
57 }
58@@ -87,7 +87,7 @@
59 */
60
61 }
62-catch(exception& e)
63+catch(std::exception& e)
64 {
65 cerr<<"Fatal: "<<e.what()<<endl;
66 }
67diff -Nur pdns-2.9.21.1.orig/pdns/dnsgram.cc pdns-2.9.21.1.exception/pdns/dnsgram.cc
68--- pdns-2.9.21.1.orig/pdns/dnsgram.cc 2007-04-21 07:56:36.000000000 -0600
69+++ pdns-2.9.21.1.exception/pdns/dnsgram.cc 2008-10-06 10:44:05.000000000 -0600
70@@ -148,7 +148,7 @@
71 parseErrors++;
72 continue;
73 }
74- catch(exception& e) {
75+ catch(std::exception& e) {
76 cerr << e.what() << endl;
77 continue;
78 }
79@@ -177,7 +177,7 @@
80 }
81 }
82 }
83-catch(exception& e)
84+catch(std::exception& e)
85 {
86 cerr<<"Fatal: "<<e.what()<<endl;
87 }
88diff -Nur pdns-2.9.21.1.orig/pdns/dnspacket.cc pdns-2.9.21.1.exception/pdns/dnspacket.cc
89--- pdns-2.9.21.1.orig/pdns/dnspacket.cc 2007-04-21 07:56:36.000000000 -0600
90+++ pdns-2.9.21.1.exception/pdns/dnspacket.cc 2008-10-06 10:44:05.000000000 -0600
91@@ -320,7 +320,7 @@
92 }
93 pw.commit();
94 }
95- catch(exception& e) {
96+ catch(std::exception& e) {
97 L<<Logger::Error<<"Exception: "<<e.what()<<endl;
98 throw;
99 }
100@@ -424,7 +424,7 @@
101 qclass=mdp.d_qclass;
102 return 0;
103 }
104-catch(exception& e) {
105+catch(std::exception& e) {
106 return -1;
107 }
108
109diff -Nur pdns-2.9.21.1.orig/pdns/dnspbench.cc pdns-2.9.21.1.exception/pdns/dnspbench.cc
110--- pdns-2.9.21.1.orig/pdns/dnspbench.cc 2007-04-21 07:56:36.000000000 -0600
111+++ pdns-2.9.21.1.exception/pdns/dnspbench.cc 2008-10-06 10:44:05.000000000 -0600
112@@ -89,7 +89,7 @@
113 cerr<<"Out: "<<argv[1]<<" IN "<<argv[2]<<" "<<regen->getZoneRepresentation()<<endl;
114 #endif
115 }
116-catch(exception& e)
117+catch(std::exception& e)
118 {
119 cerr<<"Fatal: "<<e.what()<<"\n";
120 }
121diff -Nur pdns-2.9.21.1.orig/pdns/dnsproxy.cc pdns-2.9.21.1.exception/pdns/dnsproxy.cc
122--- pdns-2.9.21.1.orig/pdns/dnsproxy.cc 2007-04-21 07:56:36.000000000 -0600
123+++ pdns-2.9.21.1.exception/pdns/dnsproxy.cc 2008-10-06 10:44:05.000000000 -0600
124@@ -202,7 +202,7 @@
125 catch(AhuException &ae) {
126 L<<Logger::Error<<"Fatal error in DNS proxy: "<<ae.reason<<endl;
127 }
128- catch(exception &e) {
129+ catch(std::exception &e) {
130 L<<Logger::Error<<"Communicator thread died because of STL error: "<<e.what()<<endl;
131 }
132 catch( ... )
133diff -Nur pdns-2.9.21.1.orig/pdns/dnsreplay.cc pdns-2.9.21.1.exception/pdns/dnsreplay.cc
134--- pdns-2.9.21.1.orig/pdns/dnsreplay.cc 2007-04-21 07:56:36.000000000 -0600
135+++ pdns-2.9.21.1.exception/pdns/dnsreplay.cc 2008-10-06 10:44:05.000000000 -0600
136@@ -255,7 +255,7 @@
137 }
138 }
139 }
140-catch(exception& e)
141+catch(std::exception& e)
142 {
143 cerr<<"Receiver thread died: "<<e.what()<<endl;
144 exit(1);
145@@ -445,7 +445,7 @@
146 receiveFromReference();
147 }
148 }
149-catch(exception& e)
150+catch(std::exception& e)
151 {
152 cerr<<"Fatal: "<<e.what()<<endl;
153 }
154diff -Nur pdns-2.9.21.1.orig/pdns/dnsreplay-mindex.cc pdns-2.9.21.1.exception/pdns/dnsreplay-mindex.cc
155--- pdns-2.9.21.1.orig/pdns/dnsreplay-mindex.cc 2007-04-21 07:56:36.000000000 -0600
156+++ pdns-2.9.21.1.exception/pdns/dnsreplay-mindex.cc 2008-10-06 10:44:05.000000000 -0600
157@@ -356,7 +356,7 @@
158 }
159
160 }
161-catch(exception& e)
162+catch(std::exception& e)
163 {
164 cerr<<"Receiver thread died: "<<e.what()<<endl;
165 exit(1);
166@@ -579,7 +579,7 @@
167 }
168 out:;
169 }
170-catch(exception& e)
171+catch(std::exception& e)
172 {
173 cerr<<"Fatal: "<<e.what()<<endl;
174 }
175diff -Nur pdns-2.9.21.1.orig/pdns/dnsscan.cc pdns-2.9.21.1.exception/pdns/dnsscan.cc
176--- pdns-2.9.21.1.orig/pdns/dnsscan.cc 2007-04-21 07:56:36.000000000 -0600
177+++ pdns-2.9.21.1.exception/pdns/dnsscan.cc 2008-10-06 10:44:05.000000000 -0600
178@@ -78,7 +78,7 @@
179 }
180
181 }
182-catch(exception& e)
183+catch(std::exception& e)
184 {
185 cout<<"Fatal: "<<e.what()<<endl;
186 }
187diff -Nur pdns-2.9.21.1.orig/pdns/dnsscope.cc pdns-2.9.21.1.exception/pdns/dnsscope.cc
188--- pdns-2.9.21.1.orig/pdns/dnsscope.cc 2007-04-21 07:56:36.000000000 -0600
189+++ pdns-2.9.21.1.exception/pdns/dnsscope.cc 2008-10-06 10:44:05.000000000 -0600
190@@ -110,7 +110,7 @@
191 dnserrors++;
192 continue;
193 }
194- catch(exception& e) {
195+ catch(std::exception& e) {
196 if(pw)
197 pw->write();
198 bogus++;
199@@ -207,7 +207,7 @@
200 if(totpackets)
201 cerr<<"Average response time: "<<tottime/totpackets<<" usec"<<endl;
202 }
203-catch(exception& e)
204+catch(std::exception& e)
205 {
206 cerr<<"Fatal: "<<e.what()<<endl;
207 }
208diff -Nur pdns-2.9.21.1.orig/pdns/dnswasher.cc pdns-2.9.21.1.exception/pdns/dnswasher.cc
209--- pdns-2.9.21.1.orig/pdns/dnswasher.cc 2007-04-21 07:56:36.000000000 -0600
210+++ pdns-2.9.21.1.exception/pdns/dnswasher.cc 2008-10-06 10:44:05.000000000 -0600
211@@ -74,7 +74,7 @@
212 cerr<<"Saw "<<pr.d_correctpackets<<" correct packets, "<<pr.d_runts<<" runts, "<< pr.d_oversized<<" oversize, "<<
213 pr.d_nonetheripudp<<" unknown encaps"<<endl;
214 }
215-catch(exception& e)
216+catch(std::exception& e)
217 {
218 cerr<<"Fatal: "<<e.what()<<endl;
219 }
220diff -Nur pdns-2.9.21.1.orig/pdns/dynlistener.cc pdns-2.9.21.1.exception/pdns/dynlistener.cc
221--- pdns-2.9.21.1.orig/pdns/dynlistener.cc 2007-04-21 07:56:36.000000000 -0600
222+++ pdns-2.9.21.1.exception/pdns/dynlistener.cc 2008-10-06 10:44:05.000000000 -0600
223@@ -235,7 +235,7 @@
224 {
225 L<<Logger::Error<<"Fatal error 2 in control listener: "<<E<<endl;
226 }
227- catch(exception& e)
228+ catch(std::exception& e)
229 {
230 L<<Logger::Error<<"Fatal STL error: "<<e.what()<<endl;
231 }
232diff -Nur pdns-2.9.21.1.orig/pdns/dynmessenger.cc pdns-2.9.21.1.exception/pdns/dynmessenger.cc
233--- pdns-2.9.21.1.orig/pdns/dynmessenger.cc 2007-04-21 07:56:36.000000000 -0600
234+++ pdns-2.9.21.1.exception/pdns/dynmessenger.cc 2008-10-06 10:44:05.000000000 -0600
235@@ -17,6 +17,7 @@
236 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
237 */
238 #include "dynmessenger.hh"
239+#include <stdlib.h>
240 #include <cstdio>
241 #include <cstring>
242 #include <cerrno>
243diff -Nur pdns-2.9.21.1.orig/pdns/lwres.cc pdns-2.9.21.1.exception/pdns/lwres.cc
244--- pdns-2.9.21.1.orig/pdns/lwres.cc 2007-04-21 07:56:36.000000000 -0600
245+++ pdns-2.9.21.1.exception/pdns/lwres.cc 2008-10-06 10:44:05.000000000 -0600
246@@ -175,7 +175,7 @@
247 return ret;
248 // return p.getAnswers();
249 }
250- catch(exception &mde) {
251+ catch(std::exception &mde) {
252 if(::arg().mustDo("log-common-errors"))
253 L<<Logger::Notice<<"Unable to parse packet from remote server "<<d_ip.toString()<<": "<<mde.what()<<endl;
254 }
255diff -Nur pdns-2.9.21.1.orig/pdns/pdns_recursor.cc pdns-2.9.21.1.exception/pdns/pdns_recursor.cc
256--- pdns-2.9.21.1.orig/pdns/pdns_recursor.cc 2007-04-21 07:56:36.000000000 -0600
257+++ pdns-2.9.21.1.exception/pdns/pdns_recursor.cc 2008-10-06 10:44:05.000000000 -0600
258@@ -635,7 +635,7 @@
259 catch(MOADNSException& e) {
260 L<<Logger::Error<<"DNS parser error: "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl;
261 }
262- catch(exception& e) {
263+ catch(std::exception& e) {
264 L<<Logger::Error<<"STL error: "<<e.what()<<endl;
265 }
266 catch(...) {
267@@ -847,7 +847,7 @@
268 try {
269 questionExpand(data, len, qname, sizeof(qname), type);
270 }
271- catch(exception &e)
272+ catch(std::exception &e)
273 {
274 throw MOADNSException(e.what());
275 }
276@@ -1147,7 +1147,7 @@
277 s_rcc.send(answer, &remote);
278 command();
279 }
280- catch(exception& e) {
281+ catch(std::exception& e) {
282 L<<Logger::Error<<"Error dealing with control socket request: "<<e.what()<<endl;
283 }
284 catch(AhuException& ae) {
285@@ -1424,7 +1424,7 @@
286 SyncRes::s_negcache.clear();
287 return "ok\n";
288 }
289- catch(exception& e) {
290+ catch(std::exception& e) {
291 L<<Logger::Error<<"Had error reloading zones, keeping original data: "<<e.what()<<endl;
292 }
293 catch(AhuException& ae) {
294@@ -1463,7 +1463,7 @@
295 string tmp=DNSRR2String(rr);
296 rr=String2DNSRR(rr.qname, rr.qtype, tmp, 3600);
297 }
298- catch(exception &e) {
299+ catch(std::exception &e) {
300 throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"': "+e.what());
301 }
302 catch(...) {
303@@ -1883,7 +1883,7 @@
304 L<<Logger::Error<<"Exception: "<<ae.reason<<endl;
305 ret=EXIT_FAILURE;
306 }
307- catch(exception &e) {
308+ catch(std::exception &e) {
309 L<<Logger::Error<<"STL Exception: "<<e.what()<<endl;
310 ret=EXIT_FAILURE;
311 }
312diff -Nur pdns-2.9.21.1.orig/pdns/rcpgenerator.cc pdns-2.9.21.1.exception/pdns/rcpgenerator.cc
313--- pdns-2.9.21.1.orig/pdns/rcpgenerator.cc 2007-04-21 07:56:36.000000000 -0600
314+++ pdns-2.9.21.1.exception/pdns/rcpgenerator.cc 2008-10-06 10:44:05.000000000 -0600
315@@ -434,7 +434,7 @@
316 cout<<"Regenerated: '"<<out<<"'\n";
317
318 }
319-catch(exception& e)
320+catch(std::exception& e)
321 {
322 cerr<<"Fatal: "<<e.what()<<endl;
323 }
324diff -Nur pdns-2.9.21.1.orig/pdns/receiver.cc pdns-2.9.21.1.exception/pdns/receiver.cc
325--- pdns-2.9.21.1.orig/pdns/receiver.cc 2008-08-07 01:02:53.000000000 -0600
326+++ pdns-2.9.21.1.exception/pdns/receiver.cc 2008-10-06 10:44:05.000000000 -0600
327@@ -567,7 +567,7 @@
328 cerr<<"Exiting because: "<<AE.reason<<endl;
329 L<<Logger::Error<<"Exiting because: "<<AE.reason<<endl;
330 }
331- catch(exception &e) {
332+ catch(std::exception &e) {
333 if(!arg().mustDo("daemon"))
334 cerr<<"Exiting because of STL error: "<<e.what()<<endl;
335 L<<Logger::Error<<"Exiting because of STL error: "<<e.what()<<endl;
336diff -Nur pdns-2.9.21.1.orig/pdns/sdig.cc pdns-2.9.21.1.exception/pdns/sdig.cc
337--- pdns-2.9.21.1.orig/pdns/sdig.cc 2007-04-21 07:56:36.000000000 -0600
338+++ pdns-2.9.21.1.exception/pdns/sdig.cc 2008-10-06 10:44:05.000000000 -0600
339@@ -55,7 +55,7 @@
340 }
341
342 }
343-catch(exception &e)
344+catch(std::exception &e)
345 {
346 cerr<<"Fatal: "<<e.what()<<endl;
347 }
348diff -Nur pdns-2.9.21.1.orig/pdns/tcpreceiver.cc pdns-2.9.21.1.exception/pdns/tcpreceiver.cc
349--- pdns-2.9.21.1.orig/pdns/tcpreceiver.cc 2007-04-21 07:56:36.000000000 -0600
350+++ pdns-2.9.21.1.exception/pdns/tcpreceiver.cc 2008-10-06 10:44:05.000000000 -0600
351@@ -322,7 +322,7 @@
352 s_P = 0; // on next call, backend will be recycled
353 L<<Logger::Error<<"TCP nameserver had error, cycling backend: "<<ae.reason<<endl;
354 }
355- catch(exception &e) {
356+ catch(std::exception &e) {
357 L<<Logger::Error<<"TCP Connection Thread died because of STL error: "<<e.what()<<endl;
358 }
359 catch( ... )
360diff -Nur pdns-2.9.21.1.orig/pdns/webserver.cc pdns-2.9.21.1.exception/pdns/webserver.cc
361--- pdns-2.9.21.1.orig/pdns/webserver.cc 2007-04-21 07:56:36.000000000 -0600
362+++ pdns-2.9.21.1.exception/pdns/webserver.cc 2008-10-06 10:44:05.000000000 -0600
363@@ -170,7 +170,7 @@
364 catch(Exception &e) {
365 L<<Logger::Error<<"Exception in webserver: "<<e.reason<<endl;
366 }
367- catch(exception &e) {
368+ catch(std::exception &e) {
369 L<<Logger::Error<<"STL Exception in webserver: "<<e.what()<<endl;
370 }
371 catch(...) {
372@@ -214,7 +214,7 @@
373 catch(Exception &e) {
374 L<<Logger::Error<<"Fatal error in main webserver thread: "<<e.reason<<endl;
375 }
376- catch(exception &e) {
377+ catch(std::exception &e) {
378 L<<Logger::Error<<"STL Exception in main webserver thread: "<<e.what()<<endl;
379 }
380 catch(...) {
PowerDNS - a Versatile Database Driven Nameserver
This page took 0.070532 seconds and 4 git commands to generate.