From owner-svn-ports-head@FreeBSD.ORG Sat Aug 23 11:40:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9950A6C0; Sat, 23 Aug 2014 11:40:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6B2563B9E; Sat, 23 Aug 2014 11:40:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7NBeGfI061571; Sat, 23 Aug 2014 11:40:16 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7NBeFcu061566; Sat, 23 Aug 2014 11:40:15 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201408231140.s7NBeFcu061566@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 23 Aug 2014 11:40:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365721 - in head/www/squid33: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 11:40:16 -0000 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