Differences from squid-2.6.STABLE21 to squid-2.6.STABLE21-20080721
diff -ruN squid-2.6.STABLE21/configure squid-2.6.STABLE21-20080721/configure
--- squid-2.6.STABLE21/configure	2008-06-27 15:55:39.000000000 -0600
+++ squid-2.6.STABLE21-20080721/configure	2008-07-21 14:54:08.000000000 -0600
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Revision: 1.416.2.27 .
+# From configure.in Revision: 1.416.2.29 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Squid Web Proxy 2.6.STABLE21.
+# Generated by GNU Autoconf 2.61 for Squid Web Proxy 2.6.STABLE21-20080721.
 #
 # Report bugs to <http://www.squid-cache.org/bugs/>.
 #
@@ -575,8 +575,8 @@
 # Identity of this package.
 PACKAGE_NAME='Squid Web Proxy'
 PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='2.6.STABLE21'
-PACKAGE_STRING='Squid Web Proxy 2.6.STABLE21'
+PACKAGE_VERSION='2.6.STABLE21-20080721'
+PACKAGE_STRING='Squid Web Proxy 2.6.STABLE21-20080721'
 PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
 
 ac_default_prefix=/usr/local/squid
@@ -1314,7 +1314,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Squid Web Proxy 2.6.STABLE21 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 2.6.STABLE21-20080721 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1384,7 +1384,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE21:";;
+     short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE21-20080721:";;
    esac
   cat <<\_ACEOF
 
@@ -1662,7 +1662,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Squid Web Proxy configure 2.6.STABLE21
+Squid Web Proxy configure 2.6.STABLE21-20080721
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1676,7 +1676,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Squid Web Proxy $as_me 2.6.STABLE21, which was
+It was created by Squid Web Proxy $as_me 2.6.STABLE21-20080721, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2349,7 +2349,7 @@
 
 # Define the identity of the package.
  PACKAGE='squid'
- VERSION='2.6.STABLE21'
+ VERSION='2.6.STABLE21-20080721'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5229,10 +5229,16 @@
 	if test -z "$buildmodel"; then
 		echo "WARNING: No suitable build environment found for large files. Trying to use _FILE_OFFSET_BITS=64"
 		sleep 1
-		CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
 	fi
 fi
-if test -n "$buildmodel" && test "$buildmodel" != "default"; then
+case "$buildmodel" in
+"default"|"")
+	if test $needlargefiles; then
+		echo "Enabling -D_FILE_OFFSET_BITS=64 for large file support"
+		CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
+	fi
+	;;
+*)
 	echo "Using $buildmodel build environment"
 	if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
 	    : # All fine
@@ -5263,7 +5269,8 @@
 	    *)
 		;;
 	esac
-fi
+	;;
+esac
 
 # Check whether --enable-linux-tproxy was given.
 if test "${enable_linux_tproxy+set}" = set; then
@@ -24458,6 +24465,7 @@
 
 
 
+
 for ac_func in \
 	bcopy \
 	backtrace_symbols_fd \
@@ -24491,6 +24499,7 @@
 	regexec \
 	regfree \
 	res_init \
+	__res_init \
 	rint \
 	sbrk \
 	select \
@@ -27276,7 +27285,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Squid Web Proxy $as_me 2.6.STABLE21, which was
+This file was extended by Squid Web Proxy $as_me 2.6.STABLE21-20080721, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27329,7 +27338,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Squid Web Proxy config.status 2.6.STABLE21
+Squid Web Proxy config.status 2.6.STABLE21-20080721
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -ruN squid-2.6.STABLE21/configure.in squid-2.6.STABLE21-20080721/configure.in
--- squid-2.6.STABLE21/configure.in	2008-06-27 15:55:39.000000000 -0600
+++ squid-2.6.STABLE21-20080721/configure.in	2008-07-21 14:54:08.000000000 -0600
@@ -1,16 +1,16 @@
 dnl
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.416.2.27 2008/06/27 21:26:34 hno Exp $
+dnl  $Id: configure.in,v 1.416.2.29 2008/07/21 20:49:10 hno Exp $
 dnl
 dnl
 dnl
-AC_INIT(Squid Web Proxy, 2.6.STABLE21, http://www.squid-cache.org/bugs/, squid)
+AC_INIT(Squid Web Proxy, 2.6.STABLE21-20080721, http://www.squid-cache.org/bugs/, squid)
 AC_PREREQ(2.52)
 AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE
-AC_REVISION($Revision: 1.416.2.27 $)dnl
+AC_REVISION($Revision: 1.416.2.29 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1063,10 +1063,16 @@
 	if test -z "$buildmodel"; then
 		echo "WARNING: No suitable build environment found for large files. Trying to use _FILE_OFFSET_BITS=64"
 		sleep 1
-		CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
 	fi
 fi
-if test -n "$buildmodel" && test "$buildmodel" != "default"; then
+case "$buildmodel" in
+"default"|"")
+	if test $needlargefiles; then
+		echo "Enabling -D_FILE_OFFSET_BITS=64 for large file support"
+		CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
+	fi
+	;;
+*)
 	echo "Using $buildmodel build environment"
 	if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
 	    : # All fine
@@ -1108,7 +1114,8 @@
 	    *)
 		;;
 	esac
-fi
+	;;
+esac
 
 dnl Enable Linux transparent proxy support
 AC_ARG_ENABLE(linux-tproxy,
@@ -2351,6 +2358,7 @@
 	regexec \
 	regfree \
 	res_init \
+	__res_init \
 	rint \
 	sbrk \
 	select \
diff -ruN squid-2.6.STABLE21/include/autoconf.h.in squid-2.6.STABLE21-20080721/include/autoconf.h.in
--- squid-2.6.STABLE21/include/autoconf.h.in	2007-09-01 18:14:59.000000000 -0600
+++ squid-2.6.STABLE21-20080721/include/autoconf.h.in	2008-07-21 14:53:57.000000000 -0600
@@ -597,6 +597,9 @@
 /* Define if you have PSAPI.DLL on Windows systems */
 #undef HAVE_WIN32_PSAPI
 
+/* Define to 1 if you have the `__res_init' function. */
+#undef HAVE___RES_INIT
+
 /* Some systems support __va_copy */
 #undef HAVE___VA_COPY
 
diff -ruN squid-2.6.STABLE21/include/version.h squid-2.6.STABLE21-20080721/include/version.h
--- squid-2.6.STABLE21/include/version.h	2008-06-27 15:55:39.000000000 -0600
+++ squid-2.6.STABLE21-20080721/include/version.h	2001-08-31 05:19:09.000000000 -0600
@@ -9,5 +9,5 @@
  */
 
 #ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1214603735
+#define SQUID_RELEASE_TIME squid_curtime
 #endif
diff -ruN squid-2.6.STABLE21/src/client_side.c squid-2.6.STABLE21-20080721/src/client_side.c
--- squid-2.6.STABLE21/src/client_side.c	2008-06-27 15:06:39.000000000 -0600
+++ squid-2.6.STABLE21-20080721/src/client_side.c	2008-07-21 14:48:45.000000000 -0600
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.693.2.22 2008/06/27 21:06:39 hno Exp $
+ * $Id: client_side.c,v 1.693.2.24 2008/07/21 20:48:45 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -92,6 +92,7 @@
 #endif
 
 #if LINUX_NETFILTER
+#include <linux/types.h>
 #include <linux/netfilter_ipv4.h>
 #endif
 
@@ -4458,7 +4459,7 @@
     static int pffd = -1;
     static time_t last_reported = 0;
     if (pffd < 0) {
-	pffd = open("/dev/pf", O_RDWR);
+	pffd = open("/dev/pf", O_RDONLY);
 	if (pffd >= 0)
 	    commSetCloseOnExec(pffd);
     }
diff -ruN squid-2.6.STABLE21/src/dnsserver.c squid-2.6.STABLE21-20080721/src/dnsserver.c
--- squid-2.6.STABLE21/src/dnsserver.c	2006-05-22 15:19:48.000000000 -0600
+++ squid-2.6.STABLE21-20080721/src/dnsserver.c	2008-07-21 14:49:10.000000000 -0600
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dnsserver.c,v 1.62 2006/05/22 21:19:48 serassio Exp $
+ * $Id: dnsserver.c,v 1.62.2.1 2008/07/21 20:49:10 hno Exp $
  *
  * DEBUG: section 0     DNS Resolver
  * AUTHOR: Harvest Derived
@@ -142,7 +142,7 @@
 #include "util.h"
 #include "snprintf.h"
 
-#if !defined(_SQUID_AIX_) && !defined(_SQUID_MSWIN_)
+#if !defined(_SQUID_AIX_) && !defined(_SQUID_MSWIN_) && !defined(h_errno)
 extern int h_errno;
 #endif
 
@@ -150,6 +150,16 @@
 extern int _dns_ttl_;		/* this is a really *dirty* hack - bne */
 #endif
 
+/*
+ * res_init() is a macro re-definition of __res_init on: Debian
+ */
+#if !defined(HAVE_RES_INIT) && defined(HAVE___RES_INIT)
+#ifndef res_init
+#define res_init  __res_init
+#endif
+#define HAVE_RES_INIT   HAVE___RES_INIT
+#endif
+
 #ifdef _SQUID_NEXT_
 /* This is a really bloody hack. frank@langen.bull.de
  * Workaround bug in gethostbyname which sets h_errno wrong
@@ -167,7 +177,7 @@
 #endif
 
 /* error messages from gethostbyname() */
-static char *
+static const char *
 my_h_msgs(int x)
 {
     if (x == HOST_NOT_FOUND)
diff -ruN squid-2.6.STABLE21/src/forward.c squid-2.6.STABLE21-20080721/src/forward.c
--- squid-2.6.STABLE21/src/forward.c	2008-04-01 19:16:29.000000000 -0600
+++ squid-2.6.STABLE21-20080721/src/forward.c	2008-07-21 14:48:45.000000000 -0600
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.c,v 1.120.2.5 2008/04/02 01:16:29 hno Exp $
+ * $Id: forward.c,v 1.120.2.6 2008/07/21 20:48:45 hno Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -37,6 +37,7 @@
 #include "squid.h"
 
 #if LINUX_NETFILTER
+#include <linux/types.h>
 #include <linux/netfilter_ipv4.h>
 #endif
 #if LINUX_TPROXY
