Pullup ticket 280 - requested by Takahiro Kambe

update squid

Revisions pulled up:
pkgsrc/www/squid/Makefile		1.134
pkgsrc/www/squid/distinfo		1.80
pkgsrc/www/squid/patches/patch-al	1.6
pkgsrc/www/squid/patches/patch-cd	1.5


  Module Name:    pkgsrc
  Committed By:   taca
  Date:           Fri Feb 11 14:47:18 UTC 2005

  Modified Files:
          pkgsrc/www/squid: Makefile distinfo
          pkgsrc/www/squid/patches: patch-al patch-cd

  Log Message:
  Update squid package to 2.5.8 (squid-2.5.STABLE8).

  Most of these changes are already included in previous squid-2.5.7nb12.
  But last one is really new one.

  Changes to squid-2.5.STABLE8 (11 Feb 2005)

          - [Minor] 100% CPU usage on half-closed PUT/POST requests (Bug #354,
            #1096)
          - [Cosmetic] Document -v (protocol version) option to LDAP helpers
          - [Minor] The new req_header and resp_header acls segfaults
            immediately on parse of squid.conf (Bug #961)
          - [Minor] Failure to shut down busy helpers on -k rotate/reconfigure
            (Bug #1118)
          - [Minor] Don't use O_NONBLOCK on disk files. (Bug #1102)
          - [Minor] Squid fails to close TCP connection after blank HTTP
            response (Bug #1116)
          - [Minor security] Random error messages in response to malformed
            host name (Bug #1143)
          - [Minor] PURGE should not be able to delete internal objects
            (Bug #1112)
          - [Minor] httpd_accel_port 0 (virtual) not working correctly (Bug
            #1121)
          - [Minor] cachemgr vm_objects segfault (Bug #1149)
          - [Minor security] Confusing results on empty acl declarations (Bug
            #1166)
          - [Minor] Don't close all "other" filedescriptors on startup (Bug
            #1177)
          - [Minor] fakeauth_auth memory leak and NULL pointer access (Bug
            #1183)
          - [Security] buffer overflow bug in gopherToHTML() (Bug #1189)
          - [Medium security] Denial of service with forged WCCP messages
            (Bug #1190)
          - [Minor] DNS related memory leak on certain malformed DNS responses
            (Bug #1197)
          - [Minor] Internal DNS sometimes truncates host names in reverse
            (PTR) lookups (Bug #1136)
          - [Minor Security] Add sanity checks on LDAP user names (Bug #1187)
          - [Security] Harden Squid agains HTTP request smuggling attacks
          - [Minor] Icon URLs fails in non-anonymous FTP directory listings is
            short_icon_urls is on (Bug #1203)
          - [Security] Harden Squid agains HTTP response splitting attacks
            (Bug #1200)
          - [Medium security] Buffer overflow in WCCP recvfrom() call
            (Bug #1217)
          - [Security] Properly handle oversized reply headers (Bug #1216)
          - [Minor] LDAP helpers search fixed to properly ask for no attributes
          - [Minor] A sporadic segmentation fault when using ntlm authentication
            fixed (Bug #1127)
          - [Major] Segmentation fault on failed PUT/POST requests (Bug #1224)
          - [Medium] Persistent connection mismatch on failed PUT/POST request
            (Bug #1122)
          - [Minor] WCCP easily disturbed by forged packets (Bug #1225)
          - [Minor] Password management in ftp:// gatewaying improved (Bug #1226
          - [Major] HTTP reply data corruption in certain situations involving
            reply headers split over multiple packets (Bug #1233)

4 files changed, 19 insertions, 109 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 48dec2d3679..ab74c2564d3 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,46 +1,16 @@
-# $NetBSD: Makefile,v 1.120.2.7 2005/02/07 05:45:47 snj Exp $
+# $NetBSD: Makefile,v 1.120.2.8 2005/02/11 23:30:56 snj Exp $
 
-DISTNAME=	squid-2.5.STABLE7
-PKGNAME=	squid-2.5.7
-PKGREVISION=	12
+DISTNAME=	squid-2.5.STABLE8
+PKGNAME=	squid-2.5.8
 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.STABLE7-half_closed_POST.patch \
-		squid-2.5.STABLE7-LDAP_version_documentation.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-dothost.patch \
-		squid-2.5.STABLE7-httpd_accel_vport.patch \
-		squid-2.5.STABLE7-cachemgr_vmobjects.patch \
-		squid-2.5.STABLE7-empty_acls.patch \
-		squid-2.5.STABLE7-close_other.patch \
-		squid-2.5.STABLE7-fakeauth_auth.patch \
-		squid-2.5.STABLE7-gopher_html_parsing.patch \
-		squid-2.5.STABLE7-wccp_denial_of_service.patch \
-		squid-2.5.STABLE7-dns_memleak.patch \
-		squid-2.5.STABLE7-fqdn_truncated.patch \
-		squid-2.5.STABLE7-ldap_spaces.patch \
-		squid-2.5.STABLE7-header_parsing.patch \
-		squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch \
-		squid-2.5.STABLE7-ftp_datachannel.patch \
-		squid-2.5.STABLE7-short_icons_urls.patch \
-		squid-2.5.STABLE7-response_splitting.patch \
-		squid-2.5.STABLE7-wccp_buffer_overflow.patch \
-		squid-2.5.STABLE7-oversize_reply_headers.patch \
-		squid-2.5.STABLE7-ldap_search.patch \
-		squid-2.5.STABLE7-ntlm_segfault.patch \
-		squid-2.5.STABLE7-post.patch \
-		squid-2.5.STABLE7-server_post.patch \
-		squid-2.5.STABLE7-wccp_disturb.patch \
-		squid-2.5.STABLE7-ftp_password.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/
@@ -55,7 +25,7 @@ DATADIR=	${VARBASE}/squid
 
 # Update this time stamp pattern if any of official distfiles has changed.
 #
-DIST_STAMP=	2005020100
+DIST_STAMP=	2005021100
 
 DOCFILES=	ChangeLog RELEASENOTES.html doc/debug-sections.txt
 
diff --git a/www/squid/distinfo b/www/squid/distinfo
index dcde05b6881..95cfaf31185 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,67 +1,7 @@
-$NetBSD: distinfo,v 1.68.2.7 2005/02/07 05:48:50 snj Exp $
+$NetBSD: distinfo,v 1.68.2.8 2005/02/11 23:30:56 snj Exp $
 
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7.tar.bz2) = 24f29e28ec62d7ab5888cd594ac7a1975ee6aa36
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7.tar.bz2) = 1051830 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-half_closed_POST.patch) = 7e9259e60535185c04f060077b7e6ad6ff6defdf
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-half_closed_POST.patch) = 805 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-LDAP_version_documentation.patch) = b7b585d021a7b990c360b4e2f5c41d133dd3f8b7
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-LDAP_version_documentation.patch) = 1170 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7_req_resp_header.patch) = e1b595a3a682492f49550c8955f2853be588c16c
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7_req_resp_header.patch) = 1696 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-helper_shutdown.patch) = d05018ee7e5dbf9359430280f570baf037817010
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-helper_shutdown.patch) = 11579 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-non_blocking_disk.patch) = 73ccc1c594bcbf359dcf2e44c36e4ea802cbab6e
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-non_blocking_disk.patch) = 431 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-blank_response.patch) = b5d323d54f1e901ab6218a6fc2dc3162a865e198
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-blank_response.patch) = 723 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-dothost.patch) = 63b960ad219bd0a945418155f129a5c6b6fa9bfc
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-dothost.patch) = 2155 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-httpd_accel_vport.patch) = 8e4144c20fe297853a442b196fa45ff74c9f0b87
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-httpd_accel_vport.patch) = 843 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = f6f651a28b8ec65e3703137d2ec8bfbc69474d20
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = 6238 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-empty_acls.patch) = 0f6f4538c34f10d156572b2d16ffee24a5d762c1
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-empty_acls.patch) = 4432 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-close_other.patch) = cf73d7bd44567efa65941f2aa186711e3f1f9f8a
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-close_other.patch) = 945 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-fakeauth_auth.patch) = 7323e05403f34c2c582cb2b910337a6017686096
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-fakeauth_auth.patch) = 7967 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-gopher_html_parsing.patch) = 5da5a8b3b24eded8552d09b45f329ee927c66b3e
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-gopher_html_parsing.patch) = 714 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-wccp_denial_of_service.patch) = e4bec66adbe369eaa91cd6db3a503eb0a6de40e1
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-wccp_denial_of_service.patch) = 1928 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-dns_memleak.patch) = ea04865af9edb1db650090a6f163c33cfff69a16
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-dns_memleak.patch) = 779 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-fqdn_truncated.patch) = de02ebf4455ce1d2e685d88cb372cb7d6423a9e8
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-fqdn_truncated.patch) = 4484 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-ldap_spaces.patch) = f0ae7e6dbb9580186f2e091d840ccf3bda348abc
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-ldap_spaces.patch) = 1974 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-header_parsing.patch) = f3fd99e7a373050b5c2d34619d9f309335bb642e
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-header_parsing.patch) = 44080 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch) = 924a906c98cd5cff66115771b9e4f9d5ae5820a9
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch) = 4113 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-ftp_datachannel.patch) = 1022f7166a7bd4d83c93d7d4014865f98efefea1
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-ftp_datachannel.patch) = 4825 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-short_icons_urls.patch) = e7cf53c5a7db396d8fe89cf3c585fd591cb17903
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-short_icons_urls.patch) = 704 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-response_splitting.patch) = 04b5c84cb72f77bf3e076f752ba1f944af10457d
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-response_splitting.patch) = 10427 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 5cd9a71ea9ebaf35155c9f952152f848da4e5e79
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-oversize_reply_headers.patch) = a4cef8b40aef91dad7da0bd5175e9bde6b2928d8
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-oversize_reply_headers.patch) = 3056 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-ldap_search.patch) = 698c5d4cf703c6f576bea2f7186c1a7eb1af5698
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-ldap_search.patch) = 3719 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-ntlm_segfault.patch) = 5d2029916f949c26a80b6cd4006998275b71fe95
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-ntlm_segfault.patch) = 2076 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-post.patch) = dc115e97f17f8bc5db96aad54dd0f94026aa0e0f
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-post.patch) = 3172 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-server_post.patch) = 99bacbbca5b30e18235dd4c3dd8b2622e4689e83
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-server_post.patch) = 1424 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-wccp_disturb.patch) = 20b7a339b4bd19d66211ef97131237a7c812f6df
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-wccp_disturb.patch) = 5075 bytes
-SHA1 (squid-2.5.7-2005020100/squid-2.5.STABLE7-ftp_password.patch) = 00baf5c0c1d3021a3f88ab9289c669e155a684ad
-Size (squid-2.5.7-2005020100/squid-2.5.STABLE7-ftp_password.patch) = 1494 bytes
+SHA1 (squid-2.5.8-2005021100/squid-2.5.STABLE8.tar.bz2) = de126ef85612fcd1a44bdd67d4a410c4d47cd02d
+Size (squid-2.5.8-2005021100/squid-2.5.STABLE8.tar.bz2) = 1057299 bytes
 SHA1 (patch-aa) = 3e6fb677125eec276fdfa62336c134f26e1e1edd
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
@@ -70,11 +10,11 @@ SHA1 (patch-ae) = 860c8ad41ea09282bdb0d626260084354458f653
 SHA1 (patch-ag) = 1ea73bcd19eb0c6e380c8fd173261b1171b9d787
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
 SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7
-SHA1 (patch-al) = db2377a7c1dc3f03f562f7b1fc1e15fc567c3983
+SHA1 (patch-al) = 51d7c84b007ab9600ae911e1e9206cf91b937120
 SHA1 (patch-an) = febe1a78dfbda5caebe5a9f16af6da1e1a9e79ca
 SHA1 (patch-bb) = cc0486eaf27f5796d83041e6b7a9562a134d8063
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
 SHA1 (patch-ca) = 132e45eea22cccf6678b5d920d913965f73f0db7
 SHA1 (patch-cb) = 603471bf702c3ff4480585dc59dc326f23a5f2e8
 SHA1 (patch-cc) = 58a0ee7bbe32fd259583d3f9622b929cb568820d
-SHA1 (patch-cd) = 2e2cea8d959bd637829d518544e07a0be8175bd3
+SHA1 (patch-cd) = 2a22aa071cc0f50b5ed87e31c0e531a5fc9dc2b7
diff --git a/www/squid/patches/patch-al b/www/squid/patches/patch-al
index 4554d538fb9..48c6af00408 100644
--- a/www/squid/patches/patch-al
+++ b/www/squid/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.5 2004/08/22 15:11:09 taca Exp $
+$NetBSD: patch-al,v 1.5.4.1 2005/02/11 23:30:56 snj Exp $
 
---- src/structs.h.orig	2004-08-20 18:35:25.000000000 +0900
+--- src/structs.h.orig	2005-02-04 09:30:01.000000000 +0900
 +++ src/structs.h
-@@ -527,6 +527,7 @@ struct _SquidConfig {
+@@ -537,6 +537,7 @@ struct _SquidConfig {
      wordlist *mcast_group_list;
      wordlist *dns_testname_list;
      wordlist *dns_nameservers;
diff --git a/www/squid/patches/patch-cd b/www/squid/patches/patch-cd
index b7d577a6f81..506a2b88e4c 100644
--- a/www/squid/patches/patch-cd
+++ b/www/squid/patches/patch-cd
@@ -1,8 +1,8 @@
-$NetBSD: patch-cd,v 1.4 2004/08/22 15:11:09 taca Exp $
+$NetBSD: patch-cd,v 1.4.4.1 2005/02/11 23:30:56 snj Exp $
 
---- src/client_side.c.orig	2004-08-20 18:35:25.000000000 +0900
+--- src/client_side.c.orig	2005-02-04 09:10:09.000000000 +0900
 +++ src/client_side.c
-@@ -2752,6 +2752,9 @@ parseHttpRequest(ConnStateData * conn, m
+@@ -2773,6 +2773,9 @@ parseHttpRequest(ConnStateData * conn, m
  	    natLookup.nl_inip = http->conn->me.sin_addr;
  	    natLookup.nl_outip = http->conn->peer.sin_addr;
  	    natLookup.nl_flags = IPN_TCP;