Changes 3.3.5:

* Allocate ClientInfo::hash.key using malloc() instead of new char[]
* Bug 3851: Delay Pool class 5 tag:levels displayed incorrectly in cache manager
* Use case-insensitive comparison for HTTP header names in *_header_access
* Bug 3744: squid terminated: FATAL: Bungled (null) line 3: sslproxy_cert_sign signTrusted all
* Bug 3759: OpenSSL compilation error on stock Fedora17, RHEL, CentOS 6 systems
* Bug 3816: SSL_get_certificate call inside Ssl::verifySslCertificate crashes squid, part2
* Port from 2.6: external acl %ACL and %DATA tags
* Log an ERROR instead of halting on unknown cache_dir types
* Add missing piece omitted from rev.9677
* Remove origin_tries limiter on forwarding
* Fixed leaking configurable SSL error details.
* Fix memory error with Kerberos authentication
* Avoid !closing assertions when helpers call comm_read [during reconfigure].
* Avoid Comm::Connection leaks when helpers are reconfigured or otherwise closed.
* find-alive.pl: Replaced HttpReq entry (already covered by the guessing code) with HttpHeaderEntry entry
* Docs: Polish [http::]>h and [http::]>ha descriptions to emphasize their pre-cache scope
* Polish: show file path on Bungled lines

4 files changed, 20 insertions, 21 deletions

diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 196d5b8b3f6..26fd3d21479 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/05/23 15:28:45 tron Exp $
+# $NetBSD: Makefile,v 1.10 2013/05/23 20:21:28 adam Exp $
 
-DISTNAME=	squid-3.3.4
-PKGREVISION=	1
+DISTNAME=	squid-3.3.5
 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 38b267bf083..427ff8d6274 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.6 2013/04/27 17:51:24 tron Exp $
+$NetBSD: distinfo,v 1.7 2013/05/23 20:21:28 adam Exp $
 
-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 (squid-3.3.5.tar.xz) = 60b1b46683cccd3d845f324dbedb9f289d375115
+RMD160 (squid-3.3.5.tar.xz) = 400fe3a362a127e90ea0ece556e48ac414644f31
+Size (squid-3.3.5.tar.xz) = 2180668 bytes
+SHA1 (patch-configure) = 86400fd701a84eb174395755eec7b13cbfce55ec
 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
 SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
-SHA1 (patch-src_Makefile.in) = 32bc968a7680414d87acf1a4c96822a3d80c2030
+SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e
 SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
 SHA1 (patch-src_ip_Intercept.cc) = 8a8640d5f7eef217b2536646513eb872c67a7ffc
 SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
diff --git a/www/squid3/patches/patch-configure b/www/squid3/patches/patch-configure
index 018fbeff965..b9f72b37a74 100644
--- a/www/squid3/patches/patch-configure
+++ b/www/squid3/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2013/02/10 18:16:53 adam Exp $
+$NetBSD: patch-configure,v 1.2 2013/05/23 20:21:28 adam Exp $
 
 Compatibility problems.
 
---- configure.orig	2013-02-09 07:30:57.000000000 +0000
+--- configure.orig	2013-05-20 11:50:55.000000000 +0000
 +++ configure
-@@ -22437,7 +22437,7 @@ fi
+@@ -22798,7 +22798,7 @@ fi
  
  done
  
@@ -13,7 +13,7 @@ Compatibility problems.
      for ac_header in gssapi/gssapi_generic.h
  do :
    ac_fn_cxx_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default"
-@@ -22634,7 +22634,7 @@ done
+@@ -22995,7 +22995,7 @@ done
  
  
    ac_com_error_message=no
@@ -22,7 +22,7 @@ Compatibility problems.
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <com_err.h>
-@@ -22646,7 +22646,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -23007,7 +23007,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
  fi
  rm -f conftest*
  
@@ -31,7 +31,7 @@ Compatibility problems.
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <et/com_err.h>
-@@ -22707,7 +22707,7 @@ $as_echo "#define HAVE_MAX_SKEW_IN_KRB5_
+@@ -23068,7 +23068,7 @@ $as_echo "#define HAVE_MAX_SKEW_IN_KRB5_
  
    fi
  
@@ -40,7 +40,7 @@ Compatibility problems.
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lcom_err" >&5
  $as_echo_n "checking for error_message in -lcom_err... " >&6; }
  if ${ac_cv_lib_com_err_error_message+:} false; then :
-@@ -22750,7 +22750,7 @@ $as_echo "#define HAVE_ERROR_MESSAGE 1" 
+@@ -23111,7 +23111,7 @@ $as_echo "#define HAVE_ERROR_MESSAGE 1" 
  
  fi
  
diff --git a/www/squid3/patches/patch-src_Makefile.in b/www/squid3/patches/patch-src_Makefile.in
index c676468d21a..83789cf048a 100644
--- a/www/squid3/patches/patch-src_Makefile.in
+++ b/www/squid3/patches/patch-src_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_Makefile.in,v 1.2 2013/03/13 17:11:26 taca Exp $
+$NetBSD: patch-src_Makefile.in,v 1.3 2013/05/23 20:21:28 adam Exp $
 
 Don't install squid.conf.
 
---- src/Makefile.in.orig	2013-02-09 07:30:35.000000000 +0000
+--- src/Makefile.in.orig	2013-05-20 11:50:04.000000000 +0000
 +++ src/Makefile.in
-@@ -7163,14 +7163,14 @@ info: info-recursive
+@@ -7175,14 +7175,14 @@ info: info-recursive
  
  info-am:
  
@@ -21,10 +21,10 @@ Don't install squid.conf.
  
  install-html: install-html-recursive
  
-@@ -7283,7 +7283,7 @@ cache_cf.o: cf_parser.cci
+@@ -7295,7 +7295,7 @@ cache_cf.o: cf_parser.cci
  
  # cf_gen builds the configuration files.
- cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
 -	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
 +	$(HOSTCXX) $(CXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src