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

8 files changed, 193 insertions, 145 deletions

diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 3de9217c83a..9f0e2b0165e 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -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 @@ MAKE_ENV+=		PKG_PREFIX=${PREFIX} VARBASE=${VARBASE}
 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 --git a/www/squid3/PLIST b/www/squid3/PLIST
index 38473d460d3..0dfea3f21c1 100644
--- a/www/squid3/PLIST
+++ b/www/squid3/PLIST
@@ -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_db_daemon
 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 @@ sbin/squid
 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_URN_RESOLVE
 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_WRITE_ERROR
 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_WRITE_ERROR
 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_URN_RESOLVE
 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_URN_RESOLVE
 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
-share/squid/errors/zh-tw/ERR_INVALID_URL
-share/squid/errors/zh-tw/ERR_LIFETIME_EXP
-share/squid/errors/zh-tw/ERR_NO_RELAY
-share/squid/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS
-share/squid/errors/zh-tw/ERR_PRECONDITION_FAILED
-share/squid/errors/zh-tw/ERR_READ_ERROR
-share/squid/errors/zh-tw/ERR_READ_TIMEOUT
-share/squid/errors/zh-tw/ERR_SECURE_CONNECT_FAIL
-share/squid/errors/zh-tw/ERR_SHUTTING_DOWN
-share/squid/errors/zh-tw/ERR_SOCKET_FAILURE
-share/squid/errors/zh-tw/ERR_TOO_BIG
-share/squid/errors/zh-tw/ERR_UNSUP_HTTPVERSION
-share/squid/errors/zh-tw/ERR_UNSUP_REQ
-share/squid/errors/zh-tw/ERR_URN_RESOLVE
-share/squid/errors/zh-tw/ERR_WRITE_ERROR
-share/squid/errors/zh-tw/ERR_ZERO_SIZE_OBJECT
-share/squid/errors/zh-tw/error-details.txt
+share/squid/errors/zh-tw
 share/squid/icons/SN.png
 share/squid/icons/silk/application.png
 share/squid/icons/silk/arrow_up.png
diff --git a/www/squid3/distinfo b/www/squid3/distinfo
index 2ff36845c98..8b9b16736f6 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.28 2015/01/17 10:20:57 adam Exp $
+$NetBSD: distinfo,v 1.29 2015/01/21 11:23:16 adam Exp $
 
-SHA1 (squid-3.4.11.tar.xz) = 7de0949714cda4d3f19073aa846f00768a6f841b
-RMD160 (squid-3.4.11.tar.xz) = f8d643d4cecdee382d90152afd50cf0db121328c
-Size (squid-3.4.11.tar.xz) = 2162148 bytes
+SHA1 (squid-3.5.1.tar.xz) = a2b01afd33d1df3a234e1a5c3405d626f6cf0fb0
+RMD160 (squid-3.5.1.tar.xz) = c0adf12299ce7fcc2a9f45a81f8eabba45788cbb
+Size (squid-3.5.1.tar.xz) = 2281248 bytes
 SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
+SHA1 (patch-configure) = b0137b706bf49b8463e355f69693e85877c22de5
 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
-SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
-SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e
+SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6
 SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
 SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
-SHA1 (patch-src_ip_Intercept.cc) = 75dcd6ffc36ab7cd165469fe5f679ce56187cf4f
+SHA1 (patch-src_ip_Intercept.cc) = 80de6ca56d61e389641b35515e3509b264b1950f
 SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
 SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f
diff --git a/www/squid3/options.mk b/www/squid3/options.mk
index 2dad9d5984f..bba2ec55ecf 100644
--- a/www/squid3/options.mk
+++ b/www/squid3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2014/04/01 09:57:07 adam Exp $
+# $NetBSD: options.mk,v 1.14 2015/01/21 11:23:16 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS=	inet6 snmp ssl squid-backend-aufs squid-backend-diskd \
@@ -11,9 +11,9 @@ PKG_OPTIONS_LEGACY_OPTS+=	diskd:squid-backend-diskd \
 	arp-acl:squid-arp-acl pam-helper:squid-pam-helper carp:squid-carp
 
 PLIST_VARS+=	diskd snmp unlinkd
-PLIST_VARS+=	ba_LDAP ba_MSNT ba_NCSA ba_NIS ba_PAM ba_getpwnam
+PLIST_VARS+=	ba_LDAP ba_NCSA ba_NIS ba_PAM ba_getpwnam
 PLIST_VARS+=	da_file da_LDAP
-PLIST_VARS+=	na_SMB
+PLIST_VARS+=	na_sml_lm
 PLIST_VARS+=	ta_kerberos
 PLIST_VARS+=	eacl_file_userip eacl_LDAP_group eacl_unix_group
 PLIST_VARS+=	ssl
@@ -59,9 +59,9 @@ PKG_SUPPORTED_OPTIONS+=	squid-arp-acl
 .include "../../mk/bsd.options.mk"
 
 SQUID_BACKENDS?=		ufs
-SQUID_BASIC_AUTH_HELPERS?=	MSNT NCSA NIS getpwnam
+SQUID_BASIC_AUTH_HELPERS?=	NCSA NIS getpwnam
 SQUID_DIGEST_AUTH_HELPERS?=	file
-SQUID_NTLM_AUTH_HELPERS?=	fake
+SQUID_NTLM_AUTH_HELPERS?=	fake smb_lm
 SQUID_EXTERNAL_ACL_HELPERS?=	file_userip unix_group
 
 # squid's code has preference as:
@@ -190,8 +190,11 @@ squid-enable-helper-negotiate_auth:
 CONFIGURE_ARGS+=	--disable-auth-ntlm
 .else
 CONFIGURE_ARGS+=	--enable-auth-ntlm=${SQUID_NTLM_AUTH_HELPERS:Q}
+.PHONY: squid-enable-helper-ntlm_auth
+pre-configure: squid-enable-helper-ntlm_auth
+squid-enable-helper-ntlm_auth:
 .  for i in ${SQUID_NTLM_AUTH_HELPERS}
-PLIST.na_${i}=		yes
+	${ECHO} "exit 0" > ${WRKSRC}/helpers/ntlm_auth/${i}/config.test
 .  endfor
 .endif
 
diff --git a/www/squid3/patches/patch-configure b/www/squid3/patches/patch-configure
new file mode 100644
index 00000000000..fdc0d27eb28
--- /dev/null
+++ b/www/squid3/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.4 2015/01/21 11:23:16 adam Exp $
+
+Portability fix.
+
+--- configure.orig	2015-01-21 08:58:55.000000000 +0000
++++ configure
+@@ -32600,7 +32600,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
+ 
+@@ -33141,7 +33141,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"
+ 
+   squid_cv_check_sasl="auto"
diff --git a/www/squid3/patches/patch-helpers_basic_auth_MSNT_Makefile.in b/www/squid3/patches/patch-helpers_basic_auth_MSNT_Makefile.in
deleted file mode 100644
index c2d72ed1994..00000000000
--- a/www/squid3/patches/patch-helpers_basic_auth_MSNT_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-helpers_basic_auth_MSNT_Makefile.in,v 1.1 2013/02/10 18:16:53 adam Exp $
-
-Don't install msntauth.conf.
-
---- helpers/basic_auth/MSNT/Makefile.in.orig	2013-02-01 10:56:13.000000000 +0000
-+++ helpers/basic_auth/MSNT/Makefile.in
-@@ -756,13 +756,13 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-data-local
-+install-data-am:
- 
- install-dvi: install-dvi-am
- 
- install-dvi-am:
- 
--install-exec-am: install-libexecPROGRAMS install-sysconfDATA
-+install-exec-am: install-libexecPROGRAMS
- 
- install-html: install-html-am
- 
diff --git a/www/squid3/patches/patch-src_Makefile.in b/www/squid3/patches/patch-src_Makefile.in
index 83789cf048a..40fef5ebc84 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.3 2013/05/23 20:21:28 adam Exp $
+$NetBSD: patch-src_Makefile.in,v 1.4 2015/01/21 11:23:16 adam Exp $
 
 Don't install squid.conf.
 
---- src/Makefile.in.orig	2013-05-20 11:50:04.000000000 +0000
+--- src/Makefile.in.orig	2015-01-13 12:53:47.000000000 +0000
 +++ src/Makefile.in
-@@ -7175,14 +7175,14 @@ info: info-recursive
+@@ -7637,14 +7637,14 @@ info: info-recursive
  
  info-am:
  
@@ -21,12 +21,3 @@ Don't install squid.conf.
  
  install-html: install-html-recursive
  
-@@ -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_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
- 
- # squid.conf.default is built by cf_gen when making cf_parser.cci
- squid.conf.default squid.conf.documented: cf_parser.cci
diff --git a/www/squid3/patches/patch-src_ip_Intercept.cc b/www/squid3/patches/patch-src_ip_Intercept.cc
index 02e7488b655..843ad5d7eaa 100644
--- a/www/squid3/patches/patch-src_ip_Intercept.cc
+++ b/www/squid3/patches/patch-src_ip_Intercept.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_ip_Intercept.cc,v 1.3 2015/01/16 11:41:11 adam Exp $
+$NetBSD: patch-src_ip_Intercept.cc,v 1.4 2015/01/21 11:23:16 adam Exp $
 
 Avoid conflict with IP Fitler's debug().
 
---- src/ip/Intercept.cc.orig	2015-01-13 11:53:17.000000000 +0000
+--- src/ip/Intercept.cc.orig	2015-01-13 12:52:01.000000000 +0000
 +++ src/ip/Intercept.cc
-@@ -42,6 +42,10 @@
+@@ -21,6 +21,10 @@
  
  #if IPF_TRANSPARENT
  
@@ -15,8 +15,8 @@ Avoid conflict with IP Fitler's debug().
  #if !defined(IPFILTER_VERSION)
  #define IPFILTER_VERSION        5000004
  #endif
-@@ -92,6 +96,10 @@
- #include <errno.h>
+@@ -68,6 +72,10 @@
+ #include <netinet/ip_nat.h>
  #endif
  
 +// Stolen from src/defines.h