From 8e2e7b50746e6ee85191215c1fc4986915da6923 Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 17 Feb 2005 03:32:24 +0000 Subject: [PATCH] upgrade to Squid 2.5.STABLE8 + patches Fixes 2 major issues over STABLE7 + the previous round of patches.. - Data corruption when HTTP reply headers is split in several packets - Assertion failure on certain odd DNS responses --- www/squid/Makefile | 34 +++--------- www/squid/distinfo | 124 +++++++------------------------------------- www/squid/pkg/PLIST | 12 ++++- 3 files changed, 37 insertions(+), 133 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index d9281f08e07..2e6229f6a2b 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,40 +1,18 @@ -# $OpenBSD: Makefile,v 1.70 2005/02/11 02:47:55 brad Exp $ +# $OpenBSD: Makefile,v 1.71 2005/02/17 03:32:24 brad Exp $ COMMENT= "WWW and FTP proxy cache and accelerator" -DISTNAME= squid-2.5.STABLE7 -PKGNAME= ${DISTNAME}p3 +DISTNAME= squid-2.5.STABLE8 CATEGORIES= www MASTER_SITES= ${HOMEPAGE}Versions/v2/2.5/ MASTER_SITES0= ${HOMEPAGE}Versions/v2/2.5/bugs/ DIST_SUBDIR= squid PATCH_DIST_STRIP= -p1 -PATCHFILES= ${DISTNAME}-half_closed_POST.patch:0 \ - ${DISTNAME}_req_resp_header.patch:0 \ - ${DISTNAME}-helper_shutdown.patch:0 \ - ${DISTNAME}-non_blocking_disk.patch:0 \ - ${DISTNAME}-blank_response.patch:0 \ - ${DISTNAME}-dothost.patch:0 \ - ${DISTNAME}-PURGE_internal.patch:0 \ - ${DISTNAME}-httpd_accel_vport.patch:0 \ - ${DISTNAME}-cachemgr_vmobjects.patch:0 \ - ${DISTNAME}-empty_acls.patch:0 \ - ${DISTNAME}-close_other.patch:0 \ - ${DISTNAME}-fakeauth_auth.patch:0 \ - ${DISTNAME}-gopher_html_parsing.patch:0 \ - ${DISTNAME}-wccp_denial_of_service.patch:0 \ - ${DISTNAME}-dns_memleak.patch:0 \ - ${DISTNAME}-fqdn_truncated.patch:0 \ - ${DISTNAME}-ldap_spaces.patch:0 \ - ${DISTNAME}-header_parsing.patch:0 \ - ${DISTNAME}-httpd_accel_no_pmtu_disc.patch:0 \ - ${DISTNAME}-ftp_datachannel.patch:0 \ - ${DISTNAME}-short_icons_urls.patch:0 \ - ${DISTNAME}-response_splitting.patch:0 \ - ${DISTNAME}-wccp_buffer_overflow.patch:0 \ - ${DISTNAME}-oversize_reply_headers.patch:0 \ - ${DISTNAME}-ldap_search.patch:0 +PATCHFILES= ${DISTNAME}-dns_assert.patch:0 \ + ${DISTNAME}-format_fixes.patch:0 \ + ${DISTNAME}-html_high_chars.patch:0 \ + ${DISTNAME}-ftp_cleanup.patch:0 HOMEPAGE= http://www.squid-cache.org/ diff --git a/www/squid/distinfo b/www/squid/distinfo index 5b7b36af211..118a27d86b5 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,104 +1,20 @@ -MD5 (squid/squid-2.5.STABLE7-PURGE_internal.patch) = bc9d928b8dd37eaadd61bf7fefc375a7 -MD5 (squid/squid-2.5.STABLE7-blank_response.patch) = b4d3265c55888f9b9ba3c5bc7d073822 -MD5 (squid/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = fdde57025dbfb8caf9154e24b4e1bf3e -MD5 (squid/squid-2.5.STABLE7-close_other.patch) = 70f04f805907bb6544ae5aaccb74f324 -MD5 (squid/squid-2.5.STABLE7-dns_memleak.patch) = ee9c4b2a54fc721f67640e76d7e8b12f -MD5 (squid/squid-2.5.STABLE7-dothost.patch) = 81034e9092a06d9aa1e9ede26632ae03 -MD5 (squid/squid-2.5.STABLE7-empty_acls.patch) = 77d4365ebd4216ecde5f08301d43a02b -MD5 (squid/squid-2.5.STABLE7-fakeauth_auth.patch) = 1b630af756317f97046adad302faedc4 -MD5 (squid/squid-2.5.STABLE7-fqdn_truncated.patch) = 1c38e69132cfc469f0aa6db47315d968 -MD5 (squid/squid-2.5.STABLE7-ftp_datachannel.patch) = cc65c481c7ea1e2cb2bc1c0b61f09a69 -MD5 (squid/squid-2.5.STABLE7-gopher_html_parsing.patch) = 1c0ba661b91a17fbd01e5e42430deb86 -MD5 (squid/squid-2.5.STABLE7-half_closed_POST.patch) = 7468154bb645932718d74c3dafcc9ec3 -MD5 (squid/squid-2.5.STABLE7-header_parsing.patch) = 81fc39556c20fa64f4bffacbaf5876b1 -MD5 (squid/squid-2.5.STABLE7-helper_shutdown.patch) = bf5a91a22a4a982e2f5dd9752e81998b -MD5 (squid/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch) = a151cd22387e815028351b8b69541eec -MD5 (squid/squid-2.5.STABLE7-httpd_accel_vport.patch) = 2366a84e29fad439c2a488b03f112779 -MD5 (squid/squid-2.5.STABLE7-ldap_search.patch) = f2f39856ada003854e00b91ac258e07f -MD5 (squid/squid-2.5.STABLE7-ldap_spaces.patch) = 8c2eb269b16d757b562ee32a2eb7ef99 -MD5 (squid/squid-2.5.STABLE7-non_blocking_disk.patch) = 4b7f8e6ba590af72c0afb121d92353f2 -MD5 (squid/squid-2.5.STABLE7-oversize_reply_headers.patch) = 729c626f76637546b5ded70da6e0ee20 -MD5 (squid/squid-2.5.STABLE7-response_splitting.patch) = 9eb8049cd5dff0c8838e9e6b8b0fbe64 -MD5 (squid/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e69c444d63e -MD5 (squid/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73 -MD5 (squid/squid-2.5.STABLE7-wccp_denial_of_service.patch) = 0c77d92efda39797eb7d59c8d2e942d0 -MD5 (squid/squid-2.5.STABLE7.tar.gz) = dbdc8ef226e744d63b03f3bbe24b42da -MD5 (squid/squid-2.5.STABLE7_req_resp_header.patch) = 4237a7bcea6cb440e2b80414daf82c25 -RMD160 (squid/squid-2.5.STABLE7-PURGE_internal.patch) = a75e4a44c129ca52a6fac6f3eba029e7f70e93f4 -RMD160 (squid/squid-2.5.STABLE7-blank_response.patch) = b4b65aca547fc3e3bee4e3fe4c013ab9dd13a812 -RMD160 (squid/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = d6df16e662ab15a9b7bdc7627ac3fd13e1033894 -RMD160 (squid/squid-2.5.STABLE7-close_other.patch) = 216e83d0dae6ed18be86dee962894732b7c4dfb0 -RMD160 (squid/squid-2.5.STABLE7-dns_memleak.patch) = 101df6bb3496f1212db5201b32cbe80150bb0455 -RMD160 (squid/squid-2.5.STABLE7-dothost.patch) = 525e23449fa8337cc113640cdf3b6f3eab23ce87 -RMD160 (squid/squid-2.5.STABLE7-empty_acls.patch) = 74d31f53251d7c5bb0c9f80d777f37fa82452f91 -RMD160 (squid/squid-2.5.STABLE7-fakeauth_auth.patch) = c35108f5abd4116baa9f531c8d6dc901a87bd282 -RMD160 (squid/squid-2.5.STABLE7-fqdn_truncated.patch) = d7919b0d080b410294e93bf9909a04076f9acfef -RMD160 (squid/squid-2.5.STABLE7-ftp_datachannel.patch) = c2be04ab23dbe42a0ba99d4a332e0beada8c479c -RMD160 (squid/squid-2.5.STABLE7-gopher_html_parsing.patch) = 56f7b4108151d54395eb5a2472276d1d1bab8e9e -RMD160 (squid/squid-2.5.STABLE7-half_closed_POST.patch) = e9b7a602cf2d61f8dca7d26d39ba1e70ea656207 -RMD160 (squid/squid-2.5.STABLE7-header_parsing.patch) = 077fb806930126b554eaa6efd032498e36f16ba3 -RMD160 (squid/squid-2.5.STABLE7-helper_shutdown.patch) = 9a4520cf5558509c36bbdab4fd129e9b87827de0 -RMD160 (squid/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch) = ab11152f7e7de2d75d533e433ce1e843f602ce35 -RMD160 (squid/squid-2.5.STABLE7-httpd_accel_vport.patch) = 0c6c128af4bc2d44e29beeada5a9bdfa23790faa -RMD160 (squid/squid-2.5.STABLE7-ldap_search.patch) = 9bcbe0dc3045d98b2a34aa107bba65d03e0034a1 -RMD160 (squid/squid-2.5.STABLE7-ldap_spaces.patch) = 34cad899928c0e129681bc868b91ed144768ddbf -RMD160 (squid/squid-2.5.STABLE7-non_blocking_disk.patch) = bcc8865169e4ac6a66ba5dc11c9bd248a05ca830 -RMD160 (squid/squid-2.5.STABLE7-oversize_reply_headers.patch) = 1e6f205cbb089efd25375258691514e006344b0d -RMD160 (squid/squid-2.5.STABLE7-response_splitting.patch) = 6d221185ee6267ed13594c69079a5f4df855dc35 -RMD160 (squid/squid-2.5.STABLE7-short_icons_urls.patch) = 98e0ac012844fe32ea186b69f994e7f1f2953cad -RMD160 (squid/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 159ac865ba9b16bcbde773e639197b845f412a37 -RMD160 (squid/squid-2.5.STABLE7-wccp_denial_of_service.patch) = fe280dec5037bea75e35ccd43ede4a4091a3ffcb -RMD160 (squid/squid-2.5.STABLE7.tar.gz) = e23e8f8b4c085f922d80eeea73665fd7470a907a -RMD160 (squid/squid-2.5.STABLE7_req_resp_header.patch) = e919430dd6bf7dec935fb6777f84c765e277e8ae -SHA1 (squid/squid-2.5.STABLE7-PURGE_internal.patch) = 617ca2f47e8de159ecf7c74d5b2b5da9c901e1a9 -SHA1 (squid/squid-2.5.STABLE7-blank_response.patch) = b5d323d54f1e901ab6218a6fc2dc3162a865e198 -SHA1 (squid/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = f6f651a28b8ec65e3703137d2ec8bfbc69474d20 -SHA1 (squid/squid-2.5.STABLE7-close_other.patch) = cf73d7bd44567efa65941f2aa186711e3f1f9f8a -SHA1 (squid/squid-2.5.STABLE7-dns_memleak.patch) = ea04865af9edb1db650090a6f163c33cfff69a16 -SHA1 (squid/squid-2.5.STABLE7-dothost.patch) = 63b960ad219bd0a945418155f129a5c6b6fa9bfc -SHA1 (squid/squid-2.5.STABLE7-empty_acls.patch) = 0f6f4538c34f10d156572b2d16ffee24a5d762c1 -SHA1 (squid/squid-2.5.STABLE7-fakeauth_auth.patch) = 7323e05403f34c2c582cb2b910337a6017686096 -SHA1 (squid/squid-2.5.STABLE7-fqdn_truncated.patch) = de02ebf4455ce1d2e685d88cb372cb7d6423a9e8 -SHA1 (squid/squid-2.5.STABLE7-ftp_datachannel.patch) = 1022f7166a7bd4d83c93d7d4014865f98efefea1 -SHA1 (squid/squid-2.5.STABLE7-gopher_html_parsing.patch) = 5da5a8b3b24eded8552d09b45f329ee927c66b3e -SHA1 (squid/squid-2.5.STABLE7-half_closed_POST.patch) = 7e9259e60535185c04f060077b7e6ad6ff6defdf -SHA1 (squid/squid-2.5.STABLE7-header_parsing.patch) = f3fd99e7a373050b5c2d34619d9f309335bb642e -SHA1 (squid/squid-2.5.STABLE7-helper_shutdown.patch) = d05018ee7e5dbf9359430280f570baf037817010 -SHA1 (squid/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch) = 924a906c98cd5cff66115771b9e4f9d5ae5820a9 -SHA1 (squid/squid-2.5.STABLE7-httpd_accel_vport.patch) = 8e4144c20fe297853a442b196fa45ff74c9f0b87 -SHA1 (squid/squid-2.5.STABLE7-ldap_search.patch) = 698c5d4cf703c6f576bea2f7186c1a7eb1af5698 -SHA1 (squid/squid-2.5.STABLE7-ldap_spaces.patch) = f0ae7e6dbb9580186f2e091d840ccf3bda348abc -SHA1 (squid/squid-2.5.STABLE7-non_blocking_disk.patch) = 73ccc1c594bcbf359dcf2e44c36e4ea802cbab6e -SHA1 (squid/squid-2.5.STABLE7-oversize_reply_headers.patch) = a4cef8b40aef91dad7da0bd5175e9bde6b2928d8 -SHA1 (squid/squid-2.5.STABLE7-response_splitting.patch) = 04b5c84cb72f77bf3e076f752ba1f944af10457d -SHA1 (squid/squid-2.5.STABLE7-short_icons_urls.patch) = e7cf53c5a7db396d8fe89cf3c585fd591cb17903 -SHA1 (squid/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 5cd9a71ea9ebaf35155c9f952152f848da4e5e79 -SHA1 (squid/squid-2.5.STABLE7-wccp_denial_of_service.patch) = e4bec66adbe369eaa91cd6db3a503eb0a6de40e1 -SHA1 (squid/squid-2.5.STABLE7.tar.gz) = 9fa0ed822f626f570ea3aa4fcc3e423ca2e1fe57 -SHA1 (squid/squid-2.5.STABLE7_req_resp_header.patch) = e1b595a3a682492f49550c8955f2853be588c16c -SIZE (squid/squid-2.5.STABLE7-PURGE_internal.patch) = 871 -SIZE (squid/squid-2.5.STABLE7-blank_response.patch) = 723 -SIZE (squid/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = 6238 -SIZE (squid/squid-2.5.STABLE7-close_other.patch) = 945 -SIZE (squid/squid-2.5.STABLE7-dns_memleak.patch) = 779 -SIZE (squid/squid-2.5.STABLE7-dothost.patch) = 2155 -SIZE (squid/squid-2.5.STABLE7-empty_acls.patch) = 4432 -SIZE (squid/squid-2.5.STABLE7-fakeauth_auth.patch) = 7967 -SIZE (squid/squid-2.5.STABLE7-fqdn_truncated.patch) = 4484 -SIZE (squid/squid-2.5.STABLE7-ftp_datachannel.patch) = 4825 -SIZE (squid/squid-2.5.STABLE7-gopher_html_parsing.patch) = 714 -SIZE (squid/squid-2.5.STABLE7-half_closed_POST.patch) = 805 -SIZE (squid/squid-2.5.STABLE7-header_parsing.patch) = 44080 -SIZE (squid/squid-2.5.STABLE7-helper_shutdown.patch) = 11579 -SIZE (squid/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch) = 4113 -SIZE (squid/squid-2.5.STABLE7-httpd_accel_vport.patch) = 843 -SIZE (squid/squid-2.5.STABLE7-ldap_search.patch) = 3719 -SIZE (squid/squid-2.5.STABLE7-ldap_spaces.patch) = 1974 -SIZE (squid/squid-2.5.STABLE7-non_blocking_disk.patch) = 431 -SIZE (squid/squid-2.5.STABLE7-oversize_reply_headers.patch) = 3056 -SIZE (squid/squid-2.5.STABLE7-response_splitting.patch) = 10427 -SIZE (squid/squid-2.5.STABLE7-short_icons_urls.patch) = 704 -SIZE (squid/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505 -SIZE (squid/squid-2.5.STABLE7-wccp_denial_of_service.patch) = 1928 -SIZE (squid/squid-2.5.STABLE7.tar.gz) = 1362398 -SIZE (squid/squid-2.5.STABLE7_req_resp_header.patch) = 1696 +MD5 (squid/squid-2.5.STABLE8-dns_assert.patch) = 84469625a7fbc1fae2c688346a356341 +MD5 (squid/squid-2.5.STABLE8-format_fixes.patch) = ad7c46b18cb34dcf66b45e3cd8ba3f42 +MD5 (squid/squid-2.5.STABLE8-ftp_cleanup.patch) = 2c886bae6720c9dfaf1993a04d592dbe +MD5 (squid/squid-2.5.STABLE8-html_high_chars.patch) = 9211067e47c77f8879a8d202a22f2890 +MD5 (squid/squid-2.5.STABLE8.tar.gz) = f221312bba92a64659f6d7a3bf916911 +RMD160 (squid/squid-2.5.STABLE8-dns_assert.patch) = 6bbda3f2c7509fa219a59d398797509ae361adaf +RMD160 (squid/squid-2.5.STABLE8-format_fixes.patch) = 8ad3c061cd2f18d627db3f73a260f1407b8e2d3b +RMD160 (squid/squid-2.5.STABLE8-ftp_cleanup.patch) = c8e6e613ab85d6a38bc9d9c955009f941310dc6f +RMD160 (squid/squid-2.5.STABLE8-html_high_chars.patch) = f2c159478771d6d0ef9f432dd4d224c52bb0d382 +RMD160 (squid/squid-2.5.STABLE8.tar.gz) = ed8d103e172497cad534a2dc0edb754ece19bd82 +SHA1 (squid/squid-2.5.STABLE8-dns_assert.patch) = 41af4ec15e007d5bc2dbbdecaeb426a5f391c40f +SHA1 (squid/squid-2.5.STABLE8-format_fixes.patch) = c853e84a671a8c8a6e304a1947be11d776685f34 +SHA1 (squid/squid-2.5.STABLE8-ftp_cleanup.patch) = a710fbb1ae4d24927ce88c46d394fc585ae2a325 +SHA1 (squid/squid-2.5.STABLE8-html_high_chars.patch) = 88da65e60bc75b448385696ac2059f690a1b24c1 +SHA1 (squid/squid-2.5.STABLE8.tar.gz) = 18fc579deef7ef2c199f83ccf9914acd43d311ff +SIZE (squid/squid-2.5.STABLE8-dns_assert.patch) = 2524 +SIZE (squid/squid-2.5.STABLE8-format_fixes.patch) = 9538 +SIZE (squid/squid-2.5.STABLE8-ftp_cleanup.patch) = 4532 +SIZE (squid/squid-2.5.STABLE8-html_high_chars.patch) = 766 +SIZE (squid/squid-2.5.STABLE8.tar.gz) = 1371450 diff --git a/www/squid/pkg/PLIST b/www/squid/pkg/PLIST index f6e1aa9da98..70538ce9dc3 100644 --- a/www/squid/pkg/PLIST +++ b/www/squid/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.20 2005/02/11 02:47:56 brad Exp $ +@comment $OpenBSD: PLIST,v 1.21 2005/02/17 03:32:24 brad Exp $ @newgroup _squid:515 @newuser _squid:515:_squid:daemon:Squid Account:/nonexistent:/sbin/nologin bin/RunAccel @@ -920,6 +920,8 @@ share/examples/squid/errors/Korean/ERR_FTP_UNAVAILABLE @sample share/squid/errors/Korean/ERR_FTP_UNAVAILABLE share/examples/squid/errors/Korean/ERR_INVALID_REQ @sample share/squid/errors/Korean/ERR_INVALID_REQ +share/examples/squid/errors/Korean/ERR_INVALID_RESP +@sample share/squid/errors/Korean/ERR_INVALID_RESP share/examples/squid/errors/Korean/ERR_INVALID_URL @sample share/squid/errors/Korean/ERR_INVALID_URL share/examples/squid/errors/Korean/ERR_LIFETIME_EXP @@ -980,6 +982,8 @@ share/examples/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE @sample share/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE share/examples/squid/errors/Lithuanian/ERR_INVALID_REQ @sample share/squid/errors/Lithuanian/ERR_INVALID_REQ +share/examples/squid/errors/Lithuanian/ERR_INVALID_RESP +@sample share/squid/errors/Lithuanian/ERR_INVALID_RESP share/examples/squid/errors/Lithuanian/ERR_INVALID_URL @sample share/squid/errors/Lithuanian/ERR_INVALID_URL share/examples/squid/errors/Lithuanian/ERR_LIFETIME_EXP @@ -1040,6 +1044,8 @@ share/examples/squid/errors/Polish/ERR_FTP_UNAVAILABLE @sample share/squid/errors/Polish/ERR_FTP_UNAVAILABLE share/examples/squid/errors/Polish/ERR_INVALID_REQ @sample share/squid/errors/Polish/ERR_INVALID_REQ +share/examples/squid/errors/Polish/ERR_INVALID_RESP +@sample share/squid/errors/Polish/ERR_INVALID_RESP share/examples/squid/errors/Polish/ERR_INVALID_URL @sample share/squid/errors/Polish/ERR_INVALID_URL share/examples/squid/errors/Polish/ERR_LIFETIME_EXP @@ -1100,6 +1106,8 @@ share/examples/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE @sample share/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE share/examples/squid/errors/Portuguese/ERR_INVALID_REQ @sample share/squid/errors/Portuguese/ERR_INVALID_REQ +share/examples/squid/errors/Portuguese/ERR_INVALID_RESP +@sample share/squid/errors/Portuguese/ERR_INVALID_RESP share/examples/squid/errors/Portuguese/ERR_INVALID_URL @sample share/squid/errors/Portuguese/ERR_INVALID_URL share/examples/squid/errors/Portuguese/ERR_LIFETIME_EXP @@ -1160,6 +1168,8 @@ share/examples/squid/errors/Romanian/ERR_FTP_UNAVAILABLE @sample share/squid/errors/Romanian/ERR_FTP_UNAVAILABLE share/examples/squid/errors/Romanian/ERR_INVALID_REQ @sample share/squid/errors/Romanian/ERR_INVALID_REQ +share/examples/squid/errors/Romanian/ERR_INVALID_RESP +@sample share/squid/errors/Romanian/ERR_INVALID_RESP share/examples/squid/errors/Romanian/ERR_INVALID_URL @sample share/squid/errors/Romanian/ERR_INVALID_URL share/examples/squid/errors/Romanian/ERR_LIFETIME_EXP