ports/140394: [Maintainer] www/squid30: update to 3.0.STABLE20

[Thomas-Martin Seck]

>Number:         140394
>Category:       ports
>Synopsis:       [Maintainer] www/squid30: update to 3.0.STABLE20
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 08 18:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of November 8, 2009.

	
>Description:
- update to 3.0.STABLE20
- implement additional options vor SQUID_KERB_AUTH and SQUID_NIS_AUTH; users
  cannot be expected to duplicate src.conf(5) settings into make.conf(5).
  Keep the test for the old make.conf(5) macros in place for POLA reasons.
  See ports/139760.
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: Makefile
===================================================================
--- Makefile	(.../www/squid30)	(revision 1676)
+++ Makefile	(.../local/squid30)	(revision 1676)
@@ -99,7 +99,7 @@
 
 LATEST_LINK=	squid30
 
-SQUID_STABLE_VER=	19
+SQUID_STABLE_VER=	20
 
 CONFLICTS=	squid-2.[0-9].* squid-3.[^0].* cacheboy-[0-9]*
 GNU_CONFIGURE=	yes
@@ -117,7 +117,9 @@
 SUB_FILES+=	pkg-deinstall pkg-install pkg-message
 SUB_LIST+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
 
-OPTIONS=	SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
+OPTIONS=	SQUID_KERB_AUTH "Install Kerberos authentication helpers" on \
+		SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
+		SQUID_NIS_AUTH "Install NIS/YP authentication helpers" on \
 		SQUID_SASL_AUTH "Install SASL authentication helpers" off \
 		SQUID_DELAY_POOLS "Enable delay pools" off \
 		SQUID_SNMP "Enable SNMP support" on \
@@ -222,7 +224,8 @@
 basic_auth+=	SASL
 libexec+=	sasl_auth
 .endif
-.if !defined(NO_NIS) && !defined(WITHOUT_NIS)
+# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
+.if defined(WITH_SQUID_NIS_AUTH) && !defined(NO_NIS) && !defined(WITHOUT_NIS)
 basic_auth+=	YP
 libexec+=	yp_auth
 .endif
@@ -231,7 +234,8 @@
 			--enable-digest-auth-helpers="${digest_auth}" \
 			--enable-external-acl-helpers="${external_acl}" \
 			--enable-ntlm-auth-helpers="SMB"
-.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
+# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
+.if defined(WITH_SQUID_KERB_AUTH) && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
 # XXX This currently only works with heimdal from the base system,
 #     see files/patch-squid_kerb_auth:
 CONFIGURE_ARGS+=	--enable-negotiate-auth-helpers="squid_kerb_auth"
Index: distinfo
===================================================================
--- distinfo	(.../www/squid30)	(revision 1676)
+++ distinfo	(.../local/squid30)	(revision 1676)
@@ -1,3 +1,3 @@
-MD5 (squid3.0/squid-3.0.STABLE19.tar.bz2) = edf0f2baf06d342652f06d131f8a6082
-SHA256 (squid3.0/squid-3.0.STABLE19.tar.bz2) = 134d9ed34b4546b6822b931adbf6dc10e0e14bc50e34e6d386c8e2b3ff222884
-SIZE (squid3.0/squid-3.0.STABLE19.tar.bz2) = 1797869
+MD5 (squid3.0/squid-3.0.STABLE20.tar.bz2) = 9efcbdda8045d2a9eb5d9915449ef175
+SHA256 (squid3.0/squid-3.0.STABLE20.tar.bz2) = 7163b208855540e3a94e19f9e03fb6cee8cbc208515fc8e7d6b94419a7ccdf69
+SIZE (squid3.0/squid-3.0.STABLE20.tar.bz2) = 1801899

	


>Release-Note:
>Audit-Trail:
>Unformatted: