From delphij@tarsier.delphij.net  Mon Aug 13 05:50:17 2007
Return-Path: <delphij@tarsier.delphij.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3CD116A418
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Aug 2007 05:50:16 +0000 (UTC)
	(envelope-from delphij@tarsier.delphij.net)
Received: from tarsier.geekcn.org (tarsier.geekcn.org [210.51.165.229])
	by mx1.freebsd.org (Postfix) with ESMTP id AD23A13C46E
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Aug 2007 05:50:16 +0000 (UTC)
	(envelope-from delphij@tarsier.delphij.net)
Received: from localhost (tarsier.geekcn.org [210.51.165.229])
	by tarsier.geekcn.org (Postfix) with ESMTP id 37809EB1246;
	Mon, 13 Aug 2007 13:50:15 +0800 (CST)
Received: from tarsier.geekcn.org ([210.51.165.229])
	by localhost (mail.geekcn.org [210.51.165.229]) (amavisd-new, port 10024)
	with ESMTP id IFnGwkoa3-+K; Mon, 13 Aug 2007 13:50:04 +0800 (CST)
Received: from tarsier.delphij.net (tarsier.freebsd.org.cn [210.51.165.232])
	by tarsier.geekcn.org (Postfix) with ESMTP id E4FA3EB0C6D;
	Mon, 13 Aug 2007 13:50:01 +0800 (CST)
Received: by tarsier.delphij.net (Postfix, from userid 1001)
	id B053128449; Mon, 13 Aug 2007 13:50:01 +0800 (CST)
Message-Id: <20070813055001.B053128449@tarsier.delphij.net>
Date: Mon, 13 Aug 2007 13:50:01 +0800 (CST)
From: Xin LI <delphij@FreeBSD.org>
Reply-To: Xin LI <delphij@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tmseck@netcologne.de
Subject: [PATCH] Update www/squid to 2.6.14
X-Send-Pr-Version: 3.113
X-GNATS-Notify: tmseck@netcologne.de delphij@FreeBSD.org

>Number:         115453
>Category:       ports
>Synopsis:       [PATCH] Update www/squid to 2.6.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 13 06:00:02 GMT 2007
>Closed-Date:    Tue Aug 14 02:32:29 GMT 2007
>Last-Modified:  Tue Aug 14 02:40:01 GMT 2007
>Originator:     Xin LI
>Release:        FreeBSD 6.2-RELEASE-p7 i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD tarsier.delphij.net 6.2-RELEASE-p7 FreeBSD 6.2-RELEASE-p7 #5: Thu Aug 2 22:09:50 CST 2007 delphij@tarsier.delphij.net:/usr/obj/usr/src/sys/TARSIER i386


>Description:
>How-To-Repeat:
>Fix:


--- patch-squid-2614 begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/squid/Makefile,v
retrieving revision 1.199
diff -u -p -r1.199 Makefile
--- Makefile	25 May 2007 01:52:12 -0000	1.199
+++ Makefile	13 Aug 2007 05:41:04 -0000
@@ -75,9 +75,10 @@
 #     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%/ \
+MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.6/ \
+		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%/ \
@@ -87,7 +88,7 @@ MASTER_SITES=	ftp://ftp.squid-cache.org/
 		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 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%/ \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/squid/distinfo,v
retrieving revision 1.154
diff -u -p -r1.154 distinfo
--- distinfo	25 May 2007 01:52:12 -0000	1.154
+++ distinfo	13 Aug 2007 05:44:21 -0000
@@ -1,3 +1,3 @@
-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
--- patch-squid-2614 ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->delphij 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Aug 13 06:00:12 UTC 2007 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115453 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Aug 13 06:00:20 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115453 

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115453: [PATCH] Update www/squid to 2.6.14
Date: Mon, 13 Aug 2007 20:40:47 +0200

 --oyUTqETQ0mS9luUI
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Sorry for the delay -- I had the port ready for submission but waited
 for the distfiles to show up on the FTP mirrors -- and managed to forget
 about it. Please accept my apologies.
 
 Summary:
 
 - 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
 
 Added files:
 
 files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in
 files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c
 
 --oyUTqETQ0mS9luUI
 Content-Type: text/x-diff; charset=us-ascii
 Content-Description: squid-update.diff
 Content-Disposition: attachment; filename="squid-update.diff"
 Content-Transfer-Encoding: quoted-printable
 
 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- Makefile	(.../www/squid)	(revision 1214)
 +++ Makefile	(.../local/squid)	(revision 1214)
 @@ -75,32 +75,38 @@
  #     Enable experimental multicast notification of cachemisses.
 =20
  PORTNAME=3D	squid
 -PORTVERSION=3D	2.6.13
 +PORTVERSION=3D	2.6.14
  CATEGORIES=3D	www
  MASTER_SITES=3D	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=3D	squid-2/STABLE
 -DISTNAME=3D	squid-2.6.STABLE13
 +DISTNAME=3D	squid-2.6.STABLE14
  DIST_SUBDIR=3D	squid2.6
 =20
  PATCH_SITES=3D	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=3D	Versions/v2/2.6/changesets
 -PATCHFILES=3D
 +PATCHFILES=3D	11534.patch 11547.patch 11548.patch
  PATCH_DIST_STRIP=3D	-p1
 =20
  MAINTAINER=3D	tmseck@netcologne.de
 @@ -118,6 +124,7 @@
  MAN8=3D		cachemgr.cgi.8 squid.8
  docs=3D		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
  PORTDOCS=3D	${docs:T}
 +PORTEXAMPLES=3D	passwd.sql
  SUB_FILES+=3D	pkg-deinstall pkg-install pkg-message
  SUB_LIST+=3D	SQUID_UID=3D${SQUID_UID} SQUID_GID=3D${SQUID_GID}
 =20
 @@ -175,10 +182,11 @@
  		ERR_SOCKET_FAILURE ERR_TOO_BIG ERR_UNSUP_REQ \
  		ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT
 =20
 -libexec=3D	cachemgr.cgi digest_pw_auth diskd-daemon ip_user_check \
 +libexec=3D	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-u=
 nlinkd*} =3D=3D ""
  libexec+=3D	unlinkd
  .endif
 @@ -200,10 +208,11 @@
 =20
  # Authentication methods and modules:
 =20
 -basic_auth=3D	NCSA PAM MSNT SMB
 +basic_auth=3D	DB NCSA PAM MSNT SMB
  digest_auth=3D	password
  external_acl=3D	ip_user session unix_group wbinfo_group
 -MAN8+=3D		ncsa_auth.8 pam_auth.8 squid_session.8 squid_unix_group.8
 +MAN8+=3D		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=3D	yes
  CFLAGS+=3D	-I${LOCALBASE}/include
 @@ -231,6 +240,12 @@
  			--enable-digest-auth-helpers=3D"${digest_auth}" \
  			--enable-external-acl-helpers=3D"${external_acl}" \
  			--enable-ntlm-auth-helpers=3D"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+=3D	--enable-negotiate-auth-helpers=3D"squid_kerb_auth"
 +libexec+=3D	squid_kerb_auth
 +.endif
 =20
  # Storage schemes:
 =20
 @@ -352,10 +367,10 @@
  .if defined(WITH_SQUID_LARGEFILE)
  CONFIGURE_ARGS+=3D	--with-large-files --enable-large-cache-files
  .endif
 -.if defined(WITH_SQUID_STACKTRACES) || defined(WITH_DEBUG)
 +.if defined(WITH_SQUID_STACKTRACES)
  CONFIGURE_ARGS+=3D	--enable-stacktraces
  CFLAGS+=3D	-g
 -STRIP=3D			""
 +STRIP=3D
  .endif
 =20
  # Languages:
 @@ -409,6 +424,8 @@
  	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 =20
  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
 Index: distinfo
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- distinfo	(.../www/squid)	(revision 1214)
 +++ distinfo	(.../local/squid)	(revision 1214)
 @@ -1,3 +1,12 @@
 -MD5 (squid2.6/squid-2.6.STABLE13.tar.bz2) =3D fdc4ece264b47bab1b112d8f6f84=
 2b8b
 -SHA256 (squid2.6/squid-2.6.STABLE13.tar.bz2) =3D 894802914a63992d5c5cf7061=
 e2f242fdefd09b4af79d84b217e977f9195fdad
 -SIZE (squid2.6/squid-2.6.STABLE13.tar.bz2) =3D 1263229
 +MD5 (squid2.6/squid-2.6.STABLE14.tar.bz2) =3D eadb138d48320df8b99349121159=
 c6bf
 +SHA256 (squid2.6/squid-2.6.STABLE14.tar.bz2) =3D dcb0c10965430862721b675e2=
 f9f6a30819880e03124b5e9403bfce2c7f3b69a
 +SIZE (squid2.6/squid-2.6.STABLE14.tar.bz2) =3D 1291509
 +MD5 (squid2.6/11534.patch) =3D bbdda88fd922c0b08fa054354bef4f83
 +SHA256 (squid2.6/11534.patch) =3D 9422fa99337e6b0dde8ce6930a663988640cf96a=
 2e9457439d6156daf4f8748f
 +SIZE (squid2.6/11534.patch) =3D 1187
 +MD5 (squid2.6/11547.patch) =3D 91a09aa1afe524fec45938eba1b9ccaa
 +SHA256 (squid2.6/11547.patch) =3D b9dc9ca5ed52287d1f7d96023b16ba3d2f761e95=
 fdb86d45a953da7789d4635e
 +SIZE (squid2.6/11547.patch) =3D 2504
 +MD5 (squid2.6/11548.patch) =3D e82b317555fe58a6c550363fa6f4b5a4
 +SHA256 (squid2.6/11548.patch) =3D 8e8ef65102aa56603dae9d7362a552d4de29701f=
 9569dafd6ea6afe9e93e2ec1
 +SIZE (squid2.6/11548.patch) =3D 1448
 Index: files/squid.in
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/squid.in	(.../www/squid)	(revision 1214)
 +++ files/squid.in	(.../local/squid)	(revision 1214)
 @@ -9,7 +9,7 @@
  # Note:
  # Set "squid_enable=3Dyes" 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 @@
 =20
  load_rc_config ${name}
 =20
 -squid_chdir=3D${squid_chdir:-%%PREFIX%%/squid/logs}
 +squid_chdir=3D${squid_chdir:-"%%PREFIX%%/squid/logs"}
  squid_enable=3D${squid_enable:-"NO"}
  squid_flags=3D${squid_flags-"-D"}
 +squid_pidfile=3D${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"}
  squid_user=3D${squid_user:-%%SQUID_UID%%}
  default_config=3D%%PREFIX%%/etc/squid/squid.conf
 =20
 +pidfile=3D${squid_pidfile}
  required_dirs=3D${squid_chdir}
 =20
  # squid(8) will not start if ${default_config} is not present so try
 Index: files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in	(.../www=
 /squid)	(revision 0)
 +++ files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in	(.../loc=
 al/squid)	(revision 1214)
 @@ -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)
 +=20
 + # HEIMDAL
 +-#KERBINC =3D -DHEIMDAL -I/usr/include/heimdal
 +-#KERBLIBS =3D -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
 ++KERBINC =3D -DHEIMDAL -I/usr/include
 ++KERBLIBS =3D -lgssapi -lkrb5 -lcom_err -lasn1 -lroken -lcrypt -lcrypto
 +=20
 + # MIT
 +-KERBINC =3D=20
 +-KERBLIBS =3D -lgssapi_krb5 -lkrb5 -lcom_err
 ++#KERBINC =3D=20
 ++#KERBLIBS =3D -lgssapi_krb5 -lkrb5 -lcom_err
 + all: all-am
 +=20
 + .SUFFIXES:
 Index: files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c	(.=
 ../www/squid)	(revision 0)
 +++ files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c	(.=
 ../local/squid)	(revision 1214)
 @@ -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>
 +=20
 + #include "base64.h"
 + #ifndef HAVE_SPNEGO
 Index: files/patch-src-cf.data.pre
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-src-cf.data.pre	(.../www/squid)	(revision 1214)
 +++ files/patch-src-cf.data.pre	(.../local/squid)	(revision 1214)
 @@ -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 @@
  =20
   	Note that for coss, max-size must be less than COSS_MEMBUF_SZ
   	(hard coded at 1 MB).
 @@ -22,8 +22,19 @@
   DOC_END
  =20
   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
  =20
 + NAME: debug_options
 +@@ -3275,12 +3294,12 @@
 +=20
   NAME: cache_effective_user
   TYPE: string
  -DEFAULT: nobody
 Index: files/icap-2.6-bootstrap.patch
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/icap-2.6-bootstrap.patch	(.../www/squid)	(revision 1214)
 +++ files/icap-2.6-bootstrap.patch	(.../local/squid)	(revision 1214)
 @@ -7,16 +7,16 @@
 =20
  Please see icap-2.6-core.patch for further information.
 =20
 -Patch last updated: 2007-05-17
 +Patch last updated: 2007-07-16
 =20
 ---- 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"
  =20
 --ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAG=
 E_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_trans=
 form_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir local=
 statedir libdir includedir oldincludedir infodir mandir build_alias host_al=
 ias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCR=
 IPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHE=
 ADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AW=
 K SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAI=
 NTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT =
 DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMOD=
 E 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_MINGW32=
 SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_M=
 ALLOC 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_F=
 ALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_SNMP_TRUE USE_SNMP_FALS=
 E SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE EN=
 ABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANG=
 UAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER=
 _TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIB=
 S BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_H=
 ELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UN=
 LINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR A=
 R_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB USE_POLL_TRUE USE_PO=
 LL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE US=
 E_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE USE_SELECT_WIN32_TRUE USE_SELE=
 CT_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 LIB=
 REGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS'
 -+ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAG=
 E_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_trans=
 form_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir local=
 statedir libdir includedir oldincludedir infodir mandir build_alias host_al=
 ias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCR=
 IPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHE=
 ADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AW=
 K SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAI=
 NTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT =
 DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMOD=
 E 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_MINGW32=
 SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_M=
 ALLOC 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_F=
 ALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ICAP_TRUE USE_ICAP_FALS=
 E 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_L=
 EAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AU=
 TH_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_LBE=
 R LIB_DB USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SE=
 LECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE U=
 SE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALS=
 E 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 X=
 TRA_LIBS LTLIBOBJS'
 +-ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAG=
 E_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_trans=
 form_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir local=
 statedir libdir includedir oldincludedir infodir mandir build_alias host_al=
 ias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCR=
 IPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHE=
 ADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AW=
 K SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAI=
 NTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT =
 DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMOD=
 E 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_MINGW32=
 SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_M=
 ALLOC 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_F=
 ALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_SNMP_TRUE USE_SNMP_FALS=
 E SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE EN=
 ABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANG=
 UAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER=
 _TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIB=
 S BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_H=
 ELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UN=
 LINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR A=
 R_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB USE_POLL_TRUE USE_PO=
 LL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE US=
 E_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE USE_SELECT_WIN32_TRUE USE_SELE=
 CT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE USE_DEVPOLL_TRUE USE_DEVPOL=
 L_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE=
  NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBO=
 BJS'
 ++ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAG=
 E_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_trans=
 form_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir local=
 statedir libdir includedir oldincludedir infodir mandir build_alias host_al=
 ias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCR=
 IPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHE=
 ADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AW=
 K SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAI=
 NTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT =
 DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMOD=
 E 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_MINGW32=
 SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_M=
 ALLOC 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_F=
 ALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ICAP_TRUE USE_ICAP_FALS=
 E 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_L=
 EAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AU=
 TH_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_LBE=
 R LIB_DB USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SE=
 LECT_TRUE USE_SELECT_FALSE USE_SELECT_SIMPLE_TRUE USE_SELECT_SIMPLE_FALSE U=
 SE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALS=
 E USE_DEVPOLL_TRUE USE_DEVPOLL_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRIN=
 TF_FALSE NEED_OWN_STRNSTR_TRUE NEED_OWN_STRNSTR_FALSE NEED_OWN_STRCASESTR_T=
 RUE NEED_OWN_STRCASESTR_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE RE=
 GEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS'
   ac_subst_files=3D''
  =20
   # Initialize some variables set by options.
 @@ -28,16 +28,16 @@
     --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 @@
  =20
   # Define the identity of the package.
    PACKAGE=3D'squid'
 -- VERSION=3D'2.6.STABLE13'
 -+ VERSION=3D'2.6.STABLE13+ICAP'
 +- VERSION=3D'2.6.STABLE14'
 ++ VERSION=3D'2.6.STABLE14+ICAP'
  =20
  =20
   cat >>confdefs.h <<_ACEOF
 -@@ -3954,6 +3955,40 @@
 +@@ -3955,6 +3956,40 @@
   fi;
  =20
  =20
 @@ -78,7 +78,7 @@
   # Check whether --enable-useragent-log or --disable-useragent-log was giv=
 en.
   if test "${enable_useragent_log+set}" =3D set; then
     enableval=3D"$enable_useragent_log"
 -@@ -15923,6 +15958,8 @@
 +@@ -24144,6 +24179,8 @@
  =20
  =20
  =20
 @@ -87,7 +87,7 @@
   for ac_func in \
   	bcopy \
   	backtrace_symbols_fd \
 -@@ -15971,6 +16008,8 @@
 +@@ -24192,6 +24229,8 @@
   	srand48 \
   	srandom \
   	statfs \
 @@ -96,7 +96,7 @@
   	strsep \
   	strtoll \
   	sysconf \
 -@@ -16430,6 +16469,52 @@
 +@@ -24888,6 +24927,52 @@
  =20
  =20
   if false; then
 @@ -149,7 +149,7 @@
     NEED_OWN_STRSEP_TRUE=3D
     NEED_OWN_STRSEP_FALSE=3D'#'
   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 @@
   if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then
     { { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never def=
 ined.
   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_FA=
 LSE}"; 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_FALS=
 E}"; then
  +  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRNSTR\" was n=
 ever 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_STRNSTR_TRUE}" && test -z "${NEED_OWN_STRNSTR_FALS=
 E}"; then
 -+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRNSTR\" was n=
 ever 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
 + 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 ne=
 ver defined.
  +if test -z "${NEED_OWN_STRCASESTR_TRUE}" && test -z "${NEED_OWN_STRCASEST=
 R_FALSE}"; then
  +  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" wa=
 s never defined.
 -+Usually this means the macro was only invoked conditionally." >&5
 -+echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never define=
 d.
 -+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_STRCASEST=
 R_FALSE}"; then
 -+  { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRCASESTR\" wa=
 s never defined.
 -+Usually this means the macro was only invoked conditionally." >&5
 -+echo "$as_me: error: conditional \"NEED_OWN_STRCASESTR\" was never define=
 d.
 -+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 ne=
 ver 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 define=
 d.
 + 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 @@
   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 @@
   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
  =20
 @@ -237,7 +226,7 @@
   /* Define to 1 if you have the `strerror' function. */
   #undef HAVE_STRERROR
  =20
 -@@ -463,6 +466,9 @@
 +@@ -466,6 +469,9 @@
   /* Define to 1 if you have the <string.h> header file. */
   #undef HAVE_STRING_H
  =20
 @@ -247,7 +236,7 @@
   /* Define to 1 if you have the `strsep' function. */
   #undef HAVE_STRSEP
  =20
 -@@ -587,6 +593,9 @@
 +@@ -596,6 +602,9 @@
  =20
   /* Some systems support __va_copy */
   #undef HAVE___VA_COPY
 @@ -257,8 +246,8 @@
  =20
   /* By default (for now anyway) Squid includes options which allows the ca=
 che
      administrator to violate the HTTP protocol specification in terms of c=
 ache
 ---- 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 =3D 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 @@
   libmiscutil_a_OBJECTS =3D $(am_libmiscutil_a_OBJECTS)
   libntlmauth_a_AR =3D $(AR) $(ARFLAGS)
   libntlmauth_a_DEPENDENCIES =3D @LIBOBJS@
 -@@ -190,6 +193,10 @@
 +@@ -189,6 +192,10 @@
   NEED_OWN_MD5_TRUE =3D @NEED_OWN_MD5_TRUE@
   NEED_OWN_SNPRINTF_FALSE =3D @NEED_OWN_SNPRINTF_FALSE@
   NEED_OWN_SNPRINTF_TRUE =3D @NEED_OWN_SNPRINTF_TRUE@
 @@ -300,7 +289,7 @@
   NEED_OWN_STRSEP_FALSE =3D @NEED_OWN_STRSEP_FALSE@
   NEED_OWN_STRSEP_TRUE =3D @NEED_OWN_STRSEP_TRUE@
   NEGOTIATE_AUTH_HELPERS =3D @NEGOTIATE_AUTH_HELPERS@
 -@@ -229,6 +236,8 @@
 +@@ -230,6 +237,8 @@
   USE_DNSSERVER_TRUE =3D @USE_DNSSERVER_TRUE@
   USE_EPOLL_FALSE =3D @USE_EPOLL_FALSE@
   USE_EPOLL_TRUE =3D @USE_EPOLL_TRUE@
 @@ -309,7 +298,7 @@
   USE_KQUEUE_FALSE =3D @USE_KQUEUE_FALSE@
   USE_KQUEUE_TRUE =3D @USE_KQUEUE_TRUE@
   USE_POLL_FALSE =3D @USE_POLL_FALSE@
 -@@ -284,6 +293,10 @@
 +@@ -287,6 +296,10 @@
   target_alias =3D @target_alias@
   @NEED_OWN_SNPRINTF_FALSE@SNPRINTFSOURCE =3D=20
   @NEED_OWN_SNPRINTF_TRUE@SNPRINTFSOURCE =3D snprintf.c
 @@ -320,7 +309,7 @@
   @NEED_OWN_STRSEP_FALSE@STRSEPSOURCE =3D=20
   @NEED_OWN_STRSEP_TRUE@STRSEPSOURCE =3D strsep.c
   @NEED_OWN_MD5_FALSE@MD5SOURCE =3D=20
 -@@ -328,6 +341,8 @@
 +@@ -331,6 +344,8 @@
   	$(SNPRINTFSOURCE) \
   	splay.c \
   	Stack.c \
 @@ -329,7 +318,7 @@
   	$(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 @@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Po@am__quote@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stub_memaccount.Po@am__q=
 uote@
   @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 @@
   	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 =3D dns_internal.$(OBJEXT)
   @USE_DNSSERVER_TRUE@am__objects_3 =3D dns.$(OBJEXT)
   @ENABLE_HTCP_TRUE@am__objects_4 =3D htcp.$(OBJEXT)
 @@ -389,7 +378,7 @@
   am_squid_OBJECTS =3D 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 @@
   NEED_OWN_STRSEP_FALSE =3D @NEED_OWN_STRSEP_FALSE@
   NEED_OWN_STRSEP_TRUE =3D @NEED_OWN_STRSEP_TRUE@
   NEGOTIATE_AUTH_HELPERS =3D @NEGOTIATE_AUTH_HELPERS@
 -@@ -321,6 +329,8 @@
 +@@ -323,6 +331,8 @@
   USE_DNSSERVER_TRUE =3D @USE_DNSSERVER_TRUE@
   USE_EPOLL_FALSE =3D @USE_EPOLL_FALSE@
   USE_EPOLL_TRUE =3D @USE_EPOLL_TRUE@
 @@ -449,7 +438,7 @@
   USE_KQUEUE_FALSE =3D @USE_KQUEUE_FALSE@
   USE_KQUEUE_TRUE =3D @USE_KQUEUE_TRUE@
   USE_POLL_FALSE =3D @USE_POLL_FALSE@
 -@@ -376,6 +386,8 @@
 +@@ -378,6 +388,8 @@
   sharedstatedir =3D @sharedstatedir@
   sysconfdir =3D @sysconfdir@
   target_alias =3D @target_alias@
 @@ -458,7 +447,7 @@
   @USE_DNSSERVER_FALSE@DNSSOURCE =3D dns_internal.c
   @USE_DNSSERVER_TRUE@DNSSOURCE =3D dns.c
   @USE_DNSSERVER_FALSE@DNSSERVER =3D=20
 -@@ -479,6 +491,7 @@
 +@@ -483,6 +495,7 @@
   	HttpMsg.c \
   	HttpReply.c \
   	HttpRequest.c \
 @@ -466,7 +455,7 @@
   	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@
 
 --oyUTqETQ0mS9luUI--
State-Changed-From-To: feedback->closed 
State-Changed-By: delphij 
State-Changed-When: Tue Aug 14 02:31:57 UTC 2007 
State-Changed-Why:  
Maintainer patch committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115453 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115453: commit references a PR
Date: Tue, 14 Aug 2007 02:32:17 +0000 (UTC)

 delphij     2007-08-14 02:32:12 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/squid            Makefile distinfo 
     www/squid/files      icap-2.6-bootstrap.patch 
                          patch-src-cf.data.pre squid.in 
   Added files:
     www/squid/files      
                          patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in 
                          patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c 
   Log:
    - 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)
   
   Revision  Changes    Path
   1.200     +31 -14    ports/www/squid/Makefile
   1.155     +12 -3     ports/www/squid/distinfo
   1.3       +51 -62    ports/www/squid/files/icap-2.6-bootstrap.patch
   1.1       +19 -0     ports/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in (new)
   1.1       +10 -0     ports/www/squid/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c (new)
   1.4       +15 -4     ports/www/squid/files/patch-src-cf.data.pre
   1.3       +5 -3      ports/www/squid/files/squid.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
