From cd8065e520bf93988a52d9f2beba1b273a7796bc Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 8 May 2016 23:29:19 +0000 Subject: Update squid3 to 3.5.19, 3.5.18 contains security fix. Changes to squid-3.5.19 (09 May 2016): - Regression Bug 4515: interception proxy hangs Changes to squid-3.5.18 (06 May 2016): - Bug 4510: stale comment about 32KB limit on shared memory cache entries - Bug 4509: EUI compile error on NetBSD - Bug 4501: HTTP/1.1: normalize Host header - Bug 4498: URL-unescape the login-info after extraction from URI - Bug 4455: SegFault from ESIInclude::Start - Prevent Squid forcing -b 2048 into the arguments for sslcrtd_program - Fix TLS/SSL server handshake alert handling --- www/squid3/Makefile | 4 ++-- www/squid3/distinfo | 11 +++++------ www/squid3/patches/patch-src_eui_Eui48.cc | 18 ------------------ 3 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 www/squid3/patches/patch-src_eui_Eui48.cc (limited to 'www') diff --git a/www/squid3/Makefile b/www/squid3/Makefile index 66598aad354..9c60122d41c 100644 --- a/www/squid3/Makefile +++ b/www/squid3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.64 2016/04/22 15:14:22 adam Exp $ +# $NetBSD: Makefile,v 1.65 2016/05/08 23:29:19 taca Exp $ -DISTNAME= squid-3.5.17 +DISTNAME= squid-3.5.19 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \ ftp://ftp.squid-cache.org/pub/squid/ \ diff --git a/www/squid3/distinfo b/www/squid3/distinfo index c067f44576a..e934221b970 100644 --- a/www/squid3/distinfo +++ b/www/squid3/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.50 2016/04/26 10:36:48 adam Exp $ +$NetBSD: distinfo,v 1.51 2016/05/08 23:29:19 taca Exp $ -SHA1 (squid-3.5.17.tar.xz) = 8ef6fe7d778df9538a4aa29d7e8ace52246e7a23 -RMD160 (squid-3.5.17.tar.xz) = f0fdba7aa5601c0b43583819d58c778de351eb7e -SHA512 (squid-3.5.17.tar.xz) = 7531c208278ee42b9e34b4e49a249bb033389207546cf0172a2657d60d08146d36ee8f9296e16eea13c552bad01f3ef8592b1486556756edb0b3304b17306661 -Size (squid-3.5.17.tar.xz) = 2318216 bytes +SHA1 (squid-3.5.19.tar.xz) = 809133b751df9fb5bca07f181b3e2f7df392f761 +RMD160 (squid-3.5.19.tar.xz) = ef97ea9eb6273ec8ded8f74860bcfa7675bf1fb1 +SHA512 (squid-3.5.19.tar.xz) = b2e70845d87a3a3d57b8ff08c6fb21137cedc75c8076a8e004a4b4031a7045d13f13de2b2aa98435e39770aefe1db838538ed62fc4169f83797c99fc0883f650 +Size (squid-3.5.19.tar.xz) = 2318720 bytes SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288 SHA1 (patch-compat_debug.cc) = 95fc0aa6901834175b9bbf1ddb51eeb7d9ddc8c7 SHA1 (patch-compat_debug.h) = a828871704b1578b520d412393c3d398099a5fdc @@ -11,6 +11,5 @@ SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289 SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6 SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9 SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939 -SHA1 (patch-src_eui_Eui48.cc) = 1096f3293cc5a4249a1ce1738b2e5c4113d0a982 SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4 SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f diff --git a/www/squid3/patches/patch-src_eui_Eui48.cc b/www/squid3/patches/patch-src_eui_Eui48.cc deleted file mode 100644 index 9a1095dbe6b..00000000000 --- a/www/squid3/patches/patch-src_eui_Eui48.cc +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_eui_Eui48.cc,v 1.1 2016/04/26 10:36:48 adam Exp $ - -Fix build on NetBSD >=7.99.27 due route(4) change (deprecation of RTF_LLINFO). - ---- src/eui/Eui48.cc.orig 2016-04-20 12:24:03.000000000 +0000 -+++ src/eui/Eui48.cc -@@ -375,7 +375,11 @@ Eui::Eui48::lookup(const Ip::Address &c) - - mib[4] = NET_RT_FLAGS; - -+#ifdef RTF_LLDATA -+ mib[5] = RTF_LLDATA; -+#else - mib[5] = RTF_LLINFO; -+#endif - - if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) { - debugs(28, DBG_CRITICAL, "Can't estimate ARP table size!"); -- cgit v1.2.3