From owner-svn-ports-branches@freebsd.org Fri Dec 23 03:46:36 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F4124C8D2E0; Fri, 23 Dec 2016 03:46:35 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B62361BC1; Fri, 23 Dec 2016 03:46:35 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBN3kYKU008738; Fri, 23 Dec 2016 03:46:34 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN3kYUu008734; Fri, 23 Dec 2016 03:46:34 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201612230346.uBN3kYUu008734@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 23 Dec 2016 03:46:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429218 - in branches/2016Q4/www/squid: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Dec 2016 03:46:36 -0000 Author: junovitch Date: Fri Dec 23 03:46:34 2016 New Revision: 429218 URL: https://svnweb.freebsd.org/changeset/ports/429218 Log: MFH: r427008 r427389 (www/squid only) r429217 www/squid: update 3.5.22 -> 3.5.23 - Switch to options helpers - Mark as not openssl-devel ready - Spell CHOSEN_COMPILER_TYPE correctly - Remove upstreamed patch (IPv6 + PF crash) - Add --enable-zph-qos option to default set http://wiki.squid-cache.org/Features/QualityOfService PR: 215416 Submitted by: Pavel Timofeev (maintainer) Security: CVE-2016-10002 Security: CVE-2016-10003 Security: https://vuxml.FreeBSD.org/freebsd/41f8af15-c8b9-11e6-ae1b-002590263bf5.html Approved by: ports-secteam (with hat) Modified: branches/2016Q4/www/squid/Makefile branches/2016Q4/www/squid/distinfo branches/2016Q4/www/squid/files/patch-src__ip__Intercept.cc Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/squid/Makefile ============================================================================== --- branches/2016Q4/www/squid/Makefile Fri Dec 23 03:41:51 2016 (r429217) +++ branches/2016Q4/www/squid/Makefile Fri Dec 23 03:46:34 2016 (r429218) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 3.5.20 +PORTVERSION= 3.5.23 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,6 +222,7 @@ CONFIGURE_ARGS= --with-default-user=squi --with-swapdir=/var/squid/cache \ --without-gnutls \ --enable-auth \ + --enable-zph-qos \ --enable-build-info \ --enable-loadable-modules \ --enable-removal-policies="lru heap" \ @@ -294,7 +295,7 @@ post-patch: ${change_files}) @(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample) -.if !${PORT_OPTIONS:MIPV6} +post-patch-IPV6-off: @${REINPLACE_CMD} -e's/ ::1//' -e's/ fc00::\/7//' \ -e's/ fe80::\/10//' -e's/ 2001:DB8::2//' \ -e's/ 2001:DB8::a:0\/64//' \ @@ -302,7 +303,6 @@ post-patch: -e'/tcp_outgoing_address 2001:db8::beef normal_service_net/d' \ -e'/tcp_outgoing_address 2001:db8::1/d' \ ${WRKSRC}/src/cf.data.pre -.endif post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @@ -313,11 +313,14 @@ post-install: .include -.if ${COMPILER_TYPE} == clang +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.if ${CHOSEN_COMPILER_TYPE} == clang #CXXFLAGS+= -Wno-unused-private-field -.if ${COMPILER_VERSION} >= 35 +CXXFLAGS+= -Wno-unknown-warning-option CXXFLAGS+= -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess .endif -.endif .include Modified: branches/2016Q4/www/squid/distinfo ============================================================================== --- branches/2016Q4/www/squid/distinfo Fri Dec 23 03:41:51 2016 (r429217) +++ branches/2016Q4/www/squid/distinfo Fri Dec 23 03:46:34 2016 (r429218) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467937151 -SHA256 (squid3.5/squid-3.5.20.tar.xz) = 37db73bd33ddd3503fe375bc3f2b47d9fb7309042e439ad3651f21d5dcf2d395 -SIZE (squid3.5/squid-3.5.20.tar.xz) = 2319780 +TIMESTAMP = 1479930399 +SHA256 (squid3.5/squid-3.5.23.tar.xz) = fa4c0c99f41e92fe1330bed3968d176c6f47ef2e3aea2f83977d5501afa40bdb +SIZE (squid3.5/squid-3.5.23.tar.xz) = 2325884 Modified: branches/2016Q4/www/squid/files/patch-src__ip__Intercept.cc ============================================================================== --- branches/2016Q4/www/squid/files/patch-src__ip__Intercept.cc Fri Dec 23 03:41:51 2016 (r429217) +++ branches/2016Q4/www/squid/files/patch-src__ip__Intercept.cc Fri Dec 23 03:46:34 2016 (r429218) @@ -13,41 +13,3 @@ return false; #else natLookup.nl_v = 6; -@@ -323,13 +323,21 @@ - } - - memset(&nl, 0, sizeof(struct pfioc_natlook)); -- newConn->remote.getInAddr(nl.saddr.v4); -+ if (newConn->remote.isIPv4()) { -+ newConn->remote.getInAddr(nl.saddr.v4); -+ } else { -+ newConn->remote.getInAddr(nl.saddr.v6); -+ } - nl.sport = htons(newConn->remote.port()); - -- newConn->local.getInAddr(nl.daddr.v4); -+ if (newConn->local.isIPv4()) { -+ newConn->local.getInAddr(nl.daddr.v4); -+ } else { -+ newConn->local.getInAddr(nl.daddr.v6); -+ } - nl.dport = htons(newConn->local.port()); - -- nl.af = AF_INET; -+ nl.af = newConn->remote.isIPv4() ? AF_INET : AF_INET6; - nl.proto = IPPROTO_TCP; - nl.direction = PF_OUT; - -@@ -345,7 +353,11 @@ - debugs(89, 9, HERE << "address: " << newConn); - return false; - } else { -- newConn->local = nl.rdaddr.v4; -+ if (nl.af == AF_INET) { -+ newConn->local = nl.rdaddr.v4; -+ } else { -+ newConn->local = nl.rdaddr.v6; -+ } - newConn->local.port(ntohs(nl.rdport)); - debugs(89, 5, HERE << "address NAT: " << newConn); - return true;