svn commit: r413719 - in branches/2016Q2/www/squid: . files

[Kurt Jaeger]

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 <timp87 at gmail.com> (maintainer)
  Reported by:	Christophe Anselme-Moizan <christophe.anselmemoizan at orange.com>
  
  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 <timp87 at gmail.com> (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 at 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