- Update to 2.6.22

PR:		128251
Submitted by:	Thomas-Martin Seck <tmseck@web.de> (maintainer)

4 files changed, 171 insertions, 19 deletions

diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 773104fc9a7d..0a5aa1c03336 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -75,7 +75,7 @@
 #     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	squid
-PORTVERSION=	2.6.21
+PORTVERSION=	2.6.22
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
@@ -94,7 +94,7 @@ MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		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.STABLE21
+DISTNAME=	squid-2.6.STABLE22
 DIST_SUBDIR=	squid2.6
 
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
@@ -115,7 +115,7 @@ COMMENT=	HTTP Caching Proxy
 LATEST_LINK=	squid26
 
 DEPRECATED=	The 2.6 series is no longer actively maintained by the Squid developers
-EXPIRATION_DATE=	2008-12-31
+EXPIRATION_DATE=	2009-03-31
 
 CONFLICTS=	squid-2.[^6]* squid-3.* cacheboy-[0-9]*
 GNU_CONFIGURE=	yes
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index c3dfe810fdb0..a41450c64d0d 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -1,3 +1,3 @@
-MD5 (squid2.6/squid-2.6.STABLE21.tar.bz2) = 3a24e37ee2bc0c4721973ca6354d4aa4
-SHA256 (squid2.6/squid-2.6.STABLE21.tar.bz2) = d25dd7af33c31f0ecfe67aa92676678b0746e0226dc6eb6d9d37690816761801
-SIZE (squid2.6/squid-2.6.STABLE21.tar.bz2) = 1294517
+MD5 (squid2.6/squid-2.6.STABLE22.tar.bz2) = a55e29ad5ac26074b2f4bd9c3228763b
+SHA256 (squid2.6/squid-2.6.STABLE22.tar.bz2) = 92b067255b6b1b08ec009188fcd91003a8113f867b26bccbf6988cc7bee53e33
+SIZE (squid2.6/squid-2.6.STABLE22.tar.bz2) = 1295404
diff --git a/www/squid26/files/icap-2.6-bootstrap.patch b/www/squid26/files/icap-2.6-bootstrap.patch
index eddfbf3a856b..06111fed37d2 100644
--- a/www/squid26/files/icap-2.6-bootstrap.patch
+++ b/www/squid26/files/icap-2.6-bootstrap.patch
@@ -7,10 +7,10 @@ ICAP patchset.
 
 Please see icap-2.6-core.patch for further information.
 
-Patch last updated: 2008-06-29
+Patch last updated: 2008-10-20
 
---- configure.orig	2008-06-29 14:48:32.000000000 +0200
-+++ configure	2008-06-29 14:48:41.000000000 +0200
+--- configure.orig	2008-10-20 20:42:14.000000000 +0200
++++ configure	2008-10-20 20:42:58.000000000 +0200
 @@ -728,6 +728,8 @@
  ENABLE_PINGER_FALSE
  USE_DELAY_POOLS_TRUE
@@ -43,8 +43,8 @@ Patch last updated: 2008-06-29
  
  # Define the identity of the package.
   PACKAGE='squid'
-- VERSION='2.6.STABLE21'
-+ VERSION='2.6.STABLE21+ICAP'
+- VERSION='2.6.STABLE22'
++ VERSION='2.6.STABLE22+ICAP'
  
  
  cat >>confdefs.h <<_ACEOF
@@ -89,7 +89,7 @@ Patch last updated: 2008-06-29
  # Check whether --enable-useragent-log was given.
  if test "${enable_useragent_log+set}" = set; then
    enableval=$enable_useragent_log;  if test "$enableval" = "yes" ; then
-@@ -24861,6 +24902,8 @@
+@@ -24870,6 +24911,8 @@
  	srand48 \
  	srandom \
  	statfs \
@@ -98,7 +98,7 @@ Patch last updated: 2008-06-29
  	strsep \
  	strtoll \
  	sysconf \
-@@ -25566,6 +25609,52 @@
+@@ -25575,6 +25618,52 @@
  
  
  if false; then
@@ -151,7 +151,7 @@ Patch last updated: 2008-06-29
    NEED_OWN_STRSEP_TRUE=
    NEED_OWN_STRSEP_FALSE='#'
  else
-@@ -27156,6 +27245,20 @@
+@@ -27166,6 +27255,20 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -172,7 +172,7 @@ Patch last updated: 2008-06-29
  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
-@@ -27317,6 +27420,34 @@
+@@ -27327,6 +27430,34 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -207,7 +207,7 @@ Patch last updated: 2008-06-29
  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
-@@ -28063,6 +28194,8 @@
+@@ -28073,6 +28204,8 @@
  ENABLE_PINGER_FALSE!$ENABLE_PINGER_FALSE$ac_delim
  USE_DELAY_POOLS_TRUE!$USE_DELAY_POOLS_TRUE$ac_delim
  USE_DELAY_POOLS_FALSE!$USE_DELAY_POOLS_FALSE$ac_delim
@@ -216,7 +216,7 @@ Patch last updated: 2008-06-29
  USE_SNMP_TRUE!$USE_SNMP_TRUE$ac_delim
  USE_SNMP_FALSE!$USE_SNMP_FALSE$ac_delim
  SNMPLIB!$SNMPLIB$ac_delim
-@@ -28132,6 +28265,10 @@
+@@ -28142,6 +28275,10 @@
  USE_DEVPOLL_FALSE!$USE_DEVPOLL_FALSE$ac_delim
  NEED_OWN_SNPRINTF_TRUE!$NEED_OWN_SNPRINTF_TRUE$ac_delim
  NEED_OWN_SNPRINTF_FALSE!$NEED_OWN_SNPRINTF_FALSE$ac_delim
@@ -227,7 +227,7 @@ Patch last updated: 2008-06-29
  NEED_OWN_STRSEP_TRUE!$NEED_OWN_STRSEP_TRUE$ac_delim
  NEED_OWN_STRSEP_FALSE!$NEED_OWN_STRSEP_FALSE$ac_delim
  REGEXLIB!$REGEXLIB$ac_delim
-@@ -28142,7 +28279,7 @@
+@@ -28152,7 +28289,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
diff --git a/www/squid26/files/icap-2.6-core.patch b/www/squid26/files/icap-2.6-core.patch
index 50aafd4a4a51..2cbcc9e84618 100644
--- a/www/squid26/files/icap-2.6-core.patch
+++ b/www/squid26/files/icap-2.6-core.patch
@@ -18,13 +18,51 @@ and manually adapted because of changes in the Squid code base.
 See http://devel.squid-cache.org/icap/ for further information
 about the ICAP client project.
 
-Patch last updated: 2007-05-17
+Patch last updated: 2008-10-20
 
 Note: ICAP client support for Squid-2 is no longer supported by
       the Squid developers. This means that even known bugs in this
       code will not be fixed. If you need ICAP support please try
       Squid-3.
 
+Index: errors/Armenian/ERR_ICAP_FAILURE
+===================================================================
+RCS file: errors/Armenian/ERR_ICAP_FAILURE
+diff -N errors/Armenian/ERR_ICAP_FAILURE
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ errors/Armenian/ERR_ICAP_FAILURE	17 May 2006 17:57:59 -0000	1.1.14.1
+@@ -0,0 +1,31 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<HTML><HEAD>
++<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
++<STYLE type="text/css"><!--BODY{background-color:#ffffff; font-family:verdana,sans-serif}--></STYLE>
++</HEAD><BODY>
++<H1>ERROR</H1>
++<H2>The requested URL could not be retrieved</H2>
++<HR noshade size="1px">
++<P>
++While attempting to retrieve the URL:
++<A HREF="%U">%U</A>
++<P>
++the following error was encountered:
++<UL>
++<LI>
++<STRONG>
++ICAP protocol error.
++</STRONG>
++</UL>
++
++<P>
++<P>
++Some aspect of the ICAP communication failed. Possible problems:
++<UL>
++<LI>ICAP server is not reachable.
++<LI>Illegal response from ICAP server.
++</UL>
++</P>
++
++<P>Your cache administrator is <A HREF="mailto:%w">%w</A>. 
++
 Index: errors/Azerbaijani/ERR_ICAP_FAILURE
 ===================================================================
 RCS file: errors/Azerbaijani/ERR_ICAP_FAILURE
@@ -1167,6 +1205,120 @@ diff -N errors/Turkish/ERR_ICAP_FAILURE
 +
 +<P>Your cache administrator is <A HREF="mailto:%w">%w</A>. 
 +
+Index: errors/Ukrainian-1251/ERR_ICAP_FAILURE
+===================================================================
+RCS file: errors/Ukrainian-1251/ERR_ICAP_FAILURE
+diff -N errors/Ukrainian-1251/ERR_ICAP_FAILURE
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ errors/Ukrainian-1251/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
+@@ -0,0 +1,31 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<HTML><HEAD>
++<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
++<STYLE type="text/css"><!--BODY{background-color:#ffffff; font-family:verdana,sans-serif}--></STYLE>
++</HEAD><BODY>
++<H1>ERROR</H1>
++<H2>The requested URL could not be retrieved</H2>
++<HR noshade size="1px">
++<P>
++While attempting to retrieve the URL:
++<A HREF="%U">%U</A>
++<P>
++the following error was encountered:
++<UL>
++<LI>
++<STRONG>
++ICAP protocol error.
++</STRONG>
++</UL>
++
++<P>
++<P>
++Some aspect of the ICAP communication failed. Possible problems:
++<UL>
++<LI>ICAP server is not reachable.
++<LI>Illegal response from ICAP server.
++</UL>
++</P>
++
++<P>Your cache administrator is <A HREF="mailto:%w">%w</A>. 
++
+Index: errors/Ukrainian-koi8-u/ERR_ICAP_FAILURE
+===================================================================
+RCS file: errors/Ukrainian-koi8-u/ERR_ICAP_FAILURE
+diff -N errors/Ukrainian-koi8-u/ERR_ICAP_FAILURE
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ errors/Ukrainian-koi8-u/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
+@@ -0,0 +1,31 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<HTML><HEAD>
++<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
++<STYLE type="text/css"><!--BODY{background-color:#ffffff; font-family:verdana,sans-serif}--></STYLE>
++</HEAD><BODY>
++<H1>ERROR</H1>
++<H2>The requested URL could not be retrieved</H2>
++<HR noshade size="1px">
++<P>
++While attempting to retrieve the URL:
++<A HREF="%U">%U</A>
++<P>
++the following error was encountered:
++<UL>
++<LI>
++<STRONG>
++ICAP protocol error.
++</STRONG>
++</UL>
++
++<P>
++<P>
++Some aspect of the ICAP communication failed. Possible problems:
++<UL>
++<LI>ICAP server is not reachable.
++<LI>Illegal response from ICAP server.
++</UL>
++</P>
++
++<P>Your cache administrator is <A HREF="mailto:%w">%w</A>. 
++
+Index: errors/Ukrainian-utf8/ERR_ICAP_FAILURE
+===================================================================
+RCS file: errors/Ukrainian-utf8/ERR_ICAP_FAILURE
+diff -N errors/Ukrainian-utf8/ERR_ICAP_FAILURE
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ errors/Ukrainian-utf8/ERR_ICAP_FAILURE	17 May 2006 17:58:00 -0000	1.1.14.1
+@@ -0,0 +1,31 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<HTML><HEAD>
++<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
++<STYLE type="text/css"><!--BODY{background-color:#ffffff; font-family:verdana,sans-serif}--></STYLE>
++</HEAD><BODY>
++<H1>ERROR</H1>
++<H2>The requested URL could not be retrieved</H2>
++<HR noshade size="1px">
++<P>
++While attempting to retrieve the URL:
++<A HREF="%U">%U</A>
++<P>
++the following error was encountered:
++<UL>
++<LI>
++<STRONG>
++ICAP protocol error.
++</STRONG>
++</UL>
++
++<P>
++<P>
++Some aspect of the ICAP communication failed. Possible problems:
++<UL>
++<LI>ICAP server is not reachable.
++<LI>Illegal response from ICAP server.
++</UL>
++</P>
++
++<P>Your cache administrator is <A HREF="mailto:%w">%w</A>. 
++
 Index: include/util.h
 ===================================================================
 RCS file: /cvsroot/squid/squid/include/util.h,v