From owner-svn-ports-branches@freebsd.org Sun Apr 1 00:01:32 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 BA9B8F687D1; Sun, 1 Apr 2018 00:01: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 6C30A7DA8C; Sun, 1 Apr 2018 00:01:31 +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 656291EE7E; Sun, 1 Apr 2018 00:01:31 +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 w3101VOn012920; Sun, 1 Apr 2018 00:01:31 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3101Vh1012918; Sun, 1 Apr 2018 00:01:31 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804010001.w3101Vh1012918@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 1 Apr 2018 00:01:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466107 - in branches/2018Q1/mail/thunderbird: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/mail/thunderbird: . files X-SVN-Commit-Revision: 466107 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, 01 Apr 2018 00:01:32 -0000 Author: jbeich Date: Sun Apr 1 00:01:30 2018 New Revision: 466107 URL: https://svnweb.freebsd.org/changeset/ports/466107 Log: MFH: r466104 mail/thunderbird: apply CVE-2018-5148 fix Approved by: ports-secteam blanket Added: branches/2018Q1/mail/thunderbird/files/patch-bug1440717 - copied unchanged from r466104, head/mail/thunderbird/files/patch-bug1440717 Modified: branches/2018Q1/mail/thunderbird/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/mail/thunderbird/Makefile ============================================================================== --- branches/2018Q1/mail/thunderbird/Makefile Sun Apr 1 00:00:24 2018 (r466106) +++ branches/2018Q1/mail/thunderbird/Makefile Sun Apr 1 00:01:30 2018 (r466107) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 52.7.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Copied: branches/2018Q1/mail/thunderbird/files/patch-bug1440717 (from r466104, head/mail/thunderbird/files/patch-bug1440717) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/mail/thunderbird/files/patch-bug1440717 Sun Apr 1 00:01:30 2018 (r466107, copy of r466104, head/mail/thunderbird/files/patch-bug1440717) @@ -0,0 +1,40 @@ +commit ae9da5994b51 +Author: Nicolas Silva +Date: Mon Mar 12 13:36:00 2018 +0100 + + Bug 1440717 - Use RefPtr for CompositingRenderTargetOGL::mGL. r=Bas, a=ritu + + --HG-- + extra : source : b6d2d55223d2aa5cb85bbdf33075d1d38f2a9a30 + extra : intermediate-source : 0ec90964e0bc479412a4da8a61d48b665211736e +--- + gfx/layers/opengl/CompositingRenderTargetOGL.cpp | 2 +- + gfx/layers/opengl/CompositingRenderTargetOGL.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp +index c05b8edfd346..a1521c56da87 100644 +--- mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp ++++ mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp +@@ -60,7 +60,7 @@ CompositingRenderTargetOGL::BindRenderTarget() + msg.AppendPrintf("Framebuffer not complete -- CheckFramebufferStatus returned 0x%x, " + "GLContext=%p, IsOffscreen()=%d, mFBO=%d, aFBOTextureTarget=0x%x, " + "aRect.width=%d, aRect.height=%d", +- result, mGL, mGL->IsOffscreen(), mFBO, mInitParams.mFBOTextureTarget, ++ result, mGL.get(), mGL->IsOffscreen(), mFBO, mInitParams.mFBOTextureTarget, + mInitParams.mSize.width, mInitParams.mSize.height); + NS_WARNING(msg.get()); + } +diff --git mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h +index 501701d6f1a3..071dc5cac1c2 100644 +--- mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h ++++ mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h +@@ -184,7 +184,7 @@ private: + * the target is always cleared at the end of a frame. + */ + RefPtr mCompositor; +- GLContext* mGL; ++ RefPtr mGL; + GLuint mTextureHandle; + GLuint mFBO; + }; From owner-svn-ports-branches@freebsd.org Sun Apr 1 07:44:44 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 D1201F6B37E; Sun, 1 Apr 2018 07:44:44 +0000 (UTC) (envelope-from mat@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 83E007B578; Sun, 1 Apr 2018 07:44:44 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60A3123EB1; Sun, 1 Apr 2018 07:44:44 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w317iimi055851; Sun, 1 Apr 2018 07:44:44 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w317iihP055850; Sun, 1 Apr 2018 07:44:44 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201804010744.w317iihP055850@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Sun, 1 Apr 2018 07:44:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466125 - branches/2018Q2 X-SVN-Group: ports-branches X-SVN-Commit-Author: mat X-SVN-Commit-Paths: branches/2018Q2 X-SVN-Commit-Revision: 466125 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, 01 Apr 2018 07:44:45 -0000 Author: mat Date: Sun Apr 1 07:44:44 2018 New Revision: 466125 URL: https://svnweb.freebsd.org/changeset/ports/466125 Log: Branch 2018Q2 Added: branches/2018Q2/ - copied from r466124, head/ From owner-svn-ports-branches@freebsd.org Sun Apr 1 08:55: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 5FA90F7411F; Sun, 1 Apr 2018 08:55:39 +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 057167E413; Sun, 1 Apr 2018 08:55:39 +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 EEC5624A40; Sun, 1 Apr 2018 08:55:38 +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 w318tcsX091988; Sun, 1 Apr 2018 08:55:38 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w318tc1f091987; Sun, 1 Apr 2018 08:55:38 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201804010855.w318tc1f091987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 1 Apr 2018 08:55:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466127 - branches/2018Q2/editors/editorconfig-core-c X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: branches/2018Q2/editors/editorconfig-core-c X-SVN-Commit-Revision: 466127 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, 01 Apr 2018 08:55:39 -0000 Author: antoine Date: Sun Apr 1 08:55:38 2018 New Revision: 466127 URL: https://svnweb.freebsd.org/changeset/ports/466127 Log: MFH: r466126 Mark BROKEN: fails to package pkg-static: Unable to access file /wrkdirs/usr/ports/editors/editorconfig-core-c/work/stage/usr/local/man/man1/editorconfig.1.gz:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/editors/editorconfig-core-c/work/stage/usr/local/man/man3/editorconfig.h.3.gz:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/editors/editorconfig-core-c/work/stage/usr/local/man/man3/editorconfig_handle.h.3.gz:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/editors/editorconfig-core-c/work/stage/usr/local/man/man5/editorconfig-format.5.gz:No such file or directory Reported by: pkg-fallout Modified: branches/2018Q2/editors/editorconfig-core-c/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/editors/editorconfig-core-c/Makefile ============================================================================== --- branches/2018Q2/editors/editorconfig-core-c/Makefile Sun Apr 1 08:54:23 2018 (r466126) +++ branches/2018Q2/editors/editorconfig-core-c/Makefile Sun Apr 1 08:55:38 2018 (r466127) @@ -9,6 +9,8 @@ CATEGORIES= editors MAINTAINER= knu@FreeBSD.org COMMENT= EditorConfig core library and executable written in C +BROKEN= fails to package + LIB_DEPENDS= libpcre.so:devel/pcre USES= cmake From owner-svn-ports-branches@freebsd.org Sun Apr 1 15:38: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 E0687F58B1A; Sun, 1 Apr 2018 15:38:49 +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 77FF271758; Sun, 1 Apr 2018 15:38:49 +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 4C535BEA; Sun, 1 Apr 2018 15:38:49 +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 w31Fcmnt002768; Sun, 1 Apr 2018 15:38:48 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w31FcmT1002766; Sun, 1 Apr 2018 15:38:48 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201804011538.w31FcmT1002766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 1 Apr 2018 15:38:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466168 - in branches/2018Q2/cad/calculix: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2018Q2/cad/calculix: . files X-SVN-Commit-Revision: 466168 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, 01 Apr 2018 15:38:50 -0000 Author: riggs Date: Sun Apr 1 15:38:48 2018 New Revision: 466168 URL: https://svnweb.freebsd.org/changeset/ports/466168 Log: MFH: r466167 Fix build with clang 6.x, pet portlint PR: 227148 Submitted by: pfg (maintainer) Approved by: ports-secteam (riggs) Added: branches/2018Q2/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp - copied unchanged from r466167, head/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp Modified: branches/2018Q2/cad/calculix/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/cad/calculix/Makefile ============================================================================== --- branches/2018Q2/cad/calculix/Makefile Sun Apr 1 15:36:23 2018 (r466167) +++ branches/2018Q2/cad/calculix/Makefile Sun Apr 1 15:38:48 2018 (r466168) @@ -15,9 +15,9 @@ COMMENT= Three-Dimensional Structural Finite Element P LICENSE= GPLv2 -RUN_DEPENDS= ccx:cad/calculix-ccx - BROKEN_FreeBSD_10= Does not build with clang on FreeBSD 10, causes segfaults when built with gcc + +RUN_DEPENDS= ccx:cad/calculix-ccx DIST_SOURCES= cgx_${PORTVERSION}.all${EXTRACT_SUFX} DIST_HTM= cgx_${PORTVERSION}.htm${EXTRACT_SUFX} Copied: branches/2018Q2/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp (from r466167, head/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp Sun Apr 1 15:38:48 2018 (r466168, copy of r466167, head/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp) @@ -0,0 +1,20 @@ +--- cgx_2.13/src/uselibSNL.cpp.orig 2017-10-07 09:58:00 UTC ++++ cgx_2.13/src/uselibSNL.cpp +@@ -934,7 +934,7 @@ int createBlendedNurbs(int nr, Points ** + // (5) create the cgx nurbs + // printf(" create blended nurbs\n"); + buffer[0]='S'; +- buffer[1]=(char)NULL; ++ buffer[1]='\0'; + getNewName( name, buffer ); + for (i=0; inurs+1, name); +@@ -1012,7 +1012,7 @@ int createBlendedNurbs(int nr, Points ** + for (j=0; jcontrolPoints()[ index ].x(), surface->controlPoints()[ index ].y(), surface->controlPoints()[ index ].z(), 0); + point=*pntpntr; /* update pointer */ From owner-svn-ports-branches@freebsd.org Sun Apr 1 23:53:09 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 26F8BF8458C; Sun, 1 Apr 2018 23:53:09 +0000 (UTC) (envelope-from cpm@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 BEBF283CBC; Sun, 1 Apr 2018 23:53:08 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B40A76148; Sun, 1 Apr 2018 23:53:08 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w31Nr8X2053935; Sun, 1 Apr 2018 23:53:08 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w31Nr8eg053932; Sun, 1 Apr 2018 23:53:08 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201804012353.w31Nr8eg053932@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Sun, 1 Apr 2018 23:53:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466189 - in branches/2018Q2/dns/dnsdist: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: in branches/2018Q2/dns/dnsdist: . files X-SVN-Commit-Revision: 466189 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, 01 Apr 2018 23:53:09 -0000 Author: cpm Date: Sun Apr 1 23:53:08 2018 New Revision: 466189 URL: https://svnweb.freebsd.org/changeset/ports/466189 Log: MFH: r466147 dns/dnsdist: Update to 1.3.0 (bugfix) Changes: https://dnsdist.org/changelog.html#change-1.3.0 Approved by: ports-secteam (riggs) Modified: branches/2018Q2/dns/dnsdist/Makefile branches/2018Q2/dns/dnsdist/distinfo branches/2018Q2/dns/dnsdist/files/dnsdist.conf.sample Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/dns/dnsdist/Makefile ============================================================================== --- branches/2018Q2/dns/dnsdist/Makefile Sun Apr 1 22:38:06 2018 (r466188) +++ branches/2018Q2/dns/dnsdist/Makefile Sun Apr 1 23:53:08 2018 (r466189) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dnsdist -DISTVERSION= 1.2.1 +DISTVERSION= 1.3.0 CATEGORIES= dns net MASTER_SITES= https://downloads.powerdns.com/releases/ \ LOCAL/cpm Modified: branches/2018Q2/dns/dnsdist/distinfo ============================================================================== --- branches/2018Q2/dns/dnsdist/distinfo Sun Apr 1 22:38:06 2018 (r466188) +++ branches/2018Q2/dns/dnsdist/distinfo Sun Apr 1 23:53:08 2018 (r466189) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518870121 -SHA256 (dnsdist-1.2.1.tar.bz2) = dc71baebc1fe024035dd3fdc7b08a0ad5aa834bc9438f3152adeb881d2323012 -SIZE (dnsdist-1.2.1.tar.bz2) = 866549 +TIMESTAMP = 1522585108 +SHA256 (dnsdist-1.3.0.tar.bz2) = aa67cd4db8404a13ed4ed1097dd850203dab8a327372f72bb140df11ef7eba08 +SIZE (dnsdist-1.3.0.tar.bz2) = 924183 Modified: branches/2018Q2/dns/dnsdist/files/dnsdist.conf.sample ============================================================================== --- branches/2018Q2/dns/dnsdist/files/dnsdist.conf.sample Sun Apr 1 22:38:06 2018 (r466188) +++ branches/2018Q2/dns/dnsdist/files/dnsdist.conf.sample Sun Apr 1 23:53:08 2018 (r466189) @@ -1,6 +1,6 @@ -newServer {address="2001:4860:4860::8888", qps=1} -newServer {address="2001:4860:4860::8844", qps=1} -newServer {address="2620:0:ccc::2", qps=10} -newServer {address="2620:0:ccd::2", qps=10} +newServer ({address="2001:4860:4860::8888", qps=1}) +newServer ({address="2001:4860:4860::8844", qps=1}) +newServer ({address="2620:0:ccc::2", qps=10}) +newServer ({address="2620:0:ccd::2", name="dns1", qps=10}) newServer("192.168.1.2") setServerPolicy(firstAvailable) -- first server within its QPS limit From owner-svn-ports-branches@freebsd.org Sun Apr 1 23:54: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 31A47F84658; Sun, 1 Apr 2018 23:54:22 +0000 (UTC) (envelope-from cpm@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 D3C5883DC4; Sun, 1 Apr 2018 23:54:21 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE9E46149; Sun, 1 Apr 2018 23:54:21 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w31NsLfS054162; Sun, 1 Apr 2018 23:54:21 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w31NsLVE054159; Sun, 1 Apr 2018 23:54:21 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201804012354.w31NsLVE054159@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Sun, 1 Apr 2018 23:54:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466190 - in branches/2018Q2/dns/dnsdist: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: in branches/2018Q2/dns/dnsdist: . files X-SVN-Commit-Revision: 466190 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, 01 Apr 2018 23:54:22 -0000 Author: cpm Date: Sun Apr 1 23:54:21 2018 New Revision: 466190 URL: https://svnweb.freebsd.org/changeset/ports/466190 Log: MFH: r466149 dns/dnsdist: Update dnsdist.in - Remove -d arg in dnsdist.in as it now uses daemon(8) - Bump PORTREVISION Reported by: krion Approved by: ports-secteam (riggs) Modified: branches/2018Q2/dns/dnsdist/Makefile branches/2018Q2/dns/dnsdist/files/dnsdist.in Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/dns/dnsdist/Makefile ============================================================================== --- branches/2018Q2/dns/dnsdist/Makefile Sun Apr 1 23:53:08 2018 (r466189) +++ branches/2018Q2/dns/dnsdist/Makefile Sun Apr 1 23:54:21 2018 (r466190) @@ -3,6 +3,7 @@ PORTNAME= dnsdist DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= dns net MASTER_SITES= https://downloads.powerdns.com/releases/ \ LOCAL/cpm Modified: branches/2018Q2/dns/dnsdist/files/dnsdist.in ============================================================================== --- branches/2018Q2/dns/dnsdist/files/dnsdist.in Sun Apr 1 23:53:08 2018 (r466189) +++ branches/2018Q2/dns/dnsdist/files/dnsdist.in Sun Apr 1 23:54:21 2018 (r466190) @@ -23,6 +23,6 @@ load_rc_config ${name} : ${dnsdist_enable:=NO} command=/usr/local/sbin/${name} -command_args="-u ${dnsdist_priv_user} -g ${dnsdist_priv_group} -d" +command_args="-u ${dnsdist_priv_user} -g ${dnsdist_priv_group}" run_rc_command "$1" From owner-svn-ports-branches@freebsd.org Sun Apr 1 23:55: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 8E067F8476D; Sun, 1 Apr 2018 23:55:26 +0000 (UTC) (envelope-from cpm@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 40A4983EDD; Sun, 1 Apr 2018 23:55:26 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B3BA614A; Sun, 1 Apr 2018 23:55:26 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w31NtQsp054430; Sun, 1 Apr 2018 23:55:26 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w31NtPLC054427; Sun, 1 Apr 2018 23:55:25 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201804012355.w31NtPLC054427@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Sun, 1 Apr 2018 23:55:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466191 - in branches/2018Q2/dns/dnsdist: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: in branches/2018Q2/dns/dnsdist: . files X-SVN-Commit-Revision: 466191 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, 01 Apr 2018 23:55:26 -0000 Author: cpm Date: Sun Apr 1 23:55:25 2018 New Revision: 466191 URL: https://svnweb.freebsd.org/changeset/ports/466191 Log: MFH: r466166 dns/dnsdist: fix rc.d script, add support for LuaJIT and enable some new features - Really fix the rc.d script to start using daemon(8) and add the --supervised commandline argument (which suppresses opening up the console) - Enable DNS-over-TLS (upstream suggests enabling both GnuTLS and OpenSSL backends so you can switch in case of a serious security issue in .ie OpenSSL) - Add OpenSSL support (enabled by default) - Add GnuTLS support (enabled by default) - Add dnstap support (disabled by default) - Add SNMP support (disabled by default) - Add support for LuaJIT or whatever you set as your default version in make.conf (disabled by default) - Bump PORTREVISION PR: 227175 Submitted by: Ralf van der Enden Approved by: ports-secteam (riggs) Added: branches/2018Q2/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp - copied unchanged from r466166, head/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp Modified: branches/2018Q2/dns/dnsdist/Makefile branches/2018Q2/dns/dnsdist/files/dnsdist.in Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/dns/dnsdist/Makefile ============================================================================== --- branches/2018Q2/dns/dnsdist/Makefile Sun Apr 1 23:54:21 2018 (r466190) +++ branches/2018Q2/dns/dnsdist/Makefile Sun Apr 1 23:55:25 2018 (r466191) @@ -3,7 +3,7 @@ PORTNAME= dnsdist DISTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns net MASTER_SITES= https://downloads.powerdns.com/releases/ \ LOCAL/cpm @@ -22,9 +22,10 @@ LIB_DEPENDS= libboost_serialization.so:devel/boost-lib libsodium.so:security/libsodium GNU_CONFIGURE= yes -USES= bison compiler cpe gmake libedit libtool localbase lua:52 \ +USES= bison compiler cpe gmake libedit libtool localbase \ pkgconfig tar:bz2 CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \ + --enable-dns-over-tls \ --enable-dnscrypt \ --enable-libsodium \ --enable-re2 @@ -35,6 +36,30 @@ USERS= _dnsdist GROUPS= _dnsdist USE_RC_SUBR= dnsdist + +OPTIONS_DEFINE= FSTRM LUAJIT SNMP +OPTIONS_DEFAULT= GNUTLS OPENSSL +OPTIONS_MULTI= TLS +OPTIONS_MULTI_TLS= GNUTLS OPENSSL + +FSTRM_DESC= dnstap support (see dnstap.info) +LUAJIT_DESC= Use LuaJIT instead of Lua + +FSTRM_LIB_DEPENDS= libfstrm.so:devel/fstrm +FSTRM_CONFIGURE_ENABLE= fstrm + +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_CONFIGURE_ENABLE=gnutls + +LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit +LUAJIT_USES_OFF= lua +LUAJIT_CONFIGURE_WITH= luajit + +OPENSSL_USES= ssl +OPENSSL_CONFIGURE_ENABLE=libssl + +SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp +SNMP_CONFIGURE_WITH= net-snmp .include Modified: branches/2018Q2/dns/dnsdist/files/dnsdist.in ============================================================================== --- branches/2018Q2/dns/dnsdist/files/dnsdist.in Sun Apr 1 23:54:21 2018 (r466190) +++ branches/2018Q2/dns/dnsdist/files/dnsdist.in Sun Apr 1 23:55:25 2018 (r466191) @@ -22,7 +22,10 @@ load_rc_config ${name} : ${dnsdist_priv_group:=_dnsdist} : ${dnsdist_enable:=NO} -command=/usr/local/sbin/${name} -command_args="-u ${dnsdist_priv_user} -g ${dnsdist_priv_group}" +pidfile=/var/run/${name}.pid + +command=/usr/sbin/daemon +actual_command=/usr/local/sbin/${name} +command_args="-c -f -r -P ${pidfile} ${actual_command} -u ${dnsdist_priv_user} -g ${dnsdist_priv_group} --supervised" run_rc_command "$1" Copied: branches/2018Q2/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp (from r466166, head/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp Sun Apr 1 23:55:25 2018 (r466191, copy of r466166, head/dns/dnsdist/files/patch-ext_luawrapper_include_LuaContext.hpp) @@ -0,0 +1,28 @@ +--- ext/luawrapper/include/LuaContext.hpp.orig 2018-03-29 15:25:58 UTC ++++ ext/luawrapper/include/LuaContext.hpp +@@ -2635,11 +2635,21 @@ struct LuaContext::Reader + static auto read(lua_State* state, int index) + -> boost::optional + { ++ std::string result; ++ ++ // lua_tolstring might convert the variable that would confuse lua_next, so we ++ // make a copy of the variable. ++ lua_pushvalue(state, index); ++ + size_t len; +- const auto val = lua_tolstring(state, index, &len); +- if (val == 0) +- return boost::none; +- return std::string(val, len); ++ const auto val = lua_tolstring(state, -1, &len); ++ ++ if (val != 0) ++ result.assign(val, len); ++ ++ lua_pop(state, 1); ++ ++ return val != 0 ? boost::optional{ std::move(result) } : boost::none; + } + }; + From owner-svn-ports-branches@freebsd.org Sun Apr 1 23:56: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 6D2E0F84874; Sun, 1 Apr 2018 23:56:31 +0000 (UTC) (envelope-from cpm@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 1CCDB84032; Sun, 1 Apr 2018 23:56:31 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17387614C; Sun, 1 Apr 2018 23:56:31 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w31NuUfb054641; Sun, 1 Apr 2018 23:56:30 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w31NuUTJ054640; Sun, 1 Apr 2018 23:56:30 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201804012356.w31NuUTJ054640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Sun, 1 Apr 2018 23:56:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466192 - branches/2018Q2/dns/dnsdist X-SVN-Group: ports-branches X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: branches/2018Q2/dns/dnsdist X-SVN-Commit-Revision: 466192 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, 01 Apr 2018 23:56:31 -0000 Author: cpm Date: Sun Apr 1 23:56:30 2018 New Revision: 466192 URL: https://svnweb.freebsd.org/changeset/ports/466192 Log: MFH: r466169 dns/dnsdist: Fix building against openssl from base checking for LIBSSL... no configure: error: OpenSSL libssl requested but libraries were not found ===> Script "configure" failed unexpectedly. Please report the problem to cpm@FreeBSD.org [maintainer] and attach the "/wrkdirs/usr/ports/dns/dnsdist/work/dnsdist-1.3.0/config.log" including the output of the failure of your make command. Also, it might be a good idea to provide an overview of all packages installed on your system (e.g. a /usr/local/sbin/pkg-static info -g -Ea). *** Error code 1 Stop. make: stopped in /usr/ports/dns/dnsdist PR: 227180 Submitted by: Ralf van der Enden Approved by: ports-secteam (riggs) Modified: branches/2018Q2/dns/dnsdist/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/dns/dnsdist/Makefile ============================================================================== --- branches/2018Q2/dns/dnsdist/Makefile Sun Apr 1 23:55:25 2018 (r466191) +++ branches/2018Q2/dns/dnsdist/Makefile Sun Apr 1 23:56:30 2018 (r466192) @@ -57,6 +57,7 @@ LUAJIT_CONFIGURE_WITH= luajit OPENSSL_USES= ssl OPENSSL_CONFIGURE_ENABLE=libssl +OPENSSL_CONFIGURE_ON= LIBSSL_CFLAGS=-I${OPENSSLINC} LIBSSL_LIBS="-L${OPENSSLLIB} -lssl" SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_WITH= net-snmp From owner-svn-ports-branches@freebsd.org Mon Apr 2 13:40: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 E685BF634B3; Mon, 2 Apr 2018 13:40:29 +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 7142E7F04A; Mon, 2 Apr 2018 13:40:29 +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 6C4151656A; Mon, 2 Apr 2018 13:40:29 +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 w32DeT1c067484; Mon, 2 Apr 2018 13:40:29 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w32DeTUs067482; Mon, 2 Apr 2018 13:40:29 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201804021340.w32DeTUs067482@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 2 Apr 2018 13:40:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466228 - in branches/2018Q2/multimedia/mkvtoolnix: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2018Q2/multimedia/mkvtoolnix: . files X-SVN-Commit-Revision: 466228 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, 02 Apr 2018 13:40:30 -0000 Author: riggs Date: Mon Apr 2 13:40:29 2018 New Revision: 466228 URL: https://svnweb.freebsd.org/changeset/ports/466228 Log: MFH: r466227 Update to upstream version 22.0.0 Approved by: ports-secteam (riggs) Deleted: branches/2018Q2/multimedia/mkvtoolnix/files/ Modified: branches/2018Q2/multimedia/mkvtoolnix/Makefile branches/2018Q2/multimedia/mkvtoolnix/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/multimedia/mkvtoolnix/Makefile ============================================================================== --- branches/2018Q2/multimedia/mkvtoolnix/Makefile Mon Apr 2 13:38:58 2018 (r466227) +++ branches/2018Q2/multimedia/mkvtoolnix/Makefile Mon Apr 2 13:40:29 2018 (r466228) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 21.0.0 +PORTVERSION= 22.0.0 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ Modified: branches/2018Q2/multimedia/mkvtoolnix/distinfo ============================================================================== --- branches/2018Q2/multimedia/mkvtoolnix/distinfo Mon Apr 2 13:38:58 2018 (r466227) +++ branches/2018Q2/multimedia/mkvtoolnix/distinfo Mon Apr 2 13:40:29 2018 (r466228) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521806324 -SHA256 (mkvtoolnix-21.0.0.tar.xz) = ad6d1d0ba40b153c155d5b26425e88531b24bb9969bac0341040e48cbb77c391 -SIZE (mkvtoolnix-21.0.0.tar.xz) = 4682788 +TIMESTAMP = 1522666530 +SHA256 (mkvtoolnix-22.0.0.tar.xz) = 88c5074d6731b65d5c2ddd02113ae064373eb83ef3e6e00a04876f88c0be7f67 +SIZE (mkvtoolnix-22.0.0.tar.xz) = 4714712 From owner-svn-ports-branches@freebsd.org Mon Apr 2 17:59:27 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 437E8F7B4B1; Mon, 2 Apr 2018 17:59:27 +0000 (UTC) (envelope-from bapt@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 E427F69CB3; Mon, 2 Apr 2018 17:59:26 +0000 (UTC) (envelope-from bapt@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 DB73418F6F; Mon, 2 Apr 2018 17:59:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w32HxQ9I099807; Mon, 2 Apr 2018 17:59:26 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w32HxQbu099806; Mon, 2 Apr 2018 17:59:26 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201804021759.w32HxQbu099806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 2 Apr 2018 17:59:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466243 - branches/2018Q2/misc/freebsd-doc-en/files X-SVN-Group: ports-branches X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: branches/2018Q2/misc/freebsd-doc-en/files X-SVN-Commit-Revision: 466243 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, 02 Apr 2018 17:59:27 -0000 Author: bapt Date: Mon Apr 2 17:59:26 2018 New Revision: 466243 URL: https://svnweb.freebsd.org/changeset/ports/466243 Log: MFH: r466242 Bump xsltproc maxdepth, it is required with new version of xsltproc The same has been comitted in the doc repository by blackend@ already Added: branches/2018Q2/misc/freebsd-doc-en/files/ - copied from r466242, head/misc/freebsd-doc-en/files/ Modified: Directory Properties: branches/2018Q2/ (props changed) From owner-svn-ports-branches@freebsd.org Mon Apr 2 19:33: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 3A3FCF8063F; Mon, 2 Apr 2018 19:33:54 +0000 (UTC) (envelope-from bhughes@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 AB19D6DA6D; Mon, 2 Apr 2018 19:33:53 +0000 (UTC) (envelope-from bhughes@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 A333519F71; Mon, 2 Apr 2018 19:33:53 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w32JXrnP050735; Mon, 2 Apr 2018 19:33:53 GMT (envelope-from bhughes@FreeBSD.org) Received: (from bhughes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w32JXroH050733; Mon, 2 Apr 2018 19:33:53 GMT (envelope-from bhughes@FreeBSD.org) Message-Id: <201804021933.w32JXroH050733@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bhughes set sender to bhughes@FreeBSD.org using -f From: "Bradley T. Hughes" Date: Mon, 2 Apr 2018 19:33:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466250 - branches/2018Q2/www/node4 X-SVN-Group: ports-branches X-SVN-Commit-Author: bhughes X-SVN-Commit-Paths: branches/2018Q2/www/node4 X-SVN-Commit-Revision: 466250 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, 02 Apr 2018 19:33:54 -0000 Author: bhughes Date: Mon Apr 2 19:33:53 2018 New Revision: 466250 URL: https://svnweb.freebsd.org/changeset/ports/466250 Log: MFH: r466131 www/node4: Update 4.9.0 -> 4.9.1 No changes from the previous verison. This release ensures that the hosted binaries from the Node.js project adhere to the platform support contract, which does not apply to the FreeBSD port and packages. Approved by: ports-secteam (riggs) Modified: branches/2018Q2/www/node4/Makefile branches/2018Q2/www/node4/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/node4/Makefile ============================================================================== --- branches/2018Q2/www/node4/Makefile Mon Apr 2 18:58:11 2018 (r466249) +++ branches/2018Q2/www/node4/Makefile Mon Apr 2 19:33:53 2018 (r466250) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 4.9.0 +PORTVERSION= 4.9.1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ Modified: branches/2018Q2/www/node4/distinfo ============================================================================== --- branches/2018Q2/www/node4/distinfo Mon Apr 2 18:58:11 2018 (r466249) +++ branches/2018Q2/www/node4/distinfo Mon Apr 2 19:33:53 2018 (r466250) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522268344 -SHA256 (node-v4.9.0.tar.gz) = 55683e98b39513735dedddcdd3331c64ddc7edd5744d2c4317b44a1c54e82f9a -SIZE (node-v4.9.0.tar.gz) = 22700972 +TIMESTAMP = 1522526693 +SHA256 (node-v4.9.1.tar.gz) = d2bc20dbe2c20e6f606671b1b9631f0d20396547ac7cbc144a3dad2c78106c78 +SIZE (node-v4.9.1.tar.gz) = 22700424 From owner-svn-ports-branches@freebsd.org Mon Apr 2 19:34:32 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 231BFF806F0; Mon, 2 Apr 2018 19:34:32 +0000 (UTC) (envelope-from bhughes@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 CCA9B6DBC7; Mon, 2 Apr 2018 19:34:31 +0000 (UTC) (envelope-from bhughes@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 C5F4219F72; Mon, 2 Apr 2018 19:34:31 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w32JYV1f050923; Mon, 2 Apr 2018 19:34:31 GMT (envelope-from bhughes@FreeBSD.org) Received: (from bhughes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w32JYV8v050921; Mon, 2 Apr 2018 19:34:31 GMT (envelope-from bhughes@FreeBSD.org) Message-Id: <201804021934.w32JYV8v050921@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bhughes set sender to bhughes@FreeBSD.org using -f From: "Bradley T. Hughes" Date: Mon, 2 Apr 2018 19:34:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466251 - branches/2018Q2/www/node6 X-SVN-Group: ports-branches X-SVN-Commit-Author: bhughes X-SVN-Commit-Paths: branches/2018Q2/www/node6 X-SVN-Commit-Revision: 466251 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, 02 Apr 2018 19:34:32 -0000 Author: bhughes Date: Mon Apr 2 19:34:31 2018 New Revision: 466251 URL: https://svnweb.freebsd.org/changeset/ports/466251 Log: MFH: r466132 www/node6: Update 6.14.0 -> 6.14.1 No changes from the previous verison. This release ensures that the hosted binaries from the Node.js project adhere to the platform support contract, which does not apply to the FreeBSD port and packages. Approved by: ports-secteam (riggs) Modified: branches/2018Q2/www/node6/Makefile branches/2018Q2/www/node6/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/node6/Makefile ============================================================================== --- branches/2018Q2/www/node6/Makefile Mon Apr 2 19:33:53 2018 (r466250) +++ branches/2018Q2/www/node6/Makefile Mon Apr 2 19:34:31 2018 (r466251) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 6.14.0 +PORTVERSION= 6.14.1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ Modified: branches/2018Q2/www/node6/distinfo ============================================================================== --- branches/2018Q2/www/node6/distinfo Mon Apr 2 19:33:53 2018 (r466250) +++ branches/2018Q2/www/node6/distinfo Mon Apr 2 19:34:31 2018 (r466251) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522268406 -SHA256 (node-v6.14.0.tar.gz) = 87892f42c5c48bb6367e0299ec81e1d18e560e401eddc50dd746acc4c896bd7c -SIZE (node-v6.14.0.tar.gz) = 27449153 +TIMESTAMP = 1522526722 +SHA256 (node-v6.14.1.tar.gz) = 82ca9917819db13c3a3484bd2bee1c58cd718aec3e4ad46026f968557a6717be +SIZE (node-v6.14.1.tar.gz) = 27449739 From owner-svn-ports-branches@freebsd.org Mon Apr 2 19:35: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 34543F807FC; Mon, 2 Apr 2018 19:35:22 +0000 (UTC) (envelope-from bhughes@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 DBE046DCFC; Mon, 2 Apr 2018 19:35:21 +0000 (UTC) (envelope-from bhughes@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 D6ED719F75; Mon, 2 Apr 2018 19:35:21 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w32JZLiP051140; Mon, 2 Apr 2018 19:35:21 GMT (envelope-from bhughes@FreeBSD.org) Received: (from bhughes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w32JZLUm051138; Mon, 2 Apr 2018 19:35:21 GMT (envelope-from bhughes@FreeBSD.org) Message-Id: <201804021935.w32JZLUm051138@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bhughes set sender to bhughes@FreeBSD.org using -f From: "Bradley T. Hughes" Date: Mon, 2 Apr 2018 19:35:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466252 - branches/2018Q2/www/node8 X-SVN-Group: ports-branches X-SVN-Commit-Author: bhughes X-SVN-Commit-Paths: branches/2018Q2/www/node8 X-SVN-Commit-Revision: 466252 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, 02 Apr 2018 19:35:22 -0000 Author: bhughes Date: Mon Apr 2 19:35:21 2018 New Revision: 466252 URL: https://svnweb.freebsd.org/changeset/ports/466252 Log: MFH: r466133 www/node8: Update 8.11.0 -> 8.11.1 No changes from the previous verison. This release ensures that the hosted binaries from the Node.js project adhere to the platform support contract, which does not apply to the FreeBSD port and packages. Approved by: ports-secteam (riggs) Modified: branches/2018Q2/www/node8/Makefile branches/2018Q2/www/node8/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/node8/Makefile ============================================================================== --- branches/2018Q2/www/node8/Makefile Mon Apr 2 19:34:31 2018 (r466251) +++ branches/2018Q2/www/node8/Makefile Mon Apr 2 19:35:21 2018 (r466252) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 8.11.0 +PORTVERSION= 8.11.1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ Modified: branches/2018Q2/www/node8/distinfo ============================================================================== --- branches/2018Q2/www/node8/distinfo Mon Apr 2 19:34:31 2018 (r466251) +++ branches/2018Q2/www/node8/distinfo Mon Apr 2 19:35:21 2018 (r466252) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522268432 -SHA256 (node-v8.11.0.tar.gz) = 7683a674259298fc53dd020e210d062aaf02698980fe293c64ed2daee13466a4 -SIZE (node-v8.11.0.tar.gz) = 31029843 +TIMESTAMP = 1522526743 +SHA256 (node-v8.11.1.tar.gz) = 86678028f13b26ceed08efc4b838921ca1bf514c0b7e8151bfec8ba15c5e66ad +SIZE (node-v8.11.1.tar.gz) = 31030225 From owner-svn-ports-branches@freebsd.org Mon Apr 2 19:39:13 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 C12DDF80B57; Mon, 2 Apr 2018 19:39:13 +0000 (UTC) (envelope-from bhughes@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 6DB446E022; Mon, 2 Apr 2018 19:39:13 +0000 (UTC) (envelope-from bhughes@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 68A0119F78; Mon, 2 Apr 2018 19:39:13 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w32JdDT5051579; Mon, 2 Apr 2018 19:39:13 GMT (envelope-from bhughes@FreeBSD.org) Received: (from bhughes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w32JdDT1051577; Mon, 2 Apr 2018 19:39:13 GMT (envelope-from bhughes@FreeBSD.org) Message-Id: <201804021939.w32JdDT1051577@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bhughes set sender to bhughes@FreeBSD.org using -f From: "Bradley T. Hughes" Date: Mon, 2 Apr 2018 19:39:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466254 - branches/2018Q2/www/node X-SVN-Group: ports-branches X-SVN-Commit-Author: bhughes X-SVN-Commit-Paths: branches/2018Q2/www/node X-SVN-Commit-Revision: 466254 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, 02 Apr 2018 19:39:13 -0000 Author: bhughes Date: Mon Apr 2 19:39:13 2018 New Revision: 466254 URL: https://svnweb.freebsd.org/changeset/ports/466254 Log: MFH: r466134 www/node: Update 9.10.0 -> 9.10.1 No changes from the previous verison. This release ensures that the hosted binaries from the Node.js project adhere to the platform support contract, which does not apply to the FreeBSD port and packages. Approved by: ports-secteam (riggs) Modified: branches/2018Q2/www/node/Makefile branches/2018Q2/www/node/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/node/Makefile ============================================================================== --- branches/2018Q2/www/node/Makefile Mon Apr 2 19:38:39 2018 (r466253) +++ branches/2018Q2/www/node/Makefile Mon Apr 2 19:39:13 2018 (r466254) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 9.10.0 +PORTVERSION= 9.10.1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ Modified: branches/2018Q2/www/node/distinfo ============================================================================== --- branches/2018Q2/www/node/distinfo Mon Apr 2 19:38:39 2018 (r466253) +++ branches/2018Q2/www/node/distinfo Mon Apr 2 19:39:13 2018 (r466254) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522268450 -SHA256 (node-v9.10.0.tar.gz) = e5654e552bcc7d011fe0c5bade53ba5c3acbd8d26bfda2cf57057537a03c8d76 -SIZE (node-v9.10.0.tar.gz) = 31409091 +TIMESTAMP = 1522526760 +SHA256 (node-v9.10.1.tar.gz) = e8777b6938951eba38c02705d42c62a985a3b404429e7e54b880bdfce0cfddde +SIZE (node-v9.10.1.tar.gz) = 31411130 From owner-svn-ports-branches@freebsd.org Tue Apr 3 00:50:07 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 A62EFF72204; Tue, 3 Apr 2018 00:50:07 +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 538F27BC1F; Tue, 3 Apr 2018 00:50:07 +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 4D6931D229; Tue, 3 Apr 2018 00:50:07 +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 w330o7pK065310; Tue, 3 Apr 2018 00:50:07 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w330o6b8065261; Tue, 3 Apr 2018 00:50:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804030050.w330o6b8065261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 3 Apr 2018 00:50:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466273 - in branches/2018Q2/www: firefox firefox/files waterfox waterfox/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www: firefox firefox/files waterfox waterfox/files X-SVN-Commit-Revision: 466273 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, 03 Apr 2018 00:50:08 -0000 Author: jbeich Date: Tue Apr 3 00:50:06 2018 New Revision: 466273 URL: https://svnweb.freebsd.org/changeset/ports/466273 Log: MFH: r466270 www/firefox: use SkiaGL by default for OpenGL/WebRender compositing Copy OS X behavior. If OpenGL compositing[1] doesn't crash OS or browser SkiaGL canvas rendering is unlikely to make it worse. Mainly improves FishIE Tank benchmark. [1] layers.acceleration.force-enabled -> true in about:config or $ env MOZ_ACCELERATED=1 firefox -new-instance -profile `mktemp -d` ... Approved by: ports-secteam blanket Added: branches/2018Q2/www/firefox/files/patch-bug1411481 - copied unchanged from r466270, head/www/firefox/files/patch-bug1411481 branches/2018Q2/www/firefox/files/patch-bug1447519 - copied unchanged from r466270, head/www/firefox/files/patch-bug1447519 branches/2018Q2/www/waterfox/files/patch-bug1447519 - copied unchanged from r466270, head/www/waterfox/files/patch-bug1447519 Modified: branches/2018Q2/www/firefox/Makefile branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/firefox/Makefile ============================================================================== --- branches/2018Q2/www/firefox/Makefile Tue Apr 3 00:49:25 2018 (r466272) +++ branches/2018Q2/www/firefox/Makefile Tue Apr 3 00:50:06 2018 (r466273) @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 59.0.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= https://hg.mozilla.org/releases/mozilla-release/archive/ Copied: branches/2018Q2/www/firefox/files/patch-bug1411481 (from r466270, head/www/firefox/files/patch-bug1411481) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/firefox/files/patch-bug1411481 Tue Apr 3 00:50:06 2018 (r466273, copy of r466270, head/www/firefox/files/patch-bug1411481) @@ -0,0 +1,85 @@ +commit 57a55d1c2d33 +Author: sotaro +Date: Wed Mar 21 08:59:38 2018 +0900 + + Bug 1411481- Enable SkiaGL canvas usage on Mac r=jrmuizel +--- + dom/canvas/CanvasRenderingContext2D.cpp | 3 ++- + gfx/thebes/gfxPlatform.cpp | 3 ++- + gfx/thebes/gfxPlatform.h | 2 +- + gfx/thebes/gfxWindowsPlatform.cpp | 7 +++++++ + gfx/thebes/gfxWindowsPlatform.h | 2 ++ + 5 files changed, 14 insertions(+), 3 deletions(-) + +diff --git dom/canvas/CanvasRenderingContext2D.cpp dom/canvas/CanvasRenderingContext2D.cpp +index ef3f868bdbf7..8666564b4d0c 100644 +--- dom/canvas/CanvasRenderingContext2D.cpp ++++ dom/canvas/CanvasRenderingContext2D.cpp +@@ -1438,7 +1438,8 @@ CanvasRenderingContext2D::AllowOpenGLCanvas() const + // HTMLCanvasElement::GetCompositorBackendType would return LAYERS_NONE + // as well, so it wouldn't help much. + +- return (mCompositorBackend == LayersBackend::LAYERS_OPENGL) && ++ return (mCompositorBackend == LayersBackend::LAYERS_OPENGL || ++ mCompositorBackend == LayersBackend::LAYERS_WR) && + gfxPlatform::GetPlatform()->AllowOpenGLCanvas(); + } + +diff --git gfx/thebes/gfxPlatform.cpp gfx/thebes/gfxPlatform.cpp +index b9beea68d8c5..82635f9ab3ce 100644 +--- gfx/thebes/gfxPlatform.cpp ++++ gfx/thebes/gfxPlatform.cpp +@@ -1386,7 +1386,8 @@ bool gfxPlatform::AllowOpenGLCanvas() + // so we let content process always assume correct compositor backend. + // The callers have to do the right thing. + bool correctBackend = !XRE_IsParentProcess() || +- ((mCompositorBackend == LayersBackend::LAYERS_OPENGL) && ++ ((mCompositorBackend == LayersBackend::LAYERS_OPENGL || ++ mCompositorBackend == LayersBackend::LAYERS_WR) && + (GetContentBackendFor(mCompositorBackend) == BackendType::SKIA)); + + if (gfxPrefs::CanvasAzureAccelerated() && correctBackend) { +diff --git gfx/thebes/gfxPlatform.h gfx/thebes/gfxPlatform.h +index c988eb1168a8..3bbf2b763f26 100644 +--- gfx/thebes/gfxPlatform.h ++++ gfx/thebes/gfxPlatform.h +@@ -286,7 +286,7 @@ public: + /// asking for it, we will examine the commands in the first few seconds + /// of the canvas usage, and potentially change to accelerated or + /// non-accelerated canvas. +- bool AllowOpenGLCanvas(); ++ virtual bool AllowOpenGLCanvas(); + virtual void InitializeSkiaCacheLimits(); + + static bool AsyncPanZoomEnabled(); +diff --git gfx/thebes/gfxWindowsPlatform.cpp gfx/thebes/gfxWindowsPlatform.cpp +index 9ba6f40c6cc0..4d65791d075f 100644 +--- gfx/thebes/gfxWindowsPlatform.cpp ++++ gfx/thebes/gfxWindowsPlatform.cpp +@@ -509,6 +509,13 @@ gfxWindowsPlatform::UpdateRenderMode() + } + } + ++bool ++gfxWindowsPlatform::AllowOpenGLCanvas() ++{ ++ // OpenGL canvas is not supported on windows ++ return false; ++} ++ + mozilla::gfx::BackendType + gfxWindowsPlatform::GetContentBackendFor(mozilla::layers::LayersBackend aLayers) + { +diff --git gfx/thebes/gfxWindowsPlatform.h gfx/thebes/gfxWindowsPlatform.h +index 47048de8f5f5..47ec0e9e5547 100644 +--- gfx/thebes/gfxWindowsPlatform.h ++++ gfx/thebes/gfxWindowsPlatform.h +@@ -174,6 +174,8 @@ public: + void SchedulePaintIfDeviceReset() override; + void CheckForContentOnlyDeviceReset(); + ++ bool AllowOpenGLCanvas() override; ++ + mozilla::gfx::BackendType GetContentBackendFor(mozilla::layers::LayersBackend aLayers) override; + + mozilla::gfx::BackendType GetPreferredCanvasBackend() override; Copied: branches/2018Q2/www/firefox/files/patch-bug1447519 (from r466270, head/www/firefox/files/patch-bug1447519) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/firefox/files/patch-bug1447519 Tue Apr 3 00:50:06 2018 (r466273, copy of r466270, head/www/firefox/files/patch-bug1447519) @@ -0,0 +1,22 @@ +Enable SkiaGL by default on OpenGL compositing platforms + +diff --git modules/libpref/init/all.js modules/libpref/init/all.js +index 93e56b00a961..61a2174c3384 100644 +--- modules/libpref/init/all.js ++++ modules/libpref/init/all.js +@@ -882,15 +882,9 @@ pref("gfx.font_rendering.opentype_svg.enabled", true); + pref("gfx.canvas.azure.backends", "direct2d1.1,skia,cairo"); + pref("gfx.content.azure.backends", "direct2d1.1,skia,cairo"); + #else +-#ifdef XP_MACOSX + pref("gfx.content.azure.backends", "skia"); + pref("gfx.canvas.azure.backends", "skia"); +-// Accelerated cg canvas where available (10.7+) + pref("gfx.canvas.azure.accelerated", true); +-#else +-pref("gfx.canvas.azure.backends", "skia"); +-pref("gfx.content.azure.backends", "skia"); +-#endif + #endif + + pref("gfx.canvas.skiagl.dynamic-cache", true); Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Tue Apr 3 00:49:25 2018 (r466272) +++ branches/2018Q2/www/waterfox/Makefile Tue Apr 3 00:50:06 2018 (r466273) @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q2/www/waterfox/files/patch-bug1447519 (from r466270, head/www/waterfox/files/patch-bug1447519) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1447519 Tue Apr 3 00:50:06 2018 (r466273, copy of r466270, head/www/waterfox/files/patch-bug1447519) @@ -0,0 +1,22 @@ +Enable SkiaGL by default on OpenGL compositing platforms + +diff --git modules/libpref/init/all.js modules/libpref/init/all.js +index 93e56b00a961..61a2174c3384 100644 +--- modules/libpref/init/all.js ++++ modules/libpref/init/all.js +@@ -882,15 +882,9 @@ pref("gfx.font_rendering.opentype_svg.enabled", true); + pref("gfx.canvas.azure.backends", "direct2d1.1,skia,cairo"); + pref("gfx.content.azure.backends", "direct2d1.1,skia,cairo"); + #else +-#ifdef XP_MACOSX + pref("gfx.content.azure.backends", "skia"); + pref("gfx.canvas.azure.backends", "skia"); +-// Accelerated cg canvas where available (10.7+) + pref("gfx.canvas.azure.accelerated", true); +-#else +-pref("gfx.canvas.azure.backends", "skia"); +-pref("gfx.content.azure.backends", "skia"); +-#endif + #endif + + pref("gfx.canvas.skiagl.dynamic-cache", true); From owner-svn-ports-branches@freebsd.org Tue Apr 3 00:51: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 72FB4F72499; Tue, 3 Apr 2018 00:51:10 +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 22BD47BE53; Tue, 3 Apr 2018 00:51:10 +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 047541D254; Tue, 3 Apr 2018 00:51:10 +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 w330p9rU072480; Tue, 3 Apr 2018 00:51:09 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w330p9Mr072427; Tue, 3 Apr 2018 00:51:09 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804030051.w330p9Mr072427@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 3 Apr 2018 00:51:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466274 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 466274 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, 03 Apr 2018 00:51:10 -0000 Author: jbeich Date: Tue Apr 3 00:51:09 2018 New Revision: 466274 URL: https://svnweb.freebsd.org/changeset/ports/466274 Log: MFH: r466271 www/waterfox: apply some FF60 fixes Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1372107 - copied unchanged from r466271, head/www/waterfox/files/patch-bug1372107 branches/2018Q2/www/waterfox/files/patch-bug1418009 - copied unchanged from r466271, head/www/waterfox/files/patch-bug1418009 branches/2018Q2/www/waterfox/files/patch-bug1436809 - copied unchanged from r466271, head/www/waterfox/files/patch-bug1436809 branches/2018Q2/www/waterfox/files/patch-bug1447131 - copied unchanged from r466271, head/www/waterfox/files/patch-bug1447131 Modified: branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Tue Apr 3 00:50:06 2018 (r466273) +++ branches/2018Q2/www/waterfox/Makefile Tue Apr 3 00:51:09 2018 (r466274) @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q2/www/waterfox/files/patch-bug1372107 (from r466271, head/www/waterfox/files/patch-bug1372107) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1372107 Tue Apr 3 00:51:09 2018 (r466274, copy of r466271, head/www/waterfox/files/patch-bug1372107) @@ -0,0 +1,82 @@ +commit 4224928879ee +Author: Michael Kaply +Date: Wed Mar 14 13:30:53 2018 -0500 + + Bug 1372107 - Allow browser to be started despite Autoconfig errors. r=florian, a=ritu + + MozReview-Commit-ID: of8cdUMedC + + --HG-- + extra : rebase_source : d58039b1f2e268c7a0af77e9a0680f759f203d99 + extra : source : dad020b0bb45903972c2856cc3a2968f39a27635 +--- + extensions/pref/autoconfig/src/nsReadConfig.cpp | 27 +++++++++++++------------ + 1 file changed, 14 insertions(+), 13 deletions(-) + +diff --git extensions/pref/autoconfig/src/nsReadConfig.cpp extensions/pref/autoconfig/src/nsReadConfig.cpp +index a87b5b2c1bd4..8939fdc268eb 100644 +--- extensions/pref/autoconfig/src/nsReadConfig.cpp ++++ extensions/pref/autoconfig/src/nsReadConfig.cpp +@@ -36,35 +36,35 @@ extern nsresult CentralizedAdminPrefManagerInit(); + extern nsresult CentralizedAdminPrefManagerFinish(); + + +-static void DisplayError(void) ++static nsresult DisplayError(void) + { + nsresult rv; + + nsCOMPtr promptService = do_GetService("@mozilla.org/embedcomp/prompt-service;1"); + if (!promptService) +- return; ++ return NS_ERROR_FAILURE; + + nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID); + if (!bundleService) +- return; ++ return NS_ERROR_FAILURE; + + nsCOMPtr bundle; + bundleService->CreateBundle("chrome://autoconfig/locale/autoconfig.properties", + getter_AddRefs(bundle)); + if (!bundle) +- return; ++ return NS_ERROR_FAILURE; + + nsXPIDLString title; + rv = bundle->GetStringFromName("readConfigTitle", getter_Copies(title)); + if (NS_FAILED(rv)) +- return; ++ return rv; + + nsXPIDLString err; + rv = bundle->GetStringFromName("readConfigMsg", getter_Copies(err)); + if (NS_FAILED(rv)) +- return; ++ return rv; + +- promptService->Alert(nullptr, title.get(), err.get()); ++ return promptService->Alert(nullptr, title.get(), err.get()); + } + + // nsISupports Implementation +@@ -101,12 +101,13 @@ NS_IMETHODIMP nsReadConfig::Observe(nsISupports *aSubj + if (!nsCRT::strcmp(aTopic, NS_PREFSERVICE_READ_TOPIC_ID)) { + rv = readConfigFile(); + if (NS_FAILED(rv)) { +- DisplayError(); +- +- nsCOMPtr appStartup = +- do_GetService(NS_APPSTARTUP_CONTRACTID); +- if (appStartup) +- appStartup->Quit(nsIAppStartup::eAttemptQuit); ++ rv = DisplayError(); ++ if (NS_FAILED(rv)) { ++ nsCOMPtr appStartup = ++ do_GetService(NS_APPSTARTUP_CONTRACTID); ++ if (appStartup) ++ appStartup->Quit(nsIAppStartup::eAttemptQuit); ++ } + } + } + return rv; Copied: branches/2018Q2/www/waterfox/files/patch-bug1418009 (from r466271, head/www/waterfox/files/patch-bug1418009) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1418009 Tue Apr 3 00:51:09 2018 (r466274, copy of r466271, head/www/waterfox/files/patch-bug1418009) @@ -0,0 +1,28 @@ +commit 068a8c4feb56 +Author: Oriol Brufau +Date: Fri Mar 16 16:58:36 2018 +0100 + + Bug 1418009 - Avoid speculative connections on prematurely inserted lazy tabs. r=dao, a=RyanVM + + MozReview-Commit-ID: 3T8PLBLEGNt + + --HG-- + extra : rebase_source : 5839f1ede2a3d939e8bad02520979a8911f69553 + extra : source : 6d67283033868a54d89a936ba5e336d9bad5c79c +--- + browser/components/sessionstore/SessionStore.jsm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git browser/components/sessionstore/SessionStore.jsm browser/components/sessionstore/SessionStore.jsm +index dee998cbe7eb..88de8a64f0fc 100644 +--- browser/components/sessionstore/SessionStore.jsm ++++ browser/components/sessionstore/SessionStore.jsm +@@ -3547,7 +3547,7 @@ var SessionStoreInternal = { + * a tab to speculatively connect on mouse hover. + */ + speculativeConnectOnTabHover(tab) { +- if (this._restore_on_demand && !tab.__SS_connectionPrepared && tab.hasAttribute("pending")) { ++ if (tab.__SS_lazyData && !tab.__SS_connectionPrepared) { + let url = this.getLazyTabValue(tab, "url"); + let prepared = this.prepareConnectionToHost(url); + // This is used to test if a connection has been made beforehand. Copied: branches/2018Q2/www/waterfox/files/patch-bug1436809 (from r466271, head/www/waterfox/files/patch-bug1436809) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1436809 Tue Apr 3 00:51:09 2018 (r466274, copy of r466271, head/www/waterfox/files/patch-bug1436809) @@ -0,0 +1,27 @@ +commit 91f4336a7ddc +Author: Michal Novotny +Date: Mon Apr 2 12:59:18 2018 -0400 + + Bug 1436809 - Check that stream message was converted to string correctly. r=valentin, a=abillings + + --HG-- + extra : rebase_source : c81e8000cd7e41d8928e6ee0c6eb6ee823debc23 + extra : source : b229809d17ff18263becfad6f9777c9ab0165279 +--- + netwerk/protocol/websocket/WebSocketChannel.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git netwerk/protocol/websocket/WebSocketChannel.cpp netwerk/protocol/websocket/WebSocketChannel.cpp +index a08655f95d8c..a17b2f382d23 100644 +--- netwerk/protocol/websocket/WebSocketChannel.cpp ++++ netwerk/protocol/websocket/WebSocketChannel.cpp +@@ -1052,6 +1052,9 @@ public: + nsresult rv = NS_ReadInputStreamToString(mMsg.pStream, *temp, mLength); + + NS_ENSURE_SUCCESS(rv, rv); ++ if (temp->Length() != mLength) { ++ return NS_ERROR_UNEXPECTED; ++ } + + mMsg.pStream->Close(); + mMsg.pStream->Release(); Copied: branches/2018Q2/www/waterfox/files/patch-bug1447131 (from r466271, head/www/waterfox/files/patch-bug1447131) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1447131 Tue Apr 3 00:51:09 2018 (r466274, copy of r466271, head/www/waterfox/files/patch-bug1447131) @@ -0,0 +1,160 @@ +commit c6116093dd45 +Author: Botond Ballo +Date: Wed Mar 28 14:22:30 2018 -0400 + + Bug 1447131 - Handle backface-visibility:hidden in compositor hit testing. r=kats a=RyanVM + + MozReview-Commit-ID: EZhhSk3EZAL + + --HG-- + extra : source : e4b8a1682e6c4587649bcfbf5dab4b2ccdf4c741 +--- + gfx/layers/LayerMetricsWrapper.h | 7 +++++++ + gfx/layers/apz/src/APZCTreeManager.cpp | 9 ++++++--- + gfx/layers/apz/src/HitTestingTreeNode.cpp | 12 +++++++++++- + gfx/layers/apz/src/HitTestingTreeNode.h | 11 ++++++++++- + gfx/layers/wr/WebRenderScrollDataWrapper.h | 7 +++++++ + 5 files changed, 41 insertions(+), 5 deletions(-) + +diff --git gfx/layers/LayerMetricsWrapper.h gfx/layers/LayerMetricsWrapper.h +index baffde611220..dcf9fdc02b21 100644 +--- gfx/layers/LayerMetricsWrapper.h ++++ gfx/layers/LayerMetricsWrapper.h +@@ -446,6 +446,13 @@ public: + return mLayer->GetFixedPositionScrollContainerId(); + } + ++ bool IsBackfaceHidden() const ++ { ++ MOZ_ASSERT(IsValid()); ++ ++ return mLayer->IsBackfaceHidden(); ++ } ++ + // Expose an opaque pointer to the layer. Mostly used for printf + // purposes. This is not intended to be a general-purpose accessor + // for the underlying layer. +diff --git gfx/layers/apz/src/APZCTreeManager.cpp gfx/layers/apz/src/APZCTreeManager.cpp +index 9c66d22a41fe..7f82c3cee0a8 100644 +--- gfx/layers/apz/src/APZCTreeManager.cpp ++++ gfx/layers/apz/src/APZCTreeManager.cpp +@@ -835,7 +835,8 @@ APZCTreeManager::PrepareNodeForLayer(const ScrollNode& aLayer, + (!parentHasPerspective && aLayer.GetClipRect()) + ? Some(ParentLayerIntRegion(*aLayer.GetClipRect())) + : Nothing(), +- GetEventRegionsOverride(aParent, aLayer)); ++ GetEventRegionsOverride(aParent, aLayer), ++ aLayer.IsBackfaceHidden()); + node->SetScrollbarData(aLayer.GetScrollbarTargetContainerId(), + aLayer.GetScrollbarAnimationId(), + aLayer.GetScrollThumbData(), +@@ -948,7 +949,8 @@ APZCTreeManager::PrepareNodeForLayer(const ScrollNode& aLayer, + aLayer.GetVisibleRegion(), + aLayer.GetTransformTyped(), + clipRegion, +- GetEventRegionsOverride(aParent, aLayer)); ++ GetEventRegionsOverride(aParent, aLayer), ++ aLayer.IsBackfaceHidden()); + apzc->SetAncestorTransform(aAncestorTransform); + + PrintAPZCInfo(aLayer, apzc); +@@ -1047,7 +1049,8 @@ APZCTreeManager::PrepareNodeForLayer(const ScrollNode& aLayer, + aLayer.GetVisibleRegion(), + aLayer.GetTransformTyped(), + clipRegion, +- GetEventRegionsOverride(aParent, aLayer)); ++ GetEventRegionsOverride(aParent, aLayer), ++ aLayer.IsBackfaceHidden()); + } + + // Note: if layer properties must be propagated to nodes, RecvUpdate in +diff --git gfx/layers/apz/src/HitTestingTreeNode.cpp gfx/layers/apz/src/HitTestingTreeNode.cpp +index f16758e72ec6..ee1fce927c0d 100644 +--- gfx/layers/apz/src/HitTestingTreeNode.cpp ++++ gfx/layers/apz/src/HitTestingTreeNode.cpp +@@ -31,6 +31,7 @@ HitTestingTreeNode::HitTestingTreeNode(AsyncPanZoomController* aApzc, + , mScrollViewId(FrameMetrics::NULL_SCROLL_ID) + , mScrollbarAnimationId(0) + , mFixedPosTarget(FrameMetrics::NULL_SCROLL_ID) ++ , mIsBackfaceHidden(false) + , mOverride(EventRegionsOverride::NoOverride) + { + if (mIsPrimaryApzcHolder) { +@@ -263,13 +264,15 @@ HitTestingTreeNode::SetHitTestData(const EventRegions& aRegions, + const LayerIntRegion& aVisibleRegion, + const CSSTransformMatrix& aTransform, + const Maybe& aClipRegion, +- const EventRegionsOverride& aOverride) ++ const EventRegionsOverride& aOverride, ++ bool aIsBackfaceHidden) + { + mEventRegions = aRegions; + mVisibleRegion = aVisibleRegion; + mTransform = aTransform; + mClipRegion = aClipRegion; + mOverride = aOverride; ++ mIsBackfaceHidden = aIsBackfaceHidden; + } + + bool +@@ -287,6 +290,13 @@ HitTestingTreeNode::HitTest(const LayerPoint& aPoint) const + } + + auto point = LayerIntPoint::Round(aPoint); ++ ++ // If the layer's backface is showing and it's hidden, don't hit it. ++ // This matches the behavior of main-thread hit testing in ++ // nsDisplayTransform::HitTest(). ++ if (mIsBackfaceHidden) { ++ return HitTestResult::HitNothing; ++ } + + // test against event regions in Layer coordinate space + if (!mEventRegions.mHitRegion.Contains(point.x, point.y)) { +diff --git gfx/layers/apz/src/HitTestingTreeNode.h gfx/layers/apz/src/HitTestingTreeNode.h +index 50e04e515652..aef703fd23b5 100644 +--- gfx/layers/apz/src/HitTestingTreeNode.h ++++ gfx/layers/apz/src/HitTestingTreeNode.h +@@ -89,7 +89,8 @@ public: + const LayerIntRegion& aVisibleRegion, + const CSSTransformMatrix& aTransform, + const Maybe& aClipRegion, +- const EventRegionsOverride& aOverride); ++ const EventRegionsOverride& aOverride, ++ bool aIsBackfaceHidden); + bool IsOutsideClip(const ParentLayerPoint& aPoint) const; + + /* Scrollbar info */ +@@ -172,6 +173,14 @@ private: + * transforms. */ + CSSTransformMatrix mTransform; + ++ /* Whether layer L is backface-visibility:hidden, and its backface is ++ * currently visible. It's true that the latter depends on the layer's ++ * shadow transform, but the sorts of changes APZ makes to the shadow ++ * transform shouldn't change the backface from hidden to visible or ++ * vice versa, so it's sufficient to record this at hit test tree ++ * building time. */ ++ bool mIsBackfaceHidden; ++ + /* This is clip rect for L that we wish to use for hit-testing purposes. Note + * that this may not be exactly the same as the clip rect on layer L because + * of the touch-sensitive region provided by the GeckoContentController, or +diff --git gfx/layers/wr/WebRenderScrollDataWrapper.h gfx/layers/wr/WebRenderScrollDataWrapper.h +index 2e20bbdcdb8f..64d5319e10ff 100644 +--- gfx/layers/wr/WebRenderScrollDataWrapper.h ++++ gfx/layers/wr/WebRenderScrollDataWrapper.h +@@ -315,6 +315,13 @@ public: + return mLayer->GetFixedPositionScrollContainerId(); + } + ++ bool IsBackfaceHidden() const ++ { ++ // This is only used by APZCTM hit testing, and WR does its own ++ // hit testing, so no need to implement this. ++ return false; ++ } ++ + const void* GetLayer() const + { + MOZ_ASSERT(IsValid()); From owner-svn-ports-branches@freebsd.org Tue Apr 3 00:54: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 12724F72831; Tue, 3 Apr 2018 00:54:47 +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 AF2547C3A8; Tue, 3 Apr 2018 00:54:46 +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 9E8A41D3BA; Tue, 3 Apr 2018 00:54:46 +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 w330sk2H093243; Tue, 3 Apr 2018 00:54:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w330skgf093233; Tue, 3 Apr 2018 00:54:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804030054.w330skgf093233@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 3 Apr 2018 00:54:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466277 - branches/2018Q2/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/emulators/citra X-SVN-Commit-Revision: 466277 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, 03 Apr 2018 00:54:47 -0000 Author: jbeich Date: Tue Apr 3 00:54:46 2018 New Revision: 466277 URL: https://svnweb.freebsd.org/changeset/ports/466277 Log: MFH: r466275 emulators/citra: update to s20180402 Changes: https://github.com/citra-emu/citra/compare/11b9d303...7d710170 Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q2/emulators/citra/Makefile branches/2018Q2/emulators/citra/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/emulators/citra/Makefile ============================================================================== --- branches/2018Q2/emulators/citra/Makefile Tue Apr 3 00:52:24 2018 (r466276) +++ branches/2018Q2/emulators/citra/Makefile Tue Apr 3 00:54:46 2018 (r466277) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180330 +PORTVERSION= s20180402 PORTREVISION?= 0 CATEGORIES= emulators @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dy USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 11b9d303 +GH_TAGNAME= 7d710170 GH_TUPLE= citra-emu:ext-libressl-portable:cbb1dca:libressl/externals/libressl \ citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \ Modified: branches/2018Q2/emulators/citra/distinfo ============================================================================== --- branches/2018Q2/emulators/citra/distinfo Tue Apr 3 00:52:24 2018 (r466276) +++ branches/2018Q2/emulators/citra/distinfo Tue Apr 3 00:54:46 2018 (r466277) @@ -1,6 +1,6 @@ -TIMESTAMP = 1522424436 -SHA256 (citra-emu-citra-s20180330-11b9d303_GH0.tar.gz) = d92eb457a30afc347d149f117ed621da87f65d610df757f826a0b1bfc67c5a98 -SIZE (citra-emu-citra-s20180330-11b9d303_GH0.tar.gz) = 1889186 +TIMESTAMP = 1522685376 +SHA256 (citra-emu-citra-s20180402-7d710170_GH0.tar.gz) = b681d86635b6fb58867a739e81ad17725163ef58bbe0d6c05a8c4ce83f358be3 +SIZE (citra-emu-citra-s20180402-7d710170_GH0.tar.gz) = 1890422 SHA256 (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = f3741a3bb480d9f8a817f032f59d1908e659620cbb93c0fe8289cfb46d2ab89c SIZE (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = 1761962 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7 From owner-svn-ports-branches@freebsd.org Tue Apr 3 00:57:48 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 AFCA4F72B09; Tue, 3 Apr 2018 00:57:48 +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 54B587C519; Tue, 3 Apr 2018 00:57:48 +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 45ACF1D3BB; Tue, 3 Apr 2018 00:57:48 +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 w330vmkX005512; Tue, 3 Apr 2018 00:57:48 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w330vl2M005496; Tue, 3 Apr 2018 00:57:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804030057.w330vl2M005496@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 3 Apr 2018 00:57:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466278 - in branches/2018Q2/emulators/rpcs3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/emulators/rpcs3: . files X-SVN-Commit-Revision: 466278 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, 03 Apr 2018 00:57:48 -0000 Author: jbeich Date: Tue Apr 3 00:57:47 2018 New Revision: 466278 URL: https://svnweb.freebsd.org/changeset/ports/466278 Log: MFH: r466276 emulators/rpcs3: update to 0.0.5.173 Changes: https://github.com/RPCS3/rpcs3/compare/bca46e92d...b0352d6ef Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q2/emulators/rpcs3/Makefile branches/2018Q2/emulators/rpcs3/distinfo branches/2018Q2/emulators/rpcs3/files/patch-qt57 Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q2/emulators/rpcs3/Makefile Tue Apr 3 00:54:46 2018 (r466277) +++ branches/2018Q2/emulators/rpcs3/Makefile Tue Apr 3 00:57:47 2018 (r466278) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-146 -DISTVERSIONSUFFIX= -gbca46e92d +DISTVERSION= 0.0.5-173 +DISTVERSIONSUFFIX= -gb0352d6ef CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q2/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q2/emulators/rpcs3/distinfo Tue Apr 3 00:54:46 2018 (r466277) +++ branches/2018Q2/emulators/rpcs3/distinfo Tue Apr 3 00:57:47 2018 (r466278) @@ -1,6 +1,6 @@ -TIMESTAMP = 1522439431 -SHA256 (RPCS3-rpcs3-v0.0.5-146-gbca46e92d_GH0.tar.gz) = 0da2cccb2c4380185315e156cc0a109616f00bf8f0bf7413bac3401d705d1114 -SIZE (RPCS3-rpcs3-v0.0.5-146-gbca46e92d_GH0.tar.gz) = 4322583 +TIMESTAMP = 1522711072 +SHA256 (RPCS3-rpcs3-v0.0.5-173-gb0352d6ef_GH0.tar.gz) = 38a09a1aa4691117e099e74c4bec22f3ea019954bc75de94379a61c0de75c90f +SIZE (RPCS3-rpcs3-v0.0.5-173-gb0352d6ef_GH0.tar.gz) = 4323099 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/2018Q2/emulators/rpcs3/files/patch-qt57 ============================================================================== --- branches/2018Q2/emulators/rpcs3/files/patch-qt57 Tue Apr 3 00:54:46 2018 (r466277) +++ branches/2018Q2/emulators/rpcs3/files/patch-qt57 Tue Apr 3 00:57:47 2018 (r466278) @@ -157,16 +157,6 @@ Revert https://github.com/RPCS3/rpcs3/commit/cf1c45dfe 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; From owner-svn-ports-branches@freebsd.org Wed Apr 4 01:03:14 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 F2BE7F81DF0; Wed, 4 Apr 2018 01:03:13 +0000 (UTC) (envelope-from cpm@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 61B287EEED; Wed, 4 Apr 2018 01:03:13 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5CA3B4A50; Wed, 4 Apr 2018 01:03:13 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3413Dgh048683; Wed, 4 Apr 2018 01:03:13 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3413DL7048682; Wed, 4 Apr 2018 01:03:13 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201804040103.w3413DL7048682@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Wed, 4 Apr 2018 01:03:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466389 - branches/2018Q2/dns/dnsdist X-SVN-Group: ports-branches X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: branches/2018Q2/dns/dnsdist X-SVN-Commit-Revision: 466389 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, 04 Apr 2018 01:03:14 -0000 Author: cpm Date: Wed Apr 4 01:03:12 2018 New Revision: 466389 URL: https://svnweb.freebsd.org/changeset/ports/466389 Log: MFH: r466388 - Fix and update the comment when building dnsdist on 10.x - Mark BROKEN on FreeBSD 10.3, fails to link due to lack of thread_local Approved by: ports-secteam blanket Modified: branches/2018Q2/dns/dnsdist/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/dns/dnsdist/Makefile ============================================================================== --- branches/2018Q2/dns/dnsdist/Makefile Wed Apr 4 00:56:39 2018 (r466388) +++ branches/2018Q2/dns/dnsdist/Makefile Wed Apr 4 01:03:12 2018 (r466389) @@ -64,11 +64,15 @@ SNMP_CONFIGURE_WITH= net-snmp .include -# Fix dnsdist binaries when building on FreeBSD 10.3 +# Fix dnsdist binary when building on FreeBSD 10.x .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 BUILD_DEPENDS+= clang50:devel/llvm50 CC= clang50 CXX= clang++50 +.endif + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1004000 +BROKEN= fails to link due to lack of thread_local .endif post-install: From owner-svn-ports-branches@freebsd.org Wed Apr 4 12:03: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 CEBF1F88870; Wed, 4 Apr 2018 12:03: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 A221075E97; Wed, 4 Apr 2018 12:03: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 9CCF813747; Wed, 4 Apr 2018 12:03: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 w34C349N080165; Wed, 4 Apr 2018 12:03:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w34C323s080120; Wed, 4 Apr 2018 12:03:02 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804041203.w34C323s080120@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 4 Apr 2018 12:03:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466433 - in branches/2018Q2: audio/ncmpcpp databases/evolution-data-server/files devel/pecl-intl devel/php70-intl devel/php71-intl devel/php72-intl editors/libreoffice/files games/0ad ... X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2: audio/ncmpcpp databases/evolution-data-server/files devel/pecl-intl devel/php70-intl devel/php71-intl devel/php72-intl editors/libreoffice/files games/0ad games/openttd games/widel... X-SVN-Commit-Revision: 466433 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, 04 Apr 2018 12:03:05 -0000 Author: jbeich Date: Wed Apr 4 12:03:02 2018 New Revision: 466433 URL: https://svnweb.freebsd.org/changeset/ports/466433 Log: MFH: r466396 r466397 r466398 r466399 r466400 r466409 r466410 r466411 r466412 r466414 r466415 r466416 r466431 devel/icu: prepare consumers for 61 update https://ssl.icu-project.org/trac/changeset/40705 PR: 227042 Reported by: antoine (via exp-run) Approved by: ports-secteam blanket Added: branches/2018Q2/databases/evolution-data-server/files/patch-icu61 - copied unchanged from r466409, head/databases/evolution-data-server/files/patch-icu61 branches/2018Q2/editors/libreoffice/files/patch-icu61 - copied unchanged from r466431, head/editors/libreoffice/files/patch-icu61 branches/2018Q2/games/widelands/files/patch-src_graphic_text_bidi.h - copied unchanged from r466414, head/games/widelands/files/patch-src_graphic_text_bidi.h Modified: branches/2018Q2/audio/ncmpcpp/Makefile branches/2018Q2/devel/pecl-intl/Makefile branches/2018Q2/devel/php70-intl/Makefile branches/2018Q2/devel/php71-intl/Makefile branches/2018Q2/devel/php72-intl/Makefile branches/2018Q2/games/0ad/Makefile branches/2018Q2/games/openttd/Makefile branches/2018Q2/graphics/mapnik/Makefile branches/2018Q2/graphics/mapnik/distinfo branches/2018Q2/misc/sword/Makefile branches/2018Q2/multimedia/aegisub/Makefile branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile branches/2018Q2/textproc/rubygem-charlock_holmes/distinfo branches/2018Q2/textproc/zorba/Makefile branches/2018Q2/www/node8/Makefile branches/2018Q2/www/node8/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/audio/ncmpcpp/Makefile ============================================================================== --- branches/2018Q2/audio/ncmpcpp/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/audio/ncmpcpp/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -24,6 +24,7 @@ BROKEN_powerpc64= fails to compile: tags.cpp: undefine USES= compiler:c++14-lang iconv libtool localbase ncurses:port pkgconfig readline tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= glib20 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 LDFLAGS+= -lpthread CONFIGURE_ENV= BOOST_LIB_SUFFIX="" Copied: branches/2018Q2/databases/evolution-data-server/files/patch-icu61 (from r466409, head/databases/evolution-data-server/files/patch-icu61) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/databases/evolution-data-server/files/patch-icu61 Wed Apr 4 12:03:02 2018 (r466433, copy of r466409, head/databases/evolution-data-server/files/patch-icu61) @@ -0,0 +1,31 @@ +--- src/libedataserver/e-alphabet-index-private.cpp.orig 2017-05-08 12:04:10 UTC ++++ src/libedataserver/e-alphabet-index-private.cpp +@@ -76,7 +76,7 @@ _e_alphabet_index_cxx_get_index (EAlphabetIndex *alph + const gchar *word) + { + UErrorCode status = U_ZERO_ERROR; +- UnicodeString string; ++ icu::UnicodeString string; + gint index; + + g_return_val_if_fail (alphabet_index != NULL, -1); +@@ -129,7 +129,7 @@ _e_alphabet_index_cxx_get_labels (EAlphabetIndex *alp + + for (i = 0; alphabet_index->priv->nextBucket (status); i++) { + UAlphabeticIndexLabelType label_type; +- UnicodeString ustring; ++ icu::UnicodeString ustring; + std::string string; + + label_type = alphabet_index->priv->getBucketLabelType (); +--- src/libedataserver/e-transliterator-private.cpp.orig 2017-05-08 12:04:10 UTC ++++ src/libedataserver/e-transliterator-private.cpp +@@ -74,7 +74,7 @@ gchar * + _e_transliterator_cxx_transliterate (ETransliterator *transliterator, + const gchar *str) + { +- UnicodeString transform; ++ icu::UnicodeString transform; + std::string sourceUTF8; + std::string targetUTF8; + Modified: branches/2018Q2/devel/pecl-intl/Makefile ============================================================================== --- branches/2018Q2/devel/pecl-intl/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/devel/pecl-intl/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -17,4 +17,6 @@ IGNORE_WITH_PHP=70 71 72 USES= compiler:c++11-lib php:pecl USE_CXXSTD= gnu++11 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 + .include Modified: branches/2018Q2/devel/php70-intl/Makefile ============================================================================== --- branches/2018Q2/devel/php70-intl/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/devel/php70-intl/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -10,4 +10,6 @@ PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 + .include "${MASTERDIR}/Makefile" Modified: branches/2018Q2/devel/php71-intl/Makefile ============================================================================== --- branches/2018Q2/devel/php71-intl/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/devel/php71-intl/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -9,4 +9,6 @@ PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 + .include "${MASTERDIR}/Makefile" Modified: branches/2018Q2/devel/php72-intl/Makefile ============================================================================== --- branches/2018Q2/devel/php72-intl/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/devel/php72-intl/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -9,4 +9,6 @@ PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 + .include "${MASTERDIR}/Makefile" Copied: branches/2018Q2/editors/libreoffice/files/patch-icu61 (from r466431, head/editors/libreoffice/files/patch-icu61) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/editors/libreoffice/files/patch-icu61 Wed Apr 4 12:03:02 2018 (r466433, copy of r466431, head/editors/libreoffice/files/patch-icu61) @@ -0,0 +1,283 @@ +https://cgit.freedesktop.org/libreoffice/core/commit/?id=f7961456d81c3ee6ee4c13eac9ef7add6c7ea6b5 +https://cgit.freedesktop.org/libreoffice/core/commit/?id=7c46e0086802c22f5a5040d9161d4d2b3b2a3aff +https://cgit.freedesktop.org/libreoffice/core/commit/?id=8960ecc689ce41cfaa40b65d75830d7491b06463 +https://cgit.freedesktop.org/libreoffice/core/commit/?id=f240332f8e965ea17b70b0ccaa9990ce0a53cfc6 +https://cgit.freedesktop.org/libreoffice/core/commit/?id=ad3b7c27cdc957a8a38876c040e86a81c3cf7003 + +--- i18npool/inc/collator_unicode.hxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/inc/collator_unicode.hxx +@@ -63,7 +63,7 @@ class Collator_Unicode final : public cppu::WeakImplHe + + private: + const sal_Char *implementationName; +- RuleBasedCollator *uca_base, *collator; ++ icu::RuleBasedCollator *uca_base, *collator; + #ifndef DISABLE_DYNLOADING + oslModule hModule; + #endif +--- i18npool/source/breakiterator/breakiterator_unicode.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/source/breakiterator/breakiterator_unicode.cxx +@@ -56,14 +56,14 @@ BreakIterator_Unicode::~BreakIterator_Unicode() + } + + /* +- Wrapper class to provide public access to the RuleBasedBreakIterator's ++ Wrapper class to provide public access to the icu::RuleBasedBreakIterator's + setbreakType method. + */ +-class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator ++class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator + { + public: + #if (U_ICU_VERSION_MAJOR_NUM < 58) +- // RuleBasedBreakIterator::setBreakType() is private as of ICU 58. ++ // icu::RuleBasedBreakIterator::setBreakType() is private as of ICU 58. + void publicSetBreakType(int32_t type) + { + setBreakType(type); +@@ -71,7 +71,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBrea + #endif + OOoRuleBasedBreakIterator(UDataMemory* image, + UErrorCode &status) +- : RuleBasedBreakIterator(image, status) ++ : icu::RuleBasedBreakIterator(image, status) + { }; + + }; +@@ -334,7 +334,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacte + icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get(); + for (nDone = 0; nDone < nCount; nDone++) { + nStartPos = pBI->following(nStartPos); +- if (nStartPos == BreakIterator::DONE) ++ if (nStartPos == icu::BreakIterator::DONE) + return Text.getLength(); + } + } else { // for CHARACTER mode +@@ -353,7 +353,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousChar + icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get(); + for (nDone = 0; nDone < nCount; nDone++) { + nStartPos = pBI->preceding(nStartPos); +- if (nStartPos == BreakIterator::DONE) ++ if (nStartPos == icu::BreakIterator::DONE) + return 0; + } + } else { // for BS to delete one char and CHARACTER mode. +@@ -371,7 +371,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( con + + Boundary rv; + rv.startPos = icuBI->mpValue->mpBreakIterator->following(nStartPos); +- if( rv.startPos >= Text.getLength() || rv.startPos == BreakIterator::DONE ) ++ if( rv.startPos >= Text.getLength() || rv.startPos == icu::BreakIterator::DONE ) + rv.endPos = result.startPos; + else { + if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES || +@@ -380,7 +380,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( con + rv.startPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos); + + rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos); +- if(rv.endPos == BreakIterator::DONE) ++ if(rv.endPos == icu::BreakIterator::DONE) + rv.endPos = rv.startPos; + } + return rv; +@@ -394,7 +394,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord( + + Boundary rv; + rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(nStartPos); +- if( rv.startPos < 0 || rv.startPos == BreakIterator::DONE) ++ if( rv.startPos < 0 || rv.startPos == icu::BreakIterator::DONE) + rv.endPos = rv.startPos; + else { + if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES || +@@ -403,7 +403,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord( + rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(rv.startPos); + + rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos); +- if(rv.endPos == BreakIterator::DONE) ++ if(rv.endPos == icu::BreakIterator::DONE) + rv.endPos = rv.startPos; + } + return rv; +@@ -435,9 +435,9 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBounda + rv.endPos = icuBI->mpValue->mpBreakIterator->following(nPos); + } + } +- if (rv.startPos == BreakIterator::DONE) ++ if (rv.startPos == icu::BreakIterator::DONE) + rv.startPos = rv.endPos; +- else if (rv.endPos == BreakIterator::DONE) ++ else if (rv.endPos == icu::BreakIterator::DONE) + rv.endPos = rv.startPos; + + return rv; +@@ -502,7 +502,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLi + lbr.breakIndex = nStartPos; + lbr.breakType = BreakType::WORDBOUNDARY; + } else if (hOptions.rHyphenator.is()) { //Hyphenation break +- sal_Int32 boundary_with_punctuation = (pLineBI->next() != BreakIterator::DONE) ? pLineBI->current() : 0; ++ sal_Int32 boundary_with_punctuation = (pLineBI->next() != icu::BreakIterator::DONE) ? pLineBI->current() : 0; + pLineBI->preceding(nStartPos + 1); // reset to check correct hyphenation of "word-word" + + sal_Int32 nStartPosWordEnd = nStartPos; +--- i18npool/source/collator/collator_unicode.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/source/collator/collator_unicode.cxx +@@ -138,7 +138,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString + UErrorCode status = U_ZERO_ERROR; + OUString rule = LocaleDataImpl::get()->getCollatorRuleByAlgorithm(rLocale, rAlgorithm); + if (!rule.isEmpty()) { +- collator = new RuleBasedCollator(reinterpret_cast(rule.getStr()), status); ++ collator = new icu::RuleBasedCollator(reinterpret_cast(rule.getStr()), status); + if (! U_SUCCESS(status)) throw RuntimeException(); + } + if (!collator && OUString(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) { +@@ -343,7 +343,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString + size_t ruleImageSize = funclen(); + + #if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2) +- uca_base = new RuleBasedCollator(static_cast(NULL), status); ++ uca_base = new icu::RuleBasedCollator(static_cast(NULL), status); + #else + // Not only changed ICU 53.1 the API behavior that a negative + // length (ruleImageSize) now leads to failure, but also that +@@ -354,11 +354,11 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString + // The default collator of the en-US locale would also fulfill + // the requirement. The collator of the actual locale or the + // NULL (default) locale does not. +- uca_base = static_cast(icu::Collator::createInstance( ++ uca_base = static_cast(icu::Collator::createInstance( + icu::Locale::getRoot(), status)); + #endif + if (! U_SUCCESS(status)) throw RuntimeException(); +- collator = new RuleBasedCollator( ++ collator = new icu::RuleBasedCollator( + reinterpret_cast(ruleImage), ruleImageSize, uca_base, status); + if (! U_SUCCESS(status)) throw RuntimeException(); + } +@@ -372,17 +372,17 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString + */ + icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( rLocale), rAlgorithm)); + // load ICU collator +- collator = static_cast( icu::Collator::createInstance(icuLocale, status) ); ++ collator = static_cast( icu::Collator::createInstance(icuLocale, status) ); + if (! U_SUCCESS(status)) throw RuntimeException(); + } + } + + if (options & CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT) +- collator->setStrength(Collator::PRIMARY); ++ collator->setStrength(icu::Collator::PRIMARY); + else if (options & CollatorOptions::CollatorOptions_IGNORE_CASE) +- collator->setStrength(Collator::SECONDARY); ++ collator->setStrength(icu::Collator::SECONDARY); + else +- collator->setStrength(Collator::TERTIARY); ++ collator->setStrength(icu::Collator::TERTIARY); + + return 0; + } +--- i18npool/source/collator/gencoll_rule.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/source/collator/gencoll_rule.cxx +@@ -113,7 +113,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) + //UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF, + // UCOL_DEFAULT_STRENGTH, &parseError, &status); + +- auto coll = o3tl::make_unique(reinterpret_cast(Obuf.getStr()), status); ++ auto coll = o3tl::make_unique(reinterpret_cast(Obuf.getStr()), status); + + if (U_SUCCESS(status)) { + std::vector data; +--- i18npool/source/ordinalsuffix/ordinalsuffix.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/source/ordinalsuffix/ordinalsuffix.cxx +@@ -79,7 +79,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixServic + if (!U_SUCCESS(nCode)) + return retValue; + +- std::unique_ptr xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode)); ++ std::unique_ptr xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode)); + if (!U_SUCCESS(nCode)) + return retValue; + +--- i18npool/source/transliteration/ignoreDiacritics_CTL.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/source/transliteration/ignoreDiacritics_CTL.cxx +@@ -35,7 +35,7 @@ ignoreDiacritics_CTL::transliterateChar2Char(sal_Unico + if (!m_transliterator) + throw css::uno::RuntimeException(); + +- UnicodeString aChar(nInChar); ++ icu::UnicodeString aChar(nInChar); + m_transliterator->transliterate(aChar); + + if (aChar.isEmpty()) +@@ -68,7 +68,7 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr, + { + sal_Int32 nIndex = nPosition; + UChar32 nChar = rInStr.iterateCodePoints(&nIndex); +- UnicodeString aUStr(nChar); ++ icu::UnicodeString aUStr(nChar); + m_transliterator->transliterate(aUStr); + + if (nOffset + aUStr.length() > rOffset.getLength()) +@@ -87,7 +87,7 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr, + } + else + { +- UnicodeString aUStr(reinterpret_cast(rInStr.getStr()) + nStartPos, nCount); ++ icu::UnicodeString aUStr(reinterpret_cast(rInStr.getStr()) + nStartPos, nCount); + m_transliterator->transliterate(aUStr); + return OUString(reinterpret_cast(aUStr.getBuffer()), aUStr.length()); + } +--- i18nutil/source/utility/unicode.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18nutil/source/utility/unicode.cxx +@@ -750,15 +750,15 @@ OUString SAL_CALL unicode::formatPercent(double dNumbe + + icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag); + +- std::unique_ptr xF( +- NumberFormat::createPercentInstance(aLocale, errorCode)); ++ std::unique_ptr xF( ++ icu::NumberFormat::createPercentInstance(aLocale, errorCode)); + if(U_FAILURE(errorCode)) + { +- SAL_WARN("i18n", "NumberFormat::createPercentInstance failed"); ++ SAL_WARN("i18n", "icu::NumberFormat::createPercentInstance failed"); + return OUString::number(dNumber) + "%"; + } + +- UnicodeString output; ++ icu::UnicodeString output; + xF->format(dNumber/100, output); + OUString aRet(reinterpret_cast(output.getBuffer()), + output.length()); +--- lotuswordpro/source/filter/localtime.cxx.orig 2018-02-22 17:45:41 UTC ++++ lotuswordpro/source/filter/localtime.cxx +@@ -174,7 +174,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm) + + if ((rtime > 3 * DAY_SEC)&&(rtime < LONG_MAX - 3 * DAY_SEC)) + { +- TimeZone* pLocalZone = TimeZone::createDefault(); ++ icu::TimeZone* pLocalZone = icu::TimeZone::createDefault(); + long offset = (pLocalZone->getRawOffset())/1000; + delete pLocalZone; + long ltime = rtime + offset; +--- opencl/source/openclconfig.cxx.orig 2018-02-22 17:45:41 UTC ++++ opencl/source/openclconfig.cxx +@@ -119,7 +119,7 @@ bool match(const OUString& rPattern, const OUString& r + UErrorCode nIcuError(U_ZERO_ERROR); + icu::UnicodeString sIcuPattern(reinterpret_cast(rPattern.getStr()), rPattern.getLength()); + icu::UnicodeString sIcuInput(reinterpret_cast(rInput.getStr()), rInput.getLength()); +- RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError); ++ icu::RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError); + + return U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) && U_SUCCESS(nIcuError); + } +--- vcl/inc/scrptrun.h.orig 2018-02-22 17:45:41 UTC ++++ vcl/inc/scrptrun.h +@@ -58,7 +58,7 @@ struct ParenStackEntry + } + }; + +-class ScriptRun : public UObject { ++class ScriptRun : public icu::UObject { + public: + + ScriptRun(const UChar chars[], int32_t length); Modified: branches/2018Q2/games/0ad/Makefile ============================================================================== --- branches/2018Q2/games/0ad/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/games/0ad/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -29,6 +29,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha BUILD_WRKSRC= ${WRKSRC}/build/workspaces/gcc MAKE_ARGS= config=release +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 USES= compiler:c++11-lib dos2unix gmake iconv jpeg openal:al \ pkgconfig python:build tar:xz USE_GNOME= libxml2 gtk20 Modified: branches/2018Q2/games/openttd/Makefile ============================================================================== --- branches/2018Q2/games/openttd/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/games/openttd/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -58,6 +58,7 @@ USE_RC_SUBR= ${PORTNAME} .else USES+= compiler:c++11-lib USE_CXXSTD= gnu++11 +CXXFLAGS+= -DU_USING_ICU_NAMESPACE=1 LIB_DEPENDS+= libfreetype.so:print/freetype2 \ libicui18n.so:devel/icu \ libicu-le-hb.so:devel/icu-le-hb \ Copied: branches/2018Q2/games/widelands/files/patch-src_graphic_text_bidi.h (from r466414, head/games/widelands/files/patch-src_graphic_text_bidi.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/games/widelands/files/patch-src_graphic_text_bidi.h Wed Apr 4 12:03:02 2018 (r466433, copy of r466414, head/games/widelands/files/patch-src_graphic_text_bidi.h) @@ -0,0 +1,13 @@ +https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/revision/8641 + +--- src/graphic/text/bidi.h.orig 2016-11-10 07:28:01 UTC ++++ src/graphic/text/bidi.h +@@ -40,7 +40,7 @@ bool has_rtl_character(std::vector input) + // True if a string contains a character from the script's code blocks + bool has_script_character(const char* input, UI::FontSets::Selector script); + UI::FontSet const* find_fontset(const char* word, const UI::FontSets& fontsets); +-std::string icustring2string(const UnicodeString& convertme); ++std::string icustring2string(const icu::UnicodeString& convertme); + std::string icuchar2string(const UChar& convertme); + bool cannot_start_line(const UChar& c); + bool cannot_end_line(const UChar& c); Modified: branches/2018Q2/graphics/mapnik/Makefile ============================================================================== --- branches/2018Q2/graphics/mapnik/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/graphics/mapnik/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -8,6 +8,9 @@ PORTREVISION= 16 CATEGORIES= graphics geography MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/ +PATCH_SITES= https://github.com/mapnik/mapnik/commit/ +PATCHFILES= 1ddfe6c31548.patch:-p1 + MAINTAINER= littlesavage@rambler.ru COMMENT= Free Toolkit For Developing Mapping Applications Modified: branches/2018Q2/graphics/mapnik/distinfo ============================================================================== --- branches/2018Q2/graphics/mapnik/distinfo Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/graphics/mapnik/distinfo Wed Apr 4 12:03:02 2018 (r466433) @@ -1,2 +1,5 @@ +TIMESTAMP = 1448548335 SHA256 (mapnik-v3.0.9.tar.bz2) = 3a3f67532b05f8a527a5bab32effd7dd5aa59165c7e24505268f6d827955d3da SIZE (mapnik-v3.0.9.tar.bz2) = 75213927 +SHA256 (1ddfe6c31548.patch) = fab754996485dc607108a4fd69d0df82414928eb5a210b329a84f47e90da0c8a +SIZE (1ddfe6c31548.patch) = 2148 Modified: branches/2018Q2/misc/sword/Makefile ============================================================================== --- branches/2018Q2/misc/sword/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/misc/sword/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -16,6 +16,7 @@ BUILD_DEPENDS= cppunit-config:devel/cppunit GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-conf --with-zlib +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 INSTALL_TARGET= install-strip USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes Modified: branches/2018Q2/multimedia/aegisub/Makefile ============================================================================== --- branches/2018Q2/multimedia/aegisub/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/multimedia/aegisub/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -28,6 +28,7 @@ WX_CONF_ARGS= absolute USE_GL= gl USE_CSTD= c99 USE_CXXSTD= c++11 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 LDFLAGS+= -Wl,--as-needed # freetype GNU_CONFIGURE= yes Modified: branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile ============================================================================== --- branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -6,6 +6,9 @@ PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG +PATCH_SITES= https://github.com/brianmario/charlock_holmes/commit/ +PATCHFILES= 018be8532670.patch:-p1 + MAINTAINER= kuriyama@FreeBSD.org COMMENT= Gems for character encoding detection Modified: branches/2018Q2/textproc/rubygem-charlock_holmes/distinfo ============================================================================== --- branches/2018Q2/textproc/rubygem-charlock_holmes/distinfo Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/textproc/rubygem-charlock_holmes/distinfo Wed Apr 4 12:03:02 2018 (r466433) @@ -1,3 +1,5 @@ TIMESTAMP = 1504489308 SHA256 (rubygem/charlock_holmes-0.7.5.gem) = 9e942575e702c96e3747f494756a72eee008a185d6c7ebd1049c4dd0b529b625 SIZE (rubygem/charlock_holmes-0.7.5.gem) = 10752 +SHA256 (rubygem/018be8532670.patch) = f54871c047f27ad057720c1f3ef7578bb87edc2c9e5ee3623a3d26b9dde40f13 +SIZE (rubygem/018be8532670.patch) = 2324 Modified: branches/2018Q2/textproc/zorba/Makefile ============================================================================== --- branches/2018Q2/textproc/zorba/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/textproc/zorba/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -41,6 +41,7 @@ USES= cmake:outsource compiler:c++11-lib libedit USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes USE_CXXSTD= c++11 +CXXFLAGS+= -DU_USING_ICU_NAMESPACE=1 CXXFLAGS+= -I${LOCALBASE}/include -O1 # compiler hangs with -O2 on CURRENT LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \ Modified: branches/2018Q2/www/node8/Makefile ============================================================================== --- branches/2018Q2/www/node8/Makefile Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/www/node8/Makefile Wed Apr 4 12:03:02 2018 (r466433) @@ -7,6 +7,9 @@ CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 8 +PATCH_SITES= https://github.com/nodejs/node/commit/ +PATCHFILES= b8f47b27571f.patch:-p1 + MAINTAINER= bhughes@FreeBSD.org COMMENT= V8 JavaScript for client and server (8.x LTS) Modified: branches/2018Q2/www/node8/distinfo ============================================================================== --- branches/2018Q2/www/node8/distinfo Wed Apr 4 11:50:10 2018 (r466432) +++ branches/2018Q2/www/node8/distinfo Wed Apr 4 12:03:02 2018 (r466433) @@ -1,3 +1,5 @@ TIMESTAMP = 1522526743 SHA256 (node-v8.11.1.tar.gz) = 86678028f13b26ceed08efc4b838921ca1bf514c0b7e8151bfec8ba15c5e66ad SIZE (node-v8.11.1.tar.gz) = 31030225 +SHA256 (b8f47b27571f.patch) = b0b22c490c4b4e7ed4bad46d1989e980a0ba30299855ec0164ff3d11384833c7 +SIZE (b8f47b27571f.patch) = 4763 From owner-svn-ports-branches@freebsd.org Wed Apr 4 12:04:14 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 2D7C1F88B79; Wed, 4 Apr 2018 12:04:14 +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 D3A867611D; Wed, 4 Apr 2018 12:04:13 +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 CE8251374A; Wed, 4 Apr 2018 12:04:13 +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 w34C4DYU081131; Wed, 4 Apr 2018 12:04:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w34C4Dw6081127; Wed, 4 Apr 2018 12:04:13 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804041204.w34C4Dw6081127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 4 Apr 2018 12:04:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466434 - in branches/2018Q2/www/firefox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/firefox: . files X-SVN-Commit-Revision: 466434 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, 04 Apr 2018 12:04:14 -0000 Author: jbeich Date: Wed Apr 4 12:04:13 2018 New Revision: 466434 URL: https://svnweb.freebsd.org/changeset/ports/466434 Log: MFH: r466432 www/firefox: unbreak copy/paste with some terminal emulators Obtained from: upstream (Firefox 61) Approved by: ports-secteam blanket Added: branches/2018Q2/www/firefox/files/patch-bug1447925 - copied unchanged from r466432, head/www/firefox/files/patch-bug1447925 Modified: branches/2018Q2/www/firefox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/firefox/Makefile ============================================================================== --- branches/2018Q2/www/firefox/Makefile Wed Apr 4 12:03:02 2018 (r466433) +++ branches/2018Q2/www/firefox/Makefile Wed Apr 4 12:04:13 2018 (r466434) @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 59.0.2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= https://hg.mozilla.org/releases/mozilla-release/archive/ Copied: branches/2018Q2/www/firefox/files/patch-bug1447925 (from r466432, head/www/firefox/files/patch-bug1447925) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/firefox/files/patch-bug1447925 Wed Apr 4 12:04:13 2018 (r466434, copy of r466432, head/www/firefox/files/patch-bug1447925) @@ -0,0 +1,447 @@ +commit d648a9a26195 +Author: Martin Stransky +Date: Tue Mar 27 15:51:07 2018 +0200 + + Bug 1447925 - Add GetClipboardText() to get text data from clipboard, r=jhorak + + GetClipboardText() calls gtk_clipboard_request_text() to request text clipboard data from Gtk+ + and leave Gtk+ to do clipboard text format conversions. Also unify data getting code for text/data/targets. + + MozReview-Commit-ID: 9DGSdOACho1 + + --HG-- + extra : rebase_source : f1d95609f8a7587a4abc11739db9d17ec5446a7b +--- + widget/gtk/nsClipboard.h | 1 + + widget/gtk/nsClipboardX11.cpp | 177 +++++++++++++++++++++++++++++------------- + widget/gtk/nsClipboardX11.h | 39 +++++++--- + 3 files changed, 152 insertions(+), 65 deletions(-) + +diff --git widget/gtk/nsClipboard.h widget/gtk/nsClipboard.h +index 2be635bca10d..fa3b9b6ff087 100644 +--- widget/gtk/nsClipboard.h ++++ widget/gtk/nsClipboard.h +@@ -21,6 +21,7 @@ public: + virtual const char* GetClipboardData(const char* aMimeType, + int32_t aWhichClipboard, + uint32_t* aContentLength) = 0; ++ virtual const char* GetClipboardText(int32_t aWhichClipboard) = 0; + virtual void ReleaseClipboardData(const char* aClipboardData) = 0; + + virtual GdkAtom* GetTargets(int32_t aWhichClipboard, +diff --git widget/gtk/nsClipboardX11.cpp widget/gtk/nsClipboardX11.cpp +index 6a574069dcc4..e8d8522651c2 100644 +--- widget/gtk/nsClipboardX11.cpp ++++ widget/gtk/nsClipboardX11.cpp +@@ -62,8 +62,10 @@ selection_request_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) + + nsRetrievalContextX11::nsRetrievalContextX11() + : mState(INITIAL) +- , mData(nullptr) + , mClipboardRequestNumber(0) ++ , mClipboardData(nullptr) ++ , mClipboardDataLength(0) ++ , mTargetMIMEType(gdk_atom_intern("TARGETS", FALSE)) + { + // A custom event filter to workaround attempting to dereference a null + // selection requestor in GTK3 versions before 3.11.3. See bug 1178799. +@@ -139,13 +141,11 @@ checkEventProc(Display *display, XEvent *event, XPointer arg) + return False; + } + +-void * +-nsRetrievalContextX11::Wait() ++bool ++nsRetrievalContextX11::WaitForX11Content() + { + if (mState == COMPLETED) { // the request completed synchronously +- void *data = mData; +- mData = nullptr; +- return data; ++ return true; + } + + GdkDisplay *gdkDisplay = gdk_display_get_default(); +@@ -181,9 +181,7 @@ nsRetrievalContextX11::Wait() + DispatchPropertyNotifyEvent(context.cbWidget, &xevent); + + if (mState == COMPLETED) { +- void *data = mData; +- mData = nullptr; +- return data; ++ return true; + } + } + +@@ -200,11 +198,12 @@ nsRetrievalContextX11::Wait() + printf("exceeded clipboard timeout\n"); + #endif + mState = TIMED_OUT; +- return nullptr; ++ return false; + } + + // Call this when data has been retrieved. +-void nsRetrievalContextX11::Complete(GtkSelectionData* aData, ++void nsRetrievalContextX11::Complete(ClipboardDataType aDataType, ++ const void* aData, + int aDataRequestNumber) + { + if (mClipboardRequestNumber != aDataRequestNumber) { +@@ -214,8 +213,54 @@ void nsRetrievalContextX11::Complete(GtkSelectionData* aData, + + if (mState == INITIAL) { + mState = COMPLETED; +- mData = gtk_selection_data_get_length(aData) >= 0 ? +- gtk_selection_data_copy(aData) : nullptr; ++ ++ MOZ_ASSERT(mClipboardData == nullptr && ++ mClipboardDataLength == 0, ++ "We're leaking clipboard data!"); ++ ++ switch (aDataType) { ++ case CLIPBOARD_TEXT: ++ { ++ const char* text = static_cast(aData); ++ if (text) { ++ mClipboardDataLength = sizeof(char) * (strlen(text) + 1); ++ mClipboardData = moz_xmalloc(mClipboardDataLength); ++ memcpy(mClipboardData, text, mClipboardDataLength); ++ } ++ } ++ break; ++ case CLIPBOARD_TARGETS: ++ { ++ const GtkSelectionData *selection = ++ static_cast(aData); ++ ++ gint n_targets = 0; ++ GdkAtom *targets = nullptr; ++ ++ if (!gtk_selection_data_get_targets(selection, &targets, &n_targets) || ++ !n_targets) { ++ return; ++ } ++ ++ mClipboardData = targets; ++ mClipboardDataLength = n_targets; ++ } ++ break; ++ case CLIPBOARD_DATA: ++ { ++ const GtkSelectionData *selection = ++ static_cast(aData); ++ ++ gint dataLength = gtk_selection_data_get_length(selection); ++ if (dataLength > 0) { ++ mClipboardDataLength = dataLength; ++ mClipboardData = moz_xmalloc(dataLength); ++ memcpy(mClipboardData, gtk_selection_data_get_data(selection), ++ dataLength); ++ } ++ } ++ break; ++ } + } else { + // Already timed out + MOZ_ASSERT(mState == TIMED_OUT); +@@ -233,12 +278,24 @@ clipboard_contents_received(GtkClipboard *clipboard, + delete handler; + } + +-GtkSelectionData* +-nsRetrievalContextX11::WaitForContents(GtkClipboard *clipboard, +- const char *aMimeType) ++static void ++clipboard_text_received(GtkClipboard *clipboard, ++ const gchar *text, ++ gpointer data) ++{ ++ ClipboardRequestHandler *handler = ++ static_cast(data); ++ handler->Complete(text); ++ delete handler; ++} ++ ++bool ++nsRetrievalContextX11::WaitForClipboardData(ClipboardDataType aDataType, ++ GtkClipboard *clipboard, ++ const char *aMimeType) + { + mState = INITIAL; +- NS_ASSERTION(!mData, "Leaking clipboard content!"); ++ NS_ASSERTION(!mClipboardData, "Leaking clipboard content!"); + + // Call ClipboardRequestHandler() with unique clipboard request number. + // The request number pairs gtk_clipboard_request_contents() data request +@@ -246,39 +303,45 @@ nsRetrievalContextX11::WaitForContents(GtkClipboard *clipboard, + // is provided by Gtk. + mClipboardRequestNumber++; + ClipboardRequestHandler* handler = +- new ClipboardRequestHandler(this, mClipboardRequestNumber); ++ new ClipboardRequestHandler(this, aDataType, mClipboardRequestNumber); ++ ++ switch (aDataType) { ++ case CLIPBOARD_DATA: ++ gtk_clipboard_request_contents(clipboard, ++ gdk_atom_intern(aMimeType, FALSE), clipboard_contents_received, ++ handler); ++ break; ++ case CLIPBOARD_TEXT: ++ gtk_clipboard_request_text(clipboard, clipboard_text_received, ++ handler); ++ break; ++ case CLIPBOARD_TARGETS: ++ gtk_clipboard_request_contents(clipboard, ++ mTargetMIMEType, clipboard_contents_received, ++ handler); ++ break; ++ } + +- gtk_clipboard_request_contents(clipboard, +- gdk_atom_intern(aMimeType, FALSE), +- clipboard_contents_received, +- handler); +- return static_cast(Wait()); ++ return WaitForX11Content(); + } + + GdkAtom* + nsRetrievalContextX11::GetTargets(int32_t aWhichClipboard, int* aTargetNums) + { +- *aTargetNums = 0; ++ GtkClipboard *clipboard = ++ gtk_clipboard_get(GetSelectionAtom(aWhichClipboard)); + +- GtkClipboard *clipboard = +- gtk_clipboard_get(GetSelectionAtom(aWhichClipboard)); +- +- GtkSelectionData *selection_data = WaitForContents(clipboard, "TARGETS"); +- if (!selection_data) +- return nullptr; ++ if (!WaitForClipboardData(CLIPBOARD_TARGETS, clipboard)) ++ return nullptr; + +- gint n_targets = 0; +- GdkAtom *targets = nullptr; ++ *aTargetNums = mClipboardDataLength; ++ GdkAtom* targets = static_cast(mClipboardData); + +- if (!gtk_selection_data_get_targets(selection_data, &targets, &n_targets) || +- !n_targets) { +- return nullptr; +- } ++ // We don't hold the target list internally but we transfer the ownership. ++ mClipboardData = nullptr; ++ mClipboardDataLength = 0; + +- gtk_selection_data_free(selection_data); +- +- *aTargetNums = n_targets; +- return targets; ++ return targets; + } + + const char* +@@ -289,25 +352,31 @@ nsRetrievalContextX11::GetClipboardData(const char* aMimeType, + GtkClipboard *clipboard; + clipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard)); + +- GtkSelectionData *selectionData = WaitForContents(clipboard, aMimeType); +- if (!selectionData) ++ if (!WaitForClipboardData(CLIPBOARD_DATA, clipboard, aMimeType)) + return nullptr; + +- char* clipboardData = nullptr; +- int contentLength = gtk_selection_data_get_length(selectionData); +- if (contentLength > 0) { +- clipboardData = reinterpret_cast( +- moz_xmalloc(sizeof(char)*contentLength)); +- memcpy(clipboardData, gtk_selection_data_get_data(selectionData), +- sizeof(char)*contentLength); +- } +- gtk_selection_data_free(selectionData); ++ *aContentLength = mClipboardDataLength; ++ return static_cast(mClipboardData); ++} + +- *aContentLength = contentLength; +- return (const char*)clipboardData; ++const char* ++nsRetrievalContextX11::GetClipboardText(int32_t aWhichClipboard) ++{ ++ GtkClipboard *clipboard; ++ clipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard)); ++ ++ if (!WaitForClipboardData(CLIPBOARD_TEXT, clipboard)) ++ return nullptr; ++ ++ return static_cast(mClipboardData); + } + + void nsRetrievalContextX11::ReleaseClipboardData(const char* aClipboardData) + { +- free((void *)aClipboardData); ++ NS_ASSERTION(aClipboardData == mClipboardData, ++ "Releasing unknown clipboard data!"); ++ free((void*)aClipboardData); ++ ++ mClipboardData = nullptr; ++ mClipboardDataLength = 0; + } +diff --git widget/gtk/nsClipboardX11.h widget/gtk/nsClipboardX11.h +index 210f6b1fdbd4..9e89e08445dd 100644 +--- widget/gtk/nsClipboardX11.h ++++ widget/gtk/nsClipboardX11.h +@@ -11,6 +11,12 @@ + #include "nsIClipboard.h" + #include + ++enum ClipboardDataType { ++ CLIPBOARD_DATA, ++ CLIPBOARD_TEXT, ++ CLIPBOARD_TARGETS ++}; ++ + class nsRetrievalContextX11 : public nsRetrievalContext + { + public: +@@ -19,48 +25,59 @@ public: + virtual const char* GetClipboardData(const char* aMimeType, + int32_t aWhichClipboard, + uint32_t* aContentLength) override; ++ virtual const char* GetClipboardText(int32_t aWhichClipboard) override; + virtual void ReleaseClipboardData(const char* aClipboardData) override; + + virtual GdkAtom* GetTargets(int32_t aWhichClipboard, + int* aTargetNums) override; + +- // Call this when data has been retrieved. +- void Complete(GtkSelectionData* aData, int aDataRequestNumber); ++ // Call this when data or text has been retrieved. ++ void Complete(ClipboardDataType aDataType, ++ const void* aData, ++ int aDataRequestNumber); + + nsRetrievalContextX11(); + virtual ~nsRetrievalContextX11() override; + + private: +- GtkSelectionData* WaitForContents(GtkClipboard *clipboard, +- const char *aMimeType); ++ bool WaitForClipboardData(ClipboardDataType aDataType, ++ GtkClipboard *clipboard, ++ const char *aMimeType = nullptr); ++ + /** + * Spins X event loop until timing out or being completed. Returns + * null if we time out, otherwise returns the completed data (passing + * ownership to caller). + */ +- void *Wait(); ++ bool WaitForX11Content(); + +- State mState; +- void* mData; +- int mClipboardRequestNumber; ++ State mState; ++ int mClipboardRequestNumber; ++ void* mClipboardData; ++ uint32_t mClipboardDataLength; ++ GdkAtom mTargetMIMEType; + }; + + class ClipboardRequestHandler + { + public: +- ClipboardRequestHandler(nsRetrievalContextX11 *aContext, int aDataRequestNumber) ++ ClipboardRequestHandler(nsRetrievalContextX11 *aContext, ++ ClipboardDataType aDataType, ++ int aDataRequestNumber) + : mContext(aContext) + , mDataRequestNumber(aDataRequestNumber) ++ , mDataType(aDataType) + {} + +- void Complete(GtkSelectionData* aData) ++ void Complete(const void *aData) + { +- mContext->Complete(aData, mDataRequestNumber); ++ mContext->Complete(mDataType, aData, mDataRequestNumber); + } + + private: + nsRetrievalContextX11 *mContext; + int mDataRequestNumber; ++ ClipboardDataType mDataType; + }; + + #endif /* __nsClipboardX11_h_ */ + +commit 3a5fb9d15546 +Author: Martin Stransky +Date: Tue Apr 3 10:30:37 2018 +0200 + + Bug 1447925 - Use GetClipboardText() to get text data at nsClipboard::GetData(), r=jhorak + + MozReview-Commit-ID: 3JnLLyk0BOF + + --HG-- + extra : rebase_source : 7bd5faff15d805d19628bdbd9fcd194c89c283a4 +--- + widget/gtk/nsClipboard.cpp | 7 ++----- + widget/gtk/nsClipboard.h | 7 ++++--- + 2 files changed, 6 insertions(+), 8 deletions(-) + +diff --git widget/gtk/nsClipboard.cpp widget/gtk/nsClipboard.cpp +index 5e8105987842..36e8d6ad5cee 100644 +--- widget/gtk/nsClipboard.cpp ++++ widget/gtk/nsClipboard.cpp +@@ -301,11 +301,8 @@ nsClipboard::GetData(nsITransferable *aTransferable, int32_t aWhichClipboard) + // Special case text/unicode since we can convert any + // string into text/unicode + if (flavorStr.EqualsLiteral(kUnicodeMime)) { +- uint32_t clipboardDataLength; + const char* clipboardData = +- mContext->GetClipboardData(GTK_DEFAULT_MIME_TEXT, +- aWhichClipboard, +- &clipboardDataLength); ++ mContext->GetClipboardText(aWhichClipboard); + if (!clipboardData) { + // If the type was text/unicode and we couldn't get + // text off the clipboard, run the next loop +@@ -314,7 +311,7 @@ nsClipboard::GetData(nsITransferable *aTransferable, int32_t aWhichClipboard) + } + + // Convert utf-8 into our unicode format. +- NS_ConvertUTF8toUTF16 ucs2string(clipboardData, clipboardDataLength); ++ NS_ConvertUTF8toUTF16 ucs2string(clipboardData); + const char* unicodeData = (const char *)ToNewUnicode(ucs2string); + uint32_t unicodeDataLength = ucs2string.Length() * 2; + SetTransferableData(aTransferable, flavorStr, +diff --git widget/gtk/nsClipboard.h widget/gtk/nsClipboard.h +index fa3b9b6ff087..9b59bf8176f6 100644 +--- widget/gtk/nsClipboard.h ++++ widget/gtk/nsClipboard.h +@@ -13,17 +13,18 @@ + #include "nsIBinaryOutputStream.h" + #include + +-// Default Gtk MIME for text +-#define GTK_DEFAULT_MIME_TEXT "UTF8_STRING" +- + class nsRetrievalContext { + public: ++ // Get actual clipboard content (GetClipboardData/GetClipboardText) ++ // which has to be released by ReleaseClipboardData(). + virtual const char* GetClipboardData(const char* aMimeType, + int32_t aWhichClipboard, + uint32_t* aContentLength) = 0; + virtual const char* GetClipboardText(int32_t aWhichClipboard) = 0; + virtual void ReleaseClipboardData(const char* aClipboardData) = 0; + ++ // Get data mime types which can be obtained from clipboard. ++ // The returned array has to be released by g_free(). + virtual GdkAtom* GetTargets(int32_t aWhichClipboard, + int* aTargetNum) = 0; + From owner-svn-ports-branches@freebsd.org Wed Apr 4 12:49: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 C6FDEF8BD35; Wed, 4 Apr 2018 12:49: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 714BF7889F; Wed, 4 Apr 2018 12:49: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 6C09213DF6; Wed, 4 Apr 2018 12:49: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 w34CncZH032088; Wed, 4 Apr 2018 12:49:38 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w34CncHj032081; Wed, 4 Apr 2018 12:49:38 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804041249.w34CncHj032081@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 4 Apr 2018 12:49:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466437 - in branches/2018Q2/www: seamonkey seamonkey-i18n seamonkey/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www: seamonkey seamonkey-i18n seamonkey/files X-SVN-Commit-Revision: 466437 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, 04 Apr 2018 12:49:39 -0000 Author: jbeich Date: Wed Apr 4 12:49:37 2018 New Revision: 466437 URL: https://svnweb.freebsd.org/changeset/ports/466437 Log: MFH: r466436 www/seamonkey: switch to rc2 Changes: https://hg.mozilla.org/releases/mozilla-esr52/rev/6c7b3cc4609f Approved by: ports-secteam blanket Deleted: branches/2018Q2/www/seamonkey/files/patch-bug1440717 Modified: branches/2018Q2/www/seamonkey-i18n/Makefile branches/2018Q2/www/seamonkey/Makefile branches/2018Q2/www/seamonkey/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/seamonkey-i18n/Makefile ============================================================================== --- branches/2018Q2/www/seamonkey-i18n/Makefile Wed Apr 4 12:48:51 2018 (r466436) +++ branches/2018Q2/www/seamonkey-i18n/Makefile Wed Apr 4 12:49:37 2018 (r466437) @@ -5,7 +5,7 @@ PORTNAME= seamonkey-i18n PORTVERSION= 2.49.3 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi \ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi \ LOCAL/jbeich/${DIST_SUBDIR} PKGNAMEPREFIX= DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./} Modified: branches/2018Q2/www/seamonkey/Makefile ============================================================================== --- branches/2018Q2/www/seamonkey/Makefile Wed Apr 4 12:48:51 2018 (r466436) +++ branches/2018Q2/www/seamonkey/Makefile Wed Apr 4 12:49:37 2018 (r466437) @@ -6,7 +6,7 @@ DISTVERSION= 2.49.3 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2018Q2/www/seamonkey/distinfo ============================================================================== --- branches/2018Q2/www/seamonkey/distinfo Wed Apr 4 12:48:51 2018 (r466436) +++ branches/2018Q2/www/seamonkey/distinfo Wed Apr 4 12:49:37 2018 (r466437) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522389599 -SHA256 (seamonkey-2.49.3.source.tar.xz) = 3d149ccb0c5bafe086182b071343561bff430907cbd67f0516282722942f098a -SIZE (seamonkey-2.49.3.source.tar.xz) = 231791060 +TIMESTAMP = 1522802344 +SHA256 (seamonkey-2.49.3.source.tar.xz) = 1823ed983bbc62e40f622288d5b24be9214ff28f15bf3f21028cc992fa96484b +SIZE (seamonkey-2.49.3.source.tar.xz) = 231547028 From owner-svn-ports-branches@freebsd.org Wed Apr 4 12:51:11 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 771E6F8BF52; Wed, 4 Apr 2018 12:51:11 +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 29D5C78BAB; Wed, 4 Apr 2018 12:51:11 +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 0C24D13F35; Wed, 4 Apr 2018 12:51:11 +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 w34CpAcJ035743; Wed, 4 Apr 2018 12:51:10 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w34CpAxj035739; Wed, 4 Apr 2018 12:51:10 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804041251.w34CpAxj035739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 4 Apr 2018 12:51:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466438 - in branches/2018Q1/www: seamonkey seamonkey-i18n seamonkey/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www: seamonkey seamonkey-i18n seamonkey/files X-SVN-Commit-Revision: 466438 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, 04 Apr 2018 12:51:11 -0000 Author: jbeich Date: Wed Apr 4 12:51:10 2018 New Revision: 466438 URL: https://svnweb.freebsd.org/changeset/ports/466438 Log: MFH: r466436 www/seamonkey: switch to rc2 Changes: https://hg.mozilla.org/releases/mozilla-esr52/rev/6c7b3cc4609f Approved by: ports-secteam blanket Deleted: branches/2018Q1/www/seamonkey/files/patch-bug1440717 Modified: branches/2018Q1/www/seamonkey-i18n/Makefile branches/2018Q1/www/seamonkey/Makefile branches/2018Q1/www/seamonkey/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/seamonkey-i18n/Makefile ============================================================================== --- branches/2018Q1/www/seamonkey-i18n/Makefile Wed Apr 4 12:49:37 2018 (r466437) +++ branches/2018Q1/www/seamonkey-i18n/Makefile Wed Apr 4 12:51:10 2018 (r466438) @@ -5,7 +5,7 @@ PORTNAME= seamonkey-i18n PORTVERSION= 2.49.3 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi \ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi \ LOCAL/jbeich/${DIST_SUBDIR} PKGNAMEPREFIX= DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./} Modified: branches/2018Q1/www/seamonkey/Makefile ============================================================================== --- branches/2018Q1/www/seamonkey/Makefile Wed Apr 4 12:49:37 2018 (r466437) +++ branches/2018Q1/www/seamonkey/Makefile Wed Apr 4 12:51:10 2018 (r466438) @@ -6,7 +6,7 @@ DISTVERSION= 2.49.3 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2018Q1/www/seamonkey/distinfo ============================================================================== --- branches/2018Q1/www/seamonkey/distinfo Wed Apr 4 12:49:37 2018 (r466437) +++ branches/2018Q1/www/seamonkey/distinfo Wed Apr 4 12:51:10 2018 (r466438) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522389599 -SHA256 (seamonkey-2.49.3.source.tar.xz) = 3d149ccb0c5bafe086182b071343561bff430907cbd67f0516282722942f098a -SIZE (seamonkey-2.49.3.source.tar.xz) = 231791060 +TIMESTAMP = 1522802344 +SHA256 (seamonkey-2.49.3.source.tar.xz) = 1823ed983bbc62e40f622288d5b24be9214ff28f15bf3f21028cc992fa96484b +SIZE (seamonkey-2.49.3.source.tar.xz) = 231547028 From owner-svn-ports-branches@freebsd.org Thu Apr 5 00:44:32 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 C8959F842C8; Thu, 5 Apr 2018 00:44:32 +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 728967D105; Thu, 5 Apr 2018 00:44:32 +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 693B21B490; Thu, 5 Apr 2018 00:44:32 +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 w350iWnb016119; Thu, 5 Apr 2018 00:44:32 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w350iVlA016111; Thu, 5 Apr 2018 00:44:31 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804050044.w350iVlA016111@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 5 Apr 2018 00:44:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466517 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 466517 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, 05 Apr 2018 00:44:33 -0000 Author: jbeich Date: Thu Apr 5 00:44:31 2018 New Revision: 466517 URL: https://svnweb.freebsd.org/changeset/ports/466517 Log: MFH: r466515 www/waterfox: apply some FF60 fixes Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1346535 - copied unchanged from r466515, head/www/waterfox/files/patch-bug1346535 branches/2018Q2/www/waterfox/files/patch-bug1386371 - copied unchanged from r466515, head/www/waterfox/files/patch-bug1386371 branches/2018Q2/www/waterfox/files/patch-bug1449157 - copied unchanged from r466515, head/www/waterfox/files/patch-bug1449157 Modified: branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Thu Apr 5 00:42:51 2018 (r466516) +++ branches/2018Q2/www/waterfox/Makefile Thu Apr 5 00:44:31 2018 (r466517) @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q2/www/waterfox/files/patch-bug1346535 (from r466515, head/www/waterfox/files/patch-bug1346535) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1346535 Thu Apr 5 00:44:31 2018 (r466517, copy of r466515, head/www/waterfox/files/patch-bug1346535) @@ -0,0 +1,504 @@ +commit 8ed454acd81e +Author: Samuel Thibault +Date: Fri Mar 16 15:57:00 2018 -0400 + + Bug 1346535 - atk: Introduce U+FEFF characters to match AT-SPI offsets with DOM offsets. r=surkov, r=dbaron a=jcristau + + --HG-- + extra : source : 6f9396e9ea0a261c881dfafbfce894d7138beb6f +--- + accessible/atk/DOMtoATK.cpp | 161 +++++++++++++++++++++++++++++++++ + accessible/atk/DOMtoATK.h | 163 ++++++++++++++++++++++++++++++++++ + accessible/atk/moz.build | 1 + + accessible/atk/nsMaiInterfaceText.cpp | 40 ++++----- + xpcom/string/nsUTF8Utils.h | 24 +++++ + 5 files changed, 369 insertions(+), 20 deletions(-) + +diff --git accessible/atk/DOMtoATK.cpp accessible/atk/DOMtoATK.cpp +new file mode 100644 +index 000000000000..ea9fa543186c +--- /dev/null ++++ accessible/atk/DOMtoATK.cpp +@@ -0,0 +1,161 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* vim: set ts=2 et sw=2 tw=80: */ ++/* 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/. */ ++ ++#include "DOMtoATK.h" ++#include "nsUTF8Utils.h" ++ ++namespace mozilla { ++namespace a11y { ++ ++namespace DOMtoATK { ++ ++void ++AddBOMs(nsACString& aDest, const nsACString& aSource) ++{ ++ uint32_t destlength = 0; ++ ++ // First compute how much room we will need. ++ for (uint32_t srci = 0; srci < aSource.Length(); ) { ++ int bytes = UTF8traits::bytes(aSource[srci]); ++ if (bytes >= 4) { ++ // Non-BMP character, will add a BOM after it. ++ destlength += 3; ++ } ++ // Skip whole character encoding. ++ srci += bytes; ++ destlength += bytes; ++ } ++ ++ uint32_t desti = 0; // Index within aDest. ++ ++ // Add BOMs after non-BMP characters. ++ aDest.SetLength(destlength); ++ for (uint32_t srci = 0; srci < aSource.Length(); ) { ++ uint32_t bytes = UTF8traits::bytes(aSource[srci]); ++ ++ MOZ_ASSERT(bytes <= aSource.Length() - srci, "We should have the whole sequence"); ++ ++ // Copy whole sequence. ++ aDest.Replace(desti, bytes, Substring(aSource, srci, bytes)); ++ desti += bytes; ++ srci += bytes; ++ ++ if (bytes >= 4) { ++ // More than 4 bytes in UTF-8 encoding exactly means more than 16 encoded ++ // bits. This is thus a non-BMP character which needed a surrogate ++ // pair to get encoded in UTF-16, add a BOM after it. ++ ++ // And add a BOM after it. ++ aDest.Replace(desti, 3, "\xEF\xBB\xBF"); ++ desti += 3; ++ } ++ } ++ MOZ_ASSERT(desti == destlength, "Incoherency between computed length" ++ "and actually translated length"); ++} ++ ++void ++ATKStringConverterHelper::AdjustOffsets(gint* aStartOffset, gint* aEndOffset, ++ gint count) ++{ ++ MOZ_ASSERT(!mAdjusted, "DOMtoATK::ATKStringConverterHelper::AdjustOffsets needs to be called only once"); ++ ++ if (*aStartOffset > 0) { ++ (*aStartOffset)--; ++ mStartShifted = true; ++ } ++ ++ if (*aEndOffset != -1 && *aEndOffset < count) { ++ (*aEndOffset)++; ++ mEndShifted = true; ++ } ++ ++#ifdef DEBUG ++ mAdjusted = true; ++#endif ++} ++ ++gchar* ++ATKStringConverterHelper::FinishUTF16toUTF8(nsCString& aStr) ++{ ++ int skip = 0; ++ ++ if (mStartShifted) { ++ // AdjustOffsets added a leading character. ++ ++ MOZ_ASSERT(aStr.Length() > 0, "There should be a leading character"); ++ MOZ_ASSERT(static_cast(aStr.Length()) >= UTF8traits::bytes(aStr.CharAt(0)), ++ "The leading character should be complete"); ++ ++ // drop first character ++ skip = UTF8traits::bytes(aStr.CharAt(0)); ++ } ++ ++ if (mEndShifted) { ++ // AdjustOffsets added a trailing character. ++ ++ MOZ_ASSERT(aStr.Length() > 0, "There should be a trailing character"); ++ ++ int trail = -1; ++ // Find beginning of last character. ++ for (trail = aStr.Length() - 1; trail >= 0; trail--) { ++ if (!UTF8traits::isInSeq(aStr.CharAt(trail))) { ++ break; ++ } ++ } ++ MOZ_ASSERT(trail >= 0, ++ "There should be at least a whole trailing character"); ++ MOZ_ASSERT(trail + UTF8traits::bytes(aStr.CharAt(trail)) == static_cast(aStr.Length()), ++ "The trailing character should be complete"); ++ ++ // Drop the last character. ++ aStr.Truncate(trail); ++ } ++ ++ // copy and return, libspi will free it ++ return g_strdup(aStr.get() + skip); ++} ++ ++gchar* ++ATKStringConverterHelper::ConvertAdjusted(const nsAString& aStr) ++{ ++ MOZ_ASSERT(mAdjusted, "DOMtoATK::ATKStringConverterHelper::AdjustOffsets needs to be called before ATKStringConverterHelper::ConvertAdjusted"); ++ ++ NS_ConvertUTF16toUTF8 cautoStr(aStr); ++ if (!cautoStr.get()) { ++ return nullptr; ++ } ++ ++ nsAutoCString cautoStrBOMs; ++ AddBOMs(cautoStrBOMs, cautoStr); ++ return FinishUTF16toUTF8(cautoStrBOMs); ++} ++ ++gchar* ++Convert(const nsAString& aStr) ++{ ++ NS_ConvertUTF16toUTF8 cautoStr(aStr); ++ if (!cautoStr.get()) { ++ return nullptr; ++ } ++ ++ nsAutoCString cautoStrBOMs; ++ AddBOMs(cautoStrBOMs, cautoStr); ++ return g_strdup(cautoStrBOMs.get()); ++} ++ ++void ++ConvertTexttoAsterisks(nsAString& aString) ++{ ++ for (uint32_t i = 0; i < aString.Length(); i++) { ++ aString.ReplaceLiteral(i, 1, u"*"); ++ } ++} ++ ++} ++ ++} // namespace a11y ++} // namespace mozilla +diff --git accessible/atk/DOMtoATK.h accessible/atk/DOMtoATK.h +new file mode 100644 +index 000000000000..1f1b125ebbbe +--- /dev/null ++++ accessible/atk/DOMtoATK.h +@@ -0,0 +1,163 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* vim: set ts=2 et sw=2 tw=80: */ ++/* 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/. */ ++ ++#include "AccessibleWrap.h" ++#include "nsString.h" ++#include "nsMai.h" ++ ++/** ++ * ATK offsets are counted in unicode codepoints, while DOM offsets are counted ++ * in UTF-16 code units. That makes a difference for non-BMP characters, ++ * which need two UTF-16 code units to be represented (a pair of surrogates), ++ * while they are just one unicode character. ++ * ++ * To keep synchronization between ATK offsets (unicode codepoints) and DOM ++ * offsets (UTF-16 code units), after translation from UTF-16 to UTF-8 we add a ++ * BOM after each non-BMP character (which would otherwise use 2 UTF-16 ++ * code units for only 1 unicode codepoint). ++ * ++ * BOMs (Byte Order Marks, U+FEFF, also known as ZERO WIDTH NO-BREAK SPACE, but ++ * that usage is deprecated) normally only appear at the beginning of unicode ++ * files, but their occurrence within text (notably after cut&paste) is not ++ * uncommon, and are thus considered as non-text. ++ * ++ * Since the selection requested through ATK may not contain both surrogates ++ * at the ends of the selection, we need to fetch one UTF-16 code point more ++ * on both side, and get rid of it before returning the string to ATK. The ++ * ATKStringConverterHelper class maintains this, NewATKString should be used ++ * to call it properly. ++ * ++ * In the end, ++ * - if the start is between the high and low surrogates, the UTF-8 result ++ * includes a BOM from it but not the character ++ * - if the end is between the high and low surrogates, the UTF-8 result ++ * includes the character but *not* the BOM ++ * - all non-BMP characters that are fully in the string are in the UTF-8 result ++ * as character followed by BOM ++ */ ++namespace mozilla { ++namespace a11y { ++ ++namespace DOMtoATK ++{ ++ ++ /** ++ * Converts a string of accessible text into ATK gchar* string (by adding ++ * BOMs). This can be used when offsets do not need to be adjusted because ++ * ends of the string can not fall between surrogates. ++ */ ++ gchar* Convert(const nsAString& aStr); ++ ++ /** ++ * Add a BOM after each non-BMP character. ++ */ ++ void AddBOMs(nsACString& aDest, const nsACString& aSource); ++ ++ /** ++ * Replace all characters with asterisks (e.g. for password fields). ++ */ ++ void ConvertTexttoAsterisks(nsAString& aString); ++ ++ /** ++ * Parameterize conversion. ++ */ ++ enum class AtkStringConvertFlags : uint32_t { ++ None = 0, ++ ConvertTextToAsterisks = 1 << 0, ++ }; ++ ++ MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(AtkStringConvertFlags) ++ ++ class ATKStringConverterHelper { ++ public: ++ ATKStringConverterHelper(void) : ++#ifdef DEBUG ++ mAdjusted (false), ++#endif ++ mStartShifted (false), ++ mEndShifted (false) { } ++ ++ /** ++ * In order to properly get non-BMP values, offsets need to be changed ++ * to get one character more on each end, so that ConvertUTF16toUTF8 can ++ * convert surrogates even if the originally requested offsets fall between ++ * them. ++ */ ++ void AdjustOffsets(gint* aStartOffset, gint* aEndOffset, gint count); ++ ++ /** ++ * Converts a string of accessible text with adjusted offsets into ATK ++ * gchar* string (by adding BOMs). Note, AdjustOffsets has to be called ++ * before getting the text passed to this. ++ */ ++ gchar* ConvertAdjusted(const nsAString& aStr); ++ ++ private: ++ /** ++ * Remove the additional characters requested by PrepareUTF16toUTF8. ++ */ ++ gchar* FinishUTF16toUTF8(nsCString& aStr); ++ ++#ifdef DEBUG ++ bool mAdjusted; ++#endif ++ bool mStartShifted; ++ bool mEndShifted; ++ }; ++ ++ /** ++ * Get text from aAccessible, using ATKStringConverterHelper to properly ++ * introduce appropriate BOMs. ++ */ ++ template ++ gchar* NewATKString(AccessibleOrProxy* aAccessible, ++ gint aStartOffset, gint aEndOffset, ++ AtkStringConvertFlags aFlags) ++ { ++ gint startOffset = aStartOffset, endOffset = aEndOffset; ++ ATKStringConverterHelper converter; ++ converter.AdjustOffsets(&startOffset, &endOffset, ++ gint(aAccessible->CharacterCount())); ++ nsAutoString str; ++ aAccessible->TextSubstring(startOffset, endOffset, str); ++ if (aFlags & AtkStringConvertFlags::ConvertTextToAsterisks) ++ ConvertTexttoAsterisks(str); ++ return converter.ConvertAdjusted(str); ++ } ++ ++ /** ++ * Get a character from aAccessible, fetching more data as appropriate to ++ * properly get non-BMP characters or a BOM as appropriate. ++ */ ++ template ++ gunichar ATKCharacter(AccessibleCharAt* aAccessible, gint aOffset) ++ { ++ // char16_t is unsigned short in Mozilla, gnuichar is guint32 in glib. ++ gunichar character = static_cast(aAccessible->CharAt(aOffset)); ++ ++ if (NS_IS_LOW_SURROGATE(character)) { ++ // Trailing surrogate, return BOM instead. ++ return 0xFEFF; ++ } ++ ++ if (NS_IS_HIGH_SURROGATE(character)) { ++ // Heading surrogate, get the trailing surrogate and combine them. ++ gunichar characterLow = static_cast(aAccessible->CharAt(aOffset + 1)); ++ ++ if (!NS_IS_LOW_SURROGATE(characterLow)) { ++ // It should have been a trailing surrogate... Flag the error. ++ return 0xFFFD; ++ } ++ return SURROGATE_TO_UCS4(character, characterLow); ++ } ++ ++ return character; ++ } ++ ++} ++ ++} // namespace a11y ++} // namespace mozilla +diff --git accessible/atk/moz.build accessible/atk/moz.build +index baf71c6656b5..19b94bcca723 100644 +--- accessible/atk/moz.build ++++ accessible/atk/moz.build +@@ -14,6 +14,7 @@ SOURCES += [ + 'ApplicationAccessibleWrap.cpp', + 'AtkSocketAccessible.cpp', + 'DocAccessibleWrap.cpp', ++ 'DOMtoATK.cpp', + 'nsMaiHyperlink.cpp', + 'nsMaiInterfaceAction.cpp', + 'nsMaiInterfaceComponent.cpp', +diff --git accessible/atk/nsMaiInterfaceText.cpp accessible/atk/nsMaiInterfaceText.cpp +index d8c162855343..0c723279046e 100644 +--- accessible/atk/nsMaiInterfaceText.cpp ++++ accessible/atk/nsMaiInterfaceText.cpp +@@ -14,9 +14,12 @@ + #include "nsIAccessibleTypes.h" + #include "nsIPersistentProperties2.h" + #include "nsISimpleEnumerator.h" ++#include "nsUTF8Utils.h" + + #include "mozilla/Likely.h" + ++#include "DOMtoATK.h" ++ + using namespace mozilla; + using namespace mozilla::a11y; + +@@ -128,8 +131,7 @@ ConvertTexttoAsterisks(AccessibleWrap* accWrap, nsAString& aString) + { + // convert each char to "*" when it's "password text" + if (accWrap->NativeRole() == roles::PASSWORD_TEXT) { +- for (uint32_t i = 0; i < aString.Length(); i++) +- aString.Replace(i, 1, NS_LITERAL_STRING("*")); ++ DOMtoATK::ConvertTexttoAsterisks(aString); + } + } + +@@ -142,20 +144,20 @@ getTextCB(AtkText *aText, gint aStartOffset, gint aEndOffset) + nsAutoString autoStr; + if (accWrap) { + HyperTextAccessible* text = accWrap->AsHyperText(); +- if (!text || !text->IsTextRole()) ++ if (!text || !text->IsTextRole() || text->IsDefunct()) + return nullptr; + +- text->TextSubstring(aStartOffset, aEndOffset, autoStr); ++ return DOMtoATK::NewATKString(text, aStartOffset, aEndOffset, ++ accWrap->NativeRole() == roles::PASSWORD_TEXT ? ++ DOMtoATK::AtkStringConvertFlags::ConvertTextToAsterisks : ++ DOMtoATK::AtkStringConvertFlags::None); + +- ConvertTexttoAsterisks(accWrap, autoStr); + } else if (ProxyAccessible* proxy = GetProxy(ATK_OBJECT(aText))) { +- proxy->TextSubstring(aStartOffset, aEndOffset, autoStr); ++ return DOMtoATK::NewATKString(proxy, aStartOffset, aEndOffset, ++ DOMtoATK::AtkStringConvertFlags::None); + } + +- NS_ConvertUTF16toUTF8 cautoStr(autoStr); +- +- //copy and return, libspi will free it. +- return (cautoStr.get()) ? g_strdup(cautoStr.get()) : nullptr; ++ return nullptr; + } + + static gchar* +@@ -181,8 +183,8 @@ getTextAfterOffsetCB(AtkText *aText, gint aOffset, + *aStartOffset = startOffset; + *aEndOffset = endOffset; + +- NS_ConvertUTF16toUTF8 cautoStr(autoStr); +- return (cautoStr.get()) ? g_strdup(cautoStr.get()) : nullptr; ++ // libspi will free it. ++ return DOMtoATK::Convert(autoStr); + } + + static gchar* +@@ -208,8 +210,8 @@ getTextAtOffsetCB(AtkText *aText, gint aOffset, + *aStartOffset = startOffset; + *aEndOffset = endOffset; + +- NS_ConvertUTF16toUTF8 cautoStr(autoStr); +- return (cautoStr.get()) ? g_strdup(cautoStr.get()) : nullptr; ++ // libspi will free it. ++ return DOMtoATK::Convert(autoStr); + } + + static gunichar +@@ -221,13 +223,11 @@ getCharacterAtOffsetCB(AtkText* aText, gint aOffset) + if (!text || !text->IsTextRole()) { + return 0; + } +- +- // char16_t is unsigned short in Mozilla, gnuichar is guint32 in glib. +- return static_cast(text->CharAt(aOffset)); ++ return DOMtoATK::ATKCharacter(text, aOffset); + } + + if (ProxyAccessible* proxy = GetProxy(ATK_OBJECT(aText))) { +- return static_cast(proxy->CharAt(aOffset)); ++ return DOMtoATK::ATKCharacter(proxy, aOffset); + } + + return 0; +@@ -257,8 +257,8 @@ getTextBeforeOffsetCB(AtkText *aText, gint aOffset, + *aStartOffset = startOffset; + *aEndOffset = endOffset; + +- NS_ConvertUTF16toUTF8 cautoStr(autoStr); +- return (cautoStr.get()) ? g_strdup(cautoStr.get()) : nullptr; ++ // libspi will free it. ++ return DOMtoATK::Convert(autoStr); + } + + static gint +diff --git xpcom/string/nsUTF8Utils.h xpcom/string/nsUTF8Utils.h +index ef140084c2e6..5d39b05e799a 100644 +--- xpcom/string/nsUTF8Utils.h ++++ xpcom/string/nsUTF8Utils.h +@@ -56,6 +56,30 @@ public: + { + return (aChar & 0xFE) == 0xFC; + } ++ // return the number of bytes in a sequence beginning with aChar ++ static int bytes(char aChar) ++ { ++ if (isASCII(aChar)) { ++ return 1; ++ } ++ if (is2byte(aChar)) { ++ return 2; ++ } ++ if (is3byte(aChar)) { ++ return 3; ++ } ++ if (is4byte(aChar)) { ++ return 4; ++ } ++ if (is5byte(aChar)) { ++ return 5; ++ } ++ if (is6byte(aChar)) { ++ return 6; ++ } ++ MOZ_ASSERT_UNREACHABLE("should not be used for in-sequence characters"); ++ return 1; ++ } + }; + + /** Copied: branches/2018Q2/www/waterfox/files/patch-bug1386371 (from r466515, head/www/waterfox/files/patch-bug1386371) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1386371 Thu Apr 5 00:44:31 2018 (r466517, copy of r466515, head/www/waterfox/files/patch-bug1386371) @@ -0,0 +1,103 @@ +commit 503070ad8daa +Author: Matt Brubeck +Date: Thu Aug 10 11:38:10 2017 -0700 + + Bug 1386371 - Disable LTO by default, but enable in automation. r=froydnj + + MozReview-Commit-ID: 2DIY9ex3Mch + + --HG-- + extra : rebase_source : 61f2f073adabfa7c46c324470a308adab23e7781 +--- + build/moz.configure/toolchain.configure | 1 + + config/rules.mk | 14 ++++++++++++-- + python/mozbuild/mozbuild/frontend/emitter.py | 1 - + toolkit/library/gtest/rust/Cargo.toml | 1 - + toolkit/library/rust/Cargo.toml | 1 - + 5 files changed, 13 insertions(+), 5 deletions(-) + +diff --git build/moz.configure/toolchain.configure build/moz.configure/toolchain.configure +index eba0fbf65538..6a89676385c4 100755 +--- build/moz.configure/toolchain.configure ++++ build/moz.configure/toolchain.configure +@@ -1126,6 +1126,7 @@ def developer_options(value): + return True + + add_old_configure_assignment('DEVELOPER_OPTIONS', developer_options) ++set_config('DEVELOPER_OPTIONS', developer_options) + + # Linker detection + # ============================================================== +diff --git config/rules.mk config/rules.mk +index dc16e99c6e4d..9897c203feb4 100644 +--- config/rules.mk ++++ config/rules.mk +@@ -862,6 +862,16 @@ cargo_build_flags += --color=always + endif + endif + ++# These flags are passed via `cargo rustc` and only apply to the final rustc ++# invocation (i.e., only the top-level crate, not its dependencies). ++cargo_rustc_flags = $(CARGO_RUSTCFLAGS) ++ifndef DEVELOPER_OPTIONS ++ifndef MOZ_DEBUG_RUST ++# Enable link-time optimization for release builds. ++cargo_rustc_flags += -C lto ++endif ++endif ++ + # Cargo currently supports only two interesting profiles for building: + # development and release. Those map (roughly) to --enable-debug and + # --disable-debug in Gecko, respectively, but there's another axis that we'd +@@ -939,7 +949,7 @@ endef + # + # $(call CARGO_BUILD) + define CARGO_BUILD +-$(call RUN_CARGO,build,$(1)) ++$(call RUN_CARGO,rustc,$(1)) + endef + + define CARGO_CHECK +@@ -984,7 +994,7 @@ endif + # build. + force-cargo-library-build: + $(REPORT_BUILD) +- $(call CARGO_BUILD,$(target_cargo_env_vars)) --lib $(cargo_target_flag) $(rust_features_flag) ++ $(call CARGO_BUILD,$(target_cargo_env_vars)) --lib $(cargo_target_flag) $(rust_features_flag) -- $(cargo_rustc_flags) + + $(RUST_LIBRARY_FILE): force-cargo-library-build + +diff --git python/mozbuild/mozbuild/frontend/emitter.py python/mozbuild/mozbuild/frontend/emitter.py +index 815126d145b3..07a33caca893 100644 +--- python/mozbuild/mozbuild/frontend/emitter.py ++++ python/mozbuild/mozbuild/frontend/emitter.py +@@ -480,7 +480,6 @@ class TreeMetadataEmitter(LoggingMixin): + expected_profile = { + 'opt-level': 2, + 'rpath': False, +- 'lto': True, + 'debug-assertions': False, + 'panic': 'abort', + } +diff --git toolkit/library/gtest/rust/Cargo.toml toolkit/library/gtest/rust/Cargo.toml +index a7a64486c684..c9f942c88033 100644 +--- toolkit/library/gtest/rust/Cargo.toml ++++ toolkit/library/gtest/rust/Cargo.toml +@@ -42,6 +42,5 @@ panic = "abort" + [profile.release] + opt-level = 2 + rpath = false +-lto = true + debug-assertions = false + panic = "abort" +diff --git toolkit/library/rust/Cargo.toml toolkit/library/rust/Cargo.toml +index f67669513d38..fd5668729199 100644 +--- toolkit/library/rust/Cargo.toml ++++ toolkit/library/rust/Cargo.toml +@@ -40,6 +40,5 @@ panic = "abort" + [profile.release] + opt-level = 2 + rpath = false +-lto = true + debug-assertions = false + panic = "abort" Copied: branches/2018Q2/www/waterfox/files/patch-bug1449157 (from r466515, head/www/waterfox/files/patch-bug1449157) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1449157 Thu Apr 5 00:44:31 2018 (r466517, copy of r466515, head/www/waterfox/files/patch-bug1449157) @@ -0,0 +1,26 @@ +commit c05f2d4f28e9 +Author: Jonathan Kew +Date: Wed Mar 28 14:42:20 2018 +0100 + + Bug 1449157 - Guard against mContent being null in nsFrame::HandlePress. r=dholbert, a=jcristau + + --HG-- + extra : rebase_source : cee8a6f6ecce503cddf3492ffaf42bc317f1851c + extra : source : c09b8a694cb5d0442aa293eace75a18058b675d5 +--- + layout/generic/nsFrame.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git layout/generic/nsFrame.cpp layout/generic/nsFrame.cpp +index fd313f9a792f..5fa8bd9174e5 100644 +--- layout/generic/nsFrame.cpp ++++ layout/generic/nsFrame.cpp +@@ -4275,7 +4275,7 @@ nsFrame::HandlePress(nsPresContext* aPresContext, + // starting a new selection since the user may be trying to + // drag the selected region to some other app. + +- if (GetContent()->IsSelectionDescendant()) ++ if (GetContent() && GetContent()->IsSelectionDescendant()) + { + bool inSelection = false; + UniquePtr details From owner-svn-ports-branches@freebsd.org Thu Apr 5 00:45:16 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 9EFE3F8435E; Thu, 5 Apr 2018 00:45:16 +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 7454E7D1FB; Thu, 5 Apr 2018 00:45:16 +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 6F4C71B491; Thu, 5 Apr 2018 00:45:16 +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 w350jGLR016418; Thu, 5 Apr 2018 00:45:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w350jGc8016415; Thu, 5 Apr 2018 00:45:16 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804050045.w350jGc8016415@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 5 Apr 2018 00:45:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466518 - branches/2018Q2/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/emulators/rpcs3 X-SVN-Commit-Revision: 466518 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, 05 Apr 2018 00:45:16 -0000 Author: jbeich Date: Thu Apr 5 00:45:16 2018 New Revision: 466518 URL: https://svnweb.freebsd.org/changeset/ports/466518 Log: MFH: r466516 emulators/rpcs3: update to 0.0.5.178 Changes: https://github.com/RPCS3/rpcs3/compare/b0352d6ef...568118634 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q2/emulators/rpcs3/Makefile branches/2018Q2/emulators/rpcs3/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q2/emulators/rpcs3/Makefile Thu Apr 5 00:44:31 2018 (r466517) +++ branches/2018Q2/emulators/rpcs3/Makefile Thu Apr 5 00:45:16 2018 (r466518) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-173 -DISTVERSIONSUFFIX= -gb0352d6ef +DISTVERSION= 0.0.5-178 +DISTVERSIONSUFFIX= -g568118634 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q2/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q2/emulators/rpcs3/distinfo Thu Apr 5 00:44:31 2018 (r466517) +++ branches/2018Q2/emulators/rpcs3/distinfo Thu Apr 5 00:45:16 2018 (r466518) @@ -1,6 +1,6 @@ -TIMESTAMP = 1522711072 -SHA256 (RPCS3-rpcs3-v0.0.5-173-gb0352d6ef_GH0.tar.gz) = 38a09a1aa4691117e099e74c4bec22f3ea019954bc75de94379a61c0de75c90f -SIZE (RPCS3-rpcs3-v0.0.5-173-gb0352d6ef_GH0.tar.gz) = 4323099 +TIMESTAMP = 1522879610 +SHA256 (RPCS3-rpcs3-v0.0.5-178-g568118634_GH0.tar.gz) = c42a33ea3151622c3793b1f8d2fcf323d061bebc2c8a4375fbe5a08529ab5fc1 +SIZE (RPCS3-rpcs3-v0.0.5-178-g568118634_GH0.tar.gz) = 4323812 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 Thu Apr 5 10:29:07 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 D8C49F9C311; Thu, 5 Apr 2018 10:29:07 +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 8C5B574437; Thu, 5 Apr 2018 10:29:07 +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 8725021551; Thu, 5 Apr 2018 10:29:07 +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 w35AT7jD065212; Thu, 5 Apr 2018 10:29:07 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w35AT77B065210; Thu, 5 Apr 2018 10:29:07 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804051029.w35AT77B065210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 5 Apr 2018 10:29:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466549 - branches/2018Q2/games/openra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/games/openra X-SVN-Commit-Revision: 466549 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, 05 Apr 2018 10:29:08 -0000 Author: jbeich Date: Thu Apr 5 10:29:07 2018 New Revision: 466549 URL: https://svnweb.freebsd.org/changeset/ports/466549 Log: MFH: r466548 games/openra: update GeoLite2 to April snapshot fetch: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz: size mismatch: expected 1702260, actual 1694435 Approved by: ports-secteam blanket Modified: branches/2018Q2/games/openra/Makefile branches/2018Q2/games/openra/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/games/openra/Makefile ============================================================================== --- branches/2018Q2/games/openra/Makefile Thu Apr 5 10:28:36 2018 (r466548) +++ branches/2018Q2/games/openra/Makefile Thu Apr 5 10:29:07 2018 (r466549) @@ -3,7 +3,7 @@ PORTNAME= openra PORTVERSION= 20180307 DISTVERSIONPREFIX= release- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20161223/:SDL2_CS \ https://github.com/${GH_ACCOUNT}/OpenAL-CS/releases/download/20151227/:OpenAL_CS \ Modified: branches/2018Q2/games/openra/distinfo ============================================================================== --- branches/2018Q2/games/openra/distinfo Thu Apr 5 10:28:36 2018 (r466548) +++ branches/2018Q2/games/openra/distinfo Thu Apr 5 10:29:07 2018 (r466549) @@ -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) = 2639bf77abfb338ede92713bd274f8fe1e98b0bb3f00763ba9ab0f1c1d35a377 -SIZE (GeoLite2-Country.mmdb.gz) = 1702260 +SHA256 (GeoLite2-Country.mmdb.gz) = e118e7f20b2bd2a007f593b9527acaa594120f27ca9acb66cf34a013c8e30818 +SIZE (GeoLite2-Country.mmdb.gz) = 1694435 SHA256 (fuzzylogiclibrary.1.2.0.nupkg) = b464509236260f53d963771ed99410a7e1cdbd268a2bde43b189e7d15044a174 SIZE (fuzzylogiclibrary.1.2.0.nupkg) = 70571 SHA256 (maxmind.db.2.0.0.nupkg) = 095d62c6ecda38c1e8fe79935b4eaf228d2637f9498caec48b8b48a0aba6d5aa From owner-svn-ports-branches@freebsd.org Thu Apr 5 17:22: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 B0223F94778; Thu, 5 Apr 2018 17:22:59 +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 654A98730D; Thu, 5 Apr 2018 17:22:59 +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 601AB25A87; Thu, 5 Apr 2018 17:22:59 +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 w35HMxmG034833; Thu, 5 Apr 2018 17:22:59 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w35HMw4r034828; Thu, 5 Apr 2018 17:22:58 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201804051722.w35HMw4r034828@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Thu, 5 Apr 2018 17:22:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466575 - in branches/2018Q2/audio/liblastfm: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in branches/2018Q2/audio/liblastfm: . files X-SVN-Commit-Revision: 466575 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, 05 Apr 2018 17:23:00 -0000 Author: jhale Date: Thu Apr 5 17:22:58 2018 New Revision: 466575 URL: https://svnweb.freebsd.org/changeset/ports/466575 Log: MFH: r466574 Fix 301 redirects in the UrlBuilder class - http scheme redirects to https - Mobile website (m.last.fm) redirects to www.last.fm - Localized hosts redirect e.g. www.lastfm.de to www.last.fm/de - New localePath() function has been added to handle the localized base path since the library was localizing using the host before. This is not an official fix, but upstream is pretty dead. Move USES upward Convert CMAKE_ARGS to CMAKE_ON Approved by: ports-secteam (blanket) Added: branches/2018Q2/audio/liblastfm/files/patch-src_UrlBuilder.cpp - copied unchanged from r466574, head/audio/liblastfm/files/patch-src_UrlBuilder.cpp branches/2018Q2/audio/liblastfm/files/patch-src_UrlBuilder.h - copied unchanged from r466574, head/audio/liblastfm/files/patch-src_UrlBuilder.h branches/2018Q2/audio/liblastfm/files/patch-tests_TestUrlBuilder.h - copied unchanged from r466574, head/audio/liblastfm/files/patch-tests_TestUrlBuilder.h Modified: branches/2018Q2/audio/liblastfm/Makefile branches/2018Q2/audio/liblastfm/files/patch-src_mbid__mp3.c Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/audio/liblastfm/Makefile ============================================================================== --- branches/2018Q2/audio/liblastfm/Makefile Thu Apr 5 17:20:36 2018 (r466574) +++ branches/2018Q2/audio/liblastfm/Makefile Thu Apr 5 17:22:58 2018 (r466575) @@ -3,7 +3,7 @@ PORTNAME= liblastfm PORTVERSION= 1.0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= jhale@FreeBSD.org @@ -12,15 +12,14 @@ COMMENT= Qt C++ library for the Last.fm webservices LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +USES= cmake pkgconfig USE_GITHUB= yes GH_ACCOUNT= lastfm - -USES= cmake pkgconfig USE_LDCONFIG= yes USE_QT4= corelib dbus network sql xml \ moc_build qmake_build rcc_build -CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=ON +CMAKE_ON= BUILD_WITH_QT4 OPTIONS_DEFINE= FINGERPRINT TEST OPTIONS_DEFAULT= FINGERPRINT Copied: branches/2018Q2/audio/liblastfm/files/patch-src_UrlBuilder.cpp (from r466574, head/audio/liblastfm/files/patch-src_UrlBuilder.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/audio/liblastfm/files/patch-src_UrlBuilder.cpp Thu Apr 5 17:22:58 2018 (r466575, copy of r466574, head/audio/liblastfm/files/patch-src_UrlBuilder.cpp) @@ -0,0 +1,123 @@ +url(): + - Use https scheme to avoid 301 redirects + - Override default QUrl::TolerantMode with QUrl::StrictMode for Qt 5.x to + prevent overprocessing the already encoded input URL +localePath(): + - New function to return the base path of the localized website +host(): + - Just return www.last.fm since the localized hosts 301 redirect there +localize(): + - Set the path of the url instead of the host since the localized + hosts 301 redirect to the main website with a localized path +mobilize(): + - Mobile website 301 redirects to main website, so just return the url as-is + +--- src/UrlBuilder.cpp.orig 2014-10-02 14:05:46 UTC ++++ src/UrlBuilder.cpp +@@ -32,7 +32,7 @@ class lastfm::UrlBuilderPrivate (public) + lastfm::UrlBuilder::UrlBuilder( const QString& base ) + : d( new UrlBuilderPrivate ) + { +- d->path = '/' + base.toLatin1(); ++ d->path = localePath().toLatin1() + '/' + base.toLatin1(); + } + + +@@ -60,10 +60,10 @@ QUrl + lastfm::UrlBuilder::url() const + { + QUrl url; +- url.setScheme( "http" ); ++ url.setScheme( "https" ); + url.setHost( host() ); + #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) +- url.setPath( d->path ); ++ url.setPath( d->path, QUrl::StrictMode ); + #else + url.setEncodedPath( d->path ); + #endif +@@ -85,49 +85,50 @@ lastfm::UrlBuilder::encode( QString s ) + + + QString //static +-lastfm::UrlBuilder::host( const QLocale& locale ) ++lastfm::UrlBuilder::localePath( const QLocale& locale ) + { + switch (locale.language()) + { +- case QLocale::Portuguese: return "www.lastfm.com.br"; +- case QLocale::Turkish: return "www.lastfm.com.tr"; +- case QLocale::French: return "www.lastfm.fr"; +- case QLocale::Italian: return "www.lastfm.it"; +- case QLocale::German: return "www.lastfm.de"; +- case QLocale::Spanish: return "www.lastfm.es"; +- case QLocale::Polish: return "www.lastfm.pl"; +- case QLocale::Russian: return "www.lastfm.ru"; +- case QLocale::Japanese: return "www.lastfm.jp"; +- case QLocale::Swedish: return "www.lastfm.se"; +- case QLocale::Chinese: return "cn.last.fm"; +- default: return "www.last.fm"; ++ case QLocale::Chinese: return "/zh"; ++ case QLocale::French: return "/fr"; ++ case QLocale::German: return "/de"; ++ case QLocale::Italian: return "/it"; ++ case QLocale::Japanese: return "/ja"; ++ case QLocale::Polish: return "/pl"; ++ case QLocale::Portuguese: return "/pt"; ++ case QLocale::Russian: return "/ru"; ++ case QLocale::Spanish: return "/es"; ++ case QLocale::Swedish: return "/sv"; ++ case QLocale::Turkish: return "/tr"; ++ default: return ""; + } + } + + ++QString //static ++lastfm::UrlBuilder::host( const QLocale& locale ) ++{ ++ return "www.last.fm"; ++} ++ ++ + bool // static + lastfm::UrlBuilder::isHost( const QUrl& url ) + { +- QStringList hosts = QStringList() << "www.lastfm.com.br" +- << "www.lastfm.com.tr" +- << "www.lastfm.fr" +- << "www.lastfm.it" +- << "www.lastfm.de" +- << "www.lastfm.es" +- << "www.lastfm.pl" +- << "www.lastfm.ru" +- << "www.lastfm.jp" +- << "www.lastfm.se" +- << "cn.last.fm" +- << "www.last.fm"; ++ QStringList hosts = QStringList() << "www.last.fm"; + + return hosts.contains( url.host() ); + } + ++ + QUrl //static + lastfm::UrlBuilder::localize( QUrl url) + { +- url.setHost( url.host().replace( QRegExp("^(www.)?last.fm"), host() ) ); ++#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) ++ url.setPath( url.path().prepend( localePath() ), QUrl::DecodedMode ); ++#else ++ url.setPath( url.path().prepend( localePath() ) ); ++#endif + return url; + } + +@@ -135,7 +136,6 @@ lastfm::UrlBuilder::localize( QUrl url) + QUrl //static + lastfm::UrlBuilder::mobilize( QUrl url ) + { +- url.setHost( url.host().replace( QRegExp("^(www.)?last"), "m.last" ) ); + return url; + } + Copied: branches/2018Q2/audio/liblastfm/files/patch-src_UrlBuilder.h (from r466574, head/audio/liblastfm/files/patch-src_UrlBuilder.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/audio/liblastfm/files/patch-src_UrlBuilder.h Thu Apr 5 17:22:58 2018 (r466575, copy of r466574, head/audio/liblastfm/files/patch-src_UrlBuilder.h) @@ -0,0 +1,31 @@ +Add prototype for localePath() and adjust comments to reflect current +website layout + +--- src/UrlBuilder.h.orig 2014-10-02 14:05:46 UTC ++++ src/UrlBuilder.h +@@ -44,9 +44,11 @@ namespace lastfm + + QUrl url() const; + +- /** www.last.fm becomes the local version, eg www.lastfm.de */ ++ /** www.last.fm becomes the local version, e.g. www.last.fm/de */ + static QUrl localize( QUrl ); +- /** www.last.fm becomes m.last.fm, localisation is preserved */ ++ ++ /** DEPRECATED: Returns url as-is since the mobile website redirects ++ * to the main website */ + static QUrl mobilize( QUrl ); + + /** Use this to URL encode any database item (artist, track, album). It +@@ -60,7 +62,10 @@ namespace lastfm + */ + static QByteArray encode( QString ); + +- /** returns eg. www.lastfm.de */ ++ /** returns the base path of the localized website e.g. /de */ ++ static QString localePath ( const QLocale& = QLocale() ); ++ ++ /** returns www.last.fm */ + static QString host( const QLocale& = QLocale() ); + + /** return true if url is a last.fm url */ Modified: branches/2018Q2/audio/liblastfm/files/patch-src_mbid__mp3.c ============================================================================== --- branches/2018Q2/audio/liblastfm/files/patch-src_mbid__mp3.c Thu Apr 5 17:20:36 2018 (r466574) +++ branches/2018Q2/audio/liblastfm/files/patch-src_mbid__mp3.c Thu Apr 5 17:22:58 2018 (r466575) @@ -4,7 +4,7 @@ warning: logical not is only applied to the left hand --- src/mbid_mp3.c.orig 2014-10-02 14:05:46 UTC +++ src/mbid_mp3.c -@@ -94,7 +94,7 @@ int getMP3_MBID(const char *path, char m +@@ -94,7 +94,7 @@ int getMP3_MBID(const char *path, char mbid[MBID_BUFFE while (s) { mfile(3,head,fp,&s); Copied: branches/2018Q2/audio/liblastfm/files/patch-tests_TestUrlBuilder.h (from r466574, head/audio/liblastfm/files/patch-tests_TestUrlBuilder.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/audio/liblastfm/files/patch-tests_TestUrlBuilder.h Thu Apr 5 17:22:58 2018 (r466575, copy of r466574, head/audio/liblastfm/files/patch-tests_TestUrlBuilder.h) @@ -0,0 +1,13 @@ +http://www.last.fm 301 redirects to https://www.last.fm causing test to fail + +--- tests/TestUrlBuilder.h.orig 2018-03-31 12:04:00 UTC ++++ tests/TestUrlBuilder.h +@@ -81,7 +81,7 @@ private slots: + + void test404() /** @author */ + { +- QCOMPARE( getResponseCode( QUrl("http://www.last.fm/404") ), 404 ); ++ QCOMPARE( getResponseCode( QUrl("https://www.last.fm/404") ), 404 ); + } + }; + From owner-svn-ports-branches@freebsd.org Thu Apr 5 19:59: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 E3CFFF9E8F6; Thu, 5 Apr 2018 19:59:22 +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 82D2B6E4B1; Thu, 5 Apr 2018 19:59:22 +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 60E8227348; Thu, 5 Apr 2018 19:59:22 +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 w35JxMt7012116; Thu, 5 Apr 2018 19:59:22 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w35JxMB7012113; Thu, 5 Apr 2018 19:59:22 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201804051959.w35JxMB7012113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Thu, 5 Apr 2018 19:59:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466596 - in branches/2018Q2/databases/go-carbon: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2018Q2/databases/go-carbon: . files X-SVN-Commit-Revision: 466596 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, 05 Apr 2018 19:59:23 -0000 Author: riggs Date: Thu Apr 5 19:59:21 2018 New Revision: 466596 URL: https://svnweb.freebsd.org/changeset/ports/466596 Log: MFH: r466198 databases/go-carbon: Improve rc.d script Fixes an error with restart. PR: 226937 Submitted by: Andreas Andersson Approved by: hrs (mentor, implicit) Approved by: ports-secteam (riggs) Reported by: meta (via mail) Modified: branches/2018Q2/databases/go-carbon/Makefile branches/2018Q2/databases/go-carbon/files/go-carbon.in Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/databases/go-carbon/Makefile ============================================================================== --- branches/2018Q2/databases/go-carbon/Makefile Thu Apr 5 19:57:06 2018 (r466595) +++ branches/2018Q2/databases/go-carbon/Makefile Thu Apr 5 19:59:21 2018 (r466596) @@ -3,7 +3,7 @@ PORTNAME= go-carbon DISTVERSIONPREFIX= v DISTVERSION= 0.12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MAINTAINER= a.andersson.thn@gmail.com Modified: branches/2018Q2/databases/go-carbon/files/go-carbon.in ============================================================================== --- branches/2018Q2/databases/go-carbon/files/go-carbon.in Thu Apr 5 19:57:06 2018 (r466595) +++ branches/2018Q2/databases/go-carbon/files/go-carbon.in Thu Apr 5 19:59:21 2018 (r466596) @@ -21,35 +21,36 @@ . /etc/rc.subr -name="go-carbon" +name="go_carbon" rcvar="go_carbon_enable" +load_rc_config $name : ${go_carbon_enable:="NO"} : ${go_carbon_user:="carbon"} : ${go_carbon_config:="/usr/local/etc/go-carbon/go-carbon.conf"} -start_cmd="go_carbon_start" -stop_cmd="go_carbon_stop" -status_cmd="go_carbon_status" -procname="/usr/local/bin/go-carbon" pidfile="/var/run/$name.pid" +procname="%%PREFIX%%/bin/go-carbon" +command=/usr/sbin/daemon +command_args="-f -c -p ${pidfile} ${procname} -config ${go_carbon_config}" -# read configuration and set defaults -load_rc_config "$name" +extra_commands="reload" +reload_command="go_carbon_reload" +start_precmd="go_carbon_precmd" -go_carbon_start() +go_carbon_precmd() { - ${procname} -config ${go_carbon_config} -daemon -pidfile ${pidfile} + install -o ${go_carbon_user} /dev/null ${pidfile} } -go_carbon_stop() +carbonapi_reload() { - kill -TERM `cat /var/run/go-carbon.pid` -} - -go_carbon_status() -{ - echo "go-carbon is running as pid" `cat /var/run/go-carbon.pid` + if [ -n "$pid" ]; then + kill -HUP $pid + echo "go-carbon config reloaded." + else + echo "go-carbon not running." + fi } run_rc_command "$1" From owner-svn-ports-branches@freebsd.org Thu Apr 5 20:43: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 68AF2FA17F1; Thu, 5 Apr 2018 20:43:12 +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 16FD170948; Thu, 5 Apr 2018 20:43:12 +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 11FCB27B76; Thu, 5 Apr 2018 20:43:12 +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 w35KhBFm038623; Thu, 5 Apr 2018 20:43:11 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w35KhBlU038622; Thu, 5 Apr 2018 20:43:11 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201804052043.w35KhBlU038622@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 5 Apr 2018 20:43:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466600 - in branches/2018Q2/dns/nsnotifyd: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q2/dns/nsnotifyd: . files X-SVN-Commit-Revision: 466600 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, 05 Apr 2018 20:43:12 -0000 Author: feld Date: Thu Apr 5 20:43:11 2018 New Revision: 466600 URL: https://svnweb.freebsd.org/changeset/ports/466600 Log: MFH: r466599 dns/nsnotifyd: Add basic rc script Approved by: maintainer Added: branches/2018Q2/dns/nsnotifyd/files/ - copied from r466599, head/dns/nsnotifyd/files/ Modified: branches/2018Q2/dns/nsnotifyd/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/dns/nsnotifyd/Makefile ============================================================================== --- branches/2018Q2/dns/nsnotifyd/Makefile Thu Apr 5 20:37:15 2018 (r466599) +++ branches/2018Q2/dns/nsnotifyd/Makefile Thu Apr 5 20:43:11 2018 (r466600) @@ -2,6 +2,7 @@ PORTNAME= nsnotifyd PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://dotat.at/prog/nsnotifyd/ @@ -14,6 +15,8 @@ GNU_CONFIGURE= yes USES= shebangfix SHEBANG_FILES= nsnotify-liststealth + +USE_RC_SUBR= nsnotifyd EXEFILES= nsnotify nsnotifyd BINFILES= nsnotify-liststealth nsnotify2git nsnotify2stealth nsnotify2update From owner-svn-ports-branches@freebsd.org Fri Apr 6 05:12:42 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 36CD9FA1E98; Fri, 6 Apr 2018 05:12:42 +0000 (UTC) (envelope-from tobik@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 D8EC884AC5; Fri, 6 Apr 2018 05:12:41 +0000 (UTC) (envelope-from tobik@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 D3A2D553C; Fri, 6 Apr 2018 05:12:41 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w365Cf6M093697; Fri, 6 Apr 2018 05:12:41 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w365Cfej093695; Fri, 6 Apr 2018 05:12:41 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201804060512.w365Cfej093695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 6 Apr 2018 05:12:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466614 - branches/2018Q2/www/palemoon X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: branches/2018Q2/www/palemoon X-SVN-Commit-Revision: 466614 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, 06 Apr 2018 05:12:42 -0000 Author: tobik Date: Fri Apr 6 05:12:41 2018 New Revision: 466614 URL: https://svnweb.freebsd.org/changeset/ports/466614 Log: MFH: r466550 www/palemoon: Update to 27.8.3 Changes: http://www.palemoon.org/releasenotes.shtml PR: 227291 Approved by: lichray@gmail.com (maintainer) Approved by: ports-secteam blanket Modified: branches/2018Q2/www/palemoon/Makefile branches/2018Q2/www/palemoon/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/palemoon/Makefile ============================================================================== --- branches/2018Q2/www/palemoon/Makefile Fri Apr 6 03:58:41 2018 (r466613) +++ branches/2018Q2/www/palemoon/Makefile Fri Apr 6 05:12:41 2018 (r466614) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= palemoon -DISTVERSION= 27.8.2 +DISTVERSION= 27.8.3 DISTVERSIONSUFFIX=_Release CATEGORIES= www ipv6 Modified: branches/2018Q2/www/palemoon/distinfo ============================================================================== --- branches/2018Q2/www/palemoon/distinfo Fri Apr 6 03:58:41 2018 (r466613) +++ branches/2018Q2/www/palemoon/distinfo Fri Apr 6 05:12:41 2018 (r466614) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521865045 -SHA256 (MoonchildProductions-Pale-Moon-27.8.2_Release_GH0.tar.gz) = d6b61b1329b7bb9ddb8c8f4b6f1e2d07c30635aec8f90ddc9d9728192c62f8bb -SIZE (MoonchildProductions-Pale-Moon-27.8.2_Release_GH0.tar.gz) = 175328865 +TIMESTAMP = 1522905253 +SHA256 (MoonchildProductions-Pale-Moon-27.8.3_Release_GH0.tar.gz) = 3d4f4ec7e97f5bdbda6db4ebe04557593d4ca12578f083a044a182e1c925a4c9 +SIZE (MoonchildProductions-Pale-Moon-27.8.3_Release_GH0.tar.gz) = 175326225 From owner-svn-ports-branches@freebsd.org Fri Apr 6 05:14: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 78BD0F80042; Fri, 6 Apr 2018 05:14:12 +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 20B1784C1F; Fri, 6 Apr 2018 05:14:12 +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 1A1F75540; Fri, 6 Apr 2018 05:14:12 +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 w365EBqM093925; Fri, 6 Apr 2018 05:14:11 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w365EBNw093924; Fri, 6 Apr 2018 05:14:11 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201804060514.w365EBNw093924@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Fri, 6 Apr 2018 05:14:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466615 - branches/2018Q2/dns/knot2/dns X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q2/dns/knot2/dns X-SVN-Commit-Revision: 466615 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, 06 Apr 2018 05:14:12 -0000 Author: riggs Date: Fri Apr 6 05:14:11 2018 New Revision: 466615 URL: https://svnweb.freebsd.org/changeset/ports/466615 Log: MFH: r466594 Remove superfluous files erroneously introduced in r460797 Reported by: ashish (via mail) Approved by: ports-secteam (riggs) Deleted: branches/2018Q2/dns/knot2/dns/ Modified: Directory Properties: branches/2018Q2/ (props changed) From owner-svn-ports-branches@freebsd.org Sat Apr 7 00:23:53 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 A74F7F93D07; Sat, 7 Apr 2018 00:23:52 +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 58B7F7DE02; Sat, 7 Apr 2018 00:23:52 +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 5345B19335; Sat, 7 Apr 2018 00:23:52 +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 w370NqXZ079633; Sat, 7 Apr 2018 00:23:52 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w370NqI3079630; Sat, 7 Apr 2018 00:23:52 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804070023.w370NqI3079630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 7 Apr 2018 00:23:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466697 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 466697 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, 07 Apr 2018 00:23:53 -0000 Author: jbeich Date: Sat Apr 7 00:23:52 2018 New Revision: 466697 URL: https://svnweb.freebsd.org/changeset/ports/466697 Log: MFH: r466694 www/waterfox: apply some FF60 fixes Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-a-bug863246 - copied unchanged from r466694, head/www/waterfox/files/patch-a-bug863246 branches/2018Q2/www/waterfox/files/patch-bug1395486 - copied unchanged from r466694, head/www/waterfox/files/patch-bug1395486 branches/2018Q2/www/waterfox/files/patch-bug1433715 - copied unchanged from r466694, head/www/waterfox/files/patch-bug1433715 branches/2018Q2/www/waterfox/files/patch-bug1436482 - copied unchanged from r466694, head/www/waterfox/files/patch-bug1436482 branches/2018Q2/www/waterfox/files/patch-bug1437880 - copied unchanged from r466694, head/www/waterfox/files/patch-bug1437880 branches/2018Q2/www/waterfox/files/patch-bug1445582 - copied unchanged from r466694, head/www/waterfox/files/patch-bug1445582 branches/2018Q2/www/waterfox/files/patch-bug1447969 - copied unchanged from r466694, head/www/waterfox/files/patch-bug1447969 branches/2018Q2/www/waterfox/files/patch-bug1448705 - copied unchanged from r466694, head/www/waterfox/files/patch-bug1448705 branches/2018Q2/www/waterfox/files/patch-bug1449530 - copied unchanged from r466694, head/www/waterfox/files/patch-bug1449530 branches/2018Q2/www/waterfox/files/patch-bug1449548 - copied unchanged from r466694, head/www/waterfox/files/patch-bug1449548 Modified: branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Sat Apr 7 00:18:32 2018 (r466696) +++ branches/2018Q2/www/waterfox/Makefile Sat Apr 7 00:23:52 2018 (r466697) @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q2/www/waterfox/files/patch-a-bug863246 (from r466694, head/www/waterfox/files/patch-a-bug863246) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-a-bug863246 Sat Apr 7 00:23:52 2018 (r466697, copy of r466694, head/www/waterfox/files/patch-a-bug863246) @@ -0,0 +1,1209 @@ +commit 6a8ee766d639 +Author: Chung-Sheng Fu +Date: Thu Jun 8 17:44:09 2017 +0800 + + Bug 863246 - Content can only load resource:// URIs declared content-accessible in manifests r=billm,bz + + bz: + caps/nsScriptSecurityManager.cpp + + billm: + browser/extensions/activity-stream/jar.mn + browser/extensions/onboarding/jar.mn + chrome/RegistryMessageUtils.h + chrome/nsChromeRegistry.h + chrome/nsChromeRegistryChrome.cpp + chrome/nsChromeRegistryContent.cpp + netwerk/protocol/res/SubstitutingProtocolHandler.cpp + netwerk/protocol/res/SubstitutingProtocolHandler.h + netwerk/protocol/res/nsIResProtocolHandler.idl + netwerk/protocol/res/nsISubstitutingProtocolHandler.idl + netwerk/protocol/res/nsResProtocolHandler.cpp + netwerk/protocol/res/nsResProtocolHandler.h + xpcom/components/ManifestParser.cpp + + MozReview-Commit-ID: 1RXeNn7jdBf + + --HG-- + extra : rebase_source : 83000448abf58b7956c2eb122604d7ab38ad0f7c +--- + browser/extensions/activity-stream/jar.mn | 2 +- + browser/extensions/onboarding/jar.mn | 4 +- + browser/extensions/shield-recipe-client/jar.mn | 4 +- + caps/nsScriptSecurityManager.cpp | 54 ++++++++++++++++++---- + chrome/RegistryMessageUtils.h | 10 +++- + chrome/nsChromeRegistryChrome.cpp | 10 +++- + chrome/nsChromeRegistryContent.cpp | 2 +- + .../protocol/res/SubstitutingProtocolHandler.cpp | 53 +++++++++++++++++---- + netwerk/protocol/res/SubstitutingProtocolHandler.h | 26 +++++++++-- + netwerk/protocol/res/nsIResProtocolHandler.idl | 1 + + .../res/nsISubstitutingProtocolHandler.idl | 10 ++++ + netwerk/protocol/res/nsResProtocolHandler.cpp | 37 +++++++++++++-- + netwerk/protocol/res/nsResProtocolHandler.h | 3 +- + xpcom/components/ManifestParser.cpp | 4 +- + 14 files changed, 183 insertions(+), 37 deletions(-) + +diff --git caps/nsScriptSecurityManager.cpp caps/nsScriptSecurityManager.cpp +index 5dcb7f7ec424..4b797faf1eb3 100644 +--- caps/nsScriptSecurityManager.cpp ++++ caps/nsScriptSecurityManager.cpp +@@ -53,6 +53,7 @@ + #include "nsIURIFixup.h" + #include "nsCDefaultURIFixup.h" + #include "nsIChromeRegistry.h" ++#include "nsIResProtocolHandler.h" + #include "nsIContentSecurityPolicy.h" + #include "nsIAsyncVerifyRedirectCallback.h" + #include "mozilla/Preferences.h" +@@ -915,10 +916,9 @@ nsScriptSecurityManager::CheckLoadURIFlags(nsIURI *aSourceURI, + NS_ENSURE_SUCCESS(rv, rv); + if (hasFlags) { + if (aFlags & nsIScriptSecurityManager::ALLOW_CHROME) { +- +- // For now, don't change behavior for resource:// or moz-icon:// and +- // just allow them. +- if (!targetScheme.EqualsLiteral("chrome")) { ++ // For now, don't change behavior for moz-icon:// and just allow it. ++ if (!targetScheme.EqualsLiteral("chrome") ++ && !targetScheme.EqualsLiteral("resource")) { + return NS_OK; + } + +@@ -939,15 +939,51 @@ nsScriptSecurityManager::CheckLoadURIFlags(nsIURI *aSourceURI, + return NS_OK; + } + +- // Allow the load only if the chrome package is whitelisted. +- nsCOMPtr reg(do_GetService( +- NS_CHROMEREGISTRY_CONTRACTID)); +- if (reg) { ++ if (targetScheme.EqualsLiteral("resource")) { ++ // Mochitests that need to load resource:// URIs not declared ++ // content-accessible in manifests should set the preference ++ // "security.all_resource_uri_content_accessible" true. ++ static bool sSecurityPrefCached = false; ++ static bool sAllResourceUriContentAccessible = false; ++ if (!sSecurityPrefCached) { ++ sSecurityPrefCached = true; ++ Preferences::AddBoolVarCache( ++ &sAllResourceUriContentAccessible, ++ "security.all_resource_uri_content_accessible", ++ false); ++ } ++ if (sAllResourceUriContentAccessible) { ++ return NS_OK; ++ } ++ ++ nsCOMPtr ph; ++ rv = sIOService->GetProtocolHandler("resource", getter_AddRefs(ph)); ++ NS_ENSURE_SUCCESS(rv, rv); ++ if (!ph) { ++ return NS_ERROR_DOM_BAD_URI; ++ } ++ ++ nsCOMPtr rph = do_QueryInterface(ph); ++ if (!rph) { ++ return NS_ERROR_DOM_BAD_URI; ++ } ++ + bool accessAllowed = false; +- reg->AllowContentToAccess(aTargetBaseURI, &accessAllowed); ++ rph->AllowContentToAccess(aTargetBaseURI, &accessAllowed); + if (accessAllowed) { + return NS_OK; + } ++ } else { ++ // Allow the load only if the chrome package is whitelisted. ++ nsCOMPtr reg( ++ do_GetService(NS_CHROMEREGISTRY_CONTRACTID)); ++ if (reg) { ++ bool accessAllowed = false; ++ reg->AllowContentToAccess(aTargetBaseURI, &accessAllowed); ++ if (accessAllowed) { ++ return NS_OK; ++ } ++ } + } + } + +diff --git chrome/RegistryMessageUtils.h chrome/RegistryMessageUtils.h +index cb9db55b7ccd..d8cfa616852a 100644 +--- chrome/RegistryMessageUtils.h ++++ chrome/RegistryMessageUtils.h +@@ -42,12 +42,14 @@ struct SubstitutionMapping + nsCString scheme; + nsCString path; + SerializedURI resolvedURI; ++ uint32_t flags; + + bool operator ==(const SubstitutionMapping& rhs) const + { + return scheme.Equals(rhs.scheme) && + path.Equals(rhs.path) && +- resolvedURI == rhs.resolvedURI; ++ resolvedURI == rhs.resolvedURI && ++ flags == rhs.flags; + } + }; + +@@ -140,19 +142,23 @@ struct ParamTraits + WriteParam(aMsg, aParam.scheme); + WriteParam(aMsg, aParam.path); + WriteParam(aMsg, aParam.resolvedURI); ++ WriteParam(aMsg, aParam.flags); + } + + static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult) + { + nsCString scheme, path; + SerializedURI resolvedURI; ++ uint32_t flags; + + if (ReadParam(aMsg, aIter, &scheme) && + ReadParam(aMsg, aIter, &path) && +- ReadParam(aMsg, aIter, &resolvedURI)) { ++ ReadParam(aMsg, aIter, &resolvedURI) && ++ ReadParam(aMsg, aIter, &flags)) { + aResult->scheme = scheme; + aResult->path = path; + aResult->resolvedURI = resolvedURI; ++ aResult->flags = flags; + return true; + } + return false; +diff --git chrome/nsChromeRegistryChrome.cpp chrome/nsChromeRegistryChrome.cpp +index 8df9079d1cbd..ae10e65bd381 100644 +--- chrome/nsChromeRegistryChrome.cpp ++++ chrome/nsChromeRegistryChrome.cpp +@@ -927,7 +927,15 @@ nsChromeRegistryChrome::ManifestResource(ManifestProcessingContext& cx, int line + return; + } + +- rv = rph->SetSubstitution(host, resolved); ++ // By default, Firefox resources are not content-accessible unless the ++ // manifests opts in. ++ bool contentAccessible = (flags & nsChromeRegistry::CONTENT_ACCESSIBLE); ++ ++ uint32_t substitutionFlags = 0; ++ if (contentAccessible) { ++ substitutionFlags |= nsIResProtocolHandler::ALLOW_CONTENT_ACCESS; ++ } ++ rv = rph->SetSubstitutionWithFlags(host, resolved, substitutionFlags); + if (NS_FAILED(rv)) { + LogMessageWithContext(cx.GetManifestURI(), lineno, nsIScriptError::warningFlag, + "Warning: cannot set substitution for '%s'.", +diff --git chrome/nsChromeRegistryContent.cpp chrome/nsChromeRegistryContent.cpp +index a066f32f13d2..75141204d0b5 100644 +--- chrome/nsChromeRegistryContent.cpp ++++ chrome/nsChromeRegistryContent.cpp +@@ -114,7 +114,7 @@ nsChromeRegistryContent::RegisterSubstitution(const SubstitutionMapping& aSubsti + return; + } + +- rv = sph->SetSubstitution(aSubstitution.path, resolvedURI); ++ rv = sph->SetSubstitutionWithFlags(aSubstitution.path, resolvedURI, aSubstitution.flags); + if (NS_FAILED(rv)) + return; + } +diff --git netwerk/protocol/res/SubstitutingProtocolHandler.cpp netwerk/protocol/res/SubstitutingProtocolHandler.cpp +index d6971b036bdb..1fd362bfb1ff 100644 +--- netwerk/protocol/res/SubstitutingProtocolHandler.cpp ++++ netwerk/protocol/res/SubstitutingProtocolHandler.cpp +@@ -117,14 +117,15 @@ nsresult + SubstitutingProtocolHandler::CollectSubstitutions(InfallibleTArray& aMappings) + { + for (auto iter = mSubstitutions.ConstIter(); !iter.Done(); iter.Next()) { +- nsCOMPtr uri = iter.Data(); ++ SubstitutionEntry& entry = iter.Data(); ++ nsCOMPtr uri = entry.baseURI; + SerializedURI serialized; + if (uri) { + nsresult rv = uri->GetSpec(serialized.spec); + NS_ENSURE_SUCCESS(rv, rv); + uri->GetOriginCharset(serialized.charset); + } +- SubstitutionMapping substitution = { mScheme, nsCString(iter.Key()), serialized }; ++ SubstitutionMapping substitution = { mScheme, nsCString(iter.Key()), serialized, entry.flags }; + aMappings.AppendElement(substitution); + } + +@@ -131,7 +132,7 @@ SubstitutingProtocolHandler::CollectSubstitutions(InfallibleTArrayGetSpec(mapping.resolvedURI.spec); + NS_ENSURE_SUCCESS(rv, rv); + } ++ mapping.flags = aFlags; + + for (uint32_t i = 0; i < parents.Length(); i++) { + Unused << parents[i]->SendRegisterChromeItem(mapping); +@@ -292,11 +294,19 @@ SubstitutingProtocolHandler::AllowPort(int32_t port, const char *scheme, bool *_ + + nsresult + SubstitutingProtocolHandler::SetSubstitution(const nsACString& root, nsIURI *baseURI) ++{ ++ // Add-ons use this API but they should not be able to make anything ++ // content-accessible. ++ return SetSubstitutionWithFlags(root, baseURI, 0); ++} ++ ++nsresult ++SubstitutingProtocolHandler::SetSubstitutionWithFlags(const nsACString& root, nsIURI *baseURI, uint32_t flags) + { + if (!baseURI) { + mSubstitutions.Remove(root); + NotifyObservers(root, baseURI); +- return SendSubstitution(root, baseURI); ++ return SendSubstitution(root, baseURI, flags); + } + + // If baseURI isn't a same-scheme URI, we can set the substitution immediately. +@@ -310,9 +320,11 @@ SubstitutingProtocolHandler::SetSubstitution(const nsACString& root, nsIURI *bas + return NS_ERROR_INVALID_ARG; + } + +- mSubstitutions.Put(root, baseURI); ++ SubstitutionEntry& entry = mSubstitutions.GetOrInsert(root); ++ entry.baseURI = baseURI; ++ entry.flags = flags; + NotifyObservers(root, baseURI); +- return SendSubstitution(root, baseURI); ++ return SendSubstitution(root, baseURI, flags); + } + + // baseURI is a same-type substituting URI, let's resolve it first. +@@ -324,9 +336,11 @@ SubstitutingProtocolHandler::SetSubstitution(const nsACString& root, nsIURI *bas + rv = mIOService->NewURI(newBase, nullptr, nullptr, getter_AddRefs(newBaseURI)); + NS_ENSURE_SUCCESS(rv, rv); + +- mSubstitutions.Put(root, newBaseURI); ++ SubstitutionEntry& entry = mSubstitutions.GetOrInsert(root); ++ entry.baseURI = newBaseURI; ++ entry.flags = flags; + NotifyObservers(root, baseURI); +- return SendSubstitution(root, newBaseURI); ++ return SendSubstitution(root, newBaseURI, flags); + } + + nsresult +@@ -334,10 +348,29 @@ SubstitutingProtocolHandler::GetSubstitution(const nsACString& root, nsIURI **re + { + NS_ENSURE_ARG_POINTER(result); + +- if (mSubstitutions.Get(root, result)) ++ SubstitutionEntry entry; ++ if (mSubstitutions.Get(root, &entry)) { ++ nsCOMPtr baseURI = entry.baseURI; ++ baseURI.forget(result); + return NS_OK; ++ } ++ ++ uint32_t flags; ++ return GetSubstitutionInternal(root, result, &flags); ++} + +- return GetSubstitutionInternal(root, result); ++nsresult ++SubstitutingProtocolHandler::GetSubstitutionFlags(const nsACString& root, uint32_t* flags) ++{ ++ *flags = 0; ++ SubstitutionEntry entry; ++ if (mSubstitutions.Get(root, &entry)) { ++ *flags = entry.flags; ++ return NS_OK; ++ } ++ ++ nsCOMPtr baseURI; ++ return GetSubstitutionInternal(root, getter_AddRefs(baseURI), flags); + } + + nsresult +diff --git netwerk/protocol/res/SubstitutingProtocolHandler.h netwerk/protocol/res/SubstitutingProtocolHandler.h +index a08bd40de427..874eb1f9d04f 100644 +--- netwerk/protocol/res/SubstitutingProtocolHandler.h ++++ netwerk/protocol/res/SubstitutingProtocolHandler.h +@@ -9,9 +9,9 @@ + + #include "nsISubstitutingProtocolHandler.h" + +-#include "nsInterfaceHashtable.h" + #include "nsIOService.h" + #include "nsISubstitutionObserver.h" ++#include "nsDataHashtable.h" + #include "nsStandardURL.h" + #include "mozilla/chrome/RegistryMessageUtils.h" + #include "mozilla/Maybe.h" +@@ -44,13 +44,16 @@ protected: + virtual ~SubstitutingProtocolHandler() {} + void ConstructInternal(); + +- MOZ_MUST_USE nsresult SendSubstitution(const nsACString& aRoot, nsIURI* aBaseURI); ++ MOZ_MUST_USE nsresult SendSubstitution(const nsACString& aRoot, nsIURI* aBaseURI, uint32_t aFlags); ++ ++ nsresult GetSubstitutionFlags(const nsACString& root, uint32_t* flags); + + // Override this in the subclass to try additional lookups after checking + // mSubstitutions. +- virtual MOZ_MUST_USE nsresult GetSubstitutionInternal(const nsACString& aRoot, nsIURI** aResult) ++ virtual MOZ_MUST_USE nsresult GetSubstitutionInternal(const nsACString& aRoot, nsIURI** aResult, uint32_t* aFlags) + { + *aResult = nullptr; ++ *aFlags = 0; + return NS_ERROR_NOT_AVAILABLE; + } + +@@ -74,13 +77,28 @@ protected: + nsIIOService* IOService() { return mIOService; } + + private: ++ struct SubstitutionEntry ++ { ++ SubstitutionEntry() ++ : flags(0) ++ { ++ } ++ ++ ~SubstitutionEntry() ++ { ++ } ++ ++ nsCOMPtr baseURI; ++ uint32_t flags; ++ }; ++ + // Notifies all observers that a new substitution from |aRoot| to + // |aBaseURI| has been set/installed for this protocol handler. + void NotifyObservers(const nsACString& aRoot, nsIURI* aBaseURI); + + nsCString mScheme; + Maybe mFlags; +- nsInterfaceHashtable mSubstitutions; ++ nsDataHashtable mSubstitutions; + nsCOMPtr mIOService; + + // The list of observers added with AddObserver that will be +diff --git netwerk/protocol/res/nsIResProtocolHandler.idl netwerk/protocol/res/nsIResProtocolHandler.idl +index 56c597f4c73f..7046f2f1d452 100644 +--- netwerk/protocol/res/nsIResProtocolHandler.idl ++++ netwerk/protocol/res/nsIResProtocolHandler.idl +@@ -11,4 +11,5 @@ + [scriptable, uuid(241d34ac-9ed5-46d7-910c-7a9d914aa0c5)] + interface nsIResProtocolHandler : nsISubstitutingProtocolHandler + { ++ boolean allowContentToAccess(in nsIURI url); + }; +diff --git netwerk/protocol/res/nsISubstitutingProtocolHandler.idl netwerk/protocol/res/nsISubstitutingProtocolHandler.idl +index 11be8a5b1e0b..af0f02c28493 100644 +--- netwerk/protocol/res/nsISubstitutingProtocolHandler.idl ++++ netwerk/protocol/res/nsISubstitutingProtocolHandler.idl +@@ -14,6 +14,11 @@ interface nsISubstitutionObserver; + [scriptable, uuid(154c64fd-a69e-4105-89f8-bd7dfe621372)] + interface nsISubstitutingProtocolHandler : nsIProtocolHandler + { ++ /** ++ * Content script may access files in this package. ++ */ ++ const short ALLOW_CONTENT_ACCESS = 1; ++ + /** + * Sets the substitution for the root key: + * resource://root/path ==> baseURI.resolve(path) +@@ -25,6 +30,11 @@ interface nsISubstitutingProtocolHandler : nsIProtocolHandler + */ + [must_use] void setSubstitution(in ACString root, in nsIURI baseURI); + ++ /** ++ * Same as setSubstitution, but with specific flags. ++ */ ++ [must_use] void setSubstitutionWithFlags(in ACString root, in nsIURI baseURI, in uint32_t flags); ++ + /** + * Gets the substitution for the root key. + * +diff --git netwerk/protocol/res/nsResProtocolHandler.cpp netwerk/protocol/res/nsResProtocolHandler.cpp +index 265bab9ec9dc..57b615e67b07 100644 +--- netwerk/protocol/res/nsResProtocolHandler.cpp ++++ netwerk/protocol/res/nsResProtocolHandler.cpp +@@ -61,16 +61,36 @@ NS_IMPL_QUERY_INTERFACE(nsResProtocolHandler, nsIResProtocolHandler, + NS_IMPL_ADDREF_INHERITED(nsResProtocolHandler, SubstitutingProtocolHandler) + NS_IMPL_RELEASE_INHERITED(nsResProtocolHandler, SubstitutingProtocolHandler) + ++NS_IMETHODIMP ++nsResProtocolHandler::AllowContentToAccess(nsIURI *aURI, bool *aResult) ++{ ++ *aResult = false; ++ ++ nsAutoCString host; ++ nsresult rv = aURI->GetAsciiHost(host); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ uint32_t flags; ++ rv = GetSubstitutionFlags(host, &flags); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ *aResult = flags & nsISubstitutingProtocolHandler::ALLOW_CONTENT_ACCESS; ++ return NS_OK; ++} ++ + nsresult +-nsResProtocolHandler::GetSubstitutionInternal(const nsACString& root, nsIURI **result) ++nsResProtocolHandler::GetSubstitutionInternal(const nsACString& aRoot, ++ nsIURI** aResult, ++ uint32_t* aFlags) + { + nsAutoCString uri; + +- if (!ResolveSpecialCases(root, NS_LITERAL_CSTRING("/"), NS_LITERAL_CSTRING("/"), uri)) { ++ if (!ResolveSpecialCases(aRoot, NS_LITERAL_CSTRING("/"), NS_LITERAL_CSTRING("/"), uri)) { + return NS_ERROR_NOT_AVAILABLE; + } + +- return NS_NewURI(result, uri); ++ *aFlags = 0; // No content access. ++ return NS_NewURI(aResult, uri); + } + + bool +@@ -98,3 +118,14 @@ nsResProtocolHandler::SetSubstitution(const nsACString& aRoot, nsIURI* aBaseURI) + MOZ_ASSERT(!aRoot.Equals(kGRE)); + return SubstitutingProtocolHandler::SetSubstitution(aRoot, aBaseURI); + } ++ ++nsresult ++nsResProtocolHandler::SetSubstitutionWithFlags(const nsACString& aRoot, ++ nsIURI* aBaseURI, ++ uint32_t aFlags) ++{ ++ MOZ_ASSERT(!aRoot.Equals("")); ++ MOZ_ASSERT(!aRoot.Equals(kAPP)); ++ MOZ_ASSERT(!aRoot.Equals(kGRE)); ++ return SubstitutingProtocolHandler::SetSubstitutionWithFlags(aRoot, aBaseURI, aFlags); ++} +diff --git netwerk/protocol/res/nsResProtocolHandler.h netwerk/protocol/res/nsResProtocolHandler.h +index 3f6243667586..56bde73c0c1c 100644 +--- netwerk/protocol/res/nsResProtocolHandler.h ++++ netwerk/protocol/res/nsResProtocolHandler.h +@@ -34,6 +34,7 @@ public: + MOZ_MUST_USE nsresult Init(); + + NS_IMETHOD SetSubstitution(const nsACString& aRoot, nsIURI* aBaseURI) override; ++ NS_IMETHOD SetSubstitutionWithFlags(const nsACString& aRoot, nsIURI* aBaseURI, uint32_t aFlags) override; + + NS_IMETHOD GetSubstitution(const nsACString& aRoot, nsIURI** aResult) override + { +@@ -61,7 +62,7 @@ public: + } + + protected: +- MOZ_MUST_USE nsresult GetSubstitutionInternal(const nsACString& aRoot, nsIURI** aResult) override; ++ MOZ_MUST_USE nsresult GetSubstitutionInternal(const nsACString& aRoot, nsIURI** aResult, uint32_t* aFlags) override; + virtual ~nsResProtocolHandler() {} + + MOZ_MUST_USE bool ResolveSpecialCases(const nsACString& aHost, +diff --git xpcom/components/ManifestParser.cpp xpcom/components/ManifestParser.cpp +index ea1a243bae1f..63d7d56523d4 100644 +--- xpcom/components/ManifestParser.cpp ++++ xpcom/components/ManifestParser.cpp +@@ -56,7 +56,7 @@ struct ManifestDirective + + bool allowbootstrap; + +- // The contentaccessible flags only apply to content directives. ++ // The contentaccessible flags only apply to content/resource directives. + bool contentflags; + + // Function to handle this directive. This isn't a union because C++ still +@@ -123,7 +123,7 @@ static const ManifestDirective kParsingTable[] = { + nullptr, &nsChromeRegistry::ManifestOverride, nullptr + }, + { +- "resource", 2, false, true, true, true, false, ++ "resource", 2, false, true, true, true, true, + nullptr, &nsChromeRegistry::ManifestResource, nullptr + } + }; + +commit e5b80e9a8fc1 +Author: Chung-Sheng Fu +Date: Thu Jun 8 17:52:46 2017 +0800 + + Bug 863246 - Move resources that need to be exposed to web content to locations that are marked as contentaccessible r=billm + + MozReview-Commit-ID: ArhSHKPYOr8 + + --HG-- + extra : rebase_source : 888f7ce8f9db809ad5abbe6340af74e9dfb1d73b +--- + browser/installer/package-manifest.in | 6 +++--- + devtools/client/jsonview/converter-child.js | 2 +- + devtools/client/jsonview/viewer-config.js | 8 ++++---- + devtools/shared/jar.mn | 2 ++ + dom/html/ImageDocument.cpp | 4 ++-- + dom/html/VideoDocument.cpp | 2 +- + dom/xml/resources/XMLPrettyPrint.css | 2 +- + layout/style/jar.mn | 2 +- + layout/style/moz.build | 4 ++++ + mobile/android/installer/package-manifest.in | 5 +++-- + parser/html/nsHtml5ViewSourceUtils.cpp | 2 +- + python/mozbuild/mozbuild/frontend/context.py | 8 ++++++++ + python/mozbuild/mozpack/chrome/manifest.py | 1 + + python/mozbuild/mozpack/packager/formats.py | 1 + + toolkit/content/browser-content.js | 2 +- + 15 files changed, 34 insertions(+), 17 deletions(-) + +diff --git browser/installer/package-manifest.in browser/installer/package-manifest.in +index 641cc024892f..6c4ae941aef2 100644 +--- browser/installer/package-manifest.in ++++ browser/installer/package-manifest.in +@@ -683,9 +683,6 @@ + @RESPATH@/res/EditorOverride.css + @RESPATH@/res/contenteditable.css + @RESPATH@/res/designmode.css +-@RESPATH@/res/ImageDocument.css +-@RESPATH@/res/TopLevelImageDocument.css +-@RESPATH@/res/TopLevelVideoDocument.css + @RESPATH@/res/table-add-column-after-active.gif + @RESPATH@/res/table-add-column-after-hover.gif + @RESPATH@/res/table-add-column-after.gif +@@ -716,6 +713,9 @@ + @RESPATH@/res/MainMenu.nib/ + #endif + ++; Content-accessible resources. ++@RESPATH@/contentaccessible/* ++ + ; svg + @RESPATH@/res/svg.css + @RESPATH@/components/dom_svg.xpt +diff --git devtools/client/jsonview/converter-child.js devtools/client/jsonview/converter-child.js +index d272dad00fb1..19060088ae6b 100644 +--- devtools/client/jsonview/converter-child.js ++++ devtools/client/jsonview/converter-child.js +@@ -208,7 +208,7 @@ function initialHTML(doc) { + + // The base URI is prepended to all URIs instead of using a element + // because the latter can be blocked by a CSP base-uri directive (bug 1316393) +- let baseURI = "resource://devtools/client/jsonview/"; ++ let baseURI = "resource://devtools-client-jsonview/"; + + let style = doc.createElement("link"); + style.rel = "stylesheet"; +diff --git devtools/client/jsonview/viewer-config.js devtools/client/jsonview/viewer-config.js +index 387a0dd4ebfb..429bf9b07298 100644 +--- devtools/client/jsonview/viewer-config.js ++++ devtools/client/jsonview/viewer-config.js +@@ -21,14 +21,14 @@ + * of the code base, so it's consistent and modules can be easily reused. + */ + require.config({ +- baseUrl: "resource://devtools/client/jsonview/", ++ baseUrl: "resource://devtools-client-jsonview/", + paths: { +- "devtools/client/shared": "resource://devtools/client/shared", ++ "devtools/client/shared": "resource://devtools-client-shared", + "devtools/shared": "resource://devtools/shared", + "devtools/client/shared/vendor/react": + JSONView.debug +- ? "resource://devtools/client/shared/vendor/react-dev" +- : "resource://devtools/client/shared/vendor/react" ++ ? "resource://devtools-client-shared/vendor/react-dev" ++ : "resource://devtools-client-shared/vendor/react" + } + }); + +diff --git devtools/shared/jar.mn devtools/shared/jar.mn +index 4d0823550c5a..82dc7741b213 100644 +--- devtools/shared/jar.mn ++++ devtools/shared/jar.mn +@@ -4,6 +4,8 @@ + + devtools.jar: + % resource devtools %modules/devtools/ ++% resource devtools-client-jsonview resource://devtools/client/jsonview/ contentaccessible=yes ++% resource devtools-client-shared resource://devtools/client/shared/ contentaccessible=yes + # The typical approach would be to list all the resource files in this manifest + # for installation. Instead of doing this, use the DevToolsModules syntax via + # moz.build files to do the installation so that we can enforce correct paths +diff --git dom/html/ImageDocument.cpp dom/html/ImageDocument.cpp +index d5c686c27b9f..6e0d31275a49 100644 +--- dom/html/ImageDocument.cpp ++++ dom/html/ImageDocument.cpp +@@ -279,9 +279,9 @@ ImageDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject) + target->AddEventListener(NS_LITERAL_STRING("keypress"), this, false); + + if (GetReadyStateEnum() != nsIDocument::READYSTATE_COMPLETE) { +- LinkStylesheet(NS_LITERAL_STRING("resource://gre/res/ImageDocument.css")); ++ LinkStylesheet(NS_LITERAL_STRING("resource://content-accessible/ImageDocument.css")); + if (!nsContentUtils::IsChildOfSameType(this)) { +- LinkStylesheet(NS_LITERAL_STRING("resource://gre/res/TopLevelImageDocument.css")); ++ LinkStylesheet(NS_LITERAL_STRING("resource://content-accessible/TopLevelImageDocument.css")); + LinkStylesheet(NS_LITERAL_STRING("chrome://global/skin/media/TopLevelImageDocument.css")); + } + } +diff --git dom/html/VideoDocument.cpp dom/html/VideoDocument.cpp +index 1bd898564a47..9ca616a5ec53 100644 +--- dom/html/VideoDocument.cpp ++++ dom/html/VideoDocument.cpp +@@ -74,7 +74,7 @@ VideoDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject) + if (aScriptGlobalObject) { + if (!nsContentUtils::IsChildOfSameType(this) && + GetReadyStateEnum() != nsIDocument::READYSTATE_COMPLETE) { +- LinkStylesheet(NS_LITERAL_STRING("resource://gre/res/TopLevelVideoDocument.css")); ++ LinkStylesheet(NS_LITERAL_STRING("resource://content-accessible/TopLevelVideoDocument.css")); + LinkStylesheet(NS_LITERAL_STRING("chrome://global/skin/media/TopLevelVideoDocument.css")); + LinkScript(NS_LITERAL_STRING("chrome://global/content/TopLevelVideoDocument.js")); + } +diff --git dom/xml/resources/XMLPrettyPrint.css dom/xml/resources/XMLPrettyPrint.css +index efc7ab5e5e17..13bb61e71532 100644 +--- dom/xml/resources/XMLPrettyPrint.css ++++ dom/xml/resources/XMLPrettyPrint.css +@@ -3,7 +3,7 @@ + * 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/. */ + +-@import url("resource://gre-resources/viewsource.css"); ++@import url("resource://content-accessible/viewsource.css"); + + #header { + background-color: #ccc; +diff --git layout/style/jar.mn layout/style/jar.mn +index af8c15d4fab5..81af0f7540fc 100644 +--- layout/style/jar.mn ++++ layout/style/jar.mn +@@ -7,7 +7,6 @@ toolkit.jar: + * res/html.css (res/html.css) + res/quirk.css (res/quirk.css) + res/plaintext.css (res/plaintext.css) +- res/viewsource.css (res/viewsource.css) + res/counterstyles.css (res/counterstyles.css) + res/noscript.css (res/noscript.css) + res/noframes.css (res/noframes.css) +@@ -33,3 +32,4 @@ toolkit.jar: + res/accessiblecaret-tilt-right@2.25x.png (res/accessiblecaret-tilt-right@2.25x.png) + + % resource gre-resources %res/ ++% resource content-accessible resource://gre/contentaccessible/ contentaccessible=yes +diff --git layout/style/moz.build layout/style/moz.build +index 0d1f261454f9..d4fbd0fef384 100644 +--- layout/style/moz.build ++++ layout/style/moz.build +@@ -300,7 +300,11 @@ JAR_MANIFESTS += ['jar.mn'] + RESOURCE_FILES += [ + 'contenteditable.css', + 'designmode.css', ++] ++ ++CONTENT_ACCESSIBLE_FILES += [ + 'ImageDocument.css', ++ 'res/viewsource.css', + 'TopLevelImageDocument.css', + 'TopLevelVideoDocument.css', + ] +diff --git mobile/android/installer/package-manifest.in mobile/android/installer/package-manifest.in +index 0fc95bb838c8..ebbf39b171b6 100644 +--- mobile/android/installer/package-manifest.in ++++ mobile/android/installer/package-manifest.in +@@ -459,8 +459,6 @@ + @BINPATH@/res/EditorOverride.css + @BINPATH@/res/contenteditable.css + @BINPATH@/res/designmode.css +-@BINPATH@/res/TopLevelImageDocument.css +-@BINPATH@/res/TopLevelVideoDocument.css + @BINPATH@/res/table-add-column-after-active.gif + @BINPATH@/res/table-add-column-after-hover.gif + @BINPATH@/res/table-add-column-after.gif +@@ -490,6 +488,9 @@ + @BINPATH@/res/fonts/*.properties + #endif + ++; Content-accessible resources. ++@BINPATH@/contentaccessible/* ++ + ; svg + @BINPATH@/res/svg.css + @BINPATH@/components/dom_svg.xpt +diff --git parser/html/nsHtml5ViewSourceUtils.cpp parser/html/nsHtml5ViewSourceUtils.cpp +index b2f635bffe52..d94865d0acee 100644 +--- parser/html/nsHtml5ViewSourceUtils.cpp ++++ parser/html/nsHtml5ViewSourceUtils.cpp +@@ -50,7 +50,7 @@ nsHtml5ViewSourceUtils::NewLinkAttributes() + nsHtml5String type = nsHtml5Portability::newStringFromLiteral("text/css"); + linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_TYPE, type, -1); + nsHtml5String href = nsHtml5Portability::newStringFromLiteral( +- "resource://gre-resources/viewsource.css"); ++ "resource://content-accessible/viewsource.css"); + linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_HREF, href, -1); + return linkAttrs; + } +diff --git python/mozbuild/mozbuild/frontend/context.py python/mozbuild/mozbuild/frontend/context.py +index b06f39e3ee34..e97ee820bc79 100644 +--- python/mozbuild/mozbuild/frontend/context.py ++++ python/mozbuild/mozbuild/frontend/context.py +@@ -2090,6 +2090,14 @@ SPECIAL_VARIABLES = { + RESOURCE_FILES.fonts += ['bar.res'] + """), + ++ 'CONTENT_ACCESSIBLE_FILES': (lambda context: context['FINAL_TARGET_FILES'].contentaccessible, list, ++ """List of files which can be accessed by web content through resource:// URIs. ++ ++ ``CONTENT_ACCESSIBLE_FILES`` is used to list the files to be exported ++ to ``dist/bin/contentaccessible``. Files can also be appended to a ++ field to indicate which subdirectory they should be exported to. ++ """), ++ + 'EXTRA_JS_MODULES': (lambda context: context['FINAL_TARGET_FILES'].modules, list, + """Additional JavaScript files to distribute. + +diff --git python/mozbuild/mozpack/chrome/manifest.py python/mozbuild/mozpack/chrome/manifest.py +index 0781d0383304..05b97c8b9e09 100644 +--- python/mozbuild/mozpack/chrome/manifest.py ++++ python/mozbuild/mozpack/chrome/manifest.py +@@ -38,6 +38,7 @@ class ManifestEntry(object): + 'xpcnativewrappers', + 'tablet', + 'process', ++ 'contentaccessible', + ] + + def __init__(self, base, *flags): +diff --git python/mozbuild/mozpack/packager/formats.py python/mozbuild/mozpack/packager/formats.py +index f31d775646a7..ffafd5f520b4 100644 +--- python/mozbuild/mozpack/packager/formats.py ++++ python/mozbuild/mozpack/packager/formats.py +@@ -339,4 +339,5 @@ class OmniJarSubFormatter(PiecemealFormatter): + 'greprefs.js', + 'hyphenation', + 'update.locale', ++ 'contentaccessible', + ] +diff --git toolkit/content/browser-content.js toolkit/content/browser-content.js +index 4d2a8fca47a5..f478618c1b5b 100644 +--- toolkit/content/browser-content.js ++++ toolkit/content/browser-content.js +@@ -1340,7 +1340,7 @@ var ViewSelectionSource = { + return undefined; + + // serialize +- const VIEW_SOURCE_CSS = "resource://gre-resources/viewsource.css"; ++ const VIEW_SOURCE_CSS = "resource://content-accessible/viewsource.css"; + const BUNDLE_URL = "chrome://global/locale/viewSource.properties"; + + let bundle = Services.strings.createBundle(BUNDLE_URL); + +commit da32016d7637 +Author: Chung-Sheng Fu +Date: Mon Aug 7 15:55:39 2017 +0800 + + Bug 863246 - Use system principal to load debugger scripts r=billm,bkelly + + MozReview-Commit-ID: DPvbR1As2UV + + --HG-- + extra : rebase_source : c185be0d4d2180dd3dd7d0fbcfdd1035f3b4ddf3 +--- + dom/workers/ScriptLoader.cpp | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git dom/workers/ScriptLoader.cpp dom/workers/ScriptLoader.cpp +index 0948e8b1f860..461c7f4cd925 100644 +--- dom/workers/ScriptLoader.cpp ++++ dom/workers/ScriptLoader.cpp +@@ -894,10 +894,19 @@ private: + { + AssertIsOnMainThread(); + MOZ_ASSERT(aIndex < mLoadInfos.Length()); ++ MOZ_ASSERT_IF(IsMainWorkerScript(), mWorkerScriptType != DebuggerScript); + + WorkerPrivate* parentWorker = mWorkerPrivate->GetParent(); + +- nsIPrincipal* principal = mWorkerPrivate->GetPrincipal(); ++ // For JavaScript debugging, the devtools server must run on the same ++ // thread as the debuggee, indicating the worker uses content principal. ++ // However, in Bug 863246, web content will no longer be able to load ++ // resource:// URIs by default, so we need system principal to load ++ // debugger scripts. ++ nsIPrincipal* principal = (mWorkerScriptType == DebuggerScript) ? ++ nsContentUtils::GetSystemPrincipal() : ++ mWorkerPrivate->GetPrincipal(); ++ + nsCOMPtr loadGroup = mWorkerPrivate->GetLoadGroup(); + MOZ_DIAGNOSTIC_ASSERT(principal); + + +commit 90189a558c02 +Author: Chung-Sheng Fu +Date: Wed Jul 19 17:30:01 2017 +0800 + + Bug 863246 - Fix test failures r=Gijs + + MozReview-Commit-ID: 8tUr27zvs8z + + --HG-- + extra : rebase_source : 997ace66c37098701d433508c682ed7621a78479 +--- + .../test/static/browser_all_files_referenced.js | 6 ++- + .../content/test/static/browser_parsable_css.js | 60 ++++++++++++---------- + caps/tests/mochitest/test_bug292789.html | 7 ++- + .../platform/content/test/test_clipboard.html | 25 +++++++-- + .../test/mixedcontentblocker/test_bug803225.html | 7 ++- + .../htmlparser/tests/reftest/bug482921-1-ref.html | 2 +- + .../htmlparser/tests/reftest/bug482921-2-ref.html | 2 +- + .../htmlparser/tests/reftest/bug535530-2-ref.html | 2 +- + .../htmlparser/tests/reftest/bug704667-1-ref.html | 2 +- + .../htmlparser/tests/reftest/bug731234-1-ref.html | 2 +- + .../htmlparser/tests/reftest/bug910588-1-ref.html | 2 +- + 11 files changed, 75 insertions(+), 42 deletions(-) + +diff --git browser/base/content/test/static/browser_all_files_referenced.js browser/base/content/test/static/browser_all_files_referenced.js +index e875020ab490..87c5f96af7c3 100644 +--- browser/base/content/test/static/browser_all_files_referenced.js ++++ browser/base/content/test/static/browser_all_files_referenced.js +@@ -176,7 +176,6 @@ var whitelist = [ + {file: "resource://gre/modules/accessibility/AccessFu.jsm"}, + // Bug 1351637 + {file: "resource://gre/modules/sdk/bootstrap.js"}, +- + ]; + + whitelist = new Set(whitelist.filter(item => +@@ -478,7 +477,8 @@ function findChromeUrlsFromArray(array, prefix) { + + // Only keep strings that look like real chrome or resource urls. + if (/chrome:\/\/[a-zA-Z09 -]+\/(content|skin|locale)\//.test(string) || +- /resource:\/\/gre.*\.[a-z]+/.test(string)) ++ /resource:\/\/gre.*\.[a-z]+/.test(string) || ++ string.startsWith("resource://content-accessible/")) + gReferencesFromCode.add(string); + } + } +@@ -540,6 +540,8 @@ add_task(async function checkAllTheFiles() { + let devtoolsPrefixes = ["chrome://webide/", + "chrome://devtools", + "resource://devtools/", ++ "resource://devtools-client-jsonview/", ++ "resource://devtools-client-shared/", + "resource://app/modules/devtools", + "resource://gre/modules/devtools"]; + let chromeFiles = []; +diff --git browser/base/content/test/static/browser_parsable_css.js browser/base/content/test/static/browser_parsable_css.js +index 20d69bd9b1d1..20b12a9820c9 100644 +--- browser/base/content/test/static/browser_parsable_css.js ++++ browser/base/content/test/static/browser_parsable_css.js +@@ -17,7 +17,7 @@ let whitelist = [ + {sourceName: /devtools\/client\/debugger\/new\/debugger.css/i, + isFromDevTools: true}, + // Reps uses cross-browser CSS. +- {sourceName: /devtools\/client\/shared\/components\/reps\/reps.css/i, ++ {sourceName: /devtools-client-shared\/components\/reps\/reps.css/i, + isFromDevTools: true}, + // PDFjs is futureproofing its pseudoselectors, and those rules are dropped. + {sourceName: /web\/viewer\.css$/i, +@@ -288,41 +288,49 @@ add_task(async function checkAllTheCSS() { + // Wait for all manifest to be parsed + await Promise.all(manifestPromises); + +- // We build a list of promises that get resolved when their respective +- // files have loaded and produced no errors. +- let allPromises = []; +- + // filter out either the devtools paths or the non-devtools paths: + let isDevtools = SimpleTest.harnessParameters.subsuite == "devtools"; + let devtoolsPathBits = ["webide", "devtools"]; + uris = uris.filter(uri => isDevtools == devtoolsPathBits.some(path => uri.spec.includes(path))); + +- for (let uri of uris) { +- let linkEl = doc.createElement("link"); ++ let loadCSS = chromeUri => new Promise(resolve => { ++ let linkEl, onLoad, onError; ++ onLoad = e => { ++ processCSSRules(linkEl.sheet); ++ resolve(); ++ linkEl.removeEventListener("load", onLoad); ++ linkEl.removeEventListener("error", onError); ++ }; ++ onError = e => { ++ ok(false, "Loading " + linkEl.getAttribute("href") + " threw an error!"); ++ resolve(); ++ linkEl.removeEventListener("load", onLoad); ++ linkEl.removeEventListener("error", onError); ++ }; ++ linkEl = doc.createElement("link"); + linkEl.setAttribute("rel", "stylesheet"); +- allPromises.push(new Promise(resolve => { +- let onLoad = (e) => { +- processCSSRules(linkEl.sheet); +- resolve(); +- linkEl.removeEventListener("load", onLoad); +- linkEl.removeEventListener("error", onError); +- }; +- let onError = (e) => { +- ok(false, "Loading " + linkEl.getAttribute("href") + " threw an error!"); +- resolve(); +- linkEl.removeEventListener("load", onLoad); +- linkEl.removeEventListener("error", onError); +- }; +- linkEl.addEventListener("load", onLoad); +- linkEl.addEventListener("error", onError); +- linkEl.setAttribute("type", "text/css"); +- let chromeUri = convertToCodeURI(uri.spec); +- linkEl.setAttribute("href", chromeUri + kPathSuffix); +- })); ++ linkEl.setAttribute("type", "text/css"); ++ linkEl.addEventListener("load", onLoad); ++ linkEl.addEventListener("error", onError); ++ linkEl.setAttribute("href", chromeUri + kPathSuffix); + doc.head.appendChild(linkEl); ++ }); ++ ++ // We build a list of promises that get resolved when their respective ++ // files have loaded and produced no errors. ++ const kInContentCommonCSS = "chrome://global/skin/in-content/common.css"; ++ let allPromises = uris.map((uri) => convertToCodeURI(uri.spec)) ++ .filter((uri) => uri !== kInContentCommonCSS); ++ ++ // Make sure chrome://global/skin/in-content/common.css is loaded before other ++ // stylesheets in order to guarantee the --in-content variables can be ++ // correctly referenced. ++ if (allPromises.length !== uris.length) { ++ await loadCSS(kInContentCommonCSS); + } + + // Wait for all the files to have actually loaded: ++ allPromises = allPromises.map(loadCSS); + await Promise.all(allPromises); + + // Check if all the files referenced from CSS actually exist. +diff --git caps/tests/mochitest/test_bug292789.html caps/tests/mochitest/test_bug292789.html +index 6b30e207771c..000cf6c12b8f 100644 +--- caps/tests/mochitest/test_bug292789.html ++++ caps/tests/mochitest/test_bug292789.html *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Sat Apr 7 00:25: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 8F6E9F93F95; Sat, 7 Apr 2018 00:25:52 +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 42D217E0BB; Sat, 7 Apr 2018 00:25:52 +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 395F41933C; Sat, 7 Apr 2018 00:25:52 +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 w370Pq5M079842; Sat, 7 Apr 2018 00:25:52 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w370PpGh079840; Sat, 7 Apr 2018 00:25:51 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804070025.w370PpGh079840@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 7 Apr 2018 00:25:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466698 - branches/2018Q2/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/emulators/citra X-SVN-Commit-Revision: 466698 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, 07 Apr 2018 00:25:52 -0000 Author: jbeich Date: Sat Apr 7 00:25:51 2018 New Revision: 466698 URL: https://svnweb.freebsd.org/changeset/ports/466698 Log: MFH: r466695 emulators/citra: update to s20180406 Changes: https://github.com/citra-emu/citra/compare/7d710170...39fce601 Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q2/emulators/citra/Makefile branches/2018Q2/emulators/citra/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/emulators/citra/Makefile ============================================================================== --- branches/2018Q2/emulators/citra/Makefile Sat Apr 7 00:23:52 2018 (r466697) +++ branches/2018Q2/emulators/citra/Makefile Sat Apr 7 00:25:51 2018 (r466698) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180402 +PORTVERSION= s20180406 PORTREVISION?= 0 CATEGORIES= emulators @@ -25,13 +25,13 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dy USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 7d710170 +GH_TAGNAME= 39fce601 GH_TUPLE= citra-emu:ext-libressl-portable:cbb1dca:libressl/externals/libressl \ citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \ benhoyt:inih:r40:inih/externals/inih/inih \ catchorg:Catch2:v2.1.1:catch/externals/catch \ - fmtlib:fmt:4.0.0-435-g4d35f94:fmt/externals/fmt \ + fmtlib:fmt:4.0.0-510-g5859e58:fmt/externals/fmt \ herumi:xbyak:v5.53-1-gc5da377:xbyak/externals/xbyak \ lsalzman:enet:39a72ab:enet/externals/enet \ neobrain:nihstro:fd69de1:nihstro/externals/nihstro \ Modified: branches/2018Q2/emulators/citra/distinfo ============================================================================== --- branches/2018Q2/emulators/citra/distinfo Sat Apr 7 00:23:52 2018 (r466697) +++ branches/2018Q2/emulators/citra/distinfo Sat Apr 7 00:25:51 2018 (r466698) @@ -1,6 +1,6 @@ -TIMESTAMP = 1522685376 -SHA256 (citra-emu-citra-s20180402-7d710170_GH0.tar.gz) = b681d86635b6fb58867a739e81ad17725163ef58bbe0d6c05a8c4ce83f358be3 -SIZE (citra-emu-citra-s20180402-7d710170_GH0.tar.gz) = 1890422 +TIMESTAMP = 1523010937 +SHA256 (citra-emu-citra-s20180406-39fce601_GH0.tar.gz) = b53c62140948dd12ed9ae246c9f8cd3f4d12a0d9c66fcf77f829a61442b58e56 +SIZE (citra-emu-citra-s20180406-39fce601_GH0.tar.gz) = 1898969 SHA256 (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = f3741a3bb480d9f8a817f032f59d1908e659620cbb93c0fe8289cfb46d2ab89c SIZE (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = 1761962 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7 @@ -11,8 +11,8 @@ SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd SIZE (benhoyt-inih-r40_GH0.tar.gz) = 11436 SHA256 (catchorg-Catch2-v2.1.1_GH0.tar.gz) = c40d3c8133c9274946067007e911a55b0d0ad3ed7c59a1f258dfcdb6836d8eff SIZE (catchorg-Catch2-v2.1.1_GH0.tar.gz) = 481236 -SHA256 (fmtlib-fmt-4.0.0-435-g4d35f94_GH0.tar.gz) = fb8f361a8b33cdca1bb5ca1b9124e35133c4f7469343f6d54f65cb3f2d5b7caf -SIZE (fmtlib-fmt-4.0.0-435-g4d35f94_GH0.tar.gz) = 621671 +SHA256 (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 6d719fe37c54ffcd6a7c1679a288e4947304cc24b4ff00aaf679ef0b0474a7b3 +SIZE (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 623334 SHA256 (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 51129bc945fe2650f5fcd41f3b0166555b17589f03bda5d2216927234ef6446a SIZE (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 206888 SHA256 (lsalzman-enet-39a72ab_GH0.tar.gz) = cdeec4d447266d93dbd56564b260c57e411dc681caba6887a7e3f152009e6be1 From owner-svn-ports-branches@freebsd.org Sat Apr 7 00:29:27 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 CCB34F94285; Sat, 7 Apr 2018 00:29:27 +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 7BE437E352; Sat, 7 Apr 2018 00:29:27 +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 72A671934B; Sat, 7 Apr 2018 00:29:27 +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 w370TR8E080222; Sat, 7 Apr 2018 00:29:27 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w370TRrj080220; Sat, 7 Apr 2018 00:29:27 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804070029.w370TRrj080220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 7 Apr 2018 00:29:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466700 - branches/2018Q2/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/emulators/rpcs3 X-SVN-Commit-Revision: 466700 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, 07 Apr 2018 00:29:28 -0000 Author: jbeich Date: Sat Apr 7 00:29:27 2018 New Revision: 466700 URL: https://svnweb.freebsd.org/changeset/ports/466700 Log: MFH: r466696 emulators/rpcs3: update to 0.0.5.182 Changes: https://github.com/RPCS3/rpcs3/compare/568118634...2b5cf2455 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q2/emulators/rpcs3/Makefile branches/2018Q2/emulators/rpcs3/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q2/emulators/rpcs3/Makefile Sat Apr 7 00:26:46 2018 (r466699) +++ branches/2018Q2/emulators/rpcs3/Makefile Sat Apr 7 00:29:27 2018 (r466700) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-178 -DISTVERSIONSUFFIX= -g568118634 +DISTVERSION= 0.0.5-182 +DISTVERSIONSUFFIX= -g2b5cf2455 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q2/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q2/emulators/rpcs3/distinfo Sat Apr 7 00:26:46 2018 (r466699) +++ branches/2018Q2/emulators/rpcs3/distinfo Sat Apr 7 00:29:27 2018 (r466700) @@ -1,6 +1,6 @@ -TIMESTAMP = 1522879610 -SHA256 (RPCS3-rpcs3-v0.0.5-178-g568118634_GH0.tar.gz) = c42a33ea3151622c3793b1f8d2fcf323d061bebc2c8a4375fbe5a08529ab5fc1 -SIZE (RPCS3-rpcs3-v0.0.5-178-g568118634_GH0.tar.gz) = 4323812 +TIMESTAMP = 1523040474 +SHA256 (RPCS3-rpcs3-v0.0.5-182-g2b5cf2455_GH0.tar.gz) = 3a4f1539a305de9d0448dd258956d14b9ee211fb3a8bcccdcaba6610bb7f9271 +SIZE (RPCS3-rpcs3-v0.0.5-182-g2b5cf2455_GH0.tar.gz) = 4324645 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 Sat Apr 7 11:02:49 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 6185AFA1BDB; Sat, 7 Apr 2018 11:02:49 +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 08FA26E4EB; Sat, 7 Apr 2018 11:02:49 +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 F0AD21FF7E; Sat, 7 Apr 2018 11:02:48 +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 w37B2mvZ099983; Sat, 7 Apr 2018 11:02:48 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w37B2mvv099979; Sat, 7 Apr 2018 11:02:48 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201804071102.w37B2mvv099979@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 7 Apr 2018 11:02:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466715 - branches/2018Q2/net/traefik X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q2/net/traefik X-SVN-Commit-Revision: 466715 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, 07 Apr 2018 11:02:49 -0000 Author: riggs Date: Sat Apr 7 11:02:48 2018 New Revision: 466715 URL: https://svnweb.freebsd.org/changeset/ports/466715 Log: MFH: r466714 Update to upstream release 1.5.4 (bugfix release) Details: - Update to upstream release 1.5.4, changelog see https://github.com/containous/traefik/releases/tag/v1.5.4 - Install sample configuration file that allows to start traefik out of the box without configuration tweaks - Add pkg-message; includes a note on how to accomplish binding to privileged ports Approved by: ports-secteam (riggs) Added: branches/2018Q2/net/traefik/pkg-message - copied unchanged from r466714, head/net/traefik/pkg-message Modified: branches/2018Q2/net/traefik/Makefile branches/2018Q2/net/traefik/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/net/traefik/Makefile ============================================================================== --- branches/2018Q2/net/traefik/Makefile Sat Apr 7 11:01:08 2018 (r466714) +++ branches/2018Q2/net/traefik/Makefile Sat Apr 7 11:02:48 2018 (r466715) @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= traefik -PORTVERSION= 1.5.3 +PORTVERSION= 1.5.4 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= net MASTER_SITES= LOCAL/riggs/${PORTNAME}:webui DISTFILES= ${PORTNAME}-webui-static-${PORTVERSION}${EXTRACT_SUFX}:webui @@ -51,6 +50,10 @@ TRAEFIK_LDARGS= -ldflags "-s -w \ post-extract: @${MV} ${WRKDIR}/static ${WRKSRC} + # Install a sample configuration file which works by default + # without manual tweaking + ${REINPLACE_CMD} -e 's|:80|:8088|' \ + -e 's|\[docker|# \[docker|' ${WRKSRC}/traefik.sample.toml do-build: @cd ${WRKSRC}/src/github.com/containous/traefik; \ Modified: branches/2018Q2/net/traefik/distinfo ============================================================================== --- branches/2018Q2/net/traefik/distinfo Sat Apr 7 11:01:08 2018 (r466714) +++ branches/2018Q2/net/traefik/distinfo Sat Apr 7 11:02:48 2018 (r466715) @@ -1,5 +1,5 @@ -TIMESTAMP = 1520701876 -SHA256 (traefik-webui-static-1.5.3.tar.gz) = ddc0d6311b892e4dee6342068181a3365ef46e0cff1c804b26f18ebb6a271167 -SIZE (traefik-webui-static-1.5.3.tar.gz) = 647897 -SHA256 (containous-traefik-v1.5.3_GH0.tar.gz) = b6876834290dd3f916c78f6810597d40dbbd461e1d1d25fd30d31cd99b9c062b -SIZE (containous-traefik-v1.5.3_GH0.tar.gz) = 7828055 +TIMESTAMP = 1523094469 +SHA256 (traefik-webui-static-1.5.4.tar.gz) = 879b95fd31ef6813155a90903e2bc6be6d1266e8bf7a76c45f00679890c719c3 +SIZE (traefik-webui-static-1.5.4.tar.gz) = 649631 +SHA256 (containous-traefik-v1.5.4_GH0.tar.gz) = d07999a03fb2732945d10d4f476db0cccd5c0df53020c5988cf99318936fe79e +SIZE (containous-traefik-v1.5.4_GH0.tar.gz) = 7978182 Copied: branches/2018Q2/net/traefik/pkg-message (from r466714, head/net/traefik/pkg-message) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/net/traefik/pkg-message Sat Apr 7 11:02:48 2018 (r466715, copy of r466714, head/net/traefik/pkg-message) @@ -0,0 +1,16 @@ +============================================================== + +Note that traefik starts as unpriviliged user. Thus, it cannot +bind to privileged ports (by default, ports below 1024) and +will exit when configured to do so. + +If traefik should serve ports in the privileged range, there +are options to achieve this: +- Have traffic bind to an unprivileged port and use the + packet filter configuration to redirect requests to the + desired privileged port to the unprivileged port in + traefik's configuration file e.g. the rdr rules in pf(4). +- The mac_portacl kernel module allows unprivileged processes + to bind to privileged ports. + +============================================================== From owner-svn-ports-branches@freebsd.org Sat Apr 7 14:02:09 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 F23B9F8AC29; Sat, 7 Apr 2018 14:02:08 +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 9C96E710A3; Sat, 7 Apr 2018 14:02:08 +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 95E5A21C1C; Sat, 7 Apr 2018 14:02:08 +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 w37E28ED089577; Sat, 7 Apr 2018 14:02:08 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w37E28Fw089573; Sat, 7 Apr 2018 14:02:08 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201804071402.w37E28Fw089573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sat, 7 Apr 2018 14:02:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466726 - in branches/2018Q2: . sysutils/logstash6 sysutils/logstash6/files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q2: . sysutils/logstash6 sysutils/logstash6/files X-SVN-Commit-Revision: 466726 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, 07 Apr 2018 14:02:09 -0000 Author: feld Date: Sat Apr 7 14:02:07 2018 New Revision: 466726 URL: https://svnweb.freebsd.org/changeset/ports/466726 Log: MFH: r466725 sysutils/logstash6: Run as non-root by default - Added logstash user/group Modified: branches/2018Q2/GIDs branches/2018Q2/UIDs branches/2018Q2/sysutils/logstash6/Makefile branches/2018Q2/sysutils/logstash6/files/logstash.in Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/GIDs ============================================================================== --- branches/2018Q2/GIDs Sat Apr 7 14:01:22 2018 (r466725) +++ branches/2018Q2/GIDs Sat Apr 7 14:02:07 2018 (r466726) @@ -827,13 +827,13 @@ chronyd:*:849: # free: 884 # free: 885 # free: 886 -# free: 887 +pdagent:*:887: vuls:*:888: mattermost:*:889: matterircd:*:890: # free: 891 # free: 892 -# free: 893 +logstash:*:893: arangodb:*:894: snmptt:*:895: istat:*:896: Modified: branches/2018Q2/UIDs ============================================================================== --- branches/2018Q2/UIDs Sat Apr 7 14:01:22 2018 (r466725) +++ branches/2018Q2/UIDs Sat Apr 7 14:02:07 2018 (r466726) @@ -833,13 +833,13 @@ archiva:*:871:871::0:0:Apache Archiva Daemon:/nonexist # free: 884 # free: 885 # free: 886 -# free: 887 +pdagent:*:887:887::0:0:PagerDuty Agent:/nonexistent:/usr/sbin/nologin vuls:*:888:888::0:0:VULnerability Scanner:/var/db/vuls:/usr/sbin/nologin mattermost:*:889:889::0:0:Mattermost:/usr/local/www/mattermost:/usr/sbin/nologin matterircd:*:890:890::0:0:Matterircd User:/nonexistent:/usr/sbin/nologin # free: 891 # free: 892 -# free: 893 +logstash:*:893:893::0:0:Logstash user:/nonexistent:/usr/sbin/nologin arangodb:*:894:894::0:0:ArangoDB pseudo-user:/var/db/arangodb:/usr/sbin/nologin snmptt:*:895:895::0:0:SNMPTT User:/var/spool/snmptt:/usr/sbin/nologin istat:*:896:896::0:0:istatserver user:/nonexistent:/usr/sbin/nologin Modified: branches/2018Q2/sysutils/logstash6/Makefile ============================================================================== --- branches/2018Q2/sysutils/logstash6/Makefile Sat Apr 7 14:01:22 2018 (r466725) +++ branches/2018Q2/sysutils/logstash6/Makefile Sat Apr 7 14:02:07 2018 (r466726) @@ -3,7 +3,7 @@ PORTNAME= logstash PORTVERSION= 6.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils java MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/ PKGNAMESUFFIX= 6 @@ -25,6 +25,9 @@ JAVA_VERSION= 1.8+ JAVA_RUN= yes NO_BUILD= yes +USERS= logstash +GROUPS= logstash + LOGSTASH_DIR= ${PREFIX}/${PORTNAME} USE_RC_SUBR= logstash @@ -35,7 +38,7 @@ SUB_LIST= JAVA_HOME=${JAVA_HOME} \ LOGSTASH_HOME=${LOGSTASH_HOME} LOGSTASH_CONF_FILES= jvm.options log4j2.properties logstash.yml pipelines.yml -LOGSTASH_JRUBY_SUBDIR= vendor/jruby/bin +LOGSTASH_JRUBY_SUBDIR= vendor/jruby/bin LOGSTASH_JRUBY_BIN_FILES= ast irb jirb jruby jruby.sh rdoc testrb gem \ jgem jirb_swing jruby.bash jrubyc rake ri @@ -65,7 +68,7 @@ post-install: .endfor ${FIND} -s ${STAGEDIR}${PREFIX}/logstash -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} - ${ECHO} "@dir logstash/data" >> ${TMPPLIST} + ${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/build_info" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/cache" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/doc" >> ${TMPPLIST} Modified: branches/2018Q2/sysutils/logstash6/files/logstash.in ============================================================================== --- branches/2018Q2/sysutils/logstash6/files/logstash.in Sat Apr 7 14:01:22 2018 (r466725) +++ branches/2018Q2/sysutils/logstash6/files/logstash.in Sat Apr 7 14:02:07 2018 (r466726) @@ -55,6 +55,8 @@ load_rc_config ${name} logdir="/var/log" : ${logstash_enable="NO"} +: ${logstash_user="logstash"} +: ${logstash_group="logstash"} : ${logstash_home="%%LOGSTASH_HOME%%"} : ${logstash_config="%%ETCDIR%%"} : ${logstash_log="YES"} @@ -96,10 +98,10 @@ PATH=/usr/local/bin:$PATH logstash_precmd() { - /usr/bin/install -d -o root -g wheel -m 755 ${pidfile%/*} - /usr/bin/install -d -o root -g wheel -m 755 ${logstash_log_dir} - /usr/bin/install -d -o root -g wheel -m 755 /var/db/logstash - /usr/bin/install -d -o root -g wheel -m 755 /var/run/logstash + /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 ${pidfile%/*} + /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 ${logstash_log_dir} + /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 /var/db/logstash + /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 /var/run/logstash } configtest() From owner-svn-ports-branches@freebsd.org Sat Apr 7 16:26:02 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 A117FF94B3F; Sat, 7 Apr 2018 16:26:02 +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 530B5811CD; Sat, 7 Apr 2018 16:26:02 +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 4DB02232E2; Sat, 7 Apr 2018 16:26:02 +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 w37GQ25C061004; Sat, 7 Apr 2018 16:26:02 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w37GQ1Oj061000; Sat, 7 Apr 2018 16:26:01 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804071626.w37GQ1Oj061000@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 7 Apr 2018 16:26:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466731 - in branches/2018Q2/devel: py-game_sdl2 renpy X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/devel: py-game_sdl2 renpy X-SVN-Commit-Revision: 466731 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, 07 Apr 2018 16:26:02 -0000 Author: jbeich Date: Sat Apr 7 16:26:01 2018 New Revision: 466731 URL: https://svnweb.freebsd.org/changeset/ports/466731 Log: MFH: r466640 devel/renpy: update to 6.99.14.3 Changes: https://www.renpy.org/release/6.99.14.3 (see Announcment) Changes: https://www.renpy.org/doc/html/changelog.html#ren-py-6-99-14-3 Approved by: ports-secteam (riggs) Modified: branches/2018Q2/devel/py-game_sdl2/Makefile branches/2018Q2/devel/py-game_sdl2/distinfo branches/2018Q2/devel/renpy/Makefile branches/2018Q2/devel/renpy/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/devel/py-game_sdl2/Makefile ============================================================================== --- branches/2018Q2/devel/py-game_sdl2/Makefile Sat Apr 7 15:13:59 2018 (r466730) +++ branches/2018Q2/devel/py-game_sdl2/Makefile Sat Apr 7 16:26:01 2018 (r466731) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= game_sdl2 -PORTVERSION= 6.99.14.2 +PORTVERSION= 6.99.14.3 CATEGORIES= devel python MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \ GENTOO Modified: branches/2018Q2/devel/py-game_sdl2/distinfo ============================================================================== --- branches/2018Q2/devel/py-game_sdl2/distinfo Sat Apr 7 15:13:59 2018 (r466730) +++ branches/2018Q2/devel/py-game_sdl2/distinfo Sat Apr 7 16:26:01 2018 (r466731) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522198551 -SHA256 (pygame_sdl2-2.1.0-for-renpy-6.99.14.2.tar.gz) = f556113500442d8c5ddf17e1850ac0dbc4599eada93415f3606d34e5c7c00b97 -SIZE (pygame_sdl2-2.1.0-for-renpy-6.99.14.2.tar.gz) = 2361753 +TIMESTAMP = 1522810845 +SHA256 (pygame_sdl2-2.1.0-for-renpy-6.99.14.3.tar.gz) = 21ac604287b8aa295c4811b229de5f063c712219258fdda6dac544e46ecfb94e +SIZE (pygame_sdl2-2.1.0-for-renpy-6.99.14.3.tar.gz) = 2573293 Modified: branches/2018Q2/devel/renpy/Makefile ============================================================================== --- branches/2018Q2/devel/renpy/Makefile Sat Apr 7 15:13:59 2018 (r466730) +++ branches/2018Q2/devel/renpy/Makefile Sat Apr 7 16:26:01 2018 (r466731) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= renpy -PORTVERSION?= 6.99.14.2 +PORTVERSION?= 6.99.14.3 DISTVERSIONSUFFIX=-sdk PORTREVISION?= 0 CATEGORIES= devel games Modified: branches/2018Q2/devel/renpy/distinfo ============================================================================== --- branches/2018Q2/devel/renpy/distinfo Sat Apr 7 15:13:59 2018 (r466730) +++ branches/2018Q2/devel/renpy/distinfo Sat Apr 7 16:26:01 2018 (r466731) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522198518 -SHA256 (renpy-6.99.14.2-sdk.tar.bz2) = 44d813e0e788c07e3b51ca1e59be0fd2ea9674e36ba35f757eb7eb3055f78676 -SIZE (renpy-6.99.14.2-sdk.tar.bz2) = 101026356 +TIMESTAMP = 1522810708 +SHA256 (renpy-6.99.14.3-sdk.tar.bz2) = 5cbeea134a1907e8a14458248013e37f39f0c2d023c7b68f6ee2bee574f7a381 +SIZE (renpy-6.99.14.3-sdk.tar.bz2) = 101048525 From owner-svn-ports-branches@freebsd.org Sat Apr 7 19:09: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 5F562F9F950; Sat, 7 Apr 2018 19:09:41 +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 103B574865; Sat, 7 Apr 2018 19:09:41 +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 03FC824CDF; Sat, 7 Apr 2018 19:09:41 +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 w37J9e2i046568; Sat, 7 Apr 2018 19:09:40 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w37J9VI1046469; Sat, 7 Apr 2018 19:09:31 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804071909.w37J9VI1046469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 7 Apr 2018 19:09:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466760 - in branches/2018Q2: archivers/unarchiver audio/musicpd audio/ncmpcpp databases/clickhouse databases/couchdb databases/evolution-data-server databases/firebird25-client databas... X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2: archivers/unarchiver audio/musicpd audio/ncmpcpp databases/clickhouse databases/couchdb databases/evolution-data-server databases/firebird25-client databases/firebird25-server data... X-SVN-Commit-Revision: 466760 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, 07 Apr 2018 19:09:41 -0000 Author: jbeich Date: Sat Apr 7 19:09:30 2018 New Revision: 466760 URL: https://svnweb.freebsd.org/changeset/ports/466760 Log: MFH: r466648 devel/icu: update to 61.1 Changes: http://site.icu-project.org/download/61 ABI: https://abi-laboratory.pro/tracker/timeline/icu4c/ PR: 227042 Exp-run by: antoine Approved by: portmgr (antoine) Modified: branches/2018Q2/archivers/unarchiver/Makefile branches/2018Q2/audio/musicpd/Makefile branches/2018Q2/audio/ncmpcpp/Makefile branches/2018Q2/databases/clickhouse/Makefile branches/2018Q2/databases/couchdb/Makefile branches/2018Q2/databases/evolution-data-server/Makefile branches/2018Q2/databases/firebird25-client/Makefile branches/2018Q2/databases/firebird25-server/Makefile branches/2018Q2/databases/kdb/Makefile branches/2018Q2/databases/postgresql10-server/Makefile branches/2018Q2/databases/postgresql96-server/Makefile branches/2018Q2/databases/sqlite3/Makefile branches/2018Q2/databases/tarantool/Makefile branches/2018Q2/deskutils/bijiben/Makefile branches/2018Q2/deskutils/calibre/Makefile branches/2018Q2/deskutils/gnome-calendar/Makefile branches/2018Q2/deskutils/gnome-todo/Makefile branches/2018Q2/deskutils/orage/Makefile branches/2018Q2/deskutils/osmo/Makefile branches/2018Q2/devel/boost-libs/Makefile branches/2018Q2/devel/dee/Makefile branches/2018Q2/devel/glib20/Makefile branches/2018Q2/devel/hs-text-icu/Makefile branches/2018Q2/devel/icu-le-hb/Makefile branches/2018Q2/devel/icu/Makefile branches/2018Q2/devel/icu/distinfo branches/2018Q2/devel/libical/Makefile branches/2018Q2/devel/libzim/Makefile branches/2018Q2/devel/objecthash/Makefile branches/2018Q2/devel/pecl-intl/Makefile branches/2018Q2/devel/php70-intl/Makefile branches/2018Q2/devel/php71-intl/Makefile branches/2018Q2/devel/php72-intl/Makefile branches/2018Q2/devel/py-pyicu/Makefile branches/2018Q2/devel/qt4-corelib/Makefile branches/2018Q2/devel/qt5-core/Makefile branches/2018Q2/dns/libpsl/Makefile branches/2018Q2/editors/libreoffice/Makefile.common branches/2018Q2/editors/poedit/Makefile branches/2018Q2/games/0ad/Makefile branches/2018Q2/games/an/Makefile branches/2018Q2/games/liblcf/Makefile branches/2018Q2/games/openttd/Makefile branches/2018Q2/games/widelands/Makefile branches/2018Q2/graphics/libcdr01/Makefile branches/2018Q2/graphics/libfreehand/Makefile branches/2018Q2/graphics/libzmf/Makefile branches/2018Q2/graphics/mapnik/Makefile branches/2018Q2/graphics/tesseract/Makefile branches/2018Q2/irc/znc/Makefile branches/2018Q2/java/openjfx8-devel/Makefile branches/2018Q2/lang/gnustep-base/Makefile branches/2018Q2/lang/parrot/Makefile branches/2018Q2/lang/phantomjs/Makefile branches/2018Q2/lang/spidermonkey38/Makefile branches/2018Q2/lang/swift/Makefile branches/2018Q2/lang/v8-devel/Makefile branches/2018Q2/mail/cyrus-imapd30/Makefile branches/2018Q2/mail/dovecot/Makefile branches/2018Q2/mail/evolution-ews/Makefile branches/2018Q2/mail/evolution/Makefile branches/2018Q2/mail/postfix-current/Makefile branches/2018Q2/mail/postfix/Makefile branches/2018Q2/mail/rspamd-devel/Makefile branches/2018Q2/mail/rspamd/Makefile branches/2018Q2/mail/sendmail/Makefile branches/2018Q2/mail/thunderbird/Makefile branches/2018Q2/math/R/Makefile branches/2018Q2/math/libqalculate/Makefile branches/2018Q2/misc/sword/Makefile branches/2018Q2/multimedia/aegisub/Makefile branches/2018Q2/multimedia/subtitlecomposer-kde4/Makefile branches/2018Q2/net-im/mastodon/Makefile branches/2018Q2/net/freerdp/Makefile branches/2018Q2/net/openldap24-server/Makefile branches/2018Q2/net/yaz/Makefile branches/2018Q2/net/zebra-server/Makefile branches/2018Q2/news/tin/Makefile branches/2018Q2/print/harfbuzz-icu/Makefile branches/2018Q2/print/libmspub01/Makefile branches/2018Q2/print/tex-xetex/Makefile branches/2018Q2/print/texlive-base/Makefile branches/2018Q2/security/certificate-transparency/Makefile branches/2018Q2/sysutils/gdisk/Makefile branches/2018Q2/sysutils/osquery/Makefile branches/2018Q2/sysutils/tracker/Makefile branches/2018Q2/textproc/R-cran-stringi/Makefile branches/2018Q2/textproc/dwdiff/Makefile branches/2018Q2/textproc/ibus-qt/Makefile branches/2018Q2/textproc/libe-book/Makefile branches/2018Q2/textproc/libqxp/Makefile branches/2018Q2/textproc/libvisio01/Makefile branches/2018Q2/textproc/raptor2/Makefile branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile branches/2018Q2/textproc/zorba/Makefile branches/2018Q2/www/chromium/Makefile branches/2018Q2/www/cppcms/Makefile branches/2018Q2/www/epiphany/Makefile branches/2018Q2/www/firefox-esr/Makefile branches/2018Q2/www/firefox/Makefile branches/2018Q2/www/iridium/Makefile branches/2018Q2/www/libxul/Makefile branches/2018Q2/www/mod_pagespeed/Makefile branches/2018Q2/www/node/Makefile branches/2018Q2/www/node4/Makefile branches/2018Q2/www/node6/Makefile branches/2018Q2/www/node8/Makefile branches/2018Q2/www/palemoon/Makefile branches/2018Q2/www/qt5-webkit/Makefile branches/2018Q2/www/seamonkey/Makefile branches/2018Q2/www/waterfox/Makefile branches/2018Q2/www/webkit-gtk2/Makefile branches/2018Q2/www/webkit-gtk3/Makefile branches/2018Q2/www/webkit2-gtk3/Makefile branches/2018Q2/x11-toolkits/gnustep-gui/Makefile branches/2018Q2/x11/gnome-shell/Makefile branches/2018Q2/x11/slop/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/archivers/unarchiver/Makefile ============================================================================== --- branches/2018Q2/archivers/unarchiver/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/archivers/unarchiver/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= unar PORTVERSION= 1.10.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= archivers gnustep MASTER_SITES= http://wakaba.c3.cx/releases/TheUnarchiver/ DISTNAME= ${PORTNAME}${PORTVERSION}_src Modified: branches/2018Q2/audio/musicpd/Makefile ============================================================================== --- branches/2018Q2/audio/musicpd/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/audio/musicpd/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,6 +2,7 @@ PORTNAME= musicpd PORTVERSION= 0.20.18 +PORTREVISION= 1 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} Modified: branches/2018Q2/audio/ncmpcpp/Makefile ============================================================================== --- branches/2018Q2/audio/ncmpcpp/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/audio/ncmpcpp/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= ncmpcpp PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://ncmpcpp.rybczak.net/stable/ Modified: branches/2018Q2/databases/clickhouse/Makefile ============================================================================== --- branches/2018Q2/databases/clickhouse/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/databases/clickhouse/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -5,7 +5,7 @@ PORTNAME= clickhouse PORTVERSION= 1.1.54362 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -stable -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MAINTAINER= proler@gmail.com Modified: branches/2018Q2/databases/couchdb/Makefile ============================================================================== --- branches/2018Q2/databases/couchdb/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/databases/couchdb/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= couchdb DISTVERSION= 1.7.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= databases MASTER_SITES= APACHE/couchdb/source/${DISTVERSION} Modified: branches/2018Q2/databases/evolution-data-server/Makefile ============================================================================== --- branches/2018Q2/databases/evolution-data-server/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/databases/evolution-data-server/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= evolution-data-server PORTVERSION= 3.24.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Modified: branches/2018Q2/databases/firebird25-client/Makefile ============================================================================== --- branches/2018Q2/databases/firebird25-client/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/databases/firebird25-client/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firebird -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}-client COMMENT= Firebird-2 database client Modified: branches/2018Q2/databases/firebird25-server/Makefile ============================================================================== --- branches/2018Q2/databases/firebird25-server/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/databases/firebird25-server/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= firebird PORTVERSION= 2.5.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/ PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server Modified: branches/2018Q2/databases/kdb/Makefile ============================================================================== --- branches/2018Q2/databases/kdb/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/databases/kdb/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= kdb DISTVERSION= 3.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases kde MASTER_SITES= KDE/stable/${PORTNAME}/src DIST_SUBDIR= KDE/${PORTNAME} Modified: branches/2018Q2/databases/postgresql10-server/Makefile ============================================================================== --- branches/2018Q2/databases/postgresql10-server/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/databases/postgresql10-server/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME?= postgresql DISTVERSION?= 10.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} Modified: branches/2018Q2/databases/postgresql96-server/Makefile ============================================================================== --- branches/2018Q2/databases/postgresql96-server/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/databases/postgresql96-server/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ # $FreeBSD$ DISTVERSION?= 9.6.8 -PORTREVISION?= 0 +PORTREVISION?= 1 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org Modified: branches/2018Q2/databases/sqlite3/Makefile ============================================================================== --- branches/2018Q2/databases/sqlite3/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/databases/sqlite3/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= sqlite3 DISTVERSION= 3.22.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= https://www.sqlite.org/2018/ http://www2.sqlite.org/2018/ http://www3.sqlite.org/2018/ DISTNAME= sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00 Modified: branches/2018Q2/databases/tarantool/Makefile ============================================================================== --- branches/2018Q2/databases/tarantool/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/databases/tarantool/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= tarantool PORTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org Modified: branches/2018Q2/deskutils/bijiben/Makefile ============================================================================== --- branches/2018Q2/deskutils/bijiben/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/deskutils/bijiben/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= bijiben PORTVERSION= 3.18.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Modified: branches/2018Q2/deskutils/calibre/Makefile ============================================================================== --- branches/2018Q2/deskutils/calibre/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/deskutils/calibre/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= calibre PORTVERSION= 3.20.0 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ Modified: branches/2018Q2/deskutils/gnome-calendar/Makefile ============================================================================== --- branches/2018Q2/deskutils/gnome-calendar/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/deskutils/gnome-calendar/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= gnome-calendar PORTVERSION= 3.18.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Modified: branches/2018Q2/deskutils/gnome-todo/Makefile ============================================================================== --- branches/2018Q2/deskutils/gnome-todo/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/deskutils/gnome-todo/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= gnome-todo PORTVERSION= 3.18.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Modified: branches/2018Q2/deskutils/orage/Makefile ============================================================================== --- branches/2018Q2/deskutils/orage/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/deskutils/orage/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= orage PORTVERSION= 4.12.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils xfce MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/ DIST_SUBDIR= xfce4 Modified: branches/2018Q2/deskutils/osmo/Makefile ============================================================================== --- branches/2018Q2/deskutils/osmo/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/deskutils/osmo/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= osmo PORTVERSION= 0.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION} Modified: branches/2018Q2/devel/boost-libs/Makefile ============================================================================== --- branches/2018Q2/devel/boost-libs/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/boost-libs/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= boost-libs -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= Free portable C++ libraries (without Boost.Python) Modified: branches/2018Q2/devel/dee/Makefile ============================================================================== --- branches/2018Q2/devel/dee/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/dee/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= dee PORTVERSION= 1.2.7 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel MASTER_SITES= https://launchpadlibrarian.net/151383425/ \ https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/ Modified: branches/2018Q2/devel/glib20/Makefile ============================================================================== --- branches/2018Q2/devel/glib20/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/glib20/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= glib PORTVERSION= 2.50.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME Modified: branches/2018Q2/devel/hs-text-icu/Makefile ============================================================================== --- branches/2018Q2/devel/hs-text-icu/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/hs-text-icu/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= text-icu PORTVERSION= 0.7.0.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Modified: branches/2018Q2/devel/icu-le-hb/Makefile ============================================================================== --- branches/2018Q2/devel/icu-le-hb/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/icu-le-hb/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= icu-le-hb DISTVERSION= 1.0.3-3 DISTVERSIONSUFFIX= -gb8a3163 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel print MAINTAINER= office@FreeBSD.org Modified: branches/2018Q2/devel/icu/Makefile ============================================================================== --- branches/2018Q2/devel/icu/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/icu/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= icu -DISTVERSION= 60_2 -PORTREVISION?= 2 # keep for icu-lx +DISTVERSION= 61_1 +PORTREVISION?= 0 # keep for icu-lx PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \ Modified: branches/2018Q2/devel/icu/distinfo ============================================================================== --- branches/2018Q2/devel/icu/distinfo Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/icu/distinfo Sat Apr 7 19:09:30 2018 (r466760) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513196484 -SHA256 (icu4c-60_2-src.tgz) = f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418 -SIZE (icu4c-60_2-src.tgz) = 23317835 +TIMESTAMP = 1522071524 +SHA256 (icu4c-61_1-src.tgz) = d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef +SIZE (icu4c-61_1-src.tgz) = 23400587 Modified: branches/2018Q2/devel/libical/Makefile ============================================================================== --- branches/2018Q2/devel/libical/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/libical/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -4,7 +4,7 @@ PORTNAME= libical PORTVERSION= 2.0.0 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= gnome@FreeBSD.org Modified: branches/2018Q2/devel/libzim/Makefile ============================================================================== --- branches/2018Q2/devel/libzim/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/libzim/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,6 +2,7 @@ PORTNAME= libzim PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org Modified: branches/2018Q2/devel/objecthash/Makefile ============================================================================== --- branches/2018Q2/devel/objecthash/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/objecthash/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= objecthash PORTVERSION= 20160802 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= amutu@amutu.com Modified: branches/2018Q2/devel/pecl-intl/Makefile ============================================================================== --- branches/2018Q2/devel/pecl-intl/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/pecl-intl/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= intl PORTVERSION= 3.0.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= devel pear MAINTAINER= sunpoet@FreeBSD.org Modified: branches/2018Q2/devel/php70-intl/Makefile ============================================================================== --- branches/2018Q2/devel/php70-intl/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/php70-intl/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -1,6 +1,7 @@ # Created by: Alex Dupre # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php70 Modified: branches/2018Q2/devel/php71-intl/Makefile ============================================================================== --- branches/2018Q2/devel/php71-intl/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/php71-intl/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -1,5 +1,6 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php71 Modified: branches/2018Q2/devel/php72-intl/Makefile ============================================================================== --- branches/2018Q2/devel/php72-intl/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/php72-intl/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -1,5 +1,6 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php72 Modified: branches/2018Q2/devel/py-pyicu/Makefile ============================================================================== --- branches/2018Q2/devel/py-pyicu/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/py-pyicu/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= pyicu PORTVERSION= 1.9.8 -PORTREVISION= +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2018Q2/devel/qt4-corelib/Makefile ============================================================================== --- branches/2018Q2/devel/qt4-corelib/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/qt4-corelib/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: branches/2018Q2/devel/qt5-core/Makefile ============================================================================== --- branches/2018Q2/devel/qt5-core/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/devel/qt5-core/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- Modified: branches/2018Q2/dns/libpsl/Makefile ============================================================================== --- branches/2018Q2/dns/libpsl/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/dns/libpsl/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -4,6 +4,7 @@ PORTNAME= libpsl PORTVERSION= 0.20.1 DISTVERSIONPREFIX= ${PORTNAME}- +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= sunpoet@FreeBSD.org Modified: branches/2018Q2/editors/libreoffice/Makefile.common ============================================================================== --- branches/2018Q2/editors/libreoffice/Makefile.common Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/editors/libreoffice/Makefile.common Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= libreoffice PORTVERSION= 6.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES+= editors MAINTAINER= office@FreeBSD.org Modified: branches/2018Q2/editors/poedit/Makefile ============================================================================== --- branches/2018Q2/editors/poedit/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/editors/poedit/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -4,7 +4,7 @@ PORTNAME= poedit PORTVERSION= 1.8.4 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= editors MASTER_SITES= https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/ Modified: branches/2018Q2/games/0ad/Makefile ============================================================================== --- branches/2018Q2/games/0ad/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/games/0ad/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= 0ad PORTVERSION= 0.0.22 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://releases.wildfiregames.com/ \ SF/zero-ad/releases Modified: branches/2018Q2/games/an/Makefile ============================================================================== --- branches/2018Q2/games/an/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/games/an/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= an PORTVERSION= 1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= DEBIAN_POOL DISTNAME= ${PORTNAME}_${PORTVERSION}.orig Modified: branches/2018Q2/games/liblcf/Makefile ============================================================================== --- branches/2018Q2/games/liblcf/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/games/liblcf/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= liblcf PORTVERSION= 0.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org Modified: branches/2018Q2/games/openttd/Makefile ============================================================================== --- branches/2018Q2/games/openttd/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/games/openttd/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -4,6 +4,7 @@ PORTNAME= openttd DISTVERSION= 1.7.2 PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ Modified: branches/2018Q2/games/widelands/Makefile ============================================================================== --- branches/2018Q2/games/widelands/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/games/widelands/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= widelands DISTVERSION= build19 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= https://launchpad.net/widelands/${DISTVERSION}/${DISTVERSION}/+download/ \ http://mirror.amdmi3.ru/distfiles/ Modified: branches/2018Q2/graphics/libcdr01/Makefile ============================================================================== --- branches/2018Q2/graphics/libcdr01/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/graphics/libcdr01/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= libcdr PORTVERSION= 0.1.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics devel MASTER_SITES= LODEV PKGNAMESUFFIX= 01 Modified: branches/2018Q2/graphics/libfreehand/Makefile ============================================================================== --- branches/2018Q2/graphics/libfreehand/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/graphics/libfreehand/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= libfreehand PORTVERSION= 0.1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= LODEV Modified: branches/2018Q2/graphics/libzmf/Makefile ============================================================================== --- branches/2018Q2/graphics/libzmf/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/graphics/libzmf/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= libzmf PORTVERSION= 0.0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= LODEV Modified: branches/2018Q2/graphics/mapnik/Makefile ============================================================================== --- branches/2018Q2/graphics/mapnik/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/graphics/mapnik/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -4,7 +4,7 @@ PORTNAME= mapnik PORTVERSION= 3.0.9 DISTVERSIONPREFIX= v -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics geography MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/ Modified: branches/2018Q2/graphics/tesseract/Makefile ============================================================================== --- branches/2018Q2/graphics/tesseract/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/graphics/tesseract/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= tesseract PORTVERSION= 3.05.01 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= pkubaj@anongoth.pl Modified: branches/2018Q2/irc/znc/Makefile ============================================================================== --- branches/2018Q2/irc/znc/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/irc/znc/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= znc PORTVERSION= 1.6.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc ipv6 MASTER_SITES= https://znc.in/releases/ \ https://znc.in/releases/archive/ Modified: branches/2018Q2/java/openjfx8-devel/Makefile ============================================================================== --- branches/2018Q2/java/openjfx8-devel/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/java/openjfx8-devel/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= openjfx8 DISTVERSION= 8u172-b03 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= java x11-toolkits devel MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \ Modified: branches/2018Q2/lang/gnustep-base/Makefile ============================================================================== --- branches/2018Q2/lang/gnustep-base/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/lang/gnustep-base/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= gnustep-base PORTVERSION= 1.25.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang devel gnustep MASTER_SITES= GNUSTEP/core Modified: branches/2018Q2/lang/parrot/Makefile ============================================================================== --- branches/2018Q2/lang/parrot/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/lang/parrot/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= parrot PORTVERSION= 8.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang MASTER_SITES= ftp://ftp.parrot.org/pub/parrot/releases/supported/${PORTVERSION}/ \ LOCAL/sunpoet Modified: branches/2018Q2/lang/phantomjs/Makefile ============================================================================== --- branches/2018Q2/lang/phantomjs/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/lang/phantomjs/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= phantomjs PORTVERSION= 2.1.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang MAINTAINER= feld@FreeBSD.org Modified: branches/2018Q2/lang/spidermonkey38/Makefile ============================================================================== --- branches/2018Q2/lang/spidermonkey38/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/lang/spidermonkey38/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= spidermonkey38 PORTVERSION= 38.8.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= MOZILLA/firefox/releases/${PORTVERSION}esr/source DISTNAME= firefox-${PORTVERSION}esr.source Modified: branches/2018Q2/lang/swift/Makefile ============================================================================== --- branches/2018Q2/lang/swift/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/lang/swift/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -4,7 +4,7 @@ PORTNAME= swift PORTVERSION= 3.1.1 DISTVERSIONPREFIX= swift- DISTVERSIONSUFFIX= -RELEASE -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MAINTAINER= swills@FreeBSD.org Modified: branches/2018Q2/lang/v8-devel/Makefile ============================================================================== --- branches/2018Q2/lang/v8-devel/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/lang/v8-devel/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= v8 PORTVERSION= 3.27.7 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= lang MASTER_SITES= LOCAL/vanilla PKGNAMESUFFIX= -devel Modified: branches/2018Q2/mail/cyrus-imapd30/Makefile ============================================================================== --- branches/2018Q2/mail/cyrus-imapd30/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/mail/cyrus-imapd30/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,6 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.0.5 +PORTREVISION= 1 #PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ Modified: branches/2018Q2/mail/dovecot/Makefile ============================================================================== --- branches/2018Q2/mail/dovecot/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/mail/dovecot/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -13,6 +13,7 @@ PORTNAME= dovecot PORTVERSION= 2.2.35 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= https://www.dovecot.org/releases/2.2/ Modified: branches/2018Q2/mail/evolution-ews/Makefile ============================================================================== --- branches/2018Q2/mail/evolution-ews/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/mail/evolution-ews/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= evolution-ews PORTVERSION= 3.24.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Modified: branches/2018Q2/mail/evolution/Makefile ============================================================================== --- branches/2018Q2/mail/evolution/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/mail/evolution/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= evolution PORTVERSION= 3.24.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Modified: branches/2018Q2/mail/postfix-current/Makefile ============================================================================== --- branches/2018Q2/mail/postfix-current/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/mail/postfix-current/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= postfix DISTVERSION= 3.4-20180222 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 5 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ Modified: branches/2018Q2/mail/postfix/Makefile ============================================================================== --- branches/2018Q2/mail/postfix/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/mail/postfix/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= postfix PORTVERSION= 3.3.0 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ Modified: branches/2018Q2/mail/rspamd-devel/Makefile ============================================================================== --- branches/2018Q2/mail/rspamd-devel/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/mail/rspamd-devel/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= rspamd PORTVERSION= 1.7.0.a2.20180302 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail PKGNAMESUFFIX= -devel Modified: branches/2018Q2/mail/rspamd/Makefile ============================================================================== --- branches/2018Q2/mail/rspamd/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/mail/rspamd/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,6 +2,7 @@ PORTNAME= rspamd PORTVERSION= 1.7.2 +PORTREVISION= 1 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org Modified: branches/2018Q2/mail/sendmail/Makefile ============================================================================== --- branches/2018Q2/mail/sendmail/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/mail/sendmail/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= sendmail PORTVERSION= 8.15.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ PKGNAMESUFFIX?= ${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BDB_SUFFIX}${PKGNAMESUFFIX2} Modified: branches/2018Q2/mail/thunderbird/Makefile ============================================================================== --- branches/2018Q2/mail/thunderbird/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/mail/thunderbird/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 52.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Modified: branches/2018Q2/math/R/Makefile ============================================================================== --- branches/2018Q2/math/R/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/math/R/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= R DISTVERSION= 3.4.4 +PORTREVISION= 1 CATEGORIES= math lang MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||} Modified: branches/2018Q2/math/libqalculate/Makefile ============================================================================== --- branches/2018Q2/math/libqalculate/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/math/libqalculate/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= libqalculate PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/ Modified: branches/2018Q2/misc/sword/Makefile ============================================================================== --- branches/2018Q2/misc/sword/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/misc/sword/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= sword PORTVERSION= 1.8.0 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \ http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/ Modified: branches/2018Q2/multimedia/aegisub/Makefile ============================================================================== --- branches/2018Q2/multimedia/aegisub/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/multimedia/aegisub/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= aegisub PORTVERSION= 3.2.2 -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= multimedia MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/ \ ftp://ftp.aegisub.org/pub/archives/releases/source/ \ Modified: branches/2018Q2/multimedia/subtitlecomposer-kde4/Makefile ============================================================================== --- branches/2018Q2/multimedia/subtitlecomposer-kde4/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/multimedia/subtitlecomposer-kde4/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= subtitlecomposer PORTVERSION= 0.5.7 DISTVERSIONPREFIX= v -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia kde MAINTAINER= ports@FreeBSD.org Modified: branches/2018Q2/net-im/mastodon/Makefile ============================================================================== --- branches/2018Q2/net-im/mastodon/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/net-im/mastodon/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v DISTVERSION= 2.3.3 +PORTREVISION= 1 CATEGORIES= net-im www MAINTAINER= ports@FreeBSD.org Modified: branches/2018Q2/net/freerdp/Makefile ============================================================================== --- branches/2018Q2/net/freerdp/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/net/freerdp/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= freerdp DISTVERSION= 2.0.0-rc1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net comms ipv6 MAINTAINER= kevans@FreeBSD.org Modified: branches/2018Q2/net/openldap24-server/Makefile ============================================================================== --- branches/2018Q2/net/openldap24-server/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/net/openldap24-server/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -65,7 +65,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLD .endif PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 +PORTREVISION_SERVER= 1 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 10.9 OPENLDAP_MAJOR= ${DISTVERSION:R} Modified: branches/2018Q2/net/yaz/Makefile ============================================================================== --- branches/2018Q2/net/yaz/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/net/yaz/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= yaz DISTVERSION= 5.23.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/ Modified: branches/2018Q2/net/zebra-server/Makefile ============================================================================== --- branches/2018Q2/net/zebra-server/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/net/zebra-server/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= zebra-server PORTVERSION= 2.0.55 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MASTER_SITES= http://ftp.indexdata.dk/pub/zebra/ DISTNAME= idzebra-${PORTVERSION} Modified: branches/2018Q2/news/tin/Makefile ============================================================================== --- branches/2018Q2/news/tin/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/news/tin/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= tin PORTVERSION= 2.4.2 -PORTREVISION?= 0 # keep for chinese/tin +PORTREVISION?= 1 # keep for chinese/tin CATEGORIES+= news ipv6 MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \ ftp://ftp.sunet.se/pub/news/readers/tin/v${PORTVERSION:R}/ \ Modified: branches/2018Q2/print/harfbuzz-icu/Makefile ============================================================================== --- branches/2018Q2/print/harfbuzz-icu/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/print/harfbuzz-icu/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -icu COMMENT= Harfbuzz ICU support Modified: branches/2018Q2/print/libmspub01/Makefile ============================================================================== --- branches/2018Q2/print/libmspub01/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/print/libmspub01/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,6 +2,7 @@ PORTNAME= libmspub PORTVERSION= 0.1.4 +PORTREVISION= 1 CATEGORIES= print graphics devel MASTER_SITES= LODEV/${PORTNAME} PKGNAMESUFFIX= 01 Modified: branches/2018Q2/print/tex-xetex/Makefile ============================================================================== --- branches/2018Q2/print/tex-xetex/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/print/tex-xetex/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= xetex PORTVERSION= 0.99992 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ PKGNAMEPREFIX= tex- Modified: branches/2018Q2/print/texlive-base/Makefile ============================================================================== --- branches/2018Q2/print/texlive-base/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/print/texlive-base/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= texlive PORTVERSION= 20150521 -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/Source/ PKGNAMESUFFIX= -base Modified: branches/2018Q2/security/certificate-transparency/Makefile ============================================================================== --- branches/2018Q2/security/certificate-transparency/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/security/certificate-transparency/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= certificate-transparency PORTVERSION= 20161015 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= security MAINTAINER= ports@FreeBSD.org Modified: branches/2018Q2/sysutils/gdisk/Makefile ============================================================================== --- branches/2018Q2/sysutils/gdisk/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/sysutils/gdisk/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= gdisk PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF/gptfdisk/gptfdisk/${PORTVERSION} DISTNAME= gptfdisk-${PORTVERSION} Modified: branches/2018Q2/sysutils/osquery/Makefile ============================================================================== --- branches/2018Q2/sysutils/osquery/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/sysutils/osquery/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= osquery PORTVERSION= 2.11.2 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= zi@FreeBSD.org Modified: branches/2018Q2/sysutils/tracker/Makefile ============================================================================== --- branches/2018Q2/sysutils/tracker/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/sysutils/tracker/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= tracker PORTVERSION= 1.6.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= sysutils gnome MASTER_SITES= GNOME Modified: branches/2018Q2/textproc/R-cran-stringi/Makefile ============================================================================== --- branches/2018Q2/textproc/R-cran-stringi/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/textproc/R-cran-stringi/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,6 +3,7 @@ PORTNAME= stringi DISTVERSION= 1.1.7 +PORTREVISION= 1 CATEGORIES= textproc DISTNAME= ${PORTNAME}_${DISTVERSION} Modified: branches/2018Q2/textproc/dwdiff/Makefile ============================================================================== --- branches/2018Q2/textproc/dwdiff/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/textproc/dwdiff/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= dwdiff PORTVERSION= 2.0.9 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= textproc MASTER_SITES= http://os.ghalkes.nl/dist/ \ http://fossies.org/unix/privat/ Modified: branches/2018Q2/textproc/ibus-qt/Makefile ============================================================================== --- branches/2018Q2/textproc/ibus-qt/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/textproc/ibus-qt/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= ibus-qt PORTVERSION= 1.3.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= textproc MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source Modified: branches/2018Q2/textproc/libe-book/Makefile ============================================================================== --- branches/2018Q2/textproc/libe-book/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/textproc/libe-book/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= libe-book PORTVERSION= 0.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= SF/libebook/${PORTNAME}-${PORTVERSION}/ Modified: branches/2018Q2/textproc/libqxp/Makefile ============================================================================== --- branches/2018Q2/textproc/libqxp/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/textproc/libqxp/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,6 +2,7 @@ PORTNAME= libqxp PORTVERSION= 0.0.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= https://dev-www.libreoffice.org/src/${PORTNAME}/ Modified: branches/2018Q2/textproc/libvisio01/Makefile ============================================================================== --- branches/2018Q2/textproc/libvisio01/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/textproc/libvisio01/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ PORTNAME= libvisio PORTVERSION= 0.1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc devel MASTER_SITES= LODEV/${PORTNAME} PKGNAMESUFFIX= 01 Modified: branches/2018Q2/textproc/raptor2/Makefile ============================================================================== --- branches/2018Q2/textproc/raptor2/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/textproc/raptor2/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -3,7 +3,7 @@ PORTNAME= raptor2 PORTVERSION= 2.0.15 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ \ SF/librdf/${PORTNAME}/${PORTVERSION} Modified: branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile ============================================================================== --- branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile Sat Apr 7 18:49:01 2018 (r466759) +++ branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile Sat Apr 7 19:09:30 2018 (r466760) @@ -2,7 +2,7 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Sat Apr 7 19:19: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 7F3BFFA0578; Sat, 7 Apr 2018 19:19:58 +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 2ABC07AA1C; Sat, 7 Apr 2018 19:19:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2254224E8E; Sat, 7 Apr 2018 19:19:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w37JJw0k051995; Sat, 7 Apr 2018 19:19:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w37JJvTW051993; Sat, 7 Apr 2018 19:19:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804071919.w37JJvTW051993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 7 Apr 2018 19:19:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466761 - in branches/2018Q2: games/openttd www/webkit2-gtk3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2: games/openttd www/webkit2-gtk3 X-SVN-Commit-Revision: 466761 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, 07 Apr 2018 19:19:58 -0000 Author: jbeich Date: Sat Apr 7 19:19:57 2018 New Revision: 466761 URL: https://svnweb.freebsd.org/changeset/ports/466761 Log: devel/icu: fix PORTREVISION in consumers after r466760 (direct commit) PR: 227042 Reported by: antoine Pointy hat to: jbeich Approved by: ports-secteam blanket Modified: branches/2018Q2/games/openttd/Makefile branches/2018Q2/www/webkit2-gtk3/Makefile Modified: branches/2018Q2/games/openttd/Makefile ============================================================================== --- branches/2018Q2/games/openttd/Makefile Sat Apr 7 19:09:30 2018 (r466760) +++ branches/2018Q2/games/openttd/Makefile Sat Apr 7 19:19:57 2018 (r466761) @@ -3,8 +3,7 @@ PORTNAME= openttd DISTVERSION= 1.7.2 -PORTREVISION= 1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ Modified: branches/2018Q2/www/webkit2-gtk3/Makefile ============================================================================== --- branches/2018Q2/www/webkit2-gtk3/Makefile Sat Apr 7 19:09:30 2018 (r466760) +++ branches/2018Q2/www/webkit2-gtk3/Makefile Sat Apr 7 19:19:57 2018 (r466761) @@ -3,8 +3,7 @@ PORTNAME= webkit PORTVERSION= 2.16.6 -PORTREVISION= 3 -PORTREVISION= 1 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3