Changes 3.5.8:

Fix FreeBSD Clang-3.5 build error
Support splice for SSLv3 and TLSv1 sessions that start with an SSLv2 Hello
Bug 3553: cache_swap_high ignored and maxCapacity used instead
Fix memory leak in Surrogate-Capability header detection
When a RESPMOD service aborts, mark the body it produced as truncated.
Cleanup: fix assertion in Store unit tests
Bug 3696: crash when client delay pools are activated
Bug 4278: Docs: typo in the refresh_pattern freshness algorithm
Bug 4306: build portability fix in Kerberos helpers
Docs: auto-build release notes for snapshots
FtpServer.cc:1024: "reply != NULL" assertion
Work around clang-3.6 complaining of unknown attributes in libxml2
Ignore impossible SSL bumping actions, as intended and documented.
Bug 4242: compile errors with eCAP using clang-3.6
Docs: fix typo in miss_access
Bug 4285 partial: %us is not supported in access.log
Bug 4302: IPFilter v5 transparent interception
Docs: update intercept/tproxy related text
Bug 4301: compile errors with IPFilter interception
Polish: add debug section,level to cache.log
Reject non-chunked HTTP messages with conflicting Content-Length values
Boilerplate: update ignored files
Boilerplate: add Foundation details to rfcnb and smblib documentation files
Cleanup: de-duplicate fake-CONNECT code
Use automake subdir-objects feature

4 files changed, 6 insertions, 99 deletions

diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 7536d0aae08..c8cb5bc03aa 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2015/08/17 16:41:28 prlw1 Exp $
+# $NetBSD: Makefile,v 1.52 2015/09/05 14:25:37 adam Exp $
 
-DISTNAME=	squid-3.5.7
-PKGREVISION=	1
+DISTNAME=	squid-3.5.8
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
 		ftp://ftp.squid-cache.org/pub/squid/ \
diff --git a/www/squid3/distinfo b/www/squid3/distinfo
index 0436dfa3568..c45eb34f086 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.37 2015/08/17 16:39:38 prlw1 Exp $
+$NetBSD: distinfo,v 1.38 2015/09/05 14:25:37 adam Exp $
 
-SHA1 (squid-3.5.7.tar.xz) = e7dcc0cbcee6fd10a8c8bf3e9bff0dc6359ccc48
-RMD160 (squid-3.5.7.tar.xz) = 7284dda15e27c643cf69db1c53cc798404f6f53a
-Size (squid-3.5.7.tar.xz) = 2294580 bytes
+SHA1 (squid-3.5.8.tar.xz) = 4ba4b43cf9abaf7e5015ad4d2d9b628213e55044
+RMD160 (squid-3.5.8.tar.xz) = 56f8b3f20ae34845a38c77697bef6bbd66fc3523
+Size (squid-3.5.8.tar.xz) = 2295644 bytes
 SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
-SHA1 (patch-configure) = b8835c6abbe1ca98becc16bf3370b4f5018d3021
 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
 SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6
 SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
 SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939
-SHA1 (patch-src_ip_Intercept.cc) = 4dcab63def21137bfae25a2b514d876e5260af81
 SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
 SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f
diff --git a/www/squid3/patches/patch-configure b/www/squid3/patches/patch-configure
deleted file mode 100644
index a95ab4d8275..00000000000
--- a/www/squid3/patches/patch-configure
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-configure,v 1.9 2015/08/17 16:39:38 prlw1 Exp $
-
-* Portability fix.
-  http://bugs.squid-cache.org/show_bug.cgi?id=4306
-* Fix broken tests for IPFilter
-  http://bugs.squid-cache.org/show_bug.cgi?id=4301
-
---- configure.orig	2015-08-01 06:10:24.000000000 +0000
-+++ configure
-@@ -32753,7 +32753,7 @@ done
- ## Please see the COPYING and CONTRIBUTORS files for details.
- ##
- 
--if test "x$with_krb5" == "xyes"; then
-+if test "x$with_krb5" = "xyes"; then
-   BUILD_HELPER="kerberos"
- fi
- 
-@@ -33327,7 +33327,7 @@ done
- ## Please see the COPYING and CONTRIBUTORS files for details.
- ##
- 
--if test "x$with_krb5" == "xyes"; then
-+if test "x$with_krb5" = "xyes"; then
-   BUILD_HELPER="kerberos_ldap_group"
-   if test "x$with_apple_krb5" = "xyes" ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lresolv" >&5
-@@ -38704,6 +38704,7 @@ if test "x$enable_ipf_transparent" != "x
- /* end confdefs.h.  */
- 
- #     include <sys/types.h>
-+#     include <sys/time.h>
- #     include <sys/ioccom.h>
- #     include <netinet/in.h>
- 
-@@ -38733,6 +38734,7 @@ else
- 
- #define minor_t fubaar
- #       include <sys/types.h>
-+#       include <sys/time.h>
- #       include <sys/ioccom.h>
- #       include <netinet/in.h>
- #undef minor_t
-@@ -38756,8 +38758,7 @@ $as_echo "yes" >&6; }
- 
- else
- 
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to make IPFilter work with netinet/ headers" >&5
--$as_echo "unable to make IPFilter work with netinet/ headers" >&6; }
-+        as_fn_error $? "unable to make IPFilter work with netinet/ headers" "$LINENO" 5
- 
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -38795,6 +38796,9 @@ ac_fn_cxx_check_header_compile "$LINENO"
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#if HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
diff --git a/www/squid3/patches/patch-src_ip_Intercept.cc b/www/squid3/patches/patch-src_ip_Intercept.cc
deleted file mode 100644
index 5a9c94e99d8..00000000000
--- a/www/squid3/patches/patch-src_ip_Intercept.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_ip_Intercept.cc,v 1.5 2015/08/17 16:39:38 prlw1 Exp $
-
-Fix transparent proxying with IPFilter 5
-http://bugs.squid-cache.org/show_bug.cgi?id=4302
-
---- src/ip/Intercept.cc.orig	2015-08-01 06:08:17.000000000 +0000
-+++ src/ip/Intercept.cc
-@@ -200,6 +200,19 @@ Ip::Intercept::IpfInterception(const Com
-     // all fields must be set to 0
-     memset(&natLookup, 0, sizeof(natLookup));
-     // for NAT lookup set local and remote IP:port's
-+    if (newConn->remote.isIPv6()) {
-+#if IPFILTER_VERSION < 5000003
-+        // warn once every 10 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;
-+        return false;
-+#else
-+        natLookup.nl_v = 6;
-+    } else {
-+        natLookup.nl_v = 4;
-+#endif
-+    }
-     natLookup.nl_inport = htons(newConn->local.port());
-     newConn->local.getInAddr(natLookup.nl_inip);
-     natLookup.nl_outport = htons(newConn->remote.port());