Update squid package to 2.5.7nb2.

* Apply official three patches.

  - 2004-12-08 01:03 (Minor) cachemgr vm_objects segfault
  - 2004-12-08 00:47 (Minor) httpd_accel_port 0 (virtual) not working correctly
  - 2004-12-07 23:45 (Cosmetic / Minor Security issue) Random error messages
		     in response to malformed host name

* use VARBASE for data directory.
* better handling data directory and user and group for squid with
  bsd.pkg.install.mk.

3 files changed, 38 insertions, 19 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 22e1dc23474..b4259ce47b6 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.119 2004/11/28 16:33:58 taca Exp $
+# $NetBSD: Makefile,v 1.120 2004/12/14 14:27:07 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE7
 PKGNAME=	squid-2.5.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 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/ \
@@ -15,7 +15,10 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7_req_resp_header.patch \
 		squid-2.5.STABLE7-helper_shutdown.patch \
 		squid-2.5.STABLE7-non_blocking_disk.patch \
-		squid-2.5.STABLE7-blank_response.patch
+		squid-2.5.STABLE7-blank_response.patch \
+		squid-2.5.STABLE7-dothost.patch \
+		squid-2.5.STABLE7-httpd_accel_vport.patch \
+		squid-2.5.STABLE7-cachemgr_vmobjects.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
@@ -23,10 +26,11 @@ HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
-USE_PERL5=	build
 DIST_SUBDIR=	${PKGNAME_NOREV}-${DIST_STAMP}
+
 DOCDIR=		${PREFIX}/share/doc/squid
 EXAMPLESDIR=	${PREFIX}/share/examples/squid
+DATADIR=	${VARBASE}/squid
 
 # Update this time stamp pattern if any of official distfiles has changed.
 #
@@ -40,21 +44,28 @@ PKG_SYSCONFSUBDIR?=	squid
 .include "../../mk/bsd.prefs.mk"
 
 USE_BUILDLINK3=		yes
+USE_PERL5=		build
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
-			--localstatedir=/var/squid \
+			--localstatedir=${DATADIR} \
 			${SQUID_CONFIGURE_ARGS}
-CONFIGURE_ENV+=		PERL=${PERL5}
+#CONFIGURE_ENV+=		PERL=${PERL5}
+
+BUILD_DEFS+=	SQUID_CONFIGURE_ARGS
+MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+MAKE_ENV+=	PKG_PREFIX="${PREFIX}"
+PLIST_SRC=	${WRKDIR}/PLIST
+RCD_SCRIPTS=	squid
 
-BUILD_DEFS+=		SQUID_CONFIGURE_ARGS
-MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-MAKE_ENV+=		PKG_PREFIX="${PREFIX}"
-PLIST_SRC=		${WRKDIR}/PLIST
-RCD_SCRIPTS=		squid
+SQUID_USER?=	squid
+SQUID_GROUP?=	squid
 
-CONF_FILES+=		${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
-CONF_FILES+=		${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
+CONF_FILES+=	${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
+CONF_FILES+=	${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
+OWN_DIRS=	${DATADIR}
+OWN_DIRS_PERMS+= ${DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
+		 ${DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=	--enable-arp-acl
@@ -116,5 +127,6 @@ post-install:
 	${ECHO} "@dirrm share/squid"				\
 	) >>${PLIST_SRC}
 
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 01e604ac35a..35a910d4fda 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2004/11/28 16:33:58 taca Exp $
+$NetBSD: distinfo,v 1.68 2004/12/14 14:27:07 taca Exp $
 
 SHA1 (squid-2.5.7-2004101300/squid-2.5.STABLE7.tar.bz2) = 24f29e28ec62d7ab5888cd594ac7a1975ee6aa36
 Size (squid-2.5.7-2004101300/squid-2.5.STABLE7.tar.bz2) = 1051830 bytes
@@ -14,7 +14,13 @@ SHA1 (squid-2.5.7-2004101300/squid-2.5.STABLE7-non_blocking_disk.patch) = 73ccc1
 Size (squid-2.5.7-2004101300/squid-2.5.STABLE7-non_blocking_disk.patch) = 431 bytes
 SHA1 (squid-2.5.7-2004101300/squid-2.5.STABLE7-blank_response.patch) = b5d323d54f1e901ab6218a6fc2dc3162a865e198
 Size (squid-2.5.7-2004101300/squid-2.5.STABLE7-blank_response.patch) = 723 bytes
-SHA1 (patch-aa) = 8d760f58175cdb62af453fd1b07783859fa0bcf9
+SHA1 (squid-2.5.7-2004101300/squid-2.5.STABLE7-dothost.patch) = 63b960ad219bd0a945418155f129a5c6b6fa9bfc
+Size (squid-2.5.7-2004101300/squid-2.5.STABLE7-dothost.patch) = 2155 bytes
+SHA1 (squid-2.5.7-2004101300/squid-2.5.STABLE7-httpd_accel_vport.patch) = 8e4144c20fe297853a442b196fa45ff74c9f0b87
+Size (squid-2.5.7-2004101300/squid-2.5.STABLE7-httpd_accel_vport.patch) = 843 bytes
+SHA1 (squid-2.5.7-2004101300/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = f6f651a28b8ec65e3703137d2ec8bfbc69474d20
+Size (squid-2.5.7-2004101300/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = 6238 bytes
+SHA1 (patch-aa) = 3e6fb677125eec276fdfa62336c134f26e1e1edd
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index be869f4235a..4eff10d651a 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.14 2004/10/03 16:06:18 taca Exp $
+$NetBSD: patch-aa,v 1.15 2004/12/14 14:27:07 taca Exp $
 
---- src/Makefile.in.orig	2004-10-01 18:30:32.000000000 +0900
+--- src/Makefile.in.orig	2004-09-26 06:37:59.000000000 +0900
 +++ src/Makefile.in
 @@ -380,14 +380,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.14 2004/10/03 16:06:18 taca Exp $
  
  uninstall-info: uninstall-info-recursive
  
-@@ -1151,19 +1152,12 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1151,20 +1152,12 @@ repl_modules.c: repl_modules.sh Makefile
  auth_modules.c: auth_modules.sh Makefile
  	@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
  
@@ -83,12 +83,13 @@ $NetBSD: patch-aa,v 1.14 2004/10/03 16:06:18 taca Exp $
 -	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
 -	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
 -	fi
+-	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
 +install-data-local: install-dataDATA
 +	@mkdir -p $(DESTDIR)$(EXAMPLES_DIR)
 +	@echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf" ;\
 +	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf
 +	@echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/suqid.conf"; \
 +	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/squid.conf
- 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
  
  uninstall-local:
+ 	@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \