From 33050d8f5e0187a2c615c409812308e206c3b37b Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Thu, 10 Jan 2013 09:19:31 +0400 Subject: [PATCH] www/squid3*: update to the latest stable versions And update VuXML entry for CVE-2012-5643, because it was decided to go with the stable versions that are already rolled out and not to patch the existing ones. Signed-off-by: Eygene Ryabinkin --- security/vuxml/vuln.xml | 4 ++-- www/squid31/Makefile | 6 ++---- www/squid31/distinfo | 8 ++------ www/squid32/Makefile | 9 ++------- www/squid32/distinfo | 14 ++------------ 5 files changed, 10 insertions(+), 31 deletions(-) diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml index 1291e9e..99ce945 100644 --- a/security/vuxml/vuln.xml +++ b/security/vuxml/vuln.xml @@ -56,8 +56,8 @@ Note: Please add new entries to the beginning of this file. squid - 3.1.22_3 - 3.23.2.5_1 + 3.1.23 + 3.23.2.6 3.33.3.0.3 diff --git a/www/squid31/Makefile b/www/squid31/Makefile index f714b2c..6ff4cf4 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -48,7 +48,6 @@ PORTNAME= squid PORTVERSION= 3.1.${SQUID_STABLE_VER} -PORTREVISION= 3 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ @@ -78,8 +77,7 @@ 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 \ - squid-3.1-10484.patch +PATCHFILES= MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy @@ -92,7 +90,7 @@ LATEST_LINK= squid31 DEPRECATED= Squid 3.1 is no longer recommended for new installations. Please use www/squid32 instead EXPIRATION_DATE= 2013-03-31 -SQUID_STABLE_VER= 22 +SQUID_STABLE_VER= 23 CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 96df8d1..ef87bb3 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,6 +1,2 @@ -SHA256 (squid3.1/squid-3.1.22.tar.bz2) = 16fe2313f981ede1c945eebe3743d8f835e724c6dae296bfc1200af555549424 -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 +SHA256 (squid3.1/squid-3.1.23.tar.bz2) = ba8041d23ef168dee755ca0d343c28b117011f02abfabbf3a7b623f21ef0e48d +SIZE (squid3.1/squid-3.1.23.tar.bz2) = 2560454 diff --git a/www/squid32/Makefile b/www/squid32/Makefile index 3c024f6..061041c 100644 --- a/www/squid32/Makefile +++ b/www/squid32/Makefile @@ -37,7 +37,6 @@ 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/ \ @@ -66,11 +65,7 @@ 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.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-11744.patch +PATCHFILES= MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy @@ -80,7 +75,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LATEST_LINK= squid32 -SQUID_STABLE_VER= 5 +SQUID_STABLE_VER= 6 CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[!2].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes diff --git a/www/squid32/distinfo b/www/squid32/distinfo index 1949818..2a8d595 100644 --- a/www/squid32/distinfo +++ b/www/squid32/distinfo @@ -1,12 +1,2 @@ -SHA256 (squid3.2/squid-3.2.5.tar.bz2) = a823de016ca80680f979f3c74ba481775062b4de5924b21d58d1863254283912 -SIZE (squid3.2/squid-3.2.5.tar.bz2) = 2893104 -SHA256 (squid3.2/squid-3.2-11740.patch) = eec9b1beeccfcb436170fc9902104cea2efd6c5dddfe368c8040b45c1513ca1c -SIZE (squid3.2/squid-3.2-11740.patch) = 1710 -SHA256 (squid3.2/squid-3.2-11741.patch) = b93fc059dc1e0c0f84cb1e9873c3cc156b832410c3a60e18f1ecb58262a13e56 -SIZE (squid3.2/squid-3.2-11741.patch) = 1842 -SHA256 (squid3.2/squid-3.2-11742.patch) = 0cf97b177813136c28889c0ce2a05ab0b3fac214465bc6d741c6728a225ad49a -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 +SHA256 (squid3.2/squid-3.2.6.tar.bz2) = d48567bdd703e86900b9456f8bbdb554729fa15f579c6f2212bcd2ab6dca3324 +SIZE (squid3.2/squid-3.2.6.tar.bz2) = 2893158 -- 1.7.11.3