Date: 11 Mar 2010 20:10:54 -0000 From: Thomas-Martin Seck <tmseck@web.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/144668: [Maintainer] www/squid: update to 2.7.STABLE8 Message-ID: <20100311201054.13435.qmail@wcfields.tmseck.homedns.org> Resent-Message-ID: <201003112020.o2BKK2FB071468@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144668 >Category: ports >Synopsis: [Maintainer] www/squid: update to 2.7.STABLE8 >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 Mar 11 20:20:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 8.0-RELEASE amd64 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of March 11, 2010. >Description: Update to 2.7.STABLE8. >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid) (Revision 1781) +++ Makefile (.../local/squid) (Revision 1781) @@ -76,7 +76,6 @@ PORTNAME= squid PORTVERSION= 2.7.${SQUID_STABLE_VER} -PORTREVISION= 4 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ @@ -107,13 +106,13 @@ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www2.tw.squid-cache.org/%SUBDIR%/ PATCH_SITE_SUBDIR= Versions/v2/2.7/changesets -PATCHFILES= 12600.patch +PATCHFILES= PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy -SQUID_STABLE_VER= 7 +SQUID_STABLE_VER= 8 CONFLICTS= squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes @@ -248,7 +247,7 @@ # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too: .if defined(WITH_SQUID_KERB_AUTH) && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS) # XXX This currently only works with heimdal from the base system, -# see files/patch-helpers_negotiate_auth-squid_kerb_auth_* +# see files/patch-squid_kerb_auth: CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth" libexec+= squid_kerb_auth .endif Index: distinfo =================================================================== --- distinfo (.../www/squid) (Revision 1781) +++ distinfo (.../local/squid) (Revision 1781) @@ -1,6 +1,3 @@ -MD5 (squid2.7/squid-2.7.STABLE7.tar.bz2) = c18b0371fca813d5e7c7e0baf87baa22 -SHA256 (squid2.7/squid-2.7.STABLE7.tar.bz2) = 6c4e50708ff9ed2d2f43acf3300cbc826749d7fdc722465654415b285d6f7015 -SIZE (squid2.7/squid-2.7.STABLE7.tar.bz2) = 1341869 -MD5 (squid2.7/12600.patch) = 4bf7fb22ef3715b50650c89f679bc47d -SHA256 (squid2.7/12600.patch) = 828f386ba6468e3b810ec22691f9f920f57cf91548d2edb266c726b1e6b1b829 -SIZE (squid2.7/12600.patch) = 1194 +MD5 (squid2.7/squid-2.7.STABLE8.tar.bz2) = c061ba1c9ae39d0aaa8eca137f7dd18b +SHA256 (squid2.7/squid-2.7.STABLE8.tar.bz2) = 9409b02fc53518e334395df803a1ae30f4ed385b0f041fb310b4c75e2a49138c +SIZE (squid2.7/squid-2.7.STABLE8.tar.bz2) = 1348473 Index: files/patch-squid-advisory-2010:1 =================================================================== --- files/patch-squid-advisory-2010:1 (.../www/squid) (Revision 1781) +++ files/patch-squid-advisory-2010:1 (.../local/squid) (Revision 1781) @@ -1,38 +0,0 @@ -FreeBSD-Patch for Squid-Advisory 2010:1, prepared by Thomas-Martin Seck, -<tmseck@web.de>, 2010-02-01. - -Removed one directory level and the first hunk with CVS meta-information -from the original patch. The original patch can be downloaded from: -http://www.squid-cache.org/Versions/v2/HEAD/changesets/12597.patch - ---------------------- -PatchSet 12597 -Date: 2010/01/15 11:40:30 -Author: amosjeffries -Branch: HEAD -Tag: (none) -Log: -Handle DNS header-only packets as invalid. - -Members: - lib/rfc1035.c:1.30->1.31 - -Index: lib/rfc1035.c -=================================================================== -RCS file: /cvsroot/squid/squid/lib/rfc1035.c,v -retrieving revision 1.30 -retrieving revision 1.31 -diff -u -r1.30 -r1.31 ---- lib/rfc1035.c 15 Jun 2008 03:49:55 -0000 1.30 -+++ lib/rfc1035.c 15 Jan 2010 11:40:30 -0000 1.31 -@@ -286,7 +286,9 @@ - size_t len; - assert(ns > 0); - do { -- assert((*off) < sz); -+ if ((*off) >= sz) { -+ return 1; -+ } - c = *(buf + (*off)); - if (c > 191) { - /* blasted compression */ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100311201054.13435.qmail>