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
commit620d6f0a779e5493132e3ae68590cacb8a0f8e9d (patch)
tree29a017c4bda000593d1ed104e5e860ad8365e90c /net-dns/pdns
parentCompile libpablio. (diff)
downloadhistorical-620d6f0a779e5493132e3ae68590cacb8a0f8e9d.tar.gz
historical-620d6f0a779e5493132e3ae68590cacb8a0f8e9d.tar.bz2
historical-620d6f0a779e5493132e3ae68590cacb8a0f8e9d.zip
Added small patch from upstream that fixes ldap compilation.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'net-dns/pdns')
-rw-r--r--net-dns/pdns/ChangeLog6
-rw-r--r--net-dns/pdns/Manifest11
-rw-r--r--net-dns/pdns/files/2.9.18-ldap-fix.patch42
-rw-r--r--net-dns/pdns/pdns-2.9.18.ebuild3
4 files changed, 55 insertions, 7 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/Manifest b/net-dns/pdns/Manifest
index 52b7a7557cb2..f98edbd64b96 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,8 +1,9 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 e8263be3e982f5ba81e7cf0946d1bc05 ChangeLog 2857
+MD5 2c4ef3eb030323d5d728bc9ca17e8bc8 ChangeLog 3023
MD5 90fb32e843326d14359c508cef855929 files/2.9.18-default-mysql-options.patch 606
+MD5 48d0e8119d1617f7ab3594f836cd98fb files/2.9.18-ldap-fix.patch 853
MD5 62a8267bd54fd7edf57908299088c96a files/digest-pdns-2.9.17 63
MD5 e59bb419d93a7d7bdcb13764c57b3f6d files/digest-pdns-2.9.18 63
MD5 60d7355f48410a77e8df555a089025cb files/pdns 889
@@ -11,11 +12,11 @@ MD5 558969af8e34a040723147fe14a53a44 files/precursor 488
MD5 bbb2b0b25869b840d8fa2d242a8b20c2 files/recursor.conf 392
MD5 56567ddcaf248499457a1ce74277c910 metadata.xml 573
MD5 172c916f2af3e12be9af6f65bc4ab881 pdns-2.9.17.ebuild 1313
-MD5 0bdc23f071fd86a859052a83d9a36374 pdns-2.9.18.ebuild 2302
+MD5 6aa35ca819deeb2ceb664c69d3c6c6ff pdns-2.9.18.ebuild 2345
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFC27mQI1lqEGTUzyQRAgwSAJ9ZolEDvuKVYnYNi0IFUtWUn4/zSgCg0Xgc
-orbDlpOeP81W0FEICu+Cm3I=
-=vav9
+iD8DBQFC3tspI1lqEGTUzyQRAvZ2AJ44yCozOeiwu7L7dwNfU6To3soyBACfYQ3O
++KTSVQ33Q8pYqjDTet/5Uxw=
+=AdA9
-----END PGP SIGNATURE-----
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() {