Changes 3.5.22:

* HTTP: MUST ignore a [revalidation] response with an older Date header.
* Optimized/simplified buffering: Appending nothing is always possible.
* Hide OpenSSL tricks from Valgrind far-reaching initialization errors.
* Avoid segfaults when debugging section 4 at level 9.
* Bug 4302 pt2: IPFilter v5 transparent interception
* Bug 4594: build failure with clang 3.9
* Bug 4471: revalidation doesn't work when expired cached object lacks Last-Modified.
* Bug 2833: Collapse internal revalidation requests (SMP-unaware caches)
* Bug 3819: "fd >= 0" assertion in file_write() during reconfiguration
* Do not leak url_rewrite_extras and store_id_extras on reconfigure/shutdown.
* Do reset $HOME if needed after r13435. Minimize putenv() memory leaks.
* Bug 4228: ./configure bug/typo in r14394.
* Fix potential ICAP null pointer dereference after rev.14082
* Fix logged request size (%http::>st) and other size-related %codes.

4 files changed, 15 insertions, 15 deletions

diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 351cd170dde..10624620ea2 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2016/09/11 17:41:17 taca Exp $
+# $NetBSD: Makefile,v 1.69 2016/10/10 09:01:39 adam Exp $
 
-DISTNAME=	squid-3.5.21
+DISTNAME=	squid-3.5.22
 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/PLIST b/www/squid3/PLIST
index 0bf02591cea..982017c30d9 100644
--- a/www/squid3/PLIST
+++ b/www/squid3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2015/07/06 09:39:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/10/10 09:01:39 adam Exp $
 bin/purge
 bin/squidclient
 ${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
@@ -6,37 +6,37 @@ ${PLIST.ba_LDAP}libexec/basic_ldap_auth
 ${PLIST.ba_NCSA}libexec/basic_ncsa_auth
 ${PLIST.ba_PAM}libexec/basic_pam_auth
 libexec/cachemgr.cgi
+${PLIST.ssl}libexec/cert_valid.pl
 ${PLIST.da_file}libexec/digest_file_auth
 ${PLIST.da_LDAP}libexec/digest_ldap_auth
 ${PLIST.diskd}libexec/diskd
 ${PLIST.eacl_file_userip}libexec/ext_file_userip_acl
 ${PLIST.eacl_LDAP_group}libexec/ext_ldap_group_acl
 ${PLIST.eacl_unix_group}libexec/ext_unix_group_acl
-${PLIST.ssl}libexec/cert_valid.pl
 libexec/helper-mux.pl
 libexec/log_db_daemon
 libexec/log_file_daemon
 ${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth
 ${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth_test
-${PLIST.unlinkd}libexec/unlinkd
 libexec/ntlm_fake_auth
 libexec/ntlm_smb_lm_auth
 libexec/pinger
 libexec/storeid_file_rewrite
+${PLIST.unlinkd}libexec/unlinkd
 libexec/url_fake_rewrite
 libexec/url_fake_rewrite.sh
 man/man1/squidclient.1
-man/man8/cachemgr.cgi.8
 ${PLIST.ba_getpwnam}man/man8/basic_getpwnam_auth.8
 ${PLIST.ba_LDAP}man/man8/basic_ldap_auth.8
 ${PLIST.ba_NCSA}man/man8/basic_ncsa_auth.8
 ${PLIST.ba_PAM}man/man8/basic_pam_auth.8
+man/man8/cachemgr.cgi.8
 ${PLIST.da_file}man/man8/digest_file_auth.8
 ${PLIST.eacl_file_userip}man/man8/ext_file_userip_acl.8
 ${PLIST.eacl_LDAP_group}man/man8/ext_ldap_group_acl.8
 ${PLIST.eacl_unix_group}man/man8/ext_unix_group_acl.8
-${PLIST.ta_kerberos}man/man8/negotiate_kerberos_auth.8
 man/man8/log_db_daemon.8
+${PLIST.ta_kerberos}man/man8/negotiate_kerberos_auth.8
 man/man8/squid.8
 man/man8/storeid_file_rewrite.8
 sbin/squid
diff --git a/www/squid3/distinfo b/www/squid3/distinfo
index f83ef3af578..34c0ab75f3d 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.54 2016/09/11 17:41:17 taca Exp $
+$NetBSD: distinfo,v 1.55 2016/10/10 09:01:39 adam Exp $
 
-SHA1 (squid-3.5.21.tar.xz) = 38c4f801a17e27ea530fef88c6ee24b42f08529c
-RMD160 (squid-3.5.21.tar.xz) = 2258b5794f6dac3a431c87378866087edb8cf82a
-SHA512 (squid-3.5.21.tar.xz) = 17c541062c785effe091cedca7c5133f20280bf8a83efe0f04778a85b44d16c695f374cb8721c2fb4a241d4c7065f132e9e6bf7deca858944b22397fbf22b301
-Size (squid-3.5.21.tar.xz) = 2320896 bytes
+SHA1 (squid-3.5.22.tar.xz) = 73e9199dd9d2a7f107f78d03454830713a4a571d
+RMD160 (squid-3.5.22.tar.xz) = 0a9e5545ae8fa20c5d9f97cfc3548c0e07c86ee4
+SHA512 (squid-3.5.22.tar.xz) = 40925c8b4d7b05a580397b1adf24457b66514eea2e05c0685251370aea3e48e0ac52b36ec9ec5ef5b1564ac46fec89bc8842e24cced413b9f3b24eb7778f6ba5
+Size (squid-3.5.22.tar.xz) = 2324164 bytes
 SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
 SHA1 (patch-compat_debug.cc) = 95fc0aa6901834175b9bbf1ddb51eeb7d9ddc8c7
 SHA1 (patch-compat_debug.h) = a828871704b1578b520d412393c3d398099a5fdc
diff --git a/www/squid3/options.mk b/www/squid3/options.mk
index d8e20ab7c38..cfa8d50c7a5 100644
--- a/www/squid3/options.mk
+++ b/www/squid3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2016/06/28 10:31:42 prlw1 Exp $
+# $NetBSD: options.mk,v 1.21 2016/10/10 09:01:39 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS=	ecap inet6 snmp ssl squid-backend-aufs \
@@ -70,9 +70,9 @@ SQUID_EXTERNAL_ACL_HELPERS?=	file_userip unix_group
 CONFIGURE_ARGS+=	--enable-linux-netfilter
 .elif !empty(PKG_OPTIONS:Msquid-pf)
 CONFIGURE_ARGS+=	--enable-pf-transparent
-.if ${OPSYS} == "NetBSD"
+.  if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--with-nat-devpf
-.endif
+.  endif
 .elif !empty(PKG_OPTIONS:Msquid-ipf)
 CONFIGURE_ARGS+=	--enable-ipf-transparent
 .elif !empty(PKG_OPTIONS:Msquid-ipfw)