MongoDB backend fix1 and 2

This commit is contained in:
Morten Stevens 2012-09-18 14:11:53 +02:00
parent e8e01122a6
commit 5b7fb7d0d3
2 changed files with 33 additions and 0 deletions

15
pdns-mongodb-fix1.patch Normal file
View File

@ -0,0 +1,15 @@
--- pdns-3.1/modules/mongodbbackend/Makefile.in.orig 2012-05-04 12:15:45.000000000 +0200
+++ pdns-3.1/modules/mongodbbackend/Makefile.in 2012-09-17 23:10:01.000000000 +0200
@@ -259,10 +259,10 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = @THREADFLAGS@ $(BOOST_CPPFLAGS)
EXTRA_DIST = OBJECTFILES OBJECTLIBS
-INCLUDES = -I/opt/mongo/include/mongo/
+INCLUDES = -I/usr/include/mongo/
lib_LTLIBRARIES = libmongodbbackend.la
libmongodbbackend_la_SOURCES = mongodbbackend.cc mongodbbackend.hh minimal.cc slave.cc master.cc reload.cc private.cc dnssec.cc supermaster.cc crc32.cc
-libmongodbbackend_la_LDFLAGS = -module -avoid-version -L/opt/mongo/lib64 $(BOOST_THREAD_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) -lmongoclient $(BOOST_THREAD_LIBS) $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS)
+libmongodbbackend_la_LDFLAGS = -module -avoid-version $(BOOST_THREAD_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) -lmongoclient $(BOOST_THREAD_LIBS) $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS)
all: all-am
.SUFFIXES:

18
pdns-mongodb-fix2.patch Normal file
View File

@ -0,0 +1,18 @@
--- pdns-3.1/modules/mongodbbackend/mongodbbackend.hh.orig 2012-05-04 12:13:23.000000000 +0200
+++ pdns-3.1/modules/mongodbbackend/mongodbbackend.hh 2012-09-18 13:09:19.000000000 +0200
@@ -1,13 +1,13 @@
#ifndef MONGODB_HH
#define MONGODB_HH
+#include "client/dbclient.h"
#include "pdns/dnsbackend.hh"
#undef VERSION
#include <string>
using std::string;
-
-#include "client/dbclient.h"
+using std::auto_ptr;
class MONGODBException {
public: