rpms/pdns-recursor/devel pdns-recursor-boost.patch, NONE, 1.1 pdns-recursor-gcc44.patch, NONE, 1.1 pdns-recursor.spec, 1.10, 1.11

[Ruben Kerkhof]

Author: ruben

Update of /cvs/pkgs/rpms/pdns-recursor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2496

Modified Files:
	pdns-recursor.spec 
Added Files:
	pdns-recursor-boost.patch pdns-recursor-gcc44.patch 
Log Message:
* Fri Feb 27 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7-4
- Fix errors with newer Boost
- Fix build with gcc4.4


pdns-recursor-boost.patch:

--- NEW FILE pdns-recursor-boost.patch ---
diff -up pdns-recursor-3.1.7/lwres.cc.boost pdns-recursor-3.1.7/lwres.cc
--- pdns-recursor-3.1.7/lwres.cc.boost	2008-06-24 20:23:33.000000000 +0200
+++ pdns-recursor-3.1.7/lwres.cc	2009-02-27 15:14:06.000000000 +0100
@@ -181,7 +181,7 @@ int asyncresolve(const ComboAddress& ip,
     
     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;
   }
diff -up pdns-recursor-3.1.7/pdns_recursor.cc.boost pdns-recursor-3.1.7/pdns_recursor.cc
--- pdns-recursor-3.1.7/pdns_recursor.cc.boost	2008-06-24 20:23:33.000000000 +0200
+++ pdns-recursor-3.1.7/pdns_recursor.cc	2009-02-27 15:15:42.000000000 +0100
@@ -666,7 +666,7 @@ void startDoResolve(void *p)
   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 @@ void handleRCC(int fd, FDMultiplexer::fu
     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 @@ string reloadAuthAndForwards()
     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 @@ void parseAuthAndForwards()
 	    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 @@ string doReloadLuaScript(vector<string>:
       }
     }
   }
-  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 @@ int serviceMain(int argc, char*argv[])
     }
     
   }
-  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 @@ int main(int argc, char **argv) 
     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;
   }

pdns-recursor-gcc44.patch:

--- NEW FILE pdns-recursor-gcc44.patch ---
diff -up pdns-recursor-3.1.7/misc.hh.orig pdns-recursor-3.1.7/misc.hh
--- pdns-recursor-3.1.7/misc.hh.orig	2009-02-27 15:28:00.000000000 +0100
+++ pdns-recursor-3.1.7/misc.hh	2009-02-27 15:28:16.000000000 +0100
@@ -20,6 +20,7 @@
 #define MISC_HH
 #include <stdint.h>
 #include <cstring>
+#include <cstdio>
 
 #if 0
 #define RDTSC(qp) \


Index: pdns-recursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns-recursor/devel/pdns-recursor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pdns-recursor.spec	26 Feb 2009 10:26:40 -0000	1.10
+++ pdns-recursor.spec	27 Feb 2009 15:44:06 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:		Modern, advanced and high performance recursing/non authoritative nameserver
 Name:			pdns-recursor
 Version:		3.1.7
-Release:		3%{?dist}
+Release:		4%{?dist}
 Group:			System Environment/Daemons
 License:		GPLv2
 URL:			http://powerdns.com
@@ -11,6 +11,8 @@
 
 Patch0:			pdns-recursor-fixsysconfdir.patch
 Patch1:			pdns-recursor-fixmakefile.patch
+Patch2:			pdns-recursor-boost.patch
+Patch3:			pdns-recursor-gcc44.patch
 
 Provides:		powerdns-recursor = %{version}-%{release}
 BuildRequires:		boost-devel, lua-devel
@@ -25,9 +27,10 @@
 %setup -q
 %patch0 -p1 -b .fixsysconfdir
 %patch1 -p1 -b .fixmakefile
+%patch2 -p1 -b .boost
+%patch3 -p1 -b .gcc44
 
 %build
-#LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
 LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" make %{?_smp_mflags}
 
 
@@ -77,6 +80,10 @@
 
 
 %changelog
+* Fri Feb 27 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7-4
+- Fix errors with newer Boost
+- Fix build with gcc4.4
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild