Date: Wed, 24 Jan 2007 18:33:44 +0100 (CET) From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/108314: [Maintainer] www/squid26: update to 2.6.STABLE9 Message-ID: <200701241733.l0OHXiiX004699@hardy.tmseck.homedns.org> Resent-Message-ID: <200701241740.l0OHeFUJ086964@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108314 >Category: ports >Synopsis: [Maintainer] www/squid26: update to 2.6.STABLE9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jan 24 17:40:14 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of January 24, 2007. >Description: - Update to 2.6.STABLE9. - Update the ICAP core patchset to reflect changes in the Squid codebase. >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid26) (revision 1088) +++ Makefile (.../local/squid26) (revision 1088) @@ -75,7 +75,7 @@ # Enable experimental multicast notification of cachemisses. PORTNAME= squid -PORTVERSION= 2.6.7 +PORTVERSION= 2.6.9 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \ @@ -87,7 +87,7 @@ 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.STABLE7 +DISTNAME= squid-2.6.STABLE9 DIST_SUBDIR= squid2.6 PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ Index: distinfo =================================================================== --- distinfo (.../www/squid26) (revision 1088) +++ distinfo (.../local/squid26) (revision 1088) @@ -1,3 +1,3 @@ -MD5 (squid2.6/squid-2.6.STABLE7.tar.bz2) = 7e8eed297ceb4f3067c960d4c4d04e87 -SHA256 (squid2.6/squid-2.6.STABLE7.tar.bz2) = 86538b29cfe07955a3e7cf76693ec42dc6845dc8c4b8d9326e2d31ca07e13d29 -SIZE (squid2.6/squid-2.6.STABLE7.tar.bz2) = 1262361 +MD5 (squid2.6/squid-2.6.STABLE9.tar.bz2) = 95997d6cb38fdb562ecb790c553f9cfc +SHA256 (squid2.6/squid-2.6.STABLE9.tar.bz2) = 9cc204d41091642e480277af09872ae36097f9325cf62711d0a8ba125408b7ab +SIZE (squid2.6/squid-2.6.STABLE9.tar.bz2) = 1263060 Index: files/icap-2.6-core.patch =================================================================== --- files/icap-2.6-core.patch (.../www/squid26) (revision 1088) +++ files/icap-2.6-core.patch (.../local/squid26) (revision 1088) @@ -16,7 +16,7 @@ See http://devel.squid-cache.org/icap/ for further information about the ICAP client project. -Patch last updated: 2006-12-14 +Patch last updated: 2007-01-24 Index: errors/Azerbaijani/ERR_ICAP_FAILURE =================================================================== @@ -2694,19 +2694,14 @@ debug(17, 3) ("fwdComplete: %s\n\tstatus %d\n", storeUrl(e), e->mem_obj->reply->sline.status); Index: src/globals.h -=================================================================== -RCS file: /cvsroot/squid/squid/src/globals.h,v -retrieving revision 1.27 -retrieving revision 1.22.4.5 -diff -p -u -b -r1.27 -r1.22.4.5 ---- src/globals.h 25 Sep 2006 19:51:46 -0000 1.27 -+++ src/globals.h 26 Sep 2006 22:47:36 -0000 1.22.4.5 +--- src/globals.h.orig Fri Jan 19 01:19:26 2007 ++++ src/globals.h Wed Jan 24 17:15:33 2007 @@ -171,6 +171,9 @@ extern const char *external_acl_message; #if HAVE_SBRK extern void *sbrk_start; /* 0 */ #endif +#if HS_FEAT_ICAP -+extern char *icap_service_type_str[]; ++extern const char *icap_service_type_str[]; +#endif extern int opt_send_signal; /* -1 */ extern int opt_no_daemon; /* 0 */ @@ -6582,20 +6577,16 @@ StrPools[i].pool = memPoolCreate(StrPoolsAttrs[i].name, StrPoolsAttrs[i].obj_size); Index: src/mk-string-arrays.pl =================================================================== -RCS file: /cvsroot/squid/squid/src/mk-string-arrays.pl,v -retrieving revision 1.2 -retrieving revision 1.2.180.1 -diff -p -u -b -r1.2 -r1.2.180.1 ---- src/mk-string-arrays.pl 23 Oct 2000 15:04:21 -0000 1.2 -+++ src/mk-string-arrays.pl 17 May 2006 17:58:01 -0000 1.2.180.1 -@@ -16,6 +16,7 @@ $pat{'err_type'} = "err_type_str"; - $pat{'icp_opcode'} = "icp_opcode_str"; +--- src/mk-string-arrays.pl.orig Fri Jan 19 01:19:26 2007 ++++ src/mk-string-arrays.pl Wed Jan 24 12:31:03 2007 +@@ -17,6 +17,7 @@ $pat{'icp_opcode'} = "icp_opcode_str"; $pat{'swap_log_op'} = "swap_log_op_str"; $pat{'lookup_t'} = "lookup_t_str"; + $pat{'log_type'} = "log_tags"; +$pat{'icap_service_t'} = "icap_service_type_str"; - $state = 0; # start state - while (<>) { + print "#include \"squid.h\"\n"; + Index: src/pconn.c =================================================================== RCS file: /cvsroot/squid/squid/src/pconn.c,v >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701241733.l0OHXiiX004699>