2 files changed, 5 insertions, 21 deletions

diff --git a/www/squid/files/icap-2.6-bootstrap.patch b/www/squid/files/icap-2.6-bootstrap.patch
index b8bdb7253f6a..34e333bcb79f 100644
--- a/www/squid/files/icap-2.6-bootstrap.patch
+++ b/www/squid/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: 2007-09-06
+Patch last updated: 2007-11-26
 
---- configure.orig	Thu Sep  6 00:25:42 2007
-+++ configure	Thu Sep  6 21:22:04 2007
+--- configure.orig	Mon Nov 26 14:39:31 2007
++++ configure	Mon Nov 26 19:46:14 2007
 @@ -728,6 +728,8 @@
  ENABLE_PINGER_FALSE
  USE_DELAY_POOLS_TRUE
@@ -43,8 +43,8 @@ Patch last updated: 2007-09-06
  
  # Define the identity of the package.
   PACKAGE='squid'
-- VERSION='2.6.STABLE16'
-+ VERSION='2.6.STABLE16+ICAP'
+- VERSION='2.6.STABLE17'
++ VERSION='2.6.STABLE17+ICAP'
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/www/squid/files/patch-src_cf_gen.c b/www/squid/files/patch-src_cf_gen.c
deleted file mode 100644
index bb6a31ea7338..000000000000
--- a/www/squid/files/patch-src_cf_gen.c
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/cf_gen.c
-===================================================================
-RCS file: /cvsroot/squid/squid/src/cf_gen.c,v
-retrieving revision 1.52
-diff -u -p -r1.52 cf_gen.c
---- src/cf_gen.c	6 Sep 2007 09:33:36 -0000	1.52
-+++ src/cf_gen.c	16 Sep 2007 17:57:24 -0000
-@@ -183,7 +183,7 @@ main(int argc, char *argv[])
- 	t = (Type *) xcalloc(1, sizeof(*t));
- 	t->name = xstrdup(type);
- 	while ((dep = strtok(NULL, WS)) != NULL) {
--	    TypeDep *d = (TypeDep *) xcalloc(1, sizeof(*dep));
-+	    TypeDep *d = (TypeDep *) xcalloc(1, sizeof(*d));
- 	    d->name = xstrdup(dep);
- 	    d->next = t->depend;
- 	    t->depend = d;