From owner-svn-ports-all@FreeBSD.ORG Thu Sep 18 13:27:52 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFFF154C; Thu, 18 Sep 2014 13:27:52 +0000 (UTC) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8BADE5EF; Thu, 18 Sep 2014 13:27:52 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3hzJrW5mSNzFfCt; Thu, 18 Sep 2014 15:27:39 +0200 (CEST) Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WZXqZbafVvqN; Thu, 18 Sep 2014 15:27:36 +0200 (CEST) Received: from marvin.madpilot.net (micro.madpilot.net [88.149.173.206]) by winston.madpilot.net (Postfix) with ESMTPSA; Thu, 18 Sep 2014 15:27:36 +0200 (CEST) Message-ID: <541ADDC7.2020806@FreeBSD.org> Date: Thu, 18 Sep 2014 15:27:35 +0200 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.1.0 MIME-Version: 1.0 To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r368457 - in head/www: squid squid33 References: <201409181324.s8IDO2bH035299@svn.freebsd.org> In-Reply-To: <201409181324.s8IDO2bH035299@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Sep 2014 13:27:52 -0000 On 09/18/14 15:24, Guido Falsi wrote: > Author: madpilot > Date: Thu Sep 18 13:24:02 2014 > New Revision: 368457 > URL: http://svnweb.freebsd.org/changeset/ports/368457 > QAT: https://qat.redports.org/buildarchive/r368457/ > > Log: > Update squid to 3.4.8 and add patches to squid33. > > This update addresses CVE-2014-6270. > > PR: 193737 > Submitted by: timp87 at gmail.com > > Modified: > head/www/squid/Makefile > head/www/squid/distinfo > head/www/squid33/Makefile > head/www/squid33/distinfo This should perhaps be merged in 2014Q3, but there have been a lot of changes to the squid ports in the meanwhile, also squid 3.4 is not included in 2014Q3(and people should really update to that version). Should I port the fix for squid33 to 2014Q3 and merge the needed changes inbetween? I think that a simple merge is not going to work fine, manual changes will be needed. Any suggestion on this? -- Guido Falsi