Update "squid" package to version 2.2STABLE5. Changes since 2.2STABLE4:

- Changed configure to look for IP-Filter header files
  in both /usr/include and /usr/include/netinet.
- Fixed an ACL subdomain comparison bug (aclDomainCompare).
- Fixed an ACL host <=> domain comparison bug
  (aclHostDomainCompare).
- Fixed a "xstrdup: tried to dup a NULL pointer!" bug
  caused by illegal hostname characters when certain
  ACL types are in use.
- Fixed res_init() bug in dnsserver.  We used to call
  res_init(), and then clear the RES_INIT bit in
  _res.options.  This caused res_init() to be
  called again as soon as we use gethostbyname(), and
  this second initialization wipes out our changing
  the nameservers.  The fix is just to NOT set
  _res.options to RES_DEFAULT after calling res_init().
- Changed FTP to close data sockets as soon as the transfer
  ends, rather than waiting for the reply message on the
  control socket (Alexander V. Lukyanov).
- Fixed some buffering problems between Squid and the
  unlinkd process.  By using file_write(), unlink requests
  were being buffered and experiencing long delays under
  heavy load.  Now use use good ol' write() instead.  Also
  added some feedback from unlinkd to squid so we can track
  the unlink request queue.  If the queue becomes too large,
  we block a little and wait for some acks from unlinkd.

This fixes the first part of PR pkg/8764 by Luke Mewburn.

4 files changed, 20 insertions, 14 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 82630889d96..9fc7523b657 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 1999/11/12 16:25:30 rh Exp $
+# $NetBSD: Makefile,v 1.20 1999/11/12 22:07:10 tron Exp $
 
-DISTNAME=	squid-2.2.STABLE4-src
-PKGNAME=	squid-2.2s4
+DISTNAME=	squid-2.2.STABLE5-src
+PKGNAME=	squid-2.2s5
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
@@ -25,10 +25,7 @@ CONFIGURE_ARGS+=	--enable-icmp
 CONFIGURE_ARGS+=	--enable-ipf-transparent
 CONFIGURE_ARGS+=	--enable-snmp
 
-CPPFLAGS=		-I/usr/include/netinet
-CFLAGS+=		${CPPFLAGS}
-CONFIGURE_ENV+=		CPPFLAGS=${CPPFLAGS} \
-			PERL=${LOCALBASE}/bin/perl
+CONFIGURE_ENV+=		PERL=${LOCALBASE}/bin/perl
 
 MAKEFILE=	makefile
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}"
diff --git a/www/squid/files/md5 b/www/squid/files/md5
index 194b8526a07..00facf7c2e8 100644
--- a/www/squid/files/md5
+++ b/www/squid/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1999/07/14 21:45:51 tron Exp $
+$NetBSD: md5,v 1.7 1999/11/12 22:07:11 tron Exp $
 
-MD5 (squid-2.2.STABLE4-src.tar.gz) = 4bd0bfe6fd63b10967afb5683f52a90f
+MD5 (squid-2.2.STABLE5-src.tar.gz) = e5b02867a4c58ac5db191041a9c298b6
diff --git a/www/squid/files/patch-sum b/www/squid/files/patch-sum
index 40cdd5e399f..1485f27c752 100644
--- a/www/squid/files/patch-sum
+++ b/www/squid/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/11/12 16:25:30 rh Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/12 22:07:11 tron Exp $
 
 MD5 (patch-aa) = 6befb071002fb7ced0fb9f388d039cd9
 MD5 (patch-ab) = 05ef29847c539ee53d056061ab21ebcf
@@ -6,5 +6,5 @@ MD5 (patch-ac) = 3bb7a6c638dbbe91042ea52149dbc18e
 MD5 (patch-ad) = e29e0dbd58b2838964d4135d730dfc5b
 MD5 (patch-ae) = fa1d2532d75b8e409f225063e6589f4a
 MD5 (patch-af) = ec14792120b479d910a2a9f2f183564c
-MD5 (patch-ag) = 1f2481f9cdbd3d0c1e4ab6893b85ef68
+MD5 (patch-ag) = faf26a08bbaf4998339e37ab9f9b305c
 MD5 (patch-ah) = 971f5268e79bd6a7b266baa3e5b87ca0
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index 79ce7899bf1..1b618b9422f 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.5 1999/11/12 16:25:30 rh Exp $
+$NetBSD: patch-ag,v 1.6 1999/11/12 22:07:11 tron Exp $
 
---- configure.orig	Fri Nov 12 17:22:01 1999
-+++ configure	Fri Nov 12 17:22:01 1999
+--- configure.orig	Thu Sep 23 02:06:48 1999
++++ configure	Fri Nov 12 22:15:48 1999
 @@ -644,11 +644,11 @@
  REGEXLIB=''	# -lregex
  LIBREGEX=''	# libregex.a
@@ -19,3 +19,12 @@ $NetBSD: patch-ag,v 1.5 1999/11/12 16:25:30 rh Exp $
  
  case "$host_os" in
  cygwin32|os2)
+@@ -1204,7 +1204,7 @@
+ #define SQUID_SNMP 1
+ EOF
+ 
+-    SNMPLIB='-L../snmplib -lsnmp'
++    SNMPLIB='../snmplib/libsnmp.a'
+     SNMP_OBJS='$(SNMP_OBJS)'
+     SNMP_MAKEFILE=./snmplib/Makefile
+     makesnmplib=snmplib