From owner-freebsd-questions@FreeBSD.ORG Fri Jan 28 22:59:54 2005 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8964816A4CE for ; Fri, 28 Jan 2005 22:59:54 +0000 (GMT) Received: from wproxy.gmail.com (wproxy.gmail.com [64.233.184.192]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07F2943D48 for ; Fri, 28 Jan 2005 22:59:54 +0000 (GMT) (envelope-from juhasaarinen@gmail.com) Received: by wproxy.gmail.com with SMTP id 58so503149wri for ; Fri, 28 Jan 2005 14:59:53 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:mime-version:content-type:content-transfer-encoding; b=F+KPnE9t6dGVj4s3hba910HPlsNqyJkbh5uEpbjsQ+t57s1p/aIk8K1liGLnVZZ7l3lCYZ15+5PjuRQfiejD5LRbnXsZaa5HQVccvNtjoxAGlbUxeL8OlO/PtRYZWrML4t2KICcasht3ArMv6jOlXKOy7lIEJp5IuIW85d0Y4PY= Received: by 10.54.47.19 with SMTP id u19mr48483wru; Fri, 28 Jan 2005 14:59:53 -0800 (PST) Received: by 10.54.4.57 with HTTP; Fri, 28 Jan 2005 14:59:53 -0800 (PST) Message-ID: Date: Sat, 29 Jan 2005 11:59:53 +1300 From: Juha Saarinen To: FreeBSD Questions , tmseck@netcologne.de Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Squid 2.5.7_8 -> 2.5.7_9 portupgrade fails X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Juha Saarinen List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 22:59:54 -0000 Trying to update Squid, as portaudit complains about the existing version, but not having much success despite make clean and refetching the sources: ===> Applying distribution patches for squid-2.5.7_9 ===> Applying extra patch /usr/ports/www/squid/files/follow_xff-2.5.patch 1 out of 5 hunks failed--saving rejects to src/structs.h.rej *** Error code 1 Stop in /usr/ports/www/squid. ** Command failed [exit code 1]: /usr/bin/script -qa /tmp/portupgrade75466.58 make ** Fix the problem and try again. less structs.h.rej *************** *** 606,611 **** int request_entities; int detect_broken_server_pconns; int balance_on_multiple_ip; } onoff; acl *aclList; struct { --- 606,616 ---- int request_entities; int detect_broken_server_pconns; int balance_on_multiple_ip; + #if FOLLOW_X_FORWARDED_FOR + int acl_uses_indirect_client; + int delay_pool_uses_indirect_client; + int log_uses_indirect_client; + #endif /* FOLLOW_X_FORWARDED_FOR */ } onoff; acl *aclList; struct { structs.h.rej (END) The follow-x-forwarded-for patch looks like an option according to the port makefile: .if defined(WITH_SQUID_FOLLOW_XFF) EXTRA_PATCHES+= ${PATCHDIR}/follow_xff-2.5.patch \ ${PATCHDIR}/follow_xff-configure.patch CONFIGURE_ARGS+= --enable-follow-x-forwarded-for .endif I didn't set it, and it should be off by default: OPTIONS= ... SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \ ... Why is the patch being applied nevertheless? -- Juha