diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2013-03-28 21:45:20 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2013-03-28 21:45:20 +0000 |
| commit | 04d81bc6ee9f71f86c74bc09c4e6015e2aca62e2 (patch) | |
| tree | 2d479a70e93eedc34deb81433056c97d0106cde8 /net-dns | |
| parent | Bumping php 5.5 to beta2. Also does proper install of opcache using ext and e... (diff) | |
| download | gentoo-2-04d81bc6ee9f71f86c74bc09c4e6015e2aca62e2.tar.gz gentoo-2-04d81bc6ee9f71f86c74bc09c4e6015e2aca62e2.tar.bz2 gentoo-2-04d81bc6ee9f71f86c74bc09c4e6015e2aca62e2.zip | |
Fix libxml-2.9.x detection, bug 463626
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/bind/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/bind/bind-9.9.2_p1-r1.ebuild | 5 | ||||
| -rw-r--r-- | net-dns/bind/files/bind-9.9.2_p1-libxml.patch | 28 |
3 files changed, 37 insertions, 2 deletions
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index 659212df79dc..8410b729a388 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dns/bind # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.441 2013/02/28 22:45:55 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.442 2013/03/28 21:45:20 idl0r Exp $ + + 28 Mar 2013; Christian Ruppert <idl0r@gentoo.org> bind-9.9.2_p1-r1.ebuild, + +files/bind-9.9.2_p1-libxml.patch: + Fix libxml-2.9.x detection, bug 463626 *bind-9.9.2_p1-r1 (28 Feb 2013) *bind-9.8.4_p1 (28 Feb 2013) diff --git a/net-dns/bind/bind-9.9.2_p1-r1.ebuild b/net-dns/bind/bind-9.9.2_p1-r1.ebuild index ddf2c737c35a..f5e7453fbb8d 100644 --- a/net-dns/bind/bind-9.9.2_p1-r1.ebuild +++ b/net-dns/bind/bind-9.9.2_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2_p1-r1.ebuild,v 1.1 2013/02/28 22:45:55 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2_p1-r1.ebuild,v 1.2 2013/03/28 21:45:20 idl0r Exp $ # Re dlz/mysql and threads, needs to be verified.. # MySQL uses thread local storage in its C api. Thus MySQL @@ -107,6 +107,9 @@ src_prepare() { "${i}" || die "sed failed, ${i} doesn't exist" done + # Fix libxml-2.9.x detection, bug 463626 + epatch "${FILESDIR}/${P}-libxml.patch" + if use dlz; then # bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse # (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/) diff --git a/net-dns/bind/files/bind-9.9.2_p1-libxml.patch b/net-dns/bind/files/bind-9.9.2_p1-libxml.patch new file mode 100644 index 000000000000..d07b09a696cf --- /dev/null +++ b/net-dns/bind/files/bind-9.9.2_p1-libxml.patch @@ -0,0 +1,28 @@ +From dcf14b1cba822f5c1a578ef25d02b7d1fc04a17b Mon Sep 17 00:00:00 2001 +From: Christian Ruppert <idl0r@gentoo.org> +Date: Thu, 28 Mar 2013 22:37:15 +0100 +Subject: [PATCH] Detect libxml-2.9.x properly + +https://bugs.gentoo.org/463626 + +Signed-off-by: Christian Ruppert <idl0r@gentoo.org> +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 9dafa48..1e743e4 100644 +--- a/configure.in ++++ b/configure.in +@@ -1321,7 +1321,7 @@ case "$use_libxml2" in + ;; + auto|yes) + case X`(xml2-config --version) 2>/dev/null` in +- X2.[[678]].*) ++ X2.[[6789]].*) + libxml2_libs=`xml2-config --libs` + libxml2_cflags=`xml2-config --cflags` + ;; +-- +1.8.1.5 + |