From owner-svn-ports-head@FreeBSD.ORG Thu Sep 18 13:24:03 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C28D1ED; Thu, 18 Sep 2014 13:24:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 573F83E4; Thu, 18 Sep 2014 13:24:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8IDO3AF035307; Thu, 18 Sep 2014 13:24:03 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8IDO2bH035299; Thu, 18 Sep 2014 13:24:02 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201409181324.s8IDO2bH035299@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Thu, 18 Sep 2014 13:24:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368457 - in head/www: squid squid33 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Sep 2014 13:24:03 -0000 Author: madpilot Date: Thu Sep 18 13:24:02 2014 New Revision: 368457 URL: http://svnweb.freebsd.org/changeset/ports/368457 QAT: https://qat.redports.org/buildarchive/r368457/ Log: 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 Modified: head/www/squid/Makefile head/www/squid/distinfo head/www/squid33/Makefile head/www/squid33/distinfo Modified: head/www/squid/Makefile ============================================================================== --- head/www/squid/Makefile Thu Sep 18 13:22:58 2014 (r368456) +++ head/www/squid/Makefile Thu Sep 18 13:24:02 2014 (r368457) @@ -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 Modified: head/www/squid/distinfo ============================================================================== --- head/www/squid/distinfo Thu Sep 18 13:22:58 2014 (r368456) +++ head/www/squid/distinfo Thu Sep 18 13:24:02 2014 (r368457) @@ -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 Modified: head/www/squid33/Makefile ============================================================================== --- head/www/squid33/Makefile Thu Sep 18 13:22:58 2014 (r368456) +++ head/www/squid33/Makefile Thu Sep 18 13:24:02 2014 (r368457) @@ -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/ 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 Modified: head/www/squid33/distinfo ============================================================================== --- head/www/squid33/distinfo Thu Sep 18 13:22:58 2014 (r368456) +++ head/www/squid33/distinfo Thu Sep 18 13:24:02 2014 (r368457) @@ -2,3 +2,7 @@ SHA256 (squid3.3/squid-3.3.13.tar.bz2) = 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