Date: Sat, 19 Aug 2006 16:49:53 +0200 (CEST) From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102274: [Maintainer] www/squid26: update to 2.6.STABLE3 Message-ID: <200608191449.k7JEnr5c013620@hardy.tmseck.homedns.org> Resent-Message-ID: <200608191450.k7JEoFtY038905@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102274 >Category: ports >Synopsis: [Maintainer] www/squid26: update to 2.6.STABLE3 >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: Sat Aug 19 14:50:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 6.1-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of August 19, 2006. >Description: - update to 2.6.STABLE3 - update the ICAP core patchset to CVS as of 2006-08-13 and correct the name of the CVS branch used in creating the diff - remove a superfluous hunk from the ICAP bootstrap patchset >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid26) (revision 992) +++ Makefile (.../local/squid26) (revision 992) @@ -75,7 +75,7 @@ # Enable experimental multicast notification of cachemisses. PORTNAME= squid -PORTVERSION= 2.6.2 +PORTVERSION= 2.6.3 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://archive.progeny.com/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.STABLE2 +DISTNAME= squid-2.6.STABLE3 DIST_SUBDIR= squid2.6 PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ @@ -100,8 +100,7 @@ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www1.tw.squid-cache.org/%SUBDIR%/ PATCH_SITE_SUBDIR= Versions/v2/2.6/changesets/ -PATCHFILES= 10894.patch 10895.patch 10896.patch 10898.patch 10899.patch \ - 10900.patch 10901.patch 10902.patch 10903.patch 10904.patch +PATCHFILES= PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de Index: distinfo =================================================================== --- distinfo (.../www/squid26) (revision 992) +++ distinfo (.../local/squid26) (revision 992) @@ -1,33 +1,3 @@ -MD5 (squid2.6/squid-2.6.STABLE2.tar.bz2) = 838492f95de0964e31e633bfa07a0682 -SHA256 (squid2.6/squid-2.6.STABLE2.tar.bz2) = 8ceb890161648f26b3c16f07e2e1beecad2b0de0f3f1793142a32b5aa25ef8e6 -SIZE (squid2.6/squid-2.6.STABLE2.tar.bz2) = 1222355 -MD5 (squid2.6/10894.patch) = 8b66b5f16a1563e15690f0b8ecddd5b9 -SHA256 (squid2.6/10894.patch) = cab38b13352135433fb85e04a76182ca96b03e4c6df487b6de25e73b1bf71ffd -SIZE (squid2.6/10894.patch) = 1303 -MD5 (squid2.6/10895.patch) = 234efdec5f31662d07188829bcd28721 -SHA256 (squid2.6/10895.patch) = 8d12a761c64ca9b8c7f18e4393f47d22e4bd772a788bcbea61c81f48647a8835 -SIZE (squid2.6/10895.patch) = 5885 -MD5 (squid2.6/10896.patch) = 187944a1b8b3e796f5ae5d18b2d66284 -SHA256 (squid2.6/10896.patch) = 0a8d6dd65a3d9d76b9aeb85135f560abe9a53ce17891e866d0e38f14aa4f436b -SIZE (squid2.6/10896.patch) = 1100 -MD5 (squid2.6/10898.patch) = 830d6788b613b93221d7661bf19946a1 -SHA256 (squid2.6/10898.patch) = f6b95725ba7d78fdbd41a8589229acf9b2128deb109adbe13d5f7e0d81d192f7 -SIZE (squid2.6/10898.patch) = 3611 -MD5 (squid2.6/10899.patch) = dee2d52860f2ee66bb4ecbfbdbf1f66f -SHA256 (squid2.6/10899.patch) = c3c8b334fe5d6f3e5037e6db4cf6e5049076e07e44df2f5cd8f0f4a9d0fde5fd -SIZE (squid2.6/10899.patch) = 1641 -MD5 (squid2.6/10900.patch) = 5bb888d3a4041572bc38f9cf6e177e5e -SHA256 (squid2.6/10900.patch) = 48bc152e1986efb4ef58b64409d062b1a01a09cba0c4dcb31b719bb595c11751 -SIZE (squid2.6/10900.patch) = 917 -MD5 (squid2.6/10901.patch) = 16d5d2bf91a868da672daa8c24f0ca74 -SHA256 (squid2.6/10901.patch) = f0fe03966617b895e1fae361e8aa8557a51433c1c4eec92599424f0d2ece545e -SIZE (squid2.6/10901.patch) = 1709 -MD5 (squid2.6/10902.patch) = f9b7dd81b26a17e52175d06161b00ee6 -SHA256 (squid2.6/10902.patch) = d63c4dca13096ce3185ad6b15de2f897f24018581a69e611e9a00dbf5842ab59 -SIZE (squid2.6/10902.patch) = 1439 -MD5 (squid2.6/10903.patch) = 008c0c4e8b08def33f48f2706d13433e -SHA256 (squid2.6/10903.patch) = 727dbe9951d915f7b846ed905148ce4177703dbbfa493d45b5efbb1da61851e0 -SIZE (squid2.6/10903.patch) = 968 -MD5 (squid2.6/10904.patch) = 20d803cd8ede1132d8f8009cc93ca816 -SHA256 (squid2.6/10904.patch) = 36bf8c00084988a850bcbe816cf52a7002e8516806fb7a17438eaeeb389457fa -SIZE (squid2.6/10904.patch) = 37791 +MD5 (squid2.6/squid-2.6.STABLE3.tar.bz2) = 5b181e9c08f35d098e53e54b01fbd092 +SHA256 (squid2.6/squid-2.6.STABLE3.tar.bz2) = a427941627ab0d4c019d8fe1737b032e4667daa73f7c68b4812159ef18666634 +SIZE (squid2.6/squid-2.6.STABLE3.tar.bz2) = 1231527 Index: files/icap-2.6-core.patch =================================================================== --- files/icap-2.6-core.patch (.../www/squid26) (revision 992) +++ files/icap-2.6-core.patch (.../local/squid26) (revision 992) @@ -11,12 +11,12 @@ The patchset was pulled from the project's CVS repository at cvs.devel.squid-cache.org using -cvs diff -u -b -N -kk -rZ-icap-s2_6_merge_HEAD -ricap-2_6 +cvs diff -u -b -N -kk -rZ-icap-2_6_merge_HEAD -ricap-2_6 See http://devel.squid-cache.org/icap/ for further information about the ICAP client project. -Patch last updated: 2006-08-05 +Patch last updated: 2006-08-19 Index: errors/Azerbaijani/ERR_ICAP_FAILURE =================================================================== @@ -1377,10 +1377,10 @@ =================================================================== RCS file: /cvsroot/squid/squid/src/MemBuf.c,v retrieving revision 1.10 -retrieving revision 1.9.10.2 -diff -p -u -b -r1.10 -r1.9.10.2 +retrieving revision 1.9.10.3 +diff -p -u -b -r1.10 -r1.9.10.3 --- src/MemBuf.c 20 May 2006 22:50:55 -0000 1.10 -+++ src/MemBuf.c 26 May 2006 18:21:31 -0000 1.9.10.2 ++++ src/MemBuf.c 12 Aug 2006 23:02:50 -0000 1.9.10.3 @@ -341,3 +341,15 @@ memBufReport(MemBuf * mb) assert(mb); memBufPrintf(mb, "memBufReport is not yet implemented @?@\n"); @@ -1393,7 +1393,7 @@ + if (mb->capacity == mb->size) + memBufGrow(mb, SQUID_TCP_SO_RCVBUF); + len = FD_READ_METHOD(fd, mb->buf + mb->size, mb->capacity - mb->size); -+ if (len) ++ if (len > 0) + mb->size += len; + return len; +} Index: files/icap-2.6-bootstrap.patch =================================================================== --- files/icap-2.6-bootstrap.patch (.../www/squid26) (revision 992) +++ files/icap-2.6-bootstrap.patch (.../local/squid26) (revision 992) @@ -7,21 +7,10 @@ Please see icap-2.6-core.patch for further information. -Patch last updated: 2006-08-05 +Patch last updated: 2006-08-19 --- configure.orig Sat Aug 5 16:24:35 2006 +++ configure Sat Aug 5 16:19:46 2006 -@@ -270,8 +270,8 @@ - # Identity of this package. - PACKAGE_NAME='Squid Web Proxy' - PACKAGE_TARNAME='squid' --PACKAGE_VERSION='2.6.STABLE2' --PACKAGE_STRING='Squid Web Proxy 2.6.STABLE2' -+PACKAGE_VERSION='2.6.STABLE2-CVS' -+PACKAGE_STRING='Squid Web Proxy 2.6.STABLE2-CVS' - PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/' - - ac_default_prefix=/usr/local/squid @@ -312,7 +312,7 @@ # include <unistd.h> #endif" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608191449.k7JEnr5c013620>