Date: Sun, 9 Dec 2012 14:42:56 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308533 - head/www/squid32 Message-ID: <201212091442.qB9Egu9m068102@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Sun Dec 9 14:42:55 2012 New Revision: 308533 URL: http://svnweb.freebsd.org/changeset/ports/308533 Log: - update to 3.2.4 plus vendor patch 11738 - install the kerberos_ldap_group external helper when Kerberos, SASL and LDAP authentication are selected (this update supersedes PR ports/173564 that can be closed) - whitespace fixes PR: ports/174300 Submitted by: Thomas-Martin Seck <tmseck@web.de> (maintainer) Modified: head/www/squid32/Makefile head/www/squid32/distinfo Modified: head/www/squid32/Makefile ============================================================================== --- head/www/squid32/Makefile Sun Dec 9 14:42:36 2012 (r308532) +++ head/www/squid32/Makefile Sun Dec 9 14:42:55 2012 (r308533) @@ -37,7 +37,6 @@ PORTNAME= squid PORTVERSION= 3.2.${SQUID_STABLE_VER} -PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ @@ -66,7 +65,7 @@ PATCH_SITES= http://www.squid-cache.org/ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www2.tw.squid-cache.org/%SUBDIR%/ PATCH_SITE_SUBDIR= Versions/v3/3.2/changesets -PATCHFILES= # empty +PATCHFILES= squid-3.2-11738.patch MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy @@ -76,7 +75,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LATEST_LINK= squid32 -SQUID_STABLE_VER= 3 +SQUID_STABLE_VER= 4 CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[!2].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes @@ -98,7 +97,7 @@ OPTIONS_DEFINE= ARP_ACL AUTH_KERB AUTH_L CACHE_DIGESTS DEBUG DELAY_POOLS DNS_HELPER ECAP ESI \ FOLLOW_XFF FS_AUFS FS_COSS HTCP ICAP ICMP IDENT IPV6 KQUEUE \ LARGEFILE SNMP SSL SSL_CRTD STACKTRACES STRICT_HTTP \ - TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 + TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 ARP_ACL_DESC= Enable ARP/MAC/EUI based authentification AUTH_KERB_DESC= Install Kerberos authentication helpers @@ -302,6 +301,15 @@ negotiate_auth= kerberos wrapper libexec+= negotiate_kerberos_auth negotiate_kerberos_auth_test \ negotiate_wrapper_auth MAN8+= negotiate_kerberos_auth.8 +# the kerberos_ldap_group external helper depends on LDAP and SASL: +.if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL} +external_acl+= kerberos_ldap_group +libexec+= ext_kerberos_ldap_group_acl \ + cert_tool +# XXX: this manpage is present in Squid's source but is not being +# built/installed yet (Squid 3.2.3 as at 11/2012). +#MAN8+= ext_kerberos_ldap_group_acl.8 +.endif .else negotiate_auth= none .endif @@ -311,6 +319,7 @@ CONFIGURE_ARGS+= --enable-auth-basic="${ --enable-external-acl-helpers="${external_acl}" \ --enable-auth-negotiate="${negotiate_auth}" \ --enable-auth-ntlm="${ntlm_auth}" + # Storage schemes: storage_schemes= diskd rock ufs Modified: head/www/squid32/distinfo ============================================================================== --- head/www/squid32/distinfo Sun Dec 9 14:42:36 2012 (r308532) +++ head/www/squid32/distinfo Sun Dec 9 14:42:55 2012 (r308533) @@ -1,2 +1,4 @@ -SHA256 (squid3.2/squid-3.2.3.tar.bz2) = 1741c3ef647f5b0960498b7bb3e44af4a4409c321afe2d141c67d2b5c85ed5a1 -SIZE (squid3.2/squid-3.2.3.tar.bz2) = 2891753 +SHA256 (squid3.2/squid-3.2.4.tar.bz2) = 9c0f6425f28e275577c48e909c85122e87969211ade70bd043e4694328b964c6 +SIZE (squid3.2/squid-3.2.4.tar.bz2) = 2893401 +SHA256 (squid3.2/squid-3.2-11738.patch) = ca22c7143db486e29832f6d0530f1bc77a62e88138199473d1596dda9354c940 +SIZE (squid3.2/squid-3.2-11738.patch) = 1661
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212091442.qB9Egu9m068102>