Pullup (via patch) ticket 123 - requested by Takahiro Kambe

security fix for squid

	Modified Files:
		pkgsrc/www/squid: Makefile distinfo
		pkgsrc/www/squid/patches: patch-ag patch-an patch-bb
	Removed Files:
		pkgsrc/www/squid/patches: patch-ba

	Log Message:
	Update squid package to 2.5.7.

	This includes security problem with SNMP support which enabled by default.

	<http://www.idefense.com/application/poi/display?id=152&type=vulnerabilities>

	* pkgsrc changes:

	  - Don't use PKGNAME within DIST_SUBDIR.  Instead, date based DIST_STAMP.
	    This change prevent extra DIST_SUBDIR change asked by kim@.
	  - Remove setproctitle(3) hack for dnsserver helper program since use of
	    dnsserver itself is problematic with huge size of squid process.

	* Changes to squid-2.5.STABLE7 (11 Oct 2004)

	  - [Medium] No objects cached in ufs cache_dir type in some
	    configurations. Issue introduced in 2.5.STABLE6 by the patch for
	    Bug #676. (Bug #1011)
	  - [Minor] LDAP helpers update to correct LDAP connection management
	    and add support for literal password compare instead of binding
	  - [Minor] A large number of queued DNS lookups for the same domain
	    (Bug #852)
	  - [Cosmetic] request_header_max_size configuration partly ignored
	    (Bug #899)
	  - [Minor] Partial hit results in TCP_HIT, not TCP_MISS. (Bug #1001)
	  - Bug #1012: [Cosmetic] HEAD requests may return stale information
	    (Bug #1012)
	  - [Cosmetic] Warn if cache_dir ufs can not create files. (Bug #918)
	  - [Minor] case insensitive authentication (Bug #431)
	  - [Cosmetic] Add delay pools information to active_requests. (Bug
	    #882)
	  - [Minor] Apparent memory leak in client_db (Bug #833)
	  - [Minor] NTLM authentication truncated causing failures. (Bug
	    #1016)
	  - [Cosmetic] Grammatical corrections in squid.conf.default
	  - [Cosmetic] Unknown %X errorpage codes incorrectly quoted. (Bug
	    #1030)
	  - [Medium] Segfaults and other strange crashes when using heap
	    policies. (Bug #1009)
	  - [Minor] Supplementary group memberships not set (Bug #1021)
	  - [Cosmetic] ERR_TOO_BIG Portugese translation
	  - [Minor] external_acl does not handle newlines (Bug #1038)
	  - [Major] NTLM authentication denial of service when using msnt_auth
	    or fake_auth (Bug #1045)
	  - [Medium] Memory leaks when using NTLM authentication without
	    challenge reuse. (Bug #994)
	  - [Minor] Temporary NTLM memory leak with challenge reuse enabled
	    (Bug #910)
	  - [Minor] assertion failed: "n_ufs_dirs <=
	    Config.cacheSwap.n_configured". (Bug #1053)
	  - [Minor] Segfault in authenticateDigestHandleReply. (Bug #1031)
	  - [Minor] acl time fails to parse multiple time specifications
	    (Bug #1060)
	  - [Minor] cachemgr config dumps mixed up Range and Request-Range
	    headers in http_header_access & replace directives. (Bug #1056)
	  - [Minor] Content-Disposition added as a well known header (Bug #961)
	  - [Cosmetic] Don't warn about arp acls not being supported on FreeBSD
	    (Bug #1074)
	  - [Cosmetic] Limit internal send/receive buffer sizes (Bug #1075)
	  - [Medium] New acl types to match arbitrary HTTP headers. In addition
	    the http_header_access & replace directivess now support arbitrary
	    headers and not only the well known ones. (Bug #961)
	  - [Cosmetic] ncsa_auth now accepts Window formatted password files
	    (Bug #1078)
	  - [Cosmetic] Support the --program-prefix/suffix options or other
	    configure program name transforms (Bug #1019)
	  - [Minor] Fix race condition in CONNECT and also handle aborts of
	    CONNECT requests in a more graceful manner. (Bug #859)
	  - [Minor] New balance_on_multiple_ip directive to work around certain
	    broken load balancers and optimized ipcache on reload requests
	    (Bug #1058)
	  - [Medium] New reply_header_max_size directive (Bug #874)
	  - [Minor] Suspected instability on aborted PUT/POST requests (Bug #1089)
	  - [Security] SNMP Denial of Service fix (CAN-2004-0918)

6 files changed, 36 insertions, 203 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 821077dff38..36c9c20de4f 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,51 +1,31 @@
-# $NetBSD: Makefile,v 1.115 2004/09/03 22:58:19 taca Exp $
+# $NetBSD: Makefile,v 1.115.2.1 2004/10/20 16:33:44 agc Exp $
 
-DISTNAME=	squid-2.5.STABLE6
-PKGNAME=	squid-2.5.6
-PKGREVISION=	1
+DISTNAME=	squid-2.5.STABLE7
+PKGNAME=	squid-2.5.7
 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/ \
 		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.STABLE6-ufs_no_valid_dir.patch \
-		squid-2.5.STABLE6-ldap_helpers.patch \
-		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
-		squid-2.5.STABLE6-request_header_max_size.patch \
-		squid-2.5.STABLE6-partial_hit_is_miss.patch \
-		squid-2.5.STABLE6-HEAD.patch \
-		squid-2.5.STABLE6-ufs_create_error.patch \
-		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
-		squid-2.5.STABLE6-active_requests_delaypool.patch \
-		squid-2.5.STABLE6-client_db_gc.patch \
-		squid-2.5.STABLE6-ntlmtruncated.patch \
-		squid-2.5.STABLE6-grammar.patch \
-		squid-2.5.STABLE6-errorpage_quote.patch \
-		squid-2.5.STABLE6-heap_segfault.patch \
-		squid-2.5.STABLE6-initgroups.patch \
-		squid-2.5.STABLE6-external_acl_newlines.patch \
-		squid-2.5.STABLE6-ntlm_fetch_string.patch \
-		squid-2.5.STABLE6-ntlm_noreuse_leak.patch \
-		squid-2.5.STABLE6-ntlm_challengereuse_leak.patch \
-		squid-2.5.STABLE6-rotate_error.patch \
-		squid-2.5.STABLE6-digest_crash.patch \
-		squid-2.5.STABLE6-acl_times.patch \
-		squid-2.5.STABLE6-http_header_range.patch \
-		squid-2.5.STABLE6-Content-Disposition.patch
-PATCH_DIST_STRIP=       -p1
-
+#PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
+#PATCHFILES=
+#PATCH_DIST_STRIP=       -p1
+#
 MAINTAINER=	taca@NetBSD.org
 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}
+DIST_SUBDIR=	${PKGNAME_NOREV}-${DIST_STAMP}
 DOCDIR=		${PREFIX}/share/doc/squid
 EXAMPLESDIR=	${PREFIX}/share/examples/squid
 
+# Update this time stamp pattern if any of official distfiles has changed.
+#
+DIST_STAMP=	2004101300
+
 DOCFILES=	ChangeLog RELEASENOTES.html doc/debug-sections.txt
 
 # Configuration directory location which can be overwritten by the user.
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 6b86b87f3b8..83abcebf4c2 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,67 +1,18 @@
-$NetBSD: distinfo,v 1.63 2004/09/03 22:58:20 taca Exp $
+$NetBSD: distinfo,v 1.63.2.1 2004/10/20 16:33:44 agc Exp $
 
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6.tar.bz2) = e9d6606949b3e7caedfac5d3959d33703a81bb67
-Size (squid-2.5.6nb1/squid-2.5.STABLE6.tar.bz2) = 1047199 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 0b89c01cda73e728439ba2600f991815969da043
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ldap_helpers.patch) = 41c62edf948dc6683e5fbc84aa5bc6bef88fed7e
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-ldap_helpers.patch) = 25444 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 031f1306ee2584f2a68b7625cdc380664f5e63af
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6461 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-request_header_max_size.patch) = cad44074a4cdb9bcee48538a4287399b3211f49e
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-request_header_max_size.patch) = 765 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 531e0841020a287203925170ea515895dd0ecc6c
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-HEAD.patch) = 7c7a2c1d1bbb3cbeeeb8cce5fca15b196e5e042a
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-HEAD.patch) = 895 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ufs_create_error.patch) = d7d6c01047dda7e3f7bd9861fd23569e560d474c
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-ufs_create_error.patch) = 847 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 236a04d28b29827ed3938d24b0cfe12a5acbad22
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-active_requests_delaypool.patch) = 62ca044bc57c84ee6963b69e8fd48e1e4a13bad1
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-client_db_gc.patch) = b5ad443c429245cd4cdf01d44c1beb02ff545442
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-client_db_gc.patch) = 3668 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ntlmtruncated.patch) = 88657150423327808b475ffff9999497fbd76657
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-ntlmtruncated.patch) = 4383 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-grammar.patch) = 8761ab12ca0b09f1f7f8c33a952944ce9b4c596d
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-grammar.patch) = 50267 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-errorpage_quote.patch) = 3c0347dd66b1aaf1ed8313aba02feaaf453bd978
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-errorpage_quote.patch) = 377 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-heap_segfault.patch) = 0996cceec384ffe8ec89cff7ccbcaf9ead3b0e61
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-heap_segfault.patch) = 867 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-initgroups.patch) = c640e126659f453a02b3d1f0baed4251bd64da25
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-initgroups.patch) = 11060 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-external_acl_newlines.patch) = da8c002ab230670edcf9d3a815fda6890d68a09d
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-external_acl_newlines.patch) = 4965 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 0a63727cd4b72b65df063de0920afa610ffd5bf6
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 5ceb8d6a1df52053dda1b19fa23302247374509f
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = ee9e835033e7b24694c18a921df65240de8bc07b
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 13473 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-rotate_error.patch) = b0688938aeccde5d4af0fb777f751461bb5cda38
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-rotate_error.patch) = 2238 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-digest_crash.patch) = a32bef42fc250b73a1a4215eab8cc14664cf0fa5
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-digest_crash.patch) = 1250 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-acl_times.patch) = 8d0d5fd6eea03c8202ded68120dc81339f7f579e
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-acl_times.patch) = 3047 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-http_header_range.patch) = 578817fa1211efd152017f0af72422fa17a67803
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-http_header_range.patch) = 616 bytes
-SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-Content-Disposition.patch) = c0503e1aaa426e917cb414e713a006b0243e8714
-Size (squid-2.5.6nb1/squid-2.5.STABLE6-Content-Disposition.patch) = 1815 bytes
+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
 SHA1 (patch-aa) = 1bb64a2d302c206466d62596d1fefb83a060f9b7
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c
 SHA1 (patch-ae) = 860c8ad41ea09282bdb0d626260084354458f653
-SHA1 (patch-ag) = 37ec836fa74851d3ef4ec9534681d6c987ec2ec7
+SHA1 (patch-ag) = 1ea73bcd19eb0c6e380c8fd173261b1171b9d787
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
 SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7
 SHA1 (patch-al) = db2377a7c1dc3f03f562f7b1fc1e15fc567c3983
-SHA1 (patch-an) = 1bc420b11173ec5aa2241f93a718d3de604676ff
-SHA1 (patch-ba) = c91bc26e4b6df2cb4b7042591efb4afd7c989462
-SHA1 (patch-bb) = b1a5cf09ea4c5f3a178676033046049e91290d6d
+SHA1 (patch-an) = febe1a78dfbda5caebe5a9f16af6da1e1a9e79ca
+SHA1 (patch-bb) = cc0486eaf27f5796d83041e6b7a9562a134d8063
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
 SHA1 (patch-ca) = 132e45eea22cccf6678b5d920d913965f73f0db7
 SHA1 (patch-cb) = 603471bf702c3ff4480585dc59dc326f23a5f2e8
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index c221257f985..cf2b783db0e 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.16 2004/08/22 15:11:09 taca Exp $
+$NetBSD: patch-ag,v 1.16.2.1 2004/10/20 16:33:44 agc Exp $
 
---- configure.orig	2004-08-20 18:35:25.000000000 +0900
+--- configure.orig	2004-10-12 05:27:03.000000000 +0900
 +++ configure
 @@ -2219,7 +2219,7 @@ if test "${enable_snmp+set}" = set; then
  #define SQUID_SNMP 1
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.16 2004/08/22 15:11:09 taca Exp $
      
  
  if true; then
-@@ -3955,6 +3955,7 @@ for ac_hdr in \
+@@ -3957,6 +3957,7 @@ for ac_hdr in \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
@@ -19,15 +19,7 @@ $NetBSD: patch-ag,v 1.16 2004/08/22 15:11:09 taca Exp $
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -4005,6 +4006,7 @@ for ac_hdr in \
- 	syslog.h \
- 	time.h \
- 	unistd.h \
-+	util.h \
- 	utime.h \
- 	varargs.h \
- 	byteswap.h \
-@@ -6200,43 +6202,38 @@ fi
+@@ -6202,43 +6203,38 @@ fi
  echo "$ac_t""$ac_cv_type_mode_t" 1>&6
  if test $ac_cv_type_mode_t = no; then
    cat >> confdefs.h <<\EOF
@@ -38,15 +30,15 @@ $NetBSD: patch-ag,v 1.16 2004/08/22 15:11:09 taca Exp $
  fi
  
 -echo $ac_n "checking for fd_mask""... $ac_c" 1>&6
--echo "configure:6210: checking for fd_mask" >&5
+-echo "configure:6212: checking for fd_mask" >&5
 -if eval "test \"`echo '$''{'ac_cv_type_fd_mask'+set}'`\" = set"; then
-+ echo $ac_n "checking for fd_set""... $ac_c" 1>&6
-+ echo "configure:6031: checking for fd_set" >&5
-+ if eval "test \"`echo '$''{'ac_cv_have_fd_mask'+set}'`\" = set"; then
++echo $ac_n "checking for fd_set""... $ac_c" 1>&6
++echo "configure:6031: checking for fd_set" >&5
++if eval "test \"`echo '$''{'ac_cv_have_fd_mask'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6215 "configure"
+ #line 6217 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
 -#if STDC_HEADERS
@@ -85,7 +77,7 @@ $NetBSD: patch-ag,v 1.16 2004/08/22 15:11:09 taca Exp $
  
  
  echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-@@ -7514,8 +7511,8 @@ if test "$GCC" = "yes"; then
+@@ -7516,8 +7512,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])
@@ -96,11 +88,3 @@ $NetBSD: patch-ag,v 1.16 2004/08/22 15:11:09 taca Exp $
  		;;
  	esac
  fi
-@@ -7608,6 +7605,7 @@ for ac_func in \
- 	setrlimit \
- 	getrlimit \
- 	setsid \
-+	setproctitle \
- 	sigaction \
- 	snprintf \
- 	srand48 \
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index 61ccd357659..791f8fe7953 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.5 2004/08/22 15:11:09 taca Exp $
+$NetBSD: patch-an,v 1.5.2.1 2004/10/20 16:33:44 agc Exp $
 
---- configure.in.orig	2004-08-20 18:35:25.000000000 +0900
+--- configure.in.orig	2004-10-12 05:27:03.000000000 +0900
 +++ configure.in
 @@ -489,7 +489,7 @@ AC_ARG_ENABLE(snmp,
  [ if test "$enableval" = "yes" ; then
@@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.5 2004/08/22 15:11:09 taca Exp $
      AM_CONDITIONAL(USE_SNMP, true)
      SNMP_MAKEFILE=./snmplib/Makefile
      makesnmplib=snmplib
-@@ -1207,6 +1207,7 @@ AC_CHECK_HEADERS( \
+@@ -1209,6 +1209,7 @@ AC_CHECK_HEADERS( \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
@@ -19,15 +19,7 @@ $NetBSD: patch-an,v 1.5 2004/08/22 15:11:09 taca Exp $
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -1257,6 +1258,7 @@ AC_CHECK_HEADERS( \
- 	syslog.h \
- 	time.h \
- 	unistd.h \
-+	util.h \
- 	utime.h \
- 	varargs.h \
- 	byteswap.h \
-@@ -1432,8 +1434,17 @@ AC_CHECK_TYPE(pid_t, int)
+@@ -1434,8 +1435,17 @@ AC_CHECK_TYPE(pid_t, int)
  AC_CHECK_TYPE(size_t, unsigned int)
  AC_CHECK_TYPE(ssize_t, int)
  AC_CHECK_TYPE(off_t, int)
@@ -47,7 +39,7 @@ $NetBSD: patch-an,v 1.5 2004/08/22 15:11:09 taca Exp $
  
  AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
  AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -1637,8 +1648,8 @@ if test "$GCC" = "yes"; then
+@@ -1639,8 +1649,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	[2.95.[123]])
@@ -58,11 +50,3 @@ $NetBSD: patch-an,v 1.5 2004/08/22 15:11:09 taca Exp $
  		;;
  	esac
  fi
-@@ -1733,6 +1744,7 @@ AC_CHECK_FUNCS(\
- 	setrlimit \
- 	getrlimit \
- 	setsid \
-+	setproctitle \
- 	sigaction \
- 	snprintf \
- 	srand48 \
diff --git a/www/squid/patches/patch-ba b/www/squid/patches/patch-ba
deleted file mode 100644
index 9138c13ee51..00000000000
--- a/www/squid/patches/patch-ba
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2002/10/13 16:43:22 taca Exp $
-
---- src/dnsserver.c.orig	Mon Jul  1 17:55:46 2002
-+++ src/dnsserver.c
-@@ -138,6 +138,9 @@
- #if HAVE_RESOLV_H
- #include <resolv.h>
- #endif
-+#if HAVE_UTIL_H
-+#include <util.h>
-+#endif
- 
- #include "util.h"
- #include "snprintf.h"
-@@ -263,6 +266,9 @@ main(int argc, char *argv[])
-     char *t = NULL;
-     int c;
-     int opt_s = 0;
-+#if HAVE_SETPROCTITLE
-+    int count = 0;
-+#endif
-     extern char *optarg;
- 
-     safe_inet_addr("255.255.255.255", &no_addr);
-@@ -336,6 +342,10 @@ main(int argc, char *argv[])
- 	}
-     }
- 
-+#if HAVE_SETPROCTITLE
-+    setproctitle("(no requests)");
-+#endif
-+
-     for (;;) {
- 	memset(request, '\0', REQ_SZ);
- 	if (fgets(request, REQ_SZ, stdin) == NULL)
-@@ -348,6 +358,10 @@ main(int argc, char *argv[])
- 	    *t = '\0';		/* strip CR */
- 	lookup(request);
- 	fflush(stdout);
-+#if HAVE_SETPROCTITLE
-+	count++;
-+	setproctitle("(%d requests)", count);
-+#endif
-     }
-     /* NOTREACHED */
-     return 0;
diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb
index 417b950ab1c..87bedcf4693 100644
--- a/www/squid/patches/patch-bb
+++ b/www/squid/patches/patch-bb
@@ -1,18 +1,8 @@
-$NetBSD: patch-bb,v 1.4 2004/08/22 15:11:09 taca Exp $
+$NetBSD: patch-bb,v 1.4.2.1 2004/10/20 16:33:44 agc Exp $
 
---- include/autoconf.h.in.orig	2004-08-20 18:35:25.000000000 +0900
+--- include/autoconf.h.in.orig	2004-08-09 22:55:49.000000000 +0900
 +++ include/autoconf.h.in
-@@ -551,6 +551,9 @@
- /* Define if you have the setpgrp function.  */
- #undef HAVE_SETPGRP
- 
-+/* Define if you have the setpgrp function.  */
-+#undef HAVE_SETPROCTITLE
-+
- /* Define if you have the setrlimit function.  */
- #undef HAVE_SETRLIMIT
- 
-@@ -659,6 +662,9 @@
+@@ -659,6 +659,9 @@
  /* Define if you have the <linux/netfilter_ipv4.h> header file.  */
  #undef HAVE_LINUX_NETFILTER_IPV4_H
  
@@ -22,13 +12,3 @@ $NetBSD: patch-bb,v 1.4 2004/08/22 15:11:09 taca Exp $
  /* Define if you have the <malloc.h> header file.  */
  #undef HAVE_MALLOC_H
  
-@@ -833,6 +839,9 @@
- /* Define if you have the <unistd.h> header file.  */
- #undef HAVE_UNISTD_H
- 
-+/* Define if you have the <util.h> header file.  */
-+#undef HAVE_UTIL_H
-+
- /* Define if you have the <utime.h> header file.  */
- #undef HAVE_UTIME_H
-