diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2011-09-10 12:38:06 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2011-09-10 12:38:06 +0000 |
| commit | 1852e911c2665b75288a10369ced3049154b88c3 (patch) | |
| tree | ceb7fe52e6fc2816ebfd170c68dbeda817269f65 /net-dns/bind | |
| parent | Always depend on openbox-9999 to avoid nasty compilation problems due to API ... (diff) | |
| download | gentoo-2-1852e911c2665b75288a10369ced3049154b88c3.tar.gz gentoo-2-1852e911c2665b75288a10369ced3049154b88c3.tar.bz2 gentoo-2-1852e911c2665b75288a10369ced3049154b88c3.zip | |
Fix dlz linking, bug 382269, thanks to Todd Goodman <tsg@bonedaddy.net>.
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'net-dns/bind')
| -rw-r--r-- | net-dns/bind/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/bind/bind-9.8.1.ebuild | 5 | ||||
| -rw-r--r-- | net-dns/bind/files/bind-9.8.1-sdlz_helper.patch | 22 |
3 files changed, 31 insertions, 2 deletions
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index bf3b8d134303..dae4f31ef8e1 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dns/bind # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.352 2011/09/10 09:17:02 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.353 2011/09/10 12:38:06 idl0r Exp $ + + 10 Sep 2011; Christian Ruppert <idl0r@gentoo.org> bind-9.8.1.ebuild, + +files/bind-9.8.1-sdlz_helper.patch: + Fix dlz linking, bug 382269, thanks to Todd Goodman <tsg@bonedaddy.net>. *bind-9.7.4 (10 Sep 2011) diff --git a/net-dns/bind/bind-9.8.1.ebuild b/net-dns/bind/bind-9.8.1.ebuild index 34f09e829740..c98043aeac18 100644 --- a/net-dns/bind/bind-9.8.1.ebuild +++ b/net-dns/bind/bind-9.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.1.ebuild,v 1.3 2011/09/02 16:07:24 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.1.ebuild,v 1.4 2011/09/10 12:38:06 idl0r Exp $ # Re dlz/mysql and threads, needs to be verified.. # MySQL uses thread local storage in its C api. Thus MySQL @@ -96,6 +96,9 @@ src_prepare() { done if use dlz; then + # bug 382269 + epatch "${FILESDIR}/${P}-sdlz_helper.patch" + # 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/) if use mysql && has_version ">=dev-db/mysql-5"; then diff --git a/net-dns/bind/files/bind-9.8.1-sdlz_helper.patch b/net-dns/bind/files/bind-9.8.1-sdlz_helper.patch new file mode 100644 index 000000000000..7ee1d1584dea --- /dev/null +++ b/net-dns/bind/files/bind-9.8.1-sdlz_helper.patch @@ -0,0 +1,22 @@ +Index: contrib/dlz/drivers/sdlz_helper.c +=================================================================== +RCS file: /proj/cvs/prod/bind9/contrib/dlz/drivers/sdlz_helper.c,v +retrieving revision 1.3 +diff -u -r1.3 sdlz_helper.c +--- contrib/dlz/drivers/sdlz_helper.c 14 May 2010 06:29:37 -0000 1.3 ++++ contrib/dlz/drivers/sdlz_helper.c 5 Sep 2011 17:31:30 -0000 +@@ -50,8 +50,6 @@ + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +-#ifdef DLZ +- + #include <config.h> + + #include <dns/log.h> +@@ -527,5 +525,3 @@ + + return isc_mem_strdup(mctx, value); + } +- +-#endif |