From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 17 10:50:27 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E70216A4D1 for ; Wed, 17 Mar 2004 10:50:27 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E60BE43D31 for ; Wed, 17 Mar 2004 10:50:26 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i2HIoQbv032552 for ; Wed, 17 Mar 2004 10:50:26 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i2HIoQOv032551; Wed, 17 Mar 2004 10:50:26 -0800 (PST) (envelope-from gnats) Resent-Date: Wed, 17 Mar 2004 10:50:26 -0800 (PST) Resent-Message-Id: <200403171850.i2HIoQOv032551@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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36BB916A4CE for ; Wed, 17 Mar 2004 10:44:05 -0800 (PST) Received: from smtp1.netcologne.de (smtp1.netcologne.de [194.8.194.112]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF5BD43D39 for ; Wed, 17 Mar 2004 10:44:04 -0800 (PST) (envelope-from thomas@laurel.tmseck.homedns.org) Received: from laurel.tmseck.homedns.org (xdsl-195-14-222-94.netcologne.de [195.14.222.94]) by smtp1.netcologne.de (Postfix) with SMTP id 6335238CFB for ; Wed, 17 Mar 2004 19:44:01 +0100 (MET) Received: (qmail 13502 invoked by uid 1001); 17 Mar 2004 18:43:32 -0000 Message-Id: <20040317184332.13498.qmail@laurel.tmseck.homedns.org> Date: 17 Mar 2004 18:43:32 -0000 From: Thomas-Martin Seck To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/64385: [Maintainer] www/squid: integrate vendor patch and minor fixes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 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, 17 Mar 2004 18:50:27 -0000 >Number: 64385 >Category: ports >Synopsis: [Maintainer] www/squid: integrate vendor patch and minor fixes >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Mar 17 10:50:26 PST 2004 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 4.9-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of Mar 17, 2004. >Description: - Add a vendor patch, see http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-helper_warning for details - fix options parser to make a default-to-on option actually work in the PACKAGE_BUILDING and BATCH cases - use IGNORE instead of .error - bump PORTREVISION >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/squid/Makefile,v retrieving revision 1.116 diff -u -u -r1.116 Makefile --- Makefile 17 Mar 2004 07:06:23 -0000 1.116 +++ Makefile 17 Mar 2004 18:41:41 -0000 @@ -29,6 +29,7 @@ PORTNAME= squid PORTVERSION= 2.5.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -42,7 +43,8 @@ PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ PATCHFILES= squid-2.5.STABLE5-ntlm_assert.patch \ - squid-2.5.STABLE5-ldap.patch + squid-2.5.STABLE5-ldap.patch \ + squid-2.5.STABLE5-helper_warning.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de @@ -163,7 +165,7 @@ .if defined(WITHOUT_SQUID_WCCP) CONFIGURE_ARGS+= --disable-wccp .endif -.if defined(WITH_SQUID_UNDERSCORES) +.if !defined(WITHOUT_SQUID_UNDERSCORES) CONFIGURE_ARGS+= --enable-underscores .endif .if defined(WITHOUT_SQUID_CHECK_HOSTNAME) @@ -188,7 +190,7 @@ # on 5.[0-2] systems instead, go on, I will integrate your patch. CONFIGURE_ARGS+= --enable-pf-transparent .else -.error WITH_SQUID_PF only works on systems where pf is part of the base system. +IGNORE= WITH_SQUID_PF only works on systems where pf is part of the base system .endif .endif .if defined(WITH_SQUID_FOLLOW_XFF) Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/squid/distinfo,v retrieving revision 1.82 diff -u -u -r1.82 distinfo --- distinfo 17 Mar 2004 07:06:23 -0000 1.82 +++ distinfo 17 Mar 2004 18:27:49 -0000 @@ -4,3 +4,5 @@ SIZE (squid2.5/squid-2.5.STABLE5-ntlm_assert.patch) = 545 MD5 (squid2.5/squid-2.5.STABLE5-ldap.patch) = 81bdcaf96390eab1655fd8d65cf607ed SIZE (squid2.5/squid-2.5.STABLE5-ldap.patch) = 6245 +MD5 (squid2.5/squid-2.5.STABLE5-helper_warning.patch) = f384daa03a07a4c99e84c922d9860524 +SIZE (squid2.5/squid-2.5.STABLE5-helper_warning.patch) = 3302 >Release-Note: >Audit-Trail: >Unformatted: