diff options
author | sem <sem@FreeBSD.org> | 2005-02-13 17:21:02 +0000 |
---|---|---|
committer | sem <sem@FreeBSD.org> | 2005-02-13 17:21:02 +0000 |
commit | 81895dd1c63d9de8230ada5c4309a3d2b9dc06a6 (patch) | |
tree | 505c6884db0f5dc59f7218a711229bc43ce42b78 /www/squid30 | |
parent | 04bc30219bf81132652ad16f2dab43912b87bf39 (diff) | |
download | FreeBSD-ports-81895dd1c63d9de8230ada5c4309a3d2b9dc06a6.zip FreeBSD-ports-81895dd1c63d9de8230ada5c4309a3d2b9dc06a6.tar.gz |
- Update to 2.5-STABLE8
- Integrate a vendor patch from:
http://www.squid-cache.org/Versions/v2/2.5/bugs/
it fixes a major problem regarding the handling of invalid DNS responses
PR: ports/77423
Submitted by: maintainer
Diffstat (limited to 'www/squid30')
-rw-r--r-- | www/squid30/Makefile | 35 | ||||
-rw-r--r-- | www/squid30/distinfo | 64 | ||||
-rw-r--r-- | www/squid30/files/patch-ERR_INVALID_RESP | 132 |
3 files changed, 7 insertions, 224 deletions
diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 610203c..d1367c8 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -73,8 +73,7 @@ # about how to do transparent proxying with ipfw) PORTNAME= squid -PORTVERSION= 2.5.7 -PORTREVISION= 13 +PORTVERSION= 2.5.8 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -83,39 +82,11 @@ MASTER_SITES= \ ftp://ftp.leo.org/pub/comp/general/infosys/www/servers/squid/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,} MASTER_SITE_SUBDIR= squid-2/STABLE -DISTNAME= squid-2.5.STABLE7 +DISTNAME= squid-2.5.STABLE8 DIST_SUBDIR= squid2.5 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-blank_response.patch \ - squid-2.5.STABLE7-dothost.patch \ - squid-2.5.STABLE7-PURGE_internal.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 +PATCHFILES= squid-2.5.STABLE8-dns_assert.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid30/distinfo b/www/squid30/distinfo index ec3986b..16fbe56 100644 --- a/www/squid30/distinfo +++ b/www/squid30/distinfo @@ -1,60 +1,4 @@ -MD5 (squid2.5/squid-2.5.STABLE7.tar.bz2) = bf63e34906c68d716896eec0351108dc -SIZE (squid2.5/squid-2.5.STABLE7.tar.bz2) = 1051830 -MD5 (squid2.5/squid-2.5.STABLE7-half_closed_POST.patch) = 7468154bb645932718d74c3dafcc9ec3 -SIZE (squid2.5/squid-2.5.STABLE7-half_closed_POST.patch) = 805 -MD5 (squid2.5/squid-2.5.STABLE7-LDAP_version_documentation.patch) = 7e2dbbcfd22643246c3637a60b234214 -SIZE (squid2.5/squid-2.5.STABLE7-LDAP_version_documentation.patch) = 1170 -MD5 (squid2.5/squid-2.5.STABLE7_req_resp_header.patch) = 4237a7bcea6cb440e2b80414daf82c25 -SIZE (squid2.5/squid-2.5.STABLE7_req_resp_header.patch) = 1696 -MD5 (squid2.5/squid-2.5.STABLE7-helper_shutdown.patch) = bf5a91a22a4a982e2f5dd9752e81998b -SIZE (squid2.5/squid-2.5.STABLE7-helper_shutdown.patch) = 11579 -MD5 (squid2.5/squid-2.5.STABLE7-blank_response.patch) = b4d3265c55888f9b9ba3c5bc7d073822 -SIZE (squid2.5/squid-2.5.STABLE7-blank_response.patch) = 723 -MD5 (squid2.5/squid-2.5.STABLE7-dothost.patch) = 81034e9092a06d9aa1e9ede26632ae03 -SIZE (squid2.5/squid-2.5.STABLE7-dothost.patch) = 2155 -MD5 (squid2.5/squid-2.5.STABLE7-PURGE_internal.patch) = bc9d928b8dd37eaadd61bf7fefc375a7 -SIZE (squid2.5/squid-2.5.STABLE7-PURGE_internal.patch) = 871 -MD5 (squid2.5/squid-2.5.STABLE7-httpd_accel_vport.patch) = 2366a84e29fad439c2a488b03f112779 -SIZE (squid2.5/squid-2.5.STABLE7-httpd_accel_vport.patch) = 843 -MD5 (squid2.5/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = fdde57025dbfb8caf9154e24b4e1bf3e -SIZE (squid2.5/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = 6238 -MD5 (squid2.5/squid-2.5.STABLE7-empty_acls.patch) = 77d4365ebd4216ecde5f08301d43a02b -SIZE (squid2.5/squid-2.5.STABLE7-empty_acls.patch) = 4432 -MD5 (squid2.5/squid-2.5.STABLE7-close_other.patch) = 70f04f805907bb6544ae5aaccb74f324 -SIZE (squid2.5/squid-2.5.STABLE7-close_other.patch) = 945 -MD5 (squid2.5/squid-2.5.STABLE7-fakeauth_auth.patch) = 1b630af756317f97046adad302faedc4 -SIZE (squid2.5/squid-2.5.STABLE7-fakeauth_auth.patch) = 7967 -MD5 (squid2.5/squid-2.5.STABLE7-gopher_html_parsing.patch) = 1c0ba661b91a17fbd01e5e42430deb86 -SIZE (squid2.5/squid-2.5.STABLE7-gopher_html_parsing.patch) = 714 -MD5 (squid2.5/squid-2.5.STABLE7-wccp_denial_of_service.patch) = 0c77d92efda39797eb7d59c8d2e942d0 -SIZE (squid2.5/squid-2.5.STABLE7-wccp_denial_of_service.patch) = 1928 -MD5 (squid2.5/squid-2.5.STABLE7-dns_memleak.patch) = ee9c4b2a54fc721f67640e76d7e8b12f -SIZE (squid2.5/squid-2.5.STABLE7-dns_memleak.patch) = 779 -MD5 (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 1c38e69132cfc469f0aa6db47315d968 -SIZE (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 4484 -MD5 (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 8c2eb269b16d757b562ee32a2eb7ef99 -SIZE (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 1974 -MD5 (squid2.5/squid-2.5.STABLE7-header_parsing.patch) = fb3638f751fe45910057b101ef2febfd -SIZE (squid2.5/squid-2.5.STABLE7-header_parsing.patch) = 48402 -MD5 (squid2.5/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch) = a151cd22387e815028351b8b69541eec -SIZE (squid2.5/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch) = 4113 -MD5 (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = cc65c481c7ea1e2cb2bc1c0b61f09a69 -SIZE (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = 4825 -MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e69c444d63e -SIZE (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 704 -MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9eb8049cd5dff0c8838e9e6b8b0fbe64 -SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 10427 -MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73 -SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505 -MD5 (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 729c626f76637546b5ded70da6e0ee20 -SIZE (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 3056 -MD5 (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = f2f39856ada003854e00b91ac258e07f -SIZE (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = 3719 -MD5 (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 538a534a9a1acbbcb62cb64f618e325e -SIZE (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 2076 -MD5 (squid2.5/squid-2.5.STABLE7-post.patch) = ed73f46585b90319fc36e7f85130febc -SIZE (squid2.5/squid-2.5.STABLE7-post.patch) = 3172 -MD5 (squid2.5/squid-2.5.STABLE7-server_post.patch) = 86733a0d6052dc65b913fe7bf6357e43 -SIZE (squid2.5/squid-2.5.STABLE7-server_post.patch) = 1424 -MD5 (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 658cc713f3928e8a9774cb6543547c49 -SIZE (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 5075 +MD5 (squid2.5/squid-2.5.STABLE8.tar.bz2) = 687db8c5f0fec3798dbc77f94340b185 +SIZE (squid2.5/squid-2.5.STABLE8.tar.bz2) = 1057299 +MD5 (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 84469625a7fbc1fae2c688346a356341 +SIZE (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 2524 diff --git a/www/squid30/files/patch-ERR_INVALID_RESP b/www/squid30/files/patch-ERR_INVALID_RESP deleted file mode 100644 index 3b7cd8c..0000000 --- a/www/squid30/files/patch-ERR_INVALID_RESP +++ /dev/null @@ -1,132 +0,0 @@ -diff -ruP errors.orig/Korean/ERR_INVALID_RESP errors/Korean/ERR_INVALID_RESP ---- errors.orig/Korean/ERR_INVALID_RESP Thu Jan 1 01:00:00 1970 -+++ errors/Korean/ERR_INVALID_RESP Mon Jan 24 19:19:43 2005 -@@ -0,0 +1,29 @@ -+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> -+<TITLE>ERROR: The requested URL could not be retrieved</TITLE> -+<STYLE type="text/css"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}PRE{font-family:sans-serif}--></STYLE> -+</HEAD><BODY> -+<H1>ERROR</H1> -+<H2>The requested URL could not be retrieved</H2> -+<HR noshade size="1px"> -+<P> -+While trying to process the request: -+<PRE> -+%R -+</PRE> -+<P> -+The following error was encountered: -+<UL> -+<LI> -+<STRONG> -+Invalid Response -+</STRONG> -+</UL> -+ -+<P> -+The HTTP Response message received from the contacted server -+could not be understood or was otherwise malformed. Please contact -+the site operator. Your cache administrator may be able to provide -+you with more details about the exact nature of the problem if needed. -+ -+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>. -diff -ruP errors.orig/Polish/ERR_INVALID_RESP errors/Polish/ERR_INVALID_RESP ---- errors.orig/Polish/ERR_INVALID_RESP Thu Jan 1 01:00:00 1970 -+++ errors/Polish/ERR_INVALID_RESP Mon Jan 24 19:19:43 2005 -@@ -0,0 +1,29 @@ -+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> -+<TITLE>ERROR: The requested URL could not be retrieved</TITLE> -+<STYLE type="text/css"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}PRE{font-family:sans-serif}--></STYLE> -+</HEAD><BODY> -+<H1>ERROR</H1> -+<H2>The requested URL could not be retrieved</H2> -+<HR noshade size="1px"> -+<P> -+While trying to process the request: -+<PRE> -+%R -+</PRE> -+<P> -+The following error was encountered: -+<UL> -+<LI> -+<STRONG> -+Invalid Response -+</STRONG> -+</UL> -+ -+<P> -+The HTTP Response message received from the contacted server -+could not be understood or was otherwise malformed. Please contact -+the site operator. Your cache administrator may be able to provide -+you with more details about the exact nature of the problem if needed. -+ -+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>. -diff -ruP errors.orig/Portuguese/ERR_INVALID_RESP errors/Portuguese/ERR_INVALID_RESP ---- errors.orig/Portuguese/ERR_INVALID_RESP Thu Jan 1 01:00:00 1970 -+++ errors/Portuguese/ERR_INVALID_RESP Mon Jan 24 19:19:43 2005 -@@ -0,0 +1,29 @@ -+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> -+<TITLE>ERROR: The requested URL could not be retrieved</TITLE> -+<STYLE type="text/css"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}PRE{font-family:sans-serif}--></STYLE> -+</HEAD><BODY> -+<H1>ERROR</H1> -+<H2>The requested URL could not be retrieved</H2> -+<HR noshade size="1px"> -+<P> -+While trying to process the request: -+<PRE> -+%R -+</PRE> -+<P> -+The following error was encountered: -+<UL> -+<LI> -+<STRONG> -+Invalid Response -+</STRONG> -+</UL> -+ -+<P> -+The HTTP Response message received from the contacted server -+could not be understood or was otherwise malformed. Please contact -+the site operator. Your cache administrator may be able to provide -+you with more details about the exact nature of the problem if needed. -+ -+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>. -diff -ruP errors.orig/Romanian/ERR_INVALID_RESP errors/Romanian/ERR_INVALID_RESP ---- errors.orig/Romanian/ERR_INVALID_RESP Thu Jan 1 01:00:00 1970 -+++ errors/Romanian/ERR_INVALID_RESP Mon Jan 24 19:19:43 2005 -@@ -0,0 +1,29 @@ -+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> -+<TITLE>ERROR: The requested URL could not be retrieved</TITLE> -+<STYLE type="text/css"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}PRE{font-family:sans-serif}--></STYLE> -+</HEAD><BODY> -+<H1>ERROR</H1> -+<H2>The requested URL could not be retrieved</H2> -+<HR noshade size="1px"> -+<P> -+While trying to process the request: -+<PRE> -+%R -+</PRE> -+<P> -+The following error was encountered: -+<UL> -+<LI> -+<STRONG> -+Invalid Response -+</STRONG> -+</UL> -+ -+<P> -+The HTTP Response message received from the contacted server -+could not be understood or was otherwise malformed. Please contact -+the site operator. Your cache administrator may be able to provide -+you with more details about the exact nature of the problem if needed. -+ -+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>. |