From dc5235908dd5d5797577e7145df61b30b46645b8 Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Wed, 9 Jan 2013 10:37:45 +0400 Subject: [PATCH] Squid: add final patches that fix SQUID-2012:1 They fix the infinite loop issue that was brought in by the initial fix for SQUID-2012:1 (aka CVE-2012-5643). Also update VuXML entry with the correct Squid versions that fix this issue for FreeBSD ports. Signed-off-by: Eygene Ryabinkin Security: http://portaudit.freebsd.org/c37de843-488e-11e2-a5c9-0019996bc1f7.html --- security/vuxml/vuln.xml | 7 ++++--- www/squid31/Makefile | 5 +++-- www/squid31/distinfo | 2 ++ www/squid32/Makefile | 4 +++- www/squid32/distinfo | 2 ++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml index 1f63b1b..1291e9e 100644 --- a/security/vuxml/vuln.xml +++ b/security/vuxml/vuln.xml @@ -56,9 +56,9 @@ Note: Please add new entries to the beginning of this file. squid - 3.1.22 - 3.23.2.4 - 3.33.3.0.2 + 3.1.22_3 + 3.23.2.5_1 + 3.33.3.0.3 @@ -83,6 +83,7 @@ Note: Please add new entries to the beginning of this file. 2012-12-17 2012-12-28 + 2013-01-09 diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 28d207e..f714b2c 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -48,7 +48,7 @@ PORTNAME= squid PORTVERSION= 3.1.${SQUID_STABLE_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ @@ -78,7 +78,8 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www2.tw.squid-cache.org/%SUBDIR%/ PATCH_SITE_SUBDIR= Versions/v3/3.1/changesets -PATCHFILES= squid-3.1-10483.patch +PATCHFILES= squid-3.1-10483.patch \ + squid-3.1-10484.patch MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 3482173..96df8d1 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -2,3 +2,5 @@ SHA256 (squid3.1/squid-3.1.22.tar.bz2) = 16fe2313f981ede1c945eebe3743d8f835e724c SIZE (squid3.1/squid-3.1.22.tar.bz2) = 2560270 SHA256 (squid3.1/squid-3.1-10483.patch) = ac871ad6e078ecc0f2ef0d32f7cbca26a1472d976e749177e60ee644878b0f42 SIZE (squid3.1/squid-3.1-10483.patch) = 1746 +SHA256 (squid3.1/squid-3.1-10484.patch) = d6fa3e07ee71a5b5f468cd4427a0febc6eab4e8b939228a18e04f163cf61dda7 +SIZE (squid3.1/squid-3.1-10484.patch) = 1314 diff --git a/www/squid32/Makefile b/www/squid32/Makefile index cf95369..3c024f6 100644 --- a/www/squid32/Makefile +++ b/www/squid32/Makefile @@ -37,6 +37,7 @@ PORTNAME= squid PORTVERSION= 3.2.${SQUID_STABLE_VER} +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ @@ -68,7 +69,8 @@ PATCH_SITE_SUBDIR= Versions/v3/3.2/changesets PATCHFILES= squid-3.2-11740.patch \ squid-3.2-11741.patch \ squid-3.2-11742.patch \ - squid-3.2-11743.patch + squid-3.2-11743.patch \ + squid-3.2-11744.patch MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy diff --git a/www/squid32/distinfo b/www/squid32/distinfo index 3950d08..1949818 100644 --- a/www/squid32/distinfo +++ b/www/squid32/distinfo @@ -8,3 +8,5 @@ SHA256 (squid3.2/squid-3.2-11742.patch) = 0cf97b177813136c28889c0ce2a05ab0b3fac2 SIZE (squid3.2/squid-3.2-11742.patch) = 2611 SHA256 (squid3.2/squid-3.2-11743.patch) = 8ce53eee452b00e7c4d23f3fbe930d44d50c9981d3633d64c198c43df7da8422 SIZE (squid3.2/squid-3.2-11743.patch) = 1740 +SHA256 (squid3.2/squid-3.2-11744.patch) = b0216fee2f3ea5a1c25c7694768eb3843da12d9c9c417994d8b3f246cc238848 +SIZE (squid3.2/squid-3.2-11744.patch) = 1308 -- 1.7.11.3