summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2009-01-22 18:11:21 +0000
committerSven Wegener <swegener@gentoo.org>2009-01-22 18:11:21 +0000
commit7d168d709fa19cbc9a09f4296f06686c9cdda8b1 (patch)
tree2cdebeee6daed3062f1de7ff28b460957cbb2945 /net-dns
parentUnmasking ~net-wireless/iwl3945-ucode-15.28.2.8 since it's good idea to use i... (diff)
downloadgentoo-2-7d168d709fa19cbc9a09f4296f06686c9cdda8b1.tar.gz
gentoo-2-7d168d709fa19cbc9a09f4296f06686c9cdda8b1.tar.bz2
gentoo-2-7d168d709fa19cbc9a09f4296f06686c9cdda8b1.zip
Fix zone2ldap, bug #253959.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/pdns/ChangeLog8
-rw-r--r--net-dns/pdns/files/2.9.21.2-zone2ldap.patch21
-rw-r--r--net-dns/pdns/pdns-2.9.21.2.ebuild16
3 files changed, 38 insertions, 7 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/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