Update to 2.6.STABLE17

PR:		ports/118430
Submitted by:	maintainer
This commit is contained in:
Xin LI 2007-12-11 19:24:36 +00:00
parent 81a6ee5f75
commit 2c42e822cc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=202957
4 changed files with 11 additions and 31 deletions

View File

@ -75,8 +75,7 @@
# Enable experimental multicast notification of cachemisses.
PORTNAME= squid
PORTVERSION= 2.6.16
PORTREVISION= 1
PORTVERSION= 2.6.17
CATEGORIES= www
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
@ -95,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.STABLE16
DISTNAME= squid-2.6.STABLE17
DIST_SUBDIR= squid2.6
PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
@ -107,7 +106,7 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www1.jp.squid-cache.org/%SUBDIR%/ \
http://www2.tw.squid-cache.org/%SUBDIR%/
PATCH_SITE_SUBDIR= Versions/v2/2.6/changesets
PATCHFILES= 11780.patch
PATCHFILES=
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

View File

@ -1,6 +1,3 @@
MD5 (squid2.6/squid-2.6.STABLE16.tar.bz2) = 849bee6f269e6c773f215fd4b41de0e3
SHA256 (squid2.6/squid-2.6.STABLE16.tar.bz2) = 9e306c885c4a37b1a57e2e8c0cdac5c90e4cffa2801e30f3c78b1cca880a62c7
SIZE (squid2.6/squid-2.6.STABLE16.tar.bz2) = 1293078
MD5 (squid2.6/11780.patch) = cad6a2343d93ef4127150d5837c9662b
SHA256 (squid2.6/11780.patch) = b28045f3d47b5d4ffcfc46d934ffe533480a3b8a4c47503336c5e0fe9b8dccec
SIZE (squid2.6/11780.patch) = 3732
MD5 (squid2.6/squid-2.6.STABLE17.tar.bz2) = e6face0dff4ea054d3ba94236eb56ea1
SHA256 (squid2.6/squid-2.6.STABLE17.tar.bz2) = e6aaa26b40c5310b4047460c7dec81d73ccb5b18d19be3d088d3de4334748bfd
SIZE (squid2.6/squid-2.6.STABLE17.tar.bz2) = 1303134

View File

@ -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

View File

@ -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;