summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2005-07-20 23:15:40 +0000
committerSven Wegener <swegener@gentoo.org>2005-07-20 23:15:40 +0000
commit0f5b4ed8a3f6f34259a7accab7f30437a7c01912 (patch)
treea2cfdcf809781347b274c3e72719c94fca58c478 /net-dns/pdns
parentCompile libpablio. (diff)
downloadgentoo-2-0f5b4ed8a3f6f34259a7accab7f30437a7c01912.tar.gz
gentoo-2-0f5b4ed8a3f6f34259a7accab7f30437a7c01912.tar.bz2
gentoo-2-0f5b4ed8a3f6f34259a7accab7f30437a7c01912.zip
Added small patch from upstream that fixes ldap compilation.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-dns/pdns')
-rw-r--r--net-dns/pdns/ChangeLog6
-rw-r--r--net-dns/pdns/files/2.9.18-ldap-fix.patch42
-rw-r--r--net-dns/pdns/pdns-2.9.18.ebuild3
3 files changed, 49 insertions, 2 deletions
diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 21d0dc6c8522..add3185c2913 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dns/pdns
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.18 2005/07/18 14:15:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.19 2005/07/20 23:15:40 swegener Exp $
+
+ 20 Jul 2005; Sven Wegener <swegener@gentoo.org>
+ +files/2.9.18-ldap-fix.patch, pdns-2.9.18.ebuild:
+ Added small patch from upstream that fixes ldap compilation.
18 Jul 2005; Sven Wegener <swegener@gentoo.org> pdns-2.9.18.ebuild:
Marked stable on x86, security bug #99352.
diff --git a/net-dns/pdns/files/2.9.18-ldap-fix.patch b/net-dns/pdns/files/2.9.18-ldap-fix.patch
new file mode 100644
index 000000000000..15b0f86847a7
--- /dev/null
+++ b/net-dns/pdns/files/2.9.18-ldap-fix.patch
@@ -0,0 +1,42 @@
+Index: modules/ldapbackend/utils.hh
+===================================================================
+--- modules/ldapbackend/utils.hh (revision 452)
++++ modules/ldapbackend/utils.hh (revision 453)
+@@ -73,7 +73,7 @@
+ }
+
+
+-inline string ip2ptr4( string ip )
++inline string ip2ptr4( const string& ip )
+ {
+ string ptr;
+ vector<string> parts;
+@@ -89,7 +89,7 @@
+ }
+
+
+-inline string ip2ptr6( string ip )
++inline string ip2ptr6( const string& ip )
+ {
+ string ptr, part, defstr;
+ vector<string> parts;
+@@ -116,4 +116,19 @@
+ return ptr + "ip6.arpa";
+ }
+
++
++inline string strbind( const string& search, const string& replace, string subject )
++{
++ size_t pos = 0;
++
++
++ while( ( pos = subject.find( search, pos ) ) != string::npos )
++ {
++ subject.replace( pos, search.size(), replace );
++ pos += replace.size();
++ }
++
++ return subject;
++}
++
+ #endif
diff --git a/net-dns/pdns/pdns-2.9.18.ebuild b/net-dns/pdns/pdns-2.9.18.ebuild
index 734946ba8c27..fb1ea12711c8 100644
--- a/net-dns/pdns/pdns-2.9.18.ebuild
+++ b/net-dns/pdns/pdns-2.9.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.18.ebuild,v 1.4 2005/07/18 14:15:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.18.ebuild,v 1.5 2005/07/20 23:15:40 swegener Exp $
inherit eutils
@@ -29,6 +29,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${PV}-default-mysql-options.patch
+ epatch "${FILESDIR}"/${PV}-ldap-fix.patch
}
src_compile() {