From owner-svn-ports-branches@freebsd.org Sun Feb 18 07:52:00 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4E04F1CA47; Sun, 18 Feb 2018 07:52:00 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 544EB69A70; Sun, 18 Feb 2018 07:52:00 +0000 (UTC) (envelope-from antoine@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ED85D0D; Sun, 18 Feb 2018 07:52:00 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1I7q0Ci084410; Sun, 18 Feb 2018 07:52:00 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1I7q0bA084408; Sun, 18 Feb 2018 07:52:00 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201802180752.w1I7q0bA084408@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 18 Feb 2018 07:52:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462203 - in branches/2018Q1/net-p2p/bitmessage: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q1/net-p2p/bitmessage: . files X-SVN-Commit-Revision: 462203 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 07:52:00 -0000 Author: antoine Date: Sun Feb 18 07:51:59 2018 New Revision: 462203 URL: https://svnweb.freebsd.org/changeset/ports/462203 Log: Revert r462163, it depends on some ports that do not exist in 2018Q1 With hat: portmgr Added: branches/2018Q1/net-p2p/bitmessage/files/ - copied from r462162, branches/2018Q1/net-p2p/bitmessage/files/ Modified: branches/2018Q1/net-p2p/bitmessage/Makefile branches/2018Q1/net-p2p/bitmessage/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net-p2p/bitmessage/Makefile ============================================================================== --- branches/2018Q1/net-p2p/bitmessage/Makefile Sun Feb 18 04:41:15 2018 (r462202) +++ branches/2018Q1/net-p2p/bitmessage/Makefile Sun Feb 18 07:51:59 2018 (r462203) @@ -2,31 +2,31 @@ # $FreeBSD$ PORTNAME= bitmessage -DISTVERSION= 0.6.3.2 +PORTVERSION= 0.6.2 +DISTVERSIONPREFIX= v CATEGORIES= net-p2p -MAINTAINER= yuri@FreeBSD.org +MAINTAINER= yuri@rawbw.com COMMENT= Secure P2P communications client LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:net/py-qt4-network@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}notify2>0:devel/py-notify2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:net/py-qt4-network@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl@${FLAVOR} -USES= gmake python:2.7 pyqt:4 ssl USE_GITHUB= yes GH_ACCOUNT= Bitmessage GH_PROJECT= PyBitmessage + +USES= gmake python:2.7 pyqt:4 ssl USE_PYQT= core_run gui_run network_run -USE_PYTHON= distutils autoplist noflavors +USE_PYTHON= distutils autoplist +INSTALLS_ICONS= yes REINPLACE_ARGS= -i '' post-patch: Modified: branches/2018Q1/net-p2p/bitmessage/distinfo ============================================================================== --- branches/2018Q1/net-p2p/bitmessage/distinfo Sun Feb 18 04:41:15 2018 (r462202) +++ branches/2018Q1/net-p2p/bitmessage/distinfo Sun Feb 18 07:51:59 2018 (r462203) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518629386 -SHA256 (Bitmessage-PyBitmessage-0.6.3.2_GH0.tar.gz) = 1008d9b34070774267df005389d7e478b42131f79b63c40b1eb8212e67067ac3 -SIZE (Bitmessage-PyBitmessage-0.6.3.2_GH0.tar.gz) = 1118048 +TIMESTAMP = 1489654811 +SHA256 (Bitmessage-PyBitmessage-v0.6.2_GH0.tar.gz) = bc209725ef7c1b913ec8560557e3e862a11f664bd8c5fd2eea5adcd915acc2c6 +SIZE (Bitmessage-PyBitmessage-v0.6.2_GH0.tar.gz) = 1053815 From owner-svn-ports-branches@freebsd.org Sun Feb 18 09:35:41 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C53E8F21F0B; Sun, 18 Feb 2018 09:35:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7AEDB6DE51; Sun, 18 Feb 2018 09:35:41 +0000 (UTC) (envelope-from antoine@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75ADC1FF2; Sun, 18 Feb 2018 09:35:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1I9Zfen037514; Sun, 18 Feb 2018 09:35:41 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1I9ZfFu037513; Sun, 18 Feb 2018 09:35:41 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201802180935.w1I9ZfFu037513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 18 Feb 2018 09:35:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462212 - branches/2018Q1/security/snort3 X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: branches/2018Q1/security/snort3 X-SVN-Commit-Revision: 462212 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 09:35:41 -0000 Author: antoine Date: Sun Feb 18 09:35:41 2018 New Revision: 462212 URL: https://svnweb.freebsd.org/changeset/ports/462212 Log: MFH: r462211 Mark BROKEN: fails to package Reported by: pkg-fallout Modified: branches/2018Q1/security/snort3/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/security/snort3/Makefile ============================================================================== --- branches/2018Q1/security/snort3/Makefile Sun Feb 18 09:34:58 2018 (r462211) +++ branches/2018Q1/security/snort3/Makefile Sun Feb 18 09:35:41 2018 (r462212) @@ -13,6 +13,8 @@ COMMENT= Lightweight network intrusion detection syste LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= fails to package + BUILD_DEPENDS= daq>=2.2.2:net/daq \ bash>0:shells/bash LIB_DEPENDS= libpcre.so:devel/pcre \ From owner-svn-ports-branches@freebsd.org Sun Feb 18 16:25:54 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1558F15D63; Sun, 18 Feb 2018 16:25:53 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A71357E853; Sun, 18 Feb 2018 16:25:53 +0000 (UTC) (envelope-from jhale@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 87E3C6757; Sun, 18 Feb 2018 16:25:53 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1IGPru0046291; Sun, 18 Feb 2018 16:25:53 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1IGPrqu046289; Sun, 18 Feb 2018 16:25:53 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201802181625.w1IGPrqu046289@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sun, 18 Feb 2018 16:25:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462250 - branches/2018Q1/graphics/libraw X-SVN-Group: ports-branches X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: branches/2018Q1/graphics/libraw X-SVN-Commit-Revision: 462250 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 16:25:54 -0000 Author: jhale Date: Sun Feb 18 16:25:53 2018 New Revision: 462250 URL: https://svnweb.freebsd.org/changeset/ports/462250 Log: MFH: r461940 Update to 0.18.7 Changes: https://www.libraw.org/download#changelog Security: c60804f1-126f-11e8-8b5b-4ccc6adda413 Security: 6f0b0cbf-1274-11e8-8b5b-4ccc6adda413 Approved by: ports-secteam (riggs) Modified: branches/2018Q1/graphics/libraw/Makefile branches/2018Q1/graphics/libraw/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/graphics/libraw/Makefile ============================================================================== --- branches/2018Q1/graphics/libraw/Makefile Sun Feb 18 15:56:44 2018 (r462249) +++ branches/2018Q1/graphics/libraw/Makefile Sun Feb 18 16:25:53 2018 (r462250) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libraw -PORTVERSION= 0.18.5 +PORTVERSION= 0.18.7 CATEGORIES= graphics MASTER_SITES= http://www.libraw.org/data/ DISTNAME= LibRaw-${PORTVERSION} @@ -56,6 +56,9 @@ OPENMP_CONFIGURE_ENABLE= openmp OPENMP_USES= compiler:openmp OPTIMIZED_CFLAGS_CFLAGS= -O3 + +post-patch: + @${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/*.pc.in # Use "\*" instead of "." in COPYTREE_SHARE commands as "." has # the undesired effect of copying ".deps" directory Modified: branches/2018Q1/graphics/libraw/distinfo ============================================================================== --- branches/2018Q1/graphics/libraw/distinfo Sun Feb 18 15:56:44 2018 (r462249) +++ branches/2018Q1/graphics/libraw/distinfo Sun Feb 18 16:25:53 2018 (r462250) @@ -1,7 +1,7 @@ -TIMESTAMP = 1506714254 -SHA256 (LibRaw-0.18.5.tar.gz) = fa2a7d14d9dfaf6b368f958a76d79266b3f58c2bc367bebab56e11baa94da178 -SIZE (LibRaw-0.18.5.tar.gz) = 1280046 -SHA256 (LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz) = 2ae7923868c3e927eee72cf2e4d91384560b7cfe76a386ecf319c069d343c674 -SIZE (LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz) = 30449 -SHA256 (LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz) = b0ec998c4884cedd86a0627481a18144f0024a35c7a6fa5ae836182c16975c2b -SIZE (LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz) = 38899 +TIMESTAMP = 1518696954 +SHA256 (LibRaw-0.18.7.tar.gz) = 87e347c261a8e87935d9a23afd750d27676b99f540e8552314d40db0ea315771 +SIZE (LibRaw-0.18.7.tar.gz) = 1280935 +SHA256 (LibRaw-demosaic-pack-GPL2-0.18.7.tar.gz) = 4264c6fb586dade28a3a05e46d2b189938700117cb91ec19c7f826b9c7b6b08a +SIZE (LibRaw-demosaic-pack-GPL2-0.18.7.tar.gz) = 30659 +SHA256 (LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz) = dca6166456d73bf57be1102a6c46308da2f1969073f5af936c7dc85c33803de0 +SIZE (LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz) = 39229 From owner-svn-ports-branches@freebsd.org Mon Feb 19 10:03:55 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67CA5F157E3; Mon, 19 Feb 2018 10:03:55 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1C04D6B071; Mon, 19 Feb 2018 10:03:55 +0000 (UTC) (envelope-from sunpoet@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 167F0191A3; Mon, 19 Feb 2018 10:03:55 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1JA3s3L075388; Mon, 19 Feb 2018 10:03:54 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JA3sR1075386; Mon, 19 Feb 2018 10:03:54 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201802191003.w1JA3sR1075386@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 19 Feb 2018 10:03:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462287 - branches/2018Q1/www/npm X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: branches/2018Q1/www/npm X-SVN-Commit-Revision: 462287 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 10:03:55 -0000 Author: sunpoet Date: Mon Feb 19 10:03:54 2018 New Revision: 462287 URL: https://svnweb.freebsd.org/changeset/ports/462287 Log: MFH: r462245 Fix permission of node-gyp - Bump PORTREVISION for package change PR: 225562 Submitted by: bhughes Approved by: ports-secteam (riggs) Modified: branches/2018Q1/www/npm/Makefile branches/2018Q1/www/npm/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/npm/Makefile ============================================================================== --- branches/2018Q1/www/npm/Makefile Mon Feb 19 09:02:56 2018 (r462286) +++ branches/2018Q1/www/npm/Makefile Mon Feb 19 10:03:54 2018 (r462287) @@ -3,7 +3,7 @@ PORTNAME= npm PORTVERSION= 5.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= LOCAL/sunpoet Modified: branches/2018Q1/www/npm/pkg-plist ============================================================================== --- branches/2018Q1/www/npm/pkg-plist Mon Feb 19 09:02:56 2018 (r462286) +++ branches/2018Q1/www/npm/pkg-plist Mon Feb 19 10:03:54 2018 (r462287) @@ -1965,7 +1965,7 @@ lib/node_modules/npm/node_modules/node-gyp/CHANGELOG.m lib/node_modules/npm/node_modules/node-gyp/LICENSE lib/node_modules/npm/node_modules/node-gyp/README.md lib/node_modules/npm/node_modules/node-gyp/addon.gypi -lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js +@(,,755) lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js lib/node_modules/npm/node_modules/node-gyp/gyp/.npmignore lib/node_modules/npm/node_modules/node-gyp/gyp/AUTHORS lib/node_modules/npm/node_modules/node-gyp/gyp/DEPS @@ -2231,7 +2231,7 @@ lib/node_modules/npm/node_modules/npm-lifecycle/LICENS lib/node_modules/npm/node_modules/npm-lifecycle/README.md lib/node_modules/npm/node_modules/npm-lifecycle/index.js lib/node_modules/npm/node_modules/npm-lifecycle/lib/spawn.js -lib/node_modules/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp +@(,,755) lib/node_modules/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp lib/node_modules/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp.cmd lib/node_modules/npm/node_modules/npm-lifecycle/node_modules/byline/LICENSE lib/node_modules/npm/node_modules/npm-lifecycle/node_modules/byline/README.md From owner-svn-ports-branches@freebsd.org Mon Feb 19 10:43:03 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2F0AF18E51; Mon, 19 Feb 2018 10:43:02 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 963CD6DA24; Mon, 19 Feb 2018 10:43:02 +0000 (UTC) (envelope-from sunpoet@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9145119829; Mon, 19 Feb 2018 10:43:02 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1JAh23q097198; Mon, 19 Feb 2018 10:43:02 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JAh2x9097197; Mon, 19 Feb 2018 10:43:02 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201802191043.w1JAh2x9097197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 19 Feb 2018 10:43:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462306 - branches/2018Q1/shells/bash-completion X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: branches/2018Q1/shells/bash-completion X-SVN-Commit-Revision: 462306 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 10:43:03 -0000 Author: sunpoet Date: Mon Feb 19 10:43:02 2018 New Revision: 462306 URL: https://svnweb.freebsd.org/changeset/ports/462306 Log: MFH: r462294 Mark BROKEN_armv6 and BROKEN_armv7 BROKEN_armv6 was removed in r444870 by accident. And Mark Linimon mentioned same error on armv7. Notified by: linimon Reference: http://beefy8.nyi.freebsd.org/data/head-armv6-default/p461852_s329284/logs/errors/bash-completion-2.7,1.log Approved by: ports-secteam (blanket) Modified: branches/2018Q1/shells/bash-completion/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/shells/bash-completion/Makefile ============================================================================== --- branches/2018Q1/shells/bash-completion/Makefile Mon Feb 19 10:31:19 2018 (r462305) +++ branches/2018Q1/shells/bash-completion/Makefile Mon Feb 19 10:43:02 2018 (r462306) @@ -12,6 +12,9 @@ COMMENT= Programmable completion library for Bash LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_armv6= fails to build: gmake: install-recursive: Error 1 +BROKEN_armv7= fails to build: gmake: install-recursive: Error 1 + RUN_DEPENDS= bash:shells/bash OPTIONS_DEFINE= CMAKE_MODULES DOCS From owner-svn-ports-branches@freebsd.org Mon Feb 19 20:45:58 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1ACA0F23174; Mon, 19 Feb 2018 20:45:58 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BFBBF6AB6C; Mon, 19 Feb 2018 20:45:57 +0000 (UTC) (envelope-from dbaio@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B4C961F8AB; Mon, 19 Feb 2018 20:45:57 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1JKjvKp032567; Mon, 19 Feb 2018 20:45:57 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JKjvNO032563; Mon, 19 Feb 2018 20:45:57 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201802192045.w1JKjvNO032563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Mon, 19 Feb 2018 20:45:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462348 - in branches/2018Q1/irc/irssi: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: in branches/2018Q1/irc/irssi: . files X-SVN-Commit-Revision: 462348 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 20:45:58 -0000 Author: dbaio Date: Mon Feb 19 20:45:57 2018 New Revision: 462348 URL: https://svnweb.freebsd.org/changeset/ports/462348 Log: MFH: r460549 r462311 Update irc/irssi to 1.1.0 PR: 225196 Submitted by: David O'Rourke irc/irssi: Update to 1.1.1, Fixes multiple vulnerabilities Changes: https://irssi.org/NEWS/#v1-1-1 PR: 226001 Submitted by: David O'Rourke (maintainer) Reported by: tj@mrsk.me (email) Security: 7afc5e56-156d-11e8-95f2-005056925db4 Approved by: ports-secteam (swills) Modified: branches/2018Q1/irc/irssi/Makefile branches/2018Q1/irc/irssi/distinfo branches/2018Q1/irc/irssi/files/patch-Makefile.in branches/2018Q1/irc/irssi/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/irc/irssi/Makefile ============================================================================== --- branches/2018Q1/irc/irssi/Makefile Mon Feb 19 20:33:08 2018 (r462347) +++ branches/2018Q1/irc/irssi/Makefile Mon Feb 19 20:45:57 2018 (r462348) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= irssi -PORTVERSION= 1.0.6 +PORTVERSION= 1.1.1 PORTEPOCH= 1 CATEGORIES?= irc MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ @@ -17,8 +17,12 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_GNOME= glib20 -OPTIONS_DEFINE= PERL PROXY SOCKS BOT DOCS TRUECOLOR -OPTIONS_DEFAULT= PERL +OPTIONS_DEFINE= PERL PROXY SOCKS BOT DOCS TRUECOLOR CAPSICUM +OPTIONS_DEFAULT= PERL CAPSICUM + +# If we're on FreeBSD 10 don't offer the Capsicum option. +OPTIONS_EXCLUDE_FreeBSD_10= CAPSICUM + OPTIONS_SUB= yes SOCKS_DESC= Socks proxy support SOCKS_CONFIGURE_WITH= socks @@ -30,6 +34,8 @@ PERL_CONFIGURE_OFF= --with-perl=no PROXY_CONFIGURE_WITH= proxy TRUECOLOR_DESC= Truecolor (24bit) support TRUECOLOR_CONFIGURE_ENABLE= true-color +CAPSICUM_DESC= Capsicum support +CAPSICUM_CONFIGURE_WITH= capsicum .if defined(WITHOUT_SSL) CONFIGURE_ARGS+= --disable-ssl Modified: branches/2018Q1/irc/irssi/distinfo ============================================================================== --- branches/2018Q1/irc/irssi/distinfo Mon Feb 19 20:33:08 2018 (r462347) +++ branches/2018Q1/irc/irssi/distinfo Mon Feb 19 20:45:57 2018 (r462348) @@ -1,3 +1,3 @@ -TIMESTAMP = 1515269268 -SHA256 (irssi-1.0.6.tar.xz) = 029e884f3ebf337f7266d8ed4e1a035ca56d9f85015d74c868b488f279de8585 -SIZE (irssi-1.0.6.tar.xz) = 1033428 +TIMESTAMP = 1518995147 +SHA256 (irssi-1.1.1.tar.xz) = 784807e7a1ba25212347f03e4287cff9d0659f076edfb2c6b20928021d75a1bf +SIZE (irssi-1.1.1.tar.xz) = 1080992 Modified: branches/2018Q1/irc/irssi/files/patch-Makefile.in ============================================================================== --- branches/2018Q1/irc/irssi/files/patch-Makefile.in Mon Feb 19 20:33:08 2018 (r462347) +++ branches/2018Q1/irc/irssi/files/patch-Makefile.in Mon Feb 19 20:45:57 2018 (r462348) @@ -1,22 +1,22 @@ ---- Makefile.in.orig 2017-03-10 16:43:21 UTC -+++ Makefile.in -@@ -404,7 +404,7 @@ BUILT_SOURCES = default-config.h default +--- Makefile.in.orig 2018-01-15 21:35:25.062300000 +0000 ++++ Makefile.in 2018-01-15 21:36:17.578923000 +0000 +@@ -409,7 +409,7 @@ CLEANFILES = default-config.h default-theme.h - SUBDIRS = src docs scripts + SUBDIRS = src tests docs scripts themes utils confdir = $(sysconfdir) -conf_DATA = irssi.conf +conf_DATA = irssi.conf.sample - themedir = $(datadir)/irssi/themes - theme_DATA = default.theme colorless.theme pkginclude_HEADERS = irssi-config.h irssi-version.h -@@ -990,8 +990,8 @@ uninstall-am: uninstall-confDATA uninsta + EXTRA_DIST = \ + ChangeLog \ +@@ -965,8 +965,8 @@ - @MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h + #.PHONY: irssi-version.h -default-config.h: $(srcdir)/irssi.conf -- $(srcdir)/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h +- $(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h +default-config.h: $(srcdir)/irssi.conf.sample -+ $(srcdir)/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h ++ $(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h - default-theme.h: $(srcdir)/default.theme - $(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.h + default-theme.h: $(srcdir)/themes/default.theme + $(srcdir)/utils/file2header.sh $(srcdir)/themes/default.theme default_theme > default-theme.h Modified: branches/2018Q1/irc/irssi/pkg-plist ============================================================================== --- branches/2018Q1/irc/irssi/pkg-plist Mon Feb 19 20:33:08 2018 (r462347) +++ branches/2018Q1/irc/irssi/pkg-plist Mon Feb 19 20:45:57 2018 (r462348) @@ -5,6 +5,7 @@ include/irssi/irssi-config.h include/irssi/irssi-version.h include/irssi/src/common.h include/irssi/src/core/args.h +%%CAPSICUM%%include/irssi/src/core/capsicum.h include/irssi/src/core/channel-rec.h include/irssi/src/core/channel-setup-rec.h include/irssi/src/core/channels-setup.h @@ -16,6 +17,7 @@ include/irssi/src/core/commands.h include/irssi/src/core/core.h include/irssi/src/core/expandos.h include/irssi/src/core/ignore.h +include/irssi/src/core/iregex.h include/irssi/src/core/levels.h include/irssi/src/core/line-split.h include/irssi/src/core/log.h @@ -27,6 +29,7 @@ include/irssi/src/core/modules.h include/irssi/src/core/net-disconnect.h include/irssi/src/core/net-nonblock.h include/irssi/src/core/net-sendbuffer.h +include/irssi/src/core/network-openssl.h include/irssi/src/core/network.h include/irssi/src/core/nick-rec.h include/irssi/src/core/nicklist.h @@ -54,6 +57,7 @@ include/irssi/src/core/write-buffer.h include/irssi/src/fe-common/core/chat-completion.h include/irssi/src/fe-common/core/command-history.h include/irssi/src/fe-common/core/completion.h +%%CAPSICUM%%include/irssi/src/fe-common/core/fe-capsicum.h include/irssi/src/fe-common/core/fe-channels.h include/irssi/src/fe-common/core/fe-common-core.h include/irssi/src/fe-common/core/fe-core-commands.h @@ -61,6 +65,7 @@ include/irssi/src/fe-common/core/fe-exec.h include/irssi/src/fe-common/core/fe-messages.h include/irssi/src/fe-common/core/fe-queries.h include/irssi/src/fe-common/core/fe-recode.h +include/irssi/src/fe-common/core/fe-settings.h include/irssi/src/fe-common/core/fe-tls.h include/irssi/src/fe-common/core/fe-windows.h include/irssi/src/fe-common/core/formats.h @@ -130,6 +135,7 @@ include/irssi/src/lib-config/module.h %%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so %%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so man/man1/irssi.1.gz +%%CAPSICUM%%%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt %%PORTDOCS%%%%DOCSDIR%%/design.txt %%PORTDOCS%%%%DOCSDIR%%/faq.html %%PORTDOCS%%%%DOCSDIR%%/faq.txt @@ -139,6 +145,7 @@ man/man1/irssi.1.gz %%PORTDOCS%%%%DOCSDIR%%/signals.txt %%PORTDOCS%%%%DOCSDIR%%/special_vars.txt %%PORTDOCS%%%%DOCSDIR%%/startup-HOWTO.html +%%PORTDOCS%%%%DOCSDIR%%/startup-HOWTO.txt %%DATADIR%%/help/accept %%DATADIR%%/help/action %%DATADIR%%/help/admin @@ -217,11 +224,11 @@ man/man1/irssi.1.gz %%DATADIR%%/help/rmreconns %%DATADIR%%/help/rmrejoins %%DATADIR%%/help/save -%%DATADIR%%/help/servlist %%DATADIR%%/help/sconnect %%DATADIR%%/help/script %%DATADIR%%/help/scrollback %%DATADIR%%/help/server +%%DATADIR%%/help/servlist %%DATADIR%%/help/set %%DATADIR%%/help/silence %%DATADIR%%/help/squery From owner-svn-ports-branches@freebsd.org Tue Feb 20 00:12:39 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED487F0C95E; Tue, 20 Feb 2018 00:12:38 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9E64774851; Tue, 20 Feb 2018 00:12:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9929D21A31; Tue, 20 Feb 2018 00:12:38 +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 w1K0Ccpi037784; Tue, 20 Feb 2018 00:12:38 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1K0CcUW037778; Tue, 20 Feb 2018 00:12:38 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802200012.w1K0CcUW037778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 20 Feb 2018 00:12:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462362 - in branches/2018Q1/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www/waterfox: . files X-SVN-Commit-Revision: 462362 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 00:12:39 -0000 Author: jbeich Date: Tue Feb 20 00:12:37 2018 New Revision: 462362 URL: https://svnweb.freebsd.org/changeset/ports/462362 Log: MFH: r462361 www/waterfox: apply more FF59 fixes Approved by: ports-secteam blanket Added: branches/2018Q1/www/waterfox/files/patch-bug1231203 - copied unchanged from r462361, head/www/waterfox/files/patch-bug1231203 branches/2018Q1/www/waterfox/files/patch-bug1334465 - copied unchanged from r462361, head/www/waterfox/files/patch-bug1334465 branches/2018Q1/www/waterfox/files/patch-bug1426988 - copied unchanged from r462361, head/www/waterfox/files/patch-bug1426988 branches/2018Q1/www/waterfox/files/patch-bug1428947 - copied unchanged from r462361, head/www/waterfox/files/patch-bug1428947 branches/2018Q1/www/waterfox/files/patch-bug1431336 - copied unchanged from r462361, head/www/waterfox/files/patch-bug1431336 Modified: branches/2018Q1/www/waterfox/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Tue Feb 20 00:11:12 2018 (r462361) +++ branches/2018Q1/www/waterfox/Makefile Tue Feb 20 00:12:37 2018 (r462362) @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q1/www/waterfox/files/patch-bug1231203 (from r462361, head/www/waterfox/files/patch-bug1231203) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1231203 Tue Feb 20 00:12:37 2018 (r462362, copy of r462361, head/www/waterfox/files/patch-bug1231203) @@ -0,0 +1,203 @@ +commit ef357e507dd1 +Author: David Keeler +Date: Thu Feb 8 17:16:03 2018 -0800 + + bug 1231203 - ensure OCSP responses to requests from private contexts aren't cached on disk r=jcj a=ritu + + MozReview-Commit-ID: 374f7hERLee + + --HG-- + extra : source : ee10aee44d26bf6eb3ddc5f54ddbbbb4fdeb4b0d +--- + security/manager/ssl/nsNSSCallbacks.cpp | 12 ++- + security/manager/ssl/tests/unit/head_psm.js | 8 +- + .../ssl/tests/unit/test_ocsp_private_caching.js | 112 +++++++++++++++++++++ + security/manager/ssl/tests/unit/xpcshell.ini | 2 + + 4 files changed, 130 insertions(+), 4 deletions(-) + +diff --git security/manager/ssl/nsNSSCallbacks.cpp security/manager/ssl/nsNSSCallbacks.cpp +index 7288a7f2c725..d3b973362ab1 100644 +--- security/manager/ssl/nsNSSCallbacks.cpp ++++ security/manager/ssl/nsNSSCallbacks.cpp +@@ -119,13 +119,19 @@ nsHTTPDownloadEvent::Run() + chan->SetLoadFlags(nsIRequest::LOAD_ANONYMOUS | + nsIChannel::LOAD_BYPASS_SERVICE_WORKER); + +- // For OCSP requests, only the first party domain aspect of origin attributes +- // is used. This means that OCSP requests are shared across different +- // containers. ++ // For OCSP requests, only the first party domain and private browsing id ++ // aspects of origin attributes are used. This means that: ++ // a) if first party isolation is enabled, OCSP requests will be isolated ++ // according to the first party domain of the original https request ++ // b) OCSP requests are shared across different containers as long as first ++ // party isolation is not enabled and none of the containers are in private ++ // browsing mode. + if (mRequestSession->mOriginAttributes != OriginAttributes()) { + OriginAttributes attrs; + attrs.mFirstPartyDomain = + mRequestSession->mOriginAttributes.mFirstPartyDomain; ++ attrs.mPrivateBrowsingId = ++ mRequestSession->mOriginAttributes.mPrivateBrowsingId; + + nsCOMPtr loadInfo = chan->GetLoadInfo(); + if (loadInfo) { +diff --git security/manager/ssl/tests/unit/head_psm.js security/manager/ssl/tests/unit/head_psm.js +index 6e0d41125549..51e2beb7ce1d 100644 +--- security/manager/ssl/tests/unit/head_psm.js ++++ security/manager/ssl/tests/unit/head_psm.js +@@ -609,9 +609,12 @@ function getFailingHttpServer(serverPort, serverIdentities) { + // by which HTTP method the server is expected to be queried. + // expectedResponseTypes is an optional array of OCSP response types to use (see + // GenerateOCSPResponse.cpp). ++// responseHeaderPairs is an optional array of HTTP header (name, value) pairs ++// to set in each response. + function startOCSPResponder(serverPort, identity, nssDBLocation, + expectedCertNames, expectedBasePaths, +- expectedMethods, expectedResponseTypes) { ++ expectedMethods, expectedResponseTypes, ++ responseHeaderPairs = []) { + let ocspResponseGenerationArgs = expectedCertNames.map( + function(expectedNick) { + let responseType = "good"; +@@ -640,6 +643,9 @@ function startOCSPResponder(serverPort, identity, nssDBLocation, + } + aResponse.setStatusLine(aRequest.httpVersion, 200, "OK"); + aResponse.setHeader("Content-Type", "application/ocsp-response"); ++ for (let headerPair of responseHeaderPairs) { ++ aResponse.setHeader(headerPair[0], headerPair[1]); ++ } + aResponse.write(ocspResponses.shift()); + }); + httpServer.identity.setPrimary("http", identity, serverPort); +diff --git security/manager/ssl/tests/unit/test_ocsp_private_caching.js security/manager/ssl/tests/unit/test_ocsp_private_caching.js +new file mode 100644 +index 000000000000..b61252eb6e6f +--- /dev/null ++++ security/manager/ssl/tests/unit/test_ocsp_private_caching.js +@@ -0,0 +1,112 @@ ++// -*- indent-tabs-mode: nil; js-indent-level: 2 -*- ++// This Source Code Form is subject to the terms of the Mozilla Public ++// License, v. 2.0. If a copy of the MPL was not distributed with this ++// file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ ++"use strict"; ++ ++// In which we connect to a host and encounter OCSP responses with the ++// Cache-Control header set, which Necko will normally cache. We need to ensure ++// that these responses aren't cached to disk when the original https request ++// was in a private context. ++ ++do_get_profile(); // must be called before getting nsIX509CertDB ++const certdb = Cc["@mozilla.org/security/x509certdb;1"] ++ .getService(Ci.nsIX509CertDB); ++ ++const SERVER_PORT = 8888; ++ ++function start_ocsp_responder(expectedCertNames, expectedPaths, ++ expectedMethods) { ++ return startOCSPResponder(SERVER_PORT, "www.example.com", ++ "test_ocsp_fetch_method", expectedCertNames, ++ expectedPaths, expectedMethods); ++} ++ ++function check_cert_err(cert_name, expected_error) { ++ let cert = constructCertFromFile("test_ocsp_fetch_method/" + cert_name + ".pem"); ++ return checkCertErrorGeneric(certdb, cert, expected_error, ++ certificateUsageSSLServer); ++} ++ ++function add_flush_cache() { ++ add_test(() => { ++ // This appears to either fire multiple times or fire once for every ++ // observer that has ever been passed to flush. To prevent multiple calls to ++ // run_next_test, keep track of if this observer has already called it. ++ let observed = false; ++ let observer = { observe: () => { ++ if (!observed) { ++ observed = true; ++ run_next_test(); ++ } ++ } ++ }; ++ Services.cache2.QueryInterface(Ci.nsICacheTesting).flush(observer); ++ }); ++} ++ ++function add_ocsp_necko_cache_test(loadContext, shouldFindEntry) { ++ // Pre-testcase cleanup/setup. ++ add_test(() => { ++ Services.cache2.clear(); ++ run_next_test(); ++ }); ++ add_flush_cache(); ++ ++ let responder; ++ add_test(() => { ++ clearOCSPCache(); ++ clearSessionCache(); ++ responder = startOCSPResponder(SERVER_PORT, "localhost", "ocsp_certs", ++ ["default-ee"], [], [], [], ++ [["Cache-Control", "max-age: 1000"]]); ++ run_next_test(); ++ }); ++ ++ // Prepare a connection that will cause an OCSP request. ++ add_connection_test("ocsp-stapling-none.example.com", PRErrorCodeSuccess, ++ null, null, null, loadContext.originAttributes); ++ ++ add_flush_cache(); ++ ++ // Traverse the cache and ensure the response made it into the cache with the ++ // appropriate properties (private or not private). ++ add_test(() => { ++ let foundEntry = false; ++ let visitor = { ++ onCacheStorageInfo() {}, ++ onCacheEntryInfo(aURI, aIdEnhance, aDataSize, aFetchCount, ++ aLastModifiedTime, aExpirationTime, aPinned, aInfo) { ++ Assert.equal(aURI.spec, "http://localhost:8888/", ++ "expected OCSP request URI should match"); ++ foundEntry = true; ++ }, ++ onCacheEntryVisitCompleted() { ++ Assert.equal(foundEntry, shouldFindEntry, ++ "should only find a cached entry if we're expecting one"); ++ run_next_test(); ++ }, ++ QueryInterface(iid) { ++ if (iid.equals(Ci.nsICacheStorageVisitor)) { ++ return this; ++ } ++ throw Cr.NS_ERROR_NO_INTERFACE; ++ }, ++ }; ++ Services.cache2.asyncVisitAllStorages(visitor, true); ++ }); ++ ++ // Clean up (stop the responder). ++ add_test(() => { ++ responder.stop(run_next_test); ++ }); ++} ++ ++function run_test() { ++ Services.prefs.setIntPref("security.OCSP.enabled", 1); ++ add_tls_server_setup("OCSPStaplingServer", "ocsp_certs"); ++ add_ocsp_necko_cache_test(Services.loadContextInfo.private, false); ++ add_ocsp_necko_cache_test(Services.loadContextInfo.default, true); ++ run_next_test(); ++} +diff --git security/manager/ssl/tests/unit/xpcshell.ini security/manager/ssl/tests/unit/xpcshell.ini +index b85c775514eb..4dbe59ac5e73 100644 +--- security/manager/ssl/tests/unit/xpcshell.ini ++++ security/manager/ssl/tests/unit/xpcshell.ini +@@ -121,6 +121,8 @@ run-sequentially = hardcoded ports + run-sequentially = hardcoded ports + [test_ocsp_must_staple.js] + run-sequentially = hardcoded ports ++[test_ocsp_private_caching.js] ++run-sequentially = hardcoded ports + [test_ocsp_no_hsts_upgrade.js] + run-sequentially = hardcoded ports + [test_ocsp_required.js] Copied: branches/2018Q1/www/waterfox/files/patch-bug1334465 (from r462361, head/www/waterfox/files/patch-bug1334465) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1334465 Tue Feb 20 00:12:37 2018 (r462362, copy of r462361, head/www/waterfox/files/patch-bug1334465) @@ -0,0 +1,62 @@ +commit 646f99465e4f +Author: Valentin Gosu +Date: Fri Feb 9 13:20:04 2018 +0100 + + Bug 1334465 - Make HttpChannelParent::mIPCClosed atomic r=bagder a=ritu + + MozReview-Commit-ID: 6irCJMAjzjW + + --HG-- + extra : source : bd315ae86709c3459a3dbf0778022ff3b1908723 +--- + netwerk/protocol/http/HttpChannelParent.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git netwerk/protocol/http/HttpChannelParent.h netwerk/protocol/http/HttpChannelParent.h +index 572d7f177d7a..ef4dbd84f792 100644 +--- netwerk/protocol/http/HttpChannelParent.h ++++ netwerk/protocol/http/HttpChannelParent.h +@@ -264,7 +264,7 @@ private: + RefPtr mChannel; + nsCOMPtr mCacheEntry; + nsCOMPtr mAssociatedContentSecurity; +- bool mIPCClosed; // PHttpChannel actor has been Closed() ++ Atomic mIPCClosed; // PHttpChannel actor has been Closed() + + nsCOMPtr mRedirectChannel; + nsCOMPtr mRedirectCallback; +commit a87603550115 +Author: Valentin Gosu +Date: Sun Feb 11 03:51:09 2018 +0100 + + Bug 1334465 - Set mIPCClosed to true before calling SendDeleteSelf in order to avoid race r=bagder a=ritu + + In the previous code, a race condition could cause us to call SendSetPriority() after calling SendDeleteSelf. + + For example: + T1: SendDeleteSelf() + T2: if (!mIPCClosed) SendSetPriority() + T1: mIPCClosed = true + + MozReview-Commit-ID: 3XOwCaphb2o + + --HG-- + extra : source : 4ebdab0e332892378558817e30d0138c95199ce5 +--- + netwerk/protocol/http/HttpChannelParent.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git netwerk/protocol/http/HttpChannelParent.cpp netwerk/protocol/http/HttpChannelParent.cpp +index 064c5659e9ed..8ee13c2b5fbd 100644 +--- netwerk/protocol/http/HttpChannelParent.cpp ++++ netwerk/protocol/http/HttpChannelParent.cpp +@@ -2262,8 +2262,8 @@ HttpChannelParent::UpdateAndSerializeSecurityInfo(nsACString& aSerializedSecurit + bool + HttpChannelParent::DoSendDeleteSelf() + { +- bool rv = SendDeleteSelf(); + mIPCClosed = true; ++ bool rv = SendDeleteSelf(); + + CleanupBackgroundChannel(); + Copied: branches/2018Q1/www/waterfox/files/patch-bug1426988 (from r462361, head/www/waterfox/files/patch-bug1426988) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1426988 Tue Feb 20 00:12:37 2018 (r462362, copy of r462361, head/www/waterfox/files/patch-bug1426988) @@ -0,0 +1,102 @@ +commit 2f7e646ad8fd +Author: Nils Ohlmeier [:drno] +Date: Sat Jan 27 11:20:43 2018 -0800 + + Bug 1426988 - Properly exit encoder init in error cases. r=rillian, a=abillings + + --HG-- + extra : source : f3bc73c747e847db4243cf1167720fd69d62fe51 +--- + media/libvpx/libvpx/vpx/src/vpx_encoder.c | 52 ++++++++++++++++++------------- + 1 file changed, 30 insertions(+), 22 deletions(-) + +diff --git media/libvpx/libvpx/vpx/src/vpx_encoder.c media/libvpx/libvpx/vpx/src/vpx_encoder.c +index 4390cf7c8f1f..1cf2dca695a9 100644 +--- media/libvpx/libvpx/vpx/src/vpx_encoder.c ++++ media/libvpx/libvpx/vpx/src/vpx_encoder.c +@@ -12,8 +12,11 @@ + * \brief Provides the high level interface to wrap encoder algorithms. + * + */ ++#include + #include ++#include + #include ++#include "vp8/common/blockd.h" + #include "vpx_config.h" + #include "vpx/internal/vpx_codec_internal.h" + +@@ -81,6 +84,8 @@ vpx_codec_err_t vpx_codec_enc_init_multi_ver( + int i; + void *mem_loc = NULL; + ++ if (iface->enc.mr_get_mem_loc == NULL) return VPX_CODEC_INCAPABLE; ++ + if (!(res = iface->enc.mr_get_mem_loc(cfg, &mem_loc))) { + for (i = 0; i < num_enc; i++) { + vpx_codec_priv_enc_mr_cfg_t mr_cfg; +@@ -89,28 +94,27 @@ vpx_codec_err_t vpx_codec_enc_init_multi_ver( + if (dsf->num < 1 || dsf->num > 4096 || dsf->den < 1 || + dsf->den > dsf->num) { + res = VPX_CODEC_INVALID_PARAM; +- break; ++ } else { ++ mr_cfg.mr_low_res_mode_info = mem_loc; ++ mr_cfg.mr_total_resolutions = num_enc; ++ mr_cfg.mr_encoder_id = num_enc - 1 - i; ++ mr_cfg.mr_down_sampling_factor.num = dsf->num; ++ mr_cfg.mr_down_sampling_factor.den = dsf->den; ++ ++ /* Force Key-frame synchronization. Namely, encoder at higher ++ * resolution always use the same frame_type chosen by the ++ * lowest-resolution encoder. ++ */ ++ if (mr_cfg.mr_encoder_id) cfg->kf_mode = VPX_KF_DISABLED; ++ ++ ctx->iface = iface; ++ ctx->name = iface->name; ++ ctx->priv = NULL; ++ ctx->init_flags = flags; ++ ctx->config.enc = cfg; ++ res = ctx->iface->init(ctx, &mr_cfg); + } + +- mr_cfg.mr_low_res_mode_info = mem_loc; +- mr_cfg.mr_total_resolutions = num_enc; +- mr_cfg.mr_encoder_id = num_enc - 1 - i; +- mr_cfg.mr_down_sampling_factor.num = dsf->num; +- mr_cfg.mr_down_sampling_factor.den = dsf->den; +- +- /* Force Key-frame synchronization. Namely, encoder at higher +- * resolution always use the same frame_type chosen by the +- * lowest-resolution encoder. +- */ +- if (mr_cfg.mr_encoder_id) cfg->kf_mode = VPX_KF_DISABLED; +- +- ctx->iface = iface; +- ctx->name = iface->name; +- ctx->priv = NULL; +- ctx->init_flags = flags; +- ctx->config.enc = cfg; +- res = ctx->iface->init(ctx, &mr_cfg); +- + if (res) { + const char *error_detail = ctx->priv ? ctx->priv->err_detail : NULL; + /* Destroy current ctx */ +@@ -124,10 +128,14 @@ vpx_codec_err_t vpx_codec_enc_init_multi_ver( + vpx_codec_destroy(ctx); + i--; + } ++#if CONFIG_MULTI_RES_ENCODING ++ assert(mem_loc); ++ free(((LOWER_RES_FRAME_INFO *)mem_loc)->mb_info); ++ free(mem_loc); ++#endif ++ return SAVE_STATUS(ctx, res); + } + +- if (res) break; +- + ctx++; + cfg++; + dsf++; Copied: branches/2018Q1/www/waterfox/files/patch-bug1428947 (from r462361, head/www/waterfox/files/patch-bug1428947) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1428947 Tue Feb 20 00:12:37 2018 (r462362, copy of r462361, head/www/waterfox/files/patch-bug1428947) @@ -0,0 +1,90 @@ +commit 1251c93456f6 +Author: Dan Glastonbury +Date: Thu Feb 15 13:06:39 2018 +0200 + + Bug 1428947 - Check plane width & stride constraints. r=mattwoodrow a=ritu + + MozReview-Commit-ID: HEcMG4JoEl3 + + --HG-- + extra : amend_source : af70dc6dacdc867a39c40b0b1b8c05cea49c7586 +--- + dom/media/MediaData.cpp | 2 +- + gfx/layers/ImageContainer.cpp | 23 +++++++++++++---------- + 2 files changed, 14 insertions(+), 11 deletions(-) + +diff --git dom/media/MediaData.cpp dom/media/MediaData.cpp +index 445475163687..9aa2d58e9ded 100644 +--- dom/media/MediaData.cpp ++++ dom/media/MediaData.cpp +@@ -108,7 +108,8 @@ ValidatePlane(const VideoData::YCbCrBuffer::Plane& aPlane) + return aPlane.mWidth <= PlanarYCbCrImage::MAX_DIMENSION + && aPlane.mHeight <= PlanarYCbCrImage::MAX_DIMENSION + && aPlane.mWidth * aPlane.mHeight < MAX_VIDEO_WIDTH * MAX_VIDEO_HEIGHT +- && aPlane.mStride > 0; ++ && aPlane.mStride > 0 ++ && aPlane.mWidth <= aPlane.mStride; + } + + static bool ValidateBufferAndPicture(const VideoData::YCbCrBuffer& aBuffer, +diff --git gfx/layers/ImageContainer.cpp gfx/layers/ImageContainer.cpp +index f00d856754af..3e397def86f7 100644 +--- gfx/layers/ImageContainer.cpp ++++ gfx/layers/ImageContainer.cpp +@@ -539,12 +539,15 @@ static void + CopyPlane(uint8_t *aDst, const uint8_t *aSrc, + const gfx::IntSize &aSize, int32_t aStride, int32_t aSkip) + { ++ int32_t height = aSize.height; ++ int32_t width = aSize.width; ++ ++ MOZ_RELEASE_ASSERT(width <= aStride); ++ + if (!aSkip) { + // Fast path: planar input. +- memcpy(aDst, aSrc, aSize.height * aStride); ++ memcpy(aDst, aSrc, height * aStride); + } else { +- int32_t height = aSize.height; +- int32_t width = aSize.width; + for (int y = 0; y < height; ++y) { + const uint8_t *src = aSrc; + uint8_t *dst = aDst; +@@ -562,13 +565,11 @@ CopyPlane(uint8_t *aDst, const uint8_t *aSrc, + bool + RecyclingPlanarYCbCrImage::CopyData(const Data& aData) + { +- mData = aData; +- + // update buffer size + // Use uint32_t throughout to match AllocateBuffer's param and mBufferSize + const auto checkedSize = +- CheckedInt(mData.mCbCrStride) * mData.mCbCrSize.height * 2 + +- CheckedInt(mData.mYStride) * mData.mYSize.height; ++ CheckedInt(aData.mCbCrStride) * aData.mCbCrSize.height * 2 + ++ CheckedInt(aData.mYStride) * aData.mYSize.height; + + if (!checkedSize.isValid()) + return false; +@@ -583,16 +584,18 @@ RecyclingPlanarYCbCrImage::CopyData(const Data& aData) + // update buffer size + mBufferSize = size; + ++ mData = aData; + mData.mYChannel = mBuffer.get(); + mData.mCbChannel = mData.mYChannel + mData.mYStride * mData.mYSize.height; + mData.mCrChannel = mData.mCbChannel + mData.mCbCrStride * mData.mCbCrSize.height; ++ mData.mYSkip = mData.mCbSkip = mData.mCrSkip = 0; + + CopyPlane(mData.mYChannel, aData.mYChannel, +- mData.mYSize, mData.mYStride, mData.mYSkip); ++ aData.mYSize, aData.mYStride, aData.mYSkip); + CopyPlane(mData.mCbChannel, aData.mCbChannel, +- mData.mCbCrSize, mData.mCbCrStride, mData.mCbSkip); ++ aData.mCbCrSize, aData.mCbCrStride, aData.mCbSkip); + CopyPlane(mData.mCrChannel, aData.mCrChannel, +- mData.mCbCrSize, mData.mCbCrStride, mData.mCrSkip); ++ aData.mCbCrSize, aData.mCbCrStride, aData.mCrSkip); + + mSize = aData.mPicSize; + mOrigin = gfx::IntPoint(aData.mPicX, aData.mPicY); Copied: branches/2018Q1/www/waterfox/files/patch-bug1431336 (from r462361, head/www/waterfox/files/patch-bug1431336) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1431336 Tue Feb 20 00:12:37 2018 (r462362, copy of r462361, head/www/waterfox/files/patch-bug1431336) @@ -0,0 +1,34 @@ +commit d606d1200b5a +Author: Makoto Kato +Date: Mon Feb 19 13:12:29 2018 +0900 + + Bug 1431336. r=smaug a=abillings +--- + dom/html/nsTextEditorState.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git dom/html/nsTextEditorState.cpp dom/html/nsTextEditorState.cpp +index a8247d183732..1430d1005e2a 100644 +--- dom/html/nsTextEditorState.cpp ++++ dom/html/nsTextEditorState.cpp +@@ -936,7 +936,8 @@ nsTextInputListener::NotifySelectionChanged(nsIDOMDocument* aDoc, nsISelection* + + mSelectionWasCollapsed = collapsed; + +- if (!weakFrame.IsAlive() || !nsContentUtils::IsFocusedContent(mFrame->GetContent())) ++ if (!weakFrame.IsAlive() || !mFrame || ++ !nsContentUtils::IsFocusedContent(mFrame->GetContent())) + return NS_OK; + + return UpdateTextInputCommands(NS_LITERAL_STRING("select"), aSel, aReason); +@@ -1792,8 +1793,9 @@ nsTextEditorState::SetSelectionRange(uint32_t aStart, uint32_t aEnd, + props.SetEnd(aEnd); + props.SetDirection(aDirection); + } else { ++ WeakPtr self(this); + aRv = mBoundFrame->SetSelectionRange(aStart, aEnd, aDirection); +- if (aRv.Failed()) { ++ if (aRv.Failed() || !self.get()) { + return; + } + rv = mBoundFrame->ScrollSelectionIntoView(); From owner-svn-ports-branches@freebsd.org Tue Feb 20 00:16:55 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C8C1F0D08F; Tue, 20 Feb 2018 00:16:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D3EEA74CC5; Tue, 20 Feb 2018 00:16:54 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEF0D21A34; Tue, 20 Feb 2018 00:16:54 +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 w1K0GsYb038291; Tue, 20 Feb 2018 00:16:54 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1K0Gswa038289; Tue, 20 Feb 2018 00:16:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802200016.w1K0Gswa038289@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 20 Feb 2018 00:16:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462365 - branches/2018Q1/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/emulators/citra X-SVN-Commit-Revision: 462365 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 00:16:55 -0000 Author: jbeich Date: Tue Feb 20 00:16:54 2018 New Revision: 462365 URL: https://svnweb.freebsd.org/changeset/ports/462365 Log: MFH: r462360 emulators/citra: update to s20180219 Changes: https://github.com/citra-emu/citra/compare/775fb388...20f6cb1a Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q1/emulators/citra/Makefile branches/2018Q1/emulators/citra/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/citra/Makefile ============================================================================== --- branches/2018Q1/emulators/citra/Makefile Tue Feb 20 00:15:56 2018 (r462364) +++ branches/2018Q1/emulators/citra/Makefile Tue Feb 20 00:16:54 2018 (r462365) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180214 +PORTVERSION= s20180219 PORTREVISION?= 0 CATEGORIES= emulators @@ -26,7 +26,7 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dy USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 775fb388 +GH_TAGNAME= 20f6cb1a GH_TUPLE= citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \ benhoyt:inih:r40:inih/externals/inih/inih \ Modified: branches/2018Q1/emulators/citra/distinfo ============================================================================== --- branches/2018Q1/emulators/citra/distinfo Tue Feb 20 00:15:56 2018 (r462364) +++ branches/2018Q1/emulators/citra/distinfo Tue Feb 20 00:16:54 2018 (r462365) @@ -1,6 +1,6 @@ -TIMESTAMP = 1518622346 -SHA256 (citra-emu-citra-s20180214-775fb388_GH0.tar.gz) = 69b686ba1c1b69e87a4fea5f894e0bd77c97b66ae4b2e3df962fec47985073da -SIZE (citra-emu-citra-s20180214-775fb388_GH0.tar.gz) = 1675167 +TIMESTAMP = 1519056517 +SHA256 (citra-emu-citra-s20180219-20f6cb1a_GH0.tar.gz) = 34f363b3a610e9f8650e4e2d51b7fb2918e27512684fb4490ee0bcec8211f730 +SIZE (citra-emu-citra-s20180219-20f6cb1a_GH0.tar.gz) = 1675516 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7 SIZE (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = 59366 SHA256 (MerryMage-dynarmic-d1d4705_GH0.tar.gz) = cf120bc77912cf58e0965db2abcb2067c36aca612c42459e0eb72b740ea6cb0e From owner-svn-ports-branches@freebsd.org Tue Feb 20 00:17:39 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 12993F0D2A8; Tue, 20 Feb 2018 00:17:39 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B9E6074DED; Tue, 20 Feb 2018 00:17:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9C87C21A35; Tue, 20 Feb 2018 00:17:38 +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 w1K0Hcdv038443; Tue, 20 Feb 2018 00:17:38 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1K0HcIs038441; Tue, 20 Feb 2018 00:17:38 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802200017.w1K0HcIs038441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 20 Feb 2018 00:17:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462366 - branches/2018Q1/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/emulators/rpcs3 X-SVN-Commit-Revision: 462366 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 00:17:39 -0000 Author: jbeich Date: Tue Feb 20 00:17:38 2018 New Revision: 462366 URL: https://svnweb.freebsd.org/changeset/ports/462366 Log: MFH: r462359 emulators/rpcs3: update to 0.0.4.371 Changes: https://github.com/RPCS3/rpcs3/compare/877b296fc...d5b9eb0ca Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q1/emulators/rpcs3/Makefile branches/2018Q1/emulators/rpcs3/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q1/emulators/rpcs3/Makefile Tue Feb 20 00:16:54 2018 (r462365) +++ branches/2018Q1/emulators/rpcs3/Makefile Tue Feb 20 00:17:38 2018 (r462366) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-365 -DISTVERSIONSUFFIX= -g877b296fc +DISTVERSION= 0.0.4-371 +DISTVERSIONSUFFIX= -gd5b9eb0ca CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -39,8 +39,8 @@ USE_QT5= qmake_build buildtools_build core dbus gui ne USE_XORG= x11 EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL}} EXTRA_PATCHES_FreeBSD_10.3= ${PATCHDIR}/extra-patch-no-thread_local -CONFIGURE_ENV+= TRAVIS=1 # XXX Rename to be less generic CMAKE_ARGS+= -DCMAKE_SKIP_RPATH=on -DUSE_SYSTEM_LIBPNG=on -DUSE_SYSTEM_FFMPEG=on +CMAKE_OFF= USE_NATIVE_INSTRUCTIONS CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 CXXFLAGS+= -Wno-macro-redefined # __STDC_*_MACROS sys/cdefs.h vs. llvm-config LDFLAGS+= -Wl,--as-needed # GLU Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Tue Feb 20 00:16:54 2018 (r462365) +++ branches/2018Q1/emulators/rpcs3/distinfo Tue Feb 20 00:17:38 2018 (r462366) @@ -1,6 +1,6 @@ -TIMESTAMP = 1518803851 -SHA256 (RPCS3-rpcs3-v0.0.4-365-g877b296fc_GH0.tar.gz) = 705e30b9c960dccb8843b4d4a84fea23e716d8feac3a7d702940366ad9ea6259 -SIZE (RPCS3-rpcs3-v0.0.4-365-g877b296fc_GH0.tar.gz) = 3857139 +TIMESTAMP = 1519047024 +SHA256 (RPCS3-rpcs3-v0.0.4-371-gd5b9eb0ca_GH0.tar.gz) = 4fc3bf52a0180f024ba1c3f600676e523c28808fe6a257b396d6ec3aa6401ff9 +SIZE (RPCS3-rpcs3-v0.0.4-371-gd5b9eb0ca_GH0.tar.gz) = 3857273 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841 From owner-svn-ports-branches@freebsd.org Tue Feb 20 00:18:31 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06EB3F0D421; Tue, 20 Feb 2018 00:18:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AE6E474F00; Tue, 20 Feb 2018 00:18:30 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A97DE21A36; Tue, 20 Feb 2018 00:18:30 +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 w1K0IU8G038616; Tue, 20 Feb 2018 00:18:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1K0IULn038613; Tue, 20 Feb 2018 00:18:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802200018.w1K0IULn038613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 20 Feb 2018 00:18:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462367 - in branches/2018Q1/games/openbor: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/games/openbor: . files X-SVN-Commit-Revision: 462367 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 00:18:31 -0000 Author: jbeich Date: Tue Feb 20 00:18:30 2018 New Revision: 462367 URL: https://svnweb.freebsd.org/changeset/ports/462367 Log: MFH: r462357 games/openbor: update to 4601 Changes: https://github.com/DCurrent/openbor/compare/35968d0...ab066c1 Approved by: ports-secteam (feld, implicit for snapshots) Modified: branches/2018Q1/games/openbor/Makefile branches/2018Q1/games/openbor/distinfo branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/games/openbor/Makefile ============================================================================== --- branches/2018Q1/games/openbor/Makefile Tue Feb 20 00:17:38 2018 (r462366) +++ branches/2018Q1/games/openbor/Makefile Tue Feb 20 00:18:30 2018 (r462367) @@ -2,7 +2,7 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 4591 +PORTVERSION?= 4601 .ifndef PKGNAMESUFFIX PORTREVISION= 0 .endif @@ -31,7 +31,7 @@ PORTSCOUT= ignore:1 USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= 35968d0 +GH_TAGNAME?= ab066c1 USES+= gmake pkgconfig .if ${PORTVERSION} < 4433 Modified: branches/2018Q1/games/openbor/distinfo ============================================================================== --- branches/2018Q1/games/openbor/distinfo Tue Feb 20 00:17:38 2018 (r462366) +++ branches/2018Q1/games/openbor/distinfo Tue Feb 20 00:18:30 2018 (r462367) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518478876 -SHA256 (DCurrent-openbor-4591-35968d0_GH0.tar.gz) = d993c2e990a237427d6e58a73086c17cf8f2a0b0be40295240b53dd30594e90b -SIZE (DCurrent-openbor-4591-35968d0_GH0.tar.gz) = 107145240 +TIMESTAMP = 1519052570 +SHA256 (DCurrent-openbor-4601-ab066c1_GH0.tar.gz) = 5ce8ce0d179d82716c5ca4ff4b0ff84a11ede9cf2cdcc62109f81a6c89a2b085 +SIZE (DCurrent-openbor-4601-ab066c1_GH0.tar.gz) = 107146373 Modified: branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c ============================================================================== --- branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c Tue Feb 20 00:17:38 2018 (r462366) +++ branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c Tue Feb 20 00:18:30 2018 (r462367) @@ -1,12 +1,12 @@ -Reset seek position for BGM with more than 64 tracks +Reset seek position for BGM with more than 128 tracks ---- source/gamelib/packfile.c.orig 2015-04-18 21:22:03 UTC +--- source/gamelib/packfile.c.orig 2018-02-19 15:02:50 UTC +++ source/gamelib/packfile.c -@@ -1399,7 +1399,7 @@ void packfile_music_read(fileliststruct +@@ -1408,7 +1408,7 @@ void packfile_music_read(fileliststruct *filelist, int getBasePath(packfile, filelist[i].filename, 1); if(stristr(packfile, ".pak")) { -- memset(filelist[i].bgmTracks, 0, 256); +- memset(filelist[i].bgmTracks, 0, PACKFILE_PATH_MAX); + memset(filelist[i].bgmTracks, 0, sizeof(filelist[i].bgmTracks)); filelist[i].nTracks = 0; fd = fopen(packfile, "rb"); From owner-svn-ports-branches@freebsd.org Tue Feb 20 07:02:01 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8963DF08BBA; Tue, 20 Feb 2018 07:02:01 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3DCA186B7B; Tue, 20 Feb 2018 07:02:01 +0000 (UTC) (envelope-from pi@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 38C42260B8; Tue, 20 Feb 2018 07:02:01 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1K721Gd041824; Tue, 20 Feb 2018 07:02:01 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1K721oU041822; Tue, 20 Feb 2018 07:02:01 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201802200702.w1K721oU041822@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Tue, 20 Feb 2018 07:02:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462374 - branches/2018Q1/net/quagga X-SVN-Group: ports-branches X-SVN-Commit-Author: pi X-SVN-Commit-Paths: branches/2018Q1/net/quagga X-SVN-Commit-Revision: 462374 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 07:02:01 -0000 Author: pi Date: Tue Feb 20 07:02:00 2018 New Revision: 462374 URL: https://svnweb.freebsd.org/changeset/ports/462374 Log: MFH: r462370 net/quagga: upgrade 1.2.3 -> 1.2.4, fix ospfd crash - ospfd crashed in 1.2.3, this update fixes that crash Relnotes: https://github.com/GNOME/evince/blob/master/NEWS Approved by: portmgr (riggs) Modified: branches/2018Q1/net/quagga/Makefile branches/2018Q1/net/quagga/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net/quagga/Makefile ============================================================================== --- branches/2018Q1/net/quagga/Makefile Tue Feb 20 06:48:59 2018 (r462373) +++ branches/2018Q1/net/quagga/Makefile Tue Feb 20 07:02:00 2018 (r462374) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= quagga -PORTVERSION= 1.2.3 +PORTVERSION= 1.2.4 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH Modified: branches/2018Q1/net/quagga/distinfo ============================================================================== --- branches/2018Q1/net/quagga/distinfo Tue Feb 20 06:48:59 2018 (r462373) +++ branches/2018Q1/net/quagga/distinfo Tue Feb 20 07:02:00 2018 (r462374) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517952673 -SHA256 (quagga-1.2.3.tar.gz) = ee2c0907a106902abbdcaf63b4f28c67241c4f3396989ed54da7b4976eecad31 -SIZE (quagga-1.2.3.tar.gz) = 2925444 +TIMESTAMP = 1519100237 +SHA256 (quagga-1.2.4.tar.gz) = e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3 +SIZE (quagga-1.2.4.tar.gz) = 2925847 From owner-svn-ports-branches@freebsd.org Wed Feb 21 20:53:47 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F9C4F2958C; Wed, 21 Feb 2018 20:53:46 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 390BA72694; Wed, 21 Feb 2018 20:53:46 +0000 (UTC) (envelope-from rene@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 332681DA3E; Wed, 21 Feb 2018 20:53:46 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1LKrkM4001652; Wed, 21 Feb 2018 20:53:46 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1LKrigK001634; Wed, 21 Feb 2018 20:53:44 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201802212053.w1LKrigK001634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Wed, 21 Feb 2018 20:53:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462543 - in branches/2018Q1/www/chromium: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: rene X-SVN-Commit-Paths: in branches/2018Q1/www/chromium: . files X-SVN-Commit-Revision: 462543 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 20:53:47 -0000 Author: rene Date: Wed Feb 21 20:53:44 2018 New Revision: 462543 URL: https://svnweb.freebsd.org/changeset/ports/462543 Log: MFH: r462416 www/chromium: update to 63.0.3239.132 Submitted by: cpm Obtained from: https://github.com/cpu82/freebsd-chromium Security: https://vuxml.freebsd.org/freebsd/e264e74e-ffe0-11e7-8b91-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/1d951e85-ffdb-11e7-8b91-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/82894193-ffd4-11e7-8b91-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/f8e72cd4-c66a-11e7-bb17-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/3cd46257-bbc5-11e7-a3bc-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/a692bffe-b6ad-11e7-a1c2-e8e0b747a45a.html Approved by: ports-secteam (zi) Added: branches/2018Q1/www/chromium/files/patch-base_posix_unix__domain__socket.cc - copied unchanged from r462416, head/www/chromium/files/patch-base_posix_unix__domain__socket.cc branches/2018Q1/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc - copied unchanged from r462416, head/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc branches/2018Q1/www/chromium/files/patch-base_process_process__metrics.cc - copied unchanged from r462416, head/www/chromium/files/patch-base_process_process__metrics.cc branches/2018Q1/www/chromium/files/patch-build_gn_run_binary.py - copied unchanged from r462416, head/www/chromium/files/patch-build_gn_run_binary.py branches/2018Q1/www/chromium/files/patch-build_linux_unbundle_freetype.gn - copied unchanged from r462416, head/www/chromium/files/patch-build_linux_unbundle_freetype.gn branches/2018Q1/www/chromium/files/patch-build_linux_unbundle_harfbuzz-ng.gn - copied unchanged from r462416, head/www/chromium/files/patch-build_linux_unbundle_harfbuzz-ng.gn branches/2018Q1/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py - copied unchanged from r462416, head/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py branches/2018Q1/www/chromium/files/patch-cc_BUILD.gn - copied unchanged from r462416, head/www/chromium/files/patch-cc_BUILD.gn branches/2018Q1/www/chromium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc - copied unchanged from r462416, head/www/chromium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_libgtkui_nav_button_provider_gtk3.h - copied unchanged from r462416, head/www/chromium/files/patch-chrome_browser_ui_libgtkui_nav_button_provider_gtk3.h branches/2018Q1/www/chromium/files/patch-components_feature_engagement_public_event_constants.cc - copied unchanged from r462416, head/www/chromium/files/patch-components_feature_engagement_public_event_constants.cc branches/2018Q1/www/chromium/files/patch-components_feature_engagement_public_event_constants.h - copied unchanged from r462416, head/www/chromium/files/patch-components_feature_engagement_public_event_constants.h branches/2018Q1/www/chromium/files/patch-components_network_session_configurator_browser_network_session_configurator.cc - copied unchanged from r462416, head/www/chromium/files/patch-components_network_session_configurator_browser_network_session_configurator.cc branches/2018Q1/www/chromium/files/patch-components_password__manager_core_browser_password_manager.cc - copied unchanged from r462416, head/www/chromium/files/patch-components_password__manager_core_browser_password_manager.cc branches/2018Q1/www/chromium/files/patch-components_password__manager_core_browser_password_store.cc - copied unchanged from r462416, head/www/chromium/files/patch-components_password__manager_core_browser_password_store.cc branches/2018Q1/www/chromium/files/patch-content_common_user_agent.cc - copied unchanged from r462416, head/www/chromium/files/patch-content_common_user_agent.cc branches/2018Q1/www/chromium/files/patch-content_ppapi_plugin_ppapi_plugin_main.cc - copied unchanged from r462416, head/www/chromium/files/patch-content_ppapi_plugin_ppapi_plugin_main.cc branches/2018Q1/www/chromium/files/patch-content_test_content_test_suite.cc - copied unchanged from r462416, head/www/chromium/files/patch-content_test_content_test_suite.cc branches/2018Q1/www/chromium/files/patch-content_utility_utility_main.cc - copied unchanged from r462416, head/www/chromium/files/patch-content_utility_utility_main.cc branches/2018Q1/www/chromium/files/patch-extensions_browser_api_messaging_message_service.cc - copied unchanged from r462416, head/www/chromium/files/patch-extensions_browser_api_messaging_message_service.cc branches/2018Q1/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.cc - copied unchanged from r462416, head/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.cc branches/2018Q1/www/chromium/files/patch-extensions_common_api__permission_features.json - copied unchanged from r462416, head/www/chromium/files/patch-extensions_common_api__permission_features.json branches/2018Q1/www/chromium/files/patch-extensions_common_feature_switch.cc - copied unchanged from r462416, head/www/chromium/files/patch-extensions_common_feature_switch.cc branches/2018Q1/www/chromium/files/patch-extensions_common_features_feature.cc - copied unchanged from r462416, head/www/chromium/files/patch-extensions_common_features_feature.cc branches/2018Q1/www/chromium/files/patch-media_audio_alsa_audio_manager_alsa.cc - copied unchanged from r462416, head/www/chromium/files/patch-media_audio_alsa_audio_manager_alsa.cc branches/2018Q1/www/chromium/files/patch-net_base_address__tracker__linux.cc - copied unchanged from r462416, head/www/chromium/files/patch-net_base_address__tracker__linux.cc branches/2018Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_BUILD.gn - copied unchanged from r462416, head/www/chromium/files/patch-third__party_WebKit_Source_platform_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.h - copied unchanged from r462416, head/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.h branches/2018Q1/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c - copied unchanged from r462416, head/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c branches/2018Q1/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp - copied unchanged from r462416, head/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp branches/2018Q1/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h - copied unchanged from r462416, head/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h branches/2018Q1/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc - copied unchanged from r462416, head/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc branches/2018Q1/www/chromium/files/patch-third__party_webrtc_p2p_base_port.cc - copied unchanged from r462416, head/www/chromium/files/patch-third__party_webrtc_p2p_base_port.cc branches/2018Q1/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_timestamp_extrapolator.cc - copied unchanged from r462416, head/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_timestamp_extrapolator.cc branches/2018Q1/www/chromium/files/patch-third__party_webrtc_webrtc.gni - copied unchanged from r462416, head/www/chromium/files/patch-third__party_webrtc_webrtc.gni branches/2018Q1/www/chromium/files/patch-tools_json_schema_compiler_feature_compiler.py - copied unchanged from r462416, head/www/chromium/files/patch-tools_json_schema_compiler_feature_compiler.py branches/2018Q1/www/chromium/files/patch-tools_json_schema_compiler_model.py - copied unchanged from r462416, head/www/chromium/files/patch-tools_json_schema_compiler_model.py branches/2018Q1/www/chromium/files/patch-ui_gfx_codec_jpeg_codec.cc - copied unchanged from r462416, head/www/chromium/files/patch-ui_gfx_codec_jpeg_codec.cc branches/2018Q1/www/chromium/files/patch-ui_gl_gl_bindings_api_autogen_glx.h - copied unchanged from r462416, head/www/chromium/files/patch-ui_gl_gl_bindings_api_autogen_glx.h branches/2018Q1/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc - copied unchanged from r462416, head/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc branches/2018Q1/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.h - copied unchanged from r462416, head/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.h branches/2018Q1/www/chromium/files/patch-ui_gl_gl_implementation.cc - copied unchanged from r462416, head/www/chromium/files/patch-ui_gl_gl_implementation.cc Deleted: branches/2018Q1/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc branches/2018Q1/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc branches/2018Q1/www/chromium/files/patch-base_test_BUILD.gn branches/2018Q1/www/chromium/files/patch-breakpad_BUILD.gn branches/2018Q1/www/chromium/files/patch-breakpad_src_common_simple__string__dictionary.h branches/2018Q1/www/chromium/files/patch-build_config_clang_BUILD.gn branches/2018Q1/www/chromium/files/patch-build_config_crypto.gni branches/2018Q1/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn branches/2018Q1/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn branches/2018Q1/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn branches/2018Q1/www/chromium/files/patch-build_config_sanitizers_BUILD.gn branches/2018Q1/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni branches/2018Q1/www/chromium/files/patch-build_config_ui.gni branches/2018Q1/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn branches/2018Q1/www/chromium/files/patch-chrome_app_mash_embedded_services.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_BUILD.gn branches/2018Q1/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_prefs_browser_prefs.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_BUILD.gn branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h branches/2018Q1/www/chromium/files/patch-chrome_test_BUILD.gn branches/2018Q1/www/chromium/files/patch-chromecast_BUILD.gn branches/2018Q1/www/chromium/files/patch-chromecast_browser_BUILD.gn branches/2018Q1/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc branches/2018Q1/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn branches/2018Q1/www/chromium/files/patch-chromecast_crash_BUILD.gn branches/2018Q1/www/chromium/files/patch-components_BUILD.gn branches/2018Q1/www/chromium/files/patch-components_password__manager_core_browser_BUILD.gn branches/2018Q1/www/chromium/files/patch-components_plugins_renderer_BUILD.gn branches/2018Q1/www/chromium/files/patch-components_tracing_child_child__trace__message__filter.cc branches/2018Q1/www/chromium/files/patch-content_app_BUILD.gn branches/2018Q1/www/chromium/files/patch-content_browser_accessibility_browser_accessibility_auralinux.cc branches/2018Q1/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc branches/2018Q1/www/chromium/files/patch-content_browser_memory_swap_metrics_observer_linux.cc branches/2018Q1/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc branches/2018Q1/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc branches/2018Q1/www/chromium/files/patch-content_gpu_BUILD.gn branches/2018Q1/www/chromium/files/patch-content_gpu_in__process__gpu__thread.cc branches/2018Q1/www/chromium/files/patch-content_shell_BUILD.gn branches/2018Q1/www/chromium/files/patch-content_test_BUILD.gn branches/2018Q1/www/chromium/files/patch-content_test_suite.cc branches/2018Q1/www/chromium/files/patch-device_BUILD.gn branches/2018Q1/www/chromium/files/patch-device_gamepad_BUILD.gn branches/2018Q1/www/chromium/files/patch-device_geolocation_BUILD.gn branches/2018Q1/www/chromium/files/patch-device_hid_hid__device__info__freebsd.cc branches/2018Q1/www/chromium/files/patch-device_hid_hid__device__info__freebsd.h branches/2018Q1/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc branches/2018Q1/www/chromium/files/patch-gpu_BUILD.gn branches/2018Q1/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn branches/2018Q1/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn branches/2018Q1/www/chromium/files/patch-gpu_ipc_client_BUILD.gn branches/2018Q1/www/chromium/files/patch-gpu_ipc_service_BUILD.gn branches/2018Q1/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn branches/2018Q1/www/chromium/files/patch-gpu_vulkan_BUILD.gn branches/2018Q1/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc branches/2018Q1/www/chromium/files/patch-media_base_BUILD.gn branches/2018Q1/www/chromium/files/patch-media_cast_BUILD.gn branches/2018Q1/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni branches/2018Q1/www/chromium/files/patch-mojo_BUILD.gn branches/2018Q1/www/chromium/files/patch-mojo_edk_test_BUILD.gn branches/2018Q1/www/chromium/files/patch-native__client__sdk_src_BUILD.gn branches/2018Q1/www/chromium/files/patch-net_base_mime__util__unittest.cc branches/2018Q1/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn branches/2018Q1/www/chromium/files/patch-printing_BUILD.gn branches/2018Q1/www/chromium/files/patch-sdch_BUILD.gn branches/2018Q1/www/chromium/files/patch-services_device_battery_BUILD.gn branches/2018Q1/www/chromium/files/patch-services_ui_gpu_gpu__main.cc branches/2018Q1/www/chromium/files/patch-services_ui_gpu_gpu__service.cc branches/2018Q1/www/chromium/files/patch-skia_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_expat_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_generate_gn.py branches/2018Q1/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni branches/2018Q1/www/chromium/files/patch-third__party_fontconfig_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_fontconfig_fontconfig.gni branches/2018Q1/www/chromium/files/patch-third__party_glslang_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_libxslt_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_minigbm_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_opus_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_pdfium_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn branches/2018Q1/www/chromium/files/patch-tools_battor__agent_BUILD.gn branches/2018Q1/www/chromium/files/patch-ui_aura_BUILD.gn branches/2018Q1/www/chromium/files/patch-ui_base_BUILD.gn branches/2018Q1/www/chromium/files/patch-ui_base_ime_BUILD.gn branches/2018Q1/www/chromium/files/patch-ui_base_ui__features.gni branches/2018Q1/www/chromium/files/patch-ui_compositor_BUILD.gn branches/2018Q1/www/chromium/files/patch-ui_message__center_message__center__style.h branches/2018Q1/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc branches/2018Q1/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h branches/2018Q1/www/chromium/files/patch-ui_resources_ui__resources.grd branches/2018Q1/www/chromium/files/patch-ui_views_BUILD.gn branches/2018Q1/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn branches/2018Q1/www/chromium/files/patch-ui_views_mus_BUILD.gn Modified: branches/2018Q1/www/chromium/Makefile branches/2018Q1/www/chromium/distinfo branches/2018Q1/www/chromium/files/audio_manager_openbsd.cc branches/2018Q1/www/chromium/files/audio_manager_openbsd.h branches/2018Q1/www/chromium/files/extra-patch-clang branches/2018Q1/www/chromium/files/extra-patch-libc++-new branches/2018Q1/www/chromium/files/extra-patch-libc++-old branches/2018Q1/www/chromium/files/patch-BUILD.gn branches/2018Q1/www/chromium/files/patch-base_BUILD.gn branches/2018Q1/www/chromium/files/patch-base_process_memory.cc branches/2018Q1/www/chromium/files/patch-base_process_process__handle__freebsd.cc branches/2018Q1/www/chromium/files/patch-base_process_process__iterator__freebsd.cc branches/2018Q1/www/chromium/files/patch-base_process_process__metrics.h branches/2018Q1/www/chromium/files/patch-base_process_process__metrics__freebsd.cc branches/2018Q1/www/chromium/files/patch-base_process_process__posix.cc branches/2018Q1/www/chromium/files/patch-base_sys__info__freebsd.cc branches/2018Q1/www/chromium/files/patch-base_sys__info__posix.cc branches/2018Q1/www/chromium/files/patch-base_test_launcher_test__launcher.cc branches/2018Q1/www/chromium/files/patch-base_third__party_libevent_BUILD.gn branches/2018Q1/www/chromium/files/patch-base_trace__event_process__memory__dump.cc branches/2018Q1/www/chromium/files/patch-build_config_BUILDCONFIG.gn branches/2018Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn branches/2018Q1/www/chromium/files/patch-build_config_features.gni branches/2018Q1/www/chromium/files/patch-chrome_BUILD.gn branches/2018Q1/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc branches/2018Q1/www/chromium/files/patch-chrome_app_generated__resources.grd branches/2018Q1/www/chromium/files/patch-chrome_app_settings__strings.grdp branches/2018Q1/www/chromium/files/patch-chrome_browser_about__flags.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_browser__process__impl.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_browser__resources.grd branches/2018Q1/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h branches/2018Q1/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_download_download__prefs.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn branches/2018Q1/www/chromium/files/patch-chrome_browser_flag__descriptions.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html branches/2018Q1/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc branches/2018Q1/www/chromium/files/patch-chrome_common_BUILD.gn branches/2018Q1/www/chromium/files/patch-chrome_common_chrome__switches.cc branches/2018Q1/www/chromium/files/patch-chrome_common_chrome__switches.h branches/2018Q1/www/chromium/files/patch-chrome_common_url__constants.h branches/2018Q1/www/chromium/files/patch-components_autofill_strings.grdp branches/2018Q1/www/chromium/files/patch-components_crash_content_app_BUILD.gn branches/2018Q1/www/chromium/files/patch-components_crash_content_browser_BUILD.gn branches/2018Q1/www/chromium/files/patch-components_metrics_BUILD.gn branches/2018Q1/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp branches/2018Q1/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc branches/2018Q1/www/chromium/files/patch-components_policy_tools_generate__policy__source.py branches/2018Q1/www/chromium/files/patch-components_storage__monitor_BUILD.gn branches/2018Q1/www/chromium/files/patch-content_app_content__main__runner.cc branches/2018Q1/www/chromium/files/patch-content_browser_BUILD.gn branches/2018Q1/www/chromium/files/patch-content_browser_browser__main__loop.cc branches/2018Q1/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc branches/2018Q1/www/chromium/files/patch-content_browser_memory_memory__monitor.cc branches/2018Q1/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc branches/2018Q1/www/chromium/files/patch-content_browser_utility__process__host__impl.cc branches/2018Q1/www/chromium/files/patch-content_common_BUILD.gn branches/2018Q1/www/chromium/files/patch-content_common_content__switches__internal.cc branches/2018Q1/www/chromium/files/patch-content_gpu_gpu__main.cc branches/2018Q1/www/chromium/files/patch-content_renderer_render__thread__impl.cc branches/2018Q1/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc branches/2018Q1/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h branches/2018Q1/www/chromium/files/patch-content_renderer_renderer_main.cc branches/2018Q1/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc branches/2018Q1/www/chromium/files/patch-device_geolocation_location__arbitrator.cc branches/2018Q1/www/chromium/files/patch-device_hid_BUILD.gn branches/2018Q1/www/chromium/files/patch-device_hid_hid__connection__freebsd.cc branches/2018Q1/www/chromium/files/patch-device_hid_hid__connection__freebsd.h branches/2018Q1/www/chromium/files/patch-device_hid_hid__service__freebsd.cc branches/2018Q1/www/chromium/files/patch-device_hid_hid__service__freebsd.h branches/2018Q1/www/chromium/files/patch-device_serial_BUILD.gn branches/2018Q1/www/chromium/files/patch-gpu_config_gpu__control__list.cc branches/2018Q1/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc branches/2018Q1/www/chromium/files/patch-headless_lib_headless__macros.h branches/2018Q1/www/chromium/files/patch-media_audio_BUILD.gn branches/2018Q1/www/chromium/files/patch-media_audio_audio__manager.cc branches/2018Q1/www/chromium/files/patch-media_audio_audio__manager.h branches/2018Q1/www/chromium/files/patch-media_base_audio__latency.cc branches/2018Q1/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc branches/2018Q1/www/chromium/files/patch-net_BUILD.gn branches/2018Q1/www/chromium/files/patch-net_base_address__tracker__linux.h branches/2018Q1/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc branches/2018Q1/www/chromium/files/patch-net_proxy_proxy__service.cc branches/2018Q1/www/chromium/files/patch-net_socket_udp__socket__posix.cc branches/2018Q1/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc branches/2018Q1/www/chromium/files/patch-sandbox_features.gni branches/2018Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp branches/2018Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_x11.cpp branches/2018Q1/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h branches/2018Q1/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp branches/2018Q1/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp branches/2018Q1/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfgas_fontmgr.cpp branches/2018Q1/www/chromium/files/patch-third__party_sqlite_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_usrsctp_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_webrtc_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_webrtc_rtc_base_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc branches/2018Q1/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_yasm_BUILD.gn branches/2018Q1/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn branches/2018Q1/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py branches/2018Q1/www/chromium/files/patch-ui_base_resource_resource__bundle.cc branches/2018Q1/www/chromium/files/patch-ui_gfx_font__list.cc branches/2018Q1/www/chromium/files/patch-ui_gfx_font__render__params.h branches/2018Q1/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc branches/2018Q1/www/chromium/files/patch-ui_gl_BUILD.gn branches/2018Q1/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc branches/2018Q1/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h branches/2018Q1/www/chromium/files/sndio_input.cc branches/2018Q1/www/chromium/pkg-message branches/2018Q1/www/chromium/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/chromium/Makefile ============================================================================== --- branches/2018Q1/www/chromium/Makefile Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/Makefile Wed Feb 21 20:53:44 2018 (r462543) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 61.0.3163.100 -PORTREVISION= 5 +PORTVERSION= 63.0.3239.132 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -35,6 +34,7 @@ BUILD_DEPENDS+= gperf:devel/gperf \ LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ + libopus.so:audio/opus \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ @@ -49,7 +49,9 @@ LIB_DEPENDS= libspeechd.so:accessibility/speech-dispat libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ + libopenh264.so:multimedia/openh264 \ libcups.so:print/cups \ + libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ @@ -60,7 +62,7 @@ LIB_DEPENDS= libspeechd.so:accessibility/speech-dispat libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils \ - droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf + noto>0:x11-fonts/noto BROKEN_FreeBSD_11_aarch64= components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous BROKEN_FreeBSD_12_aarch64= third_party/skia/src/core/SkCpu.cpp:84:27: use of undeclared identifier 'getauxval' @@ -79,6 +81,7 @@ MAKE_ARGS= -C out/${BUILDTYPE} .if !defined(GN_ONLY) CPE_VENDOR= google CPE_PRODUCT= chrome +USE_GL= gl USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ @@ -104,22 +107,29 @@ GN_ARGS+= clang_use_chrome_plugins=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ - enable_webrtc=false \ + enable_webrtc=true \ fieldtrial_testing_like_official_build=true \ is_clang=true \ + is_official_build=true \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ + use_bundled_fontconfig=false \ use_cups=true \ + use_custom_libcxx=false \ use_gtk3=true \ use_lld=true \ use_sysroot=false \ + use_system_freetype=true \ + use_system_harfbuzz=true \ use_system_libjpeg=true \ - use_system_sqlite=false # chrome has additional patches + use_system_sqlite=false \ + extra_cxxflags="-I${LOCALBASE}/include" \ + extra_ldflags="-L${LOCALBASE}/lib" # TODO: investigate building with these options: -# use_system_icu use_system_harfbuzz use_system_minigbm +# use_system_icu use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild # FreeBSD Chromium Api Key @@ -134,12 +144,11 @@ GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoa SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS GCONF KERBEROS DRIVER +OPTIONS_DEFINE= CODECS DEBUG DRIVER GCONF KERBEROS TEST CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver -OPTIONS_GROUP= AUDIO TESTS +OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO -OPTIONS_GROUP_TESTS= DEBUG TEST OPTIONS_DEFAULT= ALSA CODECS DRIVER GCONF KERBEROS OPTIONS_SUB= yes @@ -159,6 +168,7 @@ CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ + GN_ARGS+=is_component_build=false \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="lots of free diskspace (~ 8.5GB)" DEBUG_VARS_OFF= BUILDTYPE=Release \ @@ -202,7 +212,7 @@ MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include # Work around base r261801 -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1004000 GN_ARGS+= extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old .else @@ -220,6 +230,11 @@ pre-everything:: @${ECHO_MSG} "and ${WANTSPACE}." @${ECHO_MSG} +post-patch: + @${REINPLACE_CMD} -e 's|@@PACKAGE@@|chromium|' \ + -e 's|@@MENUNAME@@|Chromium Web Browser|' \ + ${WRKSRC}/chrome/app/resources/manpage.1.in + post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio @@ -233,7 +248,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE} + ffmpeg flac freetype harfbuzz-ng libdrm libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} .endif do-configure: @@ -259,25 +274,17 @@ do-test-TEST-on: .if !defined(GN_ONLY) do-install: @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.for m in font_service test_ime_driver ui - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${m}.service \ - ${STAGEDIR}${DATADIR} -.endfor + ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ + ${STAGEDIR}${MANPREFIX}/man/man1/chrome.1 + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.service ${STAGEDIR}${DATADIR} .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor - ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ - ${STAGEDIR}${DATADIR} -.for p in chrome_100_percent chrome_200_percent headless_lib keyboard_resources \ - resources mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \ - views_mus_resources - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \ - ${STAGEDIR}${DATADIR} -.endfor -.for d in icudtl.dat natives_blob.bin snapshot_blob.bin + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} +.for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ @@ -288,8 +295,16 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ + ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} +.for f in libEGL.so libGLESv2.so + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} +.endfor + @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader +.for g in libEGL.so libGLESv2.so + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ + ${STAGEDIR}${DATADIR}/swiftshader +.endfor post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ Modified: branches/2018Q1/www/chromium/distinfo ============================================================================== --- branches/2018Q1/www/chromium/distinfo Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/distinfo Wed Feb 21 20:53:44 2018 (r462543) @@ -1,5 +1,5 @@ -TIMESTAMP = 1506100596 -SHA256 (chromium-61.0.3163.100.tar.xz) = 4135968cac6623c1d2b224494600cd274098cce41c298f8c3908b354a34c281b -SIZE (chromium-61.0.3163.100.tar.xz) = 556305252 -SHA256 (chromium-61.0.3163.100-testdata.tar.xz) = aae39df201eef2be59c8e65fa86c7688f05bf882d97f876a406d731209a21cea -SIZE (chromium-61.0.3163.100-testdata.tar.xz) = 126588708 +TIMESTAMP = 1515196732 +SHA256 (chromium-63.0.3239.132.tar.xz) = 84c46c2c42faaa102abe0647ee1213615a2522627124924c2741ddc2161b3d8d +SIZE (chromium-63.0.3239.132.tar.xz) = 534286424 +SHA256 (chromium-63.0.3239.132-testdata.tar.xz) = 3706e61b3473624dedea61730a6633d94e00fb3670ebdee97a9f73fbdf6bd672 +SIZE (chromium-63.0.3239.132-testdata.tar.xz) = 172896844 Modified: branches/2018Q1/www/chromium/files/audio_manager_openbsd.cc ============================================================================== --- branches/2018Q1/www/chromium/files/audio_manager_openbsd.cc Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/files/audio_manager_openbsd.cc Wed Feb 21 20:53:44 2018 (r462543) @@ -46,10 +46,6 @@ bool AudioManagerOpenBSD::HasAudioInputDevices() { return true; } -void AudioManagerOpenBSD::ShowAudioInputSettings() { - NOTIMPLEMENTED(); -} - void AudioManagerOpenBSD::GetAudioInputDeviceNames( AudioDeviceNames* device_names) { DCHECK(device_names->empty()); Modified: branches/2018Q1/www/chromium/files/audio_manager_openbsd.h ============================================================================== --- branches/2018Q1/www/chromium/files/audio_manager_openbsd.h Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/files/audio_manager_openbsd.h Wed Feb 21 20:53:44 2018 (r462543) @@ -24,7 +24,6 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioM // Implementation of AudioManager. bool HasAudioOutputDevices() override; bool HasAudioInputDevices() override; - void ShowAudioInputSettings() override; void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; AudioParameters GetInputStreamParameters( Modified: branches/2018Q1/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2018Q1/www/chromium/files/extra-patch-clang Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/files/extra-patch-clang Wed Feb 21 20:53:44 2018 (r462543) @@ -27,20 +27,6 @@ if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); ---- base/tracked_objects_unittest.cc.orig 2015-08-22 15:01:51.000000000 -0400 -+++ base/tracked_objects_unittest.cc 2015-09-03 09:20:53.370191000 -0400 -@@ -58,9 +58,9 @@ - Births* birth = ThreadData::TallyABirthIfActive(location); - - if (ThreadData::status() == ThreadData::DEACTIVATED) -- EXPECT_EQ(reinterpret_cast(NULL), birth); -+ EXPECT_EQ(static_cast(NULL), birth); - else -- EXPECT_NE(reinterpret_cast(NULL), birth); -+ EXPECT_NE(static_cast(NULL), birth); - } - - // Helper function to verify the most common test expectations. --- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200 +++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200 @@ -387,7 +387,7 @@ Modified: branches/2018Q1/www/chromium/files/extra-patch-libc++-new ============================================================================== --- branches/2018Q1/www/chromium/files/extra-patch-libc++-new Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/files/extra-patch-libc++-new Wed Feb 21 20:53:44 2018 (r462543) @@ -1,15 +1,7 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2017-09-05 21:05:47.000000000 +0200 -+++ tools/gn/bootstrap/bootstrap.py 2017-09-10 22:43:57.996797000 +0200 -@@ -23,6 +23,7 @@ - import shutil - import subprocess - import sys -+import platform - import tempfile +--- tools/gn/bootstrap/bootstrap.py.orig 2017-12-23 20:11:27.769312000 +0100 ++++ tools/gn/bootstrap/bootstrap.py 2017-12-23 20:28:42.756301000 +0100 +@@ -32,9 +32,10 @@ - BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__)) -@@ -31,9 +32,10 @@ - is_win = sys.platform.startswith('win') is_linux = sys.platform.startswith('linux') +is_bsd = platform.system().lower().endswith('bsd') @@ -20,55 +12,23 @@ def check_call(cmd, **kwargs): logging.debug('Running: %s', ' '.join(cmd)) -@@ -449,6 +451,7 @@ - 'base/metrics/histogram_base.cc', - 'base/metrics/histogram_functions.cc', - 'base/metrics/histogram_samples.cc', -+ 'base/metrics/histogram_snapshot_manager.cc', - 'base/metrics/metrics_hashes.cc', - 'base/metrics/persistent_histogram_allocator.cc', - 'base/metrics/persistent_memory_allocator.cc', -@@ -534,7 +537,7 @@ - 'base/trace_event/heap_profiler_allocation_context_tracker.cc', - 'base/trace_event/heap_profiler_allocation_register.cc', - 'base/trace_event/heap_profiler_event_filter.cc', -- 'base/trace_event/heap_profiler_event_writer.cc', -+ 'base/trace_event/heap_profiler_heap_dump_writer.cc', - 'base/trace_event/heap_profiler_serialization_state.cc', - 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', - 'base/trace_event/heap_profiler_type_name_deduplicator.cc', -@@ -627,7 +630,7 @@ +@@ -576,7 +577,6 @@ + 'base/trace_event/trace_log_constants.cc', + 'base/trace_event/tracing_agent.cc', + 'base/unguessable_token.cc', +- 'base/value_iterators.cc', + 'base/values.cc', + 'base/vlog.cc', + ]) +@@ -633,6 +633,44 @@ 'cflags': cflags + ['-DHAVE_CONFIG_H'], } -- if is_linux or is_aix: -+ if is_linux or is_aix or is_bsd: - ldflags.extend(['-pthread']) - - static_libraries['xdg_user_dirs'] = { -@@ -642,16 +645,44 @@ - 'base/memory/shared_memory_tracker.cc', - 'base/nix/xdg_util.cc', - 'base/process/internal_linux.cc', -- 'base/process/memory_linux.cc', -+ #'base/process/memory_linux.cc', - 'base/process/process_handle_linux.cc', - 'base/process/process_info_linux.cc', -- 'base/process/process_iterator_linux.cc', -- 'base/process/process_linux.cc', -- 'base/process/process_metrics_linux.cc', -+ #'base/process/process_iterator_linux.cc', -+ #'base/process/process_linux.cc', -+ #'base/process/process_metrics_linux.cc', - 'base/strings/sys_string_conversions_posix.cc', -- 'base/sys_info_linux.cc', -+ #'base/sys_info_linux.cc', - 'base/threading/platform_thread_linux.cc', - ]) -+ if is_bsd: -+ libs.extend(['-lexecinfo', '-lkvm']) -+ ldflags.extend(['-pthread']) -+ ++ if is_bsd: ++ libs.extend(['-lexecinfo', '-lkvm']) ++ ldflags.extend(['-pthread']) ++ include_dirs += ["/usr/local/include"] ++ + static_libraries['xdg_user_dirs'] = { + 'sources': [ + 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', @@ -76,12 +36,21 @@ + 'tool': 'cxx', + } + static_libraries['base']['sources'].extend([ -+ 'base/allocator/allocator_shim.cc', -+ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', -+ 'base/process/process_handle_' + platform.system().lower() + '.cc', -+ 'base/process/process_iterator_' + platform.system().lower() + '.cc', -+ 'base/process/process_metrics_'+ platform.system().lower() + '.cc', -+ 'base/sys_info_' + platform.system().lower() + '.cc', ++ 'base/memory/shared_memory_handle_posix.cc', ++ 'base/memory/shared_memory_posix.cc', ++ 'base/nix/xdg_util.cc', ++ 'base/process/memory_stubs.cc', ++ 'base/process/process_info_linux.cc', ++ 'base/process/internal_linux.cc', ++ 'base/process/process_handle_freebsd.cc', ++ 'base/process/process_metrics_freebsd.cc', ++ 'base/strings/sys_string_conversions_posix.cc', ++ 'base/sys_info_freebsd.cc', ++ 'base/threading/platform_thread_linux.cc', ++ 'base/synchronization/waitable_event_posix.cc', ++ 'base/time/time_exploded_posix.cc', ++ 'base/time/time_now_posix.cc', ++ 'base/value_iterators.cc', + ]) + static_libraries['libevent']['include_dirs'].extend([ + os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd') @@ -93,10 +62,10 @@ + # Suppressing warnings + cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) + - if is_linux: - static_libraries['base']['sources'].extend([ - 'base/allocator/allocator_shim.cc', -@@ -663,17 +694,6 @@ + if is_linux or is_aix: + ldflags.extend(['-pthread']) + +@@ -671,17 +709,6 @@ ]) static_libraries['libevent']['sources'].extend([ 'base/third_party/libevent/epoll.c', Modified: branches/2018Q1/www/chromium/files/extra-patch-libc++-old ============================================================================== --- branches/2018Q1/www/chromium/files/extra-patch-libc++-old Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/files/extra-patch-libc++-old Wed Feb 21 20:53:44 2018 (r462543) @@ -1,15 +1,7 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2017-09-05 21:05:47.000000000 +0200 -+++ tools/gn/bootstrap/bootstrap.py 2017-09-10 19:20:25.156037000 +0200 -@@ -23,6 +23,7 @@ - import shutil - import subprocess - import sys -+import platform - import tempfile +--- tools/gn/bootstrap/bootstrap.py.orig 2017-12-23 20:11:27.769312000 +0100 ++++ tools/gn/bootstrap/bootstrap.py 2017-12-23 20:27:26.501215000 +0100 +@@ -32,9 +32,10 @@ - BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__)) -@@ -31,9 +32,10 @@ - is_win = sys.platform.startswith('win') is_linux = sys.platform.startswith('linux') +is_bsd = platform.system().lower().endswith('bsd') @@ -20,55 +12,23 @@ def check_call(cmd, **kwargs): logging.debug('Running: %s', ' '.join(cmd)) -@@ -449,6 +451,7 @@ - 'base/metrics/histogram_base.cc', - 'base/metrics/histogram_functions.cc', - 'base/metrics/histogram_samples.cc', -+ 'base/metrics/histogram_snapshot_manager.cc', - 'base/metrics/metrics_hashes.cc', - 'base/metrics/persistent_histogram_allocator.cc', - 'base/metrics/persistent_memory_allocator.cc', -@@ -534,7 +537,7 @@ - 'base/trace_event/heap_profiler_allocation_context_tracker.cc', - 'base/trace_event/heap_profiler_allocation_register.cc', - 'base/trace_event/heap_profiler_event_filter.cc', -- 'base/trace_event/heap_profiler_event_writer.cc', -+ 'base/trace_event/heap_profiler_heap_dump_writer.cc', - 'base/trace_event/heap_profiler_serialization_state.cc', - 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', - 'base/trace_event/heap_profiler_type_name_deduplicator.cc', -@@ -627,7 +630,7 @@ +@@ -576,7 +577,6 @@ + 'base/trace_event/trace_log_constants.cc', + 'base/trace_event/tracing_agent.cc', + 'base/unguessable_token.cc', +- 'base/value_iterators.cc', + 'base/values.cc', + 'base/vlog.cc', + ]) +@@ -633,6 +633,47 @@ 'cflags': cflags + ['-DHAVE_CONFIG_H'], } -- if is_linux or is_aix: -+ if is_linux or is_aix or is_bsd: - ldflags.extend(['-pthread']) - - static_libraries['xdg_user_dirs'] = { -@@ -642,16 +645,45 @@ - 'base/memory/shared_memory_tracker.cc', - 'base/nix/xdg_util.cc', - 'base/process/internal_linux.cc', -- 'base/process/memory_linux.cc', -+ #'base/process/memory_linux.cc', - 'base/process/process_handle_linux.cc', - 'base/process/process_info_linux.cc', -- 'base/process/process_iterator_linux.cc', -- 'base/process/process_linux.cc', -- 'base/process/process_metrics_linux.cc', -+ #'base/process/process_iterator_linux.cc', -+ #'base/process/process_linux.cc', -+ #'base/process/process_metrics_linux.cc', - 'base/strings/sys_string_conversions_posix.cc', -- 'base/sys_info_linux.cc', -+ #'base/sys_info_linux.cc', - 'base/threading/platform_thread_linux.cc', - ]) -+ if is_bsd: -+ libs.extend(['-lexecinfo', '-lkvm']) -+ ldflags.extend(['-pthread']) -+ ++ if is_bsd: ++ libs.extend(['-lexecinfo', '-lkvm']) ++ ldflags.extend(['-pthread']) ++ include_dirs += ["/usr/local/include"] ++ + static_libraries['xdg_user_dirs'] = { + 'sources': [ + 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', @@ -76,12 +36,21 @@ + 'tool': 'cxx', + } + static_libraries['base']['sources'].extend([ -+ 'base/allocator/allocator_shim.cc', -+ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', -+ 'base/process/process_handle_' + platform.system().lower() + '.cc', -+ 'base/process/process_iterator_' + platform.system().lower() + '.cc', -+ 'base/process/process_metrics_'+ platform.system().lower() + '.cc', -+ 'base/sys_info_' + platform.system().lower() + '.cc', ++ 'base/memory/shared_memory_handle_posix.cc', ++ 'base/memory/shared_memory_posix.cc', ++ 'base/nix/xdg_util.cc', ++ 'base/process/memory_stubs.cc', ++ 'base/process/process_info_linux.cc', ++ 'base/process/internal_linux.cc', ++ 'base/process/process_handle_freebsd.cc', ++ 'base/process/process_metrics_freebsd.cc', ++ 'base/strings/sys_string_conversions_posix.cc', ++ 'base/sys_info_freebsd.cc', ++ 'base/threading/platform_thread_linux.cc', ++ 'base/synchronization/waitable_event_posix.cc', ++ 'base/time/time_exploded_posix.cc', ++ 'base/time/time_now_posix.cc', ++ 'base/value_iterators.cc', + ]) + static_libraries['libevent']['include_dirs'].extend([ + os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd') @@ -92,12 +61,14 @@ + + # Suppressing warnings + cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) ++ ++ # Work around base r261801 + cflags_cc.extend(['-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1']) + - if is_linux: - static_libraries['base']['sources'].extend([ - 'base/allocator/allocator_shim.cc', -@@ -663,17 +695,6 @@ + if is_linux or is_aix: + ldflags.extend(['-pthread']) + +@@ -671,17 +712,6 @@ ]) static_libraries['libevent']['sources'].extend([ 'base/third_party/libevent/epoll.c', Modified: branches/2018Q1/www/chromium/files/patch-BUILD.gn ============================================================================== --- branches/2018Q1/www/chromium/files/patch-BUILD.gn Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/files/patch-BUILD.gn Wed Feb 21 20:53:44 2018 (r462543) @@ -1,162 +1,96 @@ ---- BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200 -+++ BUILD.gn 2017-07-29 00:52:25.378843000 +0200 -@@ -92,7 +92,7 @@ +--- BUILD.gn.orig 2017-12-15 02:04:03.000000000 +0100 ++++ BUILD.gn 2017-12-25 04:12:31.425198000 +0100 +@@ -99,7 +99,7 @@ ] } - if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { -+ if (!is_ios && !is_android && !is_bsd && !is_chromecast && !is_fuchsia) { ++ if (!is_ios && !is_android && !is_chromecast && !is_fuchsia && !is_bsd) { deps += [ "//chrome", - "//chrome/test:browser_tests", -@@ -151,7 +151,7 @@ - ] + "//chrome/installer/zucchini:zucchini", +@@ -368,7 +368,7 @@ + } } -- if (!is_ios && !is_fuchsia) { -+ if (!is_ios && !is_bsd && !is_fuchsia) { +- if (is_linux || is_android) { ++ if ((is_linux && !is_bsd) || is_android) { deps += [ - "//cc:cc_unittests", - "//chrome/test:telemetry_perf_unittests", -@@ -363,7 +363,7 @@ + "//third_party/breakpad:breakpad_unittests", + "//third_party/breakpad:core-2-minidump", +@@ -408,8 +408,6 @@ + "//net:disk_cache_memory_test", + "//net:quic_client", + "//net:quic_server", +- "//sandbox/linux:chrome_sandbox", +- "//sandbox/linux:sandbox_linux_unittests", ] - } -- if (is_linux) { -+ if (is_linux || is_bsd) { - # The following are definitely linux-only. - deps += [ - "//chrome:manpage", -@@ -386,9 +386,16 @@ - # TODO(dpranke): add the linux_dump_symbols flag? - deps += [ "//chrome:linux_symbols" ] - } -+ -+ if (is_bsd) { -+ deps -= [ -+ "//sandbox/linux:chrome_sandbox", -+ "//sandbox/linux:sandbox_linux_unittests", -+ ] -+ } - } + if (use_dbus) { +@@ -465,10 +463,6 @@ + "//chrome/test/chromedriver:chromedriver", + "//chrome/test/chromedriver:chromedriver_tests", + "//components/sync:run_sync_testserver", +- "//courgette:courgette", +- "//courgette:courgette_fuzz", +- "//courgette:courgette_minimal_tool", +- "//courgette:courgette_unittests", + "//media/cast:generate_barcode_video", + "//media/cast:generate_timecode_audio", + "//net:crash_cache", +@@ -523,10 +517,6 @@ + "//mojo/edk/test:mojo_public_system_perftests", + "//services/service_manager/public/cpp", + "//testing/gmock:gmock_main", +- "//third_party/breakpad:dump_syms($host_toolchain)", +- "//third_party/breakpad:microdump_stackwalk($host_toolchain)", +- "//third_party/breakpad:minidump_dump($host_toolchain)", +- "//third_party/breakpad:minidump_stackwalk($host_toolchain)", + ] -- if (is_ios || is_win || (is_linux && !is_chromeos)) { -+ if (is_ios || is_win || is_bsd || (is_linux && !is_chromeos)) { - deps += [ - "//base:base_i18n_perftests", - "//base:base_perftests", -@@ -459,7 +466,7 @@ - if (enable_nacl) { - deps += [ "//components/nacl/loader:nacl_loader_unittests" ] - -- if (is_linux) { -+ if (is_linux || is_bsd) { - # TODO(dpranke): Figure out what platforms should actually have this. - deps += [ "//components/nacl/loader:nacl_helper" ] - -@@ -557,7 +564,7 @@ + if (!is_android) { +@@ -594,7 +584,7 @@ deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } - } else if (!is_android && !is_ios && !is_fuchsia) { -+ } else if (!is_android && !is_ios && !is_bsd && !is_fuchsia) { - deps += [ "//breakpad:symupload($host_toolchain)" ] ++ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { + deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -588,7 +595,7 @@ - deps += [ "//components/proximity_auth:proximity_auth_unittests" ] - } +@@ -831,7 +821,6 @@ + "//ppapi/examples/video_decode", + "//sandbox/linux:chrome_sandbox", + "//sandbox/linux:sandbox_linux_unittests", +- "//third_party/breakpad:minidump_stackwalk($host_toolchain)", -- if (is_win || is_linux) { -+ if (is_win || is_linux || is_bsd) { - deps += [ - "//mash:all", - "//media/mojo/services:media_service_unittests", -@@ -606,7 +613,7 @@ - } - } - -- if (is_linux && !is_chromeos && !is_chromecast) { -+ if ((is_linux || is_bsd) && !is_chromeos && !is_chromecast) { - # TODO(GYP): Figure out if any of these should be in gn_all - # and figure out how cross-platform they are - deps += [ -@@ -644,7 +651,7 @@ - } - - if (target_cpu == "x86" || target_cpu == "x64") { -- if (!is_android) { -+ if (!is_android && !is_bsd) { - deps += [ "//chrome/test:load_library_perf_tests" ] - } - deps += [ -@@ -652,13 +659,13 @@ - "//third_party/libjpeg_turbo:simd_asm", - ] - } -- if (is_linux && current_toolchain == host_toolchain) { -+ if ((is_linux || is_bsd) && current_toolchain == host_toolchain) { - deps += [ "//v8:v8_shell" ] - } - } - - if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || -- (use_libfuzzer && is_mac)) { -+ (use_libfuzzer && is_mac) || is_bsd) { - deps += [ - "//testing/libfuzzer/fuzzers", - "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -677,7 +684,7 @@ - deps += [ "//native_client_sdk/src:nacl_core_sdk" ] - } - -- if (is_linux && use_ozone) { -+ if ((is_linux || is_bsd ) && use_ozone) { - deps += [ - "//headless", - "//headless:headless_tests", -@@ -811,7 +818,7 @@ - } - } - --if (!is_ios && !is_fuchsia) { -+if (!is_ios && !is_bsd && !is_fuchsia) { - # This group includes all of the targets needed to build and test Blink, - # including running the layout tests (see below). - group("blink_tests") { -@@ -879,7 +886,7 @@ + # Blocked on https://github.com/catapult-project/catapult/issues/2297 + #"//third_party/catapult/telemetry:bitmaptools", +@@ -939,7 +928,7 @@ data_deps += [ "//content/shell:content_shell_crash_service" ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { - data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + data_deps += + [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } - -@@ -887,7 +894,7 @@ - data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] +@@ -948,7 +937,7 @@ + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } - if (is_linux) { + if (is_linux && !is_bsd) { - data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -941,7 +948,7 @@ - group("chromium_builder_perf") { - testonly = true - -- if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { -+ if (!is_ios && !is_android && !is_bsd && !is_chromecast && !is_fuchsia) { - data_deps = [ - "//cc:cc_perftests", - "//chrome/test:load_library_perf_tests", -@@ -975,7 +982,7 @@ +@@ -1066,9 +1055,6 @@ "//chrome/installer/mini_installer:mini_installer", "//chrome/test:angle_perftests", ] - } else { -+ } else if (!is_bsd) { - data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] +- data_deps += +- [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } } + } Modified: branches/2018Q1/www/chromium/files/patch-base_BUILD.gn ============================================================================== --- branches/2018Q1/www/chromium/files/patch-base_BUILD.gn Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/files/patch-base_BUILD.gn Wed Feb 21 20:53:44 2018 (r462543) @@ -1,15 +1,6 @@ ---- base/BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200 -+++ base/BUILD.gn 2017-08-02 22:12:25.442369000 +0200 -@@ -1106,7 +1106,7 @@ - "base_paths_win.h", - ] - -- if (is_linux) { -+ if (is_linux || is_bsd) { - sources += [ "base_paths_posix.cc" ] - } - } -@@ -1142,7 +1142,7 @@ +--- base/BUILD.gn.orig 2017-12-15 02:04:05.000000000 +0100 ++++ base/BUILD.gn 2017-12-30 01:18:00.438461000 +0100 +@@ -1125,7 +1125,7 @@ # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -18,31 +9,44 @@ host_toolchain != "//build/toolchain/cros:host") { libs = [ "atomic" ] } -@@ -1168,7 +1168,7 @@ +@@ -1151,7 +1151,7 @@ "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] - } else if (is_linux && use_allocator == "none") { -+ } else if (is_linux && !is_bsd && use_allocator == "none") { ++ } else if ((is_linux && !is_bsd) && use_allocator == "none") { sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1185,6 +1185,31 @@ +@@ -1539,7 +1539,7 @@ + "//base/third_party/xdg_user_dirs", + ] + } else { +- # Non-Linux. ++ # Non-Linux/BSD. + sources -= [ + "nix/mime_util_xdg.cc", + "nix/mime_util_xdg.h", +@@ -1555,6 +1555,33 @@ } } + if (is_bsd) { + sources -= [ -+ "files/file_util_linux.cc", + "files/file_path_watcher_linux.cc", ++ "files/file_util_linux.cc", ++ "process/memory_linux.cc", + "process/process_linux.cc", ++ "process/process_handle_linux.cc", + "process/process_iterator_linux.cc", + "process/process_metrics_linux.cc", -+ "process/process_handle_linux.cc", -+ "sys_info_linux.cc", ++ "sys_info_linux.cc" + ] + sources += [ ++ "files/file_path_watcher_kqueue.cc", ++ "files/file_path_watcher_kqueue.h", + "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", @@ -54,39 +58,19 @@ + ] + } + -+ -+ - # Allow more direct string conversions on platforms with native utf8 - # strings - if (is_mac || is_ios || is_chromeos || is_chromecast) { -@@ -1520,7 +1545,7 @@ - } - - # Linux. -- if (is_linux) { -+ if (is_linux || is_bsd) { - if (is_asan || is_lsan || is_msan || is_tsan) { - # For llvm-sanitizer. - data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] -@@ -1545,7 +1570,7 @@ - "//base/third_party/xdg_user_dirs", + # iOS + if (is_ios) { + set_sources_assignment_filter([]) +@@ -2389,6 +2416,12 @@ ] - } else { -- # Non-Linux. -+ # Non-Linux/BSD. - sources -= [ - "nix/mime_util_xdg.cc", - "nix/mime_util_xdg.h", -@@ -2392,6 +2417,12 @@ - "trace_event/trace_event_android_unittest.cc", - ] 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" ] Copied: branches/2018Q1/www/chromium/files/patch-base_posix_unix__domain__socket.cc (from r462416, head/www/chromium/files/patch-base_posix_unix__domain__socket.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/chromium/files/patch-base_posix_unix__domain__socket.cc Wed Feb 21 20:53:44 2018 (r462543, copy of r462416, head/www/chromium/files/patch-base_posix_unix__domain__socket.cc) @@ -0,0 +1,49 @@ +--- base/posix/unix_domain_socket.cc.orig 2018-01-04 21:05:38.000000000 +0100 ++++ base/posix/unix_domain_socket.cc 2018-01-06 12:44:56.681201000 +0100 +@@ -5,7 +5,10 @@ + #include "base/posix/unix_domain_socket.h" + + #include ++#include + #include ++#include ++#include + #if !defined(OS_NACL_NONSFI) + #include + #endif +@@ -28,6 +31,14 @@ + + const size_t UnixDomainSocket::kMaxFileDescriptors = 16; + ++#ifndef SCM_CREDENTIALS ++# define SCM_CREDENTIALS 0x9001 ++#endif ++ ++#ifndef SO_PASSCRED ++# define SO_PASSCRED 0x9002 ++#endif ++ + #if !defined(OS_NACL_NONSFI) + bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { + int raw_socks[2]; +@@ -150,7 +161,7 @@ + #if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) + // The PNaCl toolchain for Non-SFI binary build and macOS do not support + // ucred. macOS supports xucred, but this structure is insufficient. +- + CMSG_SPACE(sizeof(struct ucred)) ++ + CMSG_SPACE(sizeof(struct cmsgcred)) + #endif // OS_NACL_NONSFI or OS_MACOSX + ; + char control_buffer[kControlBufferSize]; +@@ -180,9 +191,9 @@ + // SCM_CREDENTIALS. + if (cmsg->cmsg_level == SOL_SOCKET && + cmsg->cmsg_type == SCM_CREDENTIALS) { +- DCHECK_EQ(payload_len, sizeof(struct ucred)); ++ DCHECK_EQ(payload_len, sizeof(struct cmsgcred)); + DCHECK_EQ(pid, -1); +- pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; ++ pid = getpid(); + } + #endif // !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) + } Copied: branches/2018Q1/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc (from r462416, head/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc Wed Feb 21 20:53:44 2018 (r462543, copy of r462416, head/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc) @@ -0,0 +1,12 @@ +--- base/posix/unix_domain_socket_unittest.cc.orig 2017-12-23 20:50:07.237565000 +0100 ++++ base/posix/unix_domain_socket_unittest.cc 2017-12-23 20:51:05.651558000 +0100 +@@ -8,6 +8,9 @@ + #include + #include + #include ++#if defined(OS_BSD) ++#include ++#endif + #include + + #include "base/bind.h" Modified: branches/2018Q1/www/chromium/files/patch-base_process_memory.cc ============================================================================== --- branches/2018Q1/www/chromium/files/patch-base_process_memory.cc Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/files/patch-base_process_memory.cc Wed Feb 21 20:53:44 2018 (r462543) @@ -1,6 +1,15 @@ ---- base/process/memory.cc.orig 2017-06-05 19:03:00 UTC -+++ base/process/memory.cc -@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) { +--- base/process/memory.cc.orig 2017-12-15 02:04:05.000000000 +0100 ++++ base/process/memory.cc 2017-12-31 09:49:46.308931000 +0100 +@@ -10,7 +10,7 @@ + namespace base { + + // Defined in memory_win.cc for Windows. +-#if !defined(OS_WIN) ++#if !defined(OS_WIN) && !defined(OS_BSD) + + namespace { + +@@ -31,7 +31,7 @@ #endif // Defined in memory_mac.mm for Mac. Modified: branches/2018Q1/www/chromium/files/patch-base_process_process__handle__freebsd.cc ============================================================================== --- branches/2018Q1/www/chromium/files/patch-base_process_process__handle__freebsd.cc Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/files/patch-base_process_process__handle__freebsd.cc Wed Feb 21 20:53:44 2018 (r462543) @@ -1,6 +1,6 @@ ---- base/process/process_handle_freebsd.cc.orig 2017-04-19 19:06:28 UTC -+++ base/process/process_handle_freebsd.cc -@@ -16,7 +16,7 @@ namespace base { +--- base/process/process_handle_freebsd.cc.orig 2018-01-04 21:05:38.000000000 +0100 ++++ base/process/process_handle_freebsd.cc 2018-01-27 02:11:02.948007000 +0100 +@@ -16,10 +16,13 @@ ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; @@ -9,3 +9,9 @@ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process }; if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0) ++ return -1; ++ ++ if (length < sizeof(struct kinfo_proc)) + return -1; + + return info.ki_ppid; Modified: branches/2018Q1/www/chromium/files/patch-base_process_process__iterator__freebsd.cc ============================================================================== --- branches/2018Q1/www/chromium/files/patch-base_process_process__iterator__freebsd.cc Wed Feb 21 20:48:59 2018 (r462542) +++ branches/2018Q1/www/chromium/files/patch-base_process_process__iterator__freebsd.cc Wed Feb 21 20:53:44 2018 (r462543) @@ -1,5 +1,5 @@ ---- base/process/process_iterator_freebsd.cc.orig 2017-06-05 19:03:00 UTC -+++ base/process/process_iterator_freebsd.cc +--- base/process/process_iterator_freebsd.cc.orig 2018-01-04 21:05:38.000000000 +0100 ++++ base/process/process_iterator_freebsd.cc 2018-01-27 17:58:40.475292000 +0100 @@ -10,6 +10,10 @@ #include #include @@ -11,7 +11,16 @@ #include "base/logging.h" #include "base/macros.h" #include "base/strings/string_split.h" -@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProcess() { +@@ -40,7 +44,7 @@ + num_of_kinfo_proc += 16; + kinfo_procs_.resize(num_of_kinfo_proc); + len = num_of_kinfo_proc * sizeof(struct kinfo_proc); +- if (sysctl(mib, arraysize(mib), &kinfo_procs_[0], &len, NULL, 0) <0) { ++ if (sysctl(mib, arraysize(mib), kinfo_procs_.data(), &len, NULL, 0) <0) { + // If we get a mem error, it just means we need a bigger buffer, so + // loop around again. Anything else is a real error and give up. + if (errno != ENOMEM) { +@@ -72,19 +76,13 @@ 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_]; Copied: branches/2018Q1/www/chromium/files/patch-base_process_process__metrics.cc (from r462416, head/www/chromium/files/patch-base_process_process__metrics.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/chromium/files/patch-base_process_process__metrics.cc Wed Feb 21 20:53:44 2018 (r462543, copy of r462416, head/www/chromium/files/patch-base_process_process__metrics.cc) @@ -0,0 +1,11 @@ +--- base/process/process_metrics.cc.orig 2017-12-23 21:01:02.481980000 +0100 ++++ base/process/process_metrics.cc 2017-12-23 21:01:15.848759000 +0100 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Thu Feb 22 01:00:23 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4623DF13003; Thu, 22 Feb 2018 01:00:23 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E85997D3F3; Thu, 22 Feb 2018 01:00:22 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E339D2010D; Thu, 22 Feb 2018 01:00:22 +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 w1M10MLu022755; Thu, 22 Feb 2018 01:00:22 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1M10MU0022751; Thu, 22 Feb 2018 01:00:22 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802220100.w1M10MU0022751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 22 Feb 2018 01:00:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462555 - in branches/2018Q1/emulators/rpcs3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/emulators/rpcs3: . files X-SVN-Commit-Revision: 462555 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 01:00:23 -0000 Author: jbeich Date: Thu Feb 22 01:00:22 2018 New Revision: 462555 URL: https://svnweb.freebsd.org/changeset/ports/462555 Log: MFH: r462553 emulators/rpcs3: update to 0.0.4.379 Changes: https://github.com/RPCS3/rpcs3/compare/d5b9eb0ca...cf1c45dfe Approved by: ports-secteam (junovitch, implicit for snapshots) Added: branches/2018Q1/emulators/rpcs3/files/patch-qt57 - copied unchanged from r462553, head/emulators/rpcs3/files/patch-qt57 Modified: branches/2018Q1/emulators/rpcs3/Makefile branches/2018Q1/emulators/rpcs3/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q1/emulators/rpcs3/Makefile Thu Feb 22 00:59:42 2018 (r462554) +++ branches/2018Q1/emulators/rpcs3/Makefile Thu Feb 22 01:00:22 2018 (r462555) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-371 -DISTVERSIONSUFFIX= -gd5b9eb0ca +DISTVERSION= 0.0.4-379 +DISTVERSIONSUFFIX= -gcf1c45dfe CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Thu Feb 22 00:59:42 2018 (r462554) +++ branches/2018Q1/emulators/rpcs3/distinfo Thu Feb 22 01:00:22 2018 (r462555) @@ -1,6 +1,6 @@ -TIMESTAMP = 1519047024 -SHA256 (RPCS3-rpcs3-v0.0.4-371-gd5b9eb0ca_GH0.tar.gz) = 4fc3bf52a0180f024ba1c3f600676e523c28808fe6a257b396d6ec3aa6401ff9 -SIZE (RPCS3-rpcs3-v0.0.4-371-gd5b9eb0ca_GH0.tar.gz) = 3857273 +TIMESTAMP = 1519244294 +SHA256 (RPCS3-rpcs3-v0.0.4-379-gcf1c45dfe_GH0.tar.gz) = f6631d7b614368a43d4cfcdcecb744c149eb66fc2cba740aa1f6ac9ff25b652d +SIZE (RPCS3-rpcs3-v0.0.4-379-gcf1c45dfe_GH0.tar.gz) = 3859027 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841 Copied: branches/2018Q1/emulators/rpcs3/files/patch-qt57 (from r462553, head/emulators/rpcs3/files/patch-qt57) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/emulators/rpcs3/files/patch-qt57 Thu Feb 22 01:00:22 2018 (r462555, copy of r462553, head/emulators/rpcs3/files/patch-qt57) @@ -0,0 +1,223 @@ +Revert https://github.com/RPCS3/rpcs3/commit/cf1c45dfe86e for Qt 5.7 compatibility + +--- rpcs3/main.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/main.cpp +@@ -86,7 +86,6 @@ int main(int argc, char** argv) + #endif + + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +- QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton); + + s_init.post(); + s_qt_mutex.wait(); +--- rpcs3/rpcs3qt/about_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/about_dialog.cpp +@@ -23,6 +23,7 @@ about_dialog::about_dialog(QWidget* parent) : QDialog( + connect(ui->patreon, &QAbstractButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://www.patreon.com/Nekotekina")); }); + connect(ui->close, &QAbstractButton::clicked, this, &QWidget::close); + ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + layout()->setSizeConstraint(QLayout::SetFixedSize); + } + +--- rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp +@@ -5,6 +5,8 @@ constexpr auto qstr = QString::fromStdString; + + auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialog(parent) + { ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); ++ + QLabel *description = new QLabel(tr("To use auto pause: enter the ID(s) of a function or a system call.\nRestart of the game is required to apply. You can enable/disable this in the settings."), this); + + pauseList = new QTableWidget(this); +--- rpcs3/rpcs3qt/find_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/find_dialog.cpp +@@ -5,6 +5,7 @@ + find_dialog::find_dialog(QTextEdit* edit, QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f), m_text_edit(edit) + { + setWindowTitle(tr("Find string")); ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + + m_find_bar = new QLineEdit(); + m_find_bar->setPlaceholderText(tr("Search...")); +--- rpcs3/rpcs3qt/gamepads_settings_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/gamepads_settings_dialog.cpp +@@ -76,6 +76,7 @@ gamepads_settings_dialog::gamepads_settings_dialog(QWi + json_file.open(QIODevice::ReadOnly | QIODevice::Text); + QJsonObject json_input = QJsonDocument::fromJson(json_file.readAll()).object().value("input").toObject(); + json_file.close(); ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + + QVBoxLayout *dialog_layout = new QVBoxLayout(); + QHBoxLayout *all_players = new QHBoxLayout(); +--- rpcs3/rpcs3qt/gui_settings.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/gui_settings.cpp +@@ -260,6 +260,7 @@ void gui_settings::ShowInfoBox(const gui_save& entry, + { + QCheckBox* cb = new QCheckBox(tr("Don't show again")); + QMessageBox* mb = new QMessageBox(QMessageBox::Information, title, text, QMessageBox::Ok, parent); ++ mb->setWindowFlags(mb->windowFlags() & ~Qt::WindowContextHelpButtonHint); + mb->setCheckBox(cb); + mb->deleteLater(); + mb->exec(); +--- rpcs3/rpcs3qt/instruction_editor_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/instruction_editor_dialog.cpp +@@ -14,6 +14,7 @@ instruction_editor_dialog::instruction_editor_dialog(Q + { + setWindowTitle(tr("Edit instruction")); + setAttribute(Qt::WA_DeleteOnClose); ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + setMinimumSize(300, sizeHint().height()); + + const auto cpu = _cpu.get(); +--- rpcs3/rpcs3qt/kernel_explorer.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/kernel_explorer.cpp +@@ -30,6 +30,7 @@ kernel_explorer::kernel_explorer(QWidget* parent) : QD + setWindowTitle(tr("Kernel Explorer")); + setObjectName("kernel_explorer"); + setAttribute(Qt::WA_DeleteOnClose); ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + setMinimumSize(QSize(700, 450)); + + QVBoxLayout* vbox_panel = new QVBoxLayout(); +--- rpcs3/rpcs3qt/memory_string_searcher.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/memory_string_searcher.cpp +@@ -8,6 +8,7 @@ memory_string_searcher::memory_string_searcher(QWidget + { + setWindowTitle(tr("String Searcher")); + setAttribute(Qt::WA_DeleteOnClose); ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + + m_addr_line = new QLineEdit(this); + m_addr_line->setFixedWidth(QLabel("This is the very length of the lineedit due to hidpi reasons.").sizeHint().width()); +--- rpcs3/rpcs3qt/memory_viewer_panel.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/memory_viewer_panel.cpp +@@ -11,6 +11,7 @@ memory_viewer_panel::memory_viewer_panel(QWidget* pare + setWindowTitle(tr("Memory Viewer")); + setObjectName("memory_viewer"); + setAttribute(Qt::WA_DeleteOnClose); ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + exit = false; + m_addr = 0; + m_colcount = 16; +--- rpcs3/rpcs3qt/msg_dialog_frame.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/msg_dialog_frame.cpp +@@ -24,6 +24,7 @@ void msg_dialog_frame::Create(const std::string& msg) + + m_dialog = new custom_dialog(type.disable_cancel); + m_dialog->setWindowTitle(type.se_normal ? "Normal dialog" : "Error dialog"); ++ m_dialog->setWindowFlags(m_dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint); + m_dialog->setWindowOpacity(type.bg_invisible ? 1. : 0.75); + + m_text = new QLabel(qstr(msg)); +@@ -245,6 +246,7 @@ void msg_dialog_frame::CreateOsk(const std::string& ms + + //Title + m_osk_dialog->setWindowTitle(qstr(msg)); ++ m_osk_dialog->setWindowFlags(m_osk_dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint); + + //Text Input + QLineEdit* input = new QLineEdit(m_osk_dialog); +--- rpcs3/rpcs3qt/pad_settings_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/pad_settings_dialog.cpp +@@ -18,6 +18,8 @@ pad_settings_dialog::pad_settings_dialog(const std::st + { + ui->setupUi(this); + ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); ++ + ui->b_cancel->setDefault(true); + connect(ui->b_cancel, &QAbstractButton::clicked, this, &QWidget::close); + +--- rpcs3/rpcs3qt/register_editor_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/register_editor_dialog.cpp +@@ -13,6 +13,7 @@ register_editor_dialog::register_editor_dialog(QWidget + { + setWindowTitle(tr("Edit registers")); + setAttribute(Qt::WA_DeleteOnClose); ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + + QVBoxLayout* vbox_panel = new QVBoxLayout(); + QHBoxLayout* hbox_panel = new QHBoxLayout(); +--- rpcs3/rpcs3qt/rsx_debugger.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/rsx_debugger.cpp +@@ -18,6 +18,7 @@ rsx_debugger::rsx_debugger(QWidget* parent) + { + setWindowTitle(tr("RSX Debugger")); + setAttribute(Qt::WA_DeleteOnClose); ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + + //Fonts and Colors + QFont mono = QFontDatabase::systemFont(QFontDatabase::FixedFont); +--- rpcs3/rpcs3qt/save_data_info_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/save_data_info_dialog.cpp +@@ -9,6 +9,7 @@ constexpr auto qstr = QString::fromStdString; + save_data_info_dialog::save_data_info_dialog(const SaveDataEntry& save, QWidget* parent) + : QDialog(parent), m_entry(save) + { ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + setWindowTitle(tr("Save Data Information")); + + // Table +--- rpcs3/rpcs3qt/save_data_list_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/save_data_list_dialog.cpp +@@ -16,6 +16,8 @@ constexpr auto qstr = QString::fromStdString; + save_data_list_dialog::save_data_list_dialog(const std::vector& entries, s32 focusedEntry, u32 op, vm::ptr listSet, QWidget* parent) + : QDialog(parent), m_save_entries(entries), m_entry(selection_code::new_save), m_entry_label(nullptr) + { ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); ++ + if (op >= 8) + { + setWindowTitle(tr("Save Data Interface (Delete)")); +--- rpcs3/rpcs3qt/save_manager_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/save_manager_dialog.cpp +@@ -81,6 +81,7 @@ namespace + save_manager_dialog::save_manager_dialog(std::shared_ptr gui_settings, std::string dir, QWidget* parent) + : QDialog(parent), m_save_entries(), m_dir(dir), m_sort_column(1), m_sort_ascending(true), m_gui_settings(gui_settings) + { ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + setWindowTitle(tr("Save Manager")); + setMinimumSize(QSize(400, 400)); + +--- rpcs3/rpcs3qt/settings_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/settings_dialog.cpp +@@ -30,6 +30,8 @@ inline std::string sstr(const QVariant& _in) { return + settings_dialog::settings_dialog(std::shared_ptr guiSettings, std::shared_ptr emuSettings, const int& tabIndex, QWidget *parent, const GameInfo* game) + : QDialog(parent), xgui_settings(guiSettings), xemu_settings(emuSettings), ui(new Ui::settings_dialog), m_tab_Index(tabIndex) + { ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); ++ + ui->setupUi(this); + ui->cancelButton->setFocus(); + ui->tabWidget->setUsesScrollButtons(false); +--- rpcs3/rpcs3qt/trophy_manager_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/trophy_manager_dialog.cpp +@@ -40,6 +40,7 @@ trophy_manager_dialog::trophy_manager_dialog(std::shar + : QWidget(), m_sort_column(0), m_col_sort_order(Qt::AscendingOrder), m_gui_settings(gui_settings) + { + // Nonspecific widget settings ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + setWindowTitle(tr("Trophy Manager")); + + m_icon_height = m_gui_settings->GetValue(gui::tr_icon_height).toInt(); +--- rpcs3/rpcs3qt/vfs_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/vfs_dialog.cpp +@@ -83,4 +83,5 @@ vfs_dialog::vfs_dialog(std::shared_ptr g + + setLayout(vbox); + setWindowTitle(tr("Virtual File System")); ++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + } +--- rpcs3/rpcs3qt/welcome_dialog.cpp.orig 2018-02-21 20:18:14 UTC ++++ rpcs3/rpcs3qt/welcome_dialog.cpp +@@ -15,7 +15,7 @@ welcome_dialog::welcome_dialog(QWidget* parent) : QDia + { + ui->setupUi(this); + +- setWindowFlags(windowFlags() & Qt::WindowTitleHint); ++ setWindowFlags(windowFlags() & Qt::WindowTitleHint & ~Qt::WindowContextHelpButtonHint); + + gui_settings* settings = new gui_settings(this); + From owner-svn-ports-branches@freebsd.org Thu Feb 22 01:01:05 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8236F1311B; Thu, 22 Feb 2018 01:01:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 763507D759; Thu, 22 Feb 2018 01:01:04 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 70C8020135; Thu, 22 Feb 2018 01:01:04 +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 w1M114tM023712; Thu, 22 Feb 2018 01:01:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1M113Kq023706; Thu, 22 Feb 2018 01:01:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802220101.w1M113Kq023706@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 22 Feb 2018 01:01:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462556 - in branches/2018Q1/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www/waterfox: . files X-SVN-Commit-Revision: 462556 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 01:01:05 -0000 Author: jbeich Date: Thu Feb 22 01:01:03 2018 New Revision: 462556 URL: https://svnweb.freebsd.org/changeset/ports/462556 Log: MFH: r462554 www/waterfox: apply some FF59 fixes Approved by: ports-secteam blanket Added: branches/2018Q1/www/waterfox/files/patch-bug1388020 - copied unchanged from r462554, head/www/waterfox/files/patch-bug1388020 branches/2018Q1/www/waterfox/files/patch-bug1435566 - copied unchanged from r462554, head/www/waterfox/files/patch-bug1435566 branches/2018Q1/www/waterfox/files/patch-bug1436768 - copied unchanged from r462554, head/www/waterfox/files/patch-bug1436768 branches/2018Q1/www/waterfox/files/patch-bug1437214 - copied unchanged from r462554, head/www/waterfox/files/patch-bug1437214 branches/2018Q1/www/waterfox/files/patch-bug1438645 - copied unchanged from r462554, head/www/waterfox/files/patch-bug1438645 Modified: branches/2018Q1/www/waterfox/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Thu Feb 22 01:00:22 2018 (r462555) +++ branches/2018Q1/www/waterfox/Makefile Thu Feb 22 01:01:03 2018 (r462556) @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q1/www/waterfox/files/patch-bug1388020 (from r462554, head/www/waterfox/files/patch-bug1388020) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1388020 Thu Feb 22 01:01:03 2018 (r462556, copy of r462554, head/www/waterfox/files/patch-bug1388020) @@ -0,0 +1,439 @@ +commit 56cb3a82e6f1 +Author: Andrew Osmond +Date: Wed Feb 7 09:33:12 2018 -0500 + + Bug 1388020. r=nical a=RyanVM + + --HG-- + extra : source : fd15c14e5efb1874591f4e113c1ae1c49154804f +--- + gfx/layers/client/TextureClient.h | 2 +- + gfx/layers/composite/TextureHost.cpp | 65 +++++++++++++++++++----- + gfx/layers/composite/X11TextureHost.cpp | 13 +++-- + gfx/layers/d3d11/TextureD3D11.cpp | 6 +-- + gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp | 8 +++ + gfx/layers/opengl/TextureHostOGL.cpp | 25 ++------- + gfx/tests/gtest/TestLayers.h | 16 ++++++ + gfx/tests/gtest/TestTextureCompatibility.cpp | 12 +++-- + gfx/tests/gtest/TestTextures.cpp | 7 ++- + gfx/tests/gtest/TextureHelper.h | 3 +- + 10 files changed, 108 insertions(+), 49 deletions(-) + +diff --git gfx/layers/client/TextureClient.h gfx/layers/client/TextureClient.h +index e56ea21841ad..81be2867ca7a 100644 +--- gfx/layers/client/TextureClient.h ++++ gfx/layers/client/TextureClient.h +@@ -761,7 +761,7 @@ protected: + friend void TestTextureClientSurface(TextureClient*, gfxImageSurface*); + friend void TestTextureClientYCbCr(TextureClient*, PlanarYCbCrData&); + friend already_AddRefed CreateTextureHostWithBackend( +- TextureClient*, LayersBackend&); ++ TextureClient*, ISurfaceAllocator*, LayersBackend&); + + #ifdef GFX_DEBUG_TRACK_CLIENTS_IN_POOL + public: +diff --git gfx/layers/composite/TextureHost.cpp gfx/layers/composite/TextureHost.cpp +index a48a9081e155..e0a74920fbe5 100644 +--- gfx/layers/composite/TextureHost.cpp ++++ gfx/layers/composite/TextureHost.cpp +@@ -116,15 +116,9 @@ TextureHost::CreateIPDLActor(HostIPCAllocator* aAllocator, + uint64_t aSerial, + const wr::MaybeExternalImageId& aExternalImageId) + { +- if (aSharedData.type() == SurfaceDescriptor::TSurfaceDescriptorBuffer && +- aSharedData.get_SurfaceDescriptorBuffer().data().type() == MemoryOrShmem::Tuintptr_t && +- !aAllocator->IsSameProcess()) +- { +- NS_ERROR("A client process is trying to peek at our address space using a MemoryTexture!"); +- return nullptr; +- } + TextureParent* actor = new TextureParent(aAllocator, aSerial, aExternalImageId); + if (!actor->Init(aSharedData, aLayersBackend, aFlags)) { ++ actor->ActorDestroy(ipc::IProtocol::ActorDestroyReason::FailedConstructor); + delete actor; + return nullptr; + } +@@ -232,6 +226,11 @@ TextureHost::Create(const SurfaceDescriptor& aDesc, + + #ifdef MOZ_X11 + case SurfaceDescriptor::TSurfaceDescriptorX11: { ++ if (!aDeallocator->IsSameProcess()) { ++ NS_ERROR("A client process is trying to peek at our address space using a X11Texture!"); ++ return nullptr; ++ } ++ + const SurfaceDescriptorX11& desc = aDesc.get_SurfaceDescriptorX11(); + result = MakeAndAddRef(aFlags, desc); + break; +@@ -248,7 +247,7 @@ TextureHost::Create(const SurfaceDescriptor& aDesc, + MOZ_CRASH("GFX: Unsupported Surface type host"); + } + +- if (WrapWithWebRenderTextureHost(aDeallocator, aBackend, aFlags)) { ++ if (result && WrapWithWebRenderTextureHost(aDeallocator, aBackend, aFlags)) { + MOZ_ASSERT(aExternalImageId.isSome()); + result = new WebRenderTextureHost(aDesc, aFlags, result, aExternalImageId.ref()); + } +@@ -269,13 +268,50 @@ CreateBackendIndependentTextureHost(const SurfaceDescriptor& aDesc, + const MemoryOrShmem& data = bufferDesc.data(); + switch (data.type()) { + case MemoryOrShmem::TShmem: { +- result = new ShmemTextureHost(data.get_Shmem(), +- bufferDesc.desc(), +- aDeallocator, +- aFlags); ++ const ipc::Shmem& shmem = data.get_Shmem(); ++ const BufferDescriptor& desc = bufferDesc.desc(); ++ if (!shmem.IsReadable()) { ++ // We failed to map the shmem so we can't verify its size. This ++ // should not be a fatal error, so just create the texture with ++ // nothing backing it. ++ result = new ShmemTextureHost(shmem, desc, aDeallocator, aFlags); ++ break; ++ } ++ ++ size_t bufSize = shmem.Size(); ++ size_t reqSize = SIZE_MAX; ++ switch (desc.type()) { ++ case BufferDescriptor::TYCbCrDescriptor: { ++ const YCbCrDescriptor& ycbcr = desc.get_YCbCrDescriptor(); ++ reqSize = ++ ImageDataSerializer::ComputeYCbCrBufferSize(ycbcr.ySize(), ycbcr.yStride(), ++ ycbcr.cbCrSize(), ycbcr.cbCrStride()); ++ break; ++ } ++ case BufferDescriptor::TRGBDescriptor: { ++ const RGBDescriptor& rgb = desc.get_RGBDescriptor(); ++ reqSize = ImageDataSerializer::ComputeRGBBufferSize(rgb.size(), rgb.format()); ++ break; ++ } ++ default: ++ gfxCriticalError() << "Bad buffer host descriptor " << (int)desc.type(); ++ MOZ_CRASH("GFX: Bad descriptor"); ++ } ++ ++ if (bufSize < reqSize) { ++ NS_ERROR("A client process gave a shmem too small to fit for its descriptor!"); ++ return nullptr; ++ } ++ ++ result = new ShmemTextureHost(shmem, desc, aDeallocator, aFlags); + break; + } + case MemoryOrShmem::Tuintptr_t: { ++ if (!aDeallocator->IsSameProcess()) { ++ NS_ERROR("A client process is trying to peek at our address space using a MemoryTexture!"); ++ return nullptr; ++ } ++ + result = new MemoryTextureHost(reinterpret_cast(data.get_uintptr_t()), + bufferDesc.desc(), + aFlags); +@@ -293,6 +329,11 @@ CreateBackendIndependentTextureHost(const SurfaceDescriptor& aDesc, + } + #ifdef XP_WIN + case SurfaceDescriptor::TSurfaceDescriptorDIB: { ++ if (!aDeallocator->IsSameProcess()) { ++ NS_ERROR("A client process is trying to peek at our address space using a DIBTexture!"); ++ return nullptr; ++ } ++ + result = new DIBTextureHost(aFlags, aDesc); + break; + } +diff --git gfx/layers/composite/X11TextureHost.cpp gfx/layers/composite/X11TextureHost.cpp +index e2251f0c531a..94cb3f2f9594 100644 +--- gfx/layers/composite/X11TextureHost.cpp ++++ gfx/layers/composite/X11TextureHost.cpp +@@ -23,10 +23,9 @@ X11TextureHost::X11TextureHost(TextureFlags aFlags, + const SurfaceDescriptorX11& aDescriptor) + : TextureHost(aFlags) + { +- RefPtr surface = aDescriptor.OpenForeign(); +- mSurface = surface.get(); ++ mSurface = aDescriptor.OpenForeign(); + +- if (!(aFlags & TextureFlags::DEALLOCATE_CLIENT)) { ++ if (mSurface && !(aFlags & TextureFlags::DEALLOCATE_CLIENT)) { + mSurface->TakePixmap(); + } + } +@@ -34,7 +33,7 @@ X11TextureHost::X11TextureHost(TextureFlags aFlags, + bool + X11TextureHost::Lock() + { +- if (!mCompositor) { ++ if (!mCompositor || !mSurface) { + return false; + } + +@@ -75,6 +74,9 @@ X11TextureHost::SetTextureSourceProvider(TextureSourceProvider* aProvider) + SurfaceFormat + X11TextureHost::GetFormat() const + { ++ if (!mSurface) { ++ return SurfaceFormat::UNKNOWN; ++ } + gfxContentType type = mSurface->GetContentType(); + #ifdef GL_PROVIDER_GLX + if (mCompositor->GetBackendType() == LayersBackend::LAYERS_OPENGL) { +@@ -87,6 +89,9 @@ X11TextureHost::GetFormat() const + IntSize + X11TextureHost::GetSize() const + { ++ if (!mSurface) { ++ return IntSize(); ++ } + return mSurface->GetSize(); + } + +diff --git gfx/layers/d3d11/TextureD3D11.cpp gfx/layers/d3d11/TextureD3D11.cpp +index 379686418ef0..4ad758849b93 100644 +--- gfx/layers/d3d11/TextureD3D11.cpp ++++ gfx/layers/d3d11/TextureD3D11.cpp +@@ -763,10 +763,6 @@ CreateTextureHostD3D11(const SurfaceDescriptor& aDesc, + { + RefPtr result; + switch (aDesc.type()) { +- case SurfaceDescriptor::TSurfaceDescriptorBuffer: { +- result = CreateBackendIndependentTextureHost(aDesc, aDeallocator, aBackend, aFlags); +- break; +- } + case SurfaceDescriptor::TSurfaceDescriptorD3D10: { + result = new DXGITextureHostD3D11(aFlags, + aDesc.get_SurfaceDescriptorD3D10()); +@@ -778,7 +774,7 @@ CreateTextureHostD3D11(const SurfaceDescriptor& aDesc, + break; + } + default: { +- NS_WARNING("Unsupported SurfaceDescriptor type"); ++ MOZ_ASSERT_UNREACHABLE("Unsupported SurfaceDescriptor type"); + } + } + return result.forget(); +diff --git gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp +index 291b0eb3d0dc..f363bb5a7cf7 100644 +--- gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp ++++ gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp +@@ -32,6 +32,8 @@ MacIOSurfaceTextureHostOGL::~MacIOSurfaceTextureHostOGL() + GLTextureSource* + MacIOSurfaceTextureHostOGL::CreateTextureSourceForPlane(size_t aPlane) + { ++ MOZ_ASSERT(mSurface); ++ + GLuint textureHandle; + gl::GLContext* gl = mProvider->GetGLContext(); + gl->fGenTextures(1, &textureHandle); +@@ -94,11 +96,17 @@ MacIOSurfaceTextureHostOGL::SetTextureSourceProvider(TextureSourceProvider* aPro + + gfx::SurfaceFormat + MacIOSurfaceTextureHostOGL::GetFormat() const { ++ if (!mSurface) { ++ return gfx::SurfaceFormat::UNKNOWN; ++ } + return mSurface->GetFormat(); + } + + gfx::SurfaceFormat + MacIOSurfaceTextureHostOGL::GetReadFormat() const { ++ if (!mSurface) { ++ return gfx::SurfaceFormat::UNKNOWN; ++ } + return mSurface->GetReadFormat(); + } + +diff --git gfx/layers/opengl/TextureHostOGL.cpp gfx/layers/opengl/TextureHostOGL.cpp +index bdcd8778c10d..2b28c19a126d 100644 +--- gfx/layers/opengl/TextureHostOGL.cpp ++++ gfx/layers/opengl/TextureHostOGL.cpp +@@ -26,10 +26,6 @@ + #include "mozilla/layers/MacIOSurfaceTextureHostOGL.h" + #endif + +-#ifdef GL_PROVIDER_GLX +-#include "mozilla/layers/X11TextureHost.h" +-#endif +- + using namespace mozilla::gl; + using namespace mozilla::gfx; + +@@ -46,14 +42,6 @@ CreateTextureHostOGL(const SurfaceDescriptor& aDesc, + { + RefPtr result; + switch (aDesc.type()) { +- case SurfaceDescriptor::TSurfaceDescriptorBuffer: { +- result = CreateBackendIndependentTextureHost(aDesc, +- aDeallocator, +- aBackend, +- aFlags); +- break; +- } +- + #ifdef MOZ_WIDGET_ANDROID + case SurfaceDescriptor::TSurfaceTextureDescriptor: { + const SurfaceTextureDescriptor& desc = aDesc.get_SurfaceTextureDescriptor(); +@@ -88,14 +76,6 @@ CreateTextureHostOGL(const SurfaceDescriptor& aDesc, + } + #endif + +-#ifdef GL_PROVIDER_GLX +- case SurfaceDescriptor::TSurfaceDescriptorX11: { +- const auto& desc = aDesc.get_SurfaceDescriptorX11(); +- result = new X11TextureHost(aFlags, desc); +- break; +- } +-#endif +- + case SurfaceDescriptor::TSurfaceDescriptorSharedGLTexture: { + const auto& desc = aDesc.get_SurfaceDescriptorSharedGLTexture(); + result = new GLTextureHost(aFlags, desc.texture(), +@@ -105,7 +85,10 @@ CreateTextureHostOGL(const SurfaceDescriptor& aDesc, + desc.hasAlpha()); + break; + } +- default: return nullptr; ++ default: { ++ MOZ_ASSERT_UNREACHABLE("Unsupported SurfaceDescriptor type"); ++ break; ++ } + } + return result.forget(); + } +diff --git gfx/tests/gtest/TestLayers.h gfx/tests/gtest/TestLayers.h +index 18e351f7718c..fc6b750f1c62 100644 +--- gfx/tests/gtest/TestLayers.h ++++ gfx/tests/gtest/TestLayers.h +@@ -8,6 +8,22 @@ + + #include "Layers.h" + #include "nsTArray.h" ++#include "mozilla/layers/ISurfaceAllocator.h" ++ ++namespace mozilla { ++namespace layers { ++ ++class TestSurfaceAllocator final : public ISurfaceAllocator ++{ ++public: ++ TestSurfaceAllocator() {} ++ ~TestSurfaceAllocator() override {} ++ ++ bool IsSameProcess() const override { return true; } ++}; ++ ++} // layers ++} // mozilla + + /* Create layer tree from a simple layer tree description syntax. + * Each index is either the first letter of the layer type or +diff --git gfx/tests/gtest/TestTextureCompatibility.cpp gfx/tests/gtest/TestTextureCompatibility.cpp +index 45db4943ed1c..0815823b81ce 100644 +--- gfx/tests/gtest/TestTextureCompatibility.cpp ++++ gfx/tests/gtest/TestTextureCompatibility.cpp +@@ -14,6 +14,7 @@ + #include "mozilla/layers/TextureClient.h" + #include "mozilla/layers/TextureHost.h" + #include "mozilla/RefPtr.h" ++#include "TestLayers.h" + #include "TextureHelper.h" + + using mozilla::gfx::Feature; +@@ -22,6 +23,7 @@ using mozilla::layers::BasicCompositor; + using mozilla::layers::Compositor; + using mozilla::layers::CompositorOptions; + using mozilla::layers::LayersBackend; ++using mozilla::layers::TestSurfaceAllocator; + using mozilla::layers::TextureClient; + using mozilla::layers::TextureHost; + using mozilla::widget::CompositorWidget; +@@ -31,8 +33,9 @@ using mozilla::widget::InProcessCompositorWidget; + * This function will create the possible TextureClient and TextureHost pairs + * according to the given backend. + */ +-void ++static void + CreateTextureWithBackend(LayersBackend& aLayersBackend, ++ ISurfaceAllocator* aDeallocator, + nsTArray>& aTextureClients, + nsTArray>& aTextureHosts) + { +@@ -43,7 +46,8 @@ CreateTextureWithBackend(LayersBackend& aLayersBackend, + + for (uint32_t i = 0; i < aTextureClients.Length(); i++) { + aTextureHosts.AppendElement( +- CreateTextureHostWithBackend(aTextureClients[i], aLayersBackend)); ++ CreateTextureHostWithBackend(aTextureClients[i], aDeallocator, ++ aLayersBackend)); + } + } + +@@ -115,13 +119,15 @@ CheckCompatibilityWithBasicCompositor(LayersBackend aBackends, + TEST(Gfx, TestTextureCompatibility) + { + nsTArray backendHints; ++ RefPtr deallocator = new TestSurfaceAllocator(); + + GetPlatformBackends(backendHints); + for (uint32_t i = 0; i < backendHints.Length(); i++) { + nsTArray> textureClients; + nsTArray> textureHosts; + +- CreateTextureWithBackend(backendHints[i], textureClients, textureHosts); ++ CreateTextureWithBackend(backendHints[i], deallocator, ++ textureClients, textureHosts); + CheckCompatibilityWithBasicCompositor(backendHints[i], textureHosts); + } + } +diff --git gfx/tests/gtest/TestTextures.cpp gfx/tests/gtest/TestTextures.cpp +index 19b94b867117..291eb55ca7e5 100644 +--- gfx/tests/gtest/TestTextures.cpp ++++ gfx/tests/gtest/TestTextures.cpp +@@ -5,6 +5,7 @@ + + #include "gtest/gtest.h" + #include "gmock/gmock.h" ++#include "TestLayers.h" + + #include "mozilla/gfx/2D.h" + #include "mozilla/gfx/Tools.h" +@@ -147,7 +148,8 @@ void TestTextureClientSurface(TextureClient* texture, gfxImageSurface* surface) + ASSERT_NE(descriptor.type(), SurfaceDescriptor::Tnull_t); + + // host deserialization +- RefPtr host = CreateBackendIndependentTextureHost(descriptor, nullptr, ++ RefPtr deallocator = new TestSurfaceAllocator(); ++ RefPtr host = CreateBackendIndependentTextureHost(descriptor, deallocator, + LayersBackend::LAYERS_NONE, + texture->GetFlags()); + +@@ -193,7 +195,8 @@ void TestTextureClientYCbCr(TextureClient* client, PlanarYCbCrData& ycbcrData) { + ASSERT_EQ(ycbcrDesc.stereoMode(), ycbcrData.mStereoMode); + + // host deserialization +- RefPtr textureHost = CreateBackendIndependentTextureHost(descriptor, nullptr, ++ RefPtr deallocator = new TestSurfaceAllocator(); ++ RefPtr textureHost = CreateBackendIndependentTextureHost(descriptor, deallocator, + LayersBackend::LAYERS_NONE, + client->GetFlags()); + +diff --git gfx/tests/gtest/TextureHelper.h gfx/tests/gtest/TextureHelper.h +index 144a237b17d4..770f7464f829 100644 +--- gfx/tests/gtest/TextureHelper.h ++++ gfx/tests/gtest/TextureHelper.h +@@ -140,6 +140,7 @@ CreateTextureClientWithBackend(LayersBackend aLayersBackend) + */ + already_AddRefed + CreateTextureHostWithBackend(TextureClient* aClient, ++ ISurfaceAllocator* aDeallocator, + LayersBackend& aLayersBackend) + { + if (!aClient) { +@@ -153,7 +154,7 @@ CreateTextureHostWithBackend(TextureClient* aClient, + aClient->ToSurfaceDescriptor(descriptor); + + wr::MaybeExternalImageId id = Nothing(); +- return TextureHost::Create(descriptor, nullptr, aLayersBackend, ++ return TextureHost::Create(descriptor, aDeallocator, aLayersBackend, + aClient->GetFlags(), id); + } + Copied: branches/2018Q1/www/waterfox/files/patch-bug1435566 (from r462554, head/www/waterfox/files/patch-bug1435566) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1435566 Thu Feb 22 01:01:03 2018 (r462556, copy of r462554, head/www/waterfox/files/patch-bug1435566) @@ -0,0 +1,27 @@ +commit 2d6648d9388d +Author: Emilio Cobos Álvarez +Date: Thu Feb 15 11:21:55 2018 +0100 + + Bug 1435566: Make sure to drop frames for manual NAC from display: contents nodes. r=bz a=RyanVM + + MozReview-Commit-ID: 9CQIueSPwCV + + --HG-- + extra : source : 3219cd61e87b4f3003079154c437efa87080a917 +--- + layout/base/nsCSSFrameConstructor.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git layout/base/nsCSSFrameConstructor.cpp layout/base/nsCSSFrameConstructor.cpp +index 4a45072cbca5..7b6be5f222e8 100644 +--- layout/base/nsCSSFrameConstructor.cpp ++++ layout/base/nsCSSFrameConstructor.cpp +@@ -8533,7 +8533,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer, + return true; + } + +- FlattenedChildIterator iter(aChild); ++ StyleChildrenIterator iter(aChild); + for (nsIContent* c = iter.GetNextChild(); c; c = iter.GetNextChild()) { + if (c->GetPrimaryFrame() || GetDisplayContentsStyleFor(c)) { + LAYOUT_PHASE_TEMP_EXIT(); Copied: branches/2018Q1/www/waterfox/files/patch-bug1436768 (from r462554, head/www/waterfox/files/patch-bug1436768) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1436768 Thu Feb 22 01:01:03 2018 (r462556, copy of r462554, head/www/waterfox/files/patch-bug1436768) @@ -0,0 +1,106 @@ +commit 885fcfb6c9fe +Author: Eric Rahm +Date: Thu Feb 8 16:25:07 2018 -0800 + + Bug 1436768 - Avoid initializing LogModuleManager more than once. r=froydnj a=RyanVM + + This adds some assertions to make the intended usage of LogModuleManager::Init + more clear. + + --HG-- + extra : source : ec9f62910277ae252c3fb32166358419afb96b34 +--- + xpcom/base/Logging.cpp | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +diff --git xpcom/base/Logging.cpp xpcom/base/Logging.cpp +index 9d6a6d9ea861..eca3e97ee61e 100644 +--- xpcom/base/Logging.cpp ++++ xpcom/base/Logging.cpp +@@ -16,6 +16,7 @@ + #include "mozilla/Atomics.h" + #include "mozilla/Sprintf.h" + #include "mozilla/UniquePtrExtensions.h" ++#include "MainThreadUtils.h" + #include "nsClassHashtable.h" + #include "nsDebug.h" + #include "NSPRLogModulesParser.h" +@@ -179,6 +180,7 @@ public: + , mAddTimestamp(false) + , mIsSync(false) + , mRotate(0) ++ , mInitialized(false) + { + } + +@@ -190,9 +192,17 @@ public: + + /** + * Loads config from env vars if present. ++ * ++ * Notes: ++ * ++ * 1) This function is only intended to be called once per session. ++ * 2) None of the functions used in Init should rely on logging. + */ + void Init() + { ++ MOZ_DIAGNOSTIC_ASSERT(!mInitialized); ++ mInitialized = true; ++ + bool shouldAppend = false; + bool addTimestamp = false; + bool isSync = false; +@@ -213,8 +223,10 @@ public: + } + } + ++ // Need to capture `this` since `sLogModuleManager` is not set until after ++ // initialization is complete. + NSPRLogModulesParser(modules, +- [&shouldAppend, &addTimestamp, &isSync, &rotate] ++ [this, &shouldAppend, &addTimestamp, &isSync, &rotate] + (const char* aName, LogLevel aLevel, int32_t aValue) mutable { + if (strcmp(aName, "append") == 0) { + shouldAppend = true; +@@ -225,7 +237,7 @@ public: + } else if (strcmp(aName, "rotate") == 0) { + rotate = (aValue << 20) / kRotateFilesNumber; + } else { +- LogModule::Get(aName)->SetLevel(aLevel); ++ this->CreateOrGetModule(aName)->SetLevel(aLevel); + } + }); + +@@ -513,6 +525,7 @@ private: + Atomic mAddTimestamp; + Atomic mIsSync; + int32_t mRotate; ++ bool mInitialized; + }; + + StaticAutoPtr sLogModuleManager; +@@ -557,6 +570,8 @@ LogModule::Init() + { + // NB: This method is not threadsafe; it is expected to be called very early + // in startup prior to any other threads being run. ++ MOZ_DIAGNOSTIC_ASSERT(NS_IsMainThread()); ++ + if (sLogModuleManager) { + // Already initialized. + return; +@@ -565,8 +580,12 @@ LogModule::Init() + // NB: We intentionally do not register for ClearOnShutdown as that happens + // before all logging is complete. And, yes, that means we leak, but + // we're doing that intentionally. +- sLogModuleManager = new LogModuleManager(); +- sLogModuleManager->Init(); ++ ++ // Don't assign the pointer until after Init is called. This should help us ++ // detect if any of the functions called by Init somehow rely on logging. ++ auto mgr = new LogModuleManager(); ++ mgr->Init(); ++ sLogModuleManager = mgr; + } + + void Copied: branches/2018Q1/www/waterfox/files/patch-bug1437214 (from r462554, head/www/waterfox/files/patch-bug1437214) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1437214 Thu Feb 22 01:01:03 2018 (r462556, copy of r462554, head/www/waterfox/files/patch-bug1437214) @@ -0,0 +1,217 @@ +commit 8fdc2449bfe2 +Author: David Keeler +Date: Fri Feb 9 16:35:54 2018 -0800 + + bug 1437214 - if PathBuildingStep::Check fails due to a problem with the subject certificate rather than the potential issuer, set keepGoing to false r=jcj a=RyanVM + + MozReview-Commit-ID: DEr4YgXfkOL + + --HG-- + extra : source : f2669a2b5934ac8e5637c3b96ab1f1dcdf502c00 +--- + security/pkix/lib/pkixbuild.cpp | 13 ++- + security/pkix/test/gtest/pkixbuild_tests.cpp | 163 +++++++++++++++++++++++++++ + 2 files changed, 174 insertions(+), 2 deletions(-) + +diff --git security/pkix/lib/pkixbuild.cpp security/pkix/lib/pkixbuild.cpp +index fd6a9d5115d4..0b33e3d5ae71 100644 +--- security/pkix/lib/pkixbuild.cpp ++++ security/pkix/lib/pkixbuild.cpp +@@ -241,7 +241,12 @@ PathBuildingStep::Check(Input potentialIssuerDER, + validityDuration, stapledOCSPResponse, + subject.GetAuthorityInfoAccess()); + if (rv != Success) { +- return RecordResult(rv, keepGoing); ++ // Since this is actually a problem with the current subject certificate ++ // (rather than the issuer), it doesn't make sense to keep going; all ++ // paths through this certificate will fail. ++ Result savedRv = RecordResult(rv, keepGoing); ++ keepGoing = false; ++ return savedRv; + } + + if (subject.endEntityOrCA == EndEntityOrCA::MustBeEndEntity) { +@@ -251,7 +256,11 @@ PathBuildingStep::Check(Input potentialIssuerDER, + rv = ExtractSignedCertificateTimestampListFromExtension(*sctExtension, + sctList); + if (rv != Success) { +- return RecordResult(rv, keepGoing); ++ // Again, the problem is with this certificate, and all paths through ++ // it will fail. ++ Result savedRv = RecordResult(rv, keepGoing); ++ keepGoing = false; ++ return savedRv; + } + trustDomain.NoteAuxiliaryExtension(AuxiliaryExtension::EmbeddedSCTList, + sctList); +diff --git security/pkix/test/gtest/pkixbuild_tests.cpp security/pkix/test/gtest/pkixbuild_tests.cpp +index 64fa4c307c76..5948df7037a8 100644 +--- security/pkix/test/gtest/pkixbuild_tests.cpp ++++ security/pkix/test/gtest/pkixbuild_tests.cpp +@@ -582,3 +582,166 @@ TEST_F(pkixbuild, CertificateTransparencyExtension) + ASSERT_EQ(BytesToByteString(dummySctList), + extTrustDomain.signedCertificateTimestamps); + } ++ ++// This TrustDomain implements a hierarchy like so: ++// ++// A B ++// | | ++// C D ++// \ / ++// E ++// ++// where A is a trust anchor, B is not a trust anchor and has no known issuer, C ++// and D are intermediates with the same subject and subject public key, and E ++// is an end-entity (in practice, the end-entity will be generated by the test ++// functions using this trust domain). ++class MultiplePathTrustDomain: public DefaultCryptoTrustDomain ++{ ++public: ++ void SetUpCerts() ++ { ++ ASSERT_FALSE(ENCODING_FAILED(CreateCert("UntrustedRoot", "UntrustedRoot", ++ EndEntityOrCA::MustBeCA, ++ &subjectDERToCertDER))); ++ // The subject DER -> cert DER mapping would be overwritten for subject ++ // "Intermediate" when we create the second "Intermediate" certificate, so ++ // we keep a copy of this "Intermediate". ++ intermediateSignedByUntrustedRootCertDER = ++ CreateCert("UntrustedRoot", "Intermediate", EndEntityOrCA::MustBeCA); ++ ASSERT_FALSE(ENCODING_FAILED(intermediateSignedByUntrustedRootCertDER)); ++ rootCACertDER = CreateCert("TrustedRoot", "TrustedRoot", ++ EndEntityOrCA::MustBeCA, &subjectDERToCertDER); ++ ASSERT_FALSE(ENCODING_FAILED(rootCACertDER)); ++ ASSERT_FALSE(ENCODING_FAILED(CreateCert("TrustedRoot", "Intermediate", ++ EndEntityOrCA::MustBeCA, ++ &subjectDERToCertDER))); ++ } ++ ++private: ++ Result GetCertTrust(EndEntityOrCA, const CertPolicyId&, Input candidateCert, ++ /*out*/ TrustLevel& trustLevel) override ++ { ++ trustLevel = InputEqualsByteString(candidateCert, rootCACertDER) ++ ? TrustLevel::TrustAnchor ++ : TrustLevel::InheritsTrust; ++ return Success; ++ } ++ ++ Result CheckCert(ByteString& certDER, IssuerChecker& checker, bool& keepGoing) ++ { ++ Input derCert; ++ Result rv = derCert.Init(certDER.data(), certDER.length()); ++ if (rv != Success) { ++ return rv; ++ } ++ return checker.Check(derCert, nullptr/*additionalNameConstraints*/, ++ keepGoing); ++ } ++ ++ Result FindIssuer(Input encodedIssuerName, IssuerChecker& checker, Time) ++ override ++ { ++ ByteString subjectDER(InputToByteString(encodedIssuerName)); ++ ByteString certDER(subjectDERToCertDER[subjectDER]); ++ assert(!ENCODING_FAILED(certDER)); ++ bool keepGoing; ++ Result rv = CheckCert(certDER, checker, keepGoing); ++ if (rv != Success) { ++ return rv; ++ } ++ // Also try the other intermediate. ++ if (keepGoing) { ++ rv = CheckCert(intermediateSignedByUntrustedRootCertDER, checker, ++ keepGoing); ++ if (rv != Success) { ++ return rv; ++ } ++ } ++ return Success; ++ } ++ ++ Result CheckRevocation(EndEntityOrCA, const CertID&, Time, Duration, ++ /*optional*/ const Input*, ++ /*optional*/ const Input*) override ++ { ++ return Success; ++ } ++ ++ Result IsChainValid(const DERArray&, Time, const CertPolicyId&) override ++ { ++ return Success; ++ } ++ ++ std::map subjectDERToCertDER; ++ ByteString rootCACertDER; ++ ByteString intermediateSignedByUntrustedRootCertDER; ++}; ++ ++TEST_F(pkixbuild, BadEmbeddedSCTWithMultiplePaths) ++{ ++ MultiplePathTrustDomain trustDomain; ++ trustDomain.SetUpCerts(); ++ ++ // python security/pkix/tools/DottedOIDToCode.py --tlv ++ // id-embeddedSctList 1.3.6.1.4.1.11129.2.4.2 ++ static const uint8_t tlv_id_embeddedSctList[] = { ++ 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0xd6, 0x79, 0x02, 0x04, 0x02 ++ }; ++ static const uint8_t dummySctList[] = { ++ 0x01, 0x02, 0x03, 0x04, 0x05 ++ }; ++ ByteString ctExtension = TLV(der::SEQUENCE, ++ BytesToByteString(tlv_id_embeddedSctList) + ++ Boolean(false) + ++ // The contents of the OCTET STRING are supposed to consist of an OCTET ++ // STRING of useful data. We're testing what happens if it isn't, so shove ++ // some bogus (non-OCTET STRING) data in there. ++ TLV(der::OCTET_STRING, BytesToByteString(dummySctList))); ++ ByteString certDER(CreateCert("Intermediate", "Cert with bogus SCT list", ++ EndEntityOrCA::MustBeEndEntity, ++ nullptr, /*subjectDERToCertDER*/ ++ &ctExtension)); ++ ASSERT_FALSE(ENCODING_FAILED(certDER)); ++ Input certDERInput; ++ ASSERT_EQ(Success, certDERInput.Init(certDER.data(), certDER.length())); ++ ASSERT_EQ(Result::ERROR_BAD_DER, ++ BuildCertChain(trustDomain, certDERInput, Now(), ++ EndEntityOrCA::MustBeEndEntity, ++ KeyUsage::noParticularKeyUsageRequired, ++ KeyPurposeId::id_kp_serverAuth, ++ CertPolicyId::anyPolicy, ++ nullptr/*stapledOCSPResponse*/)); ++} ++ ++// Same as a MultiplePathTrustDomain, but the end-entity is revoked. ++class RevokedEndEntityTrustDomain final : public MultiplePathTrustDomain ++{ ++public: ++ Result CheckRevocation(EndEntityOrCA endEntityOrCA, const CertID&, Time, ++ Duration, /*optional*/ const Input*, ++ /*optional*/ const Input*) override ++ { ++ if (endEntityOrCA == EndEntityOrCA::MustBeEndEntity) { ++ return Result::ERROR_REVOKED_CERTIFICATE; ++ } ++ return Success; ++ } ++}; ++ ++TEST_F(pkixbuild, RevokedEndEntityWithMultiplePaths) ++{ ++ RevokedEndEntityTrustDomain trustDomain; ++ trustDomain.SetUpCerts(); ++ ByteString certDER(CreateCert("Intermediate", "RevokedEndEntity", ++ EndEntityOrCA::MustBeEndEntity)); ++ ASSERT_FALSE(ENCODING_FAILED(certDER)); ++ Input certDERInput; ++ ASSERT_EQ(Success, certDERInput.Init(certDER.data(), certDER.length())); ++ ASSERT_EQ(Result::ERROR_REVOKED_CERTIFICATE, ++ BuildCertChain(trustDomain, certDERInput, Now(), ++ EndEntityOrCA::MustBeEndEntity, ++ KeyUsage::noParticularKeyUsageRequired, ++ KeyPurposeId::id_kp_serverAuth, ++ CertPolicyId::anyPolicy, ++ nullptr/*stapledOCSPResponse*/)); ++} Copied: branches/2018Q1/www/waterfox/files/patch-bug1438645 (from r462554, head/www/waterfox/files/patch-bug1438645) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1438645 Thu Feb 22 01:01:03 2018 (r462556, copy of r462554, head/www/waterfox/files/patch-bug1438645) @@ -0,0 +1,210 @@ +commit dc9f32108582 +Author: Ted Campbell +Date: Thu Feb 15 14:58:00 2018 +0200 + + Bug 1438645 - Prevent XDR from reading past its buffer. r=nbp a=lizzard + While XDR data is supposed to be trusted, we currently run into a + corruption for some users/use-cases and so make more XDR operations + fallible instead of crashing. + + MozReview-Commit-ID: 9FSLNWh9RxG + + --HG-- + extra : source : fb0c12a38e03ad49c40eb64df23885037d26053d +--- + js/src/jsatom.cpp | 18 ++++++++++++---- + js/src/vm/Xdr.cpp | 2 ++ + js/src/vm/Xdr.h | 62 ++++++++++++++++++++++++++++++++++++------------------- + 3 files changed, 57 insertions(+), 25 deletions(-) + +diff --git js/src/jsatom.cpp js/src/jsatom.cpp +index 5d3ed0040dc1..f1d975f6f03d 100644 +--- js/src/jsatom.cpp ++++ js/src/jsatom.cpp +@@ -644,15 +644,25 @@ js::XDRAtom(XDRState* xdr, MutableHandleAtom atomp) + JSAtom* atom; + if (latin1) { + const Latin1Char* chars = nullptr; +- if (length) +- chars = reinterpret_cast(xdr->buf.read(length)); ++ if (length) { ++ const uint8_t *ptr; ++ size_t nbyte = length * sizeof(Latin1Char); ++ if (!xdr->peekData(&ptr, nbyte)) ++ return false; ++ chars = reinterpret_cast(ptr); ++ } + atom = AtomizeChars(cx, chars, length); + } else { + #if MOZ_LITTLE_ENDIAN + /* Directly access the little endian chars in the XDR buffer. */ + const char16_t* chars = nullptr; +- if (length) +- chars = reinterpret_cast(xdr->buf.read(length * sizeof(char16_t))); ++ if (length) { ++ const uint8_t *ptr; ++ size_t nbyte = length * sizeof(char16_t); ++ if (!xdr->peekData(&ptr, nbyte)) ++ return false; ++ chars = reinterpret_cast(ptr); ++ } + atom = AtomizeChars(cx, chars, length); + #else + /* +diff --git js/src/vm/Xdr.cpp js/src/vm/Xdr.cpp +index ec184f31e0c7..5847dbbe3453 100644 +--- js/src/vm/Xdr.cpp ++++ js/src/vm/Xdr.cpp +@@ -73,6 +73,8 @@ XDRState::codeChars(char16_t* chars, size_t nchars) + mozilla::NativeEndian::copyAndSwapToLittleEndian(ptr, chars, nchars); + } else { + const uint8_t* ptr = buf.read(nbytes); ++ if (!ptr) ++ return fail(JS::TranscodeResult_Failure_BadDecode); + mozilla::NativeEndian::copyAndSwapFromLittleEndian(chars, ptr, nchars); + } + return true; +diff --git js/src/vm/Xdr.h js/src/vm/Xdr.h +index 0a6cbf01b50f..a60f43c6b531 100644 +--- js/src/vm/Xdr.h ++++ js/src/vm/Xdr.h +@@ -61,11 +61,6 @@ class XDRBuffer : public XDRBufferBase + return ptr; + } + +- const char* readCString() { +- MOZ_CRASH("Should never read in encode mode"); +- return nullptr; +- } +- + const uint8_t* read(size_t n) { + MOZ_CRASH("Should never read in encode mode"); + return nullptr; +@@ -87,19 +82,15 @@ class XDRBuffer : public XDRBufferBase + : XDRBufferBase(cx, cursor), + buffer_(buffer.begin(), buffer.length()) { } + +- const char* readCString() { +- char* ptr = reinterpret_cast(&buffer_[cursor_]); +- uint8_t* end = reinterpret_cast(strchr(ptr, '\0')) + 1; +- MOZ_ASSERT(buffer_.begin().get() < end); +- MOZ_ASSERT(end <= buffer_.end().get()); +- cursor_ = end - buffer_.begin().get(); +- return ptr; +- } +- + const uint8_t* read(size_t n) { + MOZ_ASSERT(cursor_ < buffer_.length()); + uint8_t* ptr = &buffer_[cursor_]; + cursor_ += n; ++ ++ // Don't let buggy code read past our buffer ++ if (cursor_ > buffer_.length()) ++ return nullptr; ++ + return ptr; + } + +@@ -174,7 +165,7 @@ class XDRCoderBase + template + class XDRState : public XDRCoderBase + { +- public: ++ protected: + XDRBuffer buf; + private: + JS::TranscodeResult resultCode_; +@@ -220,6 +211,14 @@ class XDRState : public XDRCoderBase + return false; + } + ++ bool peekData(const uint8_t** pptr, size_t length) { ++ const uint8_t* ptr = buf.read(length); ++ if (!ptr) ++ return fail(JS::TranscodeResult_Failure_BadDecode); ++ *pptr = ptr; ++ return true; ++ } ++ + bool codeUint8(uint8_t* n) { + if (mode == XDR_ENCODE) { + uint8_t* ptr = buf.write(sizeof(*n)); +@@ -227,7 +226,10 @@ class XDRState : public XDRCoderBase + return fail(JS::TranscodeResult_Throw); + *ptr = *n; + } else { +- *n = *buf.read(sizeof(*n)); ++ const uint8_t* ptr = buf.read(sizeof(*n)); ++ if (!ptr) ++ return fail(JS::TranscodeResult_Failure_BadDecode); ++ *n = *ptr; + } + return true; + } +@@ -240,6 +242,8 @@ class XDRState : public XDRCoderBase + mozilla::LittleEndian::writeUint16(ptr, *n); + } else { + const uint8_t* ptr = buf.read(sizeof(*n)); ++ if (!ptr) ++ return fail(JS::TranscodeResult_Failure_BadDecode); + *n = mozilla::LittleEndian::readUint16(ptr); + } + return true; +@@ -253,6 +257,8 @@ class XDRState : public XDRCoderBase + mozilla::LittleEndian::writeUint32(ptr, *n); + } else { + const uint8_t* ptr = buf.read(sizeof(*n)); ++ if (!ptr) ++ return fail(JS::TranscodeResult_Failure_BadDecode); + *n = mozilla::LittleEndian::readUint32(ptr); + } + return true; +@@ -266,6 +272,8 @@ class XDRState : public XDRCoderBase + mozilla::LittleEndian::writeUint64(ptr, *n); + } else { + const uint8_t* ptr = buf.read(sizeof(*n)); ++ if (!ptr) ++ return fail(JS::TranscodeResult_Failure_BadDecode); + *n = mozilla::LittleEndian::readUint64(ptr); + } + return true; +@@ -328,7 +336,10 @@ class XDRState : public XDRCoderBase + return fail(JS::TranscodeResult_Throw); + memcpy(ptr, bytes, len); + } else { +- memcpy(bytes, buf.read(len), len); ++ const uint8_t* ptr = buf.read(len); ++ if (!ptr) ++ return fail(JS::TranscodeResult_Failure_BadDecode); ++ memcpy(bytes, ptr, len); + } + return true; + } +@@ -340,14 +351,23 @@ class XDRState : public XDRCoderBase + * the decoding buffer. + */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Thu Feb 22 01:01:52 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9220F1339E; Thu, 22 Feb 2018 01:01:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6CDB27D954; Thu, 22 Feb 2018 01:01:51 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67D202017B; Thu, 22 Feb 2018 01:01:51 +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 w1M11pwW024587; Thu, 22 Feb 2018 01:01:51 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1M11pNu024584; Thu, 22 Feb 2018 01:01:51 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802220101.w1M11pNu024584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 22 Feb 2018 01:01:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462557 - in branches/2018Q1/games/openbor: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/games/openbor: . files X-SVN-Commit-Revision: 462557 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 01:01:52 -0000 Author: jbeich Date: Thu Feb 22 01:01:50 2018 New Revision: 462557 URL: https://svnweb.freebsd.org/changeset/ports/462557 Log: MFH: r462552 games/openbor: update to 4604 Changes: https://github.com/DCurrent/openbor/compare/ab066c1...d73408f Approved by: ports-secteam (feld, implicit for snapshots) Deleted: branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.h Modified: branches/2018Q1/games/openbor/Makefile branches/2018Q1/games/openbor/distinfo branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/games/openbor/Makefile ============================================================================== --- branches/2018Q1/games/openbor/Makefile Thu Feb 22 01:01:03 2018 (r462556) +++ branches/2018Q1/games/openbor/Makefile Thu Feb 22 01:01:50 2018 (r462557) @@ -2,7 +2,7 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 4601 +PORTVERSION?= 4604 .ifndef PKGNAMESUFFIX PORTREVISION= 0 .endif @@ -31,7 +31,7 @@ PORTSCOUT= ignore:1 USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= ab066c1 +GH_TAGNAME?= d73408f USES+= gmake pkgconfig .if ${PORTVERSION} < 4433 Modified: branches/2018Q1/games/openbor/distinfo ============================================================================== --- branches/2018Q1/games/openbor/distinfo Thu Feb 22 01:01:03 2018 (r462556) +++ branches/2018Q1/games/openbor/distinfo Thu Feb 22 01:01:50 2018 (r462557) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519052570 -SHA256 (DCurrent-openbor-4601-ab066c1_GH0.tar.gz) = 5ce8ce0d179d82716c5ca4ff4b0ff84a11ede9cf2cdcc62109f81a6c89a2b085 -SIZE (DCurrent-openbor-4601-ab066c1_GH0.tar.gz) = 107146373 +TIMESTAMP = 1519248328 +SHA256 (DCurrent-openbor-4604-d73408f_GH0.tar.gz) = 1827f54f3340782ca11e3c17e3c6623f9fb88112db510e89db917909842de656 +SIZE (DCurrent-openbor-4604-d73408f_GH0.tar.gz) = 107146873 Modified: branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c ============================================================================== --- branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c Thu Feb 22 01:01:03 2018 (r462556) +++ branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c Thu Feb 22 01:01:50 2018 (r462557) @@ -1,4 +1,5 @@ Reset seek position for BGM with more than 128 tracks +Don't crash with more than 256 tracks. --- source/gamelib/packfile.c.orig 2018-02-19 15:02:50 UTC +++ source/gamelib/packfile.c @@ -11,3 +12,12 @@ Reset seek position for BGM with more than 128 tracks filelist[i].nTracks = 0; fd = fopen(packfile, "rb"); if(fd == NULL) +@@ -1440,7 +1440,7 @@ void packfile_music_read(fileliststruct *filelist, int + { + goto nextpak; + } +- if(filelist[i].nTracks < PACKFILE_PATH_MAX) ++ if(filelist[i].nTracks < 256) + { + packfile_get_titlename(pn.namebuf, filelist[i].bgmFileName[filelist[i].nTracks]); + filelist[i].bgmTracks[filelist[i].nTracks] = off; From owner-svn-ports-branches@freebsd.org Thu Feb 22 03:00:31 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA3A4F1F5E3; Thu, 22 Feb 2018 03:00:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 982D9846CB; Thu, 22 Feb 2018 03:00:30 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 930F921798; Thu, 22 Feb 2018 03:00:30 +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 w1M30UQu083543; Thu, 22 Feb 2018 03:00:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1M30Uvp083542; Thu, 22 Feb 2018 03:00:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802220300.w1M30Uvp083542@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 22 Feb 2018 03:00:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462559 - branches/2018Q1/www/waterfox/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/www/waterfox/files X-SVN-Commit-Revision: 462559 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 03:00:31 -0000 Author: jbeich Date: Thu Feb 22 03:00:30 2018 New Revision: 462559 URL: https://svnweb.freebsd.org/changeset/ports/462559 Log: MFH: r462558 www/waterfox: unbreak after r462554 In file included from objdir/gfx/layers/Unified_cpp_gfx_layers7.cpp:11: gfx/layers/composite/TextureHost.cpp:287:82: error: no member named 'yStride' in 'mozilla::layers::YCbCrDescriptor' ImageDataSerializer::ComputeYCbCrBufferSize(ycbcr.ySize(), ycbcr.yStride(), ~~~~~ ^ gfx/layers/composite/TextureHost.cpp:288:85: error: no member named 'cbCrStride' in 'mozilla::layers::YCbCrDescriptor'; did you mean 'cbCrSize'? ycbcr.cbCrSize(), ycbcr.cbCrStride()); ^~~~~~~~~~ cbCrSize Point hat to: jbeich (last minute fix) Approved by: ports-secteam blanket Modified: branches/2018Q1/www/waterfox/files/patch-bug1388020 Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/files/patch-bug1388020 ============================================================================== --- branches/2018Q1/www/waterfox/files/patch-bug1388020 Thu Feb 22 02:59:52 2018 (r462558) +++ branches/2018Q1/www/waterfox/files/patch-bug1388020 Thu Feb 22 03:00:30 2018 (r462559) @@ -98,8 +98,8 @@ index a48a9081e155..e0a74920fbe5 100644 + case BufferDescriptor::TYCbCrDescriptor: { + const YCbCrDescriptor& ycbcr = desc.get_YCbCrDescriptor(); + reqSize = -+ ImageDataSerializer::ComputeYCbCrBufferSize(ycbcr.ySize(), ycbcr.yStride(), -+ ycbcr.cbCrSize(), ycbcr.cbCrStride()); ++ ImageDataSerializer::ComputeYCbCrBufferSize(ycbcr.ySize(), ycbcr.ySize().width, ++ ycbcr.cbCrSize(), ycbcr.cbCrSize().width); + break; + } + case BufferDescriptor::TRGBDescriptor: { From owner-svn-ports-branches@freebsd.org Thu Feb 22 12:19:57 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78093F28B52; Thu, 22 Feb 2018 12:19:57 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 28F807F72F; Thu, 22 Feb 2018 12:19:57 +0000 (UTC) (envelope-from sunpoet@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 235B02777B; Thu, 22 Feb 2018 12:19:57 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1MCJvc3064928; Thu, 22 Feb 2018 12:19:57 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1MCJuPJ064926; Thu, 22 Feb 2018 12:19:56 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201802221219.w1MCJuPJ064926@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 22 Feb 2018 12:19:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462586 - in branches/2018Q1/lang/python35: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in branches/2018Q1/lang/python35: . files X-SVN-Commit-Revision: 462586 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 12:19:57 -0000 Author: sunpoet Date: Thu Feb 22 12:19:56 2018 New Revision: 462586 URL: https://svnweb.freebsd.org/changeset/ports/462586 Log: MFH: r461917 Fix build with OpenSSL 1.1.0 (security/openssl-devel) - Remove BROKEN_SSL=openssl-devel Reference: https://bugs.python.org/issue30622 https://github.com/python/cpython/commit/b2d096bd2a5ff86e53c25d00ee5fa097b36bf1d8 https://github.com/python/cpython/commit/af64aff9f7de2ee60c20bfb331e8a00ea0521c1e PR: 225870 Submitted by: brnrd Approved by: ports-secteam (blanket) Added: branches/2018Q1/lang/python35/files/patch-issue30622 - copied unchanged from r461917, head/lang/python35/files/patch-issue30622 Modified: branches/2018Q1/lang/python35/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/lang/python35/Makefile ============================================================================== --- branches/2018Q1/lang/python35/Makefile Thu Feb 22 12:19:27 2018 (r462585) +++ branches/2018Q1/lang/python35/Makefile Thu Feb 22 12:19:56 2018 (r462586) @@ -14,8 +14,6 @@ COMMENT= Interpreted object-oriented programming langu LICENSE= PSFL -BROKEN_SSL= openssl-devel - USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes Copied: branches/2018Q1/lang/python35/files/patch-issue30622 (from r461917, head/lang/python35/files/patch-issue30622) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/lang/python35/files/patch-issue30622 Thu Feb 22 12:19:56 2018 (r462586, copy of r461917, head/lang/python35/files/patch-issue30622) @@ -0,0 +1,145 @@ +From b2d096bd2a5ff86e53c25d00ee5fa097b36bf1d8 Mon Sep 17 00:00:00 2001 +From: Melvyn Sopacua +Date: Mon, 4 Sep 2017 23:35:15 +0200 +Subject: [PATCH] bpo-30622: Change NPN detection: (#2079) + +* Change NPN detection: + +Version breakdown, support disabled (pre-patch/post-patch): +- pre-1.0.1: OPENSSL_NPN_NEGOTIATED will not be defined -> False/False +- 1.0.1 and 1.0.2: OPENSSL_NPN_NEGOTIATED will not be defined -> +False/False +- 1.1.0+: OPENSSL_NPN_NEGOTIATED will be defined and +OPENSSL_NO_NEXTPROTONEG will be defined -> True/False + +Version breakdown support enabled (pre-patch/post-patch): +- pre-1.0.1: OPENSSL_NPN_NEGOTIATED will not be defined -> False/False +- 1.0.1 and 1.0.2: OPENSSL_NPN_NEGOTIATED will be defined and +OPENSSL_NO_NEXTPROTONEG will not be defined -> True/True +- 1.1.0+: OPENSSL_NPN_NEGOTIATED will be defined and +OPENSSL_NO_NEXTPROTONEG will not be defined -> True/True + +* Refine NPN guard: + +- If NPN is disabled, but ALPN is available we need our callback +- Make clinic's ssl behave the same way + +This created a working ssl module for me, with NPN disabled and ALPN +enabled for OpenSSL 1.1.0f. + +Concerns to address: +The initial commit for NPN support into OpenSSL [1], had the +OPENSSL_NPN_* variables defined inside the OPENSSL_NO_NEXTPROTONEG +guard. The question is if that ever made it into a release. +This would need an ugly hack, something like: + + #if defined(OPENSSL_NO_NEXTPROTONEG) && \ + !defined(OPENSSL_NPN_NEGOTIATED) + # define OPENSSL_NPN_UNSUPPORTED 0 + # define OPENSSL_NPN_NEGOTIATED 1 + # define OPENSSL_NPN_NO_OVERLAP 2 + #endif + +[1] https://github.com/openssl/openssl/commit/68b33cc5c7 + +--- Modules/_ssl.c.orig 2018-02-04 23:40:56 UTC ++++ Modules/_ssl.c +@@ -260,7 +260,7 @@ static unsigned int _ssl_locks_count = 0 + typedef struct { + PyObject_HEAD + SSL_CTX *ctx; +-#ifdef OPENSSL_NPN_NEGOTIATED ++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) + unsigned char *npn_protocols; + int npn_protocols_len; + #endif +@@ -1605,7 +1605,7 @@ _ssl__SSLSocket_version_impl(PySSLSocket + return PyUnicode_FromString(version); + } + +-#ifdef OPENSSL_NPN_NEGOTIATED ++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) + /*[clinic input] + _ssl._SSLSocket.selected_npn_protocol + [clinic start generated code]*/ +@@ -2375,7 +2375,7 @@ _ssl__SSLContext_impl(PyTypeObject *type + return NULL; + } + self->ctx = ctx; +-#ifdef OPENSSL_NPN_NEGOTIATED ++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) + self->npn_protocols = NULL; + #endif + #ifdef HAVE_ALPN +@@ -2469,7 +2469,7 @@ context_dealloc(PySSLContext *self) + PyObject_GC_UnTrack(self); + context_clear(self); + SSL_CTX_free(self->ctx); +-#ifdef OPENSSL_NPN_NEGOTIATED ++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) + PyMem_FREE(self->npn_protocols); + #endif + #ifdef HAVE_ALPN +@@ -2501,7 +2501,7 @@ _ssl__SSLContext_set_ciphers_impl(PySSLC + Py_RETURN_NONE; + } + +-#ifdef OPENSSL_NPN_NEGOTIATED ++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) || defined(HAVE_ALPN) + static int + do_protocol_selection(int alpn, unsigned char **out, unsigned char *outlen, + const unsigned char *server_protocols, unsigned int server_protocols_len, +@@ -2525,7 +2525,9 @@ do_protocol_selection(int alpn, unsigned + + return SSL_TLSEXT_ERR_OK; + } ++#endif + ++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) + /* this callback gets passed to SSL_CTX_set_next_protos_advertise_cb */ + static int + _advertiseNPN_cb(SSL *s, +@@ -2568,7 +2570,7 @@ _ssl__SSLContext__set_npn_protocols_impl + Py_buffer *protos) + /*[clinic end generated code: output=72b002c3324390c6 input=319fcb66abf95bd7]*/ + { +-#ifdef OPENSSL_NPN_NEGOTIATED ++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) + PyMem_Free(self->npn_protocols); + self->npn_protocols = PyMem_Malloc(protos->len); + if (self->npn_protocols == NULL) +@@ -4843,7 +4845,7 @@ PyInit__ssl(void) + Py_INCREF(r); + PyModule_AddObject(m, "HAS_ECDH", r); + +-#ifdef OPENSSL_NPN_NEGOTIATED ++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) + r = Py_True; + #else + r = Py_False; +--- Modules/clinic/_ssl.c.h.orig 2018-02-04 23:40:56 UTC ++++ Modules/clinic/_ssl.c.h +@@ -130,7 +130,7 @@ _ssl__SSLSocket_version(PySSLSocket *sel + return _ssl__SSLSocket_version_impl(self); + } + +-#if defined(OPENSSL_NPN_NEGOTIATED) ++#if (defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)) + + PyDoc_STRVAR(_ssl__SSLSocket_selected_npn_protocol__doc__, + "selected_npn_protocol($self, /)\n" +@@ -149,7 +149,7 @@ _ssl__SSLSocket_selected_npn_protocol(Py + return _ssl__SSLSocket_selected_npn_protocol_impl(self); + } + +-#endif /* defined(OPENSSL_NPN_NEGOTIATED) */ ++#endif /* (defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)) */ + + #if defined(HAVE_ALPN) + +@@ -1102,4 +1102,4 @@ exit: + #ifndef _SSL_ENUM_CRLS_METHODDEF + #define _SSL_ENUM_CRLS_METHODDEF + #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */ +-/*[clinic end generated code: output=6fb10594d8351dc5 input=a9049054013a1b77]*/ ++/*[clinic end generated code: output=8f9d480117387554 input=a9049054013a1b77]*/ From owner-svn-ports-branches@freebsd.org Thu Feb 22 14:14:18 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0EE4F07127; Thu, 22 Feb 2018 14:14:17 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A30D38481F; Thu, 22 Feb 2018 14:14:17 +0000 (UTC) (envelope-from feld@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9E06FB08; Thu, 22 Feb 2018 14:14:17 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1MEEH3g024729; Thu, 22 Feb 2018 14:14:17 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1MEEHuX024727; Thu, 22 Feb 2018 14:14:17 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201802221414.w1MEEHuX024727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 22 Feb 2018 14:14:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462591 - in branches/2018Q1/textproc/elasticsearch5: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q1/textproc/elasticsearch5: . files X-SVN-Commit-Revision: 462591 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 14:14:18 -0000 Author: feld Date: Thu Feb 22 14:14:17 2018 New Revision: 462591 URL: https://svnweb.freebsd.org/changeset/ports/462591 Log: MFH: r462590 textproc/elasticsearch5: rc script improvement - Fix behavior with multiple profiles - Correctly handle the individual config dirs - Prevent thundering herd at shutdown by using wait_for_pids Approved by: maintainer Deleted: branches/2018Q1/textproc/elasticsearch5/files/patch-bin_elasticsearch.in.sh Modified: branches/2018Q1/textproc/elasticsearch5/Makefile branches/2018Q1/textproc/elasticsearch5/files/elasticsearch.in Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/textproc/elasticsearch5/Makefile ============================================================================== --- branches/2018Q1/textproc/elasticsearch5/Makefile Thu Feb 22 14:13:30 2018 (r462590) +++ branches/2018Q1/textproc/elasticsearch5/Makefile Thu Feb 22 14:14:17 2018 (r462591) @@ -3,7 +3,7 @@ PORTNAME= elasticsearch PORTVERSION= 5.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ Modified: branches/2018Q1/textproc/elasticsearch5/files/elasticsearch.in ============================================================================== --- branches/2018Q1/textproc/elasticsearch5/files/elasticsearch.in Thu Feb 22 14:13:30 2018 (r462590) +++ branches/2018Q1/textproc/elasticsearch5/files/elasticsearch.in Thu Feb 22 14:14:17 2018 (r462591) @@ -15,7 +15,7 @@ # Set it to required username. # elasticsearch_group (group): Set to elasticsearch by default. # Set it to required group. -# elasticsearch_config (path): Set to /usr/local/etc/elasticsearch/elasticsearch.yml by default. +# elasticsearch_config (path): Set to %%PREFIX%%/etc/elasticsearch/elasticsearch.yml by default. # Set it to the config file location. # elasticsearch_tmp (path): Set to /var/tmp/elasticsearch by default. # Set it to the path to be used for temp files. @@ -27,31 +27,30 @@ rcvar=elasticsearch_enable load_rc_config ${name} -: ${elasticsearch_enable:="NO"} -: ${elasticsearch_user:=%%SEARCHUSER%%} -: ${elasticsearch_group:=%%SEARCHGROUP%%} -: ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch"} -: ${elasticsearch_tmp:="/var/tmp/elasticsearch"} +: ${elasticsearch_enable:=NO} +: ${elasticsearch_user=elasticsearch} +: ${elasticsearch_group=elasticsearch} +: ${elasticsearch_config=%%PREFIX%%/etc/elasticsearch} +: ${elasticsearch_tmp=/var/tmp/elasticsearch} required_files="${elasticsearch_config}/elasticsearch.yml" -_pidprefix="/var/run/elasticsearch" -pidfile="${_pidprefix}.pid" +_pidprefix=/var/run/elasticsearch +pidfile=${_pidprefix}.pid extra_commands="console status" -console_cmd="elasticsearch_console" -start_precmd="elasticsearch_precmd" -status_cmd="elasticsearch_status" -stop_cmd="elasticsearch_stop" -command="%%PREFIX%%/lib/elasticsearch/bin/elasticsearch" -command_args="-d --pidfile=${pidfile}" +console_cmd=elasticsearch_console +start_precmd=elasticsearch_precmd +status_cmd=elasticsearch_status +stop_cmd=elasticsearch_stop +command=%%PREFIX%%/lib/elasticsearch/bin/elasticsearch +command_args="-d --pidfile=${pidfile} -Epath.conf=${elasticsearch_config}" elasticsearch_precmd() { - touch ${pidfile} - chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile} - /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp} - /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/db/elasticsearch - /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/log/elasticsearch + /usr/bin/install -o ${elasticsearch_user} -g ${elasticsearch_group} /dev/null ${pidfile} + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 ${elasticsearch_tmp} + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/db/elasticsearch + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/log/elasticsearch } elasticsearch_console() @@ -60,7 +59,6 @@ elasticsearch_console() run_rc_command "start" } - elasticsearch_stop() { rc_pid=$(elasticsearch_check_pidfile $pidfile) @@ -72,7 +70,8 @@ elasticsearch_stop() fi echo "Stopping ${name}." - kill ${rc_pid} 2> /dev/null + kill $sig_stop ${rc_pid} + wait_for_pids ${rc_pid} } elasticsearch_status() @@ -102,15 +101,13 @@ elasticsearch_check_pidfile() debug "pid file ($_pidfile): no pid in file." return fi - if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid"`" ]; then + if [ -n "`%%PREFIX%%/bin/jps -l | grep -e "^$_pid"`" ]; then echo -n $_pid fi } if [ -n "$2" ]; then profile="$2" if [ "x${elasticsearch_profiles}" != "x" ]; then - pidfile="${_pidprefix}.${profile}.pid" - command_args="-d --pidfile=${pidfile}" eval elasticsearch_config="\${elasticsearch_${profile}_config:-}" if [ "x${elasticsearch_config}" = "x" ]; then echo "You must define a configuration (elasticsearch_${profile}_config)" @@ -120,6 +117,11 @@ if [ -n "$2" ]; then required_files="${elasticsearch_config}/jvm.options" eval elasticsearch_enable="\${elasticsearch_${profile}_enable:-${elasticsearch_enable}}" eval elasticsearch_tmp="\${elasticsearch_${profile}_args:-${elasticsearch_tmp}}" + pidfile="${_pidprefix}.${profile}.pid" + if [ -e ${elasticsearch_config}/jvm.options ]; then + export ES_JVM_OPTIONS=${elasticsearch_config}/jvm.options + fi + command_args="-d --pidfile=${pidfile} -Epath.conf=${elasticsearch_config}" else echo "$0: extra argument ignored" fi @@ -147,7 +149,7 @@ else ;; esac echo "===> elasticsearch profile: ${profile}" - /usr/local/etc/rc.d/elasticsearch $1 ${profile} + %%PREFIX%%/etc/rc.d/elasticsearch $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" From owner-svn-ports-branches@freebsd.org Thu Feb 22 19:52:10 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8513F25F16; Thu, 22 Feb 2018 19:52:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 778A2762EE; Thu, 22 Feb 2018 19:52:09 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5461C4682; Thu, 22 Feb 2018 19:52:09 +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 w1MJq9LK005427; Thu, 22 Feb 2018 19:52:09 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1MJq9IL005422; Thu, 22 Feb 2018 19:52:09 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802221952.w1MJq9IL005422@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 22 Feb 2018 19:52:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462640 - in branches/2018Q1/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www/waterfox: . files X-SVN-Commit-Revision: 462640 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 19:52:10 -0000 Author: jbeich Date: Thu Feb 22 19:52:08 2018 New Revision: 462640 URL: https://svnweb.freebsd.org/changeset/ports/462640 Log: MFH: r462635 www/waterfox: update to 56.0.4.20 - Apply some FF59 fixes Changes: https://github.com/MrAlex94/Waterfox/compare/56.0.4...e03e284b083d Security: HPKP/HSTS Approved by: ports-secteam blanket Added: branches/2018Q1/www/waterfox/files/patch-bug1398021 - copied unchanged from r462635, head/www/waterfox/files/patch-bug1398021 branches/2018Q1/www/waterfox/files/patch-bug1399412 - copied unchanged from r462635, head/www/waterfox/files/patch-bug1399412 branches/2018Q1/www/waterfox/files/patch-bug1430557 - copied unchanged from r462635, head/www/waterfox/files/patch-bug1430557 branches/2018Q1/www/waterfox/files/patch-bug1437087 - copied unchanged from r462635, head/www/waterfox/files/patch-bug1437087 Deleted: branches/2018Q1/www/waterfox/files/patch-bug895096 Modified: branches/2018Q1/www/waterfox/Makefile branches/2018Q1/www/waterfox/distinfo branches/2018Q1/www/waterfox/files/patch-bug1388020 Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Thu Feb 22 19:51:35 2018 (r462639) +++ branches/2018Q1/www/waterfox/Makefile Thu Feb 22 19:52:08 2018 (r462640) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.0.4 -PORTREVISION= 6 +DISTVERSION= 56.0.4-20 +DISTVERSIONSUFFIX= -ge03e284b083d CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/www/waterfox/distinfo ============================================================================== --- branches/2018Q1/www/waterfox/distinfo Thu Feb 22 19:51:35 2018 (r462639) +++ branches/2018Q1/www/waterfox/distinfo Thu Feb 22 19:52:08 2018 (r462640) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517598190 -SHA256 (MrAlex94-Waterfox-56.0.4_GH0.tar.gz) = 291a7aa8e541802d1705cf68c694e300f9cb14fffc6c1d24e51b9ed486cd44b7 -SIZE (MrAlex94-Waterfox-56.0.4_GH0.tar.gz) = 394233214 +TIMESTAMP = 1519322366 +SHA256 (MrAlex94-Waterfox-56.0.4-20-ge03e284b083d_GH0.tar.gz) = f8103fee10acf9e32fc8d9ea8fca6418a557888a2bda781a92e96beb305c8c4e +SIZE (MrAlex94-Waterfox-56.0.4-20-ge03e284b083d_GH0.tar.gz) = 394048388 Modified: branches/2018Q1/www/waterfox/files/patch-bug1388020 ============================================================================== --- branches/2018Q1/www/waterfox/files/patch-bug1388020 Thu Feb 22 19:51:35 2018 (r462639) +++ branches/2018Q1/www/waterfox/files/patch-bug1388020 Thu Feb 22 19:52:08 2018 (r462640) @@ -74,7 +74,7 @@ index a48a9081e155..e0a74920fbe5 100644 MOZ_ASSERT(aExternalImageId.isSome()); result = new WebRenderTextureHost(aDesc, aFlags, result, aExternalImageId.ref()); } -@@ -269,13 +268,50 @@ CreateBackendIndependentTextureHost(const SurfaceDescriptor& aDesc, +@@ -269,13 +268,49 @@ CreateBackendIndependentTextureHost(const SurfaceDescriptor& aDesc, const MemoryOrShmem& data = bufferDesc.data(); switch (data.type()) { case MemoryOrShmem::TShmem: { @@ -98,8 +98,7 @@ index a48a9081e155..e0a74920fbe5 100644 + case BufferDescriptor::TYCbCrDescriptor: { + const YCbCrDescriptor& ycbcr = desc.get_YCbCrDescriptor(); + reqSize = -+ ImageDataSerializer::ComputeYCbCrBufferSize(ycbcr.ySize(), ycbcr.ySize().width, -+ ycbcr.cbCrSize(), ycbcr.cbCrSize().width); ++ ImageDataSerializer::ComputeYCbCrBufferSize(ycbcr.ySize(), ycbcr.cbCrSize()); + break; + } + case BufferDescriptor::TRGBDescriptor: { Copied: branches/2018Q1/www/waterfox/files/patch-bug1398021 (from r462635, head/www/waterfox/files/patch-bug1398021) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1398021 Thu Feb 22 19:52:08 2018 (r462640, copy of r462635, head/www/waterfox/files/patch-bug1398021) @@ -0,0 +1,2737 @@ +commit 909ebdebd850 +Author: Ryan VanderMeulen +Date: Tue Sep 12 09:00:37 2017 -0400 + + Bug 1398021 - Update lz4 to version 1.8.0. r=froydnj +--- + mfbt/Compression.cpp | 7 +- + mfbt/lz4.c | 1593 ++++++++++++++++++++++++++++++-------------------- + mfbt/lz4.h | 531 +++++++++++------ + 3 files changed, 1319 insertions(+), 812 deletions(-) + +diff --git mfbt/Compression.cpp mfbt/Compression.cpp +index 3f5fff53c425..ed0bb4ef72c7 100644 +--- mfbt/Compression.cpp ++++ mfbt/Compression.cpp +@@ -36,7 +36,8 @@ LZ4::compress(const char* aSource, size_t aInputSize, char* aDest) + { + CheckedInt inputSizeChecked = aInputSize; + MOZ_ASSERT(inputSizeChecked.isValid()); +- return LZ4_compress(aSource, aDest, inputSizeChecked.value()); ++ return LZ4_compress_default(aSource, aDest, inputSizeChecked.value(), ++ LZ4_compressBound(inputSizeChecked.value())); + } + + size_t +@@ -47,8 +48,8 @@ LZ4::compressLimitedOutput(const char* aSource, size_t aInputSize, char* aDest, + MOZ_ASSERT(inputSizeChecked.isValid()); + CheckedInt maxOutputSizeChecked = aMaxOutputSize; + MOZ_ASSERT(maxOutputSizeChecked.isValid()); +- return LZ4_compress_limitedOutput(aSource, aDest, inputSizeChecked.value(), +- maxOutputSizeChecked.value()); ++ return LZ4_compress_default(aSource, aDest, inputSizeChecked.value(), ++ maxOutputSizeChecked.value()); + } + + bool +diff --git mfbt/lz4.c mfbt/lz4.c +index c416fe815a42..5752b4d17b0e 100644 +--- mfbt/lz4.c ++++ mfbt/lz4.c +@@ -1,6 +1,7 @@ + /* + LZ4 - Fast LZ compression algorithm +- Copyright (C) 2011-2014, Yann Collet. ++ Copyright (C) 2011-2017, Yann Collet. ++ + BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + + Redistribution and use in source and binary forms, with or without +@@ -27,118 +28,96 @@ + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + You can contact the author at : +- - LZ4 source repository : http://code.google.com/p/lz4/ +- - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c ++ - LZ4 homepage : http://www.lz4.org ++ - LZ4 source repository : https://github.com/lz4/lz4 + */ + +-/************************************** +- Tuning parameters ++ ++/*-************************************ ++* Tuning parameters + **************************************/ + /* +- * HEAPMODE : ++ * LZ4_HEAPMODE : + * Select how default compression functions will allocate memory for their hash table, +- * in memory stack (0:default, fastest), or in memory heap (1:requires memory allocation (malloc)). ++ * in memory stack (0:default, fastest), or in memory heap (1:requires malloc()). + */ +-#define HEAPMODE 0 +- +- +-/************************************** +- CPU Feature Detection +-**************************************/ +-/* 32 or 64 bits ? */ +-#if (defined(__x86_64__) || defined(_M_X64) || defined(_WIN64) \ +- || defined(__powerpc64__) || defined(__powerpc64le__) \ +- || defined(__ppc64__) || defined(__ppc64le__) \ +- || defined(__PPC64__) || defined(__PPC64LE__) \ +- || defined(__ia64) || defined(__itanium__) || defined(_M_IA64) \ +- || (defined(__mips64) && defined(_ABI64))) /* Detects 64 bits mode */ +-# define LZ4_ARCH64 1 +-#else +-# define LZ4_ARCH64 0 ++#ifndef LZ4_HEAPMODE ++# define LZ4_HEAPMODE 0 + #endif + + /* +- * Little Endian or Big Endian ? +- * Overwrite the #define below if you know your architecture endianess ++ * ACCELERATION_DEFAULT : ++ * Select "acceleration" for LZ4_compress_fast() when parameter value <= 0 + */ +-#include /* Apparently required to detect endianess */ +-#if defined (__GLIBC__) +-# include +-# if (__BYTE_ORDER == __BIG_ENDIAN) +-# define LZ4_BIG_ENDIAN 1 ++#define ACCELERATION_DEFAULT 1 ++ ++ ++/*-************************************ ++* CPU Feature Detection ++**************************************/ ++/* LZ4_FORCE_MEMORY_ACCESS ++ * By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable. ++ * Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal. ++ * The below switch allow to select different access method for improved performance. ++ * Method 0 (default) : use `memcpy()`. Safe and portable. ++ * Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable). ++ * This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`. ++ * Method 2 : direct access. This method is portable but violate C standard. ++ * It can generate buggy code on targets which assembly generation depends on alignment. ++ * But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6) ++ * See https://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details. ++ * Prefer these methods in priority order (0 > 1 > 2) ++ */ ++#ifndef LZ4_FORCE_MEMORY_ACCESS /* can be defined externally */ ++# if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) ) ++# define LZ4_FORCE_MEMORY_ACCESS 2 ++# elif defined(__INTEL_COMPILER) || defined(__GNUC__) ++# define LZ4_FORCE_MEMORY_ACCESS 1 + # endif +-#elif (defined(__BIG_ENDIAN__) || defined(__BIG_ENDIAN) || defined(_BIG_ENDIAN)) && !(defined(__LITTLE_ENDIAN__) || defined(__LITTLE_ENDIAN) || defined(_LITTLE_ENDIAN)) +-# define LZ4_BIG_ENDIAN 1 +-#elif defined(__sparc) || defined(__sparc__) \ +- || defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) \ +- || defined(__hpux) || defined(__hppa) \ +- || defined(_MIPSEB) || defined(__s390__) +-# define LZ4_BIG_ENDIAN 1 +-#else +-/* Little Endian assumed. PDP Endian and other very rare endian format are unsupported. */ + #endif + + /* +- * Unaligned memory access is automatically enabled for "common" CPU, such as x86. +- * For others CPU, such as ARM, the compiler may be more cautious, inserting unnecessary extra code to ensure aligned access property +- * If you know your target CPU supports unaligned memory access, you want to force this option manually to improve performance ++ * LZ4_FORCE_SW_BITCOUNT ++ * Define this parameter if your target system or compiler does not support hardware bit count + */ +-#if defined(__ARM_FEATURE_UNALIGNED) +-# define LZ4_FORCE_UNALIGNED_ACCESS 1 +-#endif +- +-/* Define this parameter if your target system or compiler does not support hardware bit count */ + #if defined(_MSC_VER) && defined(_WIN32_WCE) /* Visual Studio for Windows CE does not support Hardware bit count */ + # define LZ4_FORCE_SW_BITCOUNT + #endif + +-/* +- * BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE : +- * This option may provide a small boost to performance for some big endian cpu, although probably modest. +- * You may set this option to 1 if data will remain within closed environment. +- * This option is useless on Little_Endian CPU (such as x86) +- */ + +-/* #define BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE 1 */ ++/*-************************************ ++* Dependency ++**************************************/ ++#include "lz4.h" ++/* see also "memory routines" below */ + + +-/************************************** +- Compiler Options ++/*-************************************ ++* Compiler Options + **************************************/ +-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */ +-/* "restrict" is a known keyword */ +-#else +-# define restrict /* Disable restrict */ +-#endif +- + #ifdef _MSC_VER /* Visual Studio */ +-# define FORCE_INLINE static __forceinline +-# include /* For Visual 2005 */ +-# if LZ4_ARCH64 /* 64-bits */ +-# pragma intrinsic(_BitScanForward64) /* For Visual 2005 */ +-# pragma intrinsic(_BitScanReverse64) /* For Visual 2005 */ +-# else /* 32-bits */ +-# pragma intrinsic(_BitScanForward) /* For Visual 2005 */ +-# pragma intrinsic(_BitScanReverse) /* For Visual 2005 */ +-# endif ++# include + # pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ +-#else +-# ifdef __GNUC__ +-# define FORCE_INLINE static inline __attribute__((always_inline)) +-# else +-# define FORCE_INLINE static inline +-# endif +-#endif +- +-#ifdef _MSC_VER /* Visual Studio */ +-# define lz4_bswap16(x) _byteswap_ushort(x) +-#else +-# define lz4_bswap16(x) ((unsigned short int) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))) +-#endif +- +-#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) ++# pragma warning(disable : 4293) /* disable: C4293: too large shift (32-bits) */ ++#endif /* _MSC_VER */ + +-#if (GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__) ++#ifndef FORCE_INLINE ++# ifdef _MSC_VER /* Visual Studio */ ++# define FORCE_INLINE static __forceinline ++# else ++# if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */ ++# ifdef __GNUC__ ++# define FORCE_INLINE static inline __attribute__((always_inline)) ++# else ++# define FORCE_INLINE static inline ++# endif ++# else ++# define FORCE_INLINE static ++# endif /* __STDC_VERSION__ */ ++# endif /* _MSC_VER */ ++#endif /* FORCE_INLINE */ ++ ++#if (defined(__GNUC__) && (__GNUC__ >= 3)) || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) || defined(__clang__) + # define expect(expr,value) (__builtin_expect ((expr),(value)) ) + #else + # define expect(expr,value) (expr) +@@ -148,8 +127,8 @@ + #define unlikely(expr) expect((expr) != 0, 0) + + +-/************************************** +- Memory routines ++/*-************************************ ++* Memory routines + **************************************/ + #include /* malloc, calloc, free */ + #define ALLOCATOR(n,s) calloc(n,s) +@@ -158,84 +137,146 @@ + #define MEM_INIT memset + + +-/************************************** +- Includes ++/*-************************************ ++* Basic Types + **************************************/ +-#include "lz4.h" +- +- +-/************************************** +- Basic Types +-**************************************/ +-#if defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */ ++#if defined(__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) + # include + typedef uint8_t BYTE; + typedef uint16_t U16; + typedef uint32_t U32; + typedef int32_t S32; + typedef uint64_t U64; ++ typedef uintptr_t uptrval; + #else + typedef unsigned char BYTE; + typedef unsigned short U16; + typedef unsigned int U32; + typedef signed int S32; + typedef unsigned long long U64; ++ typedef size_t uptrval; /* generally true, except OpenVMS-64 */ + #endif + +-#if defined(__GNUC__) && !defined(LZ4_FORCE_UNALIGNED_ACCESS) +-# define _PACKED __attribute__ ((packed)) ++#if defined(__x86_64__) ++ typedef U64 reg_t; /* 64-bits in x32 mode */ + #else +-# define _PACKED ++ typedef size_t reg_t; /* 32-bits in x32 mode */ + #endif + +-#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__) +-# if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +-# pragma pack(1) +-# else +-# pragma pack(push, 1) +-# endif +-#endif ++/*-************************************ ++* Reading and writing into memory ++**************************************/ ++static unsigned LZ4_isLittleEndian(void) ++{ ++ const union { U32 u; BYTE c[4]; } one = { 1 }; /* don't use static : performance detrimental */ ++ return one.c[0]; ++} + +-typedef struct { U16 v; } _PACKED U16_S; +-typedef struct { U32 v; } _PACKED U32_S; +-typedef struct { U64 v; } _PACKED U64_S; +-typedef struct {size_t v;} _PACKED size_t_S; + +-#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__) +-# if defined(__SUNPRO_C) || defined(__SUNPRO_CC) +-# pragma pack(0) +-# else +-# pragma pack(pop) +-# endif +-#endif ++#if defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS==2) ++/* lie to the compiler about data alignment; use with caution */ + +-#define A16(x) (((U16_S *)(x))->v) +-#define A32(x) (((U32_S *)(x))->v) +-#define A64(x) (((U64_S *)(x))->v) +-#define AARCH(x) (((size_t_S *)(x))->v) ++static U16 LZ4_read16(const void* memPtr) { return *(const U16*) memPtr; } ++static U32 LZ4_read32(const void* memPtr) { return *(const U32*) memPtr; } ++static reg_t LZ4_read_ARCH(const void* memPtr) { return *(const reg_t*) memPtr; } + ++static void LZ4_write16(void* memPtr, U16 value) { *(U16*)memPtr = value; } ++static void LZ4_write32(void* memPtr, U32 value) { *(U32*)memPtr = value; } + +-/************************************** +- Constants +-**************************************/ +-#define LZ4_HASHLOG (LZ4_MEMORY_USAGE-2) +-#define HASHTABLESIZE (1 << LZ4_MEMORY_USAGE) +-#define HASH_SIZE_U32 (1 << LZ4_HASHLOG) ++#elif defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS==1) ++ ++/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */ ++/* currently only defined for gcc and icc */ ++typedef union { U16 u16; U32 u32; reg_t uArch; } __attribute__((packed)) unalign; ++ ++static U16 LZ4_read16(const void* ptr) { return ((const unalign*)ptr)->u16; } ++static U32 LZ4_read32(const void* ptr) { return ((const unalign*)ptr)->u32; } ++static reg_t LZ4_read_ARCH(const void* ptr) { return ((const unalign*)ptr)->uArch; } ++ ++static void LZ4_write16(void* memPtr, U16 value) { ((unalign*)memPtr)->u16 = value; } ++static void LZ4_write32(void* memPtr, U32 value) { ((unalign*)memPtr)->u32 = value; } ++ ++#else /* safe and portable access through memcpy() */ + ++static U16 LZ4_read16(const void* memPtr) ++{ ++ U16 val; memcpy(&val, memPtr, sizeof(val)); return val; ++} ++ ++static U32 LZ4_read32(const void* memPtr) ++{ ++ U32 val; memcpy(&val, memPtr, sizeof(val)); return val; ++} ++ ++static reg_t LZ4_read_ARCH(const void* memPtr) ++{ ++ reg_t val; memcpy(&val, memPtr, sizeof(val)); return val; ++} ++ ++static void LZ4_write16(void* memPtr, U16 value) ++{ ++ memcpy(memPtr, &value, sizeof(value)); ++} ++ ++static void LZ4_write32(void* memPtr, U32 value) ++{ ++ memcpy(memPtr, &value, sizeof(value)); ++} ++ ++#endif /* LZ4_FORCE_MEMORY_ACCESS */ ++ ++ ++static U16 LZ4_readLE16(const void* memPtr) ++{ ++ if (LZ4_isLittleEndian()) { ++ return LZ4_read16(memPtr); ++ } else { ++ const BYTE* p = (const BYTE*)memPtr; ++ return (U16)((U16)p[0] + (p[1]<<8)); ++ } ++} ++ ++static void LZ4_writeLE16(void* memPtr, U16 value) ++{ ++ if (LZ4_isLittleEndian()) { ++ LZ4_write16(memPtr, value); ++ } else { ++ BYTE* p = (BYTE*)memPtr; ++ p[0] = (BYTE) value; ++ p[1] = (BYTE)(value>>8); ++ } ++} ++ ++static void LZ4_copy8(void* dst, const void* src) ++{ ++ memcpy(dst,src,8); ++} ++ ++/* customized variant of memcpy, which can overwrite up to 8 bytes beyond dstEnd */ ++static void LZ4_wildCopy(void* dstPtr, const void* srcPtr, void* dstEnd) ++{ ++ BYTE* d = (BYTE*)dstPtr; ++ const BYTE* s = (const BYTE*)srcPtr; ++ BYTE* const e = (BYTE*)dstEnd; ++ ++ do { LZ4_copy8(d,s); d+=8; s+=8; } while (d=2) ++# include ++# define DEBUGLOG(l, ...) { \ ++ if (l<=LZ4_DEBUG) { \ ++ fprintf(stderr, __FILE__ ": "); \ ++ fprintf(stderr, __VA_ARGS__); \ ++ fprintf(stderr, " \n"); \ ++ } } ++#else ++# define DEBUGLOG(l, ...) {} /* disabled */ ++#endif + +-typedef enum { notLimited = 0, limitedOutput = 1 } limitedOutput_directive; +-typedef enum { byPtr, byU32, byU16 } tableType_t; + +-typedef enum { noDict = 0, withPrefix64k, usingExtDict } dict_directive; +-typedef enum { noDictIssue = 0, dictSmall } dictIssue_directive; ++/*-************************************ ++* Common functions ++**************************************/ ++static unsigned LZ4_NbCommonBytes (register reg_t val) ++{ ++ if (LZ4_isLittleEndian()) { ++ if (sizeof(val)==8) { ++# if defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT) ++ unsigned long r = 0; ++ _BitScanForward64( &r, (U64)val ); ++ return (int)(r>>3); ++# elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__>=3))) && !defined(LZ4_FORCE_SW_BITCOUNT) ++ return (__builtin_ctzll((U64)val) >> 3); ++# else ++ static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 }; ++ return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58]; ++# endif ++ } else /* 32 bits */ { ++# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) ++ unsigned long r; ++ _BitScanForward( &r, (U32)val ); ++ return (int)(r>>3); ++# elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__>=3))) && !defined(LZ4_FORCE_SW_BITCOUNT) ++ return (__builtin_ctz((U32)val) >> 3); ++# else ++ static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 }; ++ return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27]; ++# endif ++ } ++ } else /* Big Endian CPU */ { ++ if (sizeof(val)==8) { ++# if defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT) ++ unsigned long r = 0; ++ _BitScanReverse64( &r, val ); ++ return (unsigned)(r>>3); ++# elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__>=3))) && !defined(LZ4_FORCE_SW_BITCOUNT) ++ return (__builtin_clzll((U64)val) >> 3); ++# else ++ unsigned r; ++ if (!(val>>32)) { r=4; } else { r=0; val>>=32; } ++ if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; } ++ r += (!val); ++ return r; ++# endif ++ } else /* 32 bits */ { ++# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) ++ unsigned long r = 0; ++ _BitScanReverse( &r, (unsigned long)val ); ++ return (unsigned)(r>>3); ++# elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__>=3))) && !defined(LZ4_FORCE_SW_BITCOUNT) ++ return (__builtin_clz((U32)val) >> 3); ++# else ++ unsigned r; ++ if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; } ++ r += (!val); ++ return r; ++# endif ++ } ++ } ++} + +-typedef enum { endOnOutputSize = 0, endOnInputSize = 1 } endCondition_directive; +-typedef enum { full = 0, partial = 1 } earlyEnd_directive; ++#define STEPSIZE sizeof(reg_t) ++static unsigned LZ4_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* pInLimit) ++{ ++ const BYTE* const pStart = pIn; + ++ while (likely(pIn=e; */ +-#else +-# define LZ4_WILDCOPY(d,s,e) { if (likely(e-d <= 8)) LZ4_COPY8(d,s) else do { LZ4_COPY8(d,s) } while (d compression run slower on incompressible data */ + + +-/**************************** +- Private local functions +-****************************/ +-#if LZ4_ARCH64 ++/*-************************************ ++* Local Structures and types ++**************************************/ ++typedef enum { notLimited = 0, limitedOutput = 1 } limitedOutput_directive; ++typedef enum { byPtr, byU32, byU16 } tableType_t; + +-int LZ4_NbCommonBytes (register U64 val) +-{ +-# if defined(LZ4_BIG_ENDIAN) +-# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) +- unsigned long r = 0; +- _BitScanReverse64( &r, val ); +- return (int)(r>>3); +-# elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) +- return (__builtin_clzll(val) >> 3); +-# else +- int r; +- if (!(val>>32)) { r=4; } else { r=0; val>>=32; } +- if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; } +- r += (!val); +- return r; +-# endif +-# else +-# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) +- unsigned long r = 0; +- _BitScanForward64( &r, val ); +- return (int)(r>>3); +-# elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) +- return (__builtin_ctzll(val) >> 3); +-# else +- static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 }; +- return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58]; +-# endif +-# endif +-} ++typedef enum { noDict = 0, withPrefix64k, usingExtDict } dict_directive; ++typedef enum { noDictIssue = 0, dictSmall } dictIssue_directive; + +-#else ++typedef enum { endOnOutputSize = 0, endOnInputSize = 1 } endCondition_directive; ++typedef enum { full = 0, partial = 1 } earlyEnd_directive; + +-int LZ4_NbCommonBytes (register U32 val) +-{ +-# if defined(LZ4_BIG_ENDIAN) +-# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) +- unsigned long r = 0; +- _BitScanReverse( &r, val ); +- return (int)(r>>3); +-# elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) +- return (__builtin_clz(val) >> 3); +-# else +- int r; +- if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; } +- r += (!val); +- return r; +-# endif +-# else +-# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) +- unsigned long r; +- _BitScanForward( &r, val ); +- return (int)(r>>3); +-# elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) +- return (__builtin_ctz(val) >> 3); +-# else +- static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 }; +- return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27]; +-# endif +-# endif +-} + +-#endif ++/*-************************************ ++* Local Utils ++**************************************/ ++int LZ4_versionNumber (void) { return LZ4_VERSION_NUMBER; } ++const char* LZ4_versionString(void) { return LZ4_VERSION_STRING; } ++int LZ4_compressBound(int isize) { return LZ4_COMPRESSBOUND(isize); } ++int LZ4_sizeofState() { return LZ4_STREAMSIZE; } + + +-/******************************** +- Compression functions ++/*-****************************** ++* Compression functions + ********************************/ +-int LZ4_compressBound(int isize) { return LZ4_COMPRESSBOUND(isize); } +- +-static int LZ4_hashSequence(U32 sequence, tableType_t tableType) ++static U32 LZ4_hash4(U32 sequence, tableType_t const tableType) + { + if (tableType == byU16) +- return (((sequence) * 2654435761U) >> ((MINMATCH*8)-(LZ4_HASHLOG+1))); ++ return ((sequence * 2654435761U) >> ((MINMATCH*8)-(LZ4_HASHLOG+1))); + else +- return (((sequence) * 2654435761U) >> ((MINMATCH*8)-LZ4_HASHLOG)); ++ return ((sequence * 2654435761U) >> ((MINMATCH*8)-LZ4_HASHLOG)); + } + +-static int LZ4_hashPosition(const BYTE* p, tableType_t tableType) { return LZ4_hashSequence(A32(p), tableType); } ++static U32 LZ4_hash5(U64 sequence, tableType_t const tableType) ++{ ++ static const U64 prime5bytes = 889523592379ULL; ++ static const U64 prime8bytes = 11400714785074694791ULL; ++ const U32 hashLog = (tableType == byU16) ? LZ4_HASHLOG+1 : LZ4_HASHLOG; ++ if (LZ4_isLittleEndian()) ++ return (U32)(((sequence << 24) * prime5bytes) >> (64 - hashLog)); ++ else ++ return (U32)(((sequence >> 24) * prime8bytes) >> (64 - hashLog)); ++} ++ ++FORCE_INLINE U32 LZ4_hashPosition(const void* const p, tableType_t const tableType) ++{ ++ if ((sizeof(reg_t)==8) && (tableType != byU16)) return LZ4_hash5(LZ4_read_ARCH(p), tableType); ++ return LZ4_hash4(LZ4_read32(p), tableType); ++} + +-static void LZ4_putPositionOnHash(const BYTE* p, U32 h, void* tableBase, tableType_t tableType, const BYTE* srcBase) ++static void LZ4_putPositionOnHash(const BYTE* p, U32 h, void* tableBase, tableType_t const tableType, const BYTE* srcBase) + { + switch (tableType) + { +- case byPtr: { const BYTE** hashTable = (const BYTE**) tableBase; hashTable[h] = p; break; } +- case byU32: { U32* hashTable = (U32*) tableBase; hashTable[h] = (U32)(p-srcBase); break; } +- case byU16: { U16* hashTable = (U16*) tableBase; hashTable[h] = (U16)(p-srcBase); break; } ++ case byPtr: { const BYTE** hashTable = (const BYTE**)tableBase; hashTable[h] = p; return; } ++ case byU32: { U32* hashTable = (U32*) tableBase; hashTable[h] = (U32)(p-srcBase); return; } ++ case byU16: { U16* hashTable = (U16*) tableBase; hashTable[h] = (U16)(p-srcBase); return; } + } + } + +-static void LZ4_putPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase) ++FORCE_INLINE void LZ4_putPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase) + { +- U32 h = LZ4_hashPosition(p, tableType); ++ U32 const h = LZ4_hashPosition(p, tableType); + LZ4_putPositionOnHash(p, h, tableBase, tableType, srcBase); + } + + static const BYTE* LZ4_getPositionOnHash(U32 h, void* tableBase, tableType_t tableType, const BYTE* srcBase) + { + if (tableType == byPtr) { const BYTE** hashTable = (const BYTE**) tableBase; return hashTable[h]; } +- if (tableType == byU32) { U32* hashTable = (U32*) tableBase; return hashTable[h] + srcBase; } +- { U16* hashTable = (U16*) tableBase; return hashTable[h] + srcBase; } /* default, to ensure a return */ ++ if (tableType == byU32) { const U32* const hashTable = (U32*) tableBase; return hashTable[h] + srcBase; } ++ { const U16* const hashTable = (U16*) tableBase; return hashTable[h] + srcBase; } /* default, to ensure a return */ + } + +-static const BYTE* LZ4_getPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase) ++FORCE_INLINE const BYTE* LZ4_getPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase) + { +- U32 h = LZ4_hashPosition(p, tableType); ++ U32 const h = LZ4_hashPosition(p, tableType); + return LZ4_getPositionOnHash(h, tableBase, tableType, srcBase); + } + +-static unsigned LZ4_count(const BYTE* pIn, const BYTE* pRef, const BYTE* pInLimit) +-{ +- const BYTE* const pStart = pIn; +- +- while (likely(pIndictSize; +- const BYTE* const dictionary = dictPtr->dictionary; +- const BYTE* const dictEnd = dictionary + dictPtr->dictSize; +- const size_t dictDelta = dictEnd - (const BYTE*)source; ++ const BYTE* const lowRefLimit = ip - cctx->dictSize; ++ const BYTE* const dictionary = cctx->dictionary; ++ const BYTE* const dictEnd = dictionary + cctx->dictSize; ++ const ptrdiff_t dictDelta = dictEnd - (const BYTE*)source; + const BYTE* anchor = (const BYTE*) source; + const BYTE* const iend = ip + inputSize; + const BYTE* const mflimit = iend - MFLIMIT; +@@ -455,12 +501,10 @@ static int LZ4_compress_generic( + BYTE* op = (BYTE*) dest; + BYTE* const olimit = op + maxOutputSize; + +- const int skipStrength = SKIPSTRENGTH; + U32 forwardH; +- size_t refDelta=0; + + /* Init conditions */ +- if ((U32)inputSize > (U32)LZ4_MAX_INPUT_SIZE) return 0; /* Unsupported input size, too large (or negative) */ ++ if ((U32)inputSize > (U32)LZ4_MAX_INPUT_SIZE) return 0; /* Unsupported inputSize, too large (or negative) */ + switch(dict) + { + case noDict: +@@ -469,125 +513,118 @@ static int LZ4_compress_generic( + lowLimit = (const BYTE*)source; + break; + case withPrefix64k: +- base = (const BYTE*)source - dictPtr->currentOffset; +- lowLimit = (const BYTE*)source - dictPtr->dictSize; ++ base = (const BYTE*)source - cctx->currentOffset; ++ lowLimit = (const BYTE*)source - cctx->dictSize; + break; + case usingExtDict: +- base = (const BYTE*)source - dictPtr->currentOffset; ++ base = (const BYTE*)source - cctx->currentOffset; + lowLimit = (const BYTE*)source; + break; + } +- if ((tableType == byU16) && (inputSize>=(int)LZ4_64KLIMIT)) return 0; /* Size too large (not within 64K limit) */ +- if (inputSize=LZ4_64Klimit)) return 0; /* Size too large (not within 64K limit) */ ++ if (inputSizehashTable, tableType, base); + ip++; forwardH = LZ4_hashPosition(ip, tableType); + + /* Main Loop */ +- for ( ; ; ) +- { +- const BYTE* ref; ++ for ( ; ; ) { ++ ptrdiff_t refDelta = 0; ++ const BYTE* match; + BYTE* token; +- { +- const BYTE* forwardIp = ip; +- unsigned step=1; +- unsigned searchMatchNb = (1U << skipStrength); + +- /* Find a match */ ++ /* Find a match */ ++ { const BYTE* forwardIp = ip; ++ unsigned step = 1; ++ unsigned searchMatchNb = acceleration << LZ4_skipTrigger; + do { +- U32 h = forwardH; ++ U32 const h = forwardH; + ip = forwardIp; + forwardIp += step; +- step = searchMatchNb++ >> skipStrength; +- //if (step>8) step=8; // required for valid forwardIp ; slows down uncompressible data a bit ++ step = (searchMatchNb++ >> LZ4_skipTrigger); + + if (unlikely(forwardIp > mflimit)) goto _last_literals; + +- ref = LZ4_getPositionOnHash(h, ctx, tableType, base); +- if (dict==usingExtDict) +- { +- if (ref<(const BYTE*)source) +- { ++ match = LZ4_getPositionOnHash(h, cctx->hashTable, tableType, base); ++ if (dict==usingExtDict) { ++ if (match < (const BYTE*)source) { + refDelta = dictDelta; + lowLimit = dictionary; +- } +- else +- { ++ } else { + refDelta = 0; + lowLimit = (const BYTE*)source; +- } +- } ++ } } + forwardH = LZ4_hashPosition(forwardIp, tableType); +- LZ4_putPositionOnHash(ip, h, ctx, tableType, base); ++ LZ4_putPositionOnHash(ip, h, cctx->hashTable, tableType, base); + +- } while ( ((dictIssue==dictSmall) ? (ref < lowRefLimit) : 0) +- || ((tableType==byU16) ? 0 : (ref + MAX_DISTANCE < ip)) +- || (A32(ref+refDelta) != A32(ip)) ); ++ } while ( ((dictIssue==dictSmall) ? (match < lowRefLimit) : 0) ++ || ((tableType==byU16) ? 0 : (match + MAX_DISTANCE < ip)) ++ || (LZ4_read32(match+refDelta) != LZ4_read32(ip)) ); + } + + /* Catch up */ +- while ((ip>anchor) && (ref+refDelta > lowLimit) && (unlikely(ip[-1]==ref[refDelta-1]))) { ip--; ref--; } ++ while (((ip>anchor) & (match+refDelta > lowLimit)) && (unlikely(ip[-1]==match[refDelta-1]))) { ip--; match--; } + +- { +- /* Encode Literal length */ +- unsigned litLength = (unsigned)(ip - anchor); ++ /* Encode Literals */ ++ { unsigned const litLength = (unsigned)(ip - anchor); + token = op++; +- if ((outputLimited) && (unlikely(op + litLength + (2 + 1 + LASTLITERALS) + (litLength/255) > olimit))) +- return 0; /* Check output limit */ +- if (litLength>=RUN_MASK) +- { ++ if ((outputLimited) && /* Check output buffer overflow */ ++ (unlikely(op + litLength + (2 + 1 + LASTLITERALS) + (litLength/255) > olimit))) ++ return 0; ++ if (litLength >= RUN_MASK) { + int len = (int)litLength-RUN_MASK; +- *token=(RUN_MASK<= 255 ; len-=255) *op++ = 255; + *op++ = (BYTE)len; + } + else *token = (BYTE)(litLength< Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4CC4F0752D; Thu, 22 Feb 2018 22:32:05 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9836D7C9B9; Thu, 22 Feb 2018 22:32:05 +0000 (UTC) (envelope-from flo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 933B45F1D; Thu, 22 Feb 2018 22:32:05 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1MMW5hb086324; Thu, 22 Feb 2018 22:32:05 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1MMW5LZ086230; Thu, 22 Feb 2018 22:32:05 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201802222232.w1MMW5LZ086230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Thu, 22 Feb 2018 22:32:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462647 - branches/2018Q1/databases/percona55-server X-SVN-Group: ports-branches X-SVN-Commit-Author: flo X-SVN-Commit-Paths: branches/2018Q1/databases/percona55-server X-SVN-Commit-Revision: 462647 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 22:32:06 -0000 Author: flo Date: Thu Feb 22 22:32:05 2018 New Revision: 462647 URL: https://svnweb.freebsd.org/changeset/ports/462647 Log: MFH: r461609 Update to 5.5.59-38.11 PR: 225587 Submitted by: Sergey Akhmatov Security: e3445736-fd01-11e7-ac58-b499baebfeaf Approved by: ports-secteam (riggs) Modified: branches/2018Q1/databases/percona55-server/Makefile branches/2018Q1/databases/percona55-server/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/percona55-server/Makefile ============================================================================== --- branches/2018Q1/databases/percona55-server/Makefile Thu Feb 22 22:05:21 2018 (r462646) +++ branches/2018Q1/databases/percona55-server/Makefile Thu Feb 22 22:32:05 2018 (r462647) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.5.58-38.10 +DISTVERSION= 5.5.59-38.11 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/ Modified: branches/2018Q1/databases/percona55-server/distinfo ============================================================================== --- branches/2018Q1/databases/percona55-server/distinfo Thu Feb 22 22:05:21 2018 (r462646) +++ branches/2018Q1/databases/percona55-server/distinfo Thu Feb 22 22:32:05 2018 (r462647) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513432672 -SHA256 (percona-server-5.5.58-38.10.tar.gz) = 6ad57105b037e0e66ccba320cd58dfc5108e3e585f1e225875c2f96b06429a9e -SIZE (percona-server-5.5.58-38.10.tar.gz) = 23055563 +TIMESTAMP = 1517405720 +SHA256 (percona-server-5.5.59-38.11.tar.gz) = 1be9a179c86fdf43e2374eb22aaece4ac9f93b4ea89d9c96a20d1b189f7be175 +SIZE (percona-server-5.5.59-38.11.tar.gz) = 23064594 From owner-svn-ports-branches@freebsd.org Thu Feb 22 23:04:19 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57F8AF0ADE8; Thu, 22 Feb 2018 23:04:19 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0A9B47E103; Thu, 22 Feb 2018 23:04:19 +0000 (UTC) (envelope-from feld@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 056AC6555; Thu, 22 Feb 2018 23:04:19 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1MN4Ixg002103; Thu, 22 Feb 2018 23:04:18 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1MN4I1Y002101; Thu, 22 Feb 2018 23:04:18 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201802222304.w1MN4I1Y002101@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 22 Feb 2018 23:04:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462651 - in branches/2018Q1/textproc/elasticsearch5: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q1/textproc/elasticsearch5: . files X-SVN-Commit-Revision: 462651 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 23:04:19 -0000 Author: feld Date: Thu Feb 22 23:04:18 2018 New Revision: 462651 URL: https://svnweb.freebsd.org/changeset/ports/462651 Log: MFH: r462650 textproc/elasticsearch5: Use native facilites for manging the process start/stop/status will behave correctly with procname set. This now prevents Elastic from starting when a process is already running, stops cleanly, and also handles multiple profiles correctly: if only some of the profile processes are running, a "service elasticsearch start" will only start the profiles that are not detected as running already. All of this comes with the caveat that Elastic is slow to start up and write its pidfile, so if you are too quick it will allow duplicate processes to start. Here be JVM dragons. Approved by: portmgr (with hat) Modified: branches/2018Q1/textproc/elasticsearch5/Makefile branches/2018Q1/textproc/elasticsearch5/files/elasticsearch.in Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/textproc/elasticsearch5/Makefile ============================================================================== --- branches/2018Q1/textproc/elasticsearch5/Makefile Thu Feb 22 23:03:41 2018 (r462650) +++ branches/2018Q1/textproc/elasticsearch5/Makefile Thu Feb 22 23:04:18 2018 (r462651) @@ -3,7 +3,7 @@ PORTNAME= elasticsearch PORTVERSION= 5.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ @@ -51,7 +51,8 @@ ELASTIC_LOGDIR= /var/log/elasticsearch SUB_LIST= SEARCHUSER=${SEARCHUSER} \ SEARCHGROUP=${SEARCHGROUP} \ - PORTVERSION=${PORTVERSION} + PORTVERSION=${PORTVERSION} \ + JAVA=${JAVA} SUB_FILES= pkg-message PLIST_SUB= SEARCHUSER=${SEARCHUSER} \ SEARCHGROUP=${SEARCHGROUP} \ Modified: branches/2018Q1/textproc/elasticsearch5/files/elasticsearch.in ============================================================================== --- branches/2018Q1/textproc/elasticsearch5/files/elasticsearch.in Thu Feb 22 23:03:41 2018 (r462650) +++ branches/2018Q1/textproc/elasticsearch5/files/elasticsearch.in Thu Feb 22 23:04:18 2018 (r462651) @@ -36,12 +36,11 @@ load_rc_config ${name} required_files="${elasticsearch_config}/elasticsearch.yml" _pidprefix=/var/run/elasticsearch pidfile=${_pidprefix}.pid +procname=%%JAVA%% extra_commands="console status" console_cmd=elasticsearch_console start_precmd=elasticsearch_precmd -status_cmd=elasticsearch_status -stop_cmd=elasticsearch_stop command=%%PREFIX%%/lib/elasticsearch/bin/elasticsearch command_args="-d --pidfile=${pidfile} -Epath.conf=${elasticsearch_config}" @@ -59,52 +58,6 @@ elasticsearch_console() run_rc_command "start" } -elasticsearch_stop() -{ - rc_pid=$(elasticsearch_check_pidfile $pidfile) - - if [ -z "$rc_pid" ]; then - [ -n "$rc_fast" ] && return 0 - echo "${name} not running? (check $pidfile)." - return 1 - fi - - echo "Stopping ${name}." - kill $sig_stop ${rc_pid} - wait_for_pids ${rc_pid} -} - -elasticsearch_status() -{ - rc_pid=$(elasticsearch_check_pidfile $pidfile) - - if [ -z "$rc_pid" ]; then - [ -n "$rc_fast" ] && return 0 - echo "${name} not running? (check $pidfile)." - return 1 - fi - echo "${name} is running as pid ${rc_pid}." -} - -elasticsearch_check_pidfile() -{ - _pidfile=$1 - if [ -z "$_pidfile" ]; then - err 3 'USAGE: elasticsearch_check_pidfile pidfile' - fi - if [ ! -f $_pidfile ]; then - debug "pid file ($_pidfile): not readable." - return - fi - read _pid _junk < $_pidfile - if [ -z "$_pid" ]; then - debug "pid file ($_pidfile): no pid in file." - return - fi - if [ -n "`%%PREFIX%%/bin/jps -l | grep -e "^$_pid"`" ]; then - echo -n $_pid - fi -} if [ -n "$2" ]; then profile="$2" if [ "x${elasticsearch_profiles}" != "x" ]; then From owner-svn-ports-branches@freebsd.org Thu Feb 22 23:39:26 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D94EFF0E97B; Thu, 22 Feb 2018 23:39:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 846DD7F781; Thu, 22 Feb 2018 23:39:25 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7EEC86AAA; Thu, 22 Feb 2018 23:39:25 +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 w1MNdPFI017244; Thu, 22 Feb 2018 23:39:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1MNdPeR017242; Thu, 22 Feb 2018 23:39:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802222339.w1MNdPeR017242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 22 Feb 2018 23:39:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462652 - branches/2018Q1/games/openra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/games/openra X-SVN-Commit-Revision: 462652 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 23:39:26 -0000 Author: jbeich Date: Thu Feb 22 23:39:25 2018 New Revision: 462652 URL: https://svnweb.freebsd.org/changeset/ports/462652 Log: MFH: r462334 games/openra: update to 20180218 Changes: https://github.com/OpenRA/OpenRA/wiki/Changelog#release-20180218 Approved by: ports-secteam (zi) Modified: branches/2018Q1/games/openra/Makefile branches/2018Q1/games/openra/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/games/openra/Makefile ============================================================================== --- branches/2018Q1/games/openra/Makefile Thu Feb 22 23:04:18 2018 (r462651) +++ branches/2018Q1/games/openra/Makefile Thu Feb 22 23:39:25 2018 (r462652) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= openra -PORTVERSION= 20171014 +PORTVERSION= 20180218 DISTVERSIONPREFIX= release- CATEGORIES= games MASTER_SITES= https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20161223/:SDL2_CS \ @@ -30,7 +30,6 @@ NUGET_DEPENDS= FuzzyLogicLibrary=1.2.0 \ Open.Nat=2.1.0 \ SharpFont=4.0.1 \ SharpZipLib=0.86.0 \ - SmartIrc4net=0.4.5.1 \ StyleCop.MSBuild=4.7.49.0 \ StyleCopPlus.MSBuild=4.7.49.5 \ rix0rrr.BeaconLib=1.0.1 @@ -66,7 +65,7 @@ post-patch: -e '/echo/!s/ @/ /' \ -e '/^mods:/s/$$/ version/' \ ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e '/[[:<:]]get[[:blank:]]/d' \ + ${REINPLACE_CMD} -e '/noget\.sh/d' \ ${WRKSRC}/thirdparty/fetch-thirdparty-deps.sh ${FIND} ${WRKSRC}/thirdparty -name '*.config*' -exec ${REINPLACE_CMD} \ -i '.bak.os' -e '/linux/{ p; s//${OPSYS:tl}/; }' {} + Modified: branches/2018Q1/games/openra/distinfo ============================================================================== --- branches/2018Q1/games/openra/distinfo Thu Feb 22 23:04:18 2018 (r462651) +++ branches/2018Q1/games/openra/distinfo Thu Feb 22 23:39:25 2018 (r462652) @@ -1,4 +1,4 @@ -TIMESTAMP = 1507980608 +TIMESTAMP = 1518967773 SHA256 (SDL2-CS.dll) = b06c14a771d14cb37210f476dfd973d4e7d80d97f90566bd5bc78996ade4f7a0 SIZE (SDL2-CS.dll) = 80896 SHA256 (SDL2-CS.dll.config) = eff0594f7e86d40a94c1b28f8db87478f3de1cf0857f3d46e384bcc6744ce094 @@ -9,8 +9,8 @@ SHA256 (OpenAL-CS.dll.config) = 58eaf46a749e466fce0a0e SIZE (OpenAL-CS.dll.config) = 301 SHA256 (Eluant.dll) = 218c4ea5424b44d746b5343563123beebc652fd9731967dfd49fed071b58df31 SIZE (Eluant.dll) = 71168 -SHA256 (GeoLite2-Country.mmdb.gz) = e10ae6872a330ec07d5ad3636dcd7a3d435ca998445ff4bb3805ee025fedb5d7 -SIZE (GeoLite2-Country.mmdb.gz) = 1583522 +SHA256 (GeoLite2-Country.mmdb.gz) = f5bbf524e2811336dc37812342b6bbe5f2b8a1e0879a578935713e1a8c91c77e +SIZE (GeoLite2-Country.mmdb.gz) = 1687146 SHA256 (fuzzylogiclibrary.1.2.0.nupkg) = b464509236260f53d963771ed99410a7e1cdbd268a2bde43b189e7d15044a174 SIZE (fuzzylogiclibrary.1.2.0.nupkg) = 70571 SHA256 (maxmind.db.2.0.0.nupkg) = 095d62c6ecda38c1e8fe79935b4eaf228d2637f9498caec48b8b48a0aba6d5aa @@ -25,13 +25,11 @@ SHA256 (sharpfont.4.0.1.nupkg) = 48eff311d5fb4fe886123 SIZE (sharpfont.4.0.1.nupkg) = 141955 SHA256 (sharpziplib.0.86.0.nupkg) = 5906c248bb986d50489192f490f94d2331d04e7d34337bc3c0d64df6d0008207 SIZE (sharpziplib.0.86.0.nupkg) = 454026 -SHA256 (smartirc4net.0.4.5.1.nupkg) = a1c2b2be28d798187ecd118768b03ca3193995182d1d92983df23bacbb61dfcc -SIZE (smartirc4net.0.4.5.1.nupkg) = 104627 SHA256 (stylecop.msbuild.4.7.49.0.nupkg) = 6680dedaa5d27fb1ead475015de98e476e58fa9a27e4b7ad0f08d5f7d8f6ee66 SIZE (stylecop.msbuild.4.7.49.0.nupkg) = 2366995 SHA256 (stylecopplus.msbuild.4.7.49.5.nupkg) = b98a8ed20c5e82ff5fe6c2a52ecd45bffd4d4ab284611f35a25889c3bba364c3 SIZE (stylecopplus.msbuild.4.7.49.5.nupkg) = 124724 SHA256 (rix0rrr.beaconlib.1.0.1.nupkg) = e8e126b98ae7676cb0434455aa8a41c17a927c1b40c4cf368f9527af6bc251f2 SIZE (rix0rrr.beaconlib.1.0.1.nupkg) = 8421 -SHA256 (openra-OpenRA-release-20171014_GH0.tar.gz) = ea8a6c38f22c3432bd173c15e3f3d96a7bb47c39f73db5aa5ab6df7e6980ed5a -SIZE (openra-OpenRA-release-20171014_GH0.tar.gz) = 20125442 +SHA256 (openra-OpenRA-release-20180218_GH0.tar.gz) = 8f8979f2124accea85e80e00e95573e82a46f0aa11f31d3167bf5f99a8df6ebc +SIZE (openra-OpenRA-release-20180218_GH0.tar.gz) = 23225441 From owner-svn-ports-branches@freebsd.org Fri Feb 23 14:11:12 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6070BF2573B; Fri, 23 Feb 2018 14:11:12 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 12B998203B; Fri, 23 Feb 2018 14:11:12 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0DA0917807; Fri, 23 Feb 2018 14:11:12 +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 w1NEBBqD055771; Fri, 23 Feb 2018 14:11:11 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1NEBBqP055769; Fri, 23 Feb 2018 14:11:11 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201802231411.w1NEBBqP055769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Fri, 23 Feb 2018 14:11:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462699 - branches/2018Q1/databases/phpmyadmin X-SVN-Group: ports-branches X-SVN-Commit-Author: matthew X-SVN-Commit-Paths: branches/2018Q1/databases/phpmyadmin X-SVN-Commit-Revision: 462699 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 14:11:12 -0000 Author: matthew Date: Fri Feb 23 14:11:11 2018 New Revision: 462699 URL: https://svnweb.freebsd.org/changeset/ports/462699 Log: MFH: r462566 Security update to 4.7.8 Advisory: https://www.phpmyadmin.net/security/PMASA-2018-1/ ChangeLog: https://www.phpmyadmin.net/files/4.7.8/ Security: 261ca31c-179f-11e8-b8b9-6805ca0b3d42 Approved by: ports-secteam (implicit) Modified: branches/2018Q1/databases/phpmyadmin/Makefile branches/2018Q1/databases/phpmyadmin/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/phpmyadmin/Makefile ============================================================================== --- branches/2018Q1/databases/phpmyadmin/Makefile Fri Feb 23 13:35:43 2018 (r462698) +++ branches/2018Q1/databases/phpmyadmin/Makefile Fri Feb 23 14:11:11 2018 (r462699) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpMyAdmin -DISTVERSION= 4.7.7 +DISTVERSION= 4.7.8 CATEGORIES= databases www MASTER_SITES= https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages Modified: branches/2018Q1/databases/phpmyadmin/distinfo ============================================================================== --- branches/2018Q1/databases/phpmyadmin/distinfo Fri Feb 23 13:35:43 2018 (r462698) +++ branches/2018Q1/databases/phpmyadmin/distinfo Fri Feb 23 14:11:11 2018 (r462699) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514048608 -SHA256 (phpMyAdmin-4.7.7-all-languages.tar.xz) = 2a748e92e7bf8d4d008a524f8101f011ff63de2fd20339d025f2be4900f75deb -SIZE (phpMyAdmin-4.7.7-all-languages.tar.xz) = 6411768 +TIMESTAMP = 1519215411 +SHA256 (phpMyAdmin-4.7.8-all-languages.tar.xz) = 828c687f1463561db9043eecaae8eee3b2e1895066bfecd240c6e25abf283701 +SIZE (phpMyAdmin-4.7.8-all-languages.tar.xz) = 6218056 From owner-svn-ports-branches@freebsd.org Fri Feb 23 15:57:50 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3541EF01E3B; Fri, 23 Feb 2018 15:57:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DD5C28776D; Fri, 23 Feb 2018 15:57:49 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D35A318989; Fri, 23 Feb 2018 15:57:49 +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 w1NFvn73009093; Fri, 23 Feb 2018 15:57:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1NFvnPI009091; Fri, 23 Feb 2018 15:57:49 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802231557.w1NFvnPI009091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 23 Feb 2018 15:57:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462705 - branches/2018Q1/devel/hg-git X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/devel/hg-git X-SVN-Commit-Revision: 462705 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 15:57:50 -0000 Author: jbeich Date: Fri Feb 23 15:57:49 2018 New Revision: 462705 URL: https://svnweb.freebsd.org/changeset/ports/462705 Log: MFH: r462648 devel/hg-git: update to 0.8.10 Changes: https://bitbucket.org/durin42/hg-git/branches/compare/0.8.10..0.8.9 PR: 225718 Submitted by: np Approved by: maintainer timeout (2 weeks) Approved by: ports-secteam (swills) Modified: branches/2018Q1/devel/hg-git/Makefile branches/2018Q1/devel/hg-git/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/devel/hg-git/Makefile ============================================================================== --- branches/2018Q1/devel/hg-git/Makefile Fri Feb 23 15:32:36 2018 (r462704) +++ branches/2018Q1/devel/hg-git/Makefile Fri Feb 23 15:57:49 2018 (r462705) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hg-git -DISTVERSION= 0.8.9 +DISTVERSION= 0.8.10 CATEGORIES= devel python MASTER_SITES= http://bitbucket.org/durin42/${PORTNAME}/get/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dulwich>=*:devel/d PORTDOCS= README.md NO_ARCH= yes -WRKSRC= ${WRKDIR}/durin42-${PORTNAME}-88de3215e138 +WRKSRC= ${WRKDIR}/durin42-${PORTNAME}-6ef27582bfa5 USES= python:2.7 USE_PYTHON= distutils autoplist Modified: branches/2018Q1/devel/hg-git/distinfo ============================================================================== --- branches/2018Q1/devel/hg-git/distinfo Fri Feb 23 15:32:36 2018 (r462704) +++ branches/2018Q1/devel/hg-git/distinfo Fri Feb 23 15:57:49 2018 (r462705) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508436170 -SHA256 (hg-git/0.8.9.tar.gz) = b752f7bb7da685d3c2dff29910087564a714cd43eda4598266a7c405da5a892d -SIZE (hg-git/0.8.9.tar.gz) = 107248 +TIMESTAMP = 1517964609 +SHA256 (hg-git/0.8.10.tar.gz) = 31a81e42f8fd2bed283d8f8f9eae9196aee3b1124dc94cfd1aae545c8fae0f6c +SIZE (hg-git/0.8.10.tar.gz) = 124879 From owner-svn-ports-branches@freebsd.org Fri Feb 23 17:12:59 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41A8CF07ADF; Fri, 23 Feb 2018 17:12:59 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E06A76B49E; Fri, 23 Feb 2018 17:12:58 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB42719642; Fri, 23 Feb 2018 17:12:58 +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 w1NHCwPB049617; Fri, 23 Feb 2018 17:12:58 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1NHCwBD049615; Fri, 23 Feb 2018 17:12:58 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201802231712.w1NHCwBD049615@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 23 Feb 2018 17:12:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462709 - branches/2018Q1/net/asterisk13 X-SVN-Group: ports-branches X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: branches/2018Q1/net/asterisk13 X-SVN-Commit-Revision: 462709 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 17:12:59 -0000 Author: madpilot Date: Fri Feb 23 17:12:58 2018 New Revision: 462709 URL: https://svnweb.freebsd.org/changeset/ports/462709 Log: MFH: r462582 Update asterisk13 to 13.19.2 Security: 933654ce-17b8-11e8-90b8-001999f8d30b f9f5c5a2-17b5-11e8-90b8-001999f8d30b Approved by: ports-secteam (swills) Modified: branches/2018Q1/net/asterisk13/Makefile branches/2018Q1/net/asterisk13/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net/asterisk13/Makefile ============================================================================== --- branches/2018Q1/net/asterisk13/Makefile Fri Feb 23 17:11:07 2018 (r462708) +++ branches/2018Q1/net/asterisk13/Makefile Fri Feb 23 17:12:58 2018 (r462709) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.19.1 +PORTVERSION= 13.19.2 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Modified: branches/2018Q1/net/asterisk13/distinfo ============================================================================== --- branches/2018Q1/net/asterisk13/distinfo Fri Feb 23 17:11:07 2018 (r462708) +++ branches/2018Q1/net/asterisk13/distinfo Fri Feb 23 17:12:58 2018 (r462709) @@ -1,6 +1,6 @@ -TIMESTAMP = 1518560936 -SHA256 (asterisk-13.19.1.tar.gz) = ff64118f9b9e5b3c84d09105a24751af573976718ce4bfd641075eb01b56dc63 -SIZE (asterisk-13.19.1.tar.gz) = 32989891 +TIMESTAMP = 1519294786 +SHA256 (asterisk-13.19.2.tar.gz) = aab4bf95eea21a3864015d2a49a02e13e9f191f6a68acb0f7b1619da86ce3fb2 +SIZE (asterisk-13.19.2.tar.gz) = 32991960 SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 From owner-svn-ports-branches@freebsd.org Fri Feb 23 17:52:30 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ABEE9F0D1BF; Fri, 23 Feb 2018 17:52:30 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5DF766D15E; Fri, 23 Feb 2018 17:52:30 +0000 (UTC) (envelope-from swills@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58F5419C9E; Fri, 23 Feb 2018 17:52:30 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1NHqUKw069324; Fri, 23 Feb 2018 17:52:30 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1NHqUah069322; Fri, 23 Feb 2018 17:52:30 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201802231752.w1NHqUah069322@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 23 Feb 2018 17:52:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462710 - in branches/2018Q1/devel: valgrind-devel/files valgrind/files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2018Q1/devel: valgrind-devel/files valgrind/files X-SVN-Commit-Revision: 462710 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 17:52:30 -0000 Author: swills Date: Fri Feb 23 17:52:29 2018 New Revision: 462710 URL: https://svnweb.freebsd.org/changeset/ports/462710 Log: MFH: r459883 Fix build with clang 6. PR: 224828 Submitted by: dim Approved by: ports-secteam (implicit) Modified: branches/2018Q1/devel/valgrind-devel/files/patch-configure.ac branches/2018Q1/devel/valgrind/files/patch-configure.ac Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/devel/valgrind-devel/files/patch-configure.ac ============================================================================== --- branches/2018Q1/devel/valgrind-devel/files/patch-configure.ac Fri Feb 23 17:12:58 2018 (r462709) +++ branches/2018Q1/devel/valgrind-devel/files/patch-configure.ac Fri Feb 23 17:52:29 2018 (r462710) @@ -17,7 +17,7 @@ + notclang-9.*) + AC_MSG_RESULT([ok (${gcc_version})]) + ;; -+ clang-2.9|clang-3.*|clang-4.*|clang-5.*) ++ clang-2.9|clang-[[3-9]].*) AC_MSG_RESULT([ok (clang-${gcc_version})]) ;; *) Modified: branches/2018Q1/devel/valgrind/files/patch-configure.ac ============================================================================== --- branches/2018Q1/devel/valgrind/files/patch-configure.ac Fri Feb 23 17:12:58 2018 (r462709) +++ branches/2018Q1/devel/valgrind/files/patch-configure.ac Fri Feb 23 17:52:29 2018 (r462710) @@ -17,7 +17,7 @@ + notclang-9.*) + AC_MSG_RESULT([ok (${gcc_version})]) + ;; -+ clang-2.9|clang-3.*|clang-4.*|clang-5.*) ++ clang-2.9|clang-[[3-9]].*) AC_MSG_RESULT([ok (clang-${gcc_version})]) ;; *) From owner-svn-ports-branches@freebsd.org Fri Feb 23 18:15:00 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92BA9F0EB7C; Fri, 23 Feb 2018 18:15:00 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 427366E048; Fri, 23 Feb 2018 18:15:00 +0000 (UTC) (envelope-from swills@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3918619FDA; Fri, 23 Feb 2018 18:15:00 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1NIF0sx079854; Fri, 23 Feb 2018 18:15:00 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1NIExuv079840; Fri, 23 Feb 2018 18:14:59 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201802231814.w1NIExuv079840@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 23 Feb 2018 18:14:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462712 - branches/2018Q1/java/openjdk7/files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: branches/2018Q1/java/openjdk7/files X-SVN-Commit-Revision: 462712 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 18:15:00 -0000 Author: swills Date: Fri Feb 23 18:14:59 2018 New Revision: 462712 URL: https://svnweb.freebsd.org/changeset/ports/462712 Log: MFH: r459311 Fix build with Clang 6.0. Note it is partially merged from the upstream patches for Linux and GCC 6. https://bugs.openjdk.java.net/browse/JDK-8163032 http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot/rev/e34324d73cd5 http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/9e1264f51bae PR: 225054 Approved by: ports-secteam (implicit) Added: branches/2018Q1/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make - copied unchanged from r459311, head/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make branches/2018Q1/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk - copied unchanged from r459311, head/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk Modified: Directory Properties: branches/2018Q1/ (props changed) Copied: branches/2018Q1/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make (from r459311, head/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make Fri Feb 23 18:14:59 2018 (r462712, copy of r459311, head/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make) @@ -0,0 +1,10 @@ +--- hotspot/make/bsd/makefiles/gcc.make.orig ++++ hotspot/make/bsd/makefiles/gcc.make +@@ -112,6 +112,7 @@ ifeq ($(JVM_VARIANT_ZEROSHARK), true) + CFLAGS += $(LIBFFI_CFLAGS) + CFLAGS += $(LLVM_CFLAGS) + endif ++CFLAGS += -std=gnu++98 + CFLAGS += $(VM_PICFLAG) + CFLAGS += -fno-rtti + CFLAGS += -fno-exceptions Copied: branches/2018Q1/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk (from r459311, head/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk Fri Feb 23 18:14:59 2018 (r462712, copy of r459311, head/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk) @@ -0,0 +1,11 @@ +--- jdk/make/common/Defs-bsd.gmk.orig ++++ jdk/make/common/Defs-bsd.gmk +@@ -274,7 +274,7 @@ CFLAGS_OPT = $(CC_OPT) + CFLAGS_DBG = $(DEBUG_FLAG) + CFLAGS_COMMON += $(CFLAGS_REQUIRED) + +-CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) ++CXXFLAGS_COMMON = -std=gnu++98 $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) + CXXFLAGS_OPT = $(CC_OPT) + CXXFLAGS_DBG = $(DEBUG_FLAG) + CXXFLAGS_COMMON += $(CFLAGS_REQUIRED) From owner-svn-ports-branches@freebsd.org Fri Feb 23 18:15:54 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97649F0ECA7; Fri, 23 Feb 2018 18:15:54 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 498016E14D; Fri, 23 Feb 2018 18:15:54 +0000 (UTC) (envelope-from swills@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 447A619FDF; Fri, 23 Feb 2018 18:15:54 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1NIFsM8080132; Fri, 23 Feb 2018 18:15:54 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1NIFsAC080130; Fri, 23 Feb 2018 18:15:54 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201802231815.w1NIFsAC080130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 23 Feb 2018 18:15:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462713 - in branches/2018Q1/java/openjdk8: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2018Q1/java/openjdk8: . files X-SVN-Commit-Revision: 462713 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 18:15:54 -0000 Author: swills Date: Fri Feb 23 18:15:53 2018 New Revision: 462713 URL: https://svnweb.freebsd.org/changeset/ports/462713 Log: MFH: r459368 Fix a run-time crash with Clang 6.0. Note this problem was introduced with fixes for JDK-8055007. https://bugs.java.com/view_bug.do?bug_id=8055007 http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/changeset/c6211b707068 PR: 225054 Approved by: ports-secteam (implicit) Added: branches/2018Q1/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp - copied unchanged from r459368, head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp Modified: branches/2018Q1/java/openjdk8/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/java/openjdk8/Makefile ============================================================================== --- branches/2018Q1/java/openjdk8/Makefile Fri Feb 23 18:14:59 2018 (r462712) +++ branches/2018Q1/java/openjdk8/Makefile Fri Feb 23 18:15:53 2018 (r462713) @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ Copied: branches/2018Q1/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp (from r459368, head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp Fri Feb 23 18:15:53 2018 (r462713, copy of r459368, head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp) @@ -0,0 +1,13 @@ +--- hotspot/src/share/vm/services/memTracker.cpp.orig ++++ hotspot/src/share/vm/services/memTracker.cpp +@@ -67,10 +67,6 @@ NMT_TrackingLevel MemTracker::init_tracking_level() { + os::unsetenv(buf); + } + +- // Construct NativeCallStack::EMPTY_STACK. It may get constructed twice, +- // but it is benign, the results are the same. +- ::new ((void*)&NativeCallStack::EMPTY_STACK) NativeCallStack(0, false); +- + if (!MallocTracker::initialize(level) || + !VirtualMemoryTracker::initialize(level)) { + level = NMT_off; From owner-svn-ports-branches@freebsd.org Fri Feb 23 19:48:35 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A844F16CBD; Fri, 23 Feb 2018 19:48:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3E1BA7478A; Fri, 23 Feb 2018 19:48:35 +0000 (UTC) (envelope-from swills@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EFEB1AEAE; Fri, 23 Feb 2018 19:48:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1NJmZIr028066; Fri, 23 Feb 2018 19:48:35 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1NJmXma028055; Fri, 23 Feb 2018 19:48:33 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201802231948.w1NJmXma028055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 23 Feb 2018 19:48:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462736 - in branches/2018Q1/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-kmod virtualbox-ose/files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2018Q1/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-kmod virtualbox-ose/files X-SVN-Commit-Revision: 462736 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 19:48:35 -0000 Author: swills Date: Fri Feb 23 19:48:33 2018 New Revision: 462736 URL: https://svnweb.freebsd.org/changeset/ports/462736 Log: MFH: r459217 r459219 r459385 Update to 5.2.6. Update to 5.2.6. Fix emulators/virtualbox-ose-additions build with Clang 6.0. Approved by: ports-secteam (implicit) Added: branches/2018Q1/emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h - copied unchanged from r459217, head/emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h branches/2018Q1/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h - copied unchanged from r459217, head/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h branches/2018Q1/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp - copied unchanged from r459385, head/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp branches/2018Q1/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp - copied unchanged from r459217, head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp branches/2018Q1/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp - copied unchanged from r459217, head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp Deleted: branches/2018Q1/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedClipboard_x11-stub.cpp Modified: branches/2018Q1/emulators/virtualbox-ose-additions/Makefile branches/2018Q1/emulators/virtualbox-ose-additions/distinfo branches/2018Q1/emulators/virtualbox-ose-kmod/Makefile branches/2018Q1/emulators/virtualbox-ose-kmod/distinfo branches/2018Q1/emulators/virtualbox-ose/Makefile branches/2018Q1/emulators/virtualbox-ose/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- branches/2018Q1/emulators/virtualbox-ose-additions/Makefile Fri Feb 23 19:48:04 2018 (r462735) +++ branches/2018Q1/emulators/virtualbox-ose-additions/Makefile Fri Feb 23 19:48:33 2018 (r462736) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.2.4 +PORTVERSION= 5.2.6 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX?= -additions Modified: branches/2018Q1/emulators/virtualbox-ose-additions/distinfo ============================================================================== --- branches/2018Q1/emulators/virtualbox-ose-additions/distinfo Fri Feb 23 19:48:04 2018 (r462735) +++ branches/2018Q1/emulators/virtualbox-ose-additions/distinfo Fri Feb 23 19:48:33 2018 (r462736) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514405545 -SHA256 (VirtualBox-5.2.4.tar.bz2) = c9a060bd99168e05587f1ba74b54e9c1f709734bdfc956b0242fe63e81bb7d14 -SIZE (VirtualBox-5.2.4.tar.bz2) = 118481693 +TIMESTAMP = 1516131253 +SHA256 (VirtualBox-5.2.6.tar.bz2) = fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7 +SIZE (VirtualBox-5.2.6.tar.bz2) = 118530572 Modified: branches/2018Q1/emulators/virtualbox-ose-kmod/Makefile ============================================================================== --- branches/2018Q1/emulators/virtualbox-ose-kmod/Makefile Fri Feb 23 19:48:04 2018 (r462735) +++ branches/2018Q1/emulators/virtualbox-ose-kmod/Makefile Fri Feb 23 19:48:33 2018 (r462736) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.2.4 +PORTVERSION= 5.2.6 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -kmod Modified: branches/2018Q1/emulators/virtualbox-ose-kmod/distinfo ============================================================================== --- branches/2018Q1/emulators/virtualbox-ose-kmod/distinfo Fri Feb 23 19:48:04 2018 (r462735) +++ branches/2018Q1/emulators/virtualbox-ose-kmod/distinfo Fri Feb 23 19:48:33 2018 (r462736) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514405545 -SHA256 (VirtualBox-5.2.4.tar.bz2) = c9a060bd99168e05587f1ba74b54e9c1f709734bdfc956b0242fe63e81bb7d14 -SIZE (VirtualBox-5.2.4.tar.bz2) = 118481693 +TIMESTAMP = 1516131253 +SHA256 (VirtualBox-5.2.6.tar.bz2) = fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7 +SIZE (VirtualBox-5.2.6.tar.bz2) = 118530572 Modified: branches/2018Q1/emulators/virtualbox-ose/Makefile ============================================================================== --- branches/2018Q1/emulators/virtualbox-ose/Makefile Fri Feb 23 19:48:04 2018 (r462735) +++ branches/2018Q1/emulators/virtualbox-ose/Makefile Fri Feb 23 19:48:33 2018 (r462736) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.2.4 +PORTVERSION= 5.2.6 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} Modified: branches/2018Q1/emulators/virtualbox-ose/distinfo ============================================================================== --- branches/2018Q1/emulators/virtualbox-ose/distinfo Fri Feb 23 19:48:04 2018 (r462735) +++ branches/2018Q1/emulators/virtualbox-ose/distinfo Fri Feb 23 19:48:33 2018 (r462736) @@ -1,5 +1,5 @@ -TIMESTAMP = 1514405545 -SHA256 (VirtualBox-5.2.4.tar.bz2) = c9a060bd99168e05587f1ba74b54e9c1f709734bdfc956b0242fe63e81bb7d14 -SIZE (VirtualBox-5.2.4.tar.bz2) = 118481693 -SHA256 (VBoxGuestAdditions_5.2.4.iso) = 60da4bb2d522632f6ac82377354cb03a9ff25c36d6a881d3158d22c2b6c91a62 -SIZE (VBoxGuestAdditions_5.2.4.iso) = 57868288 +TIMESTAMP = 1516131253 +SHA256 (VirtualBox-5.2.6.tar.bz2) = fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7 +SIZE (VirtualBox-5.2.6.tar.bz2) = 118530572 +SHA256 (VBoxGuestAdditions_5.2.6.iso) = c5ff76a50504e8be1f6c6f3202c78f9cd07e7023b9684bec3cce9d4dcd95a9df +SIZE (VBoxGuestAdditions_5.2.6.iso) = 57866240 Copied: branches/2018Q1/emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h (from r459217, head/emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h Fri Feb 23 19:48:33 2018 (r462736, copy of r459217, head/emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h) @@ -0,0 +1,15 @@ +--- include/iprt/assertcompile.h.orig 2018-01-15 14:49:42 UTC ++++ include/iprt/assertcompile.h +@@ -104,7 +104,11 @@ RT_C_DECLS_END + * @param expr Expression which should be true. + */ + #ifdef RTASSERT_HAVE_STATIC_ASSERT +-# define AssertCompile(expr) static_assert(!!(expr), #expr) ++# ifdef __cplusplus ++# define AssertCompile(expr) static_assert(!!(expr), #expr) ++# else ++# define AssertCompile(expr) _Static_assert(!!(expr), #expr) ++# endif + #else + # define AssertCompile(expr) AssertCompileNS(expr) + #endif Copied: branches/2018Q1/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h (from r459217, head/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h Fri Feb 23 19:48:33 2018 (r462736, copy of r459217, head/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h) @@ -0,0 +1,83 @@ +--- include/iprt/cdefs.h.orig 2018-01-15 14:49:42 UTC ++++ include/iprt/cdefs.h +@@ -2214,6 +2214,8 @@ + */ + #if defined(__cplusplus) && RT_GNUC_PREREQ(4, 4) + # define RT_OFFSETOF(type, member) ( (int)(uintptr_t)&( ((type *)(void *)0x1000)->member) - 0x1000 ) ++#elif RT_CLANG_PREREQ(6, 0) ++# define RT_OFFSETOF(type, member) ( (int)__builtin_offsetof(type, member) ) + #else + # define RT_OFFSETOF(type, member) ( (int)(uintptr_t)&( ((type *)(void *)0)->member) ) + #endif +@@ -2232,6 +2234,8 @@ + */ + #if defined(__cplusplus) && RT_GNUC_PREREQ(4, 4) + # define RT_UOFFSETOF(type, member) ( (uintptr_t)&( ((type *)(void *)0x1000)->member) - 0x1000 ) ++#elif RT_CLANG_PREREQ(6, 0) ++# define RT_UOFFSETOF(type, member) ( (unsigned)__builtin_offsetof(type, member) ) + #else + # define RT_UOFFSETOF(type, member) ( (uintptr_t)&( ((type *)(void *)0)->member) ) + #endif +@@ -2244,7 +2248,11 @@ + * @param member Member. + * @param addend The addend to add to the offset. + */ +-#define RT_OFFSETOF_ADD(type, member, addend) ( (int)RT_UOFFSETOF_ADD(type, member, addend) ) ++#if RT_CLANG_PREREQ(6, 0) ++# define RT_OFFSETOF_ADD(type, member, addend) ( (int)(__builtin_offsetof(type, member) + addend) ) ++#else ++# define RT_OFFSETOF_ADD(type, member, addend) ( (int)RT_UOFFSETOF_ADD(type, member, addend) ) ++#endif + + /** @def RT_UOFFSETOF_ADD + * RT_UOFFSETOF with an addend. +@@ -2254,7 +2262,11 @@ + * @param member Member. + * @param addend The addend to add to the offset. + */ +-#define RT_UOFFSETOF_ADD(type, member, addend) ( (uintptr_t)&( ((type *)(void *)(uintptr_t)(addend))->member) ) ++#if RT_CLANG_PREREQ(6, 0) ++# define RT_UOFFSETOF_ADD(type, member, addend) ( (unsigned)(__builtin_offsetof(type, member) + addend) ) ++#else ++# define RT_UOFFSETOF_ADD(type, member, addend) ( (uintptr_t)&( ((type *)(void *)(uintptr_t)(addend))->member) ) ++#endif + + /** @def RT_SIZEOFMEMB + * Get the size of a structure member. +@@ -2517,28 +2529,28 @@ + + /** @def RT_BYTE1 + * Gets the first byte of something. */ +-#define RT_BYTE1(a) ( (a) & 0xff ) ++#define RT_BYTE1(a) ( (uint8_t)((a) & 0xff) ) + /** @def RT_BYTE2 + * Gets the second byte of something. */ +-#define RT_BYTE2(a) ( ((a) >> 8) & 0xff ) ++#define RT_BYTE2(a) ( (uint8_t)(((a) >> 8) & 0xff) ) + /** @def RT_BYTE3 + * Gets the second byte of something. */ +-#define RT_BYTE3(a) ( ((a) >> 16) & 0xff ) ++#define RT_BYTE3(a) ( (uint8_t)(((a) >> 16) & 0xff) ) + /** @def RT_BYTE4 + * Gets the fourth byte of something. */ +-#define RT_BYTE4(a) ( ((a) >> 24) & 0xff ) ++#define RT_BYTE4(a) ( (uint8_t)(((a) >> 24) & 0xff) ) + /** @def RT_BYTE5 + * Gets the fifth byte of something. */ +-#define RT_BYTE5(a) ( ((a) >> 32) & 0xff ) ++#define RT_BYTE5(a) ( (uint8_t)(((a) >> 32) & 0xff) ) + /** @def RT_BYTE6 + * Gets the sixth byte of something. */ +-#define RT_BYTE6(a) ( ((a) >> 40) & 0xff ) ++#define RT_BYTE6(a) ( (uint8_t)(((a) >> 40) & 0xff) ) + /** @def RT_BYTE7 + * Gets the seventh byte of something. */ +-#define RT_BYTE7(a) ( ((a) >> 48) & 0xff ) ++#define RT_BYTE7(a) ( (uint8_t)(((a) >> 48) & 0xff) ) + /** @def RT_BYTE8 + * Gets the eight byte of something. */ +-#define RT_BYTE8(a) ( ((a) >> 56) & 0xff ) ++#define RT_BYTE8(a) ( (uint8_t)(((a) >> 56) & 0xff) ) + + + /** @def RT_LODWORD Copied: branches/2018Q1/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp (from r459385, head/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp Fri Feb 23 19:48:33 2018 (r462736, copy of r459385, head/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp) @@ -0,0 +1,11 @@ +--- src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp.orig 2018-01-15 14:56:07 UTC ++++ src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp +@@ -302,7 +302,7 @@ RTDECL(int) RTErrConvertFromErrno(unsigned uNativeCod + case EILSEQ: return VERR_NO_TRANSLATION; + #endif + #ifdef ERESTART +- case ERESTART: return VERR_INTERRUPTED;/** @todo fix duplicate error?*/ ++ case (unsigned)ERESTART: return VERR_INTERRUPTED;/** @todo fix duplicate error?*/ + #endif + #ifdef ESTRPIPE + //case ESTRPIPE 86 /* Streams pipe error */ Copied: branches/2018Q1/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp (from r459217, head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp Fri Feb 23 19:48:33 2018 (r462736, copy of r459217, head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp) @@ -0,0 +1,11 @@ +--- src/VBox/VMM/VMMR0/GVMMR0.cpp.orig 2018-01-15 14:56:33.000000000 +0000 ++++ src/VBox/VMM/VMMR0/GVMMR0.cpp 2018-01-17 01:13:24.832105000 +0000 +@@ -1243,7 +1243,7 @@ static void gvmmR0CleanupVM(PGVM pGVM) + + GMMR0CleanupVM(pGVM); + +- AssertCompile((uintptr_t)NIL_RTTHREADCTXHOOK == 0); /* Depends on zero initialized memory working for NIL at the moment. */ ++ AssertCompile(NIL_RTTHREADCTXHOOK == (RTTHREADCTXHOOK)0); /* Depends on zero initialized memory working for NIL at the moment. */ + for (VMCPUID idCpu = 0; idCpu < pGVM->cCpus; idCpu++) + { + /** @todo Can we busy wait here for all thread-context hooks to be Copied: branches/2018Q1/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp (from r459217, head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp Fri Feb 23 19:48:33 2018 (r462736, copy of r459217, head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp) @@ -0,0 +1,11 @@ +--- src/VBox/VMM/VMMR3/VMReq.cpp.orig 2018-01-15 14:56:37 UTC ++++ src/VBox/VMM/VMMR3/VMReq.cpp +@@ -669,7 +669,7 @@ VMMR3DECL(int) VMR3ReqAlloc(PUVM pUVM, PVMREQ *ppReq, + Assert(pReq->enmType == VMREQTYPE_INVALID); + Assert(pReq->enmState == VMREQSTATE_FREE); + Assert(pReq->pUVM == pUVM); +- ASMAtomicXchgSize(&pReq->pNext, NULL); ++ ASMAtomicXchgSize(&pReq->pNext, (uintptr_t)NULL); + pReq->enmState = VMREQSTATE_ALLOCATED; + pReq->iStatus = VERR_VM_REQUEST_STATUS_STILL_PENDING; + pReq->fFlags = VMREQFLAGS_VBOX_STATUS; From owner-svn-ports-branches@freebsd.org Fri Feb 23 19:51:29 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DEC0AF17164; Fri, 23 Feb 2018 19:51:28 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9198174A0D; Fri, 23 Feb 2018 19:51:28 +0000 (UTC) (envelope-from dbaio@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8BC571AFF5; Fri, 23 Feb 2018 19:51:28 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1NJpSau031620; Fri, 23 Feb 2018 19:51:28 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1NJpSbj031616; Fri, 23 Feb 2018 19:51:28 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201802231951.w1NJpSbj031616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Fri, 23 Feb 2018 19:51:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462737 - in branches/2018Q1/www/squid-devel: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: in branches/2018Q1/www/squid-devel: . files X-SVN-Commit-Revision: 462737 X-SVN-Commit-Repository: ports 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.25 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 Feb 2018 19:51:29 -0000 Author: dbaio Date: Fri Feb 23 19:51:27 2018 New Revision: 462737 URL: https://svnweb.freebsd.org/changeset/ports/462737 Log: MFH: r462698 www/squid-devel: Update to 4.0.23, Fixes security vulnerabilities - Add a patch from upstream that fixes a problem when building on i386 arch Kid.cc:93:42: error: format specifies type 'long' but the argument has type 'time_t' (aka 'int') [-Werror,-Wformat] theName.termedBuf(), pid, Config.hopelessKidRevivalDelay); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. - Remove CXXFLAGS with clang, not necessary anymore PR: 225447 Submitted by: timp87@gmail.com (maintainer) Security: d5b6d151-1887-11e8-94f7-9c5c8e75236a Approved by: ports-secteam (swills) Added: branches/2018Q1/www/squid-devel/files/patch-src_ipc_Kid.cc - copied unchanged from r462698, head/www/squid-devel/files/patch-src_ipc_Kid.cc Modified: branches/2018Q1/www/squid-devel/Makefile branches/2018Q1/www/squid-devel/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/squid-devel/Makefile ============================================================================== --- branches/2018Q1/www/squid-devel/Makefile Fri Feb 23 19:48:33 2018 (r462736) +++ branches/2018Q1/www/squid-devel/Makefile Fri Feb 23 19:51:27 2018 (r462737) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 4.0.22 -PORTREVISION= 1 +PORTVERSION= 4.0.23 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \ http://www2.us.squid-cache.org/Versions/v4/ \ @@ -309,11 +308,4 @@ post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}) -.include - -.if ${CHOSEN_COMPILER_TYPE} == clang -CXXFLAGS+= -Wno-unknown-warning-option -CXXFLAGS+= -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess -.endif - -.include +.include Modified: branches/2018Q1/www/squid-devel/distinfo ============================================================================== --- branches/2018Q1/www/squid-devel/distinfo Fri Feb 23 19:48:33 2018 (r462736) +++ branches/2018Q1/www/squid-devel/distinfo Fri Feb 23 19:51:27 2018 (r462737) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499897995 -SHA256 (squid4.0/squid-4.0.22.tar.xz) = 51b852f17c21569d53bcd098d2c55a4e0c745e9cac392cff26d92681e911a5a2 -SIZE (squid4.0/squid-4.0.22.tar.xz) = 2411692 +TIMESTAMP = 1517146538 +SHA256 (squid4.0/squid-4.0.23.tar.xz) = 18b71a601f60f49ca0cfc7d1d212dc935112d61008ab8a689fceab3ef4070f29 +SIZE (squid4.0/squid-4.0.23.tar.xz) = 2415132 Copied: branches/2018Q1/www/squid-devel/files/patch-src_ipc_Kid.cc (from r462698, head/www/squid-devel/files/patch-src_ipc_Kid.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/squid-devel/files/patch-src_ipc_Kid.cc Fri Feb 23 19:51:27 2018 (r462737, copy of r462698, head/www/squid-devel/files/patch-src_ipc_Kid.cc) @@ -0,0 +1,16 @@ +# https://bugs.squid-cache.org/show_bug.cgi?id=4822 +# https://patch-diff.githubusercontent.com/raw/squid-cache/squid/pull/158.patch + +--- src/ipc/Kid.cc.orig 2018-02-22 18:34:42 UTC ++++ src/ipc/Kid.cc +@@ -90,7 +90,9 @@ Kid::reportStopped() const + if (hopeless() && Config.hopelessKidRevivalDelay) { + syslog(LOG_NOTICE, "Squid Parent: %s process %d will not be restarted for %ld " + "seconds due to repeated, frequent failures", +- theName.termedBuf(), pid, Config.hopelessKidRevivalDelay); ++ theName.termedBuf(), ++ pid, ++ static_cast(Config.hopelessKidRevivalDelay)); + } + } + From owner-svn-ports-branches@freebsd.org Sat Feb 24 00:51:36 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02CB5F03CB4; Sat, 24 Feb 2018 00:51:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A5AC182CC8; Sat, 24 Feb 2018 00:51:35 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 86E521DFCE; Sat, 24 Feb 2018 00:51:35 +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 w1O0pZFS083803; Sat, 24 Feb 2018 00:51:35 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1O0pYiv083793; Sat, 24 Feb 2018 00:51:34 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802240051.w1O0pYiv083793@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 24 Feb 2018 00:51:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462760 - in branches/2018Q1/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www/waterfox: . files X-SVN-Commit-Revision: 462760 X-SVN-Commit-Repository: ports 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.25 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: Sat, 24 Feb 2018 00:51:36 -0000 Author: jbeich Date: Sat Feb 24 00:51:34 2018 New Revision: 462760 URL: https://svnweb.freebsd.org/changeset/ports/462760 Log: MFH: r462756 www/waterfox: apply some FF59 fixes Approved by: ports-secteam blanket Added: branches/2018Q1/www/waterfox/files/patch-bug1325888 - copied unchanged from r462756, head/www/waterfox/files/patch-bug1325888 branches/2018Q1/www/waterfox/files/patch-bug1345058 - copied unchanged from r462756, head/www/waterfox/files/patch-bug1345058 branches/2018Q1/www/waterfox/files/patch-bug1363038 - copied unchanged from r462756, head/www/waterfox/files/patch-bug1363038 branches/2018Q1/www/waterfox/files/patch-bug1385609 - copied unchanged from r462756, head/www/waterfox/files/patch-bug1385609 branches/2018Q1/www/waterfox/files/patch-bug1393235 - copied unchanged from r462756, head/www/waterfox/files/patch-bug1393235 branches/2018Q1/www/waterfox/files/patch-bug1394601 - copied unchanged from r462756, head/www/waterfox/files/patch-bug1394601 branches/2018Q1/www/waterfox/files/patch-bug1426869 - copied unchanged from r462756, head/www/waterfox/files/patch-bug1426869 branches/2018Q1/www/waterfox/files/patch-bug1427118 - copied unchanged from r462756, head/www/waterfox/files/patch-bug1427118 branches/2018Q1/www/waterfox/files/patch-bug1435859 - copied unchanged from r462756, head/www/waterfox/files/patch-bug1435859 branches/2018Q1/www/waterfox/files/patch-bug1437507 - copied unchanged from r462756, head/www/waterfox/files/patch-bug1437507 branches/2018Q1/www/waterfox/files/patch-revert-bug1393954 - copied unchanged from r462756, head/www/waterfox/files/patch-revert-bug1393954 Modified: branches/2018Q1/www/waterfox/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Sat Feb 24 00:50:20 2018 (r462759) +++ branches/2018Q1/www/waterfox/Makefile Sat Feb 24 00:51:34 2018 (r462760) @@ -3,6 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.0.4-20 DISTVERSIONSUFFIX= -ge03e284b083d +PORTREVISION= 1 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q1/www/waterfox/files/patch-bug1325888 (from r462756, head/www/waterfox/files/patch-bug1325888) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1325888 Sat Feb 24 00:51:34 2018 (r462760, copy of r462756, head/www/waterfox/files/patch-bug1325888) @@ -0,0 +1,39 @@ +commit fb631be6ce75 +Author: DimiL +Date: Wed Nov 1 08:40:00 2017 +0800 + + Bug 1325888 - Clear cached completion result when close safebrowsing database. r=francois + + Safebrowsing testcase will close and then re-open database to simulate firefox restart. + This bug happened when DB service already has a previously cached completion result and then + re-open database. In this scenario, if testcase triggers another the same completion request, + we won't cache it because we thought we have it already (See nsUrlClassifierDBServiceWorker::CacheCompletion). + + This causes a testcase assertion when testcase expects the completion + result should be stored in LookupCache. + + MozReview-Commit-ID: 8o57jHv92OH + + --HG-- + extra : rebase_source : 90861060437d6cef860b85dd669d76e74ceec660 +--- + toolkit/components/url-classifier/nsUrlClassifierDBService.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git toolkit/components/url-classifier/nsUrlClassifierDBService.cpp toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +index e1a1be065aaf..a108812a1792 100644 +--- toolkit/components/url-classifier/nsUrlClassifierDBService.cpp ++++ toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +@@ -812,6 +812,12 @@ nsUrlClassifierDBServiceWorker::CloseDb() + mClassifier = nullptr; + } + ++ // Clear last completion result when close db so we will still cache completion ++ // result next time we re-open it. ++ if (mLastResults) { ++ mLastResults->Clear(); ++ } ++ + LOG(("urlclassifier db closed\n")); + + return NS_OK; Copied: branches/2018Q1/www/waterfox/files/patch-bug1345058 (from r462756, head/www/waterfox/files/patch-bug1345058) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1345058 Sat Feb 24 00:51:34 2018 (r462760, copy of r462756, head/www/waterfox/files/patch-bug1345058) @@ -0,0 +1,620 @@ +commit 1f57fdb85d3d +Author: Thomas Nguyen +Date: Mon Aug 14 14:05:23 2017 +0800 + + Bug 1345058 - Asynchronously decide if a flash document should be blocked. r=baku + + MozReview-Commit-ID: K91cSvIdOrb + + --HG-- + extra : rebase_source : 4d91ab3499c0124129e74a054c5cc78882ff351e +--- + dom/base/nsDocument.cpp | 447 ++++++++++++++++++--- + dom/base/nsDocument.h | 5 + + .../url-classifier/nsUrlClassifierDBService.cpp | 22 +- + 3 files changed, 401 insertions(+), 73 deletions(-) + +diff --git dom/base/nsDocument.cpp dom/base/nsDocument.cpp +index acfde3bc0210..386c96745438 100644 +--- dom/base/nsDocument.cpp ++++ dom/base/nsDocument.cpp +@@ -279,6 +279,7 @@ + #include "nsIURIClassifier.h" + #include "mozilla/DocumentStyleRootIterator.h" + #include "mozilla/ServoRestyleManager.h" ++#include "mozilla/ClearOnShutdown.h" + + using namespace mozilla; + using namespace mozilla::dom; +@@ -319,6 +320,65 @@ GetHttpChannelHelper(nsIChannel* aChannel, nsIHttpChannel** aHttpChannel) + return NS_OK; + } + ++//////////////////////////////////////////////////////////////////// ++// PrincipalFlashClassifier ++ ++// Classify the flash based on the document principal. ++// The usage of this class is as follows: ++// ++// 1) Call AsyncClassify() as early as possible to asynchronously do ++// classification against all the flash blocking related tables ++// via nsIURIClassifier.asyncClassifyLocalWithTables. ++// ++// 2) At any time you need the classification result, call Result() ++// and it is guaranteed to give you the result. Note that you have ++// to specify "aIsThirdParty" to the function so please make sure ++// you can already correctly decide if the document is third-party. ++// ++// Behind the scenes, the sync classification API ++// (nsIURIClassifier.classifyLocalWithTable) may be called as a fallback to ++// synchronously get the result if the asyncClassifyLocalWithTables hasn't ++// been done yet. ++// ++// 3) You can call Result() as many times as you want and only the first time ++// it may unfortunately call the blocking sync API. The subsequent call ++// will just return the result that came out at the first time. ++// ++class PrincipalFlashClassifier final : public nsIURIClassifierCallback ++{ ++public: ++ NS_DECL_THREADSAFE_ISUPPORTS ++ NS_DECL_NSIURICLASSIFIERCALLBACK ++ ++ PrincipalFlashClassifier(); ++ ++ // Fire async classification based on the given principal. ++ void AsyncClassify(nsIPrincipal* aPrincipal); ++ ++ // Would block if the result hasn't come out. ++ mozilla::dom::FlashClassification ClassifyMaybeSync(nsIPrincipal* aPrincipal, ++ bool aIsThirdParty); ++ ++private: ++ ~PrincipalFlashClassifier() = default; ++ ++ void Reset(); ++ bool EnsureUriClassifier(); ++ mozilla::dom::FlashClassification CheckIfClassifyNeeded(nsIPrincipal* aPrincipal); ++ mozilla::dom::FlashClassification Resolve(bool aIsThirdParty); ++ mozilla::dom::FlashClassification AsyncClassifyInternal(nsIPrincipal* aPrincipal); ++ void GetClassificationTables(bool aIsThirdParty, nsACString& aTables); ++ ++ // For the fallback sync classification. ++ nsCOMPtr mClassificationURI; ++ ++ nsCOMPtr mUriClassifier; ++ bool mAsyncClassified; ++ nsTArray mMatchedTables; ++ mozilla::dom::FlashClassification mResult; ++}; ++ ++ + #define NAME_NOT_VALID ((nsSimpleContentList*)1) + + nsIdentifierMapEntry::~nsIdentifierMapEntry() +@@ -1575,6 +1635,9 @@ nsDocument::nsDocument(const char* aContentType) + + // void state used to differentiate an empty source from an unselected source + mPreloadPictureFoundSource.SetIsVoid(true); ++ // For determining if this is a flash document which should be ++ // blocked based on its principal. ++ mPrincipalFlashClassifier = new PrincipalFlashClassifier(); + } + + void +@@ -2761,6 +2824,11 @@ nsDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, + aChannel->Cancel(NS_ERROR_CSP_FRAME_ANCESTOR_VIOLATION); + } + ++ // Perform a async flash classification based on the doc principal ++ // in an early stage to reduce the blocking time. ++ mFlashClassification = FlashClassification::Unclassified; ++ mPrincipalFlashClassifier->AsyncClassify(GetPrincipal()); ++ + return NS_OK; + } + +@@ -13483,6 +13551,23 @@ nsIDocument::UpdateStyleBackendType() + #endif + } + ++/** ++ * Retrieves the classification of the Flash plugins in the document based on ++ * the classification lists. We perform AsyncInitFlashClassification on ++ * StartDocumentLoad() and the result may not be initialized when this function ++ * gets called. In that case, We can only unfortunately have a blocking wait. ++ * ++ * For more information, see ++ * toolkit/components/url-classifier/flash-block-lists.rst ++ */ ++FlashClassification ++nsDocument::PrincipalFlashClassification() ++{ ++ MOZ_ASSERT(mPrincipalFlashClassifier); ++ return mPrincipalFlashClassifier->ClassifyMaybeSync(GetPrincipal(), ++ IsThirdParty()); ++} ++ + /** + * Helper function for |nsDocument::PrincipalFlashClassification| + * +@@ -13523,27 +13608,279 @@ ArrayContainsTable(const nsTArray& aTableArray, + return false; + } + +-/** +- * Retrieves the classification of the Flash plugins in the document based on +- * the classification lists. +- * +- * For more information, see +- * toolkit/components/url-classifier/flash-block-lists.rst +- */ ++namespace { ++ ++// An object to store all preferences we need for flash blocking feature. ++struct PrefStore ++{ ++ PrefStore() ++ { ++ Preferences::AddBoolVarCache(&mFlashBlockEnabled, ++ "plugins.flashBlock.enabled"); ++ Preferences::AddBoolVarCache(&mPluginsHttpOnly, ++ "plugins.http_https_only"); ++ ++ // We only need to register string-typed preferences. ++ Preferences::RegisterCallback(UpdateStringPrefs, "urlclassifier.flashAllowTable", this); ++ Preferences::RegisterCallback(UpdateStringPrefs, "urlclassifier.flashAllowExceptTable", this); ++ Preferences::RegisterCallback(UpdateStringPrefs, "urlclassifier.flashTable", this); ++ Preferences::RegisterCallback(UpdateStringPrefs, "urlclassifier.flashExceptTable", this); ++ Preferences::RegisterCallback(UpdateStringPrefs, "urlclassifier.flashSubDocTable", this); ++ Preferences::RegisterCallback(UpdateStringPrefs, "urlclassifier.flashSubDocExceptTable", this); ++ ++ UpdateStringPrefs(); ++ } ++ ++ ~PrefStore() ++ { ++ Preferences::UnregisterCallback(UpdateStringPrefs, "urlclassifier.flashAllowTable", this); ++ Preferences::UnregisterCallback(UpdateStringPrefs, "urlclassifier.flashAllowExceptTable", this); ++ Preferences::UnregisterCallback(UpdateStringPrefs, "urlclassifier.flashTable", this); ++ Preferences::UnregisterCallback(UpdateStringPrefs, "urlclassifier.flashExceptTable", this); ++ Preferences::UnregisterCallback(UpdateStringPrefs, "urlclassifier.flashSubDocTable", this); ++ Preferences::UnregisterCallback(UpdateStringPrefs, "urlclassifier.flashSubDocExceptTable", this); ++ } ++ ++ void UpdateStringPrefs() ++ { ++ Preferences::GetCString("urlclassifier.flashAllowTable", mAllowTables); ++ Preferences::GetCString("urlclassifier.flashAllowExceptTable", mAllowExceptionsTables); ++ Preferences::GetCString("urlclassifier.flashTable", mDenyTables); ++ Preferences::GetCString("urlclassifier.flashExceptTable", mDenyExceptionsTables); ++ Preferences::GetCString("urlclassifier.flashSubDocTable", mSubDocDenyTables); ++ Preferences::GetCString("urlclassifier.flashSubDocExceptTable", mSubDocDenyExceptionsTables); ++ } ++ ++ static void UpdateStringPrefs(const char*, void* aClosure) ++ { ++ static_cast(aClosure)->UpdateStringPrefs(); ++ } ++ ++ bool mFlashBlockEnabled; ++ bool mPluginsHttpOnly; ++ ++ nsCString mAllowTables; ++ nsCString mAllowExceptionsTables; ++ nsCString mDenyTables; ++ nsCString mDenyExceptionsTables; ++ nsCString mSubDocDenyTables; ++ nsCString mSubDocDenyExceptionsTables; ++}; ++ ++static const ++PrefStore& GetPrefStore() ++{ ++ static UniquePtr sPrefStore; ++ if (!sPrefStore) { ++ sPrefStore.reset(new PrefStore()); ++ ClearOnShutdown(&sPrefStore); ++ } ++ return *sPrefStore; ++} ++ ++} // end of unnamed namespace. ++ ++//////////////////////////////////////////////////////////////////// ++// PrincipalFlashClassifier implementation. ++ ++NS_IMPL_ISUPPORTS(PrincipalFlashClassifier, nsIURIClassifierCallback) ++ ++PrincipalFlashClassifier::PrincipalFlashClassifier() ++{ ++ Reset(); ++} ++ ++void ++PrincipalFlashClassifier::Reset() ++{ ++ mAsyncClassified = false; ++ mMatchedTables.Clear(); ++ mResult = FlashClassification::Unclassified; ++} ++ ++void ++PrincipalFlashClassifier::GetClassificationTables(bool aIsThirdParty, ++ nsACString& aTables) ++{ ++ aTables.Truncate(); ++ auto& prefs = GetPrefStore(); ++ ++ MaybeAddTableToTableList(prefs.mAllowTables, aTables); ++ MaybeAddTableToTableList(prefs.mAllowExceptionsTables, aTables); ++ MaybeAddTableToTableList(prefs.mDenyTables, aTables); ++ MaybeAddTableToTableList(prefs.mDenyExceptionsTables, aTables); ++ ++ if (aIsThirdParty) { ++ MaybeAddTableToTableList(prefs.mSubDocDenyTables, aTables); ++ MaybeAddTableToTableList(prefs.mSubDocDenyExceptionsTables, aTables); ++ } ++} ++ ++bool ++PrincipalFlashClassifier::EnsureUriClassifier() ++{ ++ if (!mUriClassifier) { ++ mUriClassifier = do_GetService(NS_URICLASSIFIERSERVICE_CONTRACTID); ++ } ++ ++ return !!mUriClassifier; ++} ++ + FlashClassification +-nsDocument::PrincipalFlashClassification() ++PrincipalFlashClassifier::ClassifyMaybeSync(nsIPrincipal* aPrincipal, bool aIsThirdParty) ++{ ++ if (FlashClassification::Unclassified != mResult) { ++ // We already have the result. Just return it. ++ return mResult; ++ } ++ ++ // TODO: Bug 1342333 - Entirely remove the use of the sync API ++ // (ClassifyLocalWithTables). ++ if (!mAsyncClassified) { ++ ++ // ++ // We may ++ // 1) have called AsyncClassifyLocalWithTables but OnClassifyComplete ++ // hasn't been called. ++ // 2) haven't even called AsyncClassifyLocalWithTables. ++ // ++ // In both cases we need to do the synchronous classification as the fallback. ++ // ++ ++ if (!EnsureUriClassifier()) { ++ return FlashClassification::Denied; ++ } ++ mResult = CheckIfClassifyNeeded(aPrincipal); ++ if (FlashClassification::Unclassified != mResult) { ++ return mResult; ++ } ++ ++ nsresult rv; ++ nsAutoCString classificationTables; ++ GetClassificationTables(aIsThirdParty, classificationTables); ++ ++ if (!mClassificationURI) { ++ rv = aPrincipal->GetURI(getter_AddRefs(mClassificationURI)); ++ if (NS_FAILED(rv) || !mClassificationURI) { ++ mResult = FlashClassification::Denied; ++ return mResult; ++ } ++ } ++ ++ rv = mUriClassifier->ClassifyLocalWithTables(mClassificationURI, ++ classificationTables, ++ mMatchedTables); ++ if (NS_WARN_IF(NS_FAILED(rv))) { ++ if (rv == NS_ERROR_MALFORMED_URI) { ++ // This means that the URI had no hostname (ex: file://doc.html). In this ++ // case, we allow the default (Unknown plugin) behavior. ++ mResult = FlashClassification::Unknown; ++ } else { ++ mResult = FlashClassification::Denied; ++ } ++ return mResult; ++ } ++ } ++ ++ // Resolve the result based on mMatchedTables and aIsThirdParty. ++ mResult = Resolve(aIsThirdParty); ++ MOZ_ASSERT(FlashClassification::Unclassified != mResult); ++ ++ // The subsequent call of Result() will return the resolved result ++ // and never reach here until Reset() is called. ++ return mResult; ++} ++ ++/*virtual*/ nsresult ++PrincipalFlashClassifier::OnClassifyComplete(nsresult /*aErrorCode*/, ++ const nsACString& aLists, // Only this matters. ++ const nsACString& /*aProvider*/, ++ const nsACString& /*aPrefix*/) ++{ ++ mAsyncClassified = true; ++ ++ if (FlashClassification::Unclassified != mResult) { ++ // Result() has been called prior to this callback. ++ return NS_OK; ++ } ++ ++ // TODO: Bug 1364804 - We should use a callback type which notifies ++ // the result as a string array rather than a formatted string. ++ ++ // We only populate the matched list without resolving the classification ++ // result because we are not sure if the parent doc has been properly set. ++ // We also parse the comma-separated tables to array. (the code is copied ++ // from Classifier::SplitTables.) ++ nsACString::const_iterator begin, iter, end; ++ aLists.BeginReading(begin); ++ aLists.EndReading(end); ++ while (begin != end) { ++ iter = begin; ++ FindCharInReadable(',', iter, end); ++ nsDependentCSubstring table = Substring(begin,iter); ++ if (!table.IsEmpty()) { ++ mMatchedTables.AppendElement(Substring(begin, iter)); ++ } ++ begin = iter; ++ if (begin != end) { ++ begin++; ++ } ++ } ++ ++ return NS_OK; ++} ++ ++// We resolve the classification result based on aIsThirdParty ++// and the matched tables we got ealier on (via either sync or async API). ++FlashClassification ++PrincipalFlashClassifier::Resolve(bool aIsThirdParty) ++{ ++ MOZ_ASSERT(FlashClassification::Unclassified == mResult, ++ "We already have resolved classification result."); ++ ++ if (mMatchedTables.IsEmpty()) { ++ return FlashClassification::Unknown; ++ } ++ ++ auto& prefs = GetPrefStore(); ++ if (ArrayContainsTable(mMatchedTables, prefs.mDenyTables) && ++ !ArrayContainsTable(mMatchedTables, prefs.mDenyExceptionsTables)) { ++ return FlashClassification::Denied; ++ } else if (ArrayContainsTable(mMatchedTables, prefs.mAllowTables) && ++ !ArrayContainsTable(mMatchedTables, prefs.mAllowExceptionsTables)) { ++ return FlashClassification::Allowed; ++ } ++ ++ if (aIsThirdParty && ArrayContainsTable(mMatchedTables, prefs.mSubDocDenyTables) && ++ !ArrayContainsTable(mMatchedTables, prefs.mSubDocDenyExceptionsTables)) { ++ return FlashClassification::Denied; ++ } ++ ++ return FlashClassification::Unknown; ++} ++ ++void ++PrincipalFlashClassifier::AsyncClassify(nsIPrincipal* aPrincipal) ++{ ++ MOZ_ASSERT(FlashClassification::Unclassified == mResult, ++ "The old classification result should be reset first."); ++ Reset(); ++ mResult = AsyncClassifyInternal(aPrincipal); ++} ++ ++FlashClassification ++PrincipalFlashClassifier::CheckIfClassifyNeeded(nsIPrincipal* aPrincipal) + { + nsresult rv; + +- bool httpOnly = Preferences::GetBool("plugins.http_https_only", true); +- bool flashBlock = Preferences::GetBool("plugins.flashBlock.enabled", false); ++ auto& prefs = GetPrefStore(); + + // If neither pref is on, skip the null-principal and principal URI checks. +- if (!httpOnly && !flashBlock) { +- return FlashClassification::Unknown; ++ if (prefs.mPluginsHttpOnly && !prefs.mFlashBlockEnabled) { ++ return FlashClassification::Unknown; + } + +- nsCOMPtr principal = GetPrincipal(); ++ nsCOMPtr principal = aPrincipal; + if (principal->GetIsNullPrincipal()) { + return FlashClassification::Denied; + } +@@ -13554,7 +13891,7 @@ nsDocument::PrincipalFlashClassification() + return FlashClassification::Denied; + } + +- if (httpOnly) { ++ if (prefs.mPluginsHttpOnly) { + // Only allow plugins for documents from an HTTP/HTTPS origin. This should + // allow dependent data: URIs to load plugins, but not: + // * chrome documents +@@ -13570,49 +13907,50 @@ nsDocument::PrincipalFlashClassification() + + // If flash blocking is disabled, it is equivalent to all sites being + // on neither list. +- if (!flashBlock) { ++ if (!prefs.mFlashBlockEnabled) { + return FlashClassification::Unknown; + } + +- nsAutoCString allowTables, allowExceptionsTables, +- denyTables, denyExceptionsTables, +- subDocDenyTables, subDocDenyExceptionsTables, +- tables; +- Preferences::GetCString("urlclassifier.flashAllowTable", allowTables); +- MaybeAddTableToTableList(allowTables, tables); +- Preferences::GetCString("urlclassifier.flashAllowExceptTable", +- allowExceptionsTables); +- MaybeAddTableToTableList(allowExceptionsTables, tables); +- Preferences::GetCString("urlclassifier.flashTable", denyTables); +- MaybeAddTableToTableList(denyTables, tables); +- Preferences::GetCString("urlclassifier.flashExceptTable", +- denyExceptionsTables); +- MaybeAddTableToTableList(denyExceptionsTables, tables); +- +- bool isThirdPartyDoc = IsThirdParty(); +- if (isThirdPartyDoc) { +- Preferences::GetCString("urlclassifier.flashSubDocTable", +- subDocDenyTables); +- MaybeAddTableToTableList(subDocDenyTables, tables); +- Preferences::GetCString("urlclassifier.flashSubDocExceptTable", +- subDocDenyExceptionsTables); +- MaybeAddTableToTableList(subDocDenyExceptionsTables, tables); ++ return FlashClassification::Unclassified; ++} ++ ++// Using nsIURIClassifier.asyncClassifyLocalWithTables to do classification ++// against the flash related tables based on the given principal. ++FlashClassification ++PrincipalFlashClassifier::AsyncClassifyInternal(nsIPrincipal* aPrincipal) ++{ ++ auto result = CheckIfClassifyNeeded(aPrincipal); ++ if (FlashClassification::Unclassified != result) { ++ return result; + } + ++ // We haven't been able to decide if it's a third party document ++ // since determining if a document is third-party may depend on its ++ // parent document. At the time we call AsyncClassifyInternal ++ // (i.e. StartDocumentLoad) the parent document may not have been ++ // set. As a result, we wait until Resolve() to be called to ++ // take "is third party" into account. At this point, we just assume ++ // it's third-party to include every list. ++ nsAutoCString tables; ++ GetClassificationTables(true, tables); ++ + if (tables.IsEmpty()) { + return FlashClassification::Unknown; + } + +- nsCOMPtr uriClassifier = +- do_GetService(NS_URICLASSIFIERSERVICE_CONTRACTID, &rv); +- if (NS_FAILED(rv)) { ++ if (!EnsureUriClassifier()) { + return FlashClassification::Denied; + } + +- nsTArray results; +- rv = uriClassifier->ClassifyLocalWithTables(classificationURI, +- tables, +- results); ++ nsresult rv = aPrincipal->GetURI(getter_AddRefs(mClassificationURI)); ++ if (NS_FAILED(rv) || !mClassificationURI) { ++ return FlashClassification::Denied; ++ } ++ ++ rv = mUriClassifier->AsyncClassifyLocalWithTables(mClassificationURI, ++ tables, ++ this); ++ + if (NS_FAILED(rv)) { + if (rv == NS_ERROR_MALFORMED_URI) { + // This means that the URI had no hostname (ex: file://doc.html). In this +@@ -13623,24 +13961,7 @@ nsDocument::PrincipalFlashClassification() + } + } + +- if (results.IsEmpty()) { +- return FlashClassification::Unknown; +- } +- +- if (ArrayContainsTable(results, denyTables) && +- !ArrayContainsTable(results, denyExceptionsTables)) { +- return FlashClassification::Denied; +- } else if (ArrayContainsTable(results, allowTables) && +- !ArrayContainsTable(results, allowExceptionsTables)) { +- return FlashClassification::Allowed; +- } +- +- if (isThirdPartyDoc && ArrayContainsTable(results, subDocDenyTables) && +- !ArrayContainsTable(results, subDocDenyExceptionsTables)) { +- return FlashClassification::Denied; +- } +- +- return FlashClassification::Unknown; ++ return FlashClassification::Unclassified; + } + + FlashClassification +diff --git dom/base/nsDocument.h dom/base/nsDocument.h +index be3d59698b56..5a2938f353a3 100644 +--- dom/base/nsDocument.h ++++ dom/base/nsDocument.h +@@ -72,6 +72,7 @@ + #include "CustomElementRegistry.h" + #include "mozilla/dom/Performance.h" + #include "mozilla/Maybe.h" ++#include "nsIURIClassifier.h" + + #define XML_DECLARATION_BITS_DECLARATION_EXISTS (1 << 0) + #define XML_DECLARATION_BITS_ENCODING_EXISTS (1 << 1) +@@ -346,6 +347,9 @@ protected: + bool mHaveShutDown; + }; + ++// For classifying a flash document based on its principal. ++class PrincipalFlashClassifier; ++ + // Base class for our document implementations. + class nsDocument : public nsIDocument, + public nsIDOMDocument, +@@ -1184,6 +1188,7 @@ protected: + // non-null when this document is in fullscreen mode. + nsWeakPtr mFullscreenRoot; + ++ RefPtr mPrincipalFlashClassifier; + mozilla::dom::FlashClassification mFlashClassification; + // Do not use this value directly. Call the |IsThirdParty()| method, which + // caches its result here. +diff --git toolkit/components/url-classifier/nsUrlClassifierDBService.cpp toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +index 074bfc583b93..6476b8d546f3 100644 +--- toolkit/components/url-classifier/nsUrlClassifierDBService.cpp ++++ toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +@@ -1783,6 +1783,18 @@ nsUrlClassifierDBService::AsyncClassifyLocalWithTables(nsIURI *aURI, + MOZ_ASSERT(NS_IsMainThread(), "AsyncClassifyLocalWithTables must be called " + "on main thread"); + ++ // We do this check no matter what process we are in to return ++ // error as early as possible. ++ nsCOMPtr uri = NS_GetInnermostURI(aURI); ++ NS_ENSURE_TRUE(uri, NS_ERROR_FAILURE); ++ ++ nsAutoCString key; ++ // Canonicalize the url ++ nsCOMPtr utilsService = ++ do_GetService(NS_URLCLASSIFIERUTILS_CONTRACTID); ++ nsresult rv = utilsService->GetKeyForURI(uri, key); ++ NS_ENSURE_SUCCESS(rv, rv); ++ + if (XRE_IsContentProcess()) { + using namespace mozilla::dom; + using namespace mozilla::ipc; +@@ -1815,16 +1827,6 @@ nsUrlClassifierDBService::AsyncClassifyLocalWithTables(nsIURI *aURI, + using namespace mozilla::Telemetry; + auto startTime = TimeStamp::Now(); // For telemetry. + +- nsCOMPtr uri = NS_GetInnermostURI(aURI); +- NS_ENSURE_TRUE(uri, NS_ERROR_FAILURE); +- +- nsAutoCString key; +- // Canonicalize the url +- nsCOMPtr utilsService = +- do_GetService(NS_URLCLASSIFIERUTILS_CONTRACTID); +- nsresult rv = utilsService->GetKeyForURI(uri, key); +- NS_ENSURE_SUCCESS(rv, rv); +- + auto worker = mWorker; + nsCString tables(aTables); + Copied: branches/2018Q1/www/waterfox/files/patch-bug1363038 (from r462756, head/www/waterfox/files/patch-bug1363038) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1363038 Sat Feb 24 00:51:34 2018 (r462760, copy of r462756, head/www/waterfox/files/patch-bug1363038) @@ -0,0 +1,68 @@ +commit 9d1887c28c05 +Author: Thomas Nguyen +Date: Tue Aug 22 14:51:44 2017 +0800 + + Bug 1363038 - Remove synchronous dispatch when worker is racing against shutdown r=hchang + + MozReview-Commit-ID: JOkOukz1fov + + --HG-- + extra : rebase_source : 9e4204cebcd4615078019a51818250ff8125efe1 +--- + .../url-classifier/nsUrlClassifierDBService.cpp | 21 ++++++++------------- + .../url-classifier/nsUrlClassifierDBService.h | 3 +++ + 2 files changed, 11 insertions(+), 13 deletions(-) + +diff --git toolkit/components/url-classifier/nsUrlClassifierDBService.cpp toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +index 3f7e3c8daaac..074bfc583b93 100644 +--- toolkit/components/url-classifier/nsUrlClassifierDBService.cpp ++++ toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +@@ -1616,12 +1616,6 @@ nsUrlClassifierDBService::Init() + ReadTablesFromPrefs(); + nsresult rv; + +- { +- // Force PSM loading on main thread +- nsCOMPtr dummy = do_CreateInstance(NS_CRYPTO_HASH_CONTRACTID, &rv); +- NS_ENSURE_SUCCESS(rv, rv); +- } +- + { + // Force nsIUrlClassifierUtils loading on main thread. + nsCOMPtr dummy = +@@ -2278,13 +2272,14 @@ nsUrlClassifierDBService::Shutdown() + // is to avoid racing for Classifier::mUpdateThread + // between main thread and the worker thread. (Both threads + // would access Classifier::mUpdateThread.) +- using Worker = nsUrlClassifierDBServiceWorker; +- RefPtr r = NewRunnableMethod( +- "nsUrlClassifierDBServiceWorker::FlushAndDisableAsyncUpdate", +- mWorker, +- &Worker::FlushAndDisableAsyncUpdate); +- SyncRunnable::DispatchToThread(gDbBackgroundThread, r); +- ++ if (mWorker->IsDBOpened()) { ++ using Worker = nsUrlClassifierDBServiceWorker; ++ RefPtr r = NewRunnableMethod( ++ "nsUrlClassifierDBServiceWorker::FlushAndDisableAsyncUpdate", ++ mWorker, ++ &Worker::FlushAndDisableAsyncUpdate); ++ SyncRunnable::DispatchToThread(gDbBackgroundThread, r); ++ } + // At this point the update thread has been shut down and + // the worker thread should only have at most one event, + // which is the callback event. +diff --git toolkit/components/url-classifier/nsUrlClassifierDBService.h toolkit/components/url-classifier/nsUrlClassifierDBService.h +index 13987b0ed2ee..8d284f5b0842 100644 +--- toolkit/components/url-classifier/nsUrlClassifierDBService.h ++++ toolkit/components/url-classifier/nsUrlClassifierDBService.h +@@ -227,6 +227,9 @@ public: + // will be nulled out in NotifyUpdateObserver. + bool IsBusyUpdating() const { return !!mUpdateObserver; } + ++ // Check the DB ready state of the worker thread ++ bool IsDBOpened() const { return !!mClassifier; } ++ + // Delegate Classifier to disable async update. If there is an + // ongoing update on the update thread, we will be blocked until + // the background update is done and callback is fired. Copied: branches/2018Q1/www/waterfox/files/patch-bug1385609 (from r462756, head/www/waterfox/files/patch-bug1385609) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1385609 Sat Feb 24 00:51:34 2018 (r462760, copy of r462756, head/www/waterfox/files/patch-bug1385609) @@ -0,0 +1,102 @@ +commit dd42019824ed +Author: Thomas Nguyen +Date: Wed Aug 30 18:04:10 2017 +0800 + + Bug 1385609 - Fix backoff issue that makes SB lists no longer update r=francois + + The issue occurs when nsITimer is fired earlier than the backoff time. In that + case, the update doesn't proceed and we never make another attempt because the + backoff update timer was oneshot. + + We fix the issue in two ways: + + - Add a tolerance of 1 second in case the timer fires too early. + - Set another oneshot timer whenever we are prevented from updating due to + backoff. + + MozReview-Commit-ID: E2ogNRsHJVK + + --HG-- + extra : rebase_source : c81fa77934f6c39e1c5d07b19785a01546e02542 +--- + toolkit/components/url-classifier/nsUrlClassifierLib.js | 12 +++++++++--- + .../components/url-classifier/nsUrlClassifierListManager.js | 5 ++++- + toolkit/components/url-classifier/tests/unit/test_backoff.js | 2 +- + 3 files changed, 14 insertions(+), 5 deletions(-) + +diff --git toolkit/components/url-classifier/nsUrlClassifierLib.js toolkit/components/url-classifier/nsUrlClassifierLib.js +index e2457d85474c..38d1977e4641 100644 +--- toolkit/components/url-classifier/nsUrlClassifierLib.js ++++ toolkit/components/url-classifier/nsUrlClassifierLib.js +@@ -77,17 +77,20 @@ this.HTTP_TEMPORARY_REDIRECT = 307; + * @param timeoutIncrement Number time (ms) the starting timeout period + * we double this time for consecutive errors + * @param maxTimeout Number time (ms) maximum timeout period ++ * @param tolerance Checking next request tolerance. + */ + this.RequestBackoff = + function RequestBackoff(maxErrors, retryIncrement, + maxRequests, requestPeriod, +- timeoutIncrement, maxTimeout) { ++ timeoutIncrement, maxTimeout, ++ tolerance) { + this.MAX_ERRORS_ = maxErrors; + this.RETRY_INCREMENT_ = retryIncrement; + this.MAX_REQUESTS_ = maxRequests; + this.REQUEST_PERIOD_ = requestPeriod; + this.TIMEOUT_INCREMENT_ = timeoutIncrement; + this.MAX_TIMEOUT_ = maxTimeout; ++ this.TOLERANCE_ = tolerance; + + // Queue of ints keeping the time of all requests + this.requestTimes_ = []; +@@ -111,7 +114,9 @@ RequestBackoff.prototype.reset = function() { + */ + RequestBackoff.prototype.canMakeRequest = function() { + var now = Date.now(); +- if (now < this.nextRequestTime_) { ++ // Note that nsITimer delay is approximate: the timer can be fired before the ++ // requested time has elapsed. So, give it a tolerance ++ if (now + this.TOLERANCE_ < this.nextRequestTime_) { + return false; + } + +@@ -180,7 +185,8 @@ function RequestBackoffV4(maxRequests, requestPeriod) { + maxRequests /* num requests */, + requestPeriod /* request time, 60 min */, + backoffInterval /* backoff interval, 60 min */, +- 24 * 60 * 60 * 1000 /* max backoff, 24hr */); ++ 24 * 60 * 60 * 1000 /* max backoff, 24hr */, ++ 1000 /* tolerance of 1 sec */); + } + + // Expose this whole component. +diff --git toolkit/components/url-classifier/nsUrlClassifierListManager.js toolkit/components/url-classifier/nsUrlClassifierListManager.js +index 1e976b8597b7..5f10933163b6 100644 +--- toolkit/components/url-classifier/nsUrlClassifierListManager.js ++++ toolkit/components/url-classifier/nsUrlClassifierListManager.js +@@ -236,7 +236,10 @@ PROT_ListManager.prototype.setUpdateCheckTimer = function(updateUrl, + .createInstance(Ci.nsITimer); + this.updateCheckers_[updateUrl].initWithCallback(() => { + this.updateCheckers_[updateUrl] = null; +- this.checkForUpdates(updateUrl); ++ if (updateUrl && !this.checkForUpdates(updateUrl)) { ++ // Make another attempt later. ++ this.setUpdateCheckTimer(updateUrl, this.updateInterval); ++ } + }, delay, Ci.nsITimer.TYPE_ONE_SHOT); + } + /** +diff --git toolkit/components/url-classifier/tests/unit/test_backoff.js toolkit/components/url-classifier/tests/unit/test_backoff.js +index 365568c479e9..205507e83dd6 100644 +--- toolkit/components/url-classifier/tests/unit/test_backoff.js ++++ toolkit/components/url-classifier/tests/unit/test_backoff.js +@@ -11,7 +11,7 @@ function setNow(time) { + function run_test() { + // 3 errors, 1ms retry period, max 3 requests per ten milliseconds, + // 5ms backoff interval, 19ms max delay +- var rb = new jslib.RequestBackoff(3, 1, 3, 10, 5, 19); ++ var rb = new jslib.RequestBackoff(3, 1, 3, 10, 5, 19, 0); + setNow(1); + rb.noteServerResponse(200); + do_check_true(rb.canMakeRequest()); Copied: branches/2018Q1/www/waterfox/files/patch-bug1393235 (from r462756, head/www/waterfox/files/patch-bug1393235) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1393235 Sat Feb 24 00:51:34 2018 (r462760, copy of r462756, head/www/waterfox/files/patch-bug1393235) @@ -0,0 +1,88 @@ +commit 9398bd6f4378 +Author: Eric Rahm +Date: Tue Aug 22 19:30:46 2017 -0700 + + Bug 1393235 - Fix improper usages of string functions. r=njn + + This fixes usages of `Find`, `RFind` and the equality operator that kind of + work right now but will break with the proper type checking of a templatized + version of the string classes. + + For `Find` and `RFind` it appears that `nsCString::(R)Find("foo", 0)` calls + were being coerced to the `Find(char*, bool, int, int)` versions. The intent was + probably to just start searching from position zero. + + For the equality operator, the type of nullptr is nullptr_t rather than + char(16_t)* so we'd need to add an operator overload that takes nullptr_t. In + this case just using `IsVoid` is probably more appropriate. + + --HG-- + extra : rebase_source : 50f78519084012ca669da0a211c489520c11d6b6 +--- + docshell/base/nsDefaultURIFixup.cpp | 2 +- + dom/media/gmp/ChromiumCDMChild.cpp | 2 +- + toolkit/components/places/nsNavHistory.cpp | 2 +- + toolkit/components/url-classifier/Classifier.cpp | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git docshell/base/nsDefaultURIFixup.cpp docshell/base/nsDefaultURIFixup.cpp +index 77e008b15a17..a1a893b8efb2 100644 +--- docshell/base/nsDefaultURIFixup.cpp ++++ docshell/base/nsDefaultURIFixup.cpp +@@ -687,7 +687,7 @@ nsDefaultURIFixup::FixupURIProtocol(const nsACString& aURIString, + // no-scheme.com/query?foo=http://www.foo.com + // user:pass@no-scheme.com + // +- int32_t schemeDelim = uriString.Find("://", 0); ++ int32_t schemeDelim = uriString.Find("://"); + int32_t firstDelim = uriString.FindCharInSet("/:"); + if (schemeDelim <= 0 || + (firstDelim != -1 && schemeDelim > firstDelim)) { +diff --git dom/media/gmp/ChromiumCDMChild.cpp dom/media/gmp/ChromiumCDMChild.cpp +index e99f913622ab..8dc288b4c57e 100644 +--- dom/media/gmp/ChromiumCDMChild.cpp ++++ dom/media/gmp/ChromiumCDMChild.cpp +@@ -232,7 +232,7 @@ ChromiumCDMChild::OnResolveNewSessionPromiseInternal(uint32_t aPromiseId, + // a session it calls OnResolveNewSessionPromise with nullptr as the sessionId. + // We can safely assume this means that we have failed to load a session + // as the other methods specify calling 'OnRejectPromise' when they fail. +- bool loadSuccessful = aSessionId != nullptr; ++ bool loadSuccessful = !aSessionId.IsEmpty(); + GMP_LOG("ChromiumCDMChild::OnResolveNewSessionPromise(pid=%u, sid=%s) " + "resolving %s load session ", + aPromiseId, +diff --git toolkit/components/places/nsNavHistory.cpp toolkit/components/places/nsNavHistory.cpp +index 4e52752529fa..0b01d904b2f7 100644 +--- toolkit/components/places/nsNavHistory.cpp ++++ toolkit/components/places/nsNavHistory.cpp +@@ -1939,7 +1939,7 @@ PlacesSQLQueryBuilder::Where() + + // If we used WHERE already, we inject the conditions + // in place of {ADDITIONAL_CONDITIONS} +- if (mQueryString.Find("{ADDITIONAL_CONDITIONS}", 0) != kNotFound) { ++ if (mQueryString.Find("{ADDITIONAL_CONDITIONS}") != kNotFound) { + nsAutoCString innerCondition; + // If we have condition AND it + if (!mConditions.IsEmpty()) { +diff --git toolkit/components/url-classifier/Classifier.cpp toolkit/components/url-classifier/Classifier.cpp +index 500780150a91..68169925d2d0 100644 +--- toolkit/components/url-classifier/Classifier.cpp ++++ toolkit/components/url-classifier/Classifier.cpp +@@ -992,7 +992,7 @@ Classifier::ScanStoreDir(nsIFile* aDirectory, nsTArray& aTables) + // Both v2 and v4 contain .pset file + nsCString suffix(NS_LITERAL_CSTRING(".pset")); + +- int32_t dot = leafName.RFind(suffix, 0); ++ int32_t dot = leafName.RFind(suffix); + if (dot != -1) { + leafName.Cut(dot, suffix.Length()); + aTables.AppendElement(leafName); +@@ -1582,7 +1582,7 @@ Classifier::LoadMetadata(nsIFile* aDirectory, nsACString& aResult) + rv = file->GetNativeLeafName(tableName); + NS_ENSURE_SUCCESS(rv, rv); + +- int32_t dot = tableName.RFind(METADATA_SUFFIX, 0); ++ int32_t dot = tableName.RFind(METADATA_SUFFIX); + if (dot == -1) { + continue; + } Copied: branches/2018Q1/www/waterfox/files/patch-bug1394601 (from r462756, head/www/waterfox/files/patch-bug1394601) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1394601 Sat Feb 24 00:51:34 2018 (r462760, copy of r462756, head/www/waterfox/files/patch-bug1394601) @@ -0,0 +1,26 @@ +commit 99cb2b5a1879 +Author: Francois Marier +Date: Mon Aug 28 17:06:00 2017 -0700 + + Bug 1394601 - Log an error when the Google API key is missing during Safe Browsing initialization. r=gcp + + MozReview-Commit-ID: DNwa9lR0J6K + + --HG-- + extra : rebase_source : 0a547c0cf88e1ed09268cbb810abaaca09e98531 +--- + toolkit/components/url-classifier/SafeBrowsing.jsm | 1 + + 1 file changed, 1 insertion(+) + +diff --git toolkit/components/url-classifier/SafeBrowsing.jsm toolkit/components/url-classifier/SafeBrowsing.jsm +index 051432393539..32cab18c187f 100644 +--- toolkit/components/url-classifier/SafeBrowsing.jsm ++++ toolkit/components/url-classifier/SafeBrowsing.jsm +@@ -343,6 +343,7 @@ this.SafeBrowsing = { + let googleKey = Services.urlFormatter.formatURL("%GOOGLE_API_KEY%").trim(); + if ((provider == "google" || provider == "google4") && + (!googleKey || googleKey == "no-google-api-key")) { ++ log("Missing Google API key, clearing updateURL and gethashURL."); + updateURL= ""; + gethashURL= ""; + } Copied: branches/2018Q1/www/waterfox/files/patch-bug1426869 (from r462756, head/www/waterfox/files/patch-bug1426869) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1426869 Sat Feb 24 00:51:34 2018 (r462760, copy of r462756, head/www/waterfox/files/patch-bug1426869) @@ -0,0 +1,25 @@ +commit 65d845f891a3 +Author: Jet Villegas +Date: Tue Jan 9 08:00:00 2018 +0200 + + Bug 1426869 - td.contenteditable=true focus breaks text selection. r=masayuki, a=RyanVM + + --HG-- + extra : source : b3118b4fae1372c3aa57caf4b16af9834ce46539 + extra : amend_source : 1187aa7d3d760aa60b974b874968aea4d0e09eea +--- + layout/generic/nsFrameSelection.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git layout/generic/nsFrameSelection.cpp layout/generic/nsFrameSelection.cpp +index c483622e1ffb..a60d69bf79e0 100644 +--- layout/generic/nsFrameSelection.cpp ++++ layout/generic/nsFrameSelection.cpp +@@ -1403,6 +1403,7 @@ nsFrameSelection::TakeFocus(nsIContent* aNewFocus, + + NS_ENSURE_STATE(mShell); + bool editableCell = false; ++ mCellParent = nullptr; + RefPtr context = mShell->GetPresContext(); + if (context) { + RefPtr htmlEditor = nsContentUtils::GetHTMLEditor(context); Copied: branches/2018Q1/www/waterfox/files/patch-bug1427118 (from r462756, head/www/waterfox/files/patch-bug1427118) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Sat Feb 24 00:52:22 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27570F03F39; Sat, 24 Feb 2018 00:52:22 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C9D0782E53; Sat, 24 Feb 2018 00:52:21 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C49D81E106; Sat, 24 Feb 2018 00:52:21 +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 w1O0qLe3085569; Sat, 24 Feb 2018 00:52:21 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1O0qLAi085566; Sat, 24 Feb 2018 00:52:21 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802240052.w1O0qLAi085566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 24 Feb 2018 00:52:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462761 - in branches/2018Q1/emulators/rpcs3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/emulators/rpcs3: . files X-SVN-Commit-Revision: 462761 X-SVN-Commit-Repository: ports 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.25 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: Sat, 24 Feb 2018 00:52:22 -0000 Author: jbeich Date: Sat Feb 24 00:52:21 2018 New Revision: 462761 URL: https://svnweb.freebsd.org/changeset/ports/462761 Log: MFH: r462757 emulators/rpcs3: update to 0.0.4.382 Changes: https://github.com/RPCS3/rpcs3/compare/cf1c45dfe...ede76033a Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q1/emulators/rpcs3/Makefile branches/2018Q1/emulators/rpcs3/distinfo branches/2018Q1/emulators/rpcs3/files/patch-qt57 Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q1/emulators/rpcs3/Makefile Sat Feb 24 00:51:34 2018 (r462760) +++ branches/2018Q1/emulators/rpcs3/Makefile Sat Feb 24 00:52:21 2018 (r462761) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-379 -DISTVERSIONSUFFIX= -gcf1c45dfe +DISTVERSION= 0.0.4-382 +DISTVERSIONSUFFIX= -gede76033a CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Sat Feb 24 00:51:34 2018 (r462760) +++ branches/2018Q1/emulators/rpcs3/distinfo Sat Feb 24 00:52:21 2018 (r462761) @@ -1,6 +1,6 @@ -TIMESTAMP = 1519244294 -SHA256 (RPCS3-rpcs3-v0.0.4-379-gcf1c45dfe_GH0.tar.gz) = f6631d7b614368a43d4cfcdcecb744c149eb66fc2cba740aa1f6ac9ff25b652d -SIZE (RPCS3-rpcs3-v0.0.4-379-gcf1c45dfe_GH0.tar.gz) = 3859027 +TIMESTAMP = 1519425523 +SHA256 (RPCS3-rpcs3-v0.0.4-382-gede76033a_GH0.tar.gz) = 2a74415e5721cc0d961c22d52108ac2c9a8c010d4d679a5ba59a6d224c47663a +SIZE (RPCS3-rpcs3-v0.0.4-382-gede76033a_GH0.tar.gz) = 3860559 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841 Modified: branches/2018Q1/emulators/rpcs3/files/patch-qt57 ============================================================================== --- branches/2018Q1/emulators/rpcs3/files/patch-qt57 Sat Feb 24 00:51:34 2018 (r462760) +++ branches/2018Q1/emulators/rpcs3/files/patch-qt57 Sat Feb 24 00:52:21 2018 (r462761) @@ -1,5 +1,22 @@ Revert https://github.com/RPCS3/rpcs3/commit/cf1c45dfe86e for Qt 5.7 compatibility +--- rpcs3/CMakeLists.txt.orig 2018-02-23 22:38:43 UTC ++++ rpcs3/CMakeLists.txt +@@ -6,12 +6,12 @@ set(CMAKE_CXX_STANDARD 14) + include(CheckCXXCompilerFlag) + + # Qt section +-find_package(Qt5 5.10 COMPONENTS Widgets Network) ++find_package(Qt5 5.7 COMPONENTS Widgets Network) + if(WIN32) + find_package(Qt5 5.10 COMPONENTS WinExtras REQUIRED) + set(RPCS3_QT_LIBS Qt5::Widgets Qt5::WinExtras Qt5::Network) + else() +- find_package(Qt5 5.10 COMPONENTS DBus Gui) ++ find_package(Qt5 5.7 COMPONENTS DBus Gui) + if(Qt5DBus_FOUND) + set(RPCS3_QT_LIBS Qt5::Widgets Qt5::DBus Qt5::Network) + add_definitions(-DHAVE_QTDBUS) --- rpcs3/main.cpp.orig 2018-02-21 20:18:14 UTC +++ rpcs3/main.cpp @@ -86,7 +86,6 @@ int main(int argc, char** argv) From owner-svn-ports-branches@freebsd.org Sat Feb 24 00:53:38 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5CB24F04080; Sat, 24 Feb 2018 00:53:38 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B63482FB6; Sat, 24 Feb 2018 00:53:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 064771E115; Sat, 24 Feb 2018 00:53:38 +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 w1O0rbTw086522; Sat, 24 Feb 2018 00:53:37 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1O0rbPL086520; Sat, 24 Feb 2018 00:53:37 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802240053.w1O0rbPL086520@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 24 Feb 2018 00:53:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462762 - branches/2018Q1/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/emulators/citra X-SVN-Commit-Revision: 462762 X-SVN-Commit-Repository: ports 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.25 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: Sat, 24 Feb 2018 00:53:38 -0000 Author: jbeich Date: Sat Feb 24 00:53:37 2018 New Revision: 462762 URL: https://svnweb.freebsd.org/changeset/ports/462762 Log: MFH: r462758 emulators/citra: update to s20180222 Changes: https://github.com/citra-emu/citra/compare/20f6cb1a...e51a642a Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q1/emulators/citra/Makefile branches/2018Q1/emulators/citra/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/citra/Makefile ============================================================================== --- branches/2018Q1/emulators/citra/Makefile Sat Feb 24 00:52:21 2018 (r462761) +++ branches/2018Q1/emulators/citra/Makefile Sat Feb 24 00:53:37 2018 (r462762) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180219 +PORTVERSION= s20180222 PORTREVISION?= 0 CATEGORIES= emulators @@ -26,7 +26,7 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dy USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 20f6cb1a +GH_TAGNAME= e51a642a GH_TUPLE= citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \ benhoyt:inih:r40:inih/externals/inih/inih \ Modified: branches/2018Q1/emulators/citra/distinfo ============================================================================== --- branches/2018Q1/emulators/citra/distinfo Sat Feb 24 00:52:21 2018 (r462761) +++ branches/2018Q1/emulators/citra/distinfo Sat Feb 24 00:53:37 2018 (r462762) @@ -1,6 +1,6 @@ -TIMESTAMP = 1519056517 -SHA256 (citra-emu-citra-s20180219-20f6cb1a_GH0.tar.gz) = 34f363b3a610e9f8650e4e2d51b7fb2918e27512684fb4490ee0bcec8211f730 -SIZE (citra-emu-citra-s20180219-20f6cb1a_GH0.tar.gz) = 1675516 +TIMESTAMP = 1519335714 +SHA256 (citra-emu-citra-s20180222-e51a642a_GH0.tar.gz) = 3a76840f9411ecf3205e5c8542164e5279da8ee7169c114999da293fab7f60b8 +SIZE (citra-emu-citra-s20180222-e51a642a_GH0.tar.gz) = 1677211 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7 SIZE (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = 59366 SHA256 (MerryMage-dynarmic-d1d4705_GH0.tar.gz) = cf120bc77912cf58e0965db2abcb2067c36aca612c42459e0eb72b740ea6cb0e From owner-svn-ports-branches@freebsd.org Sat Feb 24 08:57:21 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0CB5F24943; Sat, 24 Feb 2018 08:57:21 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4500B76409; Sat, 24 Feb 2018 08:57:21 +0000 (UTC) (envelope-from riggs@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F3CE2350D; Sat, 24 Feb 2018 08:57:21 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1O8vL47027665; Sat, 24 Feb 2018 08:57:21 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1O8vLuj027663; Sat, 24 Feb 2018 08:57:21 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201802240857.w1O8vLuj027663@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 24 Feb 2018 08:57:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462777 - in branches/2018Q1/devel/cvs: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2018Q1/devel/cvs: . files X-SVN-Commit-Revision: 462777 X-SVN-Commit-Repository: ports 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.25 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: Sat, 24 Feb 2018 08:57:22 -0000 Author: riggs Date: Sat Feb 24 08:57:20 2018 New Revision: 462777 URL: https://svnweb.freebsd.org/changeset/ports/462777 Log: MFH: r462776 Fix ssh injection vulnerability from CVE-2017-12836 Details: - Adopt patch from debian, documented in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=871810#10 PR: 226088 Submitted by: fk@fabiankeil.de Security: CVE-2017-12836 Approved by: ports-secteam (riggs) Added: branches/2018Q1/devel/cvs/files/patch-src-client.c - copied unchanged from r462776, head/devel/cvs/files/patch-src-client.c Modified: branches/2018Q1/devel/cvs/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/devel/cvs/Makefile ============================================================================== --- branches/2018Q1/devel/cvs/Makefile Sat Feb 24 08:54:57 2018 (r462776) +++ branches/2018Q1/devel/cvs/Makefile Sat Feb 24 08:57:20 2018 (r462777) @@ -2,7 +2,7 @@ PORTNAME= cvs PORTVERSION= 1.20120905 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= devel MASTER_SITES= LOCAL/eadler Copied: branches/2018Q1/devel/cvs/files/patch-src-client.c (from r462776, head/devel/cvs/files/patch-src-client.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/devel/cvs/files/patch-src-client.c Sat Feb 24 08:57:20 2018 (r462777, copy of r462776, head/devel/cvs/files/patch-src-client.c) @@ -0,0 +1,55 @@ +From 9c448da8bb5f592ddcd2d980d01d81305f920f78 Mon Sep 17 00:00:00 2001 +From: Fabian Keil +Date: Mon, 21 Aug 2017 10:49:05 +0200 +Subject: [PATCH] Add fix for CVE-2017-12836 + +Based on a patch by Thorsten Glaser: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=871810#10 + +The patched file had to be changed and in the first +chunk the size of rsh_argv has been extended to 16 +to match Debian's upstream version. +--- + cvs/src/client.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git cvs/src/client.c cvs/src/client.c +index c9fe170..09771ce 100644 +--- src/client.c ++++ src/client.c +@@ -4736,9 +4736,10 @@ start_rsh_server (root, to_server, from_server) + char *cvs_rsh; + char *cvs_server = getenv ("CVS_SERVER"); + int i = 0; +- /* This needs to fit "rsh", "-b", "-l", "USER", "host", +- "cmd (w/ args)", and NULL. We leave some room to grow. */ +- char *rsh_argv[10]; ++ /* This needs to fit "rsh", "-b", "-l", "USER", "-p", port, ++ "--", "host", "cvs", "-R", "server", and NULL. ++ We leave some room to grow. */ ++ char *rsh_argv[16]; + + if (root->method == extssh_method) + cvs_rsh = env_cvs_ssh ? env_cvs_ssh : SSH_DFLT; +@@ -4763,6 +4764,9 @@ start_rsh_server (root, to_server, from_server) + rsh_argv[i++] = root->username; + } + ++ /* Only non-option arguments from here. (CVE-2017-12836) */ ++ rsh_argv[i++] = "--"; ++ + rsh_argv[i++] = root->hostname; + rsh_argv[i++] = cvs_server; + rsh_argv[i++] = "server"; +@@ -4841,6 +4845,8 @@ start_rsh_server (root, to_server, from_server) + *p++ = root->username; + } + ++ *p++ = "--"; ++ + *p++ = root->hostname; + *p++ = command; + *p++ = NULL; +-- +2.14.1 + From owner-svn-ports-branches@freebsd.org Sat Feb 24 13:13:51 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67F31F10594; Sat, 24 Feb 2018 13:13:51 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1688E818E8; Sat, 24 Feb 2018 13:13:51 +0000 (UTC) (envelope-from brnrd@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 114062602D; Sat, 24 Feb 2018 13:13:51 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1ODDomC058537; Sat, 24 Feb 2018 13:13:50 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1ODDoqg058536; Sat, 24 Feb 2018 13:13:50 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201802241313.w1ODDoqg058536@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 24 Feb 2018 13:13:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462803 - branches/2018Q1/databases/mariadb100-server X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: branches/2018Q1/databases/mariadb100-server X-SVN-Commit-Revision: 462803 X-SVN-Commit-Repository: ports 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.25 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: Sat, 24 Feb 2018 13:13:51 -0000 Author: brnrd Date: Sat Feb 24 13:13:50 2018 New Revision: 462803 URL: https://svnweb.freebsd.org/changeset/ports/462803 Log: MFH: r462802 databases/mariadb100-server: Fix build with OQGRAPH disabled - The cmake knob works OK Approved by: ports-secteam (fixit blanket) Modified: branches/2018Q1/databases/mariadb100-server/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/mariadb100-server/Makefile ============================================================================== --- branches/2018Q1/databases/mariadb100-server/Makefile Sat Feb 24 13:12:17 2018 (r462802) +++ branches/2018Q1/databases/mariadb100-server/Makefile Sat Feb 24 13:13:50 2018 (r462803) @@ -155,9 +155,6 @@ NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit p USE_GCC= yes .endif -post-extract-OQGRAPH-off: - @${RM} -r ${WRKSRC}/storage/oqgraph - post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c