Fix zone2ldap, bug #253959.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 44 insertions, 12 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 1036fd5469ae..15a2b4671b42 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdns
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.58 2008/11/30 18:11:57 swegener Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.59 2009/01/22 18:11:21 swegener Exp $
+
+  22 Jan 2009; Sven Wegener <swegener@gentoo.org>
+  +files/2.9.21.2-zone2ldap.patch, pdns-2.9.21.2.ebuild:
+  Fix zone2ldap, bug #253959.
 
   30 Nov 2008; Sven Wegener <swegener@gentoo.org> -pdns-2.9.21.1.ebuild:
   Cleanup.
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index bf7ffbb55fb4..97343de78a12 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -4,15 +4,16 @@ Hash: SHA1
 AUX 2.9.18-default-mysql-options.patch 606 RMD160 bfc5e2aeee2bc3e01a62a430b087e7ca5742a85b SHA1 d265706bb723f1a878a65c7c0db59a88e67f0816 SHA256 228a6c42a11a2eab82b68f8c04d5881f8be39746010675feba7ebf16add18151
 AUX 2.9.20-ldap-deprecated.patch 457 RMD160 edcb367abfc83853e4739cc6646ca593ae7d5e9e SHA1 858cfe5e7169329f13dfb547c5ae8ff436eff64f SHA256 862728373669f7ea5544de7021c394cc0efa3ff5c65551d6657dad85cb654097
 AUX 2.9.21-gcc-4.3.patch 4762 RMD160 08fe799699d103b6aa422e00993fcd80789d0317 SHA1 4baa3ce459b88a7dbbb422291f04cfb0aabc58ca SHA256 a3f8f35f9403216de7e596eb3f6248ed148cee85bef44d6f40020b9f52a79e57
+AUX 2.9.21.2-zone2ldap.patch 718 RMD160 e2791e8c1773b19e5eefdfdbf40a66591d487e96 SHA1 d3e5e8a62632989a68f1a1b273101d3ee3589b8f SHA256 6664621aefa15658526e94c9fc7fc40324e0d5d7522d90729466da7b39f09bfc
 AUX pdns 1253 RMD160 f576dd3edda7b22155ebc2cb8c060459ba871471 SHA1 174beeed51f22fbe35f883b22465a94f6c569d85 SHA256 d4b1e4ae4330c8572ed8a9b16d3a1524d62f1380f22f33ba581aaf9599e44113
 DIST pdns-2.9.21.2.tar.gz 1008111 RMD160 e28a31c6816a382502124726a5fe9ac66dd2df94 SHA1 9088361071ddb6c2bd32eb90c6c166736e8a229d SHA256 04c7ea0024b96ec70ed73950b2394d3f45f03d5bc22448c68e073022b9c6e809
-EBUILD pdns-2.9.21.2.ebuild 2928 RMD160 246915367db43bb943f88fa8cdc872409d864266 SHA1 3f7c895eb14cbe0a0e0f9220ef132c3a0e9fde29 SHA256 c10e829c34aee517b893eb1ef62169bf75a99348e3f6fe2091f053739e3f9caf
-MISC ChangeLog 8743 RMD160 b451619381cc9c9f7d572b954f9ae979e39fa4aa SHA1 22ebe17feebf77ec441d12bb16aa268b75dcf838 SHA256 2ada1d72231eba95fe02f0e5464b427d259a791e6aa48a802577a150e48b4998
+EBUILD pdns-2.9.21.2.ebuild 2984 RMD160 f4c0c918d96116d3ec08730ed4e71e2940db5756 SHA1 8043f12def0c5b94ee868f3085b5b7b45268f69f SHA256 83446c6673e7c8e30f6f69e351211cae4459b932c976a7ebacd932d2510c5e58
+MISC ChangeLog 8881 RMD160 04775a2fafc93d16dbc2047a9feeb1ed28a503f6 SHA1 05a2177e47e85c049a4b0c614983df31548e5969 SHA256 218b36fc77b99ca115c8ccf3a00aa0b609fe7051b7cd4cdc30f403c3a45f9f17
 MISC metadata.xml 709 RMD160 01ea2530b412ec56a4a52196e7d08229386a927a SHA1 4883719a029bf18655e83f37b46420cb2921895e SHA256 b9bc7bbd88f60ed3e6e8e9784ee611755f3ddbc284e36fc09b5ce57089c79c3f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkky13kACgkQI1lqEGTUzyTYcQCglknCh0IEKJHwGJ0zT21d14zK
-vXUAnix5LgS1M6dxJAWcr6TbC/iH1Kij
-=K3c1
+iEYEARECAAYFAkl4ts8ACgkQI1lqEGTUzyQPGwCgqDL2coIp09+uXzHizCEY8AK9
+2e4Aniz1t6xsZOaVm9D/oUNVDugrkDdF
+=b/eT
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/files/2.9.21.2-zone2ldap.patch b/net-dns/pdns/files/2.9.21.2-zone2ldap.patch
new file mode 100644
index 000000000000..5689a4a05beb
--- /dev/null
+++ b/net-dns/pdns/files/2.9.21.2-zone2ldap.patch
@@ -0,0 +1,21 @@
+Index: pdns/pdns/backends/bind/zone2ldap.cc
+===================================================================
+--- pdns/pdns/backends/bind/zone2ldap.cc	(revision 1057)
++++ pdns/pdns/backends/bind/zone2ldap.cc	(revision 1058)
+@@ -27,6 +27,7 @@
+ #include "bindparser.hh"
+ #include "statbag.hh"
+ #include <boost/function.hpp>
++#include "dnsrecords.hh"
+ #include "misc.hh"
+ #include "dns.hh"
+ #include "zoneparser-tng.hh"
+@@ -155,7 +156,7 @@
+ #if __GNUC__ >= 3
+ 		ios_base::sync_with_stdio( false );
+ #endif
+-
++		reportAllTypes();
+ 		args.setCmd( "help", "Provide a helpful message" );
+ 		args.setSwitch( "verbose", "Verbose comments on operation" ) = "no";
+ 		args.setSwitch( "resume", "Continue after errors" ) = "no";
diff --git a/net-dns/pdns/pdns-2.9.21.2.ebuild b/net-dns/pdns/pdns-2.9.21.2.ebuild
index f487f167db92..e46fd5aad9e1 100644
--- a/net-dns/pdns/pdns-2.9.21.2.ebuild
+++ b/net-dns/pdns/pdns-2.9.21.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.21.2.ebuild,v 1.2 2008/11/19 22:21:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.21.2.ebuild,v 1.3 2009/01/22 18:11:21 swegener Exp $
+
+EAPI="2"
 
 inherit multilib eutils autotools
 
@@ -27,17 +29,18 @@ DEPEND="${DEPEND}
 	doc? ( app-doc/doxygen )"
 
 src_unpack() {
-	unpack ${A}
+	default
 	cd "${S}"
 
 	epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch
 	epatch "${FILESDIR}"/2.9.20-ldap-deprecated.patch
 	epatch "${FILESDIR}"/2.9.21-gcc-4.3.patch
+	epatch "${FILESDIR}"/2.9.21.2-zone2ldap.patch
 
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local modules="pipe geo" myconf=""
 
 	use mysql && modules="${modules} gmysql"
@@ -63,7 +66,10 @@ src_compile() {
 		$(use_enable static static-binaries) \
 		${myconf} \
 		|| die "econf failed"
-	emake || die "emake failed"
+}
+
+src_compile() {
+	default
 
 	if use doc
 	then