From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 23 20:00:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38F5810656C5 for ; Wed, 23 Dec 2009 20:00:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0A89F8FC12 for ; Wed, 23 Dec 2009 20:00:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nBNK02nX007558 for ; Wed, 23 Dec 2009 20:00:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nBNK02xT007557; Wed, 23 Dec 2009 20:00:02 GMT (envelope-from gnats) Resent-Date: Wed, 23 Dec 2009 20:00:02 GMT Resent-Message-Id: <200912232000.nBNK02xT007557@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thomas-Martin Seck Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4382E1065670 for ; Wed, 23 Dec 2009 19:55:16 +0000 (UTC) (envelope-from tmseck@netcologne.de) Received: from smtp5.netcologne.de (smtp5.netcologne.de [194.8.194.25]) by mx1.freebsd.org (Postfix) with ESMTP id C44B98FC12 for ; Wed, 23 Dec 2009 19:55:15 +0000 (UTC) Received: from wcfields.tmseck.homedns.org (xdsl-89-0-188-114.netcologne.de [89.0.188.114]) by smtp5.netcologne.de (Postfix) with SMTP id 112EC40CFF6 for ; Wed, 23 Dec 2009 20:55:14 +0100 (CET) Received: (qmail 96374 invoked by uid 1001); 23 Dec 2009 19:55:10 -0000 Message-Id: <20091223195510.96373.qmail@wcfields.tmseck.homedns.org> Date: 23 Dec 2009 19:55:10 -0000 From: Thomas-Martin Seck To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/141926: [Maintainer] www/squid31: add vendor patches, update CONFLICTS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Thomas-Martin Seck List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2009 20:00:03 -0000 >Number: 141926 >Category: ports >Synopsis: [Maintainer] www/squid31: add vendor patches, update CONFLICTS >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 Dec 23 20:00:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 7.2-RELEASE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of December 23, 2009. >Description: - add some vendor patches as published on http://www.squid-cache.org/Versions/v3/3.1/changesets/ - add a CONFLICT with www/lusca-head >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid31) (Revision 1714) +++ Makefile (.../local/squid31) (Revision 1714) @@ -53,6 +53,7 @@ PORTNAME= squid PORTVERSION= 3.1.0.${SQUID_BETA_VER} +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ @@ -84,7 +85,13 @@ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www1.tw.squid-cache.org/%SUBDIR%/ PATCH_SITE_SUBDIR= Versions/v3/3.1/changesets -PATCHFILES= squid-3.1-9822.patch +PATCHFILES= squid-3.1-9816.patch \ + squid-3.1-9817.patch \ + squid-3.1-9818.patch \ + squid-3.1-9822.patch \ + squid-3.1-9823.patch \ + squid-3.1-9825.patch \ + squid-3.1-9826.patch MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy (BETA Version) @@ -93,7 +100,7 @@ SQUID_BETA_VER= 15 -CONFLICTS= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* +CONFLICTS= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes USE_BZIP2= yes USE_PERL5= yes Index: distinfo =================================================================== --- distinfo (.../www/squid31) (Revision 1714) +++ distinfo (.../local/squid31) (Revision 1714) @@ -1,6 +1,24 @@ MD5 (squid3.1/squid-3.1.0.15.tar.bz2) = 295f5c6067244cf8537600be0b9841d7 SHA256 (squid3.1/squid-3.1.0.15.tar.bz2) = 9fd3d7f5e2bee836126ab0f9cc07fb61207027bed29a3213db73aed46a888bdd SIZE (squid3.1/squid-3.1.0.15.tar.bz2) = 2416255 +MD5 (squid3.1/squid-3.1-9816.patch) = eeada33894e7b2f1087584cabc610ae6 +SHA256 (squid3.1/squid-3.1-9816.patch) = 848568fa48d77de8076610c30af791b2fed4e4853e6bf5759b6be83220db3e70 +SIZE (squid3.1/squid-3.1-9816.patch) = 1807 +MD5 (squid3.1/squid-3.1-9817.patch) = bb2c31777322e62ceb2526d258cd69f7 +SHA256 (squid3.1/squid-3.1-9817.patch) = 33208a0f717640b6c17e0efc976cc939abad508b30d0102b4ef3abd10accad71 +SIZE (squid3.1/squid-3.1-9817.patch) = 4079 +MD5 (squid3.1/squid-3.1-9818.patch) = ee68af7fbff4c9571ed22326eb0c59dc +SHA256 (squid3.1/squid-3.1-9818.patch) = 97e9c34f1a6be8aa565ab106d99458fa31225051dc650a7f7bb6d9db762a6819 +SIZE (squid3.1/squid-3.1-9818.patch) = 3479 MD5 (squid3.1/squid-3.1-9822.patch) = fa645851b2dfce355e465cbe0e27404d SHA256 (squid3.1/squid-3.1-9822.patch) = 8ffb28e5e6d1adb7e289390fa3dfb99aea989bd65513a1350f84905486819b72 SIZE (squid3.1/squid-3.1-9822.patch) = 1383 +MD5 (squid3.1/squid-3.1-9823.patch) = dd6ba7ec343d1a6caddfd1f000932eec +SHA256 (squid3.1/squid-3.1-9823.patch) = 09be6070f8015c4ca3fb003b1ebd35cfd6420e7a80d9a676c195fb151e28a743 +SIZE (squid3.1/squid-3.1-9823.patch) = 1933 +MD5 (squid3.1/squid-3.1-9825.patch) = 18e24ae7783f69362f55ec731e8dcf9f +SHA256 (squid3.1/squid-3.1-9825.patch) = a1f1b77ef6fe3a6fb1eca74606d545e9523885283f25b43a423cfce3a247800b +SIZE (squid3.1/squid-3.1-9825.patch) = 1261 +MD5 (squid3.1/squid-3.1-9826.patch) = 02a49a40917c50995a37d2d29c80591c +SHA256 (squid3.1/squid-3.1-9826.patch) = e4041f02c4233d664afbbd3bb472865dddb7d9187181acf9542bd650b6f8ffc0 +SIZE (squid3.1/squid-3.1-9826.patch) = 3915 >Release-Note: >Audit-Trail: >Unformatted: