- Update to 2.6.STABLE14 plus three patches (see

   http://www.squid-cache.org/Versions/v2/2.6/changesets/ for details)
 - Add two new authentication helpers: DB and squid_kerb_auth
 - Add the website mirrors to the list of download sites as a last resort
   in case the distfiles do not make it to the FTP mirrors in time
 - Update the mirror server list a bit after checking with the official list
   at http://www.squid-cache.org/Download/mirrors.dyn
 - Stop handling the "WITH_DEBUG" case: bsd.port.mk handles this just fine
 - Add a new rc configuration variable "squid_pidfile" that defaults to
   $PREFIX/squid/logs/squid.pid, use this variable for $pidfile in
   the rc script and document it in the Squid default/example configuration
 - Update the ICAP-2.6-bootstrap patch to reflect changes in the Squid
   sources

Submitted by:	maintainer
PR:		ports/115453 (in followup)

7 files changed, 142 insertions, 85 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 0a74f0971cb6..f3603c4987f9 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -75,32 +75,38 @@
 #     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	squid
-PORTVERSION=	2.6.13
+PORTVERSION=	2.6.14
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://ftp.belnet.be/packages/squid/pub/%SUBDIR%/ \
 		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
 		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,} \
+		http://www.squid-cache.org/Versions/v2/2.6/ \
+		http://www3.us.squid-cache.org/Versions/v2/2.6/ \
+		http://www1.at.squid-cache.org/Versions/v2/2.6/ \
+		http://www2.nl.squid-cache.org/Versions/v2/2.6/ \
+		http://www1.ru.squid-cache.org/Versions/v2/2.6/ \
+		http://www1.uk.squid-cache.org/Versions/v2/2.6/ \
+		http://www1.jp.squid-cache.org/Versions/v2/2.6/ \
+		http://www2.tw.squid-cache.org/Versions/v2/2.6/
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.6.STABLE13
+DISTNAME=	squid-2.6.STABLE14
 DIST_SUBDIR=	squid2.6
 
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
-		http://www2.us.squid-cache.org/%SUBDIR%/ \
 		http://www3.us.squid-cache.org/%SUBDIR%/ \
 		http://www1.at.squid-cache.org/%SUBDIR%/ \
 		http://www2.nl.squid-cache.org/%SUBDIR%/ \
 		http://www1.ru.squid-cache.org/%SUBDIR%/ \
 		http://www1.uk.squid-cache.org/%SUBDIR%/ \
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
-		http://www1.tw.squid-cache.org/%SUBDIR%/
+		http://www2.tw.squid-cache.org/%SUBDIR%/
 PATCH_SITE_SUBDIR=	Versions/v2/2.6/changesets
-PATCHFILES=
+PATCHFILES=	11534.patch 11547.patch 11548.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
@@ -118,6 +124,7 @@ SQUID_GID?=	squid
 MAN8=		cachemgr.cgi.8 squid.8
 docs=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
 PORTDOCS=	${docs:T}
+PORTEXAMPLES=	passwd.sql
 SUB_FILES+=	pkg-deinstall pkg-install pkg-message
 SUB_LIST+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
 
@@ -175,10 +182,11 @@ error_files=	ERR_ACCESS_DENIED ERR_CACHE_ACCESS_DENIED \
 		ERR_SOCKET_FAILURE ERR_TOO_BIG ERR_UNSUP_REQ \
 		ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT
 
-libexec=	cachemgr.cgi digest_pw_auth diskd-daemon ip_user_check \
+libexec=	cachemgr.cgi digest_pw_auth diskd-daemon \
+		ip_user_check \
 		msnt_auth ncsa_auth ntlm_auth \
-		pam_auth smb_auth smb_auth.sh squid_session squid_unix_group \
-		wbinfo_group.pl
+		pam_auth smb_auth smb_auth.sh squid_db_auth squid_session \
+		squid_unix_group wbinfo_group.pl
 .if !defined(SQUID_CONFIGURE_ARGS) || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == ""
 libexec+=	unlinkd
 .endif
@@ -200,10 +208,11 @@ CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  \
 
 # Authentication methods and modules:
 
-basic_auth=	NCSA PAM MSNT SMB
+basic_auth=	DB NCSA PAM MSNT SMB
 digest_auth=	password
 external_acl=	ip_user session unix_group wbinfo_group
-MAN8+=		ncsa_auth.8 pam_auth.8 squid_session.8 squid_unix_group.8
+MAN8+=		ncsa_auth.8 pam_auth.8 squid_db_auth.8 squid_session.8 \
+		squid_unix_group.8
 .if defined(WITH_SQUID_LDAP_AUTH)
 USE_OPENLDAP=	yes
 CFLAGS+=	-I${LOCALBASE}/include
@@ -231,6 +240,12 @@ CONFIGURE_ARGS+=	--enable-auth="basic ntlm digest" \
 			--enable-digest-auth-helpers="${digest_auth}" \
 			--enable-external-acl-helpers="${external_acl}" \
 			--enable-ntlm-auth-helpers="SMB"
+.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
+# XXX This currently only works with heimdal from the base system,
+#     see files/patch-helpers_negotiate_auth-squid_kerb_auth_*
+CONFIGURE_ARGS+=	--enable-negotiate-auth-helpers="squid_kerb_auth"
+libexec+=	squid_kerb_auth
+.endif
 
 # Storage schemes:
 
@@ -352,10 +367,10 @@ CONFIGURE_ARGS+=	--disable-kqueue
 .if defined(WITH_SQUID_LARGEFILE)
 CONFIGURE_ARGS+=	--with-large-files --enable-large-cache-files
 .endif
-.if defined(WITH_SQUID_STACKTRACES) || defined(WITH_DEBUG)
+.if defined(WITH_SQUID_STACKTRACES)
 CONFIGURE_ARGS+=	--enable-stacktraces
 CFLAGS+=	-g
-STRIP=			""
+STRIP=
 .endif
 
 # Languages:
@@ -409,6 +424,8 @@ pre-su-install:
 	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
 .if defined(WITH_SQUID_PINGER)
 	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
 	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 1620a5eb8f2c..7ffa1e260b5d 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,3 +1,12 @@
-MD5 (squid2.6/squid-2.6.STABLE13.tar.bz2) = fdc4ece264b47bab1b112d8f6f842b8b
-SHA256 (squid2.6/squid-2.6.STABLE13.tar.bz2) = 894802914a63992d5c5cf7061e2f242fdefd09b4af79d84b217e977f9195fdad
-SIZE (squid2.6/squid-2.6.STABLE13.tar.bz2) = 1263229
+MD5 (squid2.6/squid-2.6.STABLE14.tar.bz2) = eadb138d48320df8b99349121159c6bf
+SHA256 (squid2.6/squid-2.6.STABLE14.tar.bz2) = dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a
+SIZE (squid2.6/squid-2.6.STABLE14.tar.bz2) = 1291509
+MD5 (squid2.6/11534.patch) = bbdda88fd922c0b08fa054354bef4f83
+SHA256 (squid2.6/11534.patch) = 9422fa99337e6b0dde8ce6930a663988640cf96a2e9457439d6156daf4f8748f
+SIZE (squid2.6/11534.patch) = 1187
+MD5 (squid2.6/11547.patch) = 91a09aa1afe524fec45938eba1b9ccaa
+SHA256 (squid2.6/11547.patch) = b9dc9ca5ed52287d1f7d96023b16ba3d2f761e95fdb86d45a953da7789d4635e
+SIZE (squid2.6/11547.patch) = 2504
+MD5 (squid2.6/11548.patch) = e82b317555fe58a6c550363fa6f4b5a4
+SHA256 (squid2.6/11548.patch) = 8e8ef65102aa56603dae9d7362a552d4de29701f9569dafd6ea6afe9e93e2ec1
+SIZE (squid2.6/11548.patch) = 1448
diff --git a/www/squid/files/icap-2.6-bootstrap.patch b/www/squid/files/icap-2.6-bootstrap.patch
index 97c7de88ce0a..dc4dfb6b305b 100644
--- a/www/squid/files/icap-2.6-bootstrap.patch
+++ b/www/squid/files/icap-2.6-bootstrap.patch
@@ -7,16 +7,16 @@ ICAP patchset.
 
 Please see icap-2.6-core.patch for further information.
 
-Patch last updated: 2007-05-17
+Patch last updated: 2007-07-16
 
---- configure.orig	Thu May 17 13:34:14 2007
-+++ configure	Thu May 17 13:35:15 2007
+--- configure.orig	Sun Jul 15 16:21:59 2007
++++ configure	Mon Jul 16 22:37:43 2007
 @@ -312,7 +312,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKGCONFIG CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE ENABLE_MINGW32SPECIFIC_TRUE ENABLE_MINGW32SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES NEED_DISKD_TRUE NEED_DISKD_FALSE USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE NEED_COSSDUMP_TRUE NEED_COSSDUMP_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE USE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKGCONFIG CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE ENABLE_MINGW32SPECIFIC_TRUE ENABLE_MINGW32SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES NEED_DISKD_TRUE NEED_DISKD_FALSE USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE NEED_COSSDUMP_TRUE NEED_COSSDUMP_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ICAP_TRUE USE_ICAP_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE USE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRNSTR_TRUE NEED_OWN_STRNSTR_FALSE NEED_OWN_STRCASESTR_TRUE NEED_OWN_STRCASESTR_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKGCONFIG CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE ENABLE_MINGW32SPECIFIC_TRUE ENABLE_MINGW32SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES NEED_DISKD_TRUE NEED_DISKD_FALSE USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE NEED_COSSDUMP_TRUE NEED_COSSDUMP_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE USE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE USE_DEVPOLL_TRUE USE_DEVPOLL_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKGCONFIG CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE ENABLE_MINGW32SPECIFIC_TRUE ENABLE_MINGW32SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES NEED_DISKD_TRUE NEED_DISKD_FALSE USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE NEED_COSSDUMP_TRUE NEED_COSSDUMP_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ICAP_TRUE USE_ICAP_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE USE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE USE_DEVPOLL_TRUE USE_DEVPOLL_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRNSTR_TRUE NEED_OWN_STRNSTR_FALSE NEED_OWN_STRCASESTR_TRUE NEED_OWN_STRCASESTR_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -28,16 +28,16 @@ Patch last updated: 2007-05-17
    --enable-useragent-log  Enable logging of User-Agent header
    --enable-referer-log    Enable logging of Referer header
    --disable-wccp          Disable Web Cache Coordination V1 Protocol
-@@ -1818,7 +1818,7 @@
+@@ -1819,7 +1820,7 @@
  
  # Define the identity of the package.
   PACKAGE='squid'
-- VERSION='2.6.STABLE13'
-+ VERSION='2.6.STABLE13+ICAP'
+- VERSION='2.6.STABLE14'
++ VERSION='2.6.STABLE14+ICAP'
  
  
  cat >>confdefs.h <<_ACEOF
-@@ -3954,6 +3955,40 @@
+@@ -3955,6 +3956,40 @@
  fi;
  
  
@@ -78,7 +78,7 @@ Patch last updated: 2007-05-17
  # Check whether --enable-useragent-log or --disable-useragent-log was given.
  if test "${enable_useragent_log+set}" = set; then
    enableval="$enable_useragent_log"
-@@ -15923,6 +15958,8 @@
+@@ -24144,6 +24179,8 @@
  
  
  
@@ -87,7 +87,7 @@ Patch last updated: 2007-05-17
  for ac_func in \
  	bcopy \
  	backtrace_symbols_fd \
-@@ -15971,6 +16008,8 @@
+@@ -24192,6 +24229,8 @@
  	srand48 \
  	srandom \
  	statfs \
@@ -96,7 +96,7 @@ Patch last updated: 2007-05-17
  	strsep \
  	strtoll \
  	sysconf \
-@@ -16430,6 +16469,52 @@
+@@ -24888,6 +24927,52 @@
  
  
  if false; then
@@ -149,7 +149,7 @@ Patch last updated: 2007-05-17
    NEED_OWN_STRSEP_TRUE=
    NEED_OWN_STRSEP_FALSE='#'
  else
-@@ -17947,6 +18032,20 @@
+@@ -26405,6 +26490,20 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -170,42 +170,31 @@ Patch last updated: 2007-05-17
  if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -18101,6 +18200,34 @@
+@@ -26559,17 +26658,17 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
+-if test -z "${NEED_OWN_SNPRINTF_TRUE}" && test -z "${NEED_OWN_SNPRINTF_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_SNPRINTF\" was never defined.
 +if test -z "${NEED_OWN_STRNSTR_TRUE}" && test -z "${NEED_OWN_STRNSTR_FALSE}"; then
 +  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${NEED_OWN_STRNSTR_TRUE}" && test -z "${NEED_OWN_STRNSTR_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
+ Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"NEED_OWN_SNPRINTF\" was never defined.
 +echo "$as_me: error: conditional \"NEED_OWN_STRNSTR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${NEED_OWN_STRCASESTR_TRUE}" && test -z "${NEED_OWN_STRCASESTR_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.
 +if test -z "${NEED_OWN_STRCASESTR_TRUE}" && test -z "${NEED_OWN_STRCASESTR_FALSE}"; then
 +  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -18766,6 +18893,8 @@
+-echo "$as_me: error: conditional \"NEED_OWN_STRSEP\" was never defined.
++echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -27235,6 +27334,8 @@
  s,@ENABLE_PINGER_FALSE@,$ENABLE_PINGER_FALSE,;t t
  s,@USE_DELAY_POOLS_TRUE@,$USE_DELAY_POOLS_TRUE,;t t
  s,@USE_DELAY_POOLS_FALSE@,$USE_DELAY_POOLS_FALSE,;t t
@@ -214,8 +203,8 @@ Patch last updated: 2007-05-17
  s,@USE_SNMP_TRUE@,$USE_SNMP_TRUE,;t t
  s,@USE_SNMP_FALSE@,$USE_SNMP_FALSE,;t t
  s,@SNMPLIB@,$SNMPLIB,;t t
-@@ -18599,6 +18728,10 @@
- s,@USE_KQUEUE_FALSE@,$USE_KQUEUE_FALSE,;t t
+@@ -27301,6 +27402,10 @@
+ s,@USE_DEVPOLL_FALSE@,$USE_DEVPOLL_FALSE,;t t
  s,@NEED_OWN_SNPRINTF_TRUE@,$NEED_OWN_SNPRINTF_TRUE,;t t
  s,@NEED_OWN_SNPRINTF_FALSE@,$NEED_OWN_SNPRINTF_FALSE,;t t
 +s,@NEED_OWN_STRNSTR_TRUE@,$NEED_OWN_STRNSTR_TRUE,;t t
@@ -225,9 +214,9 @@ Patch last updated: 2007-05-17
  s,@NEED_OWN_STRSEP_TRUE@,$NEED_OWN_STRSEP_TRUE,;t t
  s,@NEED_OWN_STRSEP_FALSE@,$NEED_OWN_STRSEP_FALSE,;t t
  s,@REGEXLIB@,$REGEXLIB,;t t
---- include/autoconf.h.in.orig Wed Jul 12 17:00:31 2006
-+++ include/autoconf.h.in	Sat Aug  5 16:18:25 2006
-@@ -454,6 +454,9 @@
+--- include/autoconf.h.in.orig	Sat Jun 23 23:51:56 2007
++++ include/autoconf.h.in	Mon Jul 16 22:21:25 2007
+@@ -457,6 +457,9 @@
  /* Define to 1 if you have the <stdlib.h> header file. */
  #undef HAVE_STDLIB_H
  
@@ -237,7 +226,7 @@ Patch last updated: 2007-05-17
  /* Define to 1 if you have the `strerror' function. */
  #undef HAVE_STRERROR
  
-@@ -463,6 +466,9 @@
+@@ -466,6 +469,9 @@
  /* Define to 1 if you have the <string.h> header file. */
  #undef HAVE_STRING_H
  
@@ -247,7 +236,7 @@ Patch last updated: 2007-05-17
  /* Define to 1 if you have the `strsep' function. */
  #undef HAVE_STRSEP
  
-@@ -587,6 +593,9 @@
+@@ -596,6 +602,9 @@
  
  /* Some systems support __va_copy */
  #undef HAVE___VA_COPY
@@ -257,8 +246,8 @@ Patch last updated: 2007-05-17
  
  /* By default (for now anyway) Squid includes options which allows the cache
     administrator to violate the HTTP protocol specification in terms of cache
---- lib/Makefile.in.orig Fri Sep 22 11:09:48 2006
-+++ lib/Makefile.in	Sat Sep 19 20:05:28 2006
+--- lib/Makefile.in.orig	Sat Jun 23 02:14:55 2007
++++ lib/Makefile.in	Mon Jul 16 22:21:39 2007
 @@ -62,20 +62,23 @@
  am__libmiscutil_a_SOURCES_DIST = Array.c base64.c getfullhostname.c \
  	hash.c heap.c html_quote.c iso3307.c md5.c radix.c rfc1035.c \
@@ -289,7 +278,7 @@ Patch last updated: 2007-05-17
  libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
  libntlmauth_a_AR = $(AR) $(ARFLAGS)
  libntlmauth_a_DEPENDENCIES = @LIBOBJS@
-@@ -190,6 +193,10 @@
+@@ -189,6 +192,10 @@
  NEED_OWN_MD5_TRUE = @NEED_OWN_MD5_TRUE@
  NEED_OWN_SNPRINTF_FALSE = @NEED_OWN_SNPRINTF_FALSE@
  NEED_OWN_SNPRINTF_TRUE = @NEED_OWN_SNPRINTF_TRUE@
@@ -300,7 +289,7 @@ Patch last updated: 2007-05-17
  NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@
  NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@
  NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
-@@ -229,6 +236,8 @@
+@@ -230,6 +237,8 @@
  USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@
  USE_EPOLL_FALSE = @USE_EPOLL_FALSE@
  USE_EPOLL_TRUE = @USE_EPOLL_TRUE@
@@ -309,7 +298,7 @@ Patch last updated: 2007-05-17
  USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@
  USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@
  USE_POLL_FALSE = @USE_POLL_FALSE@
-@@ -284,6 +293,10 @@
+@@ -287,6 +296,10 @@
  target_alias = @target_alias@
  @NEED_OWN_SNPRINTF_FALSE@SNPRINTFSOURCE = 
  @NEED_OWN_SNPRINTF_TRUE@SNPRINTFSOURCE = snprintf.c
@@ -320,7 +309,7 @@ Patch last updated: 2007-05-17
  @NEED_OWN_STRSEP_FALSE@STRSEPSOURCE = 
  @NEED_OWN_STRSEP_TRUE@STRSEPSOURCE = strsep.c
  @NEED_OWN_MD5_FALSE@MD5SOURCE = 
-@@ -328,6 +341,8 @@
+@@ -331,6 +344,8 @@
  	$(SNPRINTFSOURCE) \
  	splay.c \
  	Stack.c \
@@ -329,7 +318,7 @@ Patch last updated: 2007-05-17
  	$(STRSEPSOURCE) \
  	stub_memaccount.c \
  	util.c \
-@@ -443,6 +458,8 @@
+@@ -446,6 +461,8 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splay.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sspwin32.Po@am__quote@
@@ -338,8 +327,8 @@ Patch last updated: 2007-05-17
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stub_memaccount.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
--- src/Makefile.in.orig	Sat Nov  4 16:36:15 2006
-+++ src/Makefile.in	Sat Nov  4 16:36:27 2006
+--- src/Makefile.in.orig	Sat Jun 23 02:14:56 2007
++++ src/Makefile.in	Mon Jul 16 22:21:33 2007
 @@ -91,14 +91,15 @@
  	globals.h gopher.c helper.c htcp.c http.c HttpStatusLine.c \
  	HttpHdrCc.c HttpHdrRange.c HttpHdrContRange.c HttpHeader.c \
@@ -364,7 +353,7 @@ Patch last updated: 2007-05-17
  	store_digest.c store_dir.c store_key_md5.c store_log.c \
  	store_rebuild.c store_swapin.c store_swapmeta.c \
  	store_swapout.c structs.h tools.c typedefs.h unlinkd.c url.c \
-@@ -114,14 +115,17 @@
+@@ -115,14 +116,17 @@
  @USE_DNSSERVER_FALSE@am__objects_3 = dns_internal.$(OBJEXT)
  @USE_DNSSERVER_TRUE@am__objects_3 = dns.$(OBJEXT)
  @ENABLE_HTCP_TRUE@am__objects_4 = htcp.$(OBJEXT)
@@ -389,7 +378,7 @@ Patch last updated: 2007-05-17
  am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \
  	authenticate.$(OBJEXT) cache_cf.$(OBJEXT) \
  	CacheDigest.$(OBJEXT) cache_manager.$(OBJEXT) carp.$(OBJEXT) \
-@@ -136,27 +140,27 @@
+@@ -137,27 +141,27 @@
  	HttpHdrRange.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \
  	HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
  	HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \
@@ -440,7 +429,7 @@ Patch last updated: 2007-05-17
  NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@
  NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@
  NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
-@@ -321,6 +329,8 @@
+@@ -323,6 +331,8 @@
  USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@
  USE_EPOLL_FALSE = @USE_EPOLL_FALSE@
  USE_EPOLL_TRUE = @USE_EPOLL_TRUE@
@@ -449,7 +438,7 @@ Patch last updated: 2007-05-17
  USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@
  USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@
  USE_POLL_FALSE = @USE_POLL_FALSE@
-@@ -376,6 +386,8 @@
+@@ -378,6 +388,8 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -458,7 +447,7 @@ Patch last updated: 2007-05-17
  @USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c
  @USE_DNSSERVER_TRUE@DNSSOURCE = dns.c
  @USE_DNSSERVER_FALSE@DNSSERVER = 
-@@ -479,6 +491,7 @@
+@@ -483,6 +495,7 @@
  	HttpMsg.c \
  	HttpReply.c \
  	HttpRequest.c \
@@ -466,7 +455,7 @@ Patch last updated: 2007-05-17
  	icmp.c \
  	icp_v2.c \
  	icp_v3.c \
-@@ -791,6 +804,10 @@
+@@ -802,6 +815,10 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htcp.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@
diff --git a/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in b/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in
new file mode 100644
index 000000000000..ca72c3f2fdd0
--- /dev/null
+++ b/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in
@@ -0,0 +1,19 @@
+--- helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig	Mon Jul 16 20:40:58 2007
++++ helpers/negotiate_auth/squid_kerb_auth/Makefile.in	Mon Jul 16 20:44:52 2007
+@@ -264,12 +264,12 @@
+ #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+ 
+ # HEIMDAL
+-#KERBINC = -DHEIMDAL -I/usr/include/heimdal
+-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
++KERBINC = -DHEIMDAL -I/usr/include
++KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken -lcrypt -lcrypto
+ 
+ # MIT
+-KERBINC = 
+-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
++#KERBINC = 
++#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c b/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c
new file mode 100644
index 000000000000..14f2ac56e21a
--- /dev/null
+++ b/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c
@@ -0,0 +1,10 @@
+--- helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c.orig	Mon Jul 16 21:10:10 2007
++++ helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c	Mon Jul 16 21:10:35 2007
+@@ -31,6 +31,7 @@
+ #include <unistd.h>
+ #include <time.h>
+ #include <sys/time.h>
++#include <sys/param.h>
+ 
+ #include "base64.h"
+ #ifndef HAVE_SPNEGO
diff --git a/www/squid/files/patch-src-cf.data.pre b/www/squid/files/patch-src-cf.data.pre
index 98e99812e05a..6cb44428ed2b 100644
--- a/www/squid/files/patch-src-cf.data.pre
+++ b/www/squid/files/patch-src-cf.data.pre
@@ -1,6 +1,6 @@
---- src/cf.data.pre.orig	Thu Oct 12 22:48:48 2006
-+++ src/cf.data.pre	Wed Nov  8 18:56:47 2006
-@@ -1183,6 +1183,21 @@
+--- src/cf.data.pre.orig	Tue Jun 26 01:34:57 2007
++++ src/cf.data.pre	Mon Jul 16 20:02:21 2007
+@@ -1207,6 +1207,21 @@
  
  	Note that for coss, max-size must be less than COSS_MEMBUF_SZ
  	(hard coded at 1 MB).
@@ -22,7 +22,18 @@
  DOC_END
  
  NAME: logformat
-@@ -3280,12 +3295,12 @@
+@@ -1439,6 +1454,10 @@
+ LOC: Config.pidFilename
+ DOC_START
+ 	A filename to write the process-id to.  To disable, enter "none".
++
++	Note: If you change this setting, you need to set squid_pidfile
++	in /etc/rc.conf to reflect the new value. Please see
++	%%PREFIX%%/etc/rc.d/squid for details.
+ DOC_END
+ 
+ NAME: debug_options
+@@ -3275,12 +3294,12 @@
  
  NAME: cache_effective_user
  TYPE: string
diff --git a/www/squid/files/squid.in b/www/squid/files/squid.in
index b173aaa2bc7f..bd9483908ae6 100644
--- a/www/squid/files/squid.in
+++ b/www/squid/files/squid.in
@@ -9,7 +9,7 @@
 # Note:
 # Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
 # /etc/rc.conf.d/squid to make this script actually do something. There
-# you can also set squid_chdir, squid_user, and squid_flags.
+# you can also set squid_chdir, squid_pidfile, squid_user, and squid_flags.
 #
 # Please see squid(8), rc.conf(5) and rc(8) for further details.
 #
@@ -37,12 +37,14 @@ stop_cmd="squid_stop"
 
 load_rc_config ${name}
 
-squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
+squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"}
 squid_enable=${squid_enable:-"NO"}
 squid_flags=${squid_flags-"-D"}
+squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"}
 squid_user=${squid_user:-%%SQUID_UID%%}
 default_config=%%PREFIX%%/etc/squid/squid.conf
 
+pidfile=${squid_pidfile}
 required_dirs=${squid_chdir}
 
 # squid(8) will not start if ${default_config} is not present so try