svn commit: r365721 - in head/www/squid33: . files

[John Marino]

Author: marino
Date: Sat Aug 23 11:40:15 2014
New Revision: 365721
URL: http://svnweb.freebsd.org/changeset/ports/365721
QAT: https://qat.redports.org/buildarchive/r365721/

Log:
  www/squid33: Fix plist for options, enable keytab only for squid
  
  PR:		192913
  Submitted by:	timp87

Modified:
  head/www/squid33/Makefile
  head/www/squid33/files/squid.in
  head/www/squid33/pkg-plist

Modified: head/www/squid33/Makefile
==============================================================================
--- head/www/squid33/Makefile	Sat Aug 23 10:44:37 2014	(r365720)
+++ head/www/squid33/Makefile	Sat Aug 23 11:40:15 2014	(r365721)
@@ -3,7 +3,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.3.${SQUID_STABLE_VER}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \

Modified: head/www/squid33/files/squid.in
==============================================================================
--- head/www/squid33/files/squid.in	Sat Aug 23 10:44:37 2014	(r365720)
+++ head/www/squid33/files/squid.in	Sat Aug 23 11:40:15 2014	(r365721)
@@ -39,6 +39,9 @@
 # squid_flags:	Additional commandline arguments for Squid you might want to
 #		use. See squid(8) for further details.
 #
+# squid_krb5_ktname:
+#		Alternative Kerberos 5 Key Table.
+#		Default: none
 
 . /etc/rc.subr
 
@@ -83,6 +86,12 @@ squid_prestart()
 	[ -d ${state_dir} ] && rm -rf ${state_dir}
 	install -d -o ${squid_user} -m 0755 ${state_dir}
 
+	# setup KRB5_KTNAME:
+	squid_krb5_ktname=${squid_krb5_ktname:-"NONE"}
+	if [ "${squid_krb5_ktname}" != "NONE" ]; then
+		export KRB5_KTNAME=${squid_krb5_ktname}
+	fi
+
 	# setup FIB tables:
 	if command -v check_namevarlist > /dev/null 2>&1; then
 		check_namevarlist fib && return 0

Modified: head/www/squid33/pkg-plist
==============================================================================
--- head/www/squid33/pkg-plist	Sat Aug 23 10:44:37 2014	(r365720)
+++ head/www/squid33/pkg-plist	Sat Aug 23 11:40:15 2014	(r365721)
@@ -18,12 +18,12 @@ libexec/squid/basic_radius_auth
 %%AUTH_SMB%%libexec/squid/basic_smb_auth
 %%AUTH_SMB%%libexec/squid/basic_smb_auth.sh
 libexec/squid/cachemgr.cgi
-%%AUTH_LDAP%%libexec/squid/cert_tool
+%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
 libexec/squid/digest_file_auth
 libexec/squid/diskd
 %%DNS_HELPER%%libexec/squid/dnsserver
 libexec/squid/ext_file_userip_acl
-%%AUTH_LDAP%%libexec/squid/ext_kerberos_ldap_group_acl
+%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
 %%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl
 %%AUTH_SQL%%libexec/squid/ext_sql_session_acl
 libexec/squid/ext_time_quota_acl