Update squid to 2.5.1 with several patches from

http://www.squid-cache.org/Versions/v2/2.5/bugs/.

Now try to install more authentication modules, but those modules
should be handled by proper frame work (Curretly, SASL modules
aren't handled).

Changes to squid-2.5 ():

	- Major rewrite of proxy authentication to support other schemes
	  than basic. First in the line is NTLM support but others can
	  easily be added (minimal digest is present). See Programmers Guide.
	  (Robert Collins & Francesco Chemolli)
	- Reworked how request bodies are passed down to the protocols.
	  Now all client side processing is inside client_side.c, and
	  the pass and pump modules is no longer used.
	- Optimized searching in proxy_auth and ident ACL types. Squid should
	  now handle large access lists a lot more efficiently.
	  (Francesco Chemolli)
	- Fixed forwarding/peer loop detection code (Brian Degenhardt) -
	  now a peer is ignored if it turns out to be us, rather than
	  committing suicide
	- Changed the internal URL code to obey appendDomain for internal
	  objects if it needs appending. This fixes weirdnesses where
	  a machine can think it is "foo.bar.com", and "foo" is requested.
	  (Brian Degenhardt)
	- Added the use of Automake to create the Makefile.in's in the squid
	  source tree. This will allow libtool in the future, and immediately
	  allows better dependency tracking - with or without gcc - as well
	  as the dist-all and distcheck targets for developers which respectively
	  build a tar.gz and a tar.bz2 distribution, and check that what will be
	  distributed builds.
	- Added TOS and source address selection based on ACLs,
	  written by Roger Venning. This allows administrators to set
	  the TOS precedence bits and/or the source IP from a set of
	  available IPs based upon some ACLs, generally to map different
	  users to different outgoing links and traffic profiles.
	- Added 'max-conn' option to 'cache_peer'
	- Added SSL gatewaying support, allowing Squid to act as a SSL server
	  in accelerator setups.
	- SASL authentication helper by Ian Castle
	- msntauth updated to v2.0.3
	- no_cache now applies to cache hits as well as cache misses
	- the Gopher client in Squid has been significantly improved
	- Squid now sanity checks FTP data connections to ensure the
	  connection is from the requested server. Can be disabled if
	  needed by turning off the ftp_sanitycheck option.
	- external acl support. A mechanism where flexible ACL checks
	  can be driven by external helpers. See the external_acl_type
	  and acl external directives.
	- Countless other small things and fixes
	- HTML pages generated by Squid or CacheMgr as well as the
	  ERR documents now contain a doctype declaration so that
	  browsers know which HTML specification the document uses.
	  In addition to that they have a new look (background-color, font)
	  and are valid according to the HTML standards at www.w3.org.
	  (Clemens Löser)
	- Login and password send to Basic auth helpers is now URL escaped
	  to allow for spaces and other "odd" characters in logins and
	  passwords
	- Proxy Authentication is no longer blindly forwarded to peer
	  caches if not used locally. If forwarding of proxy authentication
	  is desired then it must now be configured with the login=PASS
	  cache_peer option.
	- Responses with Vary: in the header are now cached by squid.
	  (Henrik Nordstrom).
	- Removed unused 'siteselect_timeout' directive.

1 files changed, 38 insertions, 10 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 6c9c20053dd..46a7612f375 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,11 +1,21 @@
-# $NetBSD: Makefile,v 1.68 2002/09/19 09:04:32 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2002/10/13 16:43:20 taca Exp $
 
-DISTNAME=	squid-2.4.STABLE7-src
-PKGNAME=	squid-2.4.7
+DISTNAME=	squid-2.5.STABLE1
+PKGNAME=	squid-2.5.1
 CATEGORIES=	www
-MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.4/ \
+MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
 		ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
 		ftp://ftp1.au.squid-cache.org/pub/squid/squid-2/STABLE/
+EXTRACT_SUFX=	.tar.bz2
+
+PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
+PATCHFILES=     squid-2.5.STABLE1-disable-ident-lookups.patch \
+		squid-2.5.STABLE1-disable-http-violations.patch \
+		squid-2.5.STABLE1-proxy_auth.patch \
+		squid-2.5.STABLE1-max_user_ip.patch \
+		squid-2.5.STABLE1-cache_dir_docs.patch \
+		squid-2.5.STABLE1-load_icons.patch
+PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.squid-cache.org/
@@ -25,7 +35,6 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
 CONFIGURE_ENV+=	PERL=${PERL5}
 
 BUILD_DEFS+=	SQUID_CONFIGURE_ARGS
-MAKEFILE=	makefile
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}"
 PLIST_SRC=	${WRKDIR}/PLIST
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
@@ -38,15 +47,28 @@ CONF_FILES+=	${PREFIX}/share/examples/squid/squid.conf \
 
 # Configuration options which can be overwritten by the user.
 SQUID_CONFIGURE_ARGS?=	--disable-internal-dns \
+			--enable-auth=basic,digest,ntlm \
 			--enable-cachemgr-hostname=localhost \
 			--enable-delay-pools \
+			--enable-removal-policies=lru,heap \
 			--enable-icmp \
 			--enable-ipf-transparent \
+			--enable-poll \
 			--enable-snmp \
+			--enable-ssl \
+			--with-openssl=${SSLBASE} \
 			--enable-underscores \
-			--enable-storeio=ufs,diskd
+			--enable-storeio=ufs,diskd,null \
+			--enable-basic-auth-helpers=getpwnam,winbind,SMB \
+			--enable-digest-auth-helpers=password \
+			--enable-external-acl-helpers=unix_group,ip_user,winbind_group \
+			--enable-ntlm-auth-helpers=winbind
 
-OPTIONAL_FILES=	libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd
+OPTIONAL_FILES+= libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd
+OPTIONAL_FILES+= libexec/digest_pw_auth libexec/getpwname_auth
+OPTIONAL_FILES+= libexec/ip_user_check libexec/smb_auth libexec/smb_auth.sh
+OPTIONAL_FILES+= libexec/wb_auth libexec/wb_group
+OPTIONAL_FILES+= libexec/wb_ntlmauth
 
 pre-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/squid
@@ -55,14 +77,18 @@ pre-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/icons
 
 post-install:
-	cd ${WRKSRC}/src; ${TEST} ! -x pinger || ${MAKE} install-pinger
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	@(							\
 	for FILE in ${OPTIONAL_FILES}; do			\
 	  ${TEST} ! -e ${PREFIX}/$$FILE || ${ECHO} $$FILE;	\
 	done;							\
-	cd ${WRKSRC}/errors/English;				\
-	ls ERR_* | ${SED} -e 's@^@share/squid/errors/@';	\
+	cd ${WRKSRC}/errors;					\
+	for i in *; do \
+		${TEST} -d $$i &&				\
+		(${LS} $$i/ERR_* |				\
+		${SED} -e 's@^@share/squid/errors/@';		\
+		${ECHO} "@dirrm share/squid/errors/$$i");	\
+	done; 							\
 	${ECHO} "@dirrm share/squid/errors";			\
 	cd ${WRKSRC}/icons;					\
 	ls anthony-*.gif | ${SED} -e 's@^@share/squid/icons/@';	\
@@ -71,5 +97,7 @@ post-install:
 	${ECHO} "@dirrm share/squid"				\
 	) >>${PLIST_SRC}
 
+.include "../../security/openssl/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"