diff options
| author | madpilot <madpilot@FreeBSD.org> | 2014-09-18 21:24:02 +0800 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2014-09-18 21:24:02 +0800 |
| commit | f99b89da1ca35281650b7c6918b87b47c6e75302 (patch) | |
| tree | 31f3a009fa8c806805be6089bf722ec01b615b08 | |
| parent | 724f82e7f967ad79f24d90f465c5ae9d2602ecdb (diff) | |
| download | freebsd-ports-gnome-f99b89da1ca35281650b7c6918b87b47c6e75302.tar.gz freebsd-ports-gnome-f99b89da1ca35281650b7c6918b87b47c6e75302.tar.zst freebsd-ports-gnome-f99b89da1ca35281650b7c6918b87b47c6e75302.zip | |
Update squid to 3.4.8 and add patches to squid33.
This update addresses CVE-2014-6270.
PR: 193737
Submitted by: timp87 at gmail.com
| -rw-r--r-- | www/squid/Makefile | 5 | ||||
| -rw-r--r-- | www/squid/distinfo | 4 | ||||
| -rw-r--r-- | www/squid33/Makefile | 8 | ||||
| -rw-r--r-- | www/squid33/distinfo | 4 |
4 files changed, 13 insertions, 8 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 5d72e75f7b60..c4cf1107003a 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 3.4.7 -PORTREVISION= 1 +PORTVERSION= 3.4.8 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ @@ -222,7 +221,7 @@ negotiate_auth= kerberos wrapper . if ${OPSYS} == DragonFly LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5 . endif -# the kerberos_ldap_group external helper depends on LDAP and SASL: +# the kerberos_ldap_group external helper also depends on LDAP and SASL: . if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL} external_acl+= kerberos_ldap_group . endif diff --git a/www/squid/distinfo b/www/squid/distinfo index d60109f2f0d6..8e1adb6ca39b 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,2 +1,2 @@ -SHA256 (squid3.4/squid-3.4.7.tar.xz) = cc40a3cccdcdfc11269ea969e658d99e3ef2202999b78aa01a647a6bc71759ee -SIZE (squid3.4/squid-3.4.7.tar.xz) = 2158672 +SHA256 (squid3.4/squid-3.4.8.tar.xz) = 9146017d0e4ad48fbc1d1b6c03d544227c8e7fc7720952b588b688e65beedc18 +SIZE (squid3.4/squid-3.4.8.tar.xz) = 2159904 diff --git a/www/squid33/Makefile b/www/squid33/Makefile index d5b65ae05870..b72f1c22ffb2 100644 --- a/www/squid33/Makefile +++ b/www/squid33/Makefile @@ -3,7 +3,7 @@ PORTNAME= squid PORTVERSION= 3.3.${SQUID_STABLE_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ @@ -21,7 +21,9 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://master.squid-cache.org/~amosjeffries/patches/:nosid PATCH_SITE_SUBDIR= Versions/v3/${PORTVERSION:R}/changesets -PATCHFILES= FreeBSD_silence_nosuid_mk1.patch:nosid +PATCHFILES= FreeBSD_silence_nosuid_mk1.patch:nosid \ + squid-3.3-12682.patch \ + squid-3.3-12683.patch MAINTAINER= ports@FreeBSD.org COMMENT= HTTP Caching Proxy @@ -228,7 +230,7 @@ negotiate_auth= kerberos wrapper . if ${OPSYS} == DragonFly LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5 . endif -# the kerberos_ldap_group external helper depends on LDAP and SASL: +# the kerberos_ldap_group external helper also depends on LDAP and SASL: . if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL} external_acl+= kerberos_ldap_group . endif diff --git a/www/squid33/distinfo b/www/squid33/distinfo index 91202d1c3f62..2e9c4723cddc 100644 --- a/www/squid33/distinfo +++ b/www/squid33/distinfo @@ -2,3 +2,7 @@ SHA256 (squid3.3/squid-3.3.13.tar.bz2) = 584f85de055c28705492ab07a2d5bb818286f56 SIZE (squid3.3/squid-3.3.13.tar.bz2) = 2991135 SHA256 (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 6fd9e55812e18463e92c83d1376e65ca54b2857606f59f4aa1b7d2716af2b72c SIZE (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 1295 +SHA256 (squid3.3/squid-3.3-12682.patch) = b13866b058fe2545a4b221416d2822bfb1003bb23d66304255b4778dc3bc6520 +SIZE (squid3.3/squid-3.3-12682.patch) = 1896 +SHA256 (squid3.3/squid-3.3-12683.patch) = dd4e08cf56def77680489432e269074e0ca6cf4fd21446985e866e4e69894060 +SIZE (squid3.3/squid-3.3-12683.patch) = 9334 |