[pkgsrc/trunk]: pkgsrc/www/squid3 Changes 3.5.1:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/093b23d8f82f
branches:  trunk
changeset: 645031:093b23d8f82f
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jan 21 11:23:16 2015 +0000

description:
Changes 3.5.1:
Support libecap v1.0
Authentication helper query extensions
Support named services
Upgraded squidclient tool
Helper support for concurrency channels
Native FTP Relay
Receive PROXY protocol, Versions 1 & 2
Basic authentication MSNT helper changes

diffstat:

 www/squid3/Makefile                                          |    7 +-
 www/squid3/PLIST                                             |  231 ++++++----
 www/squid3/distinfo                                          |   14 +-
 www/squid3/options.mk                                        |   15 +-
 www/squid3/patches/patch-configure                           |   24 +
 www/squid3/patches/patch-helpers_basic_auth_MSNT_Makefile.in |   22 -
 www/squid3/patches/patch-src_Makefile.in                     |   15 +-
 www/squid3/patches/patch-src_ip_Intercept.cc                 |   10 +-
 8 files changed, 193 insertions(+), 145 deletions(-)

diffs (truncated from 504 to 300 lines):

diff -r c3507dcd6e48 -r 093b23d8f82f www/squid3/Makefile
--- a/www/squid3/Makefile       Wed Jan 21 09:12:41 2015 +0000
+++ b/www/squid3/Makefile       Wed Jan 21 11:23:16 2015 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2015/01/16 11:41:11 adam Exp $
+# $NetBSD: Makefile,v 1.41 2015/01/21 11:23:16 adam Exp $
 
-DISTNAME=      squid-3.4.11
+DISTNAME=      squid-3.5.1
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
                ftp://ftp.squid-cache.org/pub/squid/ \
@@ -40,10 +40,9 @@
 REPLACE_PERL+=         helpers/ssl/cert_valid.pl tools/helper-mux.pl
 
 EGFILES=       src/mime.conf.default src/squid.conf.default \
-               helpers/basic_auth/MSNT/msntauth.conf.default \
                errors/errorpage.css tools/cachemgr.conf
 EGDIR=         share/examples/squid
-.for f in cachemgr.conf errorpage.css mime.conf squid.conf msntauth.conf
+.for f in cachemgr.conf errorpage.css mime.conf squid.conf
 CONF_FILES+=   ${PREFIX}/${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 OWN_DIRS=      ${SQUID_DATADIR}
diff -r c3507dcd6e48 -r 093b23d8f82f www/squid3/PLIST
--- a/www/squid3/PLIST  Wed Jan 21 09:12:41 2015 +0000
+++ b/www/squid3/PLIST  Wed Jan 21 11:23:16 2015 +0000
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2014/03/11 14:05:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/01/21 11:23:16 adam Exp $
 bin/purge
 bin/squidclient
 ${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
 ${PLIST.ba_LDAP}libexec/basic_ldap_auth
-${PLIST.ba_MSNT}libexec/basic_msnt_auth
 ${PLIST.ba_NCSA}libexec/basic_ncsa_auth
-${PLIST.ba_NIS}libexec/basic_nis_auth
 ${PLIST.ba_PAM}libexec/basic_pam_auth
 libexec/cachemgr.cgi
 ${PLIST.da_file}libexec/digest_file_auth
@@ -20,9 +18,9 @@
 libexec/log_file_daemon
 ${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth
 ${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth_test
-${PLIST.na_SMB}libexec/ntlm_auth
 ${PLIST.unlinkd}libexec/unlinkd
 libexec/ntlm_fake_auth
+libexec/ntlm_smb_lm_auth
 libexec/pinger
 libexec/storeid_file_rewrite
 libexec/url_fake_rewrite
@@ -45,7 +43,6 @@
 share/examples/squid/cachemgr.conf
 share/examples/squid/errorpage.css
 share/examples/squid/mime.conf
-share/examples/squid/msntauth.conf
 share/examples/squid/squid.conf
 share/squid/errors/COPYRIGHT
 share/squid/errors/TRANSLATORS
@@ -1009,6 +1006,49 @@
 share/squid/errors/ja/ERR_WRITE_ERROR
 share/squid/errors/ja/ERR_ZERO_SIZE_OBJECT
 share/squid/errors/ja/error-details.txt
+share/squid/errors/ka-ge
+share/squid/errors/ka/ERR_ACCESS_DENIED
+share/squid/errors/ka/ERR_ACL_TIME_QUOTA_EXCEEDED
+share/squid/errors/ka/ERR_AGENT_CONFIGURE
+share/squid/errors/ka/ERR_AGENT_WPAD
+share/squid/errors/ka/ERR_CACHE_ACCESS_DENIED
+share/squid/errors/ka/ERR_CACHE_MGR_ACCESS_DENIED
+share/squid/errors/ka/ERR_CANNOT_FORWARD
+share/squid/errors/ka/ERR_CONFLICT_HOST
+share/squid/errors/ka/ERR_CONNECT_FAIL
+share/squid/errors/ka/ERR_DIR_LISTING
+share/squid/errors/ka/ERR_DNS_FAIL
+share/squid/errors/ka/ERR_ESI
+share/squid/errors/ka/ERR_FORWARDING_DENIED
+share/squid/errors/ka/ERR_FTP_DISABLED
+share/squid/errors/ka/ERR_FTP_FAILURE
+share/squid/errors/ka/ERR_FTP_FORBIDDEN
+share/squid/errors/ka/ERR_FTP_NOT_FOUND
+share/squid/errors/ka/ERR_FTP_PUT_CREATED
+share/squid/errors/ka/ERR_FTP_PUT_ERROR
+share/squid/errors/ka/ERR_FTP_PUT_MODIFIED
+share/squid/errors/ka/ERR_FTP_UNAVAILABLE
+share/squid/errors/ka/ERR_GATEWAY_FAILURE
+share/squid/errors/ka/ERR_ICAP_FAILURE
+share/squid/errors/ka/ERR_INVALID_REQ
+share/squid/errors/ka/ERR_INVALID_RESP
+share/squid/errors/ka/ERR_INVALID_URL
+share/squid/errors/ka/ERR_LIFETIME_EXP
+share/squid/errors/ka/ERR_NO_RELAY
+share/squid/errors/ka/ERR_ONLY_IF_CACHED_MISS
+share/squid/errors/ka/ERR_PRECONDITION_FAILED
+share/squid/errors/ka/ERR_READ_ERROR
+share/squid/errors/ka/ERR_READ_TIMEOUT
+share/squid/errors/ka/ERR_SECURE_CONNECT_FAIL
+share/squid/errors/ka/ERR_SHUTTING_DOWN
+share/squid/errors/ka/ERR_SOCKET_FAILURE
+share/squid/errors/ka/ERR_TOO_BIG
+share/squid/errors/ka/ERR_UNSUP_HTTPVERSION
+share/squid/errors/ka/ERR_UNSUP_REQ
+share/squid/errors/ka/ERR_URN_RESOLVE
+share/squid/errors/ka/ERR_WRITE_ERROR
+share/squid/errors/ka/ERR_ZERO_SIZE_OBJECT
+share/squid/errors/ka/error-details.txt
 share/squid/errors/ko-kp
 share/squid/errors/ko-kr
 share/squid/errors/ko/ERR_ACCESS_DENIED
@@ -1570,6 +1610,9 @@
 share/squid/errors/sl/ERR_ZERO_SIZE_OBJECT
 share/squid/errors/sl/error-details.txt
 share/squid/errors/sr
+share/squid/errors/sr-cyrl-cs
+share/squid/errors/sr-cyrl-me
+share/squid/errors/sr-cyrl-rs
 share/squid/errors/sr-cyrl/ERR_ACCESS_DENIED
 share/squid/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED
 share/squid/errors/sr-cyrl/ERR_AGENT_CONFIGURE
@@ -1613,6 +1656,8 @@
 share/squid/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT
 share/squid/errors/sr-cyrl/error-details.txt
 share/squid/errors/sr-latn-cs
+share/squid/errors/sr-latn-me
+share/squid/errors/sr-latn-rs
 share/squid/errors/sr-latn/ERR_ACCESS_DENIED
 share/squid/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED
 share/squid/errors/sr-latn/ERR_AGENT_CONFIGURE
@@ -1655,6 +1700,7 @@
 share/squid/errors/sr-latn/ERR_WRITE_ERROR
 share/squid/errors/sr-latn/ERR_ZERO_SIZE_OBJECT
 share/squid/errors/sr-latn/error-details.txt
+share/squid/errors/sr-rs
 share/squid/errors/sr-sp
 share/squid/errors/sv-fi
 share/squid/errors/sv-se
@@ -1956,93 +2002,100 @@
 share/squid/errors/vi/ERR_WRITE_ERROR
 share/squid/errors/vi/ERR_ZERO_SIZE_OBJECT
 share/squid/errors/vi/error-details.txt
-share/squid/errors/zh-cn/ERR_ACCESS_DENIED
-share/squid/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED
-share/squid/errors/zh-cn/ERR_AGENT_CONFIGURE
-share/squid/errors/zh-cn/ERR_AGENT_WPAD
-share/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
-share/squid/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED
-share/squid/errors/zh-cn/ERR_CANNOT_FORWARD
-share/squid/errors/zh-cn/ERR_CONFLICT_HOST
-share/squid/errors/zh-cn/ERR_CONNECT_FAIL
-share/squid/errors/zh-cn/ERR_DIR_LISTING
-share/squid/errors/zh-cn/ERR_DNS_FAIL
-share/squid/errors/zh-cn/ERR_ESI
-share/squid/errors/zh-cn/ERR_FORWARDING_DENIED
-share/squid/errors/zh-cn/ERR_FTP_DISABLED
-share/squid/errors/zh-cn/ERR_FTP_FAILURE
-share/squid/errors/zh-cn/ERR_FTP_FORBIDDEN
-share/squid/errors/zh-cn/ERR_FTP_NOT_FOUND
-share/squid/errors/zh-cn/ERR_FTP_PUT_CREATED
-share/squid/errors/zh-cn/ERR_FTP_PUT_ERROR
-share/squid/errors/zh-cn/ERR_FTP_PUT_MODIFIED
-share/squid/errors/zh-cn/ERR_FTP_UNAVAILABLE
-share/squid/errors/zh-cn/ERR_GATEWAY_FAILURE
-share/squid/errors/zh-cn/ERR_ICAP_FAILURE
-share/squid/errors/zh-cn/ERR_INVALID_REQ
-share/squid/errors/zh-cn/ERR_INVALID_RESP
-share/squid/errors/zh-cn/ERR_INVALID_URL
-share/squid/errors/zh-cn/ERR_LIFETIME_EXP
-share/squid/errors/zh-cn/ERR_NO_RELAY
-share/squid/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS
-share/squid/errors/zh-cn/ERR_PRECONDITION_FAILED
-share/squid/errors/zh-cn/ERR_READ_ERROR
-share/squid/errors/zh-cn/ERR_READ_TIMEOUT
-share/squid/errors/zh-cn/ERR_SECURE_CONNECT_FAIL
-share/squid/errors/zh-cn/ERR_SHUTTING_DOWN
-share/squid/errors/zh-cn/ERR_SOCKET_FAILURE
-share/squid/errors/zh-cn/ERR_TOO_BIG
-share/squid/errors/zh-cn/ERR_UNSUP_HTTPVERSION
-share/squid/errors/zh-cn/ERR_UNSUP_REQ
-share/squid/errors/zh-cn/ERR_URN_RESOLVE
-share/squid/errors/zh-cn/ERR_WRITE_ERROR
-share/squid/errors/zh-cn/ERR_ZERO_SIZE_OBJECT
-share/squid/errors/zh-cn/error-details.txt
+share/squid/errors/zh-cn
+share/squid/errors/zh-hans-cn
+share/squid/errors/zh-hans-sg
+share/squid/errors/zh-hans/ERR_ACCESS_DENIED
+share/squid/errors/zh-hans/ERR_ACL_TIME_QUOTA_EXCEEDED
+share/squid/errors/zh-hans/ERR_AGENT_CONFIGURE
+share/squid/errors/zh-hans/ERR_AGENT_WPAD
+share/squid/errors/zh-hans/ERR_CACHE_ACCESS_DENIED
+share/squid/errors/zh-hans/ERR_CACHE_MGR_ACCESS_DENIED
+share/squid/errors/zh-hans/ERR_CANNOT_FORWARD
+share/squid/errors/zh-hans/ERR_CONFLICT_HOST
+share/squid/errors/zh-hans/ERR_CONNECT_FAIL
+share/squid/errors/zh-hans/ERR_DIR_LISTING
+share/squid/errors/zh-hans/ERR_DNS_FAIL
+share/squid/errors/zh-hans/ERR_ESI
+share/squid/errors/zh-hans/ERR_FORWARDING_DENIED
+share/squid/errors/zh-hans/ERR_FTP_DISABLED
+share/squid/errors/zh-hans/ERR_FTP_FAILURE
+share/squid/errors/zh-hans/ERR_FTP_FORBIDDEN
+share/squid/errors/zh-hans/ERR_FTP_NOT_FOUND
+share/squid/errors/zh-hans/ERR_FTP_PUT_CREATED
+share/squid/errors/zh-hans/ERR_FTP_PUT_ERROR
+share/squid/errors/zh-hans/ERR_FTP_PUT_MODIFIED
+share/squid/errors/zh-hans/ERR_FTP_UNAVAILABLE
+share/squid/errors/zh-hans/ERR_GATEWAY_FAILURE
+share/squid/errors/zh-hans/ERR_ICAP_FAILURE
+share/squid/errors/zh-hans/ERR_INVALID_REQ
+share/squid/errors/zh-hans/ERR_INVALID_RESP
+share/squid/errors/zh-hans/ERR_INVALID_URL
+share/squid/errors/zh-hans/ERR_LIFETIME_EXP
+share/squid/errors/zh-hans/ERR_NO_RELAY
+share/squid/errors/zh-hans/ERR_ONLY_IF_CACHED_MISS
+share/squid/errors/zh-hans/ERR_PRECONDITION_FAILED
+share/squid/errors/zh-hans/ERR_READ_ERROR
+share/squid/errors/zh-hans/ERR_READ_TIMEOUT
+share/squid/errors/zh-hans/ERR_SECURE_CONNECT_FAIL
+share/squid/errors/zh-hans/ERR_SHUTTING_DOWN
+share/squid/errors/zh-hans/ERR_SOCKET_FAILURE
+share/squid/errors/zh-hans/ERR_TOO_BIG
+share/squid/errors/zh-hans/ERR_UNSUP_HTTPVERSION
+share/squid/errors/zh-hans/ERR_UNSUP_REQ
+share/squid/errors/zh-hans/ERR_URN_RESOLVE
+share/squid/errors/zh-hans/ERR_WRITE_ERROR
+share/squid/errors/zh-hans/ERR_ZERO_SIZE_OBJECT
+share/squid/errors/zh-hans/error-details.txt
+share/squid/errors/zh-hant-hk
+share/squid/errors/zh-hant-mo
+share/squid/errors/zh-hant-tw
+share/squid/errors/zh-hant/ERR_ACCESS_DENIED
+share/squid/errors/zh-hant/ERR_ACL_TIME_QUOTA_EXCEEDED
+share/squid/errors/zh-hant/ERR_AGENT_CONFIGURE
+share/squid/errors/zh-hant/ERR_AGENT_WPAD
+share/squid/errors/zh-hant/ERR_CACHE_ACCESS_DENIED
+share/squid/errors/zh-hant/ERR_CACHE_MGR_ACCESS_DENIED
+share/squid/errors/zh-hant/ERR_CANNOT_FORWARD
+share/squid/errors/zh-hant/ERR_CONFLICT_HOST
+share/squid/errors/zh-hant/ERR_CONNECT_FAIL
+share/squid/errors/zh-hant/ERR_DIR_LISTING
+share/squid/errors/zh-hant/ERR_DNS_FAIL
+share/squid/errors/zh-hant/ERR_ESI
+share/squid/errors/zh-hant/ERR_FORWARDING_DENIED
+share/squid/errors/zh-hant/ERR_FTP_DISABLED
+share/squid/errors/zh-hant/ERR_FTP_FAILURE
+share/squid/errors/zh-hant/ERR_FTP_FORBIDDEN
+share/squid/errors/zh-hant/ERR_FTP_NOT_FOUND
+share/squid/errors/zh-hant/ERR_FTP_PUT_CREATED
+share/squid/errors/zh-hant/ERR_FTP_PUT_ERROR
+share/squid/errors/zh-hant/ERR_FTP_PUT_MODIFIED
+share/squid/errors/zh-hant/ERR_FTP_UNAVAILABLE
+share/squid/errors/zh-hant/ERR_GATEWAY_FAILURE
+share/squid/errors/zh-hant/ERR_ICAP_FAILURE
+share/squid/errors/zh-hant/ERR_INVALID_REQ
+share/squid/errors/zh-hant/ERR_INVALID_RESP
+share/squid/errors/zh-hant/ERR_INVALID_URL
+share/squid/errors/zh-hant/ERR_LIFETIME_EXP
+share/squid/errors/zh-hant/ERR_NO_RELAY
+share/squid/errors/zh-hant/ERR_ONLY_IF_CACHED_MISS
+share/squid/errors/zh-hant/ERR_PRECONDITION_FAILED
+share/squid/errors/zh-hant/ERR_READ_ERROR
+share/squid/errors/zh-hant/ERR_READ_TIMEOUT
+share/squid/errors/zh-hant/ERR_SECURE_CONNECT_FAIL
+share/squid/errors/zh-hant/ERR_SHUTTING_DOWN
+share/squid/errors/zh-hant/ERR_SOCKET_FAILURE
+share/squid/errors/zh-hant/ERR_TOO_BIG
+share/squid/errors/zh-hant/ERR_UNSUP_HTTPVERSION
+share/squid/errors/zh-hant/ERR_UNSUP_REQ
+share/squid/errors/zh-hant/ERR_URN_RESOLVE
+share/squid/errors/zh-hant/ERR_WRITE_ERROR
+share/squid/errors/zh-hant/ERR_ZERO_SIZE_OBJECT
+share/squid/errors/zh-hant/error-details.txt
 share/squid/errors/zh-hk
 share/squid/errors/zh-mo
 share/squid/errors/zh-sg
-share/squid/errors/zh-tw/ERR_ACCESS_DENIED
-share/squid/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED
-share/squid/errors/zh-tw/ERR_AGENT_CONFIGURE
-share/squid/errors/zh-tw/ERR_AGENT_WPAD
-share/squid/errors/zh-tw/ERR_CACHE_ACCESS_DENIED
-share/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
-share/squid/errors/zh-tw/ERR_CANNOT_FORWARD
-share/squid/errors/zh-tw/ERR_CONFLICT_HOST
-share/squid/errors/zh-tw/ERR_CONNECT_FAIL
-share/squid/errors/zh-tw/ERR_DIR_LISTING
-share/squid/errors/zh-tw/ERR_DNS_FAIL
-share/squid/errors/zh-tw/ERR_ESI
-share/squid/errors/zh-tw/ERR_FORWARDING_DENIED
-share/squid/errors/zh-tw/ERR_FTP_DISABLED
-share/squid/errors/zh-tw/ERR_FTP_FAILURE
-share/squid/errors/zh-tw/ERR_FTP_FORBIDDEN
-share/squid/errors/zh-tw/ERR_FTP_NOT_FOUND
-share/squid/errors/zh-tw/ERR_FTP_PUT_CREATED
-share/squid/errors/zh-tw/ERR_FTP_PUT_ERROR
-share/squid/errors/zh-tw/ERR_FTP_PUT_MODIFIED
-share/squid/errors/zh-tw/ERR_FTP_UNAVAILABLE
-share/squid/errors/zh-tw/ERR_GATEWAY_FAILURE
-share/squid/errors/zh-tw/ERR_ICAP_FAILURE
-share/squid/errors/zh-tw/ERR_INVALID_REQ
-share/squid/errors/zh-tw/ERR_INVALID_RESP