Skip site navigation (1)Skip section navigation (2)
Date:      11 Jul 2006 04:37:11 -0000
From:      Thomas-Martin Seck <tmseck@netcologne.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/100056: [Maintainer] www/squid: integrate vendor patch, add additional PATCH_SITES
Message-ID:  <20060711043711.1136.qmail@laurel.tmseck.homedns.org>
Resent-Message-ID: <200607110440.k6B4eDxb033583@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         100056
>Category:       ports
>Synopsis:       [Maintainer] www/squid: integrate vendor patch, add additional PATCH_SITES
>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:   Tue Jul 11 04:40:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of July 11, 2006.

	
>Description:
- integrate a vendor patch from
  <http://www.squid-cache.org/Versions/v2/2.5/bugs/>;
  to correct a problem with logging that could occur in certain cases
  (Squid bug #1605)

- add some of the WWW mirrors found on
  <http://www.squid-cache.org/Mirrors/http-mirrors.html>; as additional
  PATCH_SITES
  (thanks to Robert Backhaus for the initial submission)

- make the rc.d script print "Stopping squid." in the hand rolled stop command
  when shutting down, just like default rc.subr stop routine would do
	
>How-To-Repeat:

	
>Fix:

Apply this patch:

Index: distinfo
===================================================================
--- distinfo	(.../www/squid)	(revision 943)
+++ distinfo	(.../local/squid)	(revision 943)
@@ -1,6 +1,6 @@
 MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
-SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
 SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
 MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
-SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
 SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
+MD5 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 9abe563ca3d01dc58502737edc6f3c60
+SIZE (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319
Index: files/squid.sh.in
===================================================================
--- files/squid.sh.in	(.../www/squid)	(revision 943)
+++ files/squid.sh.in	(.../local/squid)	(revision 943)
@@ -43,6 +43,7 @@
 # --end rcold
 # --begin rcng
 squid_stop() {
+	echo "Stopping ${name}."
 	${command} -k shutdown
 	run_rc_command poll
 }
Index: Makefile
===================================================================
--- Makefile	(.../www/squid)	(revision 943)
+++ Makefile	(.../local/squid)	(revision 943)
@@ -73,7 +73,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -89,8 +89,19 @@
 DISTNAME=	squid-2.5.STABLE14
 DIST_SUBDIR=	squid2.5
 
-PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE14-httpReplyDestroy.patch
+PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
+		http://www2.us.squid-cache.org/%SUBDIR%/ \
+		http://www3.us.squid-cache.org/%SUBDIR%/ \
+		http://www1.at.squid-cache.org/%SUBDIR%/ \
+		http://www1.nl.squid-cache.org/%SUBDIR%/ \
+		http://www1.ru.squid-cache.org/%SUBDIR%/ \
+		http://www1.uk.squid-cache.org/%SUBDIR%/ \
+		http://www1.gr.squid-cache.org/%SUBDIR%/ \
+		http://www1.jp.squid-cache.org/%SUBDIR%/ \
+		http://www1.tw.squid-cache.org/%SUBDIR%/
+PATCH_SITE_SUBDIR=	Versions/v2/2.5/bugs
+PATCHFILES=	squid-2.5.STABLE14-httpReplyDestroy.patch \
+		squid-2.5.STABLE14-hierarchy_tag.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
	


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060711043711.1136.qmail>