# HG changeset patch
# User Craig Mohrman <craig.mohrman@oracle.com>
# Date 1444409713 25200
# Node ID 79af241b48341febfb232e4b75606f82333cec7f
# Parent  ed3830c87e7bf1b25730d84cd430f9f704ffcc9a
21843191 squid upgrade in 21305852 dropped password by accident

diff -r ed3830c87e7b -r 79af241b4834 components/squid/Makefile
--- a/components/squid/Makefile	Mon Aug 03 15:31:47 2015 -0700
+++ b/components/squid/Makefile	Fri Oct 09 09:55:13 2015 -0700
@@ -62,12 +62,12 @@
 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_PREFIX)/man
 CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_PREFIX)/sbin
 CONFIGURE_OPTIONS += --enable-arp-acl
-CONFIGURE_OPTIONS += --enable-auth-basic='DB,NCSA,LDAP,PAM,getpwnam,MSNT-multi-domain,POP3,SMB,SASL'
+CONFIGURE_OPTIONS += --enable-auth-basic='DB,NCSA,NIS,LDAP,PAM,getpwnam,MSNT-multi-domain,POP3,SMB,SMB_LM,SASL'
 CONFIGURE_OPTIONS += --enable-cache-digests
 CONFIGURE_OPTIONS += --enable-carp
 CONFIGURE_OPTIONS += --enable-coss-aio-ops
 CONFIGURE_OPTIONS += --enable-delay-pools
-CONFIGURE_OPTIONS += --enable-auth-digest='LDAP'
+CONFIGURE_OPTIONS += --enable-auth-digest='file,LDAP'
 CONFIGURE_OPTIONS += --enable-external-acl-helpers='file_userip,unix_group,LDAP_group,wbinfo_group'
 CONFIGURE_OPTIONS += --enable-follow-x-forwarded-for
 CONFIGURE_OPTIONS += --enable-forward-log
diff -r ed3830c87e7b -r 79af241b4834 components/squid/squid.p5m
--- a/components/squid/squid.p5m	Mon Aug 03 15:31:47 2015 -0700
+++ b/components/squid/squid.p5m	Fri Oct 09 09:55:13 2015 -0700
@@ -64,12 +64,15 @@
 file path=usr/squid/libexec/basic_ldap_auth
 file path=usr/squid/libexec/basic_msnt_multi_domain_auth
 file path=usr/squid/libexec/basic_ncsa_auth
+file path=usr/squid/libexec/basic_nis_auth
 file path=usr/squid/libexec/basic_pam_auth
 file path=usr/squid/libexec/basic_pop3_auth
 file path=usr/squid/libexec/basic_sasl_auth
 file path=usr/squid/libexec/basic_smb_auth
 file path=usr/squid/libexec/basic_smb_auth.sh
+file path=usr/squid/libexec/basic_smb_lm_auth
 file path=usr/squid/libexec/cachemgr.cgi
+file path=usr/squid/libexec/digest_file_auth
 file path=usr/squid/libexec/digest_ldap_auth
 file path=usr/squid/libexec/diskd
 file path=usr/squid/libexec/ext_file_userip_acl
@@ -98,6 +101,7 @@
 file path=usr/squid/man/man8/basic_pop3_auth.8
 file path=usr/squid/man/man8/basic_sasl_auth.8
 file path=usr/squid/man/man8/cachemgr.cgi.8
+file path=usr/squid/man/man8/digest_file_auth.8
 file path=usr/squid/man/man8/ext_file_userip_acl.8
 file path=usr/squid/man/man8/ext_ldap_group_acl.8
 file path=usr/squid/man/man8/ext_unix_group_acl.8