Date: Thu, 1 Jun 2006 15:35:53 +0200 (CEST) From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/98279: [Maintainer] www/squid: update MASTER_SITES and ICAP patchset Message-ID: <200606011335.k51DZrqX009982@hardy.tmseck.homedns.org> Resent-Message-ID: <200606011340.k51DeIaR044537@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98279
>Category: ports
>Synopsis: [Maintainer] www/squid: update MASTER_SITES and ICAP patchset
>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: Thu Jun 01 13:40:18 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 June 1, 2006.
>Description:
- update the list of MASTER_SITES:
+ remove ftp.unimelb.au.edu because it does not carry recent squid
versions (see fenner's distfile survey) and is not an official squid
mirror anymore (cf <http://www.squid-cache.org/Mirrors/ftp-mirrors.html>)
+ add three mirrors located in the USA and two mirrors in Europe
- update the icap-core patchset to CVS as of 2006-05-25
(and re-add diff meta information in one of the patches that I
probably managed to remove while merging in changes)
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../www/squid) (revision 857)
+++ Makefile (.../local/squid) (revision 857)
@@ -76,9 +76,13 @@
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
- ftp://ftp.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+ ftp://archive.progeny.com/squid/%SUBDIR%/ \
+ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+ ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
+ ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
+ 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.5.STABLE14
Index: files/icap-2.5-core.patch
===================================================================
--- files/icap-2.5-core.patch (.../www/squid) (revision 857)
+++ files/icap-2.5-core.patch (.../local/squid) (revision 857)
@@ -20,7 +20,7 @@
See http://devel.squid-cache.org/icap/ for further information
about the ICAP client project.
-Patch last updated: 2006-05-21
+Patch last updated: 2006-06-01
Index: errors/Azerbaijani/ERR_ICAP_FAILURE
===================================================================
@@ -5441,8 +5441,8 @@
RCS file: src/icap_respmod.c
diff -N src/icap_respmod.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ src/icap_respmod.c 17 Feb 2006 12:45:23 -0000 1.1.2.64
-@@ -0,0 +1,1057 @@
++++ src/icap_respmod.c 25 May 2006 16:04:55 -0000 1.1.2.65
+@@ -0,0 +1,1055 @@
+
+/*
+ * $Id$
@@ -5522,8 +5522,6 @@
+ memBufPrintf(mb, "X-TE: trailers\r\n");
+ }
+#endif
-+ if (service->flags.allow_204)
-+ memBufPrintf(mb, "Allow: 204\r\n");
+}
+
+static int
@@ -7101,7 +7099,10 @@
===================================================================
RCS file: /cvsroot/squid/squid/src/url.c,v
retrieving revision 1.7.6.7
+retrieving revision 1.7.6.5.2.3
+diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.3
--- src/url.c 11 Mar 2006 03:16:31 -0000 1.7.6.7
++++ src/url.c 16 May 2006 17:56:59 -0000 1.7.6.5.2.3
@@ -103,6 +103,9 @@ const char *ProtocolStr[] =
"whois",
"internal",
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606011335.k51DZrqX009982>