From b051f5819de28fe039aadebfd5b6bc0f8f929354 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 30 Nov 2003 14:08:31 +0000 Subject: Take in 16 official patches and bump revision. * connection setup may look like syn flood attack if server is refusing connection * --enable-arp-acl may give warning about net/route.h * Incorrect html on empty Gopher responses * positive_dns_ttl ignored when using internal DNS client * squid_ldap_group update to version 2.12 * 100% CPU loop if external_acl combined with authentication * maximum_object_size too large causes squid not to cache * Install of Mozilla/Netscape plugins fails because .xpi mime type unknown * Segfault if failing to load error page * Error page translation updates for German and Lithuanian * auth_param documentation update * pam_auth fails on Solaris when using pam_authtok_get * FQDNcache discards negative responses when using internal DNS * login with space confuses redirector helpers * digest auth never detects password changes * cache.log message on "squid -k reconfigure" confusing --- www/squid/Makefile | 23 +++++++++++++++++++---- www/squid/distinfo | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index fcb1ca97015..955e4f31d58 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.94 2003/11/12 03:39:44 jschauma Exp $ +# $NetBSD: Makefile,v 1.95 2003/11/30 14:08:31 taca Exp $ DISTNAME= squid-2.5.STABLE4 PKGNAME= squid-2.5.4 -PKGREVISION= 1 +PKGREVISION= 2 WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.5/ \ @@ -10,8 +10,23 @@ MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.5/ \ 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= +PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ +PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ + squid-2.5.STABLE4-digest_auth_pwchange.patch \ + squid-2.5.STABLE4-redirect_login_space.patch \ + squid-2.5.STABLE4-fqdnnegcache.patch \ + pam_auth-2.2.patch \ + squid-2.5.STABLE4_auth_param_doc.patch \ + squid-2.5.STABLE4-errorpages.patch \ + squid-2.5.STABLE4-error_load_text.patch \ + squid-2.5.STABLE4-xpi_mime.patch \ + squid-2.5.STABLE4-size_overflow.patch \ + squid-2.5.STABLE4-extacl_auth_loop.patch \ + squid-2.5.STABLE4-squid_ldap_group.patch \ + squid-2.5.STABLE4-positive_dns_ttl.patch \ + squid-2.5.STABLE4-gopherhtml.patch \ + squid-2.5.STABLE4-netroute.patch \ + squid-2.5.STABLE4-synflood.patch PATCH_DIST_STRIP= -p1 MAINTAINER= taca@NetBSD.org diff --git a/www/squid/distinfo b/www/squid/distinfo index b75a41878ee..262cdc4b945 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,7 +1,39 @@ -$NetBSD: distinfo,v 1.40 2003/09/17 05:40:57 taca Exp $ +$NetBSD: distinfo,v 1.41 2003/11/30 14:08:31 taca Exp $ SHA1 (squid-2.5.4/squid-2.5.STABLE4.tar.bz2) = 470a2697625cf6edb83ad6fe59af2e147f557e24 Size (squid-2.5.4/squid-2.5.STABLE4.tar.bz2) = 1036704 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-reconfigure_message.patch) = 9b304f2c1956ade18329c7357ce1458990a74581 +Size (squid-2.5.4/squid-2.5.STABLE4-reconfigure_message.patch) = 760 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-digest_auth_pwchange.patch) = 6e80ae5e468b03ee4d3d6b1d69021aecdec04614 +Size (squid-2.5.4/squid-2.5.STABLE4-digest_auth_pwchange.patch) = 2694 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-redirect_login_space.patch) = a7fb688d69fde9dbb70acb009a3db1b5a547a3f9 +Size (squid-2.5.4/squid-2.5.STABLE4-redirect_login_space.patch) = 619 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-fqdnnegcache.patch) = f9e2b1d4c7df4cb94fd561f7c77cc7e7f24cfde0 +Size (squid-2.5.4/squid-2.5.STABLE4-fqdnnegcache.patch) = 701 bytes +SHA1 (squid-2.5.4/pam_auth-2.2.patch) = 2978e0bf5531fc179f9cedfbf12216efc1e715af +Size (squid-2.5.4/pam_auth-2.2.patch) = 4878 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4_auth_param_doc.patch) = 88f8c093280329bb7f4624c8f9392069f977e98e +Size (squid-2.5.4/squid-2.5.STABLE4_auth_param_doc.patch) = 9068 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-errorpages.patch) = 954ebcb707deeba64bda287e7591a5d107578fdb +Size (squid-2.5.4/squid-2.5.STABLE4-errorpages.patch) = 49938 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-error_load_text.patch) = 0f7a7df65346512074b0ec7bc459d5ea3f541076 +Size (squid-2.5.4/squid-2.5.STABLE4-error_load_text.patch) = 571 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-xpi_mime.patch) = 257ce3058e62a209dae55c9daad77cc5579bfeb8 +Size (squid-2.5.4/squid-2.5.STABLE4-xpi_mime.patch) = 601 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-size_overflow.patch) = fea2b13f00332ef5f04ffff72de81d58eeef3c4a +Size (squid-2.5.4/squid-2.5.STABLE4-size_overflow.patch) = 438 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-extacl_auth_loop.patch) = 6de2a5f5b04cc645e164c9b5476061e7b27fac84 +Size (squid-2.5.4/squid-2.5.STABLE4-extacl_auth_loop.patch) = 756 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-squid_ldap_group.patch) = 9cba29ee21840f3598c8684abd4a52882a459db7 +Size (squid-2.5.4/squid-2.5.STABLE4-squid_ldap_group.patch) = 30490 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-positive_dns_ttl.patch) = 1ec94a4ce2e583e6b734a2e5f381bb086b45f43d +Size (squid-2.5.4/squid-2.5.STABLE4-positive_dns_ttl.patch) = 3409 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-gopherhtml.patch) = 1925feb4a37b91eb0be934941030b328bb00811b +Size (squid-2.5.4/squid-2.5.STABLE4-gopherhtml.patch) = 3382 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-netroute.patch) = f9fdd9d819796120a6bcf4752f6ea8a0e4fd94db +Size (squid-2.5.4/squid-2.5.STABLE4-netroute.patch) = 592 bytes +SHA1 (squid-2.5.4/squid-2.5.STABLE4-synflood.patch) = a1138fb535a3f41a67c01e3e9eca8c11fcc8d72d +Size (squid-2.5.4/squid-2.5.STABLE4-synflood.patch) = 12861 bytes SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0 -- cgit v1.2.3