Author: kiesiu Date: Mon Nov 28 12:24:19 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.0
---- Files affected:
packages/pdns:
gcc4.patch (1.1 -> 1.2) , pdns-int16.patch (1.4 -> 1.5) ,
pdns-openldap-2.3.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/pdns/gcc4.patch
diff -u packages/pdns/gcc4.patch:1.1 packages/pdns/gcc4.patch:1.2
--- packages/pdns/gcc4.patch:1.1 Wed Apr 21 18:55:59 2010
+++ packages/pdns/gcc4.patch Mon Nov 28 13:24:14 2011
@@ -1,20 +1,22 @@
---- pdns-2.9.22/pdns/rcpgenerator.cc.orig 2010-04-14 23:40:51.208359588
+0200
-+++ pdns-2.9.22/pdns/rcpgenerator.cc 2010-04-14 23:42:06.531685676 +0200
-@@ -21,6 +21,7 @@
- #include "misc.hh"
- #include <boost/lexical_cast.hpp>
- #include <iostream>
-+#include <cstdio>
- #include "base64.hh"
- using namespace boost;
-
---- pdns-2.9.22/pdns/dnsparser.cc.orig 2010-04-14 23:44:22.735837950 +0200
-+++ pdns-2.9.22/pdns/dnsparser.cc 2010-04-14 23:44:37.368336270 +0200
+diff -uNr pdns-3.0/pdns/dnsparser.cc pdns-3.0.new/pdns/dnsparser.cc
+--- pdns-3.0/pdns/dnsparser.cc 2011-07-22 13:23:22.000000000 +0200
++++ pdns-3.0.new/pdns/dnsparser.cc 2011-11-28 11:59:02.047547670 +0100
@@ -20,6 +20,7 @@
#include "dnswriter.hh"
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>
+#include <cstdio>
- using namespace boost;
+ #include "namespaces.hh"
+diff -uNr pdns-3.0/pdns/rcpgenerator.cc pdns-3.0.new/pdns/rcpgenerator.cc
+--- pdns-3.0/pdns/rcpgenerator.cc 2011-07-22 13:23:22.000000000 +0200
++++ pdns-3.0.new/pdns/rcpgenerator.cc 2011-11-28 11:59:22.501841684 +0100
+@@ -22,6 +22,7 @@
+ #include <boost/lexical_cast.hpp>
+ #include <boost/algorithm/string.hpp>
+ #include <iostream>
++#include <cstdio>
+ #include "base32.hh"
+ #include "base64.hh"
+ #include "namespaces.hh"
================================================================
Index: packages/pdns/pdns-int16.patch
diff -u packages/pdns/pdns-int16.patch:1.4 packages/pdns/pdns-int16.patch:1.5
--- packages/pdns/pdns-int16.patch:1.4 Sat Feb 7 19:56:14 2009
+++ packages/pdns/pdns-int16.patch Mon Nov 28 13:24:14 2011
@@ -1,5 +1,30 @@
---- pdns-2.9.22/modules/ldapbackend/powerldap.hh~ 2009-02-07
19:46:56.713653002 +0100
-+++ pdns-2.9.22/modules/ldapbackend/powerldap.hh 2009-02-07
19:47:40.993231763 +0100
+diff -uNr pdns-3.0/modules/ldapbackend/ldapbackend.cc
pdns-3.0.new/modules/ldapbackend/ldapbackend.cc
+--- pdns-3.0/modules/ldapbackend/ldapbackend.cc 2011-07-22
13:23:22.000000000 +0200
++++ pdns-3.0.new/modules/ldapbackend/ldapbackend.cc 2011-11-28
11:55:30.704283338 +0100
+@@ -434,7 +434,7 @@
+ continue;
+ }
+
+- rr.priority =
(uint16_t) strtoul( (content.substr( 0, first )).c_str(), &endptr, 10 );
++ rr.priority =
(u_int16_t) strtoul( (content.substr( 0, first )).c_str(), &endptr, 10 );
+ if( *endptr != '\0' )
+ {
+ L <<
Logger::Warning << m_myname << " Invalid " << attrname << " without priority
for " << m_qname << ": " << content << endl;
+diff -uNr pdns-3.0/modules/ldapbackend/powerldap.cc
pdns-3.0.new/modules/ldapbackend/powerldap.cc
+--- pdns-3.0/modules/ldapbackend/powerldap.cc 2011-07-22 13:23:22.000000000
+0200
++++ pdns-3.0.new/modules/ldapbackend/powerldap.cc 2011-11-28
11:55:46.355019073 +0100
+@@ -4,7 +4,7 @@
+
+
+
+-PowerLDAP::PowerLDAP( const string& hosts, uint16_t port, bool tls )
++PowerLDAP::PowerLDAP( const string& hosts, u_int16_t port, bool tls )
+ {
+ d_ld = 0;
+ d_hosts = hosts;
+diff -uNr pdns-3.0/modules/ldapbackend/powerldap.hh
pdns-3.0.new/modules/ldapbackend/powerldap.hh
+--- pdns-3.0/modules/ldapbackend/powerldap.hh 2011-07-22 13:23:22.000000000
+0200
++++ pdns-3.0.new/modules/ldapbackend/powerldap.hh 2011-11-28
11:54:08.347077606 +0100
@@ -18,7 +18,7 @@
*/
@@ -9,39 +34,12 @@
#include <map>
#include <string>
#include <vector>
-diff -Nur pdns-2.9.21.1.orig/modules/ldapbackend/ldapbackend.cc
pdns-2.9.21.1.int16/modules/ldapbackend/ldapbackend.cc
---- pdns-2.9.21.1.orig/modules/ldapbackend/ldapbackend.cc 2007-04-21
07:56:36.000000000 -0600
-+++ pdns-2.9.21.1.int16/modules/ldapbackend/ldapbackend.cc 2008-10-06
10:08:55.000000000 -0600
-@@ -433,7 +433,7 @@
- continue;
- }
-
-- rr.priority =
(uint16_t) strtoul( (content.substr( 0, first )).c_str(), &endptr, 10 );
-+ rr.priority =
(u_int16_t) strtoul( (content.substr( 0, first )).c_str(), &endptr, 10 );
- if( *endptr != '\0' )
- {
- L <<
Logger::Warning << m_myname << " Invalid " << attrname << " without priority
for " << m_qname << ": " << content << endl;
-diff -Nur pdns-2.9.21.1.orig/modules/ldapbackend/powerldap.cc
pdns-2.9.21.1.int16/modules/ldapbackend/powerldap.cc
---- pdns-2.9.21.1.orig/modules/ldapbackend/powerldap.cc 2007-04-21
07:56:36.000000000 -0600
-+++ pdns-2.9.21.1.int16/modules/ldapbackend/powerldap.cc 2008-10-06
10:08:55.000000000 -0600
-@@ -2,7 +2,7 @@
-
-
-
--PowerLDAP::PowerLDAP( const string& hosts, uint16_t port, bool tls )
-+PowerLDAP::PowerLDAP( const string& hosts, u_int16_t port, bool tls )
- {
- int protocol = LDAP_VERSION3;
-
-diff -Nur pdns-2.9.21.1.orig/modules/ldapbackend/powerldap.hh
pdns-2.9.21.1.int16/modules/ldapbackend/powerldap.hh
---- pdns-2.9.21.1.orig/modules/ldapbackend/powerldap.hh 2007-04-21
07:56:36.000000000 -0600
-+++ pdns-2.9.21.1.int16/modules/ldapbackend/powerldap.hh 2008-10-06
10:11:53.000000000 -0600
-@@ -78,7 +74,7 @@
- typedef map<string, vector<string> > sentry_t;
- typedef vector<sentry_t> sresult_t;
-
-- PowerLDAP( const string& hosts = "ldap://127.0.0.1/";, uint16_t port =
LDAP_PORT, bool tls = false );
-+ PowerLDAP( const string& hosts = "ldap://127.0.0.1/";, u_int16_t port =
LDAP_PORT, bool tls = false );
- ~PowerLDAP();
+@@ -69,7 +69,7 @@
+ typedef map<string, vector<string> > sentry_t;
+ typedef vector<sentry_t> sresult_t;
+
+- PowerLDAP( const string& hosts = "ldap://127.0.0.1/";, uint16_t port =
LDAP_PORT, bool tls = false );
++ PowerLDAP( const string& hosts = "ldap://127.0.0.1/";, u_int16_t port
= LDAP_PORT, bool tls = false );
+ ~PowerLDAP();
- void getOption( int option, int* value );
+ void getOption( int option, int* value );
================================================================
Index: packages/pdns/pdns-openldap-2.3.patch
diff -u packages/pdns/pdns-openldap-2.3.patch:1.1
packages/pdns/pdns-openldap-2.3.patch:1.2
--- packages/pdns/pdns-openldap-2.3.patch:1.1 Wed Jan 18 01:06:14 2006
+++ packages/pdns/pdns-openldap-2.3.patch Mon Nov 28 13:24:14 2011
@@ -1,11 +1,12 @@
---- pdns-2.9.19/modules/ldapbackend/powerldap.hh~ 2006-01-18
00:55:23.000000000 +0100
-+++ pdns-2.9.19/modules/ldapbackend/powerldap.hh 2006-01-18
01:03:42.000000000 +0100
+diff -uNr pdns-3.0/modules/ldapbackend/powerldap.hh
pdns-3.0.new/modules/ldapbackend/powerldap.hh
+--- pdns-3.0/modules/ldapbackend/powerldap.hh 2011-07-22 13:23:22.000000000
+0200
++++ pdns-3.0.new/modules/ldapbackend/powerldap.hh 2011-11-28
11:50:02.192161656 +0100
@@ -27,6 +27,8 @@
- #include <stdexcept>
+ #include <inttypes.h>
#include <errno.h>
#include <lber.h>
+
+#define LDAP_DEPRECATED 1
#include <ldap.h>
-
+ #ifdef HAVE_CONFIG_H
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pdns/gcc4.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pdns/pdns-int16.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pdns/pdns-openldap-2.3.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
