From owner-svn-ports-branches@freebsd.org Thu Apr 21 07:44:46 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7872B16208; Thu, 21 Apr 2016 07:44:46 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 7F86812F1; Thu, 21 Apr 2016 07:44:46 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3L7ijTK080719; Thu, 21 Apr 2016 07:44:45 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3L7ijgn080716; Thu, 21 Apr 2016 07:44:45 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201604210744.u3L7ijgn080716@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Thu, 21 Apr 2016 07:44:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413719 - in branches/2016Q2/www/squid: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2016 07:44:46 -0000 Author: pi Date: Thu Apr 21 07:44:45 2016 New Revision: 413719 URL: https://svnweb.freebsd.org/changeset/ports/413719 Log: MFH: r413688 r413697 www/squid: Add all available official patches up to 14031 It fixes two annoying and long-standing problems: - header forgery detection (using sslbump) leads to crash - add chained certificates and signing certificate to peek-then-bumped connections. PR: 207901 Submitted by: Pavel Timofeev (maintainer) Reported by: Christophe Anselme-Moizan www/squid: 3.5.16 -> 3.5.17 Changes: http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID_3_5_17.html http://www.squid-cache.org/Advisories/SQUID-2016_5.txt PR: 208939 Submitted by: Pavel Timofeev (maintainer) Security: CVE-2016-4052, CVE-2016-4053, CVE-2016-4054 Approved by: ports-secteam (junovitch) Modified: branches/2016Q2/www/squid/Makefile branches/2016Q2/www/squid/distinfo branches/2016Q2/www/squid/files/patch-src__ip__Intercept.cc Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/squid/Makefile ============================================================================== --- branches/2016Q2/www/squid/Makefile Thu Apr 21 07:32:49 2016 (r413718) +++ branches/2016Q2/www/squid/Makefile Thu Apr 21 07:44:45 2016 (r413719) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 3.5.16 +PORTVERSION= 3.5.17 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ @@ -17,6 +17,7 @@ PATCH_SITES= http://www.squid-cache.org/ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://master.squid-cache.org/~amosjeffries/patches/:nosid PATCH_SITE_SUBDIR= Versions/v3/${PORTVERSION:R}/changesets +#PATCHFILES= MAINTAINER= timp87@gmail.com COMMENT= HTTP Caching Proxy Modified: branches/2016Q2/www/squid/distinfo ============================================================================== --- branches/2016Q2/www/squid/distinfo Thu Apr 21 07:32:49 2016 (r413718) +++ branches/2016Q2/www/squid/distinfo Thu Apr 21 07:44:45 2016 (r413719) @@ -1,2 +1,2 @@ -SHA256 (squid3.5/squid-3.5.16.tar.xz) = e73d821180eed8bed230f357c680c0b19f1efa51a24725e810f2b48a2079d385 -SIZE (squid3.5/squid-3.5.16.tar.xz) = 2317320 +SHA256 (squid3.5/squid-3.5.17.tar.xz) = cb04e34f6ec80a5ae6caaef042703c841d3803c4c280e75eff12a5a6c84951a2 +SIZE (squid3.5/squid-3.5.17.tar.xz) = 2318216 Modified: branches/2016Q2/www/squid/files/patch-src__ip__Intercept.cc ============================================================================== --- branches/2016Q2/www/squid/files/patch-src__ip__Intercept.cc Thu Apr 21 07:32:49 2016 (r413718) +++ branches/2016Q2/www/squid/files/patch-src__ip__Intercept.cc Thu Apr 21 07:44:45 2016 (r413719) @@ -8,7 +8,7 @@ + // warn once every million at critical level, then push down a level each repeated event static int warningLevel = DBG_CRITICAL; debugs(89, warningLevel, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1"); -- warningLevel = ++warningLevel % 10; +- warningLevel = (warningLevel + 1) % 10; + warningLevel = (warningLevel + 1) % 1048576; return false; #else