Update squid to 2.4.3 (squid-2.4.STABLE3), referring to tech-pkg's mail

from "Ciarcinski, Adam \(ISS Brussels\)" <ACiarcinski@iss.net>.

From ChangeLog:

Changes to Squid-2.4.STABLE3 (Nov 28, 2001):

	- Fixed bug #255: core dump on SSL/CONNECT if access denied by
	  miss_access
	- Fixed bug #246: corrupt on-disk meta information preventing
	  rebuilds of lost swap.state files
	- Fixed bug #243: squid_ldap_auth now supports spaces in passwords
	- Fixed a coredump when creating FTP directories
	- Fixed a compile time problem with statHistDump prototype mistmatch,
	  reported by some compilers
	- Fixed a potential coredump situation on snmpwalk in certain
	  configurations
	- Fixed bug #229: filedescriptor leakage in the "aufs" cache_dir
	  store implementation
	- Serbian error message translations

I added following changes, too.

o honor PKG_SYSCONFDIR keep SQUID_SYSCONFDIR effective.
o Add --disable-internal-dns.  This made external dnsserver
  available.  External dnsserver could be disabled with configuration
  file.
o Enable optimization with "-O".
o Fix a problem to access nat device when transparent proxy enabled.
  This fix will be contained in squid 2.5 release.
o setproctitle() hack for external dnsserver from daemonnews's article.

8 files changed, 110 insertions, 27 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 9dd24b4dba2..869025b1455 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2001/11/23 10:22:53 tron Exp $
+# $NetBSD: Makefile,v 1.57 2001/12/12 17:06:18 taca Exp $
 
-DISTNAME=	squid-2.4.STABLE2-src
-PKGNAME=	squid-2.4.2
+DISTNAME=	squid-2.4.STABLE3-src
+PKGNAME=	squid-2.4.3
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.4/ \
 		ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
@@ -28,7 +28,8 @@ PLIST_SRC=	${WRKDIR}/PLIST
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
 # Configuration options which can be overwritten by the user.
-SQUID_CONFIGURE_ARGS?=	--enable-cachemgr-hostname=localhost \
+SQUID_CONFIGURE_ARGS?=	--disable-internal-dns \
+			--enable-cachemgr-hostname=localhost \
 			--enable-delay-pools \
 			--enable-icmp \
 			--enable-ipf-transparent \
@@ -37,9 +38,10 @@ SQUID_CONFIGURE_ARGS?=	--enable-cachemgr-hostname=localhost \
 			--enable-storeio=ufs,diskd
 
 # Configuration directory location which can be overwritten by the user.
-SQUID_SYSCONFDIR?=	${PREFIX}/etc/squid
+PKG_SYSCONFSUBDIR?=	squid
+SQUID_SYSCONFDIR?=	${PKG_SYSCONFDIR}
 
-OPTIONAL_FILES=	libexec/diskd libexec/pinger libexec/unlinkd
+OPTIONAL_FILES=	libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd
 
 post-configure:
 	@cd ${WRKSRC}/include && \
diff --git a/www/squid/PLIST b/www/squid/PLIST
index b2f0c9170d9..6f063055ef8 100644
--- a/www/squid/PLIST
+++ b/www/squid/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2001/11/23 10:22:53 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/12/12 17:06:19 taca Exp $
 etc/rc.d/squid
 etc/squid/mime.conf.default
 etc/squid/squid.conf.default
-@unexec rmdir %D/etc/squid 2>/dev/null || true
+@unexec ${RMDIR} %D/etc/squid 2>/dev/null || ${TRUE}
 libexec/cachemgr.cgi
 sbin/RunAccel
 sbin/RunCache
diff --git a/www/squid/distinfo b/www/squid/distinfo
index ba479d7b4a1..0d8ee850794 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.6 2001/11/23 10:22:53 tron Exp $
+$NetBSD: distinfo,v 1.7 2001/12/12 17:06:19 taca Exp $
 
-SHA1 (squid-2.4.STABLE2-src.tar.gz) = 798723943ef09e52539919f10b5d17a361fcfc11
-Size (squid-2.4.STABLE2-src.tar.gz) = 1075738 bytes
+SHA1 (squid-2.4.STABLE3-src.tar.gz) = c388825d57998a80f2733a60d42ebe4b0bface49
+Size (squid-2.4.STABLE3-src.tar.gz) = 1081040 bytes
 SHA1 (patch-aa) = d56966fabb9477ec1f4db2b91b1ed1e4be35a952
 SHA1 (patch-ab) = afb0c443c708d03fc7ab39120ae9a3c68d9e9b88
 SHA1 (patch-ac) = b962e05bcaccd0d9a0969b2f1419fd73456440cd
 SHA1 (patch-ad) = 03f76c2a781bff4b3a8680ee815f8c5dcbdd70d0
 SHA1 (patch-ae) = 5189de99c6f453ef58b97a4df54c065c87cf7e21
-SHA1 (patch-ag) = e6c225d0c5a1e2bd595437ea0d2cff5d2ea214af
+SHA1 (patch-ag) = 9403399f18ac6ca3b0295055c1064df97f7d3edf
 SHA1 (patch-ah) = c80f9d8ce5fae7f399583607aa7f7153824465b7
-SHA1 (patch-aj) = c50f9474870c0ada822db2345a05dc1d81192cd3
+SHA1 (patch-aj) = 2a8a7df72d0e978c069a8f273a0ee91ac31aa985
 SHA1 (patch-ak) = a3f3000dbab7ba6f08904008ccf9e08bc70b3e3f
-SHA1 (patch-al) = 83198acc0accb358075500d4b71486b3f401c449
+SHA1 (patch-al) = d0741a93a4df8bf94b07e65680b50c294243c728
+SHA1 (patch-am) = c844378a03ae27ae52eb454958fb9ed7bc0ce21e
+SHA1 (patch-ba) = a66094abbf55b1eda9d38204bdcf6a4dd1679cda
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index f426dddde44..4161c4a6536 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.8 2001/04/14 10:05:01 tron Exp $
+$NetBSD: patch-ag,v 1.9 2001/12/12 17:06:20 taca Exp $
 
---- configure.orig	Thu Jan 18 18:58:25 2001
-+++ configure	Sat Apr 14 11:49:08 2001
+--- configure.orig	Thu Nov 29 08:56:25 2001
++++ configure
 @@ -711,11 +711,11 @@
  REGEXLIB=''	# -lregex
  LIBREGEX=''	# libregex.a
@@ -28,3 +28,14 @@ $NetBSD: patch-ag,v 1.8 2001/04/14 10:05:01 tron Exp $
      SNMP_OBJS='$(SNMP_OBJS)'
      SNMP_MAKEFILE=./snmplib/Makefile
      makesnmplib=snmplib
+@@ -4501,8 +4501,8 @@
+ 	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
+ 	case "$GCCVER" in
+ 	2.95.[123])
+-		echo "Removing -O for gcc on $host with GCC $GCCVER"
+-		CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*//'`"
++		echo "Making -O[2-9] to -O for gcc on $host with GCC $GCCVER"
++		CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*/-O/'`"
+ 		;;
+ 	esac
+ fi
diff --git a/www/squid/patches/patch-aj b/www/squid/patches/patch-aj
index 21af23024dd..37b19b1c37b 100644
--- a/www/squid/patches/patch-aj
+++ b/www/squid/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.4 2000/11/02 10:41:45 jdolecek Exp $
+$NetBSD: patch-aj,v 1.5 2001/12/12 17:06:20 taca Exp $
 
---- src/access_log.c.orig	Thu Nov  2 10:00:04 2000
-+++ src/access_log.c	Thu Nov  2 11:06:28 2000
-@@ -122,6 +122,8 @@ log_quote(const char *header)
+--- src/access_log.c.orig	Fri Jan 12 09:51:44 2001
++++ src/access_log.c
+@@ -120,6 +120,8 @@
  {
      int c;
      int i;
@@ -11,7 +11,7 @@ $NetBSD: patch-aj,v 1.4 2000/11/02 10:41:45 jdolecek Exp $
      char *buf;
      char *buf_cursor;
      if (header == NULL) {
-@@ -131,13 +133,41 @@ log_quote(const char *header)
+@@ -129,13 +131,41 @@
      }
      buf = xcalloc((strlen(header) * 3) + 1, 1);
      buf_cursor = buf;
@@ -54,7 +54,7 @@ $NetBSD: patch-aj,v 1.4 2000/11/02 10:41:45 jdolecek Exp $
  #if !OLD_LOG_MIME
  	if (c == '\r') {
  	    *buf_cursor++ = '\\';
-@@ -145,6 +175,7 @@ log_quote(const char *header)
+@@ -143,6 +173,7 @@
  	} else if (c == '\n') {
  	    *buf_cursor++ = '\\';
  	    *buf_cursor++ = 'n';
diff --git a/www/squid/patches/patch-al b/www/squid/patches/patch-al
index fad028bade2..c839ff65759 100644
--- a/www/squid/patches/patch-al
+++ b/www/squid/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2000/11/02 10:41:45 jdolecek Exp $
+$NetBSD: patch-al,v 1.3 2001/12/12 17:06:20 taca Exp $
 
---- src/structs.h.orig	Thu Nov  2 09:51:20 2000
-+++ src/structs.h	Thu Nov  2 09:52:03 2000
-@@ -359,6 +359,7 @@ struct _SquidConfig {
+--- src/structs.h.orig	Tue Oct  9 00:22:03 2001
++++ src/structs.h
+@@ -368,6 +368,7 @@
      wordlist *mcast_group_list;
      wordlist *dns_testname_list;
      wordlist *dns_nameservers;
diff --git a/www/squid/patches/patch-am b/www/squid/patches/patch-am
new file mode 100644
index 00000000000..e4359b1ae3e
--- /dev/null
+++ b/www/squid/patches/patch-am
@@ -0,0 +1,21 @@
+$NetBSD: patch-am,v 1.1 2001/12/12 17:06:20 taca Exp $
+
+--- src/client_side.c.orig	Sat Apr 21 08:21:41 2001
++++ src/client_side.c
+@@ -2441,8 +2441,15 @@
+ 	    natLookup.nl_inip = http->conn->me.sin_addr;
+ 	    natLookup.nl_outip = http->conn->peer.sin_addr;
+ 	    natLookup.nl_flags = IPN_TCP;
+-	    if (natfd < 0)
++	    if (natfd < 0) {
++		int save_errno;
++
++		enter_suid();
+ 		natfd = open(IPL_NAT, O_RDONLY, 0);
++		save_errno = errno;
++		leave_suid();
++		errno = save_errno;
++	    }
+ 	    if (natfd < 0) {
+ 		debug(50, 1) ("parseHttpRequest: NAT open failed: %s\n",
+ 		    xstrerror());
diff --git a/www/squid/patches/patch-ba b/www/squid/patches/patch-ba
new file mode 100644
index 00000000000..28230d38c1e
--- /dev/null
+++ b/www/squid/patches/patch-ba
@@ -0,0 +1,47 @@
+$NetBSD: patch-ba,v 1.1 2001/12/12 17:06:21 taca Exp $
+
+--- src/dnsserver.c.orig	Fri Jan 12 09:51:47 2001
++++ src/dnsserver.c
+@@ -135,6 +135,8 @@
+ #if HAVE_RESOLV_H
+ #include <resolv.h>
+ #endif
++#include <util.h>
++#define HAVE_SETPROCTITLE 1
+ 
+ #include "util.h"
+ #include "snprintf.h"
+@@ -258,8 +260,10 @@
+ {
+     char request[512];
+     char *t = NULL;
+-    int c;
++    int c, count = 0;
++#if HAVE_RES_INIT
+     int opt_s = 0;
++#endif
+     extern char *optarg;
+ 
+     safe_inet_addr("255.255.255.255", &no_addr);
+@@ -333,6 +337,10 @@
+ 	}
+     }
+ 
++#if HAVE_SETPROCTITLE
++    setproctitle("(%d requests)", count);
++#endif
++
+     for (;;) {
+ 	memset(request, '\0', REQ_SZ);
+ 	if (fgets(request, REQ_SZ, stdin) == NULL)
+@@ -345,6 +353,10 @@
+ 	    *t = '\0';		/* strip CR */
+ 	lookup(request);
+ 	fflush(stdout);
++#if HAVE_SETPROCTITLE
++	count++;
++	setproctitle("(%d requests)", count);
++#endif
+     }
+     /* NOTREACHED */
+     return 0;