From tmseck@netcologne.de  Sun Dec  9 13:53:05 2012
Return-Path: <tmseck@netcologne.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2BE269AE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Dec 2012 13:53:05 +0000 (UTC)
	(envelope-from tmseck@netcologne.de)
Received: from cc-smtpout2.netcologne.de (cc-smtpout2.netcologne.de [IPv6:2001:4dd0:100:1062:25:2:0:2])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C02B8FC18
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Dec 2012 13:53:04 +0000 (UTC)
Received: from cc-smtpin1.netcologne.de (cc-smtpin1.netcologne.de [89.1.8.201])
	by cc-smtpout2.netcologne.de (Postfix) with ESMTP id 7C09A12305
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Dec 2012 14:53:03 +0100 (CET)
Received: from wcfields.tmseck.homedns.org (xdsl-89-0-84-253.netcologne.de [89.0.84.253])
	by cc-smtpin1.netcologne.de (Postfix) with ESMTPSA id 60FB811DC0
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Dec 2012 14:53:03 +0100 (CET)
Received: by wcfields.tmseck.homedns.org (Postfix, from userid 1001)
	id 2AD53130E4F; Sun,  9 Dec 2012 14:52:58 +0100 (CET)
Message-Id: <20121209135258.2AD53130E4F@wcfields.tmseck.homedns.org>
Date: Sun,  9 Dec 2012 14:52:58 +0100 (CET)
From: Thomas-Martin Seck <tmseck@web.de>
Reply-To: Thomas-Martin Seck <tmseck@web.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer] www/squid32: update to 3.2.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         174300
>Category:       ports
>Synopsis:       [Maintainer] www/squid32: update to 3.2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    flo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 09 14:00:00 UTC 2012
>Closed-Date:    Sun Dec 09 14:43:47 UTC 2012
>Last-Modified:  Sun Dec 09 14:43:47 UTC 2012
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 8.3-RELEASE amd64
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of December 9, 2012.

	
>Description:
- 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
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: Makefile
===================================================================
--- Makefile	(.../www/squid32)	(Revision 2084)
+++ Makefile	(.../local/squid32)	(Revision 2084)
@@ -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 @@
 		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 @@
 
 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 @@
 		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 @@
 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 @@
 			--enable-external-acl-helpers="${external_acl}" \
 			--enable-auth-negotiate="${negotiate_auth}" \
 			--enable-auth-ntlm="${ntlm_auth}"
+
 # Storage schemes:
 
 storage_schemes=	diskd rock ufs
Index: distinfo
===================================================================
--- distinfo	(.../www/squid32)	(Revision 2084)
+++ distinfo	(.../local/squid32)	(Revision 2084)
@@ -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
	


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->flo 
Responsible-Changed-By: flo 
Responsible-Changed-When: Sun Dec 9 14:01:19 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174300 
State-Changed-From-To: open->closed 
State-Changed-By: flo 
State-Changed-When: Sun Dec 9 14:43:46 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174300 
>Unformatted:
