---------------------
PatchSet 5812 
Date: 2007/09/21 09:08:24
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Fix fallout from actual FreeBSD compile tests.

 - FreeBSD 6.2 does not seem to provide _res_ext form IPv6 support
   on the native resolver

 - autoconf 2.59 contains a regression which blocks parametized macros
   ie AC_DEFINE([FOO(i)],[__bar = i],[goes all fubar])

Members: 
	NOTES-IPv6:1.1.2.67->1.1.2.68 
	bootstrap.sh:1.17.4.2->1.17.4.3 
	src/dnsserver.cc:1.7.4.20->1.7.4.21 

Index: squid3/NOTES-IPv6
===================================================================
RCS file: /cvsroot/squid-sf//squid3/Attic/NOTES-IPv6,v
retrieving revision 1.1.2.67
retrieving revision 1.1.2.68
diff -u -r1.1.2.67 -r1.1.2.68
--- squid3/NOTES-IPv6	11 Sep 2007 01:42:36 -0000	1.1.2.67
+++ squid3/NOTES-IPv6	21 Sep 2007 09:08:24 -0000	1.1.2.68
@@ -1,4 +1,4 @@
-$Id: NOTES-IPv6,v 1.1.2.67 2007/09/11 01:42:36 amosjeffries Exp $
+$Id: NOTES-IPv6,v 1.1.2.68 2007/09/21 09:08:24 amosjeffries Exp $
 
 NP: Any problems with this version of squid please contact
 	squid3@treenet.co.nz for assistance.
@@ -48,6 +48,13 @@
 	I've found the time to sort it out (I think) and it appears to be going
 	well enough for some detailed tests.
 
+2007-09-21:
+	Due to a regression bug in autoconf 2.59 some OS may encounter compilation errors
+	when IPv6 extensions are not available via _res_ext from the system native
+	DNS resolver. This can be resolved by upgrading to autoconf 2.61 or later.
+	Systems where _res_ext is provided should not encounter this problem.
+
+
 
 PROBLEM: Testers report that "using WebDAV against my Squid-accelerated Apache gives
 	 all sorts of odd timeouts" but tester unable to spend time tracing the cause.
Index: squid3/bootstrap.sh
===================================================================
RCS file: /cvsroot/squid-sf//squid3/bootstrap.sh,v
retrieving revision 1.17.4.2
retrieving revision 1.17.4.3
diff -u -r1.17.4.2 -r1.17.4.3
--- squid3/bootstrap.sh	22 Apr 2007 08:03:51 -0000	1.17.4.2
+++ squid3/bootstrap.sh	21 Sep 2007 09:08:24 -0000	1.17.4.3
@@ -7,7 +7,7 @@
 # Autotool versions preferred. To override either edit the script
 # to match the versions you want to use, or set the variables on
 # the command line like "env acver=.. amver=... ./bootstrap.sh"
-acversions="${acver:-2.59 2.57 2.53 2.52}"
+acversions="${acver:-2.61 2.57 2.53 2.52}"
 amversions="${amver:-1.9 1.7 1.6 1.5}"
 ltversions="${ltver:-1.5 1.4}"
 
Index: squid3/src/dnsserver.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/dnsserver.cc,v
retrieving revision 1.7.4.20
retrieving revision 1.7.4.21
diff -u -r1.7.4.20 -r1.7.4.21
--- squid3/src/dnsserver.cc	1 Sep 2007 01:25:15 -0000	1.7.4.20
+++ squid3/src/dnsserver.cc	21 Sep 2007 09:08:25 -0000	1.7.4.21
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dnsserver.cc,v 1.7.4.20 2007/09/01 01:25:15 amosjeffries Exp $
+ * $Id: dnsserver.cc,v 1.7.4.21 2007/09/21 09:08:25 amosjeffries Exp $
  *
  * DEBUG: section 0     DNS Resolver
  * AUTHOR: Harvest Derived
@@ -323,7 +323,9 @@
     char request[512];
     char *t = NULL;
     int c;
-#if defined(_SQUID_FREEBSD_)
+#if defined(_SQUID_FREEBSD_) && defined(_SQUID_RES_NSADDR6_COUNT)
+    /* Only seems to be valid on FreeBSD 5.5 where _res_ext was provided without an ns6addr counter! */
+    /* Gone again on FreeBSD 6.2 along with _res_ext itself in any form. */
     int ns6count = 0;
 #endif
 #if HAVE_RES_INIT