Date: Monday, January 10, 2011 @ 09:36:47 Author: jgc Revision: 105581
upgpkg: pdns 2.9.22-6 Rebuild for MySQL 5.5, remove old patches, build without static libraries Modified: pdns/trunk/PKGBUILD Deleted: pdns/trunk/fix-ldapbackend-openldap.dpatch pdns/trunk/gcc43-fixes.dpatch pdns/trunk/ns-glue-records-out-of-zone.dpatch ------------------------------------+ PKGBUILD | 59 ++++---- fix-ldapbackend-openldap.dpatch | 239 ----------------------------------- gcc43-fixes.dpatch | 200 ----------------------------- ns-glue-records-out-of-zone.dpatch | 22 --- 4 files changed, 29 insertions(+), 491 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-01-10 14:01:25 UTC (rev 105580) +++ PKGBUILD 2011-01-10 14:36:47 UTC (rev 105581) @@ -3,12 +3,12 @@ pkgname=pdns pkgver=2.9.22 -pkgrel=5 +pkgrel=6 pkgdesc="A modern, advanced and high performance authoritative-only nameserver" arch=(i686 x86_64) url="http://www.powerdns.com"; license=('GPL') -depends=('gcc-libs' 'zlib' 'postgresql-libs>=8.4.1' 'libmysqlclient' 'sqlite3' 'libldap>=2.4.18') +depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite3' 'libldap') makedepends=('boost') provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') @@ -17,39 +17,38 @@ options=(!makeflags !libtool) backup=('etc/powerdns/pdns.conf') source=(http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.gz - 2.9.18-default-mysql-options.patch + 2.9.18-default-mysql-options.patch pdns-2.9.22-gcc44.patch pdns.rc pdns.conf) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/2.9.18-default-mysql-options.patch || return 1 - patch -Np1 -i ${srcdir}/pdns-2.9.22-gcc44.patch || return 1 - touch AUTHORS NEWS - libtoolize --force --copy || return 1 - aclocal || return 1 - autoconf || return 1 - automake --add-missing || return 1 - ./configure --prefix=/usr \ - --sysconfdir=/etc/powerdns \ - --libexecdir=/usr/lib \ - --libdir=/usr/lib/powerdns \ - --mandir=/usr/share/man \ - --with-modules="" \ - --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \ - --disable-recursor || return 1 - - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -m755 -d ${pkgdir}/etc/rc.d - install -m755 -d ${pkgdir}/etc/powerdns - rm ${startdir}/pkg/etc/powerdns/pdns.conf-dist - install -m644 ${startdir}/src/pdns.conf ${startdir}/pkg/etc/powerdns/ - install -m755 ${startdir}/src/pdns.rc ${startdir}/pkg/etc/rc.d/pdns -} md5sums=('8a6ff842733aca885577eb54e983a1ff' '90fb32e843326d14359c508cef855929' '530642273005bdabae27792098834ea6' '16e2d32e9781be7afa8f1700740bcdb0' 'a390ab49c4fcde205629be33bddc2e6c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/2.9.18-default-mysql-options.patch" + patch -Np1 -i "${srcdir}/pdns-2.9.22-gcc44.patch" + touch AUTHORS NEWS + libtoolize --force --copy + aclocal + autoconf + automake --add-missing + ./configure --prefix=/usr \ + --sysconfdir=/etc/powerdns \ + --libexecdir=/usr/lib \ + --libdir=/usr/lib/powerdns \ + --mandir=/usr/share/man \ + --with-modules="" \ + --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \ + --disable-recursor \ + --disable-static + make + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc/rc.d" + rm "${pkgdir}/etc/powerdns/pdns.conf-dist" + install -m644 "${srcdir}/pdns.conf" "${pkgdir}/etc/powerdns/" + install -m755 "${srcdir}/pdns.rc" "${pkgdir}/etc/rc.d/pdns" +} Deleted: fix-ldapbackend-openldap.dpatch =================================================================== --- fix-ldapbackend-openldap.dpatch 2011-01-10 14:01:25 UTC (rev 105580) +++ fix-ldapbackend-openldap.dpatch 2011-01-10 14:36:47 UTC (rev 105581) @@ -1,239 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix-ldapbackend-openldap.dpatch by Matthijs Mohlmann <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Upstream patch to fix build with openldap 2.4. - -...@dpatch@ -diff -urNad trunk~/configure.in trunk/configure.in ---- trunk~/configure.in 2008-03-01 16:51:09.000000000 +0100 -+++ trunk/configure.in 2008-03-02 21:43:03.677897471 +0100 -@@ -226,6 +226,36 @@ - pdns ) - needmysql=yes - ;; -+ ldap) -+ AC_CHECK_HEADERS([ldap.h], , [AC_MSG_ERROR([ldap header (ldap.h) not found])]) -+ AC_CHECK_HEADERS([lber.h], , [AC_MSG_ERROR([ldap header (lber.h) not found])]) -+ AC_SUBST([LIBLDAP]) -+ AC_CHECK_LIB( -+ [ldap_r], [ldap_set_option], -+ [AC_DEFINE([HAVE_LIBLDAP_R], 1, [Have -lldap_r]) LIBLDAP="ldap_r"], -+ [AC_CHECK_LIB( -+ [ldap], [ldap_set_option], -+ [AC_DEFINE([HAVE_LIBLDAP], 1, [Have -lldap]) LIBLDAP="ldap"], -+ [AC_MSG_ERROR([ldap library (libldap) not found])] -+ )] -+ ) -+ AC_CHECK_LIB( -+ [$LIBLDAP], [ldap_initialize], -+ [AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [Define to 1 if you have ldap_initialize])] -+ ) -+ AC_CHECK_LIB( -+ [$LIBLDAP], [ldap_sasl_bind], -+ [AC_DEFINE([HAVE_LDAP_SASL_BIND], 1, [Define to 1 if you have ldap_sasl_bind])] -+ ) -+ ;; -+ opendbx) -+ AC_CHECK_HEADERS([odbx.h], , [AC_MSG_ERROR([opendbx header (odbx.h) not found])]) -+ AC_SUBST([LIBOPENDBX]) -+ AC_CHECK_LIB( -+ [opendbx], [odbx_init], -+ [AC_DEFINE([HAVE_LIBOPENDBX], 1, [Have -lopendbx]) LIBOPENDBX="opendbx"] -+ ) -+ ;; - esac - done - -diff -urNad trunk~/modules/ldapbackend/Makefile.am trunk/modules/ldapbackend/Makefile.am ---- trunk~/modules/ldapbackend/Makefile.am 2008-03-01 16:51:09.000000000 +0100 -+++ trunk/modules/ldapbackend/Makefile.am 2008-03-02 21:43:03.677897471 +0100 -@@ -1,13 +1,13 @@ - am_cppfla...@threadflags@ - lib_LTLIBRARIES = libldapbackend.la - --EXTRA_DIST=OBJECTFILES OBJECTLIBS -+EXTRA_DIST = OBJECTFILES OBJECTLIBS - - libldapbackend_la_SOURCES=ldapbackend.cc ldapbackend.hh \ - powerldap.hh powerldap.cc utils.hh - - --libldapbackend_la_LIBADD=-lldap -+libldapbackend_la_LIBADD = -...@libldap@ - - - -diff -urNad trunk~/modules/ldapbackend/powerldap.cc trunk/modules/ldapbackend/powerldap.cc ---- trunk~/modules/ldapbackend/powerldap.cc 2008-03-01 16:51:09.000000000 +0100 -+++ trunk/modules/ldapbackend/powerldap.cc 2008-03-02 21:43:03.678897819 +0100 -@@ -1,41 +1,57 @@ - #include "powerldap.hh" -- -+#include <pdns/misc.hh> - - - PowerLDAP::PowerLDAP( const string& hosts, uint16_t port, bool tls ) - { -- int protocol = LDAP_VERSION3; -- -- -- if( ldap_initialize( &d_ld, hosts.c_str() ) != LDAP_SUCCESS ) -+ int err; -+ -+#ifdef HAVE_LDAP_INITIALIZE -+ if( ( err = ldap_initialize( &d_ld, hosts.c_str() ) ) != LDAP_SUCCESS ) - { -- if( ( d_ld = ldap_init( hosts.c_str(), port ) ) == NULL ) -+ string ldapuris; -+ vector<string> uris; -+ stringtok( uris, hosts ); -+ -+ for( size_t i = 0; i < uris.size(); i++ ) - { -- throw LDAPException( "Error initializing LDAP connection: " + string( strerror( errno ) ) ); -+ ldapuris += " ldap://"; + uris[i]; - } - -- if( tls && ldap_start_tls_s( d_ld, NULL, NULL ) != LDAP_SUCCESS ) -+ if( ( err = ldap_initialize( &d_ld, ldapuris.c_str() ) ) != LDAP_SUCCESS ) - { -- ldap_unbind( d_ld ); -- throw( LDAPException( "Couldn't perform STARTTLS" ) ); -+ throw LDAPException( "Error initializing LDAP connection to '" + ldapuris + ": " + getError( err ) ); - } - } -- -+#else -+ if( ( d_ld = ldap_init( hosts.c_str(), port ) ) == NULL ) -+ { -+ throw LDAPException( "Error initializing LDAP connection to '" + hosts + "': " + string( strerror( errno ) ) ); -+ } -+#endif -+ -+ int protocol = LDAP_VERSION3; - if( ldap_set_option( d_ld, LDAP_OPT_PROTOCOL_VERSION, &protocol ) != LDAP_OPT_SUCCESS ) - { - protocol = LDAP_VERSION2; - if( ldap_set_option( d_ld, LDAP_OPT_PROTOCOL_VERSION, &protocol ) != LDAP_OPT_SUCCESS ) - { -- ldap_unbind( d_ld ); -+ ldap_unbind_ext( d_ld, NULL, NULL ); - throw LDAPException( "Couldn't set protocol version to LDAPv3 or LDAPv2" ); - } - } -+ -+ if( tls && ( err = ldap_start_tls_s( d_ld, NULL, NULL ) ) != LDAP_SUCCESS ) -+ { -+ ldap_unbind_ext( d_ld, NULL, NULL ); -+ throw LDAPException( "Couldn't perform STARTTLS: " + getError( err ) ); -+ } - } - - - PowerLDAP::~PowerLDAP() - { -- ldap_unbind( d_ld ); -+ ldap_unbind_ext( d_ld, NULL, NULL ); - } - - -@@ -56,23 +72,48 @@ - } - } - -- --void PowerLDAP::simpleBind( const string& ldapbinddn, const string& ldapsecret ) -+void PowerLDAP::bind( const string& ldapbinddn, const string& ldapsecret, int method, int timeout ) - { -- int err; -- if( ( err = ldap_simple_bind_s( d_ld, ldapbinddn.c_str(), ldapsecret.c_str() ) ) != LDAP_SUCCESS ) -+ int msgid; -+ -+#ifdef HAVE_LDAP_SASL_BIND -+ int rc; -+ struct berval passwd; -+ -+ passwd.bv_val = (char *)ldapsecret.c_str(); -+ passwd.bv_len = strlen( passwd.bv_val ); -+ -+ if( ( rc = ldap_sasl_bind( d_ld, ldapbinddn.c_str(), LDAP_SASL_SIMPLE, &passwd, NULL, NULL, &msgid ) ) != LDAP_SUCCESS ) - { -- throw LDAPException( "Failed to bind to LDAP server: " + getError( err ) ); -+ throw LDAPException( "Failed to bind to LDAP server: " + getError( rc ) ); -+ } -+#else -+ if( ( msgid = ldap_bind( d_ld, ldapbinddn.c_str(), ldapsecret.c_str(), method ) ) == -1 ) -+ { -+ throw LDAPException( "Failed to bind to LDAP server: " + getError( msgid ) ); - } -+#endif -+ -+ waitResult( msgid, timeout, NULL ); -+} -+ -+/** -+ * Depricated, use PowerLDAP::bind() instead -+ */ -+ -+void PowerLDAP::simpleBind( const string& ldapbinddn, const string& ldapsecret ) -+{ -+ this->bind( ldapbinddn, ldapsecret, LDAP_AUTH_SIMPLE, 30 ); - } - - - int PowerLDAP::search( const string& base, int scope, const string& filter, const char** attr ) - { -- int msgid; -- if( ( msgid = ldap_search( d_ld, base.c_str(), scope, filter.c_str(), const_cast<char**> (attr), 0 ) ) == -1 ) -+ int msgid, rc; -+ -+ if( ( rc = ldap_search_ext( d_ld, base.c_str(), scope, filter.c_str(), const_cast<char**> (attr), 0, NULL, NULL, NULL, LDAP_NO_LIMIT, &msgid ) ) != LDAP_SUCCESS ) - { -- throw LDAPException( "Starting LDAP search: " + getError() ); -+ throw LDAPException( "Starting LDAP search: " + getError( rc ) ); - } - - return msgid; -@@ -195,14 +236,9 @@ - - const string PowerLDAP::getError( int rc ) - { -- int ld_errno = rc; -- -- if( ld_errno == -1 ) -- { -- getOption( LDAP_OPT_ERROR_NUMBER, &ld_errno ); -- } -+ if( rc == -1 ) { getOption( LDAP_OPT_ERROR_NUMBER, &rc ); } - -- return ldap_err2string( ld_errno ); -+ return string( ldap_err2string( rc ) );; - } - - -diff -urNad trunk~/modules/ldapbackend/powerldap.hh trunk/modules/ldapbackend/powerldap.hh ---- trunk~/modules/ldapbackend/powerldap.hh 2008-03-01 16:51:09.000000000 +0100 -+++ trunk/modules/ldapbackend/powerldap.hh 2008-03-02 21:43:29.915010836 +0100 -@@ -84,6 +84,7 @@ - void getOption( int option, int* value ); - void setOption( int option, int value ); - -+ void bind( const string& ldapbinddn, const string& ldapsecret, int method, int timeout ); - void simpleBind( const string& ldapbinddn = "", const string& ldapsecret = "" ); - int search( const string& base, int scope, const string& filter, const char** attr = 0 ); - -diff -urNad trunk~/modules/opendbxbackend/Makefile.am trunk/modules/opendbxbackend/Makefile.am ---- trunk~/modules/opendbxbackend/Makefile.am 2008-03-01 16:51:09.000000000 +0100 -+++ trunk/modules/opendbxbackend/Makefile.am 2008-03-02 21:43:03.679898166 +0100 -@@ -1,6 +1,7 @@ - am_cppfla...@threadflags@ --lib_LTLIBRARIES = libopendbxbackend.la --libopendbxbackend_la_SOURCES = odbxbackend.hh odbxbackend.cc odbxprivate.cc --libopendbxbackend_la_LIBADD = -lopendbx - - EXTRA_DIST = OBJECTFILES OBJECTLIBS -+ -+lib_LTLIBRARIES = libopendbxbackend.la -+libopendbxbackend_la_SOURCES = odbxbackend.hh odbxbackend.cc odbxprivate.cc -+libopendbxbackend_la_LIBADD =...@libopendbx@ Deleted: gcc43-fixes.dpatch =================================================================== --- gcc43-fixes.dpatch 2011-01-10 14:01:25 UTC (rev 105580) +++ gcc43-fixes.dpatch 2011-01-10 14:36:47 UTC (rev 105581) @@ -1,200 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## gcc43-fixes.dpatch by Matthijs Mohlmann <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -...@dpatch@ -diff -urNad trunk~/modules/ldapbackend/ldapbackend.cc trunk/modules/ldapbackend/ldapbackend.cc ---- trunk~/modules/ldapbackend/ldapbackend.cc 2007-04-15 12:05:52.000000000 +0200 -+++ trunk/modules/ldapbackend/ldapbackend.cc 2008-03-01 16:28:01.061412475 +0100 -@@ -194,8 +194,8 @@ - void LdapBackend::lookup_simple( const QType &qtype, const string &qname, DNSPacket *dnspkt, int zoneid ) - { - string filter, attr, qesc; -- char** attributes = ldap_attrany + 1; // skip associatedDomain -- char* attronly[] = { NULL, "dNSTTL", "modifyTimestamp", NULL }; -+ const char** attributes = ldap_attrany + 1; // skip associatedDomain -+ const char* attronly[] = { NULL, "dNSTTL", "modifyTimestamp", NULL }; - - - qesc = toLower( m_pldap->escape( qname ) ); -@@ -205,14 +205,14 @@ - { - attr = qtype.getName() + "Record"; - filter = "&(" + filter + ")(" + attr + "=*)"; -- attronly[0] = (char*) attr.c_str(); -+ attronly[0] = attr.c_str(); - attributes = attronly; - } - - filter = strbind( ":target:", filter, getArg( "filter-lookup" ) ); - - DLOG( L << Logger::Debug << m_myname << " Search = basedn: " << getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl ); -- m_msgid = m_pldap->search( getArg( "basedn" ), LDAP_SCOPE_SUBTREE, filter, (const char**) attributes ); -+ m_msgid = m_pldap->search( getArg( "basedn" ), LDAP_SCOPE_SUBTREE, filter, attributes ); - } - - -@@ -222,8 +222,8 @@ - int len; - vector<string> parts; - string filter, attr, qesc; -- char** attributes = ldap_attrany + 1; // skip associatedDomain -- char* attronly[] = { NULL, "dNSTTL", "modifyTimestamp", NULL }; -+ const char** attributes = ldap_attrany + 1; // skip associatedDomain -+ const char* attronly[] = { NULL, "dNSTTL", "modifyTimestamp", NULL }; - - - qesc = toLower( m_pldap->escape( qname ) ); -@@ -249,7 +249,7 @@ - { - attr = qtype.getName() + "Record"; - filter = "&(" + filter + ")(" + attr + "=*)"; -- attronly[0] = (char*) attr.c_str(); -+ attronly[0] = attr.c_str(); - attributes = attronly; - } - } -@@ -257,7 +257,7 @@ - filter = strbind( ":target:", filter, getArg( "filter-lookup" ) ); - - DLOG( L << Logger::Debug << m_myname << " Search = basedn: " << getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl ); -- m_msgid = m_pldap->search( getArg( "basedn" ), LDAP_SCOPE_SUBTREE, filter, (const char**) attributes ); -+ m_msgid = m_pldap->search( getArg( "basedn" ), LDAP_SCOPE_SUBTREE, filter, attributes ); - } - - -@@ -265,8 +265,8 @@ - void LdapBackend::lookup_tree( const QType &qtype, const string &qname, DNSPacket *dnspkt, int zoneid ) - { - string filter, attr, qesc, dn; -- char** attributes = ldap_attrany + 1; // skip associatedDomain -- char* attronly[] = { NULL, "dNSTTL", "modifyTimestamp", NULL }; -+ const char** attributes = ldap_attrany + 1; // skip associatedDomain -+ const char* attronly[] = { NULL, "dNSTTL", "modifyTimestamp", NULL }; - vector<string>::reverse_iterator i; - vector<string> parts; - -@@ -278,7 +278,7 @@ - { - attr = qtype.getName() + "Record"; - filter = "&(" + filter + ")(" + attr + "=*)"; -- attronly[0] = (char*) attr.c_str(); -+ attronly[0] = attr.c_str(); - attributes = attronly; - } - -@@ -291,7 +291,7 @@ - } - - DLOG( L << Logger::Debug << m_myname << " Search = basedn: " << dn + getArg( "basedn" ) << ", filter: " << filter << ", qtype: " << qtype.getName() << endl ); -- m_msgid = m_pldap->search( dn + getArg( "basedn" ), LDAP_SCOPE_BASE, filter, (const char**) attributes ); -+ m_msgid = m_pldap->search( dn + getArg( "basedn" ), LDAP_SCOPE_BASE, filter, attributes ); - } - - -@@ -487,12 +487,12 @@ - { - string filter; - SOAData sd; -- char* attronly[] = { "sOARecord", NULL }; -+ const char* attronly[] = { "sOARecord", NULL }; - - - // search for SOARecord of domain - filter = "(&(associatedDomain=" + toLower( m_pldap->escape( domain ) ) + ")(SOARecord=*))"; -- m_msgid = m_pldap->search( getArg( "basedn" ), LDAP_SCOPE_SUBTREE, filter, (const char**) attronly ); -+ m_msgid = m_pldap->search( getArg( "basedn" ), LDAP_SCOPE_SUBTREE, filter, attronly ); - m_pldap->getSearchEntry( m_msgid, m_result ); - - if( m_result.count( "sOARecord" ) && !m_result["sOARecord"].empty() ) -diff -urNad trunk~/modules/ldapbackend/ldapbackend.hh trunk/modules/ldapbackend/ldapbackend.hh ---- trunk~/modules/ldapbackend/ldapbackend.hh 2007-04-15 12:05:49.000000000 +0200 -+++ trunk/modules/ldapbackend/ldapbackend.hh 2008-03-01 16:28:01.061412475 +0100 -@@ -54,7 +54,7 @@ - - - --static char* ldap_attrany[] = { -+static const char* ldap_attrany[] = { - "associatedDomain", - "dNSTTL", - "aRecord", -diff -urNad trunk~/modules/ldapbackend/powerldap.cc trunk/modules/ldapbackend/powerldap.cc ---- trunk~/modules/ldapbackend/powerldap.cc 2008-03-01 16:27:59.909588193 +0100 -+++ trunk/modules/ldapbackend/powerldap.cc 2008-03-01 16:29:30.115826665 +0100 -@@ -1,6 +1,6 @@ - #include "powerldap.hh" - #include <pdns/misc.hh> -- -+#include <sys/time.h> - - PowerLDAP::PowerLDAP( const string& hosts, uint16_t port, bool tls ) - { -diff -urNad trunk~/pdns/distributor.hh trunk/pdns/distributor.hh ---- trunk~/pdns/distributor.hh 2007-04-15 12:04:01.000000000 +0200 -+++ trunk/pdns/distributor.hh 2008-03-01 16:33:09.179981540 +0100 -@@ -82,7 +82,6 @@ - struct QuestionData - { - Question *Q; -- time_t created; - void (*callback)(const AnswerData &); - int id; - }; -diff -urNad trunk~/pdns/dns.hh trunk/pdns/dns.hh ---- trunk~/pdns/dns.hh 2007-04-15 12:04:13.000000000 +0200 -+++ trunk/pdns/dns.hh 2008-03-01 16:30:34.170139444 +0100 -@@ -115,7 +115,7 @@ - #pragma pack (pop) - #endif - --typedef enum { -+enum { - ns_t_invalid = 0, /* Cookie. */ - ns_t_a = 1, /* Host address. */ - ns_t_ns = 2, /* Authoritative server. */ -diff -urNad trunk~/pdns/dynmessenger.cc trunk/pdns/dynmessenger.cc ---- trunk~/pdns/dynmessenger.cc 2007-04-15 12:02:08.000000000 +0200 -+++ trunk/pdns/dynmessenger.cc 2008-03-01 16:31:21.029415840 +0100 -@@ -18,6 +18,7 @@ - */ - #include "dynmessenger.hh" - #include <cstdio> -+#include <cstdlib> - #include <cstring> - #include <cerrno> - #include <iostream> -diff -urNad trunk~/pdns/misc.hh trunk/pdns/misc.hh ---- trunk~/pdns/misc.hh 2007-04-15 12:02:45.000000000 +0200 -+++ trunk/pdns/misc.hh 2008-03-01 16:32:06.277132468 +0100 -@@ -19,6 +19,7 @@ - #ifndef MISC_HH - #define MISC_HH - #include <stdint.h> -+#include <cstring> - - #if 0 - #define RDTSC(qp) \ -@@ -234,7 +235,7 @@ - return c==' ' || c=='\t' || c=='\r' || c=='\n'; - } - --inline const char dns_tolower(char c) -+inline char dns_tolower(char c) - { - if(c>='A' && c<='Z') - c+='a'-'A'; -diff -urNad trunk~/pdns/pdns_recursor.cc trunk/pdns/pdns_recursor.cc ---- trunk~/pdns/pdns_recursor.cc 2007-04-22 10:52:38.000000000 +0200 -+++ trunk/pdns/pdns_recursor.cc 2008-03-01 16:32:56.211476978 +0100 -@@ -412,7 +412,7 @@ - set<DNSResourceRecord>nsset; - - if(::arg()["hint-file"].empty()) { -- static char*ips[]={"198.41.0.4", "192.228.79.201", "192.33.4.12", "128.8.10.90", "192.203.230.10", "192.5.5.241", "192.112.36.4", "128.63.2.53", -+ static const char*ips[]={"198.41.0.4", "192.228.79.201", "192.33.4.12", "128.8.10.90", "192.203.230.10", "192.5.5.241", "192.112.36.4", "128.63.2.53", - "192.36.148.17","192.58.128.30", "193.0.14.129", "198.32.64.12", "202.12.27.33"}; - DNSResourceRecord arr, nsrr; - arr.qtype=QType::A; Deleted: ns-glue-records-out-of-zone.dpatch =================================================================== --- ns-glue-records-out-of-zone.dpatch 2011-01-10 14:01:25 UTC (rev 105580) +++ ns-glue-records-out-of-zone.dpatch 2011-01-10 14:36:47 UTC (rev 105581) @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## ns-glue-records-out-of-zone.dpatch by Matthijs Mohlmann <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -...@dpatch@ -diff -urNad trunk~/pdns/communicator.cc trunk/pdns/communicator.cc ---- trunk~/pdns/communicator.cc 2007-04-15 12:02:03.000000000 +0200 -+++ trunk/pdns/communicator.cc 2007-09-15 09:52:36.597713257 +0200 -@@ -83,9 +83,8 @@ - } - for(Resolver::res_t::iterator i=recs.begin();i!=recs.end();++i) { - if(!endsOn(i->qname, domain)) { -- L<<Logger::Error<<"Remote "<<remote<<" sneaked in out-of-zone data '"<<i->qname<<"' during AXFR of zone '"<<domain<<"'"<<endl; -- di.backend->abortTransaction(); -- return; -+ L<<Logger::Error<<"Remote "<<remote<<" tried to sneak in out-of-zone data '"<<i->qname<<"' during AXFR of zone '"<<domain<<"'"<<endl; -+ continue; - } - i->domain_id=domain_id; - if(i->qtype.getCode()>=1024)
