svn commit: r397476 - in head/www/squid: . files

[Jason Unovitch]

Author: junovitch
Date: Mon Sep 21 01:51:25 2015
New Revision: 397476
URL: https://svnweb.freebsd.org/changeset/ports/397476

Log:
  www/squid: security update and build fix
  
  - security update 3.5.8 -> 3.5.9 [1]
  - Fix TP_IPF build on FreeBSD 9 [2]
  
  PR:		203186 [1]
  PR:		202950 [2]
  Approved by:	Pavel Timofeev <timp87 at gmail.com> (maintainer) [1]
  Security:	d3a98c2d-5da1-11e5-9909-002590263bf5
  MFH:		2015Q3
  X-MFH-With:	r391555, r392222, r393602, r396106, r396185, r397215

Modified:
  head/www/squid/Makefile
  head/www/squid/distinfo
  head/www/squid/files/patch-src__ip__Intercept.cc

Modified: head/www/squid/Makefile
==============================================================================
--- head/www/squid/Makefile	Mon Sep 21 01:35:30 2015	(r397475)
+++ head/www/squid/Makefile	Mon Sep 21 01:51:25 2015	(r397476)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	squid
-PORTVERSION=	3.5.8
-PORTREVISION=	2
+PORTVERSION=	3.5.9
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \

Modified: head/www/squid/distinfo
==============================================================================
--- head/www/squid/distinfo	Mon Sep 21 01:35:30 2015	(r397475)
+++ head/www/squid/distinfo	Mon Sep 21 01:51:25 2015	(r397476)
@@ -1,2 +1,2 @@
-SHA256 (squid3.5/squid-3.5.8.tar.xz) = f402a21d4fae8b3e9df13683dc530366e4b1753df21e91c05a0a9514a1abfc62
-SIZE (squid3.5/squid-3.5.8.tar.xz) = 2295644
+SHA256 (squid3.5/squid-3.5.9.tar.xz) = 9e9a3dc16e6f97258f2c3589dc6163bec20fb9369aec1fe03612dbca76d185d3
+SIZE (squid3.5/squid-3.5.9.tar.xz) = 2296384

Modified: head/www/squid/files/patch-src__ip__Intercept.cc
==============================================================================
--- head/www/squid/files/patch-src__ip__Intercept.cc	Mon Sep 21 01:35:30 2015	(r397475)
+++ head/www/squid/files/patch-src__ip__Intercept.cc	Mon Sep 21 01:51:25 2015	(r397476)
@@ -9,7 +9,7 @@
          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 % 1048576;
++        warningLevel = (warningLevel + 1) % 1048576;
          return false;
  #else
          natLookup.nl_v = 6;