From owner-svn-ports-branches@freebsd.org Sun Jun 18 16:01:30 2017 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 A8779D88ECC; Sun, 18 Jun 2017 16:01:30 +0000 (UTC) (envelope-from matthew@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 7627673A4B; Sun, 18 Jun 2017 16:01:30 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5IG1TK7022631; Sun, 18 Jun 2017 16:01:29 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5IG1Tve022629; Sun, 18 Jun 2017 16:01:29 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201706181601.v5IG1Tve022629@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sun, 18 Jun 2017 16:01:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443831 - branches/2017Q2/www/p5-RT-Authen-ExternalAuth 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: Sun, 18 Jun 2017 16:01:30 -0000 Author: matthew Date: Sun Jun 18 16:01:29 2017 New Revision: 443831 URL: https://svnweb.freebsd.org/changeset/ports/443831 Log: MFH: r443662 Security update to 0.27 Changes: http://cpansearch.perl.org/src/BPS/RT-Authen-ExternalAuth-0.27/CHANGES Security: 7a92e958-5207-11e7-8d7c-6805ca0b3d42 Approved by: ports-secteam (feld) Modified: branches/2017Q2/www/p5-RT-Authen-ExternalAuth/Makefile branches/2017Q2/www/p5-RT-Authen-ExternalAuth/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/p5-RT-Authen-ExternalAuth/Makefile ============================================================================== --- branches/2017Q2/www/p5-RT-Authen-ExternalAuth/Makefile Sun Jun 18 15:09:12 2017 (r443830) +++ branches/2017Q2/www/p5-RT-Authen-ExternalAuth/Makefile Sun Jun 18 16:01:29 2017 (r443831) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= RT-Authen-ExternalAuth -DISTVERSION= 0.26 +DISTVERSION= 0.27 CATEGORIES= www net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Modified: branches/2017Q2/www/p5-RT-Authen-ExternalAuth/distinfo ============================================================================== --- branches/2017Q2/www/p5-RT-Authen-ExternalAuth/distinfo Sun Jun 18 15:09:12 2017 (r443830) +++ branches/2017Q2/www/p5-RT-Authen-ExternalAuth/distinfo Sun Jun 18 16:01:29 2017 (r443831) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470224438 -SHA256 (RT-Authen-ExternalAuth-0.26.tar.gz) = 3331a47e2d4c93ab085c36785a958ce8398733a73a66e96c2f81da2c3f01ecb3 -SIZE (RT-Authen-ExternalAuth-0.26.tar.gz) = 77179 +TIMESTAMP = 1497559945 +SHA256 (RT-Authen-ExternalAuth-0.27.tar.gz) = b001bfea5d06bea8aaaeb7434c94942785176cd35f081a8fed691906545b36c4 +SIZE (RT-Authen-ExternalAuth-0.27.tar.gz) = 78045 From owner-svn-ports-branches@freebsd.org Mon Jun 19 15:35:06 2017 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 41558D9F2E2; Mon, 19 Jun 2017 15:35:06 +0000 (UTC) (envelope-from jkim@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 08A1279238; Mon, 19 Jun 2017 15:35:05 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5JFZ5FR004544; Mon, 19 Jun 2017 15:35:05 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5JFZ5KO004541; Mon, 19 Jun 2017 15:35:05 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201706191535.v5JFZ5KO004541@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Mon, 19 Jun 2017 15:35:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443879 - branches/2017Q2/www/linux-flashplayer 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: Mon, 19 Jun 2017 15:35:06 -0000 Author: jkim Date: Mon Jun 19 15:35:04 2017 New Revision: 443879 URL: https://svnweb.freebsd.org/changeset/ports/443879 Log: MFH: r443622 Update to 26.0.0.126. https://helpx.adobe.com/security/products/flash-player/apsb17-17.html PR: 220006 Approved by: ports-secteam (miwi) Modified: branches/2017Q2/www/linux-flashplayer/Makefile branches/2017Q2/www/linux-flashplayer/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/linux-flashplayer/Makefile ============================================================================== --- branches/2017Q2/www/linux-flashplayer/Makefile Mon Jun 19 15:33:52 2017 (r443878) +++ branches/2017Q2/www/linux-flashplayer/Makefile Mon Jun 19 15:35:04 2017 (r443879) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 25.0.0.171 +PORTVERSION= 26.0.0.126 CATEGORIES= www multimedia linux MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ PKGNAMEPREFIX= linux- Modified: branches/2017Q2/www/linux-flashplayer/distinfo ============================================================================== --- branches/2017Q2/www/linux-flashplayer/distinfo Mon Jun 19 15:33:52 2017 (r443878) +++ branches/2017Q2/www/linux-flashplayer/distinfo Mon Jun 19 15:35:04 2017 (r443879) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494740685 -SHA256 (flashplayer/25.0.0.171/flash_player_npapi_linux.i386.tar.gz) = 83395b43da1689104e569006c2a75d159d6b12f4c07d0d8e4e05e70b233662f4 -SIZE (flashplayer/25.0.0.171/flash_player_npapi_linux.i386.tar.gz) = 8488318 +TIMESTAMP = 1497548309 +SHA256 (flashplayer/26.0.0.126/flash_player_npapi_linux.i386.tar.gz) = da0ebfb4cfedb0c684a312be758e142801d32ca2ba610a55656aa9462d2fc1de +SIZE (flashplayer/26.0.0.126/flash_player_npapi_linux.i386.tar.gz) = 8490374 From owner-svn-ports-branches@freebsd.org Mon Jun 19 16:08:59 2017 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 C3957DA00A4; Mon, 19 Jun 2017 16:08:59 +0000 (UTC) (envelope-from mat@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 8E8807A9DB; Mon, 19 Jun 2017 16:08:59 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5JG8wHQ017407; Mon, 19 Jun 2017 16:08:58 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5JG8wSn017406; Mon, 19 Jun 2017 16:08:58 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201706191608.v5JG8wSn017406@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 19 Jun 2017 16:08:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443882 - branches/2017Q2/security/openssl-devel 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: Mon, 19 Jun 2017 16:08:59 -0000 Author: mat Date: Mon Jun 19 16:08:58 2017 New Revision: 443882 URL: https://svnweb.freebsd.org/changeset/ports/443882 Log: MFH: r443880 The THREADS option is defined twice, remove one of them. It makes poudriere think that options changed, and forces openssl to be rebuilt at every bulk run. Sponsored by: Absolight Modified: branches/2017Q2/security/openssl-devel/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/openssl-devel/Makefile ============================================================================== --- branches/2017Q2/security/openssl-devel/Makefile Mon Jun 19 16:06:21 2017 (r443881) +++ branches/2017Q2/security/openssl-devel/Makefile Mon Jun 19 16:08:58 2017 (r443882) @@ -30,7 +30,7 @@ OPTIONS_GROUP_OPTIMIZE= ASM SSE2 THREADS OPTIONS_DEFINE_i386= I386 OPTIONS_GROUP_PROTOCOLS= NEXTPROTONEG SCTP SSL3 -OPTIONS_DEFINE= MAN3 RFC3779 SHARED THREADS ZLIB +OPTIONS_DEFINE= MAN3 RFC3779 SHARED ZLIB .if ${MACHINE_ARCH} == "amd64" OPTIONS_GROUP_OPTIMIZE+= EC From owner-svn-ports-branches@freebsd.org Mon Jun 19 17:55:20 2017 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 4C294DA1BC3; Mon, 19 Jun 2017 17:55:20 +0000 (UTC) (envelope-from jkim@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 1BCB87E6C4; Mon, 19 Jun 2017 17:55:20 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5JHtJeH064243; Mon, 19 Jun 2017 17:55:19 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5JHtJHf064241; Mon, 19 Jun 2017 17:55:19 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201706191755.v5JHtJHf064241@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Mon, 19 Jun 2017 17:55:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443902 - branches/2017Q2/www/linux-flashplayer 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: Mon, 19 Jun 2017 17:55:20 -0000 Author: jkim Date: Mon Jun 19 17:55:19 2017 New Revision: 443902 URL: https://svnweb.freebsd.org/changeset/ports/443902 Log: MFH: r443877 Update to 26.0.0.131. PR: 220084 Approved by: ports-secteam (zi) Modified: branches/2017Q2/www/linux-flashplayer/Makefile branches/2017Q2/www/linux-flashplayer/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/linux-flashplayer/Makefile ============================================================================== --- branches/2017Q2/www/linux-flashplayer/Makefile Mon Jun 19 17:50:06 2017 (r443901) +++ branches/2017Q2/www/linux-flashplayer/Makefile Mon Jun 19 17:55:19 2017 (r443902) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 26.0.0.126 +PORTVERSION= 26.0.0.131 CATEGORIES= www multimedia linux MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ PKGNAMEPREFIX= linux- Modified: branches/2017Q2/www/linux-flashplayer/distinfo ============================================================================== --- branches/2017Q2/www/linux-flashplayer/distinfo Mon Jun 19 17:50:06 2017 (r443901) +++ branches/2017Q2/www/linux-flashplayer/distinfo Mon Jun 19 17:55:19 2017 (r443902) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497548309 -SHA256 (flashplayer/26.0.0.126/flash_player_npapi_linux.i386.tar.gz) = da0ebfb4cfedb0c684a312be758e142801d32ca2ba610a55656aa9462d2fc1de -SIZE (flashplayer/26.0.0.126/flash_player_npapi_linux.i386.tar.gz) = 8490374 +TIMESTAMP = 1497884523 +SHA256 (flashplayer/26.0.0.131/flash_player_npapi_linux.i386.tar.gz) = ae301d3885c96a07d342460a9c128ad51fa47067cfb98268bad23d1ca287fb4b +SIZE (flashplayer/26.0.0.131/flash_player_npapi_linux.i386.tar.gz) = 8490534 From owner-svn-ports-branches@freebsd.org Mon Jun 19 20:51:58 2017 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 790D7DA4760; Mon, 19 Jun 2017 20:51:58 +0000 (UTC) (envelope-from jbeich@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 4941283B9C; Mon, 19 Jun 2017 20:51:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5JKpvxH037572; Mon, 19 Jun 2017 20:51:57 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5JKpvjP037570; Mon, 19 Jun 2017 20:51:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201706192051.v5JKpvjP037570@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 19 Jun 2017 20:51:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443907 - branches/2017Q2/multimedia/mpc-qt 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: Mon, 19 Jun 2017 20:51:58 -0000 Author: jbeich Date: Mon Jun 19 20:51:57 2017 New Revision: 443907 URL: https://svnweb.freebsd.org/changeset/ports/443907 Log: MFH: r443871 multimedia/mpc-qt: update to 0.0.0.s20170618 Changes: https://github.com/cmdrkotori/mpc-qt/compare/999d18f...55cfb22 Approved by: ports-secteam (zi) Modified: branches/2017Q2/multimedia/mpc-qt/Makefile branches/2017Q2/multimedia/mpc-qt/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/multimedia/mpc-qt/Makefile ============================================================================== --- branches/2017Q2/multimedia/mpc-qt/Makefile Mon Jun 19 20:47:00 2017 (r443906) +++ branches/2017Q2/multimedia/mpc-qt/Makefile Mon Jun 19 20:51:57 2017 (r443907) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mpc-qt -DISTVERSION= 0.0.0.s20170616 +DISTVERSION= 0.0.0.s20170618 CATEGORIES= multimedia audio MASTER_SITES= https://aur.archlinux.org/cgit/aur.git/plain/${PORTNAME}.desktop?h=${PORTNAME}-git&id=b1a6b91&dummy=/:desktop DISTFILES= ${PORTNAME}.desktop:desktop @@ -16,7 +16,7 @@ LIB_DEPENDS= libmpv.so:multimedia/mpv USE_GITHUB= yes GH_ACCOUNT= cmdrkotori -GH_TAGNAME= 999d18f +GH_TAGNAME= 55cfb22 USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake USE_QT5= qmake_build buildtools_build linguisttools_build \ Modified: branches/2017Q2/multimedia/mpc-qt/distinfo ============================================================================== --- branches/2017Q2/multimedia/mpc-qt/distinfo Mon Jun 19 20:47:00 2017 (r443906) +++ branches/2017Q2/multimedia/mpc-qt/distinfo Mon Jun 19 20:51:57 2017 (r443907) @@ -1,5 +1,5 @@ -TIMESTAMP = 1497597838 +TIMESTAMP = 1497783196 SHA256 (mpc-qt.desktop) = 7694745aac0e52c050a6bc069a0686b025e509136919d985d3c4495eec0f1c9d SIZE (mpc-qt.desktop) = 1270 -SHA256 (cmdrkotori-mpc-qt-0.0.0.s20170616-999d18f_GH0.tar.gz) = 7fd9c37de32475804761e5d1eb683c3b47d96df1077f55dbe45880389f674d27 -SIZE (cmdrkotori-mpc-qt-0.0.0.s20170616-999d18f_GH0.tar.gz) = 156036 +SHA256 (cmdrkotori-mpc-qt-0.0.0.s20170618-55cfb22_GH0.tar.gz) = 3473afda5ff64a85d2cce10b32985bef35ff3639e61967c76784d7671e2f1081 +SIZE (cmdrkotori-mpc-qt-0.0.0.s20170618-55cfb22_GH0.tar.gz) = 155997 From owner-svn-ports-branches@freebsd.org Mon Jun 19 21:07:12 2017 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 E9AB6DA4CA5; Mon, 19 Jun 2017 21:07:12 +0000 (UTC) (envelope-from adamw@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 B9D7E84585; Mon, 19 Jun 2017 21:07:12 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5JL7BJp042853; Mon, 19 Jun 2017 21:07:11 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5JL7B42042851; Mon, 19 Jun 2017 21:07:11 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201706192107.v5JL7B42042851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 19 Jun 2017 21:07:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443910 - branches/2017Q2/sysutils/qjail 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: Mon, 19 Jun 2017 21:07:13 -0000 Author: adamw Date: Mon Jun 19 21:07:11 2017 New Revision: 443910 URL: https://svnweb.freebsd.org/changeset/ports/443910 Log: MFH: r443856 Approved by: ports-secteam (zi) Update to 5.3 qjail-5.3-change-log 1. Adam Weinberger sent email about bug he found. The qjail console -c "ls /user/local" jailname command was not working correctly. This error was introduced by changes done to correct coding syntax problems that the hs-shellcheck package found and published in qjail-5.2. Fixed now. 2. Adam Weinberger also sent email containing a patch that standardized error messages and corrected some spelling errors. After review the patch was applied. 3. Checked all the 'kill' messages for 'Error:' prefix and added the prefix where it was missing to complete the standardization. 4. While reviewing the patch changes I noticed that the "qjail install" logic had some duplicated code. I removed it to make more of it part of the fall through logic path. 5. While working on the "qjail install" logic, 11.1-BETA1 was published. It cam to my attention that BETA and RC Release Engineering builds are now having distribution files built. Changed the 'qjail install' logic to auto handle BETA, RC, builds in the same manner RELEASE, and RELEASE-p builds were being handled. 6. Corrected the qjail manual to reflect the changes made to the script. PR: 220113 Submitted by: maintainer (Joe Barbish) Modified: branches/2017Q2/sysutils/qjail/Makefile branches/2017Q2/sysutils/qjail/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/sysutils/qjail/Makefile ============================================================================== --- branches/2017Q2/sysutils/qjail/Makefile Mon Jun 19 21:06:54 2017 (r443909) +++ branches/2017Q2/sysutils/qjail/Makefile Mon Jun 19 21:07:11 2017 (r443910) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qjail -PORTVERSION= 5.2 +PORTVERSION= 5.3 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME} Modified: branches/2017Q2/sysutils/qjail/distinfo ============================================================================== --- branches/2017Q2/sysutils/qjail/distinfo Mon Jun 19 21:06:54 2017 (r443909) +++ branches/2017Q2/sysutils/qjail/distinfo Mon Jun 19 21:07:11 2017 (r443910) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490990068 -SHA256 (qjail-5.2.tar.bz2) = c322b82b7285062ab8a61aa35642d8ffc3c7fbe62e95b9037b7f83d6058012e7 -SIZE (qjail-5.2.tar.bz2) = 65473 +TIMESTAMP = 1497798324 +SHA256 (qjail-5.3.tar.bz2) = aa0d80da77404cba2192e6cf772bff644335f6bbdaa97d9012ba3c00d8b7d0cd +SIZE (qjail-5.3.tar.bz2) = 65586 From owner-svn-ports-branches@freebsd.org Tue Jun 20 10:46:16 2017 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 D4D5DD953D9; Tue, 20 Jun 2017 10:46:16 +0000 (UTC) (envelope-from garga@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 A95267C89D; Tue, 20 Jun 2017 10:46:16 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5KAkFeS078914; Tue, 20 Jun 2017 10:46:15 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5KAkFrS078912; Tue, 20 Jun 2017 10:46:15 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201706201046.v5KAkFrS078912@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Tue, 20 Jun 2017 10:46:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443947 - in branches/2017Q2/devel/git: . 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: Tue, 20 Jun 2017 10:46:16 -0000 Author: garga Date: Tue Jun 20 10:46:15 2017 New Revision: 443947 URL: https://svnweb.freebsd.org/changeset/ports/443947 Log: MFH: r443903 - Replace git-send-email.perl patch by a different fix committed upstream. With previous version, when user tries to send multiple e-mails using an authenticated SMTP server, it asks for password on first one and rejects all other with "authentication failed" error - Bump PORTREVISION Reported by: novel Tested by: novel Obtained from: Git repository, commits: 0ead000c3aca13a10ae51a3c74c866981e0d33b8 bfbfc9a953d8e26b029110c05581b22f9f0d77e9 Sponsored by: Rubicon Communications, LLC (Netgate) Approved by: ports-secteam (miwi) Modified: branches/2017Q2/devel/git/Makefile branches/2017Q2/devel/git/files/patch-git-send-email.perl Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/devel/git/Makefile ============================================================================== --- branches/2017Q2/devel/git/Makefile Tue Jun 20 10:15:28 2017 (r443946) +++ branches/2017Q2/devel/git/Makefile Tue Jun 20 10:46:15 2017 (r443947) @@ -3,6 +3,7 @@ PORTNAME= git DISTVERSION= 2.13.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ Modified: branches/2017Q2/devel/git/files/patch-git-send-email.perl ============================================================================== --- branches/2017Q2/devel/git/files/patch-git-send-email.perl Tue Jun 20 10:15:28 2017 (r443946) +++ branches/2017Q2/devel/git/files/patch-git-send-email.perl Tue Jun 20 10:46:15 2017 (r443947) @@ -1,45 +1,51 @@ ---- git-send-email.perl.orig 2017-03-21 10:10:31 UTC +diff --git a/git-send-email.perl b/git-send-email.perl +index eea0a517f71b6..0d90439d9a8e5 100755 +--- git-send-email.perl +++ git-send-email.perl -@@ -27,6 +27,7 @@ use Term::ANSIColor; - use File::Temp qw/ tempdir tempfile /; - use File::Spec::Functions qw(catfile); - use Error qw(:try); -+use Net::SMTP 2.34; - use Git; - use Git::I18N; +@@ -1353,10 +1353,12 @@ sub send_message { + die __("The required SMTP server is not properly defined.") + } -@@ -1355,7 +1356,6 @@ EOF - ++ require Net::SMTP; ++ my $use_net_smtp_ssl = version->parse($Net::SMTP::VERSION) < version->parse("2.34"); ++ $smtp_domain ||= maildomain(); ++ if ($smtp_encryption eq 'ssl') { $smtp_server_port ||= 465; # ssmtp - require Net::SMTP::SSL; - $smtp_domain ||= maildomain(); +- $smtp_domain ||= maildomain(); require IO::Socket::SSL; -@@ -1365,35 +1365,22 @@ EOF - $IO::Socket::SSL::DEBUG = 1; - } - -- # Net::SMTP::SSL->new() does not forward any SSL options -- IO::Socket::SSL::set_client_defaults( -- ssl_verify_params()); + # Suppress "variable accessed once" warning. +@@ -1368,34 +1370,48 @@ sub send_message { + # Net::SMTP::SSL->new() does not forward any SSL options + IO::Socket::SSL::set_client_defaults( + ssl_verify_params()); - $smtp ||= Net::SMTP::SSL->new($smtp_server, - Hello => $smtp_domain, - Port => $smtp_server_port, - Debug => $debug_net_smtp); -+ $smtp = Net::SMTP->new($smtp_server, -+ Hello => $smtp_domain, -+ Port => $smtp_server_port, -+ SSL => 1, -+ ssl_verify_params(), -+ Debug => $debug_net_smtp); ++ ++ if ($use_net_smtp_ssl) { ++ require Net::SMTP::SSL; ++ $smtp ||= Net::SMTP::SSL->new($smtp_server, ++ Hello => $smtp_domain, ++ Port => $smtp_server_port, ++ Debug => $debug_net_smtp); ++ } ++ else { ++ $smtp ||= Net::SMTP->new($smtp_server, ++ Hello => $smtp_domain, ++ Port => $smtp_server_port, ++ Debug => $debug_net_smtp, ++ SSL => 1); ++ } } else { - require Net::SMTP; - $smtp_domain ||= maildomain(); $smtp_server_port ||= 25; -- $smtp ||= Net::SMTP->new($smtp_server, -+ $smtp = Net::SMTP->new($smtp_server, + $smtp ||= Net::SMTP->new($smtp_server, Hello => $smtp_domain, Debug => $debug_net_smtp, Port => $smtp_server_port); @@ -48,16 +54,32 @@ - $smtp->command('STARTTLS'); - $smtp->response(); - if ($smtp->code == 220) { -- $smtp = Net::SMTP::SSL->start_SSL($smtp, -- ssl_verify_params()) ++ if ($use_net_smtp_ssl) { ++ $smtp->command('STARTTLS'); ++ $smtp->response(); ++ if ($smtp->code != 220) { ++ die sprintf(__("Server does not support STARTTLS! %s"), $smtp->message); ++ } ++ require Net::SMTP::SSL; + $smtp = Net::SMTP::SSL->start_SSL($smtp, + ssl_verify_params()) - or die "STARTTLS failed! ".IO::Socket::SSL::errstr(); - $smtp_encryption = ''; - # Send EHLO again to receive fresh - # supported commands - $smtp->hello($smtp_domain); - } else { -+ $smtp->starttls(ssl_verify_params()); -+ if ($smtp->code != 250) { - die sprintf(__("Server does not support STARTTLS! %s"), $smtp->message); +- die sprintf(__("Server does not support STARTTLS! %s"), $smtp->message); ++ or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr()); ++ } ++ else { ++ $smtp->starttls(ssl_verify_params()) ++ or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr()); } ++ $smtp_encryption = ''; ++ # Send EHLO again to receive fresh ++ # supported commands ++ $smtp->hello($smtp_domain); } + } + From owner-svn-ports-branches@freebsd.org Tue Jun 20 14:41:08 2017 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 0601DD9A2C8; Tue, 20 Jun 2017 14:41:08 +0000 (UTC) (envelope-from madpilot@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 C84EBB8E; Tue, 20 Jun 2017 14:41:07 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5KEf7CB078283; Tue, 20 Jun 2017 14:41:07 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5KEf6Ua078282; Tue, 20 Jun 2017 14:41:06 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201706201441.v5KEf6Ua078282@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 20 Jun 2017 14:41:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443979 - branches/2017Q2/net/asterisk13 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: Tue, 20 Jun 2017 14:41:08 -0000 Author: madpilot Date: Tue Jun 20 14:41:06 2017 New Revision: 443979 URL: https://svnweb.freebsd.org/changeset/ports/443979 Log: MFH: r443951 - Fix user provided menuselect support - Make it work also when SYSINFO option is turned on Approved by: ports-secteam (feld) Modified: branches/2017Q2/net/asterisk13/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/net/asterisk13/Makefile ============================================================================== --- branches/2017Q2/net/asterisk13/Makefile Tue Jun 20 14:36:49 2017 (r443978) +++ branches/2017Q2/net/asterisk13/Makefile Tue Jun 20 14:41:06 2017 (r443979) @@ -249,6 +249,9 @@ post-extract-G729-on: post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample +.if exists(${FILESDIR}/.asterisk.makeopts) + ${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts +.endif post-patch-SYSINFO-on: @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile @@ -256,9 +259,6 @@ post-patch-SYSINFO-on: post-patch-SYSINFO-off: @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile -.if exists(${FILESDIR}/.asterisk.makeopts) - ${CP} ${USER_MAKEOPTS_FILE} ${WRKSRC}/menuselect.makeopts -.endif post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts From owner-svn-ports-branches@freebsd.org Tue Jun 20 14:43:45 2017 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 EC028D9A48A; Tue, 20 Jun 2017 14:43:45 +0000 (UTC) (envelope-from madpilot@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 C82C1DCD; Tue, 20 Jun 2017 14:43:45 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5KEhj6T080050; Tue, 20 Jun 2017 14:43:45 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5KEhjRI080047; Tue, 20 Jun 2017 14:43:45 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201706201443.v5KEhjRI080047@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 20 Jun 2017 14:43:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443980 - branches/2017Q2/net/asterisk11 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: Tue, 20 Jun 2017 14:43:46 -0000 Author: madpilot Date: Tue Jun 20 14:43:44 2017 New Revision: 443980 URL: https://svnweb.freebsd.org/changeset/ports/443980 Log: MFH: r443953 - Prevent asterisk build system from unconditionally using -march=native [1] - Add an OPTIMIZED_CFLAGS option, disabled by default, to allow enabling the native flag - While here, convert to option target helpers. Reported by: "Andrey V. Elsukov" (via email) [1] Approved by: ports-secteam (feld) Modified: branches/2017Q2/net/asterisk11/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/net/asterisk11/Makefile ============================================================================== --- branches/2017Q2/net/asterisk11/Makefile Tue Jun 20 14:41:06 2017 (r443979) +++ branches/2017Q2/net/asterisk11/Makefile Tue Jun 20 14:43:44 2017 (r443980) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.25.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ @@ -51,7 +52,7 @@ CONFLICTS_BUILD= linuxthreads-* pjsip-* CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-13* OPTIONS_DEFINE= BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \ - MP3PLAYER OOH323 RADIUS SNMP SPANDSP SRTP \ + MP3PLAYER OOH323 OPTIMIZED_CFLAGS RADIUS SNMP SPANDSP SRTP \ SYSINFO UUID XMPP OPTIONS_DEFAULT= BACKTRACE CURL FREETDS GSM LUA MP3PLAYER \ NEWT MYSQL ODBC PGSQL RADIUS SNMP SPANDSP SPEEX \ @@ -215,40 +216,43 @@ PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \ post-extract: @${FIND} ${WRKSRC} -name '*.d' -delete -.if ${PORT_OPTIONS:MG729} +post-extract-G729-on: ${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds ${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds -.endif post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure -.if ${PORT_OPTIONS:MSYSINFO} - @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile -.else - @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile -.endif .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts .endif +post-patch-SYSINFO-on: + @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile + +post-patch-SYSINFO-off: + @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile + post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts -.if ${PORT_OPTIONS:MMYSQL} + +post-configure-MYSQL-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts -.endif -.if ${PORT_OPTIONS:MOOH323} + +post-configure-OOH323-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts -.endif -.if ${PORT_OPTIONS:MNEWG711} + +post-configure-NEWG711-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts -.endif + +post-configure-OPTIMIZED_CFLAGS-off: + @cd ${WRKSRC} && ./menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts pre-build: @${MKDIR} ${WRKSRC}/res/pjproject/pjnath/lib ${WRKSRC}/res/pjproject/pjlib-util/lib \ From owner-svn-ports-branches@freebsd.org Tue Jun 20 14:45:03 2017 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 6BDCBD9A4C8; Tue, 20 Jun 2017 14:45:03 +0000 (UTC) (envelope-from royger@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 3B4B2ECC; Tue, 20 Jun 2017 14:45:03 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5KEj2QT080260; Tue, 20 Jun 2017 14:45:02 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5KEj2GH080258; Tue, 20 Jun 2017 14:45:02 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201706201445.v5KEj2GH080258@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Date: Tue, 20 Jun 2017 14:45:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443981 - in branches/2017Q2/sysutils/xen-tools: . 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: Tue, 20 Jun 2017 14:45:03 -0000 Author: royger (src committer) Date: Tue Jun 20 14:45:02 2017 New Revision: 443981 URL: https://svnweb.freebsd.org/changeset/ports/443981 Log: MFH: r443875 xen-tools: fix ASL QEMU code In order to build with newer IASL compiler found in FreeBSD 12 Sponsored by: Citrix Systems R&D Approved by: ports-secteam (feld) Added: branches/2017Q2/sysutils/xen-tools/files/iasl-qemuu.patch - copied unchanged from r443875, head/sysutils/xen-tools/files/iasl-qemuu.patch Modified: branches/2017Q2/sysutils/xen-tools/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/sysutils/xen-tools/Makefile ============================================================================== --- branches/2017Q2/sysutils/xen-tools/Makefile Tue Jun 20 14:43:44 2017 (r443980) +++ branches/2017Q2/sysutils/xen-tools/Makefile Tue Jun 20 14:45:02 2017 (r443981) @@ -3,7 +3,7 @@ PORTNAME= xen PKGNAMESUFFIX= -tools PORTVERSION= 4.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ Copied: branches/2017Q2/sysutils/xen-tools/files/iasl-qemuu.patch (from r443875, head/sysutils/xen-tools/files/iasl-qemuu.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/sysutils/xen-tools/files/iasl-qemuu.patch Tue Jun 20 14:45:02 2017 (r443981, copy of r443875, head/sysutils/xen-tools/files/iasl-qemuu.patch) @@ -0,0 +1,26 @@ +diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl +index a2d84ecf8f..e86d3eb263 100644 +--- a/hw/i386/acpi-dsdt.dsl ++++ b/hw/i386/acpi-dsdt.dsl +@@ -62,8 +62,6 @@ DefinitionBlock ( + + Scope(\_SB.PCI0) { + +- External(ISA, DeviceObj) +- + Device(ISA) { + Name(_ADR, 0x00010000) + +diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl +index 16eaca3fae..44fa4a9c0c 100644 +--- a/hw/i386/q35-acpi-dsdt.dsl ++++ b/hw/i386/q35-acpi-dsdt.dsl +@@ -55,8 +55,6 @@ DefinitionBlock ( + Name(_ADR, 0x00) + Name(_UID, 1) + +- External(ISA, DeviceObj) +- + // _OSC: based on sample of ACPI3.0b spec + Name(SUPP, 0) // PCI _OSC Support Field value + Name(CTRL, 0) // PCI _OSC Control Field value From owner-svn-ports-branches@freebsd.org Tue Jun 20 14:46:16 2017 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 8135FD9A537; Tue, 20 Jun 2017 14:46:16 +0000 (UTC) (envelope-from royger@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 1ED84FCE; Tue, 20 Jun 2017 14:46:16 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5KEkFm0080640; Tue, 20 Jun 2017 14:46:15 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5KEkEIT080630; Tue, 20 Jun 2017 14:46:14 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201706201446.v5KEkEIT080630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Date: Tue, 20 Jun 2017 14:46:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443982 - in branches/2017Q2/emulators/xen-kernel: . 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: Tue, 20 Jun 2017 14:46:16 -0000 Author: royger (src committer) Date: Tue Jun 20 14:46:14 2017 New Revision: 443982 URL: https://svnweb.freebsd.org/changeset/ports/443982 Log: MFH: r443949 xen: apply XSA-{217,218,219,220,221,222,224} Sponsored by: Citrix Systems R&D Approved by: ports-secteam (feld) Added: branches/2017Q2/emulators/xen-kernel/files/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures.patch branches/2017Q2/emulators/xen-kernel/files/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap.patch branches/2017Q2/emulators/xen-kernel/files/0002-gnttab-fix-unmap-pin-accounting-race.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/0002-gnttab-fix-unmap-pin-accounting-race.patch branches/2017Q2/emulators/xen-kernel/files/0002-gnttab-never-create-host-mapping-unless-asked-to.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/0002-gnttab-never-create-host-mapping-unless-asked-to.patch branches/2017Q2/emulators/xen-kernel/files/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry.patch branches/2017Q2/emulators/xen-kernel/files/0003-gnttab-correct-logic-to-get-page-references-during-m.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/0003-gnttab-correct-logic-to-get-page-references-during-m.patch branches/2017Q2/emulators/xen-kernel/files/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth.patch branches/2017Q2/emulators/xen-kernel/files/0004-gnttab-correct-maptrack-table-accesses.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/0004-gnttab-correct-maptrack-table-accesses.patch branches/2017Q2/emulators/xen-kernel/files/xsa217.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/xsa217.patch branches/2017Q2/emulators/xen-kernel/files/xsa219-4.8.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/xsa219-4.8.patch branches/2017Q2/emulators/xen-kernel/files/xsa220-4.7.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/xsa220-4.7.patch branches/2017Q2/emulators/xen-kernel/files/xsa221.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/xsa221.patch branches/2017Q2/emulators/xen-kernel/files/xsa222-1-4.7.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/xsa222-1-4.7.patch branches/2017Q2/emulators/xen-kernel/files/xsa222-2-4.7.patch - copied unchanged from r443949, head/emulators/xen-kernel/files/xsa222-2-4.7.patch Modified: branches/2017Q2/emulators/xen-kernel/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/emulators/xen-kernel/Makefile ============================================================================== --- branches/2017Q2/emulators/xen-kernel/Makefile Tue Jun 20 14:45:02 2017 (r443981) +++ branches/2017Q2/emulators/xen-kernel/Makefile Tue Jun 20 14:46:14 2017 (r443982) @@ -2,7 +2,7 @@ PORTNAME= xen PORTVERSION= 4.7.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ PKGNAMESUFFIX= -kernel @@ -45,7 +45,21 @@ EXTRA_PATCHES= ${FILESDIR}/0001-xen-logdirty-prevent-p ${FILESDIR}/xsa212.patch:-p1 \ ${FILESDIR}/xsa213-4.7.patch:-p1 \ ${FILESDIR}/xsa214.patch:-p1 \ - ${FILESDIR}/xsa215.patch:-p1 + ${FILESDIR}/xsa215.patch:-p1 \ + ${FILESDIR}/xsa217.patch:-p1 \ + ${FILESDIR}/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures.patch:-p1 \ + ${FILESDIR}/0002-gnttab-fix-unmap-pin-accounting-race.patch:-p1 \ + ${FILESDIR}/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry.patch:-p1 \ + ${FILESDIR}/0004-gnttab-correct-maptrack-table-accesses.patch:-p1 \ + ${FILESDIR}/xsa219-4.8.patch:-p1 \ + ${FILESDIR}/xsa220-4.7.patch:-p1 \ + ${FILESDIR}/xsa221.patch:-p1 \ + ${FILESDIR}/xsa222-1-4.7.patch:-p1 \ + ${FILESDIR}/xsa222-2-4.7.patch:-p1 \ + ${FILESDIR}/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap.patch:-p1 \ + ${FILESDIR}/0002-gnttab-never-create-host-mapping-unless-asked-to.patch:-p1 \ + ${FILESDIR}/0003-gnttab-correct-logic-to-get-page-references-during-m.patch:-p1 \ + ${FILESDIR}/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth.patch:-p1 .include Copied: branches/2017Q2/emulators/xen-kernel/files/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures.patch (from r443949, head/emulators/xen-kernel/files/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/emulators/xen-kernel/files/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures.patch Tue Jun 20 14:46:14 2017 (r443982, copy of r443949, head/emulators/xen-kernel/files/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures.patch) @@ -0,0 +1,78 @@ +From 03f872b98f24e25cafb478b5d7c34e1eb18e1e4c Mon Sep 17 00:00:00 2001 +From: Quan Xu +Date: Fri, 2 Jun 2017 12:30:34 +0100 +Subject: [PATCH 1/4] IOMMU: handle IOMMU mapping and unmapping failures + +Treat IOMMU mapping and unmapping failures as a fatal to the DomU +If IOMMU mapping and unmapping failed, crash the DomU and propagate +the error up to the call trees. + +No spamming of the log can occur. For DomU, we avoid logging any +message for already dying domains. For Dom0, that'll still be more +verbose than we'd really like, but it at least wouldn't outright +flood the console. + +Signed-off-by: Quan Xu +Reviewed-by: Kevin Tian +Reviewed-by: Jan Beulich +--- + xen/drivers/passthrough/iommu.c | 30 ++++++++++++++++++++++++++++-- + 1 file changed, 28 insertions(+), 2 deletions(-) + +diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c +index 1a315ee..927966f 100644 +--- a/xen/drivers/passthrough/iommu.c ++++ b/xen/drivers/passthrough/iommu.c +@@ -239,21 +239,47 @@ int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, + unsigned int flags) + { + const struct domain_iommu *hd = dom_iommu(d); ++ int rc; + + if ( !iommu_enabled || !hd->platform_ops ) + return 0; + +- return hd->platform_ops->map_page(d, gfn, mfn, flags); ++ rc = hd->platform_ops->map_page(d, gfn, mfn, flags); ++ if ( unlikely(rc) ) ++ { ++ if ( !d->is_shutting_down && printk_ratelimit() ) ++ printk(XENLOG_ERR ++ "d%d: IOMMU mapping gfn %#lx to mfn %#lx failed: %d\n", ++ d->domain_id, gfn, mfn, rc); ++ ++ if ( !is_hardware_domain(d) ) ++ domain_crash(d); ++ } ++ ++ return rc; + } + + int iommu_unmap_page(struct domain *d, unsigned long gfn) + { + const struct domain_iommu *hd = dom_iommu(d); ++ int rc; + + if ( !iommu_enabled || !hd->platform_ops ) + return 0; + +- return hd->platform_ops->unmap_page(d, gfn); ++ rc = hd->platform_ops->unmap_page(d, gfn); ++ if ( unlikely(rc) ) ++ { ++ if ( !d->is_shutting_down && printk_ratelimit() ) ++ printk(XENLOG_ERR ++ "d%d: IOMMU unmapping gfn %#lx failed: %d\n", ++ d->domain_id, gfn, rc); ++ ++ if ( !is_hardware_domain(d) ) ++ domain_crash(d); ++ } ++ ++ return rc; + } + + static void iommu_free_pagetables(unsigned long unused) +-- +2.1.4 + Copied: branches/2017Q2/emulators/xen-kernel/files/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap.patch (from r443949, head/emulators/xen-kernel/files/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/emulators/xen-kernel/files/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap.patch Tue Jun 20 14:46:14 2017 (r443982, copy of r443949, head/emulators/xen-kernel/files/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap.patch) @@ -0,0 +1,111 @@ +From fd97f5f5ba9375163c8d8771fe551bb4a6423b36 Mon Sep 17 00:00:00 2001 +From: George Dunlap +Date: Thu, 15 Jun 2017 16:24:02 +0100 +Subject: [PATCH 1/4] gnttab: Fix handling of dev_bus_addr during unmap + +If a grant has been mapped with the GNTTAB_device_map flag, calling +grant_unmap_ref() with dev_bus_addr set to zero should cause the +GNTTAB_device_map part of the mapping to be left alone. + +Unfortunately, at the moment, op->dev_bus_addr is implicitly checked +before clearing the map and adjusting the pin count, but only the bits +above 12; and it is not checked at all before dropping page +references. This means a guest can repeatedly make such a call to +cause the reference count to drop to zero, causing the page to be +freed and re-used, even though it's still mapped in its pagetables. + +To fix this, always check op->dev_bus_addr explicitly for being +non-zero, as well as op->flag & GNTMAP_device_map, before doing +operations on the device_map. + +While we're here, make the logic a bit cleaner: + +* Always initialize op->frame to zero and set it from act->frame, to reduce the +chance of untrusted input being used + +* Explicitly check the full dev_bus_addr against act->frame << + PAGE_SHIFT, rather than ignoring the lower 12 bits + +This is part of XSA-224. + +Reported-by: Jan Beulich +Signed-off-by: George Dunlap +Signed-off-by: Jan Beulich +--- + xen/common/grant_table.c | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) + +diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c +index c4d73af..69cbdb6 100644 +--- a/xen/common/grant_table.c ++++ b/xen/common/grant_table.c +@@ -1089,8 +1089,6 @@ __gnttab_unmap_common( + ld = current->domain; + lgt = ld->grant_table; + +- op->frame = (unsigned long)(op->dev_bus_addr >> PAGE_SHIFT); +- + if ( unlikely(op->handle >= lgt->maptrack_limit) ) + { + gdprintk(XENLOG_INFO, "Bad handle (%d).\n", op->handle); +@@ -1174,16 +1172,14 @@ __gnttab_unmap_common( + goto act_release_out; + } + +- if ( op->frame == 0 ) +- { +- op->frame = act->frame; +- } +- else ++ op->frame = act->frame; ++ ++ if ( op->dev_bus_addr ) + { +- if ( unlikely(op->frame != act->frame) ) ++ if ( unlikely(op->dev_bus_addr != pfn_to_paddr(act->frame)) ) + PIN_FAIL(act_release_out, GNTST_general_error, +- "Bad frame number doesn't match gntref. (%lx != %lx)\n", +- op->frame, act->frame); ++ "Bus address doesn't match gntref (%"PRIx64" != %"PRIpaddr")\n", ++ op->dev_bus_addr, pfn_to_paddr(act->frame)); + + map->flags &= ~GNTMAP_device_map; + } +@@ -1276,7 +1272,8 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + else + status = &status_entry(rgt, op->ref); + +- if ( unlikely(op->frame != act->frame) ) ++ if ( op->dev_bus_addr && ++ unlikely(op->dev_bus_addr != pfn_to_paddr(act->frame)) ) + { + /* + * Suggests that __gntab_unmap_common failed early and so +@@ -1287,7 +1284,7 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + + pg = mfn_to_page(op->frame); + +- if ( op->flags & GNTMAP_device_map ) ++ if ( op->dev_bus_addr && (op->flags & GNTMAP_device_map) ) + { + if ( !is_iomem_page(act->frame) ) + { +@@ -1358,6 +1355,7 @@ __gnttab_unmap_grant_ref( + /* Intialise these in case common contains old state */ + common->new_addr = 0; + common->rd = NULL; ++ common->frame = 0; + + __gnttab_unmap_common(common); + op->status = common->status; +@@ -1422,6 +1420,7 @@ __gnttab_unmap_and_replace( + /* Intialise these in case common contains old state */ + common->dev_bus_addr = 0; + common->rd = NULL; ++ common->frame = 0; + + __gnttab_unmap_common(common); + op->status = common->status; +-- +2.1.4 + Copied: branches/2017Q2/emulators/xen-kernel/files/0002-gnttab-fix-unmap-pin-accounting-race.patch (from r443949, head/emulators/xen-kernel/files/0002-gnttab-fix-unmap-pin-accounting-race.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/emulators/xen-kernel/files/0002-gnttab-fix-unmap-pin-accounting-race.patch Tue Jun 20 14:46:14 2017 (r443982, copy of r443949, head/emulators/xen-kernel/files/0002-gnttab-fix-unmap-pin-accounting-race.patch) @@ -0,0 +1,102 @@ +From 2c146b4f763f47180a0effb8d8045b0ebb93652c Mon Sep 17 00:00:00 2001 +From: Jan Beulich +Date: Fri, 2 Jun 2017 12:22:42 +0100 +Subject: [PATCH 2/4] gnttab: fix unmap pin accounting race + +Once all {writable} mappings of a grant entry have been unmapped, the +hypervisor informs the guest that the grant entry has been released by +clearing the _GTF_{reading,writing} usage flags in the guest's grant +table as appropriate. + +Unfortunately, at the moment, the code that updates the accounting +happens in a different critical section than the one which updates the +usage flags; this means that under the right circumstances, there may be +a window in time after the hypervisor reported the grant as being free +during which the grant referee still had access to the page. + +Move the grant accounting code into the same critical section as the +reporting code to make sure this kind of race can't happen. + +This is part of XSA-218. + +Reported-by: Jann Horn +Signed-off-by: Jan Beulich +--- + xen/common/grant_table.c | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c +index 8b22299..cfc483f 100644 +--- a/xen/common/grant_table.c ++++ b/xen/common/grant_table.c +@@ -1150,15 +1150,8 @@ __gnttab_unmap_common( + PIN_FAIL(act_release_out, GNTST_general_error, + "Bad frame number doesn't match gntref. (%lx != %lx)\n", + op->frame, act->frame); +- if ( op->flags & GNTMAP_device_map ) +- { +- ASSERT(act->pin & (GNTPIN_devw_mask | GNTPIN_devr_mask)); +- op->map->flags &= ~GNTMAP_device_map; +- if ( op->flags & GNTMAP_readonly ) +- act->pin -= GNTPIN_devr_inc; +- else +- act->pin -= GNTPIN_devw_inc; +- } ++ ++ op->map->flags &= ~GNTMAP_device_map; + } + + if ( (op->host_addr != 0) && (op->flags & GNTMAP_host_map) ) +@@ -1168,12 +1161,7 @@ __gnttab_unmap_common( + op->flags)) < 0 ) + goto act_release_out; + +- ASSERT(act->pin & (GNTPIN_hstw_mask | GNTPIN_hstr_mask)); + op->map->flags &= ~GNTMAP_host_map; +- if ( op->flags & GNTMAP_readonly ) +- act->pin -= GNTPIN_hstr_inc; +- else +- act->pin -= GNTPIN_hstw_inc; + } + + act_release_out: +@@ -1266,6 +1254,12 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + else + put_page_and_type(pg); + } ++ ++ ASSERT(act->pin & (GNTPIN_devw_mask | GNTPIN_devr_mask)); ++ if ( op->flags & GNTMAP_readonly ) ++ act->pin -= GNTPIN_devr_inc; ++ else ++ act->pin -= GNTPIN_devw_inc; + } + + if ( (op->host_addr != 0) && (op->flags & GNTMAP_host_map) ) +@@ -1274,7 +1268,9 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + { + /* + * Suggests that __gntab_unmap_common failed in +- * replace_grant_host_mapping() so nothing further to do ++ * replace_grant_host_mapping() or IOMMU handling, so nothing ++ * further to do (short of re-establishing the mapping in the ++ * latter case). + */ + goto act_release_out; + } +@@ -1285,6 +1281,12 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + put_page_type(pg); + put_page(pg); + } ++ ++ ASSERT(act->pin & (GNTPIN_hstw_mask | GNTPIN_hstr_mask)); ++ if ( op->flags & GNTMAP_readonly ) ++ act->pin -= GNTPIN_hstr_inc; ++ else ++ act->pin -= GNTPIN_hstw_inc; + } + + if ( (op->map->flags & (GNTMAP_device_map|GNTMAP_host_map)) == 0 ) +-- +2.1.4 + Copied: branches/2017Q2/emulators/xen-kernel/files/0002-gnttab-never-create-host-mapping-unless-asked-to.patch (from r443949, head/emulators/xen-kernel/files/0002-gnttab-never-create-host-mapping-unless-asked-to.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/emulators/xen-kernel/files/0002-gnttab-never-create-host-mapping-unless-asked-to.patch Tue Jun 20 14:46:14 2017 (r443982, copy of r443949, head/emulators/xen-kernel/files/0002-gnttab-never-create-host-mapping-unless-asked-to.patch) @@ -0,0 +1,42 @@ +From 8894a0c20d920aada305aade0591c1e77167b1db Mon Sep 17 00:00:00 2001 +From: Jan Beulich +Date: Fri, 2 Jun 2017 15:21:27 +0100 +Subject: [PATCH 2/4] gnttab: never create host mapping unless asked to + +We shouldn't create a host mapping unless asked to even in the case of +mapping a granted MMIO page. In particular the mapping wouldn't be torn +down when processing the matching unmap request. + +This is part of XSA-224. + +Reported-by: Jan Beulich +Signed-off-by: Jan Beulich +--- + xen/common/grant_table.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c +index 69cbdb6..452538e 100644 +--- a/xen/common/grant_table.c ++++ b/xen/common/grant_table.c +@@ -911,10 +911,13 @@ __gnttab_map_grant_ref( + goto undo_out; + } + +- rc = create_grant_host_mapping( +- op->host_addr, frame, op->flags, cache_flags); +- if ( rc != GNTST_okay ) +- goto undo_out; ++ if ( op->flags & GNTMAP_host_map ) ++ { ++ rc = create_grant_host_mapping(op->host_addr, frame, op->flags, ++ cache_flags); ++ if ( rc != GNTST_okay ) ++ goto undo_out; ++ } + } + else if ( owner == rd || owner == dom_cow ) + { +-- +2.1.4 + Copied: branches/2017Q2/emulators/xen-kernel/files/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry.patch (from r443949, head/emulators/xen-kernel/files/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/emulators/xen-kernel/files/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry.patch Tue Jun 20 14:46:14 2017 (r443982, copy of r443949, head/emulators/xen-kernel/files/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry.patch) @@ -0,0 +1,232 @@ +From 39b704785a8d330c02e8e2d2368c80dbaf679bc0 Mon Sep 17 00:00:00 2001 +From: George Dunlap +Date: Thu, 15 Jun 2017 12:05:14 +0100 +Subject: [PATCH 3/4] gnttab: Avoid potential double-put of maptrack entry + +Each grant mapping for a particular domain is tracked by an in-Xen +"maptrack" entry. This entry is is referenced by a "handle", which is +given to the guest when it calls gnttab_map_grant_ref(). + +There are two types of mapping a particular handle can refer to: +GNTMAP_host_map and GNTMAP_device_map. A given +gnttab_unmap_grant_ref() call can remove either only one or both of +these entries. When a particular handle has no entries left, it must +be freed. + +gnttab_unmap_grant_ref() loops through its grant unmap request list +twice. It first removes entries from any host pagetables and (if +appropraite) iommus; then it does a single domain TLB flush; then it +does the clean-up, including telling the granter that entries are no +longer being used (if appropriate). + +At the moment, it's during the first pass that the maptrack flags are +cleared, but the second pass that the maptrack entry is freed. + +Unfortunately this allows the following race, which results in a +double-free: + + A: (pass 1) clear host_map + B: (pass 1) clear device_map + A: (pass 2) See that maptrack entry has no mappings, free it + B: (pass 2) See that maptrack entry has no mappings, free it # + +Unfortunately, unlike the active entry pinning update, we can't simply +move the maptrack flag changes to the second half, because the +maptrack flags are used to determine if iommu entries need to be +added: a domain's iommu must never have fewer permissions than the +maptrack flags indicate, or a subsequent map_grant_ref() might fail to +add the necessary iommu entries. + +Instead, free the maptrack entry in the first pass if there are no +further mappings. + +This is part of XSA-218. + +Reported-by: Jan Beulich +Signed-off-by: George Dunlap +Signed-off-by: Jan Beulich +--- + xen/common/grant_table.c | 79 +++++++++++++++++++++++++++++++++--------------- + 1 file changed, 54 insertions(+), 25 deletions(-) + +diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c +index cfc483f..81a1a8b 100644 +--- a/xen/common/grant_table.c ++++ b/xen/common/grant_table.c +@@ -98,8 +98,8 @@ struct gnttab_unmap_common { + /* Shared state beteen *_unmap and *_unmap_complete */ + u16 flags; + unsigned long frame; +- struct grant_mapping *map; + struct domain *rd; ++ grant_ref_t ref; + }; + + /* Number of unmap operations that are done between each tlb flush */ +@@ -1079,6 +1079,8 @@ __gnttab_unmap_common( + struct grant_table *lgt, *rgt; + struct active_grant_entry *act; + s16 rc = 0; ++ struct grant_mapping *map; ++ bool_t put_handle = 0; + + ld = current->domain; + lgt = ld->grant_table; +@@ -1092,11 +1094,11 @@ __gnttab_unmap_common( + return; + } + +- op->map = &maptrack_entry(lgt, op->handle); ++ map = &maptrack_entry(lgt, op->handle); + + grant_read_lock(lgt); + +- if ( unlikely(!read_atomic(&op->map->flags)) ) ++ if ( unlikely(!read_atomic(&map->flags)) ) + { + grant_read_unlock(lgt); + gdprintk(XENLOG_INFO, "Zero flags for handle (%d).\n", op->handle); +@@ -1104,7 +1106,7 @@ __gnttab_unmap_common( + return; + } + +- dom = op->map->domid; ++ dom = map->domid; + grant_read_unlock(lgt); + + if ( unlikely((rd = rcu_lock_domain_by_id(dom)) == NULL) ) +@@ -1129,16 +1131,43 @@ __gnttab_unmap_common( + + grant_read_lock(rgt); + +- op->flags = read_atomic(&op->map->flags); +- if ( unlikely(!op->flags) || unlikely(op->map->domid != dom) ) ++ op->rd = rd; ++ op->ref = map->ref; ++ ++ /* ++ * We can't assume there was no racing unmap for this maptrack entry, ++ * and hence we can't assume map->ref is valid for rd. While the checks ++ * below (with the active entry lock held) will reject any such racing ++ * requests, we still need to make sure we don't attempt to acquire an ++ * invalid lock. ++ */ ++ smp_rmb(); ++ if ( unlikely(op->ref >= nr_grant_entries(rgt)) ) + { +- gdprintk(XENLOG_WARNING, "Unstable handle %u\n", op->handle); ++ gdprintk(XENLOG_WARNING, "Unstable handle %#x\n", op->handle); + rc = GNTST_bad_handle; +- goto unmap_out; ++ goto unlock_out; + } + +- op->rd = rd; +- act = active_entry_acquire(rgt, op->map->ref); ++ act = active_entry_acquire(rgt, op->ref); ++ ++ /* ++ * Note that we (ab)use the active entry lock here to protect against ++ * multiple unmaps of the same mapping here. We don't want to hold lgt's ++ * lock, and we only hold rgt's lock for reading (but the latter wouldn't ++ * be the right one anyway). Hence the easiest is to rely on a lock we ++ * hold anyway; see docs/misc/grant-tables.txt's "Locking" section. ++ */ ++ ++ op->flags = read_atomic(&map->flags); ++ smp_rmb(); ++ if ( unlikely(!op->flags) || unlikely(map->domid != dom) || ++ unlikely(map->ref != op->ref) ) ++ { ++ gdprintk(XENLOG_WARNING, "Unstable handle %#x\n", op->handle); ++ rc = GNTST_bad_handle; ++ goto act_release_out; ++ } + + if ( op->frame == 0 ) + { +@@ -1151,7 +1180,7 @@ __gnttab_unmap_common( + "Bad frame number doesn't match gntref. (%lx != %lx)\n", + op->frame, act->frame); + +- op->map->flags &= ~GNTMAP_device_map; ++ map->flags &= ~GNTMAP_device_map; + } + + if ( (op->host_addr != 0) && (op->flags & GNTMAP_host_map) ) +@@ -1161,14 +1190,23 @@ __gnttab_unmap_common( + op->flags)) < 0 ) + goto act_release_out; + +- op->map->flags &= ~GNTMAP_host_map; ++ map->flags &= ~GNTMAP_host_map; ++ } ++ ++ if ( !(map->flags & (GNTMAP_device_map|GNTMAP_host_map)) ) ++ { ++ map->flags = 0; ++ put_handle = 1; + } + + act_release_out: + active_entry_release(act); +- unmap_out: ++ unlock_out: + grant_read_unlock(rgt); + ++ if ( put_handle ) ++ put_maptrack_handle(lgt, op->handle); ++ + if ( rc == GNTST_okay && gnttab_need_iommu_mapping(ld) ) + { + unsigned int kind; +@@ -1205,7 +1243,6 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + grant_entry_header_t *sha; + struct page_info *pg; + uint16_t *status; +- bool_t put_handle = 0; + + if ( rd == NULL ) + { +@@ -1226,13 +1263,13 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + if ( rgt->gt_version == 0 ) + goto unlock_out; + +- act = active_entry_acquire(rgt, op->map->ref); +- sha = shared_entry_header(rgt, op->map->ref); ++ act = active_entry_acquire(rgt, op->ref); ++ sha = shared_entry_header(rgt, op->ref); + + if ( rgt->gt_version == 1 ) + status = &sha->flags; + else +- status = &status_entry(rgt, op->map->ref); ++ status = &status_entry(rgt, op->ref); + + if ( unlikely(op->frame != act->frame) ) + { +@@ -1289,9 +1326,6 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + act->pin -= GNTPIN_hstw_inc; + } + +- if ( (op->map->flags & (GNTMAP_device_map|GNTMAP_host_map)) == 0 ) +- put_handle = 1; +- + if ( ((act->pin & (GNTPIN_devw_mask|GNTPIN_hstw_mask)) == 0) && + !(op->flags & GNTMAP_readonly) ) + gnttab_clear_flag(_GTF_writing, status); +@@ -1304,11 +1338,6 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + unlock_out: + grant_read_unlock(rgt); + +- if ( put_handle ) +- { +- op->map->flags = 0; +- put_maptrack_handle(ld->grant_table, op->handle); +- } + rcu_unlock_domain(rd); + } + +-- +2.1.4 + Copied: branches/2017Q2/emulators/xen-kernel/files/0003-gnttab-correct-logic-to-get-page-references-during-m.patch (from r443949, head/emulators/xen-kernel/files/0003-gnttab-correct-logic-to-get-page-references-during-m.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/emulators/xen-kernel/files/0003-gnttab-correct-logic-to-get-page-references-during-m.patch Tue Jun 20 14:46:14 2017 (r443982, copy of r443949, head/emulators/xen-kernel/files/0003-gnttab-correct-logic-to-get-page-references-during-m.patch) @@ -0,0 +1,186 @@ +From 5d491e3cf32ff03552db9d66e842964fec06dcd4 Mon Sep 17 00:00:00 2001 +From: George Dunlap +Date: Fri, 2 Jun 2017 15:21:27 +0100 +Subject: [PATCH 3/4] gnttab: correct logic to get page references during map + requests + +The rules for reference counting are somewhat complicated: + +* Each of GNTTAB_host_map and GNTTAB_device_map need their own +reference count + +* If the mapping is writeable: + - GNTTAB_host_map needs a type count under only some conditions + - GNTTAB_device_map always needs a type count + +If the mapping succeeds, we need to keep all of these; if the mapping +fails, we need to release whatever references we have acquired so far. + +Additionally, the code that does a lot of this calculation "inherits" +a reference as part of the process of finding out who the owner is. + +Finally, if the grant is mapped as writeable (without the +GNTMAP_readonly flag), but the hypervisor cannot grab a +PGT_writeable_page type, the entire operation should fail. + +Unfortunately, the current code has several logic holes: + +* If a grant is mapped only GNTTAB_device_map, and with a writeable + mapping, but in conditions where a *host* type count is not + necessary, the code will fail to grab the necessary type count. + +* If a grant is mapped both GNTTAB_device_map and GNTTAB_host_map, + with a writeable mapping, in conditions where the host type count is + not necessary, *and* where the page cannot be changed to type + PGT_writeable, the condition will not be detected. + +In both cases, this means that on success, the type count will be +erroneously reduced when the grant is unmapped. In the second case, +the type count will be erroneously reduced on the failure path as +well. (In the first case the failure path logic has the same hole +as the reference grabbing logic.) + +Additionally, the return value of get_page() is not checked; but this +may fail even if the first get_page() succeeded due to a reference +counting overflow. + +First of all, simplify the restoration logic by explicitly counting +the reference and type references acquired. + +Consider each mapping type separately, explicitly marking the +'incoming' reference as used so we know when we need to grab a second +one. + +Finally, always check the return value of get_page[_type]() and go to +the failure path if appropriate. + +This is part of XSA-224. + +Reported-by: Jan Beulich +Signed-off-by: George Dunlap +Signed-off-by: Jan Beulich +--- + xen/common/grant_table.c | 58 +++++++++++++++++++++++++++--------------------- + 1 file changed, 33 insertions(+), 25 deletions(-) + +diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c +index 452538e..5e92e2c 100644 +--- a/xen/common/grant_table.c ++++ b/xen/common/grant_table.c +@@ -758,12 +758,12 @@ __gnttab_map_grant_ref( + struct grant_table *lgt, *rgt; + struct vcpu *led; + int handle; +- unsigned long frame = 0, nr_gets = 0; ++ unsigned long frame = 0; + struct page_info *pg = NULL; + int rc = GNTST_okay; + u32 old_pin; + u32 act_pin; +- unsigned int cache_flags; ++ unsigned int cache_flags, refcnt = 0, typecnt = 0; + struct active_grant_entry *act = NULL; + struct grant_mapping *mt; + grant_entry_header_t *shah; +@@ -889,11 +889,17 @@ __gnttab_map_grant_ref( + else + owner = page_get_owner(pg); + ++ if ( owner ) ++ refcnt++; ++ + if ( !pg || (owner == dom_io) ) + { + /* Only needed the reference to confirm dom_io ownership. */ + if ( pg ) ++ { + put_page(pg); ++ refcnt--; ++ } + + if ( paging_mode_external(ld) ) + { +@@ -921,27 +927,38 @@ __gnttab_map_grant_ref( + } + else if ( owner == rd || owner == dom_cow ) + { +- if ( gnttab_host_mapping_get_page_type(op, ld, rd) ) ++ if ( (op->flags & GNTMAP_device_map) && !(op->flags & GNTMAP_readonly) ) + { + if ( (owner == dom_cow) || + !get_page_type(pg, PGT_writable_page) ) + goto could_not_pin; ++ typecnt++; + } + +- nr_gets++; + if ( op->flags & GNTMAP_host_map ) + { +- rc = create_grant_host_mapping(op->host_addr, frame, op->flags, 0); +- if ( rc != GNTST_okay ) +- goto undo_out; +- ++ /* ++ * Only need to grab another reference if device_map claimed ++ * the other one. ++ */ + if ( op->flags & GNTMAP_device_map ) + { +- nr_gets++; +- (void)get_page(pg, rd); +- if ( !(op->flags & GNTMAP_readonly) ) +- get_page_type(pg, PGT_writable_page); ++ if ( !get_page(pg, rd) ) ++ goto could_not_pin; ++ refcnt++; ++ } ++ ++ if ( gnttab_host_mapping_get_page_type(op, ld, rd) ) ++ { ++ if ( (owner == dom_cow) || ++ !get_page_type(pg, PGT_writable_page) ) ++ goto could_not_pin; ++ typecnt++; + } ++ ++ rc = create_grant_host_mapping(op->host_addr, frame, op->flags, 0); ++ if ( rc != GNTST_okay ) ++ goto undo_out; + } + } + else +@@ -950,8 +967,6 @@ __gnttab_map_grant_ref( + if ( !rd->is_dying ) + gdprintk(XENLOG_WARNING, "Could not pin grant frame %lx\n", + frame); +- if ( owner != NULL ) +- put_page(pg); + rc = GNTST_general_error; + goto undo_out; + } +@@ -1014,18 +1029,11 @@ __gnttab_map_grant_ref( + return; + + undo_out: +- if ( nr_gets > 1 ) +- { +- if ( !(op->flags & GNTMAP_readonly) ) +- put_page_type(pg); +- put_page(pg); +- } +- if ( nr_gets > 0 ) +- { +- if ( gnttab_host_mapping_get_page_type(op, ld, rd) ) +- put_page_type(pg); ++ while ( typecnt-- ) ++ put_page_type(pg); ++ ++ while ( refcnt-- ) + put_page(pg); +- } + + grant_read_lock(rgt); + +-- +2.1.4 + Copied: branches/2017Q2/emulators/xen-kernel/files/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth.patch (from r443949, head/emulators/xen-kernel/files/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/emulators/xen-kernel/files/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth.patch Tue Jun 20 14:46:14 2017 (r443982, copy of r443949, head/emulators/xen-kernel/files/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth.patch) @@ -0,0 +1,319 @@ +From 3ad26b95cd9bacedad5ba503515cf6e618162be1 Mon Sep 17 00:00:00 2001 +From: Jan Beulich +Date: Thu, 15 Jun 2017 16:25:27 +0100 +Subject: [PATCH 4/4] gnttab: __gnttab_unmap_common_complete() is + all-or-nothing + +All failures have to be detected in __gnttab_unmap_common(), the +completion function must not skip part of its processing. In particular +the GNTMAP_device_map related putting of page references and adjustment +of pin count must not occur if __gnttab_unmap_common() signaled an +error. Furthermore the function must not make adjustments to global +state (here: clearing GNTTAB_device_map) before all possibly failing +operations have been performed. + +There's one exception for IOMMU related failures: As IOMMU manipulation +occurs after GNTMAP_*_map have been cleared already, the related page +reference and pin count adjustments need to be done nevertheless. A +fundamental requirement for the correctness of this is that +iommu_{,un}map_page() crash any affected DomU in case of failure. + +The version check appears to be pointless (or could perhaps be a +BUG_ON() or ASSERT()), but for the moment also move it. + +This is part of XSA-224. + +Reported-by: Jan Beulich +Signed-off-by: Jan Beulich +--- + xen/common/grant_table.c | 108 ++++++++++++++++++-------------------- + xen/include/asm-arm/grant_table.h | 2 +- + xen/include/asm-x86/grant_table.h | 5 +- + 3 files changed, 55 insertions(+), 60 deletions(-) + +diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c +index 5e92e2c..025aad0 100644 +--- a/xen/common/grant_table.c ++++ b/xen/common/grant_table.c +@@ -96,7 +96,7 @@ struct gnttab_unmap_common { + int16_t status; + + /* Shared state beteen *_unmap and *_unmap_complete */ +- u16 flags; ++ u16 done; + unsigned long frame; + struct domain *rd; + grant_ref_t ref; +@@ -948,7 +948,8 @@ __gnttab_map_grant_ref( + refcnt++; + } + +- if ( gnttab_host_mapping_get_page_type(op, ld, rd) ) ++ if ( gnttab_host_mapping_get_page_type(op->flags & GNTMAP_readonly, ++ ld, rd) ) + { + if ( (owner == dom_cow) || + !get_page_type(pg, PGT_writable_page) ) +@@ -1095,6 +1096,7 @@ __gnttab_unmap_common( + struct active_grant_entry *act; + s16 rc = 0; + struct grant_mapping *map; ++ unsigned int flags; + bool_t put_handle = 0; + + ld = current->domain; +@@ -1145,6 +1147,20 @@ __gnttab_unmap_common( + + grant_read_lock(rgt); + ++ if ( rgt->gt_version == 0 ) ++ { ++ /* ++ * This ought to be impossible, as such a mapping should not have ++ * been established (see the nr_grant_entries(rgt) bounds check in ++ * __gnttab_map_grant_ref()). Doing this check only in ++ * __gnttab_unmap_common_complete() - as it used to be done - would, ++ * however, be too late. ++ */ ++ rc = GNTST_bad_gntref; ++ flags = 0; ++ goto unlock_out; ++ } ++ + op->rd = rd; + op->ref = map->ref; + +@@ -1160,6 +1176,7 @@ __gnttab_unmap_common( + { + gdprintk(XENLOG_WARNING, "Unstable handle %#x\n", op->handle); + rc = GNTST_bad_handle; ++ flags = 0; + goto unlock_out; + } + +@@ -1173,9 +1190,9 @@ __gnttab_unmap_common( + * hold anyway; see docs/misc/grant-tables.txt's "Locking" section. + */ + +- op->flags = read_atomic(&map->flags); ++ flags = read_atomic(&map->flags); + smp_rmb(); +- if ( unlikely(!op->flags) || unlikely(map->domid != dom) || ++ if ( unlikely(!flags) || unlikely(map->domid != dom) || + unlikely(map->ref != op->ref) ) + { + gdprintk(XENLOG_WARNING, "Unstable handle %#x\n", op->handle); +@@ -1185,24 +1202,27 @@ __gnttab_unmap_common( + + op->frame = act->frame; + +- if ( op->dev_bus_addr ) +- { +- if ( unlikely(op->dev_bus_addr != pfn_to_paddr(act->frame)) ) +- PIN_FAIL(act_release_out, GNTST_general_error, +- "Bus address doesn't match gntref (%"PRIx64" != %"PRIpaddr")\n", +- op->dev_bus_addr, pfn_to_paddr(act->frame)); +- +- map->flags &= ~GNTMAP_device_map; +- } ++ if ( op->dev_bus_addr && ++ unlikely(op->dev_bus_addr != pfn_to_paddr(act->frame)) ) ++ PIN_FAIL(act_release_out, GNTST_general_error, ++ "Bus address doesn't match gntref (%"PRIx64" != %"PRIpaddr")\n", ++ op->dev_bus_addr, pfn_to_paddr(act->frame)); + +- if ( (op->host_addr != 0) && (op->flags & GNTMAP_host_map) ) ++ if ( op->host_addr && (flags & GNTMAP_host_map) ) + { + if ( (rc = replace_grant_host_mapping(op->host_addr, + op->frame, op->new_addr, +- op->flags)) < 0 ) ++ flags)) < 0 ) + goto act_release_out; + + map->flags &= ~GNTMAP_host_map; ++ op->done |= GNTMAP_host_map | (flags & GNTMAP_readonly); ++ } ++ ++ if ( op->dev_bus_addr && (flags & GNTMAP_device_map) ) ++ { ++ map->flags &= ~GNTMAP_device_map; ++ op->done |= GNTMAP_device_map | (flags & GNTMAP_readonly); + } + + if ( !(map->flags & (GNTMAP_device_map|GNTMAP_host_map)) ) +@@ -1239,7 +1259,7 @@ __gnttab_unmap_common( + } + + /* If just unmapped a writable mapping, mark as dirtied */ +- if ( rc == GNTST_okay && !(op->flags & GNTMAP_readonly) ) ++ if ( rc == GNTST_okay && !(flags & GNTMAP_readonly) ) + gnttab_mark_dirty(rd, op->frame); + + op->status = rc; +@@ -1256,13 +1276,9 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + struct page_info *pg; + uint16_t *status; + +- if ( rd == NULL ) ++ if ( !op->done ) + { +- /* +- * Suggests that __gntab_unmap_common failed in +- * rcu_lock_domain_by_id() or earlier, and so we have nothing +- * to complete +- */ ++ /* __gntab_unmap_common() didn't do anything - nothing to complete. */ + return; + } + +@@ -1272,8 +1288,6 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + rgt = rd->grant_table; + + grant_read_lock(rgt); +- if ( rgt->gt_version == 0 ) +- goto unlock_out; + + act = active_entry_acquire(rgt, op->ref); + sha = shared_entry_header(rgt, op->ref); +@@ -1283,72 +1297,50 @@ __gnttab_unmap_common_complete(struct gnttab_unmap_common *op) + else + status = &status_entry(rgt, op->ref); + +- if ( op->dev_bus_addr && +- unlikely(op->dev_bus_addr != pfn_to_paddr(act->frame)) ) +- { +- /* +- * Suggests that __gntab_unmap_common failed early and so +- * nothing further to do +- */ +- goto act_release_out; +- } +- + pg = mfn_to_page(op->frame); + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Tue Jun 20 16:16:48 2017 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 C8EDAD9C4AF; Tue, 20 Jun 2017 16:16:48 +0000 (UTC) (envelope-from joneum@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 971B36513E; Tue, 20 Jun 2017 16:16:48 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5KGGlkp018244; Tue, 20 Jun 2017 16:16:47 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5KGGlCx018242; Tue, 20 Jun 2017 16:16:47 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201706201616.v5KGGlCx018242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Tue, 20 Jun 2017 16:16:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443991 - branches/2017Q2/chinese/wordpress-zh_TW 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: Tue, 20 Jun 2017 16:16:48 -0000 Author: joneum Date: Tue Jun 20 16:16:47 2017 New Revision: 443991 URL: https://svnweb.freebsd.org/changeset/ports/443991 Log: MFH: r443990 - chinese/wordpress-zh_TW: Update to 4.7.5 - Changelog: https://wordpress.org/news/2017/05/wordpress-4-7-5/ Approved by: miwi (mentor) Security: a5bb7ea0-3e58-11e7-94a2-00e04c1ea73d Differential Revision: https://reviews.freebsd.org/D11275 Approved by: ports-secteam (miwi), miwi (mentor) Modified: branches/2017Q2/chinese/wordpress-zh_TW/Makefile branches/2017Q2/chinese/wordpress-zh_TW/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/chinese/wordpress-zh_TW/Makefile ============================================================================== --- branches/2017Q2/chinese/wordpress-zh_TW/Makefile Tue Jun 20 16:15:21 2017 (r443990) +++ branches/2017Q2/chinese/wordpress-zh_TW/Makefile Tue Jun 20 16:16:47 2017 (r443991) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7.4 +PORTVERSION= 4.7.5 DISTVERSIONSUFFIX= -zh_TW CATEGORIES= chinese www MASTER_SITES= http://tw.wordpress.org/ Modified: branches/2017Q2/chinese/wordpress-zh_TW/distinfo ============================================================================== --- branches/2017Q2/chinese/wordpress-zh_TW/distinfo Tue Jun 20 16:15:21 2017 (r443990) +++ branches/2017Q2/chinese/wordpress-zh_TW/distinfo Tue Jun 20 16:16:47 2017 (r443991) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493061006 -SHA256 (wordpress-4.7.4-zh_TW.tar.gz) = 735745684249be7bcefc12da3eeac6e9043ee6566746471b01045423f3cbdf81 -SIZE (wordpress-4.7.4-zh_TW.tar.gz) = 8495717 +TIMESTAMP = 1497894983 +SHA256 (wordpress-4.7.5-zh_TW.tar.gz) = 56d1dabdb8ddddb7a8f586da1d8a2825b5c8b4f1863e4776a3f1c13a5d59d436 +SIZE (wordpress-4.7.5-zh_TW.tar.gz) = 7910609 From owner-svn-ports-branches@freebsd.org Wed Jun 21 10:24:18 2017 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 8D5B7D8BB37; Wed, 21 Jun 2017 10:24:18 +0000 (UTC) (envelope-from tz@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 68FB33C67; Wed, 21 Jun 2017 10:24:18 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5LAOH4E069079; Wed, 21 Jun 2017 10:24:17 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5LAOH27069075; Wed, 21 Jun 2017 10:24:17 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201706211024.v5LAOH27069075@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Wed, 21 Jun 2017 10:24:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444024 - in branches/2017Q2/lang: php70 php70/files php71 php71/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: Wed, 21 Jun 2017 10:24:18 -0000 Author: tz Date: Wed Jun 21 10:24:17 2017 New Revision: 444024 URL: https://svnweb.freebsd.org/changeset/ports/444024 Log: MFH: r443708 lang/php70 and lang/php71: Parse multiple [PATH=] and [HOST=] sections properly Adding a patch to fix bug #74738 in PHP 7.0 and 7.1: https://bugs.php.net/bug.php?id=74738 Reported by: Philip Jocks Approved by: ports-secteam (miwi) Added: branches/2017Q2/lang/php70/files/patch-main_php__ini.c - copied unchanged from r443708, head/lang/php70/files/patch-main_php__ini.c branches/2017Q2/lang/php71/files/patch-main_php__ini.c - copied unchanged from r443708, head/lang/php71/files/patch-main_php__ini.c Modified: branches/2017Q2/lang/php70/Makefile branches/2017Q2/lang/php71/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/lang/php70/Makefile ============================================================================== --- branches/2017Q2/lang/php70/Makefile Wed Jun 21 09:30:16 2017 (r444023) +++ branches/2017Q2/lang/php70/Makefile Wed Jun 21 10:24:17 2017 (r444024) @@ -3,7 +3,7 @@ PORTNAME= php70 PORTVERSION= 7.0.20 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Copied: branches/2017Q2/lang/php70/files/patch-main_php__ini.c (from r443708, head/lang/php70/files/patch-main_php__ini.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/lang/php70/files/patch-main_php__ini.c Wed Jun 21 10:24:17 2017 (r444024, copy of r443708, head/lang/php70/files/patch-main_php__ini.c) @@ -0,0 +1,31 @@ +--- main/php_ini.c.orig 2017-06-14 13:27:29 UTC ++++ main/php_ini.c +@@ -280,7 +280,7 @@ static void php_ini_parser_cb(zval *arg1 + size_t key_len; + + /* PATH sections */ +- if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) { ++ if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "PATH", sizeof("PATH") - 1, sizeof("PATH") - 1)) { + key = Z_STRVAL_P(arg1); + key = key + sizeof("PATH") - 1; + key_len = Z_STRLEN_P(arg1) - sizeof("PATH") + 1; +@@ -291,7 +291,7 @@ static void php_ini_parser_cb(zval *arg1 + TRANSLATE_SLASHES_LOWER(key); + + /* HOST sections */ +- } else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) { ++ } else if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "HOST", sizeof("HOST") - 1, sizeof("HOST") - 1)) { + key = Z_STRVAL_P(arg1); + key = key + sizeof("HOST") - 1; + key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1; +@@ -328,7 +328,9 @@ static void php_ini_parser_cb(zval *arg1 + zend_hash_init(Z_ARRVAL(section_arr), 8, NULL, (dtor_func_t) config_zval_dtor, 1); + entry = zend_hash_str_update(target_hash, key, key_len, §ion_arr); + } +- active_ini_hash = Z_ARRVAL_P(entry); ++ if (Z_TYPE_P(entry) == IS_ARRAY) { ++ active_ini_hash = Z_ARRVAL_P(entry); ++ } + } + } + break; Modified: branches/2017Q2/lang/php71/Makefile ============================================================================== --- branches/2017Q2/lang/php71/Makefile Wed Jun 21 09:30:16 2017 (r444023) +++ branches/2017Q2/lang/php71/Makefile Wed Jun 21 10:24:17 2017 (r444024) @@ -3,7 +3,7 @@ PORTNAME= php71 PORTVERSION= 7.1.6 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Copied: branches/2017Q2/lang/php71/files/patch-main_php__ini.c (from r443708, head/lang/php71/files/patch-main_php__ini.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/lang/php71/files/patch-main_php__ini.c Wed Jun 21 10:24:17 2017 (r444024, copy of r443708, head/lang/php71/files/patch-main_php__ini.c) @@ -0,0 +1,40 @@ +--- main/php_ini.c.orig 2017-06-14 13:23:49 UTC ++++ main/php_ini.c +@@ -280,7 +280,7 @@ static void php_ini_parser_cb(zval *arg1 + size_t key_len; + + /* PATH sections */ +- if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) { ++ if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "PATH", sizeof("PATH") - 1, sizeof("PATH") - 1)) { + key = Z_STRVAL_P(arg1); + key = key + sizeof("PATH") - 1; + key_len = Z_STRLEN_P(arg1) - sizeof("PATH") + 1; +@@ -291,7 +291,7 @@ static void php_ini_parser_cb(zval *arg1 + TRANSLATE_SLASHES_LOWER(key); + + /* HOST sections */ +- } else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) { ++ } else if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "HOST", sizeof("HOST") - 1, sizeof("HOST") - 1)) { + key = Z_STRVAL_P(arg1); + key = key + sizeof("HOST") - 1; + key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1; +@@ -328,7 +328,9 @@ static void php_ini_parser_cb(zval *arg1 + zend_hash_init(Z_ARRVAL(section_arr), 8, NULL, (dtor_func_t) config_zval_dtor, 1); + entry = zend_hash_str_update(target_hash, key, key_len, §ion_arr); + } +- active_ini_hash = Z_ARRVAL_P(entry); ++ if (Z_TYPE_P(entry) == IS_ARRAY) { ++ active_ini_hash = Z_ARRVAL_P(entry); ++ } + } + } + break; +@@ -638,7 +640,7 @@ int php_init_config(void) + } + if (!debpath[0]) { + /* empty string means default builtin value +- to allow "/foo/php.d:" or ":/foo/php.d" */ ++ to allow "/foo/phd.d:" or ":/foo/php.d" */ + debpath = PHP_CONFIG_FILE_SCAN_DIR; + } + lenpath = (int)strlen(debpath); From owner-svn-ports-branches@freebsd.org Thu Jun 22 11:04:35 2017 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 9FE24D8986D; Thu, 22 Jun 2017 11:04:35 +0000 (UTC) (envelope-from mat@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 70185772B3; Thu, 22 Jun 2017 11:04:35 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5MB4YT7078518; Thu, 22 Jun 2017 11:04:34 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5MB4YXR078516; Thu, 22 Jun 2017 11:04:34 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201706221104.v5MB4YXR078516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 22 Jun 2017 11:04:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444109 - branches/2017Q2/www/apache24 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: Thu, 22 Jun 2017 11:04:35 -0000 Author: mat Date: Thu Jun 22 11:04:34 2017 New Revision: 444109 URL: https://svnweb.freebsd.org/changeset/ports/444109 Log: MFH: r444108 Update to 2.4.26. Security: CVE-2017-3167 Security: CVE-2017-3169 Security: CVE-2017-7659 Security: CVE-2017-7668 Security: CVE-2017-7679 With hat: portmgr Sponsored by: Absolight Modified: branches/2017Q2/www/apache24/Makefile branches/2017Q2/www/apache24/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/apache24/Makefile ============================================================================== --- branches/2017Q2/www/apache24/Makefile Thu Jun 22 11:04:01 2017 (r444108) +++ branches/2017Q2/www/apache24/Makefile Thu Jun 22 11:04:34 2017 (r444109) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.25 -PORTREVISION= 1 +PORTVERSION= 2.4.26 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} Modified: branches/2017Q2/www/apache24/distinfo ============================================================================== --- branches/2017Q2/www/apache24/distinfo Thu Jun 22 11:04:01 2017 (r444108) +++ branches/2017Q2/www/apache24/distinfo Thu Jun 22 11:04:34 2017 (r444109) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482168542 -SHA256 (apache24/httpd-2.4.25.tar.bz2) = f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2 -SIZE (apache24/httpd-2.4.25.tar.bz2) = 6398218 +TIMESTAMP = 1498129310 +SHA256 (apache24/httpd-2.4.26.tar.bz2) = a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387 +SIZE (apache24/httpd-2.4.26.tar.bz2) = 6524642 From owner-svn-ports-branches@freebsd.org Thu Jun 22 17:10:33 2017 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 84BDAD90CD2; Thu, 22 Jun 2017 17:10:33 +0000 (UTC) (envelope-from mandree@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 5302C8283F; Thu, 22 Jun 2017 17:10:33 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5MHAWbn028580; Thu, 22 Jun 2017 17:10:32 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5MHAWMm028578; Thu, 22 Jun 2017 17:10:32 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201706221710.v5MHAWMm028578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Thu, 22 Jun 2017 17:10:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444119 - branches/2017Q2/security/openvpn 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: Thu, 22 Jun 2017 17:10:33 -0000 Author: mandree Date: Thu Jun 22 17:10:32 2017 New Revision: 444119 URL: https://svnweb.freebsd.org/changeset/ports/444119 Log: MFH: r444043 OpenVPN security update to 2.4.3 OpenVPN v2.4.2 was analyzed closely using a fuzzer by Guido Vranken. In the process several vulnerabilities were found, some of which are remotely exploitable in certain circumstances. Compared to OpenVPN 2.4.2 there are several bugfixes and one major feature: support for building with OpenSSL 1.1. Security: 9f65d382-56a4-11e7-83e3-080027ef73ec Security: CVE-2017-7508 Security: CVE-2017-7512 Security: CVE-2017-7520 Security: CVE-2017-7521 Security: CVE-2017-7522 Approved by: ports-secteam@ (delphij@) Modified: branches/2017Q2/security/openvpn/Makefile branches/2017Q2/security/openvpn/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/openvpn/Makefile ============================================================================== --- branches/2017Q2/security/openvpn/Makefile Thu Jun 22 16:15:21 2017 (r444118) +++ branches/2017Q2/security/openvpn/Makefile Thu Jun 22 17:10:32 2017 (r444119) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 2.4.2 +DISTVERSION= 2.4.3 PORTREVISION?= 0 CATEGORIES= security net MASTER_SITES= http://swupdate.openvpn.net/community/releases/ \ Modified: branches/2017Q2/security/openvpn/distinfo ============================================================================== --- branches/2017Q2/security/openvpn/distinfo Thu Jun 22 16:15:21 2017 (r444118) +++ branches/2017Q2/security/openvpn/distinfo Thu Jun 22 17:10:32 2017 (r444119) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494532032 -SHA256 (openvpn-2.4.2.tar.xz) = df5c4f384b7df6b08a2f6fa8a84b9fd382baf59c2cef1836f82e2a7f62f1bff9 -SIZE (openvpn-2.4.2.tar.xz) = 918448 +TIMESTAMP = 1498064673 +SHA256 (openvpn-2.4.3.tar.xz) = 15e15fc97f189b52aee7c90ec8355aa77469c773125110b4c2f089abecde36fb +SIZE (openvpn-2.4.3.tar.xz) = 938440 From owner-svn-ports-branches@freebsd.org Thu Jun 22 17:19:09 2017 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 8DC92D9103B; Thu, 22 Jun 2017 17:19:09 +0000 (UTC) (envelope-from dim@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 5D9398304B; Thu, 22 Jun 2017 17:19:09 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5MHJ8Fn033092; Thu, 22 Jun 2017 17:19:08 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5MHJ8Eb033091; Thu, 22 Jun 2017 17:19:08 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201706221719.v5MHJ8Eb033091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 22 Jun 2017 17:19:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444122 - branches/2017Q2/devel/qt5-script/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: Thu, 22 Jun 2017 17:19:09 -0000 Author: dim (src committer) Date: Thu Jun 22 17:19:08 2017 New Revision: 444122 URL: https://svnweb.freebsd.org/changeset/ports/444122 Log: MFH: r444079 Disable usage of c++1z (c++17) for qt5-script, as the third-party JavaScriptCore code is not fully compatible with it. This is a requirement for using libc++ 5.0.0, which is more strict. Approved by: portmgr (feld) PR: 220188 Added: branches/2017Q2/devel/qt5-script/files/patch-cr198221 - copied unchanged from r444079, head/devel/qt5-script/files/patch-cr198221 Modified: Directory Properties: branches/2017Q2/ (props changed) Copied: branches/2017Q2/devel/qt5-script/files/patch-cr198221 (from r444079, head/devel/qt5-script/files/patch-cr198221) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/devel/qt5-script/files/patch-cr198221 Thu Jun 22 17:19:08 2017 (r444122, copy of r444079, head/devel/qt5-script/files/patch-cr198221) @@ -0,0 +1,21 @@ +From e6c7e47d85399dbedf86491ed3b7f582ddf7c740 Mon Sep 17 00:00:00 2001 +From: "Tobias C. Berner" +Date: Wed, 21 Jun 2017 21:38:23 +0200 +Subject: [PATCH] cat c.tDisable c++1z as it breaks compilation with libc++5. + +Change-Id: I7efa59433cd06ee8ff43d231e6ff1d4712fe65aa +--- + src/script/script.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/script/script.pro b/src/script/script.pro +index e9f15e2..27fa434 100644 +--- src/script/script.pro ++++ src/script/script.pro +@@ -58,3 +58,4 @@ integrity { + TR_EXCLUDE = $$WEBKITDIR/* + + load(qt_module) ++CONFIG -= c++1z +-- +2.13.1 From owner-svn-ports-branches@freebsd.org Thu Jun 22 17:26:33 2017 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 6A195D912C0; Thu, 22 Jun 2017 17:26:33 +0000 (UTC) (envelope-from mandree@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 39BBB83606; Thu, 22 Jun 2017 17:26:33 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5MHQWiG037201; Thu, 22 Jun 2017 17:26:32 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5MHQWE5037199; Thu, 22 Jun 2017 17:26:32 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201706221726.v5MHQWE5037199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Thu, 22 Jun 2017 17:26:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444124 - branches/2017Q2/security/openvpn23 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: Thu, 22 Jun 2017 17:26:33 -0000 Author: mandree Date: Thu Jun 22 17:26:32 2017 New Revision: 444124 URL: https://svnweb.freebsd.org/changeset/ports/444124 Log: OpenVPN security update to 2.3.17 OpenVPN v2.4.2 was analyzed closely using a fuzzer by Guido Vranken. In the process several vulnerabilities were found, some of which are remotely exploitable in certain circumstances, and the fixes have been backported to v2.3.x. Changelog: Security: 9f65d382-56a4-11e7-83e3-080027ef73ec Security: CVE-2017-7508 Security: CVE-2017-7512 Security: CVE-2017-7520 Security: CVE-2017-7521 Security: CVE-2017-7522 Approved by: ports-secteam@ (delphij@) Modified: branches/2017Q2/security/openvpn23/Makefile branches/2017Q2/security/openvpn23/distinfo Modified: branches/2017Q2/security/openvpn23/Makefile ============================================================================== --- branches/2017Q2/security/openvpn23/Makefile Thu Jun 22 17:24:42 2017 (r444123) +++ branches/2017Q2/security/openvpn23/Makefile Thu Jun 22 17:26:32 2017 (r444124) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 2.3.16 +DISTVERSION= 2.3.17 CATEGORIES= security net MASTER_SITES= https://swupdate.openvpn.net/community/releases/ \ https://build.openvpn.net/downloads/releases/ @@ -12,7 +12,7 @@ MAINTAINER= mandree@FreeBSD.org COMMENT?= Secure IP/Ethernet tunnel daemon DEPRECATED= Replaced by new upstream release 2.4.x -EXPIRATION_DATE= 2017-03-31 +EXPIRATION_DATE= 2017-06-30 LICENSE= GPLv2 @@ -63,8 +63,9 @@ OPENSSL_USES= ssl OPENSSL_CONFIGURE_ON= --with-crypto-library=openssl # Pin the libmbedtls version because the 2.3.x port can't work with .so.10 or -# newer from the security/mbedtls package. Upstream works in progress -# for OpenVPN 2.4 to use mbedTLS 2.X. +# newer from the security/mbedtls package. +# Recent upstream 2.4 versions can use mbedTLS 2.X, and there is a +# corresponding port. POLARSSL_LIB_DEPENDS= libmbedtls.so.9:security/polarssl13 POLARSSL_CONFIGURE_ON= --with-crypto-library=polarssl Modified: branches/2017Q2/security/openvpn23/distinfo ============================================================================== --- branches/2017Q2/security/openvpn23/distinfo Thu Jun 22 17:24:42 2017 (r444123) +++ branches/2017Q2/security/openvpn23/distinfo Thu Jun 22 17:26:32 2017 (r444124) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495220261 -SHA256 (openvpn-2.3.16.tar.xz) = efb4bd5450df7fc7b11143ee81a8fad8aaddeaefe645657c1eebb14a1377b475 -SIZE (openvpn-2.3.16.tar.xz) = 831428 +TIMESTAMP = 1498151556 +SHA256 (openvpn-2.3.17.tar.xz) = d300029416b045666f2dc957bdde407ba97894428b5ad8433df789e793ccc1d3 +SIZE (openvpn-2.3.17.tar.xz) = 846664 From owner-svn-ports-branches@freebsd.org Thu Jun 22 18:53:32 2017 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 7EF73D92903; Thu, 22 Jun 2017 18:53:32 +0000 (UTC) (envelope-from lifanov@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 566A0195A; Thu, 22 Jun 2017 18:53:32 +0000 (UTC) (envelope-from lifanov@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5MIrVxN073841; Thu, 22 Jun 2017 18:53:31 GMT (envelope-from lifanov@FreeBSD.org) Received: (from lifanov@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5MIrUrh073836; Thu, 22 Jun 2017 18:53:30 GMT (envelope-from lifanov@FreeBSD.org) Message-Id: <201706221853.v5MIrUrh073836@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lifanov set sender to lifanov@FreeBSD.org using -f From: Nikolai Lifanov Date: Thu, 22 Jun 2017 18:53:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444127 - in branches/2017Q2: . sysutils/ansible sysutils/ansible/files sysutils/ansible1 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: Thu, 22 Jun 2017 18:53:32 -0000 Author: lifanov Date: Thu Jun 22 18:53:30 2017 New Revision: 444127 URL: https://svnweb.freebsd.org/changeset/ports/444127 Log: MFH: r438364 r438419 r438787 r441093 r442458 update sysutils/ansible to 2.3.0.0 This is a major release! https://raw.githubusercontent.com/ansible/ansible/v2.3.0.0-1/CHANGELOG.md o stop "fixing" default interpreter of /usr/bin/python o remove NETADDR option and depend on py-netaddr unconditionally Differential Revision: https://reviews.freebsd.org/D10165 sysutils/ansible1: fix packaging Also, bump expiration date again since I touched it. I plan to keep it around until sysutils/py-ploy_ansible is migrated. sysutils/ansible: fix prompt for become-method=su PR: 218724 Reported by: Guillaume Bibaut sysutils/ansible: add dependency on py-jmespath o add missing dependency on py-jmespath required by built-in jsonquery o sort dependency list PR: 219359 Submitted by: Dave Cottlehuber update sysutils/ansible to 2.3.1.0 Relnotes: https://github.com/ansible/ansible/blob/v2.3.1.0-1/CHANGELOG.md Security: 15a04b9f-47cb-11e7-a853-001fbc0f280f Approved by: ports-secteam (feld) Modified: branches/2017Q2/UPDATING branches/2017Q2/sysutils/ansible/Makefile branches/2017Q2/sysutils/ansible/distinfo branches/2017Q2/sysutils/ansible/files/pkg-message.in branches/2017Q2/sysutils/ansible1/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/UPDATING ============================================================================== --- branches/2017Q2/UPDATING Thu Jun 22 18:20:08 2017 (r444126) +++ branches/2017Q2/UPDATING Thu Jun 22 18:53:30 2017 (r444127) @@ -26,6 +26,20 @@ you update your ports collection, before attempting an Qt5 was fixed to ignore gold. If you see these errors, you need to rebuild qt5-qmake, then all qt5-* ports. +20170412: + AFFECTS: users of sysutils/ansible + AUTHOR: lifanov@FreeBSD.org + + The default value for ansible_python_interpreter has been changed + to match the upstream /usr/bin/python. If managing FreeBSD systems, + adjust the hosts database to explicitly set a valid python interpreter: + + [freebsd] + host1 + + [freebsd_vars] + ansible_python_interpreter=/usr/local/bin/python2.7 + 20170411: AFFECTS: www/firefox AUTHOR: gecko@FreeBSD.org Modified: branches/2017Q2/sysutils/ansible/Makefile ============================================================================== --- branches/2017Q2/sysutils/ansible/Makefile Thu Jun 22 18:20:08 2017 (r444126) +++ branches/2017Q2/sysutils/ansible/Makefile Thu Jun 22 18:53:30 2017 (r444127) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ansible -PORTVERSION?= 2.2.2.0 +PORTVERSION?= 2.3.1.0 PORTREVISION?= 0 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ @@ -13,24 +13,25 @@ COMMENT= Radically simple IT automation LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ +RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ + ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +EXTRA_PATCHES?= # + NO_ARCH= yes -USES?= cpe python shebangfix +USES?= cpe python USE_PYTHON= autoplist distutils -python_CMD= ${LOCALBASE}/bin/python -SHEBANG_FILES+= lib/ansible/modules/core/*/*.py \ - lib/ansible/modules/core/*/*/*.py \ - lib/ansible/modules/extras/*/*.py \ - lib/ansible/modules/extras/*/*/*.py CPE_VENDOR= ansibleworks SUB_FILES= pkg-message +SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} -PLIST_FILES+= man/man1/ansible-doc.1.gz \ +PLIST_FILES?= man/man1/ansible-console.1.gz \ + man/man1/ansible-doc.1.gz \ man/man1/ansible-galaxy.1.gz \ man/man1/ansible-playbook.1.gz \ man/man1/ansible-pull.1.gz \ @@ -39,11 +40,7 @@ PLIST_FILES+= man/man1/ansible-doc.1.gz \ PORTEXAMPLES= ansible.cfg hosts -OPTIONS_DEFINE= DOCS EXAMPLES NETADDR -OPTIONS_DEFAULT=NETADDR - -NETADDR_DESC= Dependency on py-netaddr for ipaddr() filter -NETADDR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr +OPTIONS_DEFINE= DOCS EXAMPLES post-patch: .for f in bin/ansible docs/man/man1/* examples/* lib/ansible/*.py \ Modified: branches/2017Q2/sysutils/ansible/distinfo ============================================================================== --- branches/2017Q2/sysutils/ansible/distinfo Thu Jun 22 18:20:08 2017 (r444126) +++ branches/2017Q2/sysutils/ansible/distinfo Thu Jun 22 18:53:30 2017 (r444127) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490707549 -SHA256 (ansible-2.2.2.0.tar.gz) = efd9c574168ac1916dd57f7c88d4dd2e13ef816af0ee49a8d34c77567886e4c2 -SIZE (ansible-2.2.2.0.tar.gz) = 2510182 +TIMESTAMP = 1496432079 +SHA256 (ansible-2.3.1.0.tar.gz) = cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5 +SIZE (ansible-2.3.1.0.tar.gz) = 4263357 Modified: branches/2017Q2/sysutils/ansible/files/pkg-message.in ============================================================================== --- branches/2017Q2/sysutils/ansible/files/pkg-message.in Thu Jun 22 18:20:08 2017 (r444126) +++ branches/2017Q2/sysutils/ansible/files/pkg-message.in Thu Jun 22 18:53:30 2017 (r444127) @@ -8,22 +8,15 @@ host database and a sample configuration file: %%EXAMPLESDIR%%/ansible.cfg To use Ansible to control FreeBSD hosts, you need to -install the lang/python package on remote machines. +install the lang/python package on remote machines +and set up a path to the python interpreter. Example: -To use Ansible to control systems other than FreeBSD, -set the Python interpreter in the host database for -that system. Example: - [freebsd] host1 host2 - [centos] - host3 - host4 - - [centos:vars] - ansible_python_interpreter=/usr/bin/python + [freebsd:vars] + ansible_python_interpreter=%%PYTHON_CMD%% Python notes: Modified: branches/2017Q2/sysutils/ansible1/Makefile ============================================================================== --- branches/2017Q2/sysutils/ansible1/Makefile Thu Jun 22 18:20:08 2017 (r444126) +++ branches/2017Q2/sysutils/ansible1/Makefile Thu Jun 22 18:53:30 2017 (r444127) @@ -17,11 +17,18 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-ya USES= cpe python:2 shebangfix +PLIST_FILES= man/man1/ansible-doc.1.gz \ + man/man1/ansible-galaxy.1.gz \ + man/man1/ansible-playbook.1.gz \ + man/man1/ansible-pull.1.gz \ + man/man1/ansible-vault.1.gz \ + man/man1/ansible.1.gz + SHEBANG_FILES= lib/ansible/runner/action_plugins/synchronize.py EXTRA_PATCHES= DEPRECATED= please upgrade to sysutils/ansible -EXPIRATION_DATE= 2016-10-01 +EXPIRATION_DATE= 2017-10-01 .include "${MASTERDIR}/Makefile" From owner-svn-ports-branches@freebsd.org Fri Jun 23 12:52:45 2017 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 BA88BDA4347; Fri, 23 Jun 2017 12:52:45 +0000 (UTC) (envelope-from cpm@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 308E0846BA; Fri, 23 Jun 2017 12:52:45 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5NCqiOr024671; Fri, 23 Jun 2017 12:52:44 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5NCqefS024630; Fri, 23 Jun 2017 12:52:40 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201706231252.v5NCqefS024630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Fri, 23 Jun 2017 12:52:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444178 - in branches/2017Q2/www/chromium: . 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 Jun 2017 12:52:45 -0000 Author: cpm Date: Fri Jun 23 12:52:40 2017 New Revision: 444178 URL: https://svnweb.freebsd.org/changeset/ports/444178 Log: MFH: r443998 www/chromium: update to 59.0.3071.104 - Use https in WWW and MASTER_SITES - Sort ONLY_FOR_ARCHS, USES, USE_GNOME and GN_ARGS - Put in correct place MAKE_ENV+= V=1 variable - Use LLD linker by default for supported archs - Fix DEBUG option - Fix gpu_info_collector.cc warning: control may reach end of non-void function [-Wreturn-type] - Get rid of multiple definition errors Changelog: https://chromium.googlesource.com/chromium/src/+log/58.0.3029.110..59.0.3071.104?pretty=fuller&n=10000 Security: https://www.vuxml.org/freebsd/52f4b48b-4ac3-11e7-99aa-e8e0b747a45a.html Security: https://www.vuxml.org/freebsd/f53dd5cc-527f-11e7-a772-e8e0b747a45a.html Approved by: ports-secteam (feld) Added: branches/2017Q2/www/chromium/files/patch-base_debug_debugger__posix.cc - copied unchanged from r443998, head/www/chromium/files/patch-base_debug_debugger__posix.cc branches/2017Q2/www/chromium/files/patch-base_trace__event_trace__log.cc - copied unchanged from r443998, head/www/chromium/files/patch-base_trace__event_trace__log.cc branches/2017Q2/www/chromium/files/patch-build__overrides_pdfium.gni - copied unchanged from r443998, head/www/chromium/files/patch-build__overrides_pdfium.gni branches/2017Q2/www/chromium/files/patch-build_config_freetype_BUILD.gn - copied unchanged from r443998, head/www/chromium/files/patch-build_config_freetype_BUILD.gn branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__audio__private_webrtc__audio__private__api.cc - copied unchanged from r443998, head/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__audio__private_webrtc__audio__private__api.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.cc - copied unchanged from r443998, head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.h - copied unchanged from r443998, head/www/chromium/files/patch-chrome_browser_flag__descriptions.h branches/2017Q2/www/chromium/files/patch-chrome_browser_memory__details__linux.cc - copied unchanged from r443998, head/www/chromium/files/patch-chrome_browser_memory__details__linux.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html - copied unchanged from r443998, head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html branches/2017Q2/www/chromium/files/patch-components_tracing_child_child__trace__message__filter.cc - copied unchanged from r443998, head/www/chromium/files/patch-components_tracing_child_child__trace__message__filter.cc branches/2017Q2/www/chromium/files/patch-device_usb_BUILD.gn - copied unchanged from r443998, head/www/chromium/files/patch-device_usb_BUILD.gn branches/2017Q2/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc - copied unchanged from r443998, head/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc branches/2017Q2/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h - copied unchanged from r443998, head/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h branches/2017Q2/www/chromium/files/patch-services_ui_gpu_gpu__service.cc - copied unchanged from r443998, head/www/chromium/files/patch-services_ui_gpu_gpu__service.cc branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp - copied unchanged from r443998, head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Atomics.h - copied unchanged from r443998, head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Atomics.h branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_BUILD.gn - copied unchanged from r443998, head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ByteSwap.h - copied unchanged from r443998, head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ByteSwap.h branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ContainerAnnotations.h - copied unchanged from r443998, head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ContainerAnnotations.h branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_StackUtil.cpp - copied unchanged from r443998, head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_StackUtil.cpp branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp - copied unchanged from r443998, head/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp branches/2017Q2/www/chromium/files/patch-third__party_libxml_chromium_libxml__utils.cc - copied unchanged from r443998, head/www/chromium/files/patch-third__party_libxml_chromium_libxml__utils.cc branches/2017Q2/www/chromium/files/patch-third__party_webrtc_base_byteorder.h - copied unchanged from r443998, head/www/chromium/files/patch-third__party_webrtc_base_byteorder.h branches/2017Q2/www/chromium/files/patch-tools_grit_grit__rule.gni - copied unchanged from r443998, head/www/chromium/files/patch-tools_grit_grit__rule.gni Deleted: branches/2017Q2/www/chromium/files/patch-base_process_memory__stubs.cc branches/2017Q2/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc branches/2017Q2/www/chromium/files/patch-chrome_app_resources_locale__settings.grd branches/2017Q2/www/chromium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc branches/2017Q2/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc branches/2017Q2/www/chromium/files/patch-content_common_set__process__title__linux.cc branches/2017Q2/www/chromium/files/patch-content_common_set__process__title__linux.h branches/2017Q2/www/chromium/files/patch-content_gpu_gpu__child__thread.cc branches/2017Q2/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp branches/2017Q2/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h branches/2017Q2/www/chromium/files/patch-ui_app__list_app__list__constants.cc branches/2017Q2/www/chromium/files/patch-ui_app__list_app__list__constants.h branches/2017Q2/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc branches/2017Q2/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h branches/2017Q2/www/chromium/files/patch-v8_src_wasm_wasm-result.h Modified: branches/2017Q2/www/chromium/Makefile branches/2017Q2/www/chromium/Makefile.tests branches/2017Q2/www/chromium/distinfo branches/2017Q2/www/chromium/files/patch-BUILD.gn branches/2017Q2/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc branches/2017Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc branches/2017Q2/www/chromium/files/patch-base_BUILD.gn branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim.cc branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc branches/2017Q2/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc branches/2017Q2/www/chromium/files/patch-base_files_file__path__unittest.cc branches/2017Q2/www/chromium/files/patch-base_files_file__util.h branches/2017Q2/www/chromium/files/patch-base_native__library__posix.cc branches/2017Q2/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc branches/2017Q2/www/chromium/files/patch-base_process_launch.cc branches/2017Q2/www/chromium/files/patch-base_process_memory.cc branches/2017Q2/www/chromium/files/patch-base_process_memory.h branches/2017Q2/www/chromium/files/patch-base_process_memory__unittest.cc branches/2017Q2/www/chromium/files/patch-base_process_process__info__linux.cc branches/2017Q2/www/chromium/files/patch-base_process_process__iterator__freebsd.cc branches/2017Q2/www/chromium/files/patch-base_process_process__metrics.h branches/2017Q2/www/chromium/files/patch-base_process_process__metrics__freebsd.cc branches/2017Q2/www/chromium/files/patch-base_process_process__posix.cc branches/2017Q2/www/chromium/files/patch-base_sys__info__freebsd.cc branches/2017Q2/www/chromium/files/patch-base_sys__info__posix.cc branches/2017Q2/www/chromium/files/patch-base_test_BUILD.gn branches/2017Q2/www/chromium/files/patch-base_test_launcher_test__launcher.cc branches/2017Q2/www/chromium/files/patch-base_test_test__file__util__posix.cc branches/2017Q2/www/chromium/files/patch-base_threading_platform__thread__linux.cc branches/2017Q2/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc branches/2017Q2/www/chromium/files/patch-base_trace__event_process__memory__dump.cc branches/2017Q2/www/chromium/files/patch-breakpad_BUILD.gn branches/2017Q2/www/chromium/files/patch-build_config_BUILD.gn branches/2017Q2/www/chromium/files/patch-build_config_BUILDCONFIG.gn branches/2017Q2/www/chromium/files/patch-build_config_allocator.gni branches/2017Q2/www/chromium/files/patch-build_config_clang_BUILD.gn branches/2017Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn branches/2017Q2/www/chromium/files/patch-build_config_crypto.gni branches/2017Q2/www/chromium/files/patch-build_config_features.gni branches/2017Q2/www/chromium/files/patch-build_config_sanitizers_BUILD.gn branches/2017Q2/www/chromium/files/patch-build_config_ui.gni branches/2017Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni branches/2017Q2/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc branches/2017Q2/www/chromium/files/patch-cc_trees_property__tree.cc branches/2017Q2/www/chromium/files/patch-chrome_BUILD.gn branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__main.cc branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.h branches/2017Q2/www/chromium/files/patch-chrome_app_chromium__strings.grd branches/2017Q2/www/chromium/files/patch-chrome_app_generated__resources.grd branches/2017Q2/www/chromium/files/patch-chrome_app_google__chrome__strings.grd branches/2017Q2/www/chromium/files/patch-chrome_app_mash_mash__runner.cc branches/2017Q2/www/chromium/files/patch-chrome_app_settings__strings.grdp branches/2017Q2/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_BUILD.gn branches/2017Q2/www/chromium/files/patch-chrome_browser_about__flags.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_browser__process__impl.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_browser__process__impl.h branches/2017Q2/www/chromium/files/patch-chrome_browser_browser__resources.grd branches/2017Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h branches/2017Q2/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h branches/2017Q2/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_download_download__commands.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_download_download__prefs.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_memory__details.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py branches/2017Q2/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h branches/2017Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_BUILD.gn branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc branches/2017Q2/www/chromium/files/patch-chrome_browser_web__applications_web__app.h branches/2017Q2/www/chromium/files/patch-chrome_chrome__paks.gni branches/2017Q2/www/chromium/files/patch-chrome_common_chrome__paths.cc branches/2017Q2/www/chromium/files/patch-chrome_common_chrome__paths__internal.h branches/2017Q2/www/chromium/files/patch-chrome_common_chrome__switches.cc branches/2017Q2/www/chromium/files/patch-chrome_common_chrome__switches.h branches/2017Q2/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn branches/2017Q2/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc branches/2017Q2/www/chromium/files/patch-chrome_common_extensions_command.cc branches/2017Q2/www/chromium/files/patch-chrome_common_features.gni branches/2017Q2/www/chromium/files/patch-chrome_common_pref__names.cc branches/2017Q2/www/chromium/files/patch-chrome_common_pref__names.h branches/2017Q2/www/chromium/files/patch-chrome_common_url__constants.cc branches/2017Q2/www/chromium/files/patch-chrome_common_url__constants.h branches/2017Q2/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc branches/2017Q2/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h branches/2017Q2/www/chromium/files/patch-chrome_test_BUILD.gn branches/2017Q2/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc branches/2017Q2/www/chromium/files/patch-chrome_test_base_testing__browser__process.h branches/2017Q2/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc branches/2017Q2/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc branches/2017Q2/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc branches/2017Q2/www/chromium/files/patch-chromecast_crash_BUILD.gn branches/2017Q2/www/chromium/files/patch-components_BUILD.gn branches/2017Q2/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc branches/2017Q2/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc branches/2017Q2/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc branches/2017Q2/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc branches/2017Q2/www/chromium/files/patch-components_filesystem_file__system__app.cc branches/2017Q2/www/chromium/files/patch-components_flags__ui_flags__state.cc branches/2017Q2/www/chromium/files/patch-components_metrics_BUILD.gn branches/2017Q2/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc branches/2017Q2/www/chromium/files/patch-components_neterror_resources_neterror.js branches/2017Q2/www/chromium/files/patch-components_policy_BUILD.gn branches/2017Q2/www/chromium/files/patch-components_policy_resources_policy__templates.json branches/2017Q2/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc branches/2017Q2/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc branches/2017Q2/www/chromium/files/patch-components_sync_base_get__session__name.cc branches/2017Q2/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc branches/2017Q2/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h branches/2017Q2/www/chromium/files/patch-components_update__client_update__query__params.cc branches/2017Q2/www/chromium/files/patch-content_app_BUILD.gn branches/2017Q2/www/chromium/files/patch-content_app_content__main__runner.cc branches/2017Q2/www/chromium/files/patch-content_browser_BUILD.gn branches/2017Q2/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h branches/2017Q2/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h branches/2017Q2/www/chromium/files/patch-content_browser_browser__main__loop.cc branches/2017Q2/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc branches/2017Q2/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc branches/2017Q2/www/chromium/files/patch-content_browser_download_base__file.cc branches/2017Q2/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc branches/2017Q2/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h branches/2017Q2/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc branches/2017Q2/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc branches/2017Q2/www/chromium/files/patch-content_browser_media_media__internals.cc branches/2017Q2/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc branches/2017Q2/www/chromium/files/patch-content_browser_memory_memory__monitor.cc branches/2017Q2/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc branches/2017Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc branches/2017Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h branches/2017Q2/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc branches/2017Q2/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc branches/2017Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc branches/2017Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc branches/2017Q2/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc branches/2017Q2/www/chromium/files/patch-content_browser_utility__process__host__impl.cc branches/2017Q2/www/chromium/files/patch-content_child_child__process.cc branches/2017Q2/www/chromium/files/patch-content_child_child__process.h branches/2017Q2/www/chromium/files/patch-content_child_child__thread__impl.cc branches/2017Q2/www/chromium/files/patch-content_child_child__thread__impl.h branches/2017Q2/www/chromium/files/patch-content_common_BUILD.gn branches/2017Q2/www/chromium/files/patch-content_common_child__process__messages.h branches/2017Q2/www/chromium/files/patch-content_common_content__switches__internal.cc branches/2017Q2/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc branches/2017Q2/www/chromium/files/patch-content_common_view__messages.h branches/2017Q2/www/chromium/files/patch-content_gpu_BUILD.gn branches/2017Q2/www/chromium/files/patch-content_gpu_gpu__main.cc branches/2017Q2/www/chromium/files/patch-content_gpu_in__process__gpu__thread.cc branches/2017Q2/www/chromium/files/patch-content_public_common_child__process__host.h branches/2017Q2/www/chromium/files/patch-content_public_common_content__switches.cc branches/2017Q2/www/chromium/files/patch-content_public_common_content__switches.h branches/2017Q2/www/chromium/files/patch-content_public_common_renderer__preferences.h branches/2017Q2/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc branches/2017Q2/www/chromium/files/patch-content_renderer_render__thread__impl.cc branches/2017Q2/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc branches/2017Q2/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h branches/2017Q2/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc branches/2017Q2/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc branches/2017Q2/www/chromium/files/patch-content_shell_BUILD.gn branches/2017Q2/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc branches/2017Q2/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc branches/2017Q2/www/chromium/files/patch-content_test_BUILD.gn branches/2017Q2/www/chromium/files/patch-crypto_nss__util.cc branches/2017Q2/www/chromium/files/patch-device_BUILD.gn branches/2017Q2/www/chromium/files/patch-device_battery_BUILD.gn branches/2017Q2/www/chromium/files/patch-device_bluetooth_BUILD.gn branches/2017Q2/www/chromium/files/patch-device_gamepad_gamepad__provider.cc branches/2017Q2/www/chromium/files/patch-device_geolocation_location__arbitrator.cc branches/2017Q2/www/chromium/files/patch-device_sensors_data__fetcher__shared__memory.h branches/2017Q2/www/chromium/files/patch-device_serial_BUILD.gn branches/2017Q2/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc branches/2017Q2/www/chromium/files/patch-device_usb_usb__context.cc branches/2017Q2/www/chromium/files/patch-device_usb_usb__service__impl.cc branches/2017Q2/www/chromium/files/patch-device_usb_usb__service__impl.h branches/2017Q2/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc branches/2017Q2/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc branches/2017Q2/www/chromium/files/patch-gpu_config_BUILD.gn branches/2017Q2/www/chromium/files/patch-gpu_config_gpu__control__list.cc branches/2017Q2/www/chromium/files/patch-gpu_config_gpu__info__collector.cc branches/2017Q2/www/chromium/files/patch-gpu_config_gpu__test__config.cc branches/2017Q2/www/chromium/files/patch-gpu_ipc_service_BUILD.gn branches/2017Q2/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc branches/2017Q2/www/chromium/files/patch-gpu_vulkan_BUILD.gn branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h branches/2017Q2/www/chromium/files/patch-ipc_ipc__channel.h branches/2017Q2/www/chromium/files/patch-ipc_ipc__message__utils.cc branches/2017Q2/www/chromium/files/patch-ipc_ipc__message__utils.h branches/2017Q2/www/chromium/files/patch-mash_package_mash__packaged__service.cc branches/2017Q2/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc branches/2017Q2/www/chromium/files/patch-media_audio_BUILD.gn branches/2017Q2/www/chromium/files/patch-media_audio_audio__manager.cc branches/2017Q2/www/chromium/files/patch-media_base_BUILD.gn branches/2017Q2/www/chromium/files/patch-media_base_audio__latency.cc branches/2017Q2/www/chromium/files/patch-media_base_video__frame.cc branches/2017Q2/www/chromium/files/patch-media_base_video__frame.h branches/2017Q2/www/chromium/files/patch-media_capture_BUILD.gn branches/2017Q2/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc branches/2017Q2/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc branches/2017Q2/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc branches/2017Q2/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc branches/2017Q2/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc branches/2017Q2/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc branches/2017Q2/www/chromium/files/patch-media_cast_BUILD.gn branches/2017Q2/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h branches/2017Q2/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc branches/2017Q2/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc branches/2017Q2/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc branches/2017Q2/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc branches/2017Q2/www/chromium/files/patch-net_BUILD.gn branches/2017Q2/www/chromium/files/patch-net_base_mime__util__unittest.cc branches/2017Q2/www/chromium/files/patch-net_base_network__change__notifier.cc branches/2017Q2/www/chromium/files/patch-net_dns_dns__util.cc branches/2017Q2/www/chromium/files/patch-net_dns_host__resolver__proc.cc branches/2017Q2/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc branches/2017Q2/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc branches/2017Q2/www/chromium/files/patch-net_proxy_proxy__service.cc branches/2017Q2/www/chromium/files/patch-net_socket_udp__socket__posix.cc branches/2017Q2/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc branches/2017Q2/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc branches/2017Q2/www/chromium/files/patch-net_url__request_url__request__context__builder.cc branches/2017Q2/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc branches/2017Q2/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc branches/2017Q2/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc branches/2017Q2/www/chromium/files/patch-printing_BUILD.gn branches/2017Q2/www/chromium/files/patch-remoting_host_BUILD.gn branches/2017Q2/www/chromium/files/patch-remoting_host_host__details.cc branches/2017Q2/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc branches/2017Q2/www/chromium/files/patch-services_catalog_store.cc branches/2017Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc branches/2017Q2/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc branches/2017Q2/www/chromium/files/patch-services_ui_gpu_gpu__main.cc branches/2017Q2/www/chromium/files/patch-skia_BUILD.gn branches/2017Q2/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp branches/2017Q2/www/chromium/files/patch-storage_browser_quota_quota__settings.cc branches/2017Q2/www/chromium/files/patch-testing_gtest_src_gtest.cc branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp branches/2017Q2/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp branches/2017Q2/www/chromium/files/patch-third__party_angle_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c branches/2017Q2/www/chromium/files/patch-third__party_expat_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni branches/2017Q2/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h branches/2017Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h branches/2017Q2/www/chromium/files/patch-third__party_libusb_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_mesa_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_opus_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_pdfium_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp branches/2017Q2/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp branches/2017Q2/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_webrtc_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc branches/2017Q2/www/chromium/files/patch-third__party_webrtc_base_network.cc branches/2017Q2/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc branches/2017Q2/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc branches/2017Q2/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_yasm_BUILD.gn branches/2017Q2/www/chromium/files/patch-third__party_zlib_BUILD.gn branches/2017Q2/www/chromium/files/patch-tools_gn_args.cc branches/2017Q2/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py branches/2017Q2/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn branches/2017Q2/www/chromium/files/patch-ui_aura_BUILD.gn branches/2017Q2/www/chromium/files/patch-ui_base_BUILD.gn branches/2017Q2/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc branches/2017Q2/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h branches/2017Q2/www/chromium/files/patch-ui_base_ime_input__method__factory.cc branches/2017Q2/www/chromium/files/patch-ui_base_resource_resource__bundle.cc branches/2017Q2/www/chromium/files/patch-ui_base_ui__features.gni branches/2017Q2/www/chromium/files/patch-ui_compositor_BUILD.gn branches/2017Q2/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc branches/2017Q2/www/chromium/files/patch-ui_events_event__switches.cc branches/2017Q2/www/chromium/files/patch-ui_gfx_BUILD.gn branches/2017Q2/www/chromium/files/patch-ui_gfx_canvas__skia.cc branches/2017Q2/www/chromium/files/patch-ui_gfx_font__list.cc branches/2017Q2/www/chromium/files/patch-ui_gfx_font__render__params.h branches/2017Q2/www/chromium/files/patch-ui_gfx_render__text.cc branches/2017Q2/www/chromium/files/patch-ui_gl_BUILD.gn branches/2017Q2/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc branches/2017Q2/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h branches/2017Q2/www/chromium/files/patch-ui_message__center_message__center__style.h branches/2017Q2/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc branches/2017Q2/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h branches/2017Q2/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc branches/2017Q2/www/chromium/files/patch-ui_views_BUILD.gn branches/2017Q2/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc branches/2017Q2/www/chromium/files/patch-ui_views_controls_label.cc branches/2017Q2/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc branches/2017Q2/www/chromium/files/patch-ui_views_examples_widget__example.cc branches/2017Q2/www/chromium/files/patch-ui_views_mus_BUILD.gn branches/2017Q2/www/chromium/files/patch-ui_views_mus_aura__init.cc branches/2017Q2/www/chromium/files/patch-ui_views_selection__controller.cc branches/2017Q2/www/chromium/files/patch-ui_views_views__delegate.cc branches/2017Q2/www/chromium/files/patch-ui_views_views__delegate.h branches/2017Q2/www/chromium/files/patch-ui_views_views__switches.cc branches/2017Q2/www/chromium/files/patch-ui_views_window_custom__frame__view.cc branches/2017Q2/www/chromium/files/patch-ui_views_window_dialog__delegate.cc branches/2017Q2/www/chromium/files/patch-v8_BUILD.gn branches/2017Q2/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc branches/2017Q2/www/chromium/files/patch-v8_src_globals.h branches/2017Q2/www/chromium/pkg-descr branches/2017Q2/www/chromium/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/chromium/Makefile ============================================================================== --- branches/2017Q2/www/chromium/Makefile Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/Makefile Fri Jun 23 12:52:40 2017 (r444178) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 58.0.3029.110 +PORTVERSION= 59.0.3071.104 CATEGORIES= www -MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ +MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on MAINTAINER= chromium@FreeBSD.org @@ -57,16 +57,17 @@ LIB_DEPENDS= libspeechd.so:accessibility/speech-dispat RUN_DEPENDS= xdg-open:devel/xdg-utils \ droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf -ONLY_FOR_ARCHS= i386 amd64 -USES= compiler bison cpe desktop-file-utils execinfo jpeg \ +ONLY_FOR_ARCHS= amd64 i386 +USES= bison compiler cpe desktop-file-utils execinfo jpeg \ ninja perl5 pkgconfig python:2,build shebangfix tar:xz CPE_VENDOR= google CPE_PRODUCT= chrome +USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst -USE_GNOME= atk glib20 gtk20 gtk30 dconf libxslt libxml2 +USE_GNOME= atk dconf glib20 gtk20 gtk30 libxml2 libxslt MAKE_ARGS= -C out/${BUILDTYPE} SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome @@ -78,20 +79,22 @@ INSTALLS_ICONS= yes # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. -GN_ARGS+= is_clang=true \ - clang_use_chrome_plugins=false \ +GN_ARGS+= clang_use_chrome_plugins=false \ enable_media_router=true \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ enable_webrtc=false \ fieldtrial_testing_like_official_build=true \ + is_clang=true \ toolkit_views=true \ + treat_warnings_as_errors=false \ use_allocator="none" \ use_aura=true \ use_cups=true \ use_experimental_allocator_shim=false \ - treat_warnings_as_errors=false \ + use_gtk3=true \ + use_lld=true \ use_sysroot=false \ use_system_libjpeg=true \ use_system_sqlite=false # chrome has additional patches @@ -146,17 +149,13 @@ GN_ARGS+= proprietary_codecs=false GN_ARGS+= enable_hevc_demuxing=false .endif -DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} BUILDTYPE= Debug GN_ARGS+= is_debug=true GN_BOOTSTRAP_FLAGS+= --debug -#GN_ARGS+= is_component_build=true +MAKE_ENV+= V=1 .else BUILDTYPE= Release -.if ${ARCH} == amd64 -GN_ARGS+= use_lld=true # harder, better, faster, stronger -.endif GN_ARGS+= is_debug=false GN_ARGS+= symbol_level=0 GN_ARGS+= remove_webcore_debug_symbols=true @@ -244,8 +243,8 @@ test regression-test: build do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.for t in font_service test_ime_driver ui - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${t}.service \ +.for m in font_service test_ime_driver ui + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${m}.service \ ${STAGEDIR}${DATADIR} .endfor .for s in 22 24 48 64 128 256 @@ -274,6 +273,12 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ ${STAGEDIR}${DATADIR} +.if ${PORT_OPTIONS:MDEBUG} + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ + ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ + ${STAGEDIR}${DATADIR} +.endif .if ${PORT_OPTIONS:MDRIVER} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin Modified: branches/2017Q2/www/chromium/Makefile.tests ============================================================================== --- branches/2017Q2/www/chromium/Makefile.tests Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/Makefile.tests Fri Jun 23 12:52:40 2017 (r444178) @@ -4,7 +4,6 @@ TEST_TARGETS= base_unittests \ crypto_unittests \ cacheinvalidation_unittests \ gpu_unittests \ - sync_unit_tests \ printing_unittests \ sql_unittests \ content_unittests \ Modified: branches/2017Q2/www/chromium/distinfo ============================================================================== --- branches/2017Q2/www/chromium/distinfo Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/distinfo Fri Jun 23 12:52:40 2017 (r444178) @@ -1,5 +1,5 @@ -TIMESTAMP = 1494416961 -SHA256 (chromium-58.0.3029.110.tar.xz) = f24cef3dd2acf9dd5ccdeeca47fea42d1c1ddff32b7375dc9e0cd35a4e8d78ff -SIZE (chromium-58.0.3029.110.tar.xz) = 518167664 -SHA256 (chromium-58.0.3029.110-testdata.tar.xz) = 53ace1eaee38bc3bb11aef932851131d563a2deefb2fd9c9f1fa524b7098e472 -SIZE (chromium-58.0.3029.110-testdata.tar.xz) = 124161428 +TIMESTAMP = 1497583686 +SHA256 (chromium-59.0.3071.104.tar.xz) = a949fa166cdcdbd8419fbdb4583804613d9845130f0c851e4c647d79a4c300d0 +SIZE (chromium-59.0.3071.104.tar.xz) = 531895868 +SHA256 (chromium-59.0.3071.104-testdata.tar.xz) = 4826be59b1f29dcf25c9868d0cac296fb2c98a8f1f944e6a3d7cea275705b771 +SIZE (chromium-59.0.3071.104-testdata.tar.xz) = 124231072 Modified: branches/2017Q2/www/chromium/files/patch-BUILD.gn ============================================================================== --- branches/2017Q2/www/chromium/files/patch-BUILD.gn Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-BUILD.gn Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2017-04-19 19:06:27 UTC +--- BUILD.gn.orig 2017-06-05 19:03:00 UTC +++ BUILD.gn -@@ -220,7 +220,7 @@ group("both_gn_and_gyp") { +@@ -95,7 +95,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//chrome", "//chrome/test:browser_tests", -@@ -277,7 +277,7 @@ group("both_gn_and_gyp") { +@@ -153,7 +153,7 @@ group("gn_all") { ] } @@ -18,7 +18,7 @@ # TODO(GYP): Figure out which of these should actually build on iOS, # and whether there should be other targets that are iOS-only and missing. deps += [ -@@ -322,7 +322,7 @@ group("both_gn_and_gyp") { +@@ -199,7 +199,7 @@ group("gn_all") { "//ui/touch_selection:ui_touch_selection_unittests", "//url/ipc:url_ipc_unittests", ] @@ -27,7 +27,7 @@ deps += [ "//ios:all" ] } -@@ -482,7 +482,7 @@ group("both_gn_and_gyp") { +@@ -359,7 +359,7 @@ group("gn_all") { ] } @@ -36,7 +36,7 @@ # The following are definitely linux-only. deps += [ "//chrome:manpage", -@@ -505,9 +505,16 @@ group("both_gn_and_gyp") { +@@ -382,9 +382,16 @@ group("gn_all") { # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } @@ -54,7 +54,7 @@ deps += [ "//base:base_i18n_perftests", "//base:base_perftests", -@@ -578,7 +585,7 @@ group("both_gn_and_gyp") { +@@ -455,7 +462,7 @@ group("gn_all") { if (enable_nacl) { deps += [ "//components/nacl/loader:nacl_loader_unittests" ] @@ -63,7 +63,7 @@ # TODO(dpranke): Figure out what platforms should actually have this. deps += [ "//components/nacl/loader:nacl_helper" ] -@@ -684,7 +691,7 @@ group("both_gn_and_gyp") { +@@ -557,7 +564,7 @@ group("gn_all") { deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } @@ -72,7 +72,7 @@ deps += [ "//breakpad:symupload($host_toolchain)" ] } -@@ -728,7 +735,7 @@ group("gn_only") { +@@ -595,7 +602,7 @@ group("gn_all") { deps += [ "//components/proximity_auth:proximity_auth_unittests" ] } @@ -81,7 +81,7 @@ deps += [ "//mash:all", "//media/mojo/services:media_service_unittests", -@@ -754,7 +761,7 @@ group("gn_only") { +@@ -620,7 +627,7 @@ group("gn_all") { } } @@ -90,7 +90,7 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps += [ -@@ -794,7 +801,7 @@ group("gn_only") { +@@ -659,7 +666,7 @@ group("gn_all") { } if (target_cpu == "x86" || target_cpu == "x64") { @@ -99,7 +99,7 @@ deps += [ "//chrome/test:load_library_perf_tests" ] } deps += [ -@@ -802,7 +809,7 @@ group("gn_only") { +@@ -667,7 +674,7 @@ group("gn_all") { "//third_party/libjpeg_turbo:simd_asm", ] } @@ -108,7 +108,7 @@ deps += [ "//v8:v8_shell" ] } } -@@ -812,7 +819,7 @@ group("gn_only") { +@@ -677,7 +684,7 @@ group("gn_all") { } if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || @@ -117,7 +117,7 @@ deps += [ "//testing/libfuzzer/fuzzers", "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -844,7 +851,7 @@ group("gn_only") { +@@ -828,7 +835,7 @@ if (is_chromeos) { group("gn_mojo_targets") { testonly = true @@ -126,7 +126,7 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps = [ -@@ -870,7 +877,7 @@ group("gn_visibility") { +@@ -854,7 +861,7 @@ group("gn_visibility") { } } @@ -135,7 +135,7 @@ # This group includes all of the targets needed to build and test Blink, # including running the layout tests (see below). group("blink_tests") { -@@ -935,7 +942,7 @@ if (!is_ios) { +@@ -921,7 +928,7 @@ if (!is_ios) { data_deps += [ "//content/shell:content_shell_crash_service" ] } @@ -144,7 +144,7 @@ data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -943,7 +950,7 @@ if (!is_ios) { +@@ -929,7 +936,7 @@ if (!is_ios) { data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } Modified: branches/2017Q2/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2017-04-19 19:06:27 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2017-06-05 19:03:00 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsF +@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds( const gfx::Rect& client_bounds) const { gfx::Rect window_bounds = client_bounds; Modified: branches/2017Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2017-04-19 19:06:27 UTC +--- ash/display/mirror_window_controller.cc.orig 2017-06-05 19:03:00 UTC +++ ash/display/mirror_window_controller.cc -@@ -251,7 +251,11 @@ void MirrorWindowController::UpdateWindo +@@ -249,7 +249,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); Modified: branches/2017Q2/www/chromium/files/patch-base_BUILD.gn ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_BUILD.gn Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_BUILD.gn Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,15 @@ ---- base/BUILD.gn.orig 2017-04-19 19:06:28 UTC -+++ base/BUILD.gn -@@ -1156,6 +1156,9 @@ component("base") { +--- base/BUILD.gn.orig 2017-06-05 21:03:00.000000000 +0200 ++++ base/BUILD.gn 2017-06-13 19:23:34.211227000 +0200 +@@ -1098,7 +1098,7 @@ + "base_paths_win.h", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ "base_paths_posix.cc" ] + } + } +@@ -1157,6 +1157,9 @@ deps += [ "//base/allocator:tcmalloc" ] } else if (is_linux && use_allocator == "none") { sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] @@ -10,7 +19,7 @@ } else if (is_android && use_allocator == "none") { sources += [ "allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc", -@@ -1171,6 +1174,34 @@ component("base") { +@@ -1172,6 +1175,33 @@ } } @@ -28,7 +37,6 @@ + ] + sources += [ + "files/file_path_watcher_stub.cc", -+ "process/memory_stubs.cc", + "process/process_handle_freebsd.cc", + "process/process_iterator_freebsd.cc", + "process/process_metrics_freebsd.cc", @@ -45,7 +53,7 @@ # Allow more direct string conversions on platforms with native utf8 # strings if (is_mac || is_ios || is_chromeos || is_chromecast) { -@@ -1467,7 +1498,7 @@ component("base") { +@@ -1469,7 +1499,7 @@ } # Linux. @@ -54,7 +62,7 @@ if (is_asan || is_lsan || is_msan || is_tsan) { # For llvm-sanitizer. data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] -@@ -1492,7 +1523,7 @@ component("base") { +@@ -1494,7 +1524,7 @@ "//base/third_party/xdg_user_dirs", ] } else { @@ -63,30 +71,16 @@ sources -= [ "nix/mime_util_xdg.cc", "nix/mime_util_xdg.h", -@@ -1508,6 +1539,13 @@ component("base") { - } - } - -+ if (is_bsd) { -+ sources -= [ -+ "threading/platform_thread_linux.cc", -+ ] -+ sources += [ "threading/platform_thread_freebsd.cc" ] +@@ -2325,6 +2355,12 @@ + "trace_event/trace_event_android_unittest.cc", + ] + set_sources_assignment_filter(sources_assignment_filter) + } + - # iOS - if (is_ios) { - set_sources_assignment_filter([]) -@@ -2309,6 +2347,12 @@ test("base_unittests") { - set_sources_assignment_filter(sources_assignment_filter) - } - + if (is_bsd) { + sources -= [ + "debug/proc_maps_linux_unittest.cc", + ] -+ } -+ + } + if (is_win) { - deps += [ "//base:scoped_handle_test_dll" ] - if (current_cpu == "x64") { Modified: branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/allocator/allocator_shim.cc.orig 2017-04-19 19:06:28 UTC +--- base/allocator/allocator_shim.cc.orig 2017-06-05 19:03:00 UTC +++ base/allocator/allocator_shim.cc -@@ -81,7 +81,7 @@ inline const allocator::AllocatorDispatc +@@ -83,7 +83,7 @@ inline const allocator::AllocatorDispatch* GetChainHea // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully // barriered on Linux+Clang, and that causes visible perf regressons. return reinterpret_cast( Modified: branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,15 +1,15 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-04-19 19:06:28 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-06-05 19:03:00 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc @@ -3,19 +3,28 @@ // found in the LICENSE file. #include "base/allocator/allocator_shim.h" -- --#include +#include +#include +#include +-#include +- // This translation unit defines a default dispatch for the allocator shim which // routes allocations to libc functions. -// The code here is strongly inspired from tcmalloc's libc_override_glibc.h. Modified: branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2017-04-19 19:06:28 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2017-06-05 19:03:00 UTC +++ base/allocator/allocator_shim_unittest.cc -@@ -289,7 +289,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -293,7 +293,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); #endif // !OS_WIN @@ -9,7 +9,7 @@ void* memalign_ptr = memalign(128, 53); ASSERT_NE(nullptr, memalign_ptr); ASSERT_EQ(0u, reinterpret_cast(memalign_ptr) % 128); -@@ -302,7 +302,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -306,7 +306,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); // pvalloc rounds the size up to the next page. ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); @@ -18,7 +18,7 @@ char* realloc_ptr = static_cast(malloc(10)); strcpy(realloc_ptr, "foobar"); -@@ -318,13 +318,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -322,13 +322,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { free(zero_alloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); Copied: branches/2017Q2/www/chromium/files/patch-base_debug_debugger__posix.cc (from r443998, head/www/chromium/files/patch-base_debug_debugger__posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/www/chromium/files/patch-base_debug_debugger__posix.cc Fri Jun 23 12:52:40 2017 (r444178, copy of r443998, head/www/chromium/files/patch-base_debug_debugger__posix.cc) @@ -0,0 +1,57 @@ +--- base/debug/debugger_posix.cc.orig 2017-06-18 01:23:49.065175000 +0200 ++++ base/debug/debugger_posix.cc 2017-06-18 01:58:29.603481000 +0200 +@@ -84,7 +84,7 @@ + KERN_PROC, + KERN_PROC_PID, + getpid() +-#if defined(OS_OPENBSD) ++#if defined(OS_BSD) + , sizeof(struct kinfo_proc), + 0 + #endif +@@ -92,33 +92,36 @@ + + // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and + // binary interfaces may change. +- struct kinfo_proc info; +- size_t info_size = sizeof(info); ++ struct kinfo_proc *info; ++ size_t info_size; + +-#if defined(OS_OPENBSD) + if (sysctl(mib, arraysize(mib), NULL, &info_size, NULL, 0) < 0) + return -1; + ++ info = (struct kinfo_proc *)malloc(info_size); ++ + mib[5] = (info_size / sizeof(struct kinfo_proc)); +-#endif + +- int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0); ++ int sysctl_result = sysctl(mib, arraysize(mib), info, &info_size, NULL, 0); + DCHECK_EQ(sysctl_result, 0); + if (sysctl_result != 0) { + is_set = true; + being_debugged = false; +- return being_debugged; ++ goto out; + } + + // This process is being debugged if the P_TRACED flag is set. + is_set = true; + #if defined(OS_FREEBSD) +- being_debugged = (info.ki_flag & P_TRACED) != 0; ++ being_debugged = (info->ki_flag & P_TRACED) != 0; + #elif defined(OS_BSD) +- being_debugged = (info.p_flag & P_TRACED) != 0; ++ being_debugged = (info->p_flag & P_TRACED) != 0; + #else +- being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; ++ being_debugged = (info->kp_proc.p_flag & P_TRACED) != 0; + #endif ++ ++out: ++ free(info); + return being_debugged; + } + Modified: branches/2017Q2/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/debug/thread_heap_usage_tracker.cc.orig 2017-04-19 19:06:28 UTC +--- base/debug/thread_heap_usage_tracker.cc.orig 2017-06-05 19:03:00 UTC +++ base/debug/thread_heap_usage_tracker.cc -@@ -16,11 +16,13 @@ +@@ -16,10 +16,12 @@ #include "base/threading/thread_local_storage.h" #include "build/build_config.h" @@ -9,8 +9,7 @@ #include #else #include - #endif +#endif + #endif namespace base { - namespace debug { Modified: branches/2017Q2/www/chromium/files/patch-base_files_file__path__unittest.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_files_file__path__unittest.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_files_file__path__unittest.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/files/file_path_unittest.cc.orig 2017-04-19 19:06:28 UTC +--- base/files/file_path_unittest.cc.orig 2017-06-05 19:03:00 UTC +++ base/files/file_path_unittest.cc -@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_ +@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; Modified: branches/2017Q2/www/chromium/files/patch-base_files_file__util.h ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_files_file__util.h Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_files_file__util.h Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2017-04-19 19:06:28 UTC +--- base/files/file_util.h.orig 2017-06-05 19:03:00 UTC +++ base/files/file_util.h -@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByA +@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); Modified: branches/2017Q2/www/chromium/files/patch-base_native__library__posix.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_native__library__posix.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_native__library__posix.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/native_library_posix.cc.orig 2017-04-19 19:06:28 UTC +--- base/native_library_posix.cc.orig 2017-06-05 19:03:00 UTC +++ base/native_library_posix.cc -@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptio +@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // further investigation, as it might vary across versions. Crash here to // warn developers that they're trying to rely on uncertain behavior. CHECK(!options.prefer_own_symbols); Modified: branches/2017Q2/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2017-04-19 19:06:28 UTC +--- base/posix/unix_domain_socket_linux.cc.orig 2017-06-05 19:03:00 UTC +++ base/posix/unix_domain_socket_linux.cc @@ -23,6 +23,15 @@ @@ -16,7 +16,7 @@ const size_t UnixDomainSocket::kMaxFileDescriptors = 16; #if !defined(OS_NACL_NONSFI) -@@ -40,8 +49,14 @@ static bool CreateSocketPair(ScopedFD* o +@@ -37,8 +46,14 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { @@ -31,7 +31,7 @@ } #endif // !defined(OS_NACL_NONSFI) -@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFla +@@ -144,7 +159,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, // The PNaCl toolchain for Non-SFI binary build does not support // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && Modified: branches/2017Q2/www/chromium/files/patch-base_process_launch.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_process_launch.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_process_launch.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/process/launch.cc.orig 2017-04-19 19:06:28 UTC +--- base/process/launch.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/launch.cc -@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul +@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default; LaunchOptions LaunchOptionsForTest() { LaunchOptions options; Modified: branches/2017Q2/www/chromium/files/patch-base_process_memory.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_process_memory.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_process_memory.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/process/memory.cc.orig 2017-04-19 19:06:28 UTC +--- base/process/memory.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/memory.cc -@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t +@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) { #endif // Defined in memory_mac.mm for Mac. Modified: branches/2017Q2/www/chromium/files/patch-base_process_memory.h ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_process_memory.h Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_process_memory.h Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/process/memory.h.orig 2017-04-19 19:06:28 UTC +--- base/process/memory.h.orig 2017-06-05 19:03:00 UTC +++ base/process/memory.h -@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutO +@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); // Crash reporting classifies such crashes as OOM. BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); Modified: branches/2017Q2/www/chromium/files/patch-base_process_memory__unittest.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_process_memory__unittest.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_process_memory__unittest.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,7 +1,7 @@ ---- base/process/memory_unittest.cc.orig 2017-04-19 19:06:28 UTC +--- base/process/memory_unittest.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/memory_unittest.cc -@@ -93,10 +93,10 @@ TEST(MemoryTest, AllocatorShimWorking) { - ASSERT_TRUE(base::allocator::IsAllocatorInitialized()); +@@ -101,10 +101,10 @@ TEST(MemoryTest, AllocatorShimWorking) { + #endif } -// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan @@ -13,7 +13,7 @@ BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -@@ -488,5 +488,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked +@@ -508,5 +508,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); EXPECT_TRUE(value_ == NULL); } Modified: branches/2017Q2/www/chromium/files/patch-base_process_process__info__linux.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_process_process__info__linux.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_process_process__info__linux.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,4 +1,4 @@ ---- base/process/process_info_linux.cc.orig 2017-04-19 19:06:28 UTC +--- base/process/process_info_linux.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/process_info_linux.cc @@ -11,10 +11,28 @@ #include "base/process/process_handle.h" @@ -28,10 +28,10 @@ +#else int64_t start_ticks = internal::ReadProcSelfStatsAndGetFieldAsInt64(internal::VM_STARTTIME); - DCHECK(start_ticks); -@@ -22,6 +40,7 @@ const Time CurrentProcessInfo::CreationT - Time boot_time = internal::GetBootTime(); - DCHECK(!boot_time.is_null()); + if (!start_ticks) +@@ -24,6 +42,7 @@ const Time CurrentProcessInfo::CreationTime() { + if (boot_time.is_null()) + return Time(); return Time(boot_time + start_offset); +#endif } Modified: branches/2017Q2/www/chromium/files/patch-base_process_process__iterator__freebsd.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_process_process__iterator__freebsd.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_process_process__iterator__freebsd.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,4 +1,4 @@ ---- base/process/process_iterator_freebsd.cc.orig 2017-04-19 19:06:28 UTC +--- base/process/process_iterator_freebsd.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/process_iterator_freebsd.cc @@ -10,6 +10,10 @@ #include @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/macros.h" #include "base/strings/string_split.h" -@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProces +@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; Modified: branches/2017Q2/www/chromium/files/patch-base_process_process__metrics.h ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_process_process__metrics.h Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_process_process__metrics.h Fri Jun 23 12:52:40 2017 (r444178) @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2017-04-19 19:06:28 UTC +--- base/process/process_metrics.h.orig 2017-06-05 19:03:00 UTC +++ base/process/process_metrics.h @@ -22,6 +22,12 @@ #include "base/values.h" @@ -13,7 +13,34 @@ #if defined(OS_MACOSX) #include #include "base/process/port_provider_mac.h" -@@ -329,13 +335,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys +@@ -205,7 +211,7 @@ class BASE_EXPORT ProcessMetrics { + // otherwise. + bool GetIOCounters(IoCounters* io_counters) const; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Returns the number of file descriptors currently open by the process, or + // -1 on error. + int GetOpenFdCount() const; +@@ -213,7 +219,7 @@ class BASE_EXPORT ProcessMetrics { + // Returns the soft limit of file descriptors that can be opened by the + // process, or -1 on error. + int GetOpenFdSoftLimit() const; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + private: + #if !defined(OS_MACOSX) || defined(OS_IOS) +@@ -289,7 +295,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto + #endif // defined(OS_POSIX) + + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +- defined(OS_ANDROID) ++ defined(OS_ANDROID) || defined(OS_BSD) + // Data about system-wide memory consumption. Values are in KB. Available on + // Windows, Mac, Linux, Android and Chrome OS. + // +@@ -383,13 +389,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); Modified: branches/2017Q2/www/chromium/files/patch-base_process_process__metrics__freebsd.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2017-04-19 19:06:28 UTC +--- base/process/process_metrics_freebsd.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/process_metrics_freebsd.cc @@ -13,6 +13,9 @@ #include "base/memory/ptr_util.h" @@ -10,10 +10,12 @@ namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) -@@ -122,4 +125,23 @@ size_t GetSystemCommitCharge() { - return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); - } +@@ -120,6 +123,25 @@ size_t GetSystemCommitCharge() { + pagesize = getpagesize(); + return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); ++} ++ +int GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) + @@ -31,6 +33,6 @@ + return 0; + + return nproc; -+} -+ + } + } // namespace base Modified: branches/2017Q2/www/chromium/files/patch-base_process_process__posix.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_process_process__posix.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_process_process__posix.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,5 +1,5 @@ ---- base/process/process_posix.cc.orig 2017-04-19 19:06:28 UTC -+++ base/process/process_posix.cc +--- base/process/process_posix.cc.orig 2017-06-15 21:03:00.000000000 +0200 ++++ base/process/process_posix.cc 2017-06-19 15:25:27.760111000 +0200 @@ -21,8 +21,18 @@ #include #endif @@ -19,7 +19,7 @@ #if !defined(OS_NACL_NONSFI) bool WaitpidWithTimeout(base::ProcessHandle handle, -@@ -184,13 +194,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr +@@ -184,13 +194,13 @@ base::ProcessHandle parent_pid = base::GetParentProcessId(handle); base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); if (parent_pid != our_pid) { @@ -36,7 +36,7 @@ } int status; -@@ -257,12 +267,16 @@ Process Process::DeprecatedGetProcessFro +@@ -256,12 +266,16 @@ return Process(handle); } @@ -55,7 +55,7 @@ // static void Process::TerminateCurrentProcessImmediately(int exit_code) { -@@ -370,15 +384,32 @@ bool Process::WaitForExitWithTimeout(Tim +@@ -369,15 +383,31 @@ bool Process::IsProcessBackgrounded() const { // See SetProcessBackgrounded(). DCHECK(IsValid()); @@ -82,7 +82,6 @@ + int priority = value ? kBackgroundPriority : kForegroundPriority; + int result = setpriority(PRIO_PROCESS, process_, priority); + -+ DPCHECK(result == 0); + return result == 0; +#endif // !defined(OS_FREEBSD) } Modified: branches/2017Q2/www/chromium/files/patch-base_sys__info__freebsd.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_sys__info__freebsd.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_sys__info__freebsd.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,4 +1,4 @@ ---- base/sys_info_freebsd.cc.orig 2017-04-19 19:06:28 UTC +--- base/sys_info_freebsd.cc.orig 2017-06-05 19:03:00 UTC +++ base/sys_info_freebsd.cc @@ -12,12 +12,34 @@ @@ -39,7 +39,7 @@ NOTREACHED(); return 0; } -@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory( +@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory() { } // static Modified: branches/2017Q2/www/chromium/files/patch-base_sys__info__posix.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_sys__info__posix.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_sys__info__posix.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,4 +1,4 @@ ---- base/sys_info_posix.cc.orig 2017-04-19 19:06:28 UTC +--- base/sys_info_posix.cc.orig 2017-06-05 19:03:00 UTC +++ base/sys_info_posix.cc @@ -35,7 +35,7 @@ @@ -9,7 +9,7 @@ int NumberOfProcessors() { // sysconf returns the number of "logical" (not "physical") processors on both // Mac and Linux. So we get the number of max available "logical" processors. -@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePa +@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { Modified: branches/2017Q2/www/chromium/files/patch-base_test_BUILD.gn ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_test_BUILD.gn Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_test_BUILD.gn Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/test/BUILD.gn.orig 2017-04-19 19:06:28 UTC +--- base/test/BUILD.gn.orig 2017-06-05 19:03:00 UTC +++ base/test/BUILD.gn -@@ -312,7 +312,7 @@ static_library("run_all_base_unittests") +@@ -314,7 +314,7 @@ static_library("run_all_base_unittests") { ] } Modified: branches/2017Q2/www/chromium/files/patch-base_test_launcher_test__launcher.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_test_launcher_test__launcher.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_test_launcher_test__launcher.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2017-04-19 19:06:28 UTC +--- base/test/launcher/test_launcher.cc.orig 2017-06-05 19:03:00 UTC +++ base/test/launcher/test_launcher.cc -@@ -60,6 +60,10 @@ +@@ -61,6 +61,10 @@ #include "base/win/windows_version.h" #endif Modified: branches/2017Q2/www/chromium/files/patch-base_test_test__file__util__posix.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_test_test__file__util__posix.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_test_test__file__util__posix.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/test/test_file_util_posix.cc.orig 2017-04-19 19:06:28 UTC +--- base/test/test_file_util_posix.cc.orig 2017-06-05 19:03:00 UTC +++ base/test/test_file_util_posix.cc -@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bo +@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bool recurse) { return DeleteFile(file, recurse); } Modified: branches/2017Q2/www/chromium/files/patch-base_threading_platform__thread__linux.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_threading_platform__thread__linux.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_threading_platform__thread__linux.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2017-04-19 19:06:28 UTC +--- base/threading/platform_thread_linux.cc.orig 2017-06-05 19:03:01 UTC +++ base/threading/platform_thread_linux.cc @@ -19,7 +19,9 @@ @@ -10,7 +10,7 @@ #include #include #include -@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std:: +@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::string& name) ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); @@ -19,7 +19,7 @@ // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -@@ -150,7 +152,7 @@ void PlatformThread::SetName(const std:: +@@ -150,7 +152,7 @@ void PlatformThread::SetName(const std::string& name) #endif // !defined(OS_NACL) } Modified: branches/2017Q2/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,4 +1,4 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2017-04-19 19:06:28 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2017-06-05 19:03:01 UTC +++ base/threading/thread_task_runner_handle.cc @@ -7,6 +7,7 @@ #include @@ -16,7 +16,7 @@ // static ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting( scoped_refptr overriding_task_runner) { -@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHand +@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo base::Passed(&overriding_task_runner), base::Unretained(ttrh->task_runner_.get()))); } Modified: branches/2017Q2/www/chromium/files/patch-base_trace__event_process__memory__dump.cc ============================================================================== --- branches/2017Q2/www/chromium/files/patch-base_trace__event_process__memory__dump.cc Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-base_trace__event_process__memory__dump.cc Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2017-04-19 19:06:28 UTC +--- base/trace_event/process_memory_dump.cc.orig 2017-06-05 19:03:01 UTC +++ base/trace_event/process_memory_dump.cc -@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentB +@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta const size_t kMaxChunkSize = 8 * 1024 * 1024; size_t max_vec_size = GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size); Copied: branches/2017Q2/www/chromium/files/patch-base_trace__event_trace__log.cc (from r443998, head/www/chromium/files/patch-base_trace__event_trace__log.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/www/chromium/files/patch-base_trace__event_trace__log.cc Fri Jun 23 12:52:40 2017 (r444178, copy of r443998, head/www/chromium/files/patch-base_trace__event_trace__log.cc) @@ -0,0 +1,20 @@ +--- base/trace_event/trace_log.cc.orig 2017-06-05 19:03:01 UTC ++++ base/trace_event/trace_log.cc +@@ -1504,7 +1504,7 @@ void TraceLog::AddMetadataEventsWhileLocked() { + process_name_); + } + +-#if !defined(OS_NACL) && !defined(OS_IOS) ++#if !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_BSD) + Time process_creation_time = CurrentProcessInfo::CreationTime(); + if (!process_creation_time.is_null()) { + TimeDelta process_uptime = Time::Now() - process_creation_time; +@@ -1512,7 +1512,7 @@ void TraceLog::AddMetadataEventsWhileLocked() { + current_thread_id, "process_uptime_seconds", + "uptime", process_uptime.InSeconds()); + } +-#endif // !defined(OS_NACL) && !defined(OS_IOS) ++#endif // !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_BSD) + + if (!process_labels_.empty()) { + std::vector labels; Modified: branches/2017Q2/www/chromium/files/patch-breakpad_BUILD.gn ============================================================================== --- branches/2017Q2/www/chromium/files/patch-breakpad_BUILD.gn Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-breakpad_BUILD.gn Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- breakpad/BUILD.gn.orig 2017-04-19 19:06:28 UTC +--- breakpad/BUILD.gn.orig 2017-06-05 19:03:01 UTC +++ breakpad/BUILD.gn -@@ -468,7 +468,7 @@ if (is_mac) { +@@ -472,7 +472,7 @@ if (is_mac) { } } Copied: branches/2017Q2/www/chromium/files/patch-build__overrides_pdfium.gni (from r443998, head/www/chromium/files/patch-build__overrides_pdfium.gni) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/www/chromium/files/patch-build__overrides_pdfium.gni Fri Jun 23 12:52:40 2017 (r444178, copy of r443998, head/www/chromium/files/patch-build__overrides_pdfium.gni) @@ -0,0 +1,11 @@ +--- build_overrides/pdfium.gni.orig 2017-06-05 19:03:01 UTC ++++ build_overrides/pdfium.gni +@@ -10,7 +10,7 @@ pdf_enable_xfa_override = false + + # Build PDFium either using the bundled FreeType, or using a third-party + # FreeType, configured by the embedder in //build/config/freetype. +-pdf_bundle_freetype_override = !is_linux && !is_win ++pdf_bundle_freetype_override = false + + # Disable use of Skia backend. + pdf_use_skia_override = false Modified: branches/2017Q2/www/chromium/files/patch-build_config_BUILD.gn ============================================================================== --- branches/2017Q2/www/chromium/files/patch-build_config_BUILD.gn Fri Jun 23 12:29:48 2017 (r444177) +++ branches/2017Q2/www/chromium/files/patch-build_config_BUILD.gn Fri Jun 23 12:52:40 2017 (r444178) @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2017-04-19 19:06:28 UTC +--- build/config/BUILD.gn.orig 2017-06-05 19:03:01 UTC +++ build/config/BUILD.gn -@@ -193,7 +193,7 @@ config("debug") { +@@ -169,7 +169,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,7 +9,7 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -276,7 +276,7 @@ config("default_libs") { +@@ -258,7 +258,7 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] @@ -18,7 +18,7 @@ libs = [ "dl", "rt", -@@ -307,7 +307,7 @@ config("executable_config") { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Fri Jun 23 16:37:43 2017 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 379D3DA7D85; Fri, 23 Jun 2017 16:37:43 +0000 (UTC) (envelope-from jpaetzel@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 1389166BE0; Fri, 23 Jun 2017 16:37:43 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5NGbgej014913; Fri, 23 Jun 2017 16:37:42 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5NGbgXG014911; Fri, 23 Jun 2017 16:37:42 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <201706231637.v5NGbgXG014911@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Fri, 23 Jun 2017 16:37:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444182 - branches/2017Q2/security/openvpn-devel 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 Jun 2017 16:37:43 -0000 Author: jpaetzel Date: Fri Jun 23 16:37:41 2017 New Revision: 444182 URL: https://svnweb.freebsd.org/changeset/ports/444182 Log: MFH: r440983 Update to new snapshot. Note I didn't take the original patch because it needed to NOT conflict with itself, and I had to fix indentation - be sure to use TAB, not blanks, after the VARIABLE= part. PR: 219305 Submitted by: ecrist@secure-computing.net (maintainer) Approved by: ports-secteam (delphij) Modified: branches/2017Q2/security/openvpn-devel/Makefile branches/2017Q2/security/openvpn-devel/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/openvpn-devel/Makefile ============================================================================== --- branches/2017Q2/security/openvpn-devel/Makefile Fri Jun 23 15:36:51 2017 (r444181) +++ branches/2017Q2/security/openvpn-devel/Makefile Fri Jun 23 16:37:41 2017 (r444182) @@ -1,12 +1,12 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTNAME= openvpn -DISTVERSION= 201652 +PORTNAME= openvpn +DISTVERSION= 201719 PORTREVISION?= 0 -CATEGORIES= security net +CATEGORIES= security net MASTER_SITES= https://secure-computing.net/files/openvpn/ \ - ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/ + ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/ PKGNAMESUFFIX= -devel MAINTAINER= ecrist@secure-computing.net @@ -17,11 +17,11 @@ LICENSE= GPLv2 CONFLICTS_INSTALL= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX} -USES= cpe libtool pkgconfig shebangfix tar:xz +WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX} +USES= cpe libtool pkgconfig shebangfix tar:xz SHEBANG_FILES= sample/sample-scripts/verify-cn \ - sample/sample-scripts/auth-pam.pl \ - sample/sample-scripts/ucn.pl + sample/sample-scripts/auth-pam.pl \ + sample/sample-scripts/ucn.pl CONFIGURE_ARGS+= --enable-strict # avoid picking up CMAKE, we don't have cmocka in the tarballs.. CONFIGURE_ENV+= ac_cv_prog_CMAKE= CMAKE= @@ -35,13 +35,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -DPLUGIN_LIBDIR=\\\"${PREFIX}/lib/openvpn/plugins\\\" OPTIONS_DEFINE= PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \ - TEST LZ4 SMALL + TEST LZ4 SMALL TUNNELBLICK OPTIONS_DEFAULT= EASYRSA OPENSSL TEST LZ4 OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL MBEDTLS PKCS11_DESC= Use security/pkcs11-helper EASYRSA_DESC= Install security/easy-rsa RSA helper package MBEDTLS_DESC= SSL/TLS via mbedTLS +TUNNELBLICK_DESC= Tunnelblick XOR scramble patch (READ HELP!) X509ALTUSERNAME_DESC= Enable --x509-username-field (OpenSSL only) SMALL_DESC= Build a smaller executable with fewer features @@ -49,6 +50,10 @@ EASYRSA_RUN_DEPENDS= easy-rsa>=0:security/easy-rsa PKCS11_LIB_DEPENDS= libpkcs11-helper.so:security/pkcs11-helper PKCS11_CONFIGURE_ENABLE= pkcs11 +PKCS11_PREVENTS= MBEDTLS +PKCS11_PREVENTS_MSG= OpenVPN cannot use pkcs11-helper with mbedTLS. Disable PKCS11, or use OpenSSL instead + +TUNNELBLICK_EXTRA_PATCHES= ${FILESDIR}/extra-tunnelblick-openvpn_xorpatch X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username Modified: branches/2017Q2/security/openvpn-devel/distinfo ============================================================================== --- branches/2017Q2/security/openvpn-devel/distinfo Fri Jun 23 15:36:51 2017 (r444181) +++ branches/2017Q2/security/openvpn-devel/distinfo Fri Jun 23 16:37:41 2017 (r444182) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483453128 -SHA256 (openvpn-201652.tar.xz) = 783c3d5200bd286cc83e5accec075ef7f896a401b9bf550801606d1b76a1d797 -SIZE (openvpn-201652.tar.xz) = 928316 +TIMESTAMP = 1494853427 +SHA256 (openvpn-201719.tar.xz) = 26724017c6a79f4936f473c8c03760037045cdea3b3f312f32dc0daeaa6ede93 +SIZE (openvpn-201719.tar.xz) = 935492 From owner-svn-ports-branches@freebsd.org Fri Jun 23 16:38:51 2017 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 46402DA7E45; Fri, 23 Jun 2017 16:38:51 +0000 (UTC) (envelope-from jpaetzel@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 13D8D66E14; Fri, 23 Jun 2017 16:38:51 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5NGcolk015234; Fri, 23 Jun 2017 16:38:50 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5NGcnoR015232; Fri, 23 Jun 2017 16:38:49 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <201706231638.v5NGcnoR015232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Fri, 23 Jun 2017 16:38:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444183 - branches/2017Q2/security/openvpn-devel 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 Jun 2017 16:38:51 -0000 Author: jpaetzel Date: Fri Jun 23 16:38:49 2017 New Revision: 444183 URL: https://svnweb.freebsd.org/changeset/ports/444183 Log: MFH: r444072 Update to latest version PR: 220183 Submitted by: ecrist@secure-computing.net Approved by: ports-secteam (delphij) Modified: branches/2017Q2/security/openvpn-devel/Makefile branches/2017Q2/security/openvpn-devel/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/openvpn-devel/Makefile ============================================================================== --- branches/2017Q2/security/openvpn-devel/Makefile Fri Jun 23 16:37:41 2017 (r444182) +++ branches/2017Q2/security/openvpn-devel/Makefile Fri Jun 23 16:38:49 2017 (r444183) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 201719 +DISTVERSION= 201725 PORTREVISION?= 0 CATEGORIES= security net MASTER_SITES= https://secure-computing.net/files/openvpn/ \ @@ -14,7 +14,7 @@ COMMENT?= Secure IP/Ethernet tunnel daemon LICENSE= GPLv2 -CONFLICTS_INSTALL= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* +CONFLICTS_INSTALL= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX} Modified: branches/2017Q2/security/openvpn-devel/distinfo ============================================================================== --- branches/2017Q2/security/openvpn-devel/distinfo Fri Jun 23 16:37:41 2017 (r444182) +++ branches/2017Q2/security/openvpn-devel/distinfo Fri Jun 23 16:38:49 2017 (r444183) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494853427 -SHA256 (openvpn-201719.tar.xz) = 26724017c6a79f4936f473c8c03760037045cdea3b3f312f32dc0daeaa6ede93 -SIZE (openvpn-201719.tar.xz) = 935492 +TIMESTAMP = 1498051791 +SHA256 (openvpn-201725.tar.xz) = 88a14036f933b52c5094923e3673748ed2e58836a1a6744c0c224523b688ce21 +SIZE (openvpn-201725.tar.xz) = 943804