diff options
| author | rea <rea@FreeBSD.org> | 2013-01-11 17:53:41 +0800 |
|---|---|---|
| committer | rea <rea@FreeBSD.org> | 2013-01-11 17:53:41 +0800 |
| commit | f00854e92eea5e8482f0890bacccac118eaf9ca9 (patch) | |
| tree | 84a35569026788b0f2d2e70cdd75abe4b8b13a75 /www | |
| parent | abb3bd0b75edec527c9845b7433db95960b95fef (diff) | |
| download | freebsd-ports-gnome-f00854e92eea5e8482f0890bacccac118eaf9ca9.tar.gz freebsd-ports-gnome-f00854e92eea5e8482f0890bacccac118eaf9ca9.tar.zst freebsd-ports-gnome-f00854e92eea5e8482f0890bacccac118eaf9ca9.zip | |
www/squid3x: upgrade to 3.1.23 and 3.2.6
Squid 3.1.23 is effectively Squid 3.1.22_2 with the final fix for
CVE-2012-5643 applied.
Squid 3.2.6 also received that abovementioned fix, but in comparison
with 3.2.5 from ports it has another change that fixes handling the
"tcp_outgoing_tos" directive for BSD-like systems, including FreeBSD,
http://bugs.squid-cache.org/show_bug.cgi?id=3731
VuXML entry for SQUID:2012-1 (aka CVE-2012-5643) was also updated to
reflect the proper version specifications from the updated advisory,
http://www.squid-cache.org/Advisories/SQUID-2012_1.txt
Approved by: Thomas-Martin Seck <tmseck@web.de>
Security: http://portaudit.freebsd.org/c37de843-488e-11e2-a5c9-0019996bc1f7.html
QA page: http://codelabs.ru/fbsd/ports/qa/www/squid31/3.1.23
QA page: http://codelabs.ru/fbsd/ports/qa/www/squid32/3.2.6
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid31/Makefile | 5 | ||||
| -rw-r--r-- | www/squid31/distinfo | 6 | ||||
| -rw-r--r-- | www/squid32/Makefile | 7 | ||||
| -rw-r--r-- | www/squid32/distinfo | 12 |
4 files changed, 8 insertions, 22 deletions
diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 28d207e9f63b..6ff4cf4b725d 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -48,7 +48,6 @@ PORTNAME= squid PORTVERSION= 3.1.${SQUID_STABLE_VER} -PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ @@ -78,7 +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 +PATCHFILES= MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy @@ -91,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 3482173fc876..ef87bb3d27f1 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,4 +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.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 cf9536901eab..061041c9aa67 100644 --- a/www/squid32/Makefile +++ b/www/squid32/Makefile @@ -65,10 +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 +PATCHFILES= MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy @@ -78,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 3950d0869cce..2a8d59518274 100644 --- a/www/squid32/distinfo +++ b/www/squid32/distinfo @@ -1,10 +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.6.tar.bz2) = d48567bdd703e86900b9456f8bbdb554729fa15f579c6f2212bcd2ab6dca3324 +SIZE (squid3.2/squid-3.2.6.tar.bz2) = 2893158 |