Add patch to fix parsing of resolv.conf by host/dig, #231247

(Portage version: 2.2_rc2/cvs/Linux 2.6.25-gentoo-r6 x86_64)

3 files changed, 74 insertions, 2 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index a5ab49998bfa..f8e10a15b7d0 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.104 2008/07/20 09:40:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.105 2008/07/23 19:01:11 dertobi123 Exp $
+
+*bind-tools-9.5.0_p1-r1 (23 Jul 2008)
+
+  23 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/bind-tools-9.5.0_p1-lwconfig.patch, -bind-tools-9.5.0_p1.ebuild,
+  +bind-tools-9.5.0_p1-r1.ebuild:
+  Add patch to fix parsing of resolv.conf by host/dig, #231247
 
   20 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   -bind-tools-9.2.5.ebuild, -bind-tools-9.2.6.ebuild,
diff --git a/net-dns/bind-tools/bind-tools-9.5.0_p1.ebuild b/net-dns/bind-tools/bind-tools-9.5.0_p1-r1.ebuild
index c4f2e51f6d9f..4c84dcb393f5 100644
--- a/net-dns/bind-tools/bind-tools-9.5.0_p1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.5.0_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.5.0_p1.ebuild,v 1.1 2008/07/08 18:58:39 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.5.0_p1-r1.ebuild,v 1.1 2008/07/23 19:01:11 dertobi123 Exp $
 
 inherit flag-o-matic
 
@@ -33,6 +33,8 @@ src_unpack() {
 		cd -
 	}
 
+	epatch "${FILESDIR}"/${P}-lwconfig.patch
+
 	# bug #151839
 	sed -e \
 		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
diff --git a/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch b/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch
new file mode 100644
index 000000000000..7aa1d16e92cd
--- /dev/null
+++ b/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch
@@ -0,0 +1,63 @@
+--- lib/lwres/lwconfig.c.old	2007-06-20 01:47:22.000000000 +0200
++++ lib/lwres/lwconfig.c	2008-06-15 02:57:02.000000000 +0200
+@@ -175,13 +175,8 @@
+ 	REQUIRE(buffer != NULL);
+ 	REQUIRE(size > 0U);
+ 
+-	*p = '\0';
+-
+ 	ch = eatwhite(fp);
+ 
+-	if (ch == EOF)
+-		return (EOF);
+-
+ 	do {
+ 		*p = '\0';
+ 
+@@ -592,23 +587,37 @@
+ 		if (strlen(word) == 0U)
+ 			rval = LWRES_R_SUCCESS;
+ 		else if (strcmp(word, "nameserver") == 0)
+-			rval = lwres_conf_parsenameserver(ctx, fp);
++			rval = (stopchar != '\n')? /* fail instantly if EOL is reached */
++				lwres_conf_parsenameserver(ctx, fp)
++				: LWRES_R_FAILURE;
+ 		else if (strcmp(word, "lwserver") == 0)
+-			rval = lwres_conf_parselwserver(ctx, fp);
++			rval = (stopchar != '\n')?
++				lwres_conf_parselwserver(ctx, fp)
++				: LWRES_R_FAILURE;
+ 		else if (strcmp(word, "domain") == 0)
+-			rval = lwres_conf_parsedomain(ctx, fp);
++			rval = (stopchar != '\n')?
++				lwres_conf_parsedomain(ctx, fp)
++				: LWRES_R_FAILURE;
+ 		else if (strcmp(word, "search") == 0)
+-			rval = lwres_conf_parsesearch(ctx, fp);
++			rval = (stopchar != '\n')?
++				lwres_conf_parsesearch(ctx, fp)
++				: LWRES_R_FAILURE;
+ 		else if (strcmp(word, "sortlist") == 0)
+-			rval = lwres_conf_parsesortlist(ctx, fp);
++			rval = (stopchar != '\n')?
++				lwres_conf_parsesortlist(ctx, fp)
++				: LWRES_R_FAILURE;
+ 		else if (strcmp(word, "options") == 0)
+-			rval = lwres_conf_parseoption(ctx, fp);
++			rval = (stopchar != '\n')?
++				lwres_conf_parseoption(ctx, fp)
++				: LWRES_R_FAILURE;
+ 		else {
+ 			/* unrecognised word. Ignore entire line */
+ 			rval = LWRES_R_SUCCESS;
+-			stopchar = eatline(fp);
+-			if (stopchar == EOF) {
+-				break;
++			if (stopchar != '\n') { /* do not eat the next line */
++				stopchar = eatline(fp);
++				if (stopchar == EOF) {
++					break;
++				}
+ 			}
+ 		}
+ 		if (ret == LWRES_R_SUCCESS && rval != LWRES_R_SUCCESS)