Update "squid3" package to version 3.3.4. Changes since 3.3.3:

- Bug 3831: basic_ncsa_auth Blowfish and SHA support
- Bug 3816: SSL_get_certificate call inside Ssl::verifySslCertificate crashes
- Bug 3794: MacOS: workaround compiler errors and case-insensitivity
- Bug 3781: Proxy Authentication not sent to cache_peer
- Bug 3720 pt1: SourceLayout: shuffle fd_table definition into fde.h
- Bug 3720 pt2: Add missing include in /dev/poll I/O module
- Bug 3674: Improve compiler detection, better support warnings-as-errors on clang
- Add support for TPROXY on BSD
- Fix SSL Bump bypass for intercepted traffic
- Fix memory leaks in ConnStateData pinning
- Fix external_acl.cc "inBackground" assertion on queue overloads
- CacheMgr: fix missing column separator in helper stats
- OpenBSD: libpthreads requires OpenBSD 5.2 or later
- ... and lots of documentation updates
- ... and all changes from squid 3.2.10

This update might fix PR pkg/42568.

3 files changed, 12 insertions, 17 deletions

diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 5fbb8fc73c8..05468d48562 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2013/03/19 01:43:05 obache Exp $
+# $NetBSD: Makefile,v 1.7 2013/04/27 17:51:24 tron Exp $
 
-DISTNAME=	squid-3.3.3
-PKGREVISION=	1
+DISTNAME=	squid-3.3.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
 		${SQUID_MASTER_SITES}
diff --git a/www/squid3/distinfo b/www/squid3/distinfo
index 9005546fedf..38b267bf083 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.5 2013/03/13 17:11:25 taca Exp $
+$NetBSD: distinfo,v 1.6 2013/04/27 17:51:24 tron Exp $
 
-SHA1 (squid-3.3.3.tar.xz) = 2ad7c1b47efbd8969d2452f9b68c915af06d2729
-RMD160 (squid-3.3.3.tar.xz) = bfabc65771afa77c3b8867d09924cce202105656
-Size (squid-3.3.3.tar.xz) = 2174400 bytes
+SHA1 (squid-3.3.4.tar.xz) = 2b9b0e91568599ded93f90dda6197aa8744fc5b5
+RMD160 (squid-3.3.4.tar.xz) = 9a3c09867bdce77e800d247780594ccded89488a
+Size (squid-3.3.4.tar.xz) = 2178260 bytes
 SHA1 (patch-configure) = 8e5eb49a8d04c77f3cf9de9390a8992268421cb6
 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
 SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
 SHA1 (patch-src_Makefile.in) = 32bc968a7680414d87acf1a4c96822a3d80c2030
 SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
-SHA1 (patch-src_ip_Intercept.cc) = 972ad12063bcf3d24704976960f1a71452d0aa87
+SHA1 (patch-src_ip_Intercept.cc) = 8a8640d5f7eef217b2536646513eb872c67a7ffc
 SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
 SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f
diff --git a/www/squid3/patches/patch-src_ip_Intercept.cc b/www/squid3/patches/patch-src_ip_Intercept.cc
index b12b0e736b2..8439ab8ab4f 100644
--- a/www/squid3/patches/patch-src_ip_Intercept.cc
+++ b/www/squid3/patches/patch-src_ip_Intercept.cc
@@ -1,14 +1,10 @@
-$NetBSD: patch-src_ip_Intercept.cc,v 1.1 2013/02/10 18:16:53 adam Exp $
+$NetBSD: patch-src_ip_Intercept.cc,v 1.2 2013/04/27 17:51:24 tron Exp $
 
 Avoid conflict with IP Fitler's debug().
 
---- src/ip/Intercept.cc.orig	2013-02-09 07:30:01.000000000 +0000
-+++ src/ip/Intercept.cc
-@@ -34,9 +34,14 @@
- #include "comm/Connection.h"
- #include "ip/Intercept.h"
- #include "fde.h"
-+#include "../tools.h"
+--- src/ip/Intercept.cc.orig	2013-04-27 04:34:48.000000000 +0100
++++ src/ip/Intercept.cc	2013-04-27 18:40:24.000000000 +0100
+@@ -38,6 +38,10 @@
  
  #if IPF_TRANSPARENT
  
@@ -19,7 +15,7 @@ Avoid conflict with IP Fitler's debug().
  #if HAVE_SYS_IOCTL_H
  #include <sys/ioctl.h>
  #endif
-@@ -74,6 +79,10 @@
+@@ -75,6 +79,10 @@
  #include <errno.h>
  #endif