From owner-svn-ports-branches@freebsd.org Sun Feb 25 03:32: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 51190F38D84; Sun, 25 Feb 2018 03:32:42 +0000 (UTC) (envelope-from bdrewery@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 03B2E869E8; Sun, 25 Feb 2018 03:32:42 +0000 (UTC) (envelope-from bdrewery@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 F2D352F1D5; Sun, 25 Feb 2018 03:32:41 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1P3Wf1b002653; Sun, 25 Feb 2018 03:32:41 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1P3WfRn002652; Sun, 25 Feb 2018 03:32:41 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201802250332.w1P3WfRn002652@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 25 Feb 2018 03:32:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462895 - branches/2018Q1/Mk X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: branches/2018Q1/Mk X-SVN-Commit-Revision: 462895 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, 25 Feb 2018 03:32:42 -0000 Author: bdrewery Date: Sun Feb 25 03:32:41 2018 New Revision: 462895 URL: https://svnweb.freebsd.org/changeset/ports/462895 Log: MFH: r462894 WITH_CCACHE_BUILD: Fix some ports not using proper CCACHE_DIR. Some ports will truncate CCACHE_DIR from the env and due to HOME=${WRKDIR} will incorrectly use ${WRKDIR}/.ccache. Symlink to the proper place. Approved by: portmgr (implicit) Modified: branches/2018Q1/Mk/bsd.ccache.mk Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/Mk/bsd.ccache.mk ============================================================================== --- branches/2018Q1/Mk/bsd.ccache.mk Sun Feb 25 03:32:18 2018 (r462894) +++ branches/2018Q1/Mk/bsd.ccache.mk Sun Feb 25 03:32:41 2018 (r462895) @@ -51,6 +51,13 @@ MAKE_ENV+= CCACHE_DIR="${CCACHE_DIR}" CONFIGURE_ENV+= CCACHE_DIR="${CCACHE_DIR}" . endif .endif + +# Some ports will truncate CCACHE_DIR from the env and due to HOME=${WRKDIR} +# will incorrectly use ${WRKDIR}/.ccache. Symlink to the proper place. +${WRKDIR}/.ccache: ${WRKDIR} + @${LN} -sf ${CCACHE_DIR} ${WRKDIR}/.ccache +ccache-wrkdir-link: ${WRKDIR}/.ccache .PHONY +post-extract: ccache-wrkdir-link .endif .endif From owner-svn-ports-branches@freebsd.org Sun Feb 25 08:53: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 69FCCF2244D; Sun, 25 Feb 2018 08:53:22 +0000 (UTC) (envelope-from woodsb02@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 173F771F72; Sun, 25 Feb 2018 08:53:22 +0000 (UTC) (envelope-from woodsb02@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 121FA2863; Sun, 25 Feb 2018 08:53:22 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1P8rLLP066642; Sun, 25 Feb 2018 08:53:21 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1P8rLWG066640; Sun, 25 Feb 2018 08:53:21 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201802250853.w1P8rLWG066640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sun, 25 Feb 2018 08:53:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462943 - branches/2018Q1/sysutils/py-salt X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: branches/2018Q1/sysutils/py-salt X-SVN-Commit-Revision: 462943 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, 25 Feb 2018 08:53:22 -0000 Author: woodsb02 Date: Sun Feb 25 08:53:21 2018 New Revision: 462943 URL: https://svnweb.freebsd.org/changeset/ports/462943 Log: MFH: r462766 sysutils/py-salt: Update to 2017.7.3 This is a bug fix release for the 2017.7.x branch. Changes this release: https://docs.saltstack.com/en/latest/topics/releases/2017.7.3.html PR: 225983 Submitted by: ohauer Approved by: Christer Edwards (maintainer) Approved by: ports-secteam (riggs) Modified: branches/2018Q1/sysutils/py-salt/Makefile branches/2018Q1/sysutils/py-salt/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/sysutils/py-salt/Makefile ============================================================================== --- branches/2018Q1/sysutils/py-salt/Makefile Sun Feb 25 06:51:54 2018 (r462942) +++ branches/2018Q1/sysutils/py-salt/Makefile Sun Feb 25 08:53:21 2018 (r462943) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2017.7.2 -PORTREVISION= 1 +PORTVERSION= 2017.7.3 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2018Q1/sysutils/py-salt/distinfo ============================================================================== --- branches/2018Q1/sysutils/py-salt/distinfo Sun Feb 25 06:51:54 2018 (r462942) +++ branches/2018Q1/sysutils/py-salt/distinfo Sun Feb 25 08:53:21 2018 (r462943) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511447357 -SHA256 (salt-2017.7.2.tar.gz) = ff3bc7de5abf01b8acbd144db5811b00867179b2353f5c6f7f19241e2eff2840 -SIZE (salt-2017.7.2.tar.gz) = 11471191 +TIMESTAMP = 1519436462 +SHA256 (salt-2017.7.3.tar.gz) = 3d4e1aefe4fa1e53bf132e84961cf46cef3e5d654f4231a2f2e30e786ab7dc07 +SIZE (salt-2017.7.3.tar.gz) = 36461646 From owner-svn-ports-branches@freebsd.org Sun Feb 25 13:18: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 11CCEF2E90C; Sun, 25 Feb 2018 13:18:32 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B8EE47CEC2; Sun, 25 Feb 2018 13:18:31 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AF1DA56B1; Sun, 25 Feb 2018 13:18:31 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1PDIV7w000399; Sun, 25 Feb 2018 13:18:31 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1PDIVKC000396; Sun, 25 Feb 2018 13:18:31 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201802251318.w1PDIVKC000396@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sun, 25 Feb 2018 13:18:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462952 - in branches/2018Q1/www/squid: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: in branches/2018Q1/www/squid: . files X-SVN-Commit-Revision: 462952 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, 25 Feb 2018 13:18:32 -0000 Author: dbaio Date: Sun Feb 25 13:18:31 2018 New Revision: 462952 URL: https://svnweb.freebsd.org/changeset/ports/462952 Log: MFH: r462146 r462744 Use BROKEN_SSL Approved by: portmgr (blanket) www/squid: Fixes security vulnerabilities Add patches to fix CVE's: CVE-2018-1000024 CVE-2018-1000027 PR: 226139 Submitted by: Yasuhiro KIMURA Approved by: timp87@gmail.com (maintainer) Security: d5b6d151-1887-11e8-94f7-9c5c8e75236a Approved by: ports-secteam (riggs) Added: branches/2018Q1/www/squid/files/patch-src_client__side__request.cc - copied unchanged from r462744, head/www/squid/files/patch-src_client__side__request.cc branches/2018Q1/www/squid/files/patch-src_esi_CustomParser.cc - copied unchanged from r462744, head/www/squid/files/patch-src_esi_CustomParser.cc Modified: branches/2018Q1/www/squid/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/squid/Makefile ============================================================================== --- branches/2018Q1/www/squid/Makefile Sun Feb 25 12:14:34 2018 (r462951) +++ branches/2018Q1/www/squid/Makefile Sun Feb 25 13:18:31 2018 (r462952) @@ -2,7 +2,7 @@ PORTNAME= squid PORTVERSION= 3.5.27 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ @@ -113,6 +113,7 @@ SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} \ LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \ LIBOPENSSL_LIBS="-lcrypto -lssl" SSL_USES= ssl +SSL_VARS= BROKEN_SSL=openssl-devel SSL_CRTD_CONFIGURE_ENABLE= ssl-crtd SSL_CRTD_IMPLIES= SSL STACKTRACES_CONFIGURE_ENABLE= stacktraces @@ -303,10 +304,6 @@ post-install: (cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}) .include - -.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} -BROKEN= Does not build with openssl-devel -.endif .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-unknown-warning-option Copied: branches/2018Q1/www/squid/files/patch-src_client__side__request.cc (from r462744, head/www/squid/files/patch-src_client__side__request.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/squid/files/patch-src_client__side__request.cc Sun Feb 25 13:18:31 2018 (r462952, copy of r462744, head/www/squid/files/patch-src_client__side__request.cc) @@ -0,0 +1,23 @@ +http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_2.patch + +commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5) +Author: squidadm +Date: 2018-01-21 08:07:08 +1300 + + Fix indirect IP logging for transactions without a client connection (#129) (#136) + +--- src/client_side_request.cc.orig 2018-02-23 13:39:32 UTC ++++ src/client_side_request.cc +@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *d + * Ensure that the access log shows the indirect client + * instead of the direct client. + */ +- ConnStateData *conn = http->getConn(); +- conn->log_addr = request->indirect_client_addr; +- http->al->cache.caddr = conn->log_addr; ++ http->al->cache.caddr = request->indirect_client_addr; ++ if (ConnStateData *conn = http->getConn()) ++ conn->log_addr = request->indirect_client_addr; + } + request->x_forwarded_for_iterator.clean(); + request->flags.done_follow_x_forwarded_for = true; Copied: branches/2018Q1/www/squid/files/patch-src_esi_CustomParser.cc (from r462744, head/www/squid/files/patch-src_esi_CustomParser.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/squid/files/patch-src_esi_CustomParser.cc Sun Feb 25 13:18:31 2018 (r462952, copy of r462744, head/www/squid/files/patch-src_esi_CustomParser.cc) @@ -0,0 +1,28 @@ +http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_1.patch + +commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5) +Author: Amos Jeffries +Date: 2018-01-19 13:54:14 +1300 + + ESI: make sure endofName never exceeds tagEnd (#130) + +--- src/esi/CustomParser.cc.orig 2018-02-23 13:37:52 UTC ++++ src/esi/CustomParser.cc +@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t + + char * endofName = strpbrk(const_cast(tag), w_space); + +- if (endofName > tagEnd) ++ if (!endofName || endofName > tagEnd) + endofName = const_cast(tagEnd); + + *endofName = '\0'; +@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t + + char * endofName = strpbrk(const_cast(tag), w_space); + +- if (endofName > tagEnd) ++ if (!endofName || endofName > tagEnd) + endofName = const_cast(tagEnd); + + *endofName = '\0'; From owner-svn-ports-branches@freebsd.org Sun Feb 25 17:44:19 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73D22F03B32; Sun, 25 Feb 2018 17:44:19 +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 1CF6E68DFE; Sun, 25 Feb 2018 17:44:19 +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 15921101CD; Sun, 25 Feb 2018 17:44:19 +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 w1PHiIYQ036200; Sun, 25 Feb 2018 17:44:18 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1PHiIcq036198; Sun, 25 Feb 2018 17:44:18 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201802251744.w1PHiIcq036198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 25 Feb 2018 17:44:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462970 - branches/2018Q1/audio/musicpd X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q1/audio/musicpd X-SVN-Commit-Revision: 462970 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, 25 Feb 2018 17:44:19 -0000 Author: riggs Date: Sun Feb 25 17:44:18 2018 New Revision: 462970 URL: https://svnweb.freebsd.org/changeset/ports/462970 Log: MFH: r462969 Update to upstream version 0.20.18 Details from changelog, FreeBSD relevant bits: - input - curl: allow authentication methods other than "Basic" - decoder - flac: improve seeking precision - fix gapless CUE song transitions Approved by: ports-secteam (riggs) Modified: branches/2018Q1/audio/musicpd/Makefile branches/2018Q1/audio/musicpd/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/audio/musicpd/Makefile ============================================================================== --- branches/2018Q1/audio/musicpd/Makefile Sun Feb 25 17:42:48 2018 (r462969) +++ branches/2018Q1/audio/musicpd/Makefile Sun Feb 25 17:44:18 2018 (r462970) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.20.17 +PORTVERSION= 0.20.18 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} Modified: branches/2018Q1/audio/musicpd/distinfo ============================================================================== --- branches/2018Q1/audio/musicpd/distinfo Sun Feb 25 17:42:48 2018 (r462969) +++ branches/2018Q1/audio/musicpd/distinfo Sun Feb 25 17:44:18 2018 (r462970) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518854676 -SHA256 (mpd-0.20.17.tar.xz) = 2cb0e7f0e219df60a04b3c997d8ed7ad458ebfd89fd045e03fbe727277d5dac1 -SIZE (mpd-0.20.17.tar.xz) = 792108 +TIMESTAMP = 1519569665 +SHA256 (mpd-0.20.18.tar.xz) = 6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434 +SIZE (mpd-0.20.18.tar.xz) = 792416 From owner-svn-ports-branches@freebsd.org Mon Feb 26 05:19:33 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 1444DF2BB48; Mon, 26 Feb 2018 05:19:33 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BA05C83494; Mon, 26 Feb 2018 05:19:32 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B4D4B17159; Mon, 26 Feb 2018 05:19:32 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1Q5JWwJ082056; Mon, 26 Feb 2018 05:19:32 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1Q5JWSG082055; Mon, 26 Feb 2018 05:19:32 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201802260519.w1Q5JWSG082055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 26 Feb 2018 05:19:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462990 - branches/2018Q1/archivers/pbzip2 X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: branches/2018Q1/archivers/pbzip2 X-SVN-Commit-Revision: 462990 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, 26 Feb 2018 05:19:33 -0000 Author: swills Date: Mon Feb 26 05:19:32 2018 New Revision: 462990 URL: https://svnweb.freebsd.org/changeset/ports/462990 Log: MFH: r460675 Unbreak the build against Clang 6.0.0 and respect CXXFLAGS. PR: 225555 Approved by: ports-secteam (implicit) Modified: branches/2018Q1/archivers/pbzip2/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/archivers/pbzip2/Makefile ============================================================================== --- branches/2018Q1/archivers/pbzip2/Makefile Mon Feb 26 04:16:14 2018 (r462989) +++ branches/2018Q1/archivers/pbzip2/Makefile Mon Feb 26 05:19:32 2018 (r462990) @@ -17,8 +17,11 @@ PLIST_FILES= bin/pbzip2 bin/pbunzip2 \ man/man1/pbzip2.1.gz man/man1/pbunzip2.1.gz post-patch: + @${REINPLACE_CMD} -e 's,PRI[iu]MAX, & ,g' ${WRKSRC}/pbzip2.cpp \ + ${WRKSRC}/BZ2StreamScanner.cpp # Spell target sources to be understood by both BSD and GNU make(1) - @${REINPLACE_CMD} -e 's,$$^,$$>&,' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e '/-O2/s,^,#, ; s,$$^,$$>&,' \ + ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ From owner-svn-ports-branches@freebsd.org Mon Feb 26 10:00: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 A5874F39FB1; Mon, 26 Feb 2018 10:00:37 +0000 (UTC) (envelope-from girgen@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 590DE6D3CA; Mon, 26 Feb 2018 10:00:37 +0000 (UTC) (envelope-from girgen@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 53C3319F07; Mon, 26 Feb 2018 10:00:37 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1QA0b29024083; Mon, 26 Feb 2018 10:00:37 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1QA0Ybm024054; Mon, 26 Feb 2018 10:00:34 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201802261000.w1QA0Ybm024054@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Mon, 26 Feb 2018 10:00:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463010 - in branches/2018Q1/databases: postgresql10-server postgresql10-server/files postgresql92-client postgresql92-contrib postgresql92-server postgresql92-server/files postgresql93... X-SVN-Group: ports-branches X-SVN-Commit-Author: girgen X-SVN-Commit-Paths: in branches/2018Q1/databases: postgresql10-server postgresql10-server/files postgresql92-client postgresql92-contrib postgresql92-server postgresql92-server/files postgresql93-server postgresql93-serv... X-SVN-Commit-Revision: 463010 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, 26 Feb 2018 10:00:38 -0000 Author: girgen Date: Mon Feb 26 10:00:34 2018 New Revision: 463010 URL: https://svnweb.freebsd.org/changeset/ports/463010 Log: MFH: r458764 r460386 r461251 r461263 Convert to USES=autoreconf. Fix ICU depend for postgresql10-server. PR: 225049 Submitted by: mat Approved by: maintainer timeout Sponsored by: Absolight Update to latest versions of PostgreSQL 2018-02-08 Security Update Release ================================== The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 10.2, 9.6.7, 9.5.11, 9.4.16, 9.3.21. This release fixes two security issues. This release also fixes issues with VACUUM, GIN indexes, and hash indexes that could lead to data corruption, as well as fixes for using parallel queries and logical replication. All users using the affected versions of PostgreSQL should update as soon as possible. Please see the notes on "Updating" below for any post-update steps that may be required. Please note that PostgreSQL changed its versioning scheme with the release of version 10.0, so updating to version 10.2 from 10.0 or 10.1 is considered a minor update. Security Issues --------------- Two security vulnerabilities have been fixed by this release: * CVE-2018-1052: Fix the processing of partition keys containing multiple expressions * CVE-2018-1053: Ensure that all temporary files made with "pg_upgrade" are non-world-readable Local fixes to the FreeBSD ports -------------------------------- Inform users about data checksums [1]. Make sure /usr/bin/su is used regardless of PATH settings [2]. Enable DTRACE by default [3]. PR: 214671 [1], 223157 [2], 215028 [3] Security: c602c791-0cf4-11e8-a2ec-6cc21735f730 Remove DTRACE from OPTIONS_DEFAULT, causes segmentation fault during build Approved by: portmgr Modified: branches/2018Q1/databases/postgresql10-server/Makefile branches/2018Q1/databases/postgresql10-server/distinfo branches/2018Q1/databases/postgresql10-server/files/pkg-message-server.in branches/2018Q1/databases/postgresql10-server/files/postgresql.in branches/2018Q1/databases/postgresql10-server/pkg-plist-client branches/2018Q1/databases/postgresql10-server/pkg-plist-server branches/2018Q1/databases/postgresql92-client/Makefile branches/2018Q1/databases/postgresql92-contrib/Makefile branches/2018Q1/databases/postgresql92-server/Makefile branches/2018Q1/databases/postgresql92-server/files/pkg-message-server.in branches/2018Q1/databases/postgresql92-server/files/postgresql.in branches/2018Q1/databases/postgresql93-server/Makefile branches/2018Q1/databases/postgresql93-server/distinfo branches/2018Q1/databases/postgresql93-server/files/pkg-message-server.in branches/2018Q1/databases/postgresql93-server/files/postgresql.in branches/2018Q1/databases/postgresql93-server/pkg-plist-server branches/2018Q1/databases/postgresql94-server/Makefile branches/2018Q1/databases/postgresql94-server/distinfo branches/2018Q1/databases/postgresql94-server/files/pkg-message-server.in branches/2018Q1/databases/postgresql94-server/files/postgresql.in branches/2018Q1/databases/postgresql94-server/pkg-plist-server branches/2018Q1/databases/postgresql95-server/Makefile branches/2018Q1/databases/postgresql95-server/distinfo branches/2018Q1/databases/postgresql95-server/files/pkg-message-server.in branches/2018Q1/databases/postgresql95-server/files/postgresql.in branches/2018Q1/databases/postgresql95-server/pkg-plist-server branches/2018Q1/databases/postgresql96-server/Makefile branches/2018Q1/databases/postgresql96-server/distinfo branches/2018Q1/databases/postgresql96-server/files/pkg-message-server.in branches/2018Q1/databases/postgresql96-server/files/postgresql.in branches/2018Q1/databases/postgresql96-server/pkg-plist-server Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/postgresql10-server/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql10-server/Makefile Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql10-server/Makefile Mon Feb 26 10:00:34 2018 (r463010) @@ -1,12 +1,53 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 10.1 +PORTNAME?= postgresql +DISTVERSION?= 10.2 +PORTREVISION?= 0 +CATEGORIES?= databases +MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} -PORTREVISION?= 1 MAINTAINER?= pgsql@FreeBSD.org +COMMENT?= PostgreSQL is the most advanced open-source database available anywhere +LICENSE= PostgreSQL + +.if ${DISTVERSION:C/([0-9]*).*/\1/} == 10 +CONFLICTS+= ${PORTNAME}*-9.* +.else +CONFLICTS+= ${PORTNAME}*-9.[^${PORTVERSION:R:E}].* ${PORTNAME}10* +.endif + +WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} +DIST_SUBDIR= postgresql + +OPTIONS_SUB= yes + +PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} +USES+= tar:bzip2 cpe +.if !defined(NO_BUILD) +USES+= gmake +GNU_CONFIGURE= yes +LLD_UNSAFE= yes +.endif + +PG_USER?= postgres +PG_GROUP?= postgres +PG_UID?= 770 + +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/include \ + --enable-thread-safety +CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ + PTHREAD_LIBS="-lpthread" \ + LDFLAGS_SL="${LDFLAGS_SL}" +LDFLAGS+= -lpthread + +PLIST= ${PKGDIR}/pkg-plist${COMPONENT} + INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ @@ -18,14 +59,229 @@ INSTALL_DIRS?= src/common src/timezone src/backend \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade -PG_USER?= postgres -PG_GROUP?= postgres -PG_UID?= 770 +BUILD_DIRS?= src/port ${INSTALL_DIRS} +INSTALL_TARGET?=install-strip +.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) +SERVER_ONLY= yes +COMPONENT= -server +USE_RC_SUBR= postgresql +USES+= pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} +USERS= ${PG_USER} +GROUPS= ${PG_GROUP} +SUB_FILES+= 502.pgsql +.endif + +.if defined(CLIENT_ONLY) +OPTIONS_DEFINE+=LIBEDIT +LIBEDIT_DESC= Use non-GPL libedit instead of readline +USES+= perl5 +.else +MAKE_ENV= PATH=${PREFIX}/bin:${PATH} +CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} +.endif + .if defined(SERVER_ONLY) +OPTIONS_DEFINE= DTRACE LDAP INTDATE TZDATA XML +LDAP_DESC= Build with LDAP authentication support +DTRACE_DESC= Build with DTrace probes +TZDATA_DESC= Use internal timezone database +XML_DESC= Build with XML data type + +.if ${DISTVERSION:C/([0-9]*).*/\1/} != 10 +# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info +OPTIONS_DEFINE+= ICU +ICU_DESC= Use ICU for unicode collation +.else CONFIGURE_ARGS+=--with-icu LIB_DEPENDS+= libicudata.so:devel/icu USES+= pkgconfig .endif -.include "${.CURDIR}/../postgresql92-server/Makefile" +# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info +# (requires dump/restore if modified.) +OPTIONS_DEFINE+= INTDATE +INTDATE_DESC= Builds with 64-bit date/time type +OPTIONS_DEFAULT+= XML TZDATA INTDATE +.endif + +.if !defined(SLAVE_ONLY) +OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG +. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3 + OPTIONS_RADIO= KRB5 + OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 +. endif + +KRB5_DESC= Build with kerberos provider support +NLS_DESC= Use internationalized messages +PAM_DESC= Build with PAM Support +MIT_KRB5_DESC= Build with MIT kerberos support +HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos +GSSAPI_DESC= Build with GSSAPI support +OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) + +OPTIONS_DEFINE+= SSL +SSL_DESC= Build with OpenSSL support + +OPTIONS_DEFAULT+= SSL +.endif # !SLAVE_ONLY + +.if defined(CLIENT_ONLY) +LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred +LIBEDIT_USES= libedit +LIBEDIT_USES_OFF= readline +.endif # CLIENT_ONLY + +SSL_USES= ssl +SSL_CONFIGURE_WITH=openssl + +PAM_CONFIGURE_WITH= pam + +XML_CONFIGURE_WITH= libxml +XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 + +TZDATA_CONFIGURE_OFF=--with-system-tzdata=/usr/share/zoneinfo + +INTDATE_CONFIGURE_OFF=--disable-integer-datetimes + +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext + +LDAP_CONFIGURE_WITH= ldap +LDAP_USE= OPENLDAP=yes + +OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops + +DEBUG_CONFIGURE_ENABLE= debug + +PLIST_SUB+= PG_USER=${PG_USER} \ + PG_GROUP=${PG_GROUP} +SUB_LIST+= PG_GROUP=${PG_GROUP} \ + PG_USER=${PG_USER} \ + PG_UID=${PG_UID} + +.include + +.if !defined(SLAVE_ONLY) +.if ${DISTVERSION:C/([0-9]*).*/\1/} != 10 +. if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) +USES+= autoreconf +CONFIGURE_ARGS+=--with-icu +PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu +PATCHFILES+= ${ICU_PATCHFILE}:icu +LIB_DEPENDS+= libicudata.so:devel/icu +. endif +.endif # not version 10 +.endif # !SLAVE_ONLY + +.if !defined(SLAVE_ONLY) + +PATCH_DIST_STRIP=-p1 + +. if ${PORT_OPTIONS:MDTRACE} +CONFIGURE_ARGS+=--enable-dtrace +LDFLAGS+=-lelf +INSTALL_TARGET=install +. endif + +.if ${PORT_OPTIONS:MGSSAPI} +CONFIGURE_ARGS+=--with-gssapi +.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) +# Kerberos libraries will pull the proper GSSAPI library +# via linker dependencies, but otherwise we must specify +# it explicitely: ld --as-needed is used for compilation, +# so configure's -lgssapi_krb5 won't go. +LDFLAGS+= -lgssapi +LDFLAGS_SL+= -lgssapi +.endif +.else +CONFIGURE_ARGS+=--without-gssapi +.endif + +. if ${PORT_OPTIONS:MMIT_KRB5} +. if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)) +IGNORE= requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB +. else +CONFIGURE_ARGS+=--with-krb5 +# Allow defining a home built MIT Kerberos by setting KRB5_HOME +. if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) +LIB_DEPENDS+= libkrb5.so.3:security/krb5 +. endif +. endif +. endif + +. if ${PORT_OPTIONS:MHEIMDAL_KRB5} +CONFIGURE_ARGS+=--with-krb5 +. endif + +.endif # !SLAVE_ONLY + +# For testing files in FILESDIR +.include + +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.endif + +.if defined(SERVER_ONLY) +pre-build: + @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL +.endif + +.if !defined(NO_BUILD) && !target(do-build) + +do-build: + @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks + @ for dir in ${BUILD_DIRS}; do \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ + done + +. if exists(${FILESDIR}/pkg-message${COMPONENT}.in) +SUB_FILES+= pkg-message${COMPONENT} +PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} +. endif +. if exists(${FILESDIR}/pkg-install${COMPONENT}.in) +SUB_FILES+= pkg-install${COMPONENT} +PLIST_SUB+= PG_USER=${PG_USER} +. endif + +post-patch: +. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} + @${REINPLACE_CMD} \ + -e '/m4_PACKAGE_VERSION/s/\[2\.6[0-9]\]/m4_defn([m4_PACKAGE_VERSION])/' \ + -e '/icu/s/_57//' \ + ${WRKSRC}/configure.in +. endif + +do-install: + @for dir in ${INSTALL_DIRS}; do \ + cd ${WRKSRC}/$${dir} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ + done +. if defined(SERVER_ONLY) + @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ + ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ + ${STAGEDIR}${PREFIX}/etc/periodic/daily +. endif # SERVER_ONLY +. if defined(CLIENT_ONLY) + @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local +. endif + @ if [ -r ${PKGMESSAGE} ]; then \ + ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ + ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ + fi +.endif # !NO_BUILD + +.if defined(SERVER_ONLY) +check: + @if [ `id -u` != 0 ] ; then \ + ${ECHO} "Running postgresql regressions tests" ;\ + cd ${WRKSRC}; ${MAKE_CMD} check ;\ + else \ + ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ + ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ + fi +.endif + +.include Modified: branches/2018Q1/databases/postgresql10-server/distinfo ============================================================================== --- branches/2018Q1/databases/postgresql10-server/distinfo Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql10-server/distinfo Mon Feb 26 10:00:34 2018 (r463010) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510172180 -SHA256 (postgresql/postgresql-10.1.tar.bz2) = 3ccb4e25fe7a7ea6308dea103cac202963e6b746697366d72ec2900449a5e713 -SIZE (postgresql/postgresql-10.1.tar.bz2) = 19669989 +TIMESTAMP = 1518110073 +SHA256 (postgresql/postgresql-10.2.tar.bz2) = fe32009b62ddb97f7f014307ce9d0edb6972f5a698e63cb531088e147d145bad +SIZE (postgresql/postgresql-10.2.tar.bz2) = 19901836 Modified: branches/2018Q1/databases/postgresql10-server/files/pkg-message-server.in ============================================================================== --- branches/2018Q1/databases/postgresql10-server/files/pkg-message-server.in Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql10-server/files/pkg-message-server.in Mon Feb 26 10:00:34 2018 (r463010) @@ -50,6 +50,13 @@ For postmaster settings, see ~pgsql/data/postgresql.co NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/data/postgresql.conf for more info +NB. If you're not using a checksumming filesystem like ZFS, you might + wish to enable data checksumming. It can only be enabled during + the initdb phase, by adding the "--data-checksums" flag to + the postgres_initdb_flags rcvar. Check the initdb(1) manpage + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add Modified: branches/2018Q1/databases/postgresql10-server/files/postgresql.in ============================================================================== --- branches/2018Q1/databases/postgresql10-server/files/postgresql.in Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql10-server/files/postgresql.in Mon Feb 26 10:00:34 2018 (r463010) @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" Modified: branches/2018Q1/databases/postgresql10-server/pkg-plist-client ============================================================================== --- branches/2018Q1/databases/postgresql10-server/pkg-plist-client Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql10-server/pkg-plist-client Mon Feb 26 10:00:34 2018 (r463010) @@ -639,6 +639,7 @@ include/postgresql/server/utils/freepage.h include/postgresql/server/utils/geo_decls.h include/postgresql/server/utils/guc.h include/postgresql/server/utils/guc_tables.h +include/postgresql/server/utils/hashutils.h include/postgresql/server/utils/help_config.h include/postgresql/server/utils/hsearch.h include/postgresql/server/utils/index_selfuncs.h @@ -1087,7 +1088,9 @@ man/man7/WITH.7.gz %%NLS%%share/locale/ta/LC_MESSAGES/pg_config-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/ecpg-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/pg_config-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-10.mo Modified: branches/2018Q1/databases/postgresql10-server/pkg-plist-server ============================================================================== --- branches/2018Q1/databases/postgresql10-server/pkg-plist-server Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql10-server/pkg-plist-server Mon Feb 26 10:00:34 2018 (r463010) @@ -174,6 +174,13 @@ lib/libpgcommon.a %%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-10.mo %%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-10.mo %%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-10.mo +%%NLS%%share/locale/sv/LC_MESSAGES/postgres-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/postgres-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-10.mo @@ -769,7 +776,6 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/US/Michigan %%TZDATA%%%%DATADIR%%/timezone/US/Mountain %%TZDATA%%%%DATADIR%%/timezone/US/Pacific -%%TZDATA%%%%DATADIR%%/timezone/US/Pacific-New %%TZDATA%%%%DATADIR%%/timezone/US/Samoa %%TZDATA%%%%DATADIR%%/timezone/UTC %%TZDATA%%%%DATADIR%%/timezone/Universal Modified: branches/2018Q1/databases/postgresql92-client/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql92-client/Makefile Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql92-client/Makefile Mon Feb 26 10:00:34 2018 (r463010) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 0 COMMENT= PostgreSQL database (client) Modified: branches/2018Q1/databases/postgresql92-contrib/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql92-contrib/Makefile Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql92-contrib/Makefile Mon Feb 26 10:00:34 2018 (r463010) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 0 CATEGORIES= databases PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} Modified: branches/2018Q1/databases/postgresql92-server/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql92-server/Makefile Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql92-server/Makefile Mon Feb 26 10:00:34 2018 (r463010) @@ -1,277 +1,26 @@ # Created by: Marc G. Fournier # $FreeBSD$ -PORTNAME?= postgresql DISTVERSION?= 9.2.24 -PORTREVISION?= 0 -CATEGORIES?= databases -MASTER_SITES= PGSQL/source/v${DISTVERSION} +PORTREVISION?= 1 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org -COMMENT?= PostgreSQL is the most advanced open-source database available anywhere -LICENSE= PostgreSQL +ICU_PATCHFILE= pg-9218-icu-2016-08-10.diff.gz -CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \ - ${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \ - ${PORTNAME}9[^${PORTVERSION:R:E}]-client* \ - ${PORTNAME}${COMPONENT}-9.[^${PORTVERSION:R:E}].* - -WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} -DIST_SUBDIR= postgresql - -ICU_PATCHFILE?= pg-9218-icu-2016-08-10.diff.gz - -OPTIONS_SUB= yes - -PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} -USES+= tar:bzip2 cpe -.if !defined(NO_BUILD) -USES+= gmake -GNU_CONFIGURE= yes -LLD_UNSAFE= yes -.endif - -PG_USER?= pgsql -PG_GROUP?= pgsql -PG_UID?= 70 - -LDFLAGS+= -L${LOCALBASE}/lib -INCLUDES+= -I${LOCALBASE}/include -CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ - --with-includes=${PREFIX}/include \ - --enable-thread-safety -CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ - PTHREAD_LIBS="-lpthread" \ - LDFLAGS_SL="${LDFLAGS_SL}" -LDFLAGS+= -lpthread - -PLIST= ${PKGDIR}/pkg-plist${COMPONENT} - INSTALL_DIRS?= src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup -BUILD_DIRS?= src/port ${INSTALL_DIRS} -INSTALL_TARGET?=install-strip -.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) -SERVER_ONLY= yes -COMPONENT= -server -USE_RC_SUBR= postgresql -USES+= pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} -USERS= ${PG_USER} -GROUPS= ${PG_GROUP} -SUB_FILES+= 502.pgsql -.endif +DEPRECATED= PostgreSQL 9.2 support has reached End-of-line. Please upgrade to a later version. +EXPIRATION_DATE=2017-04-05 -.if defined(CLIENT_ONLY) -OPTIONS_DEFINE+=LIBEDIT -LIBEDIT_DESC= Use non-GPL libedit instead of readline -USES+= perl5 -.else -MAKE_ENV= PATH=${PREFIX}/bin:${PATH} -CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} -.endif +PG_USER?= pgsql +PG_GROUP?= pgsql +PG_UID?= 70 -.if defined(SERVER_ONLY) -OPTIONS_DEFINE= DTRACE LDAP INTDATE TZDATA XML -LDAP_DESC= Build with LDAP authentication support -DTRACE_DESC= Build with DTrace probes -TZDATA_DESC= Use internal timezone database -XML_DESC= Build with XML data type - -.if ${DISTVERSION:C/([0-9]*).*/\1/} != 10 -# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info -OPTIONS_DEFINE+= ICU -ICU_DESC= Use ICU for unicode collation -.endif - -# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info -# (requires dump/restore if modified.) -OPTIONS_DEFINE+= INTDATE -INTDATE_DESC= Builds with 64-bit date/time type -OPTIONS_DEFAULT+= XML TZDATA INTDATE -.endif - -.if !defined(SLAVE_ONLY) -OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG -. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3 - OPTIONS_RADIO= KRB5 - OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 -. endif - -KRB5_DESC= Build with kerberos provider support -NLS_DESC= Use internationalized messages -PAM_DESC= Build with PAM Support -MIT_KRB5_DESC= Build with MIT kerberos support -HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos -GSSAPI_DESC= Build with GSSAPI support -OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) - -OPTIONS_DEFINE+= SSL -SSL_DESC= Build with OpenSSL support - -OPTIONS_DEFAULT+= SSL -.endif # !SLAVE_ONLY - -.if defined(CLIENT_ONLY) -LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred -LIBEDIT_USES= libedit -LIBEDIT_USES_OFF= readline -.endif # CLIENT_ONLY - -SSL_USES= ssl -SSL_CONFIGURE_WITH=openssl - -PAM_CONFIGURE_WITH= pam - -XML_CONFIGURE_WITH= libxml -XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 - -TZDATA_CONFIGURE_OFF=--with-system-tzdata=/usr/share/zoneinfo - -INTDATE_CONFIGURE_OFF=--disable-integer-datetimes - -NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext - -LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes - -OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops - -DEBUG_CONFIGURE_ENABLE= debug - -PLIST_SUB+= PG_USER=${PG_USER} \ - PG_GROUP=${PG_GROUP} -SUB_LIST+= PG_GROUP=${PG_GROUP} \ - PG_USER=${PG_USER} \ - PG_UID=${PG_UID} - -.include - -.if !defined(SLAVE_ONLY) -. if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) -USE_AUTOTOOLS= autoconf -CONFIGURE_ARGS+=--with-icu -PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu -PATCHFILES+= ${ICU_PATCHFILE}:icu -LIB_DEPENDS+= libicudata.so:devel/icu -. endif -.endif # !SLAVE_ONLY - -.if !defined(SLAVE_ONLY) - -PATCH_DIST_STRIP=-p1 - -. if ${PORT_OPTIONS:MDTRACE} -CONFIGURE_ARGS+=--enable-dtrace -LDFLAGS+=-lelf -INSTALL_TARGET=install -. endif - -.if ${PORT_OPTIONS:MGSSAPI} -CONFIGURE_ARGS+=--with-gssapi -.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) -# Kerberos libraries will pull the proper GSSAPI library -# via linker dependencies, but otherwise we must specify -# it explicitely: ld --as-needed is used for compilation, -# so configure's -lgssapi_krb5 won't go. -LDFLAGS+= -lgssapi -LDFLAGS_SL+= -lgssapi -.endif -.else -CONFIGURE_ARGS+=--without-gssapi -.endif - -. if ${PORT_OPTIONS:MMIT_KRB5} -. if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)) -IGNORE= requires that you remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB -. else -CONFIGURE_ARGS+=--with-krb5 -# Allow defining a home built MIT Kerberos by setting KRB5_HOME -. if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) -LIB_DEPENDS+= libkrb5.so.3:security/krb5 -. endif -. endif -. endif - -. if ${PORT_OPTIONS:MHEIMDAL_KRB5} -CONFIGURE_ARGS+=--with-krb5 -. endif - -.endif # !SLAVE_ONLY - -# For testing files in FILESDIR -.include - -.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} -BROKEN= Does not build with openssl-devel -.endif - -.if defined(SERVER_ONLY) -pre-build: - @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL -.endif - -.if !defined(NO_BUILD) && !target(do-build) - -do-build: - @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks - @ for dir in ${BUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ - done - -. if exists(${FILESDIR}/pkg-message${COMPONENT}.in) -SUB_FILES+= pkg-message${COMPONENT} -PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} -. endif -. if exists(${FILESDIR}/pkg-install${COMPONENT}.in) -SUB_FILES+= pkg-install${COMPONENT} -PLIST_SUB+= PG_USER=${PG_USER} -. endif - -post-patch: -. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} - @${REINPLACE_CMD} -E -e \ - "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ - -e '/icu/s/_57//' \ - ${WRKSRC}/configure.in -. endif - -do-install: - @for dir in ${INSTALL_DIRS}; do \ - cd ${WRKSRC}/$${dir} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ - done -. if defined(SERVER_ONLY) - @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ - ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ - ${STAGEDIR}${PREFIX}/etc/periodic/daily -. endif # SERVER_ONLY -. if defined(CLIENT_ONLY) - @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local -. endif - @ if [ -r ${PKGMESSAGE} ]; then \ - ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ - ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ - fi -.endif # !NO_BUILD - -.if defined(SERVER_ONLY) -check: - @if [ `id -u` != 0 ] ; then \ - ${ECHO} "Running postgresql regressions tests" ;\ - cd ${WRKSRC}; ${MAKE_CMD} check ;\ - else \ - ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ - ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ - fi -.endif - -.include +.include "${.CURDIR}/../postgresql10-server/Makefile" Modified: branches/2018Q1/databases/postgresql92-server/files/pkg-message-server.in ============================================================================== --- branches/2018Q1/databases/postgresql92-server/files/pkg-message-server.in Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql92-server/files/pkg-message-server.in Mon Feb 26 10:00:34 2018 (r463010) @@ -63,6 +63,13 @@ For postmaster settings, see ~pgsql/data/postgresql.co NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/data/postgresql.conf for more info +NB. If you're not using a checksumming filesystem like ZFS, you might + wish to enable data checksumming. It can only be enabled during + the initdb phase, by adding the "--data-checksums" flag to + the postgres_initdb_flags rcvar. Check the initdb(1) manpage + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add Modified: branches/2018Q1/databases/postgresql92-server/files/postgresql.in ============================================================================== --- branches/2018Q1/databases/postgresql92-server/files/postgresql.in Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql92-server/files/postgresql.in Mon Feb 26 10:00:34 2018 (r463010) @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" Modified: branches/2018Q1/databases/postgresql93-server/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql93-server/Makefile Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql93-server/Makefile Mon Feb 26 10:00:34 2018 (r463010) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.3.20 +DISTVERSION?= 9.3.21 PORTREVISION= 0 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} @@ -14,6 +14,10 @@ INSTALL_DIRS?= src/common src/timezone src/backend \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup -ICU_PATCHFILE?= pg-9314-icu-2016-08-10.diff.gz +ICU_PATCHFILE= pg-9314-icu-2016-08-10.diff.gz -.include "${.CURDIR}/../postgresql92-server/Makefile" +PG_USER?= pgsql +PG_GROUP?= pgsql +PG_UID?= 70 + +.include "${.CURDIR}/../postgresql10-server/Makefile" Modified: branches/2018Q1/databases/postgresql93-server/distinfo ============================================================================== --- branches/2018Q1/databases/postgresql93-server/distinfo Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql93-server/distinfo Mon Feb 26 10:00:34 2018 (r463010) @@ -1,5 +1,5 @@ -TIMESTAMP = 1510172181 -SHA256 (postgresql/postgresql-9.3.20.tar.bz2) = eb138ad67075b8acb4fae56e98ca7be5d85f3da0ba658fc48206834598a2e6ca -SIZE (postgresql/postgresql-9.3.20.tar.bz2) = 17197360 +TIMESTAMP = 1517868536 +SHA256 (postgresql/postgresql-9.3.21.tar.bz2) = b9babc5148188a410e023d7178a5678e989ec2e276498de6cd0028bc331a40e0 +SIZE (postgresql/postgresql-9.3.21.tar.bz2) = 17014472 SHA256 (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 4be31ad9899d5caf9f57ad7ebfc0d14f0fcf58ad539c82fb353b016fb76c0c30 SIZE (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 5583 Modified: branches/2018Q1/databases/postgresql93-server/files/pkg-message-server.in ============================================================================== --- branches/2018Q1/databases/postgresql93-server/files/pkg-message-server.in Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql93-server/files/pkg-message-server.in Mon Feb 26 10:00:34 2018 (r463010) @@ -50,6 +50,13 @@ For postmaster settings, see ~pgsql/data/postgresql.co NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/data/postgresql.conf for more info +NB. If you're not using a checksumming filesystem like ZFS, you might + wish to enable data checksumming. It can only be enabled during + the initdb phase, by adding the "--data-checksums" flag to + the postgres_initdb_flags rcvar. Check the initdb(1) manpage + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add Modified: branches/2018Q1/databases/postgresql93-server/files/postgresql.in ============================================================================== --- branches/2018Q1/databases/postgresql93-server/files/postgresql.in Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql93-server/files/postgresql.in Mon Feb 26 10:00:34 2018 (r463010) @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" Modified: branches/2018Q1/databases/postgresql93-server/pkg-plist-server ============================================================================== --- branches/2018Q1/databases/postgresql93-server/pkg-plist-server Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql93-server/pkg-plist-server Mon Feb 26 10:00:34 2018 (r463010) @@ -714,7 +714,6 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/US/Michigan %%TZDATA%%%%DATADIR%%/timezone/US/Mountain %%TZDATA%%%%DATADIR%%/timezone/US/Pacific -%%TZDATA%%%%DATADIR%%/timezone/US/Pacific-New %%TZDATA%%%%DATADIR%%/timezone/US/Samoa %%TZDATA%%%%DATADIR%%/timezone/UTC %%TZDATA%%%%DATADIR%%/timezone/Universal Modified: branches/2018Q1/databases/postgresql94-server/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql94-server/Makefile Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql94-server/Makefile Mon Feb 26 10:00:34 2018 (r463010) @@ -1,8 +1,9 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.4.15 +DISTVERSION?= 9.4.16 PORTREVISION= 0 +PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org @@ -15,4 +16,8 @@ INSTALL_DIRS?= src/common src/timezone src/backend \ ICU_PATCHFILE= pg-949-icu-2016-10-02.diff.gz -.include "${.CURDIR}/../postgresql92-server/Makefile" +PG_USER?= pgsql +PG_GROUP?= pgsql +PG_UID?= 70 + +.include "${.CURDIR}/../postgresql10-server/Makefile" Modified: branches/2018Q1/databases/postgresql94-server/distinfo ============================================================================== --- branches/2018Q1/databases/postgresql94-server/distinfo Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql94-server/distinfo Mon Feb 26 10:00:34 2018 (r463010) @@ -1,5 +1,5 @@ -TIMESTAMP = 1510172182 -SHA256 (postgresql/postgresql-9.4.15.tar.bz2) = 12bfb3c7e8e45515ef921ad365e122682a5c4935dcc0032644433af2de31acc4 -SIZE (postgresql/postgresql-9.4.15.tar.bz2) = 17921677 +TIMESTAMP = 1517868536 +SHA256 (postgresql/postgresql-9.4.16.tar.bz2) = dcbc62b621e4d8a445c2f33750f7d96257c38103cccebeb934e6913a3c135e81 +SIZE (postgresql/postgresql-9.4.16.tar.bz2) = 17778763 SHA256 (postgresql/pg-949-icu-2016-10-02.diff.gz) = 34612e685a79874db04bc6b66c700bfc6412042840c532eef0da7832d1f70d43 SIZE (postgresql/pg-949-icu-2016-10-02.diff.gz) = 5289 Modified: branches/2018Q1/databases/postgresql94-server/files/pkg-message-server.in ============================================================================== --- branches/2018Q1/databases/postgresql94-server/files/pkg-message-server.in Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql94-server/files/pkg-message-server.in Mon Feb 26 10:00:34 2018 (r463010) @@ -50,6 +50,13 @@ For postmaster settings, see ~pgsql/data/postgresql.co NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/data/postgresql.conf for more info +NB. If you're not using a checksumming filesystem like ZFS, you might + wish to enable data checksumming. It can only be enabled during + the initdb phase, by adding the "--data-checksums" flag to + the postgres_initdb_flags rcvar. Check the initdb(1) manpage + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add Modified: branches/2018Q1/databases/postgresql94-server/files/postgresql.in ============================================================================== --- branches/2018Q1/databases/postgresql94-server/files/postgresql.in Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql94-server/files/postgresql.in Mon Feb 26 10:00:34 2018 (r463010) @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" Modified: branches/2018Q1/databases/postgresql94-server/pkg-plist-server ============================================================================== --- branches/2018Q1/databases/postgresql94-server/pkg-plist-server Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql94-server/pkg-plist-server Mon Feb 26 10:00:34 2018 (r463010) @@ -715,7 +715,6 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/US/Michigan %%TZDATA%%%%DATADIR%%/timezone/US/Mountain %%TZDATA%%%%DATADIR%%/timezone/US/Pacific -%%TZDATA%%%%DATADIR%%/timezone/US/Pacific-New %%TZDATA%%%%DATADIR%%/timezone/US/Samoa %%TZDATA%%%%DATADIR%%/timezone/UTC %%TZDATA%%%%DATADIR%%/timezone/Universal Modified: branches/2018Q1/databases/postgresql95-server/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql95-server/Makefile Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql95-server/Makefile Mon Feb 26 10:00:34 2018 (r463010) @@ -1,8 +1,9 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.5.10 +DISTVERSION?= 9.5.11 PORTREVISION= 0 +PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org @@ -18,4 +19,8 @@ INSTALL_DIRS?= src/common src/timezone src/backend \ ICU_PATCHFILE= pg-954-icu-2016-08-10.diff.gz -.include "${.CURDIR}/../postgresql92-server/Makefile" +PG_USER?= pgsql +PG_GROUP?= pgsql +PG_UID?= 70 + +.include "${.CURDIR}/../postgresql10-server/Makefile" Modified: branches/2018Q1/databases/postgresql95-server/distinfo ============================================================================== --- branches/2018Q1/databases/postgresql95-server/distinfo Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql95-server/distinfo Mon Feb 26 10:00:34 2018 (r463010) @@ -1,5 +1,5 @@ -TIMESTAMP = 1510172182 -SHA256 (postgresql/postgresql-9.5.10.tar.bz2) = 945d7ade094dded6b95495d8f1561a12ac9608276858ed30adf3c3658275f281 -SIZE (postgresql/postgresql-9.5.10.tar.bz2) = 18701419 +TIMESTAMP = 1517868536 +SHA256 (postgresql/postgresql-9.5.11.tar.bz2) = 8182cd74e27a75ae39166b2603b5014f4272855b4101b40819761b853a77c8dd +SIZE (postgresql/postgresql-9.5.11.tar.bz2) = 18572811 SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365 SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952 Modified: branches/2018Q1/databases/postgresql95-server/files/pkg-message-server.in ============================================================================== --- branches/2018Q1/databases/postgresql95-server/files/pkg-message-server.in Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql95-server/files/pkg-message-server.in Mon Feb 26 10:00:34 2018 (r463010) @@ -50,6 +50,13 @@ For postmaster settings, see ~pgsql/data/postgresql.co NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/data/postgresql.conf for more info +NB. If you're not using a checksumming filesystem like ZFS, you might + wish to enable data checksumming. It can only be enabled during + the initdb phase, by adding the "--data-checksums" flag to + the postgres_initdb_flags rcvar. Check the initdb(1) manpage + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add Modified: branches/2018Q1/databases/postgresql95-server/files/postgresql.in ============================================================================== --- branches/2018Q1/databases/postgresql95-server/files/postgresql.in Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql95-server/files/postgresql.in Mon Feb 26 10:00:34 2018 (r463010) @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" Modified: branches/2018Q1/databases/postgresql95-server/pkg-plist-server ============================================================================== --- branches/2018Q1/databases/postgresql95-server/pkg-plist-server Mon Feb 26 09:38:24 2018 (r463009) +++ branches/2018Q1/databases/postgresql95-server/pkg-plist-server Mon Feb 26 10:00:34 2018 (r463010) @@ -110,7 +110,7 @@ lib/libpgcommon.a %%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-9.5.mo %%NLS%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.5.mo %%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-9.5.mo -%%NLS%%share/locale/ko/LC_MESSAGES/pl%%PG_USER%%-9.5.mo +%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-9.5.mo %%NLS%%share/locale/pl/LC_MESSAGES/initdb-9.5.mo %%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-9.5.mo %%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-9.5.mo @@ -736,7 +736,6 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/US/Michigan %%TZDATA%%%%DATADIR%%/timezone/US/Mountain *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Mon Feb 26 18:57:19 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B369F3AC9A; Mon, 26 Feb 2018 18:57:19 +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 9953983648; Mon, 26 Feb 2018 18:57:18 +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 93CF01F594; Mon, 26 Feb 2018 18:57:18 +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 w1QIvIi2015072; Mon, 26 Feb 2018 18:57:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1QIvHRk015065; Mon, 26 Feb 2018 18:57:17 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802261857.w1QIvHRk015065@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 26 Feb 2018 18:57:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463038 - in branches/2018Q1/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www/waterfox: . files X-SVN-Commit-Revision: 463038 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, 26 Feb 2018 18:57:19 -0000 Author: jbeich Date: Mon Feb 26 18:57:17 2018 New Revision: 463038 URL: https://svnweb.freebsd.org/changeset/ports/463038 Log: MFH: r463037 www/waterfox: apply FF57 widget/ fixes Approved by: ports-secteam blanket Added: branches/2018Q1/www/waterfox/files/patch-bug1036008 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1036008 branches/2018Q1/www/waterfox/files/patch-bug1134077 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1134077 branches/2018Q1/www/waterfox/files/patch-bug1314928 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1314928 branches/2018Q1/www/waterfox/files/patch-bug1360278 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1360278 branches/2018Q1/www/waterfox/files/patch-bug1381815 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1381815 branches/2018Q1/www/waterfox/files/patch-bug1387170 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1387170 branches/2018Q1/www/waterfox/files/patch-bug1396722 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1396722 branches/2018Q1/www/waterfox/files/patch-bug1398539 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1398539 branches/2018Q1/www/waterfox/files/patch-bug1399336 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1399336 branches/2018Q1/www/waterfox/files/patch-bug1400238 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1400238 branches/2018Q1/www/waterfox/files/patch-bug1400839 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1400839 branches/2018Q1/www/waterfox/files/patch-bug1401063 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1401063 branches/2018Q1/www/waterfox/files/patch-bug1407001 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1407001 branches/2018Q1/www/waterfox/files/patch-bug1417751 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1417751 branches/2018Q1/www/waterfox/files/patch-bug1425878 - copied unchanged from r463037, head/www/waterfox/files/patch-bug1425878 Modified: branches/2018Q1/www/waterfox/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Mon Feb 26 18:56:14 2018 (r463037) +++ branches/2018Q1/www/waterfox/Makefile Mon Feb 26 18:57:17 2018 (r463038) @@ -3,7 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.0.4-20 DISTVERSIONSUFFIX= -ge03e284b083d -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q1/www/waterfox/files/patch-bug1036008 (from r463037, head/www/waterfox/files/patch-bug1036008) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1036008 Mon Feb 26 18:57:17 2018 (r463038, copy of r463037, head/www/waterfox/files/patch-bug1036008) @@ -0,0 +1,523 @@ +commit ed18f146242b +Author: Masayuki Nakano +Date: Fri Feb 16 15:54:07 2018 +0900 + + Bug 1036008 - Use alternative ASCII capable keyboard layout information to decide keyCode even if the key produces an ASCII punctuation character r=smaug + + Gecko decides keyCode from an ASCII character which is produced by the key + by itself or with Shift on active keyboard layout or alternative ASCII capable + keyboard layout if active keyboard layout isn't ASCII capable. However, we've + ignored alternative ASCII capable keyboard layout's character if both the + key itself and with Shift don't produce ASCII alphabet nor ASCII numeral, + i.e., ASCII punctuation characters are not used in alternative ASCII capable + keyboard layout because of avoiding mapping a keyCode value to 2 or more keys. + + However, setting 0 to keyCode value makes Firefox unusable with some web + applications which are aware of neither KeyboardEvent.key nor + KeyboardEvent.code. So, even if we map same keyCode value to a key, we should + avoid setting keyCode value to 0 as far as possible. + + This patch's approach is, we behave same keyCode value as the alternative ASCII + capable keyCode is selected when computed keyCode value of active keyboard + layout is 0. This means that we will make some language users whose keyboard + layout for their language is not ASCII capable can use global web services + which support US keyboard layout of Firefox since the new keyCode values + are mostly computed with US layout on Windows or actual alternative ASCII + capable keyboard layout on macOS and Linux. In other words, we cannot improve + compatibility with web applications which don't support Firefox by this patch + since our keyCode values are really different from Chrome's. So, unfortunately, + if we'd use exactly same keyCode computation as Chromium, we'd break + compatibility with existing web applications which are aware of Firefox since + it's necessary to check UA name or something before using keyCode values. + + Note that the most important difference between Windows and the others is, + such keyCode value is computed with alternative ASCII capable keyboard + layout on macOS and Linux but only on Windows, it's computed with OEM virtual + keycode. This means that only on Windows, the keyCode value may be different + from actual alternative ASCII capable keyboard layout's keyCode. + + MozReview-Commit-ID: As289r9wp6i + + --HG-- + extra : rebase_source : 66181403dbe8ca8dab893edc8f4eec1991d544d0 +--- + widget/TextEvents.h | 11 ++++++ + widget/WidgetEventImpl.cpp | 36 ++++++++++++++++++++ + widget/cocoa/TextInputHandler.mm | 43 ++++++++++++++---------- + widget/gtk/nsGtkKeyUtils.cpp | 64 ++++++++++++++++++++++++++--------- + widget/gtk/nsGtkKeyUtils.h | 10 ++++++ + widget/tests/test_keycodes.xul | 41 ++++++++++++----------- + widget/windows/KeyboardLayout.cpp | 70 ++++++++++++++++++++++++++++++++++++++- + 7 files changed, 223 insertions(+), 52 deletions(-) + +diff --git widget/TextEvents.h widget/TextEvents.h +index f1a67ecfdf3d..015331e8287d 100644 +--- widget/TextEvents.h ++++ widget/TextEvents.h +@@ -459,6 +459,17 @@ public: + GetDOMCodeName(mCodeNameIndex, aCodeName); + } + ++ /** ++ * GetFallbackKeyCodeOfPunctuationKey() returns a DOM keyCode value for ++ * aCodeNameIndex. This is keyCode value of the key when active keyboard ++ * layout is ANSI (US), JIS or ABNT keyboard layout (the latter 2 layouts ++ * are used only when ANSI doesn't have the key). The result is useful ++ * if the key doesn't produce ASCII character with active keyboard layout ++ * nor with alternative ASCII capable keyboard layout. ++ */ ++ static uint32_t ++ GetFallbackKeyCodeOfPunctuationKey(CodeNameIndex aCodeNameIndex); ++ + bool IsModifierKeyEvent() const + { + return GetModifierForKeyName(mKeyNameIndex) != MODIFIER_NONE; +diff --git widget/WidgetEventImpl.cpp widget/WidgetEventImpl.cpp +index 5415d9889be9..c379e7301b21 100644 +--- widget/WidgetEventImpl.cpp ++++ widget/WidgetEventImpl.cpp +@@ -1183,6 +1183,42 @@ WidgetKeyboardEvent::GetCodeNameIndex(const nsAString& aCodeValue) + return result; + } + ++/* static */ uint32_t ++WidgetKeyboardEvent::GetFallbackKeyCodeOfPunctuationKey( ++ CodeNameIndex aCodeNameIndex) ++{ ++ switch (aCodeNameIndex) { ++ case CODE_NAME_INDEX_Semicolon: // VK_OEM_1 on Windows ++ return nsIDOMKeyEvent::DOM_VK_SEMICOLON; ++ case CODE_NAME_INDEX_Equal: // VK_OEM_PLUS on Windows ++ return nsIDOMKeyEvent::DOM_VK_EQUALS; ++ case CODE_NAME_INDEX_Comma: // VK_OEM_COMMA on Windows ++ return nsIDOMKeyEvent::DOM_VK_COMMA; ++ case CODE_NAME_INDEX_Minus: // VK_OEM_MINUS on Windows ++ return nsIDOMKeyEvent::DOM_VK_HYPHEN_MINUS; ++ case CODE_NAME_INDEX_Period: // VK_OEM_PERIOD on Windows ++ return nsIDOMKeyEvent::DOM_VK_PERIOD; ++ case CODE_NAME_INDEX_Slash: // VK_OEM_2 on Windows ++ return nsIDOMKeyEvent::DOM_VK_SLASH; ++ case CODE_NAME_INDEX_Backquote: // VK_OEM_3 on Windows ++ return nsIDOMKeyEvent::DOM_VK_BACK_QUOTE; ++ case CODE_NAME_INDEX_BracketLeft: // VK_OEM_4 on Windows ++ return nsIDOMKeyEvent::DOM_VK_OPEN_BRACKET; ++ case CODE_NAME_INDEX_Backslash: // VK_OEM_5 on Windows ++ return nsIDOMKeyEvent::DOM_VK_BACK_SLASH; ++ case CODE_NAME_INDEX_BracketRight: // VK_OEM_6 on Windows ++ return nsIDOMKeyEvent::DOM_VK_CLOSE_BRACKET; ++ case CODE_NAME_INDEX_Quote: // VK_OEM_7 on Windows ++ return nsIDOMKeyEvent::DOM_VK_QUOTE; ++ case CODE_NAME_INDEX_IntlBackslash: // VK_OEM_5 on Windows (ABNT, etc) ++ case CODE_NAME_INDEX_IntlYen: // VK_OEM_5 on Windows (JIS) ++ case CODE_NAME_INDEX_IntlRo: // VK_OEM_102 on Windows ++ return nsIDOMKeyEvent::DOM_VK_BACK_SLASH; ++ default: ++ return 0; ++ } ++} ++ + /* static */ const char* + WidgetKeyboardEvent::GetCommandStr(Command aCommand) + { +diff --git widget/cocoa/TextInputHandler.mm widget/cocoa/TextInputHandler.mm +index 437d8222ab3b..106ef0e91f52 100644 +--- widget/cocoa/TextInputHandler.mm ++++ widget/cocoa/TextInputHandler.mm +@@ -1410,25 +1410,34 @@ TISInputSourceWrapper::ComputeGeckoKeyCode(UInt32 aNativeKeyCode, + return keyCode; + } + +- // If this is ASCII capable, give up to compute it. +- if (IsASCIICapable()) { +- return 0; ++ if (!IsASCIICapable()) { ++ // Retry with ASCII capable keyboard layout. ++ TISInputSourceWrapper currentKeyboardLayout; ++ currentKeyboardLayout.InitByCurrentASCIICapableKeyboardLayout(); ++ NS_ENSURE_TRUE(mInputSource != currentKeyboardLayout.mInputSource, 0); ++ keyCode = currentKeyboardLayout.ComputeGeckoKeyCode(aNativeKeyCode, aKbType, ++ aCmdIsPressed); ++ // We've returned 0 for long time if keyCode isn't for an alphabet keys or ++ // a numeric key even in alternative ASCII capable keyboard layout because ++ // we decided that we should avoid setting same keyCode value to 2 or ++ // more keys since active keyboard layout may have a key to input the ++ // punctuation with different key. However, setting keyCode to 0 makes ++ // some web applications which are aware of neither KeyboardEvent.key nor ++ // KeyboardEvent.code not work with Firefox when user selects non-ASCII ++ // capable keyboard layout such as Russian and Thai. So, if alternative ++ // ASCII capable keyboard layout has keyCode value for the key, we should ++ // use it. In other words, this behavior does that non-ASCII capable ++ // keyboard layout overrides some keys' keyCode value only if the key ++ // produces ASCII character by itself or with Shift key. ++ if (keyCode) { ++ return keyCode; ++ } + } + +- // Retry with ASCII capable keyboard layout. +- TISInputSourceWrapper currentKeyboardLayout; +- currentKeyboardLayout.InitByCurrentASCIICapableKeyboardLayout(); +- NS_ENSURE_TRUE(mInputSource != currentKeyboardLayout.mInputSource, 0); +- keyCode = currentKeyboardLayout.ComputeGeckoKeyCode(aNativeKeyCode, aKbType, +- aCmdIsPressed); +- +- // However, if keyCode isn't for an alphabet keys or a numeric key, we should +- // ignore it. For example, comma key of Thai layout is same as close-square- +- // bracket key of US layout and an unicode character key of Thai layout is +- // same as comma key of US layout. If we return NS_VK_COMMA for latter key, +- // web application developers cannot distinguish with the former key. +- return ((keyCode >= NS_VK_A && keyCode <= NS_VK_Z) || +- (keyCode >= NS_VK_0 && keyCode <= NS_VK_9)) ? keyCode : 0; ++ // Otherwise, let's decide keyCode value from the native virtual keycode ++ // value on major keyboard layout. ++ CodeNameIndex code = ComputeGeckoCodeNameIndex(aNativeKeyCode, aKbType); ++ return WidgetKeyboardEvent::GetFallbackKeyCodeOfPunctuationKey(code); + } + + // static +diff --git widget/gtk/nsGtkKeyUtils.cpp widget/gtk/nsGtkKeyUtils.cpp +index bda2c2920248..a336c1ad6c92 100644 +--- widget/gtk/nsGtkKeyUtils.cpp ++++ widget/gtk/nsGtkKeyUtils.cpp +@@ -795,7 +795,7 @@ KeymapWrapper::ComputeDOMKeyCode(const GdkEventKey* aGdkKeyEvent) + + // If the unmodified character is not an ASCII character, that means we + // couldn't find the hint. We should reset it. +- if (unmodifiedChar > 0x7F) { ++ if (!IsPrintableASCIICharacter(unmodifiedChar)) { + unmodifiedChar = 0; + } + +@@ -814,7 +814,7 @@ KeymapWrapper::ComputeDOMKeyCode(const GdkEventKey* aGdkKeyEvent) + + // If the shifted unmodified character isn't an ASCII character, we should + // discard it too. +- if (shiftedChar > 0x7F) { ++ if (!IsPrintableASCIICharacter(shiftedChar)) { + shiftedChar = 0; + } + +@@ -822,14 +822,12 @@ KeymapWrapper::ComputeDOMKeyCode(const GdkEventKey* aGdkKeyEvent) + // look for ASCII alphabet inputtable keyboard layout. If the key + // inputs an ASCII alphabet or an ASCII numeric, we should use it + // for deciding our keyCode. +- // Note that it's important not to use alternative keyboard layout for ASCII +- // alphabet inputabble keyboard layout because the keycode for the key with +- // alternative keyboard layout may conflict with another key on current +- // keyboard layout. ++ uint32_t unmodCharLatin = 0; ++ uint32_t shiftedCharLatin = 0; + if (!keymapWrapper->IsLatinGroup(aGdkKeyEvent->group)) { + gint minGroup = keymapWrapper->GetFirstLatinGroup(); + if (minGroup >= 0) { +- uint32_t unmodCharLatin = ++ unmodCharLatin = + keymapWrapper->GetCharCodeFor(aGdkKeyEvent, baseState, + minGroup); + if (IsBasicLatinLetterOrNumeral(unmodCharLatin)) { +@@ -837,7 +835,13 @@ KeymapWrapper::ComputeDOMKeyCode(const GdkEventKey* aGdkKeyEvent) + // an ASCII numeric, we should use it for the keyCode. + return WidgetUtils::ComputeKeyCodeFromChar(unmodCharLatin); + } +- uint32_t shiftedCharLatin = ++ // If the unmodified character in the alternative ASCII capable ++ // keyboard layout isn't an ASCII character, that means we couldn't ++ // find the hint. We should reset it. ++ if (!IsPrintableASCIICharacter(unmodCharLatin)) { ++ unmodCharLatin = 0; ++ } ++ shiftedCharLatin = + keymapWrapper->GetCharCodeFor(aGdkKeyEvent, shiftState, + minGroup); + if (IsBasicLatinLetterOrNumeral(shiftedCharLatin)) { +@@ -845,16 +849,46 @@ KeymapWrapper::ComputeDOMKeyCode(const GdkEventKey* aGdkKeyEvent) + // numeric, we should use it for the keyCode. + return WidgetUtils::ComputeKeyCodeFromChar(shiftedCharLatin); + } ++ // If the shifted unmodified character in the alternative ASCII ++ // capable keyboard layout isn't an ASCII character, we should ++ // discard it too. ++ if (!IsPrintableASCIICharacter(shiftedCharLatin)) { ++ shiftedCharLatin = 0; ++ } + } + } + +- // If unmodified character is in ASCII range, use it. Otherwise, use +- // shifted character. +- if (!unmodifiedChar && !shiftedChar) { +- return 0; +- } +- return WidgetUtils::ComputeKeyCodeFromChar( +- unmodifiedChar ? unmodifiedChar : shiftedChar); ++ // If the key itself or with Shift state on active keyboard layout produces ++ // an ASCII punctuation character, we should decide keyCode value with it. ++ if (unmodifiedChar || shiftedChar) { ++ return WidgetUtils::ComputeKeyCodeFromChar( ++ unmodifiedChar ? unmodifiedChar : shiftedChar); ++ } ++ ++ // If the key itself or with Shift state on alternative ASCII capable ++ // keyboard layout produces an ASCII punctuation character, we should ++ // decide keyCode value with it. Note that We've returned 0 for long ++ // time if keyCode isn't for an alphabet keys or a numeric key even in ++ // alternative ASCII capable keyboard layout because we decided that we ++ // should avoid setting same keyCode value to 2 or more keys since active ++ // keyboard layout may have a key to input the punctuation with different ++ // key. However, setting keyCode to 0 makes some web applications which ++ // are aware of neither KeyboardEvent.key nor KeyboardEvent.code not work ++ // with Firefox when user selects non-ASCII capable keyboard layout such ++ // as Russian and Thai. So, if alternative ASCII capable keyboard layout ++ // has keyCode value for the key, we should use it. In other words, this ++ // behavior means that non-ASCII capable keyboard layout overrides some ++ // keys' keyCode value only if the key produces ASCII character by itself ++ // or with Shift key. ++ if (unmodCharLatin || shiftedCharLatin) { ++ return WidgetUtils::ComputeKeyCodeFromChar( ++ unmodCharLatin ? unmodCharLatin : shiftedCharLatin); ++ } ++ ++ // Otherwise, let's decide keyCode value from the hardware_keycode ++ // value on major keyboard layout. ++ CodeNameIndex code = ComputeDOMCodeNameIndex(aGdkKeyEvent); ++ return WidgetKeyboardEvent::GetFallbackKeyCodeOfPunctuationKey(code); + } + + KeyNameIndex +diff --git widget/gtk/nsGtkKeyUtils.h widget/gtk/nsGtkKeyUtils.h +index 480d02322752..3dc8a4f6a936 100644 +--- widget/gtk/nsGtkKeyUtils.h ++++ widget/gtk/nsGtkKeyUtils.h +@@ -337,6 +337,16 @@ protected: + */ + static bool IsBasicLatinLetterOrNumeral(uint32_t aCharCode); + ++ /** ++ * IsPrintableASCIICharacter() checks whether the aCharCode is a printable ++ * ASCII character. I.e., returns false if aCharCode is a control ++ * character even in an ASCII character. ++ */ ++ static bool IsPrintableASCIICharacter(uint32_t aCharCode) ++ { ++ return aCharCode >= 0x20 && aCharCode <= 0x7E; ++ } ++ + /** + * GetGDKKeyvalWithoutModifier() returns the keyval for aGdkKeyEvent when + * ignoring the modifier state except NumLock. (NumLock is a key to change +diff --git widget/tests/test_keycodes.xul widget/tests/test_keycodes.xul +index 8a935e74a7f4..db789e8be367 100644 +--- widget/tests/test_keycodes.xul ++++ widget/tests/test_keycodes.xul +@@ -494,7 +494,7 @@ function* runKeyEventTests() + "a", "KeyA", nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_GERMAN, keyCode:MAC_VK_ANSI_LeftBracket, + modifiers: {}, chars:"\u00fc", unmodifiedChars:"\u00fc"}, +- "\u00fc", "BracketLeft", 0, "\u00fc", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "\u00fc", "BracketLeft", nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "\u00fc", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_GERMAN, keyCode:MAC_VK_ANSI_Minus, + modifiers: {}, chars:"\u00df", unmodifiedChars:"\u00df"}, + "\u00df", "Minus", nsIDOMKeyEvent.DOM_VK_QUESTION_MARK, "\u00df", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); +@@ -2737,10 +2737,9 @@ function* runKeyEventTests() + yield testKey({layout:KEYBOARD_LAYOUT_THAI, keyCode:MAC_VK_ANSI_Quote, + modifiers:{}, chars:"\u0E07", unmodifiedChars:"\u0E07"}, + "\u0E07", "Quote", nsIDOMKeyEvent.DOM_VK_PERIOD, "\u0E07", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); +- // keycode should be zero if the character of the key on the latest ASCII capable keyboard layout isn't for alphabet + yield testKey({layout:KEYBOARD_LAYOUT_THAI, keyCode:MAC_VK_ANSI_Period, + modifiers:{}, chars:"\u0E43", unmodifiedChars:"\u0E43"}, +- "\u0E43", "Period", 0, "\u0E43", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "\u0E43", "Period", nsIDOMKeyEvent.DOM_VK_PERIOD, "\u0E43", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + // keycode should be DOM_VK_[0-9] if the key on the latest ASCII capable keyboard layout is for numeric + yield testKey({layout:KEYBOARD_LAYOUT_THAI, keyCode:MAC_VK_ANSI_1, + modifiers:{}, chars:"\u0E45", unmodifiedChars:"\u0E45"}, +@@ -4129,12 +4128,14 @@ function* runKeyEventTests() + "\u00E7", "Digit9", nsIDOMKeyEvent.DOM_VK_9, "\u00E7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + + // OEM keys ++ // If the key doesn't cause ASCII character even with or without Shift key, keyCode value should be same as ++ // the key which causes the virtual keycode on ANSI keyboard layout. + yield testKey({layout:KEYBOARD_LAYOUT_FRENCH, keyCode:WIN_VK_OEM_7, + modifiers:{}, chars:"\u00B2"}, +- "\u00B2", "Backquote", 0, "\u00B2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "\u00B2", "Backquote", nsIDOMKeyEvent.DOM_VK_QUOTE, "\u00B2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_FRENCH, keyCode:WIN_VK_OEM_7, + modifiers:{shiftKey:1}, chars:""}, +- "", "Backquote", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "", "Backquote", nsIDOMKeyEvent.DOM_VK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_FRENCH, keyCode:WIN_VK_OEM_4, + modifiers:{}, chars:")"}, + ")", "Minus", nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, ")", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); +@@ -4205,10 +4206,10 @@ function* runKeyEventTests() + // OEM keys with ShiftLock + yield testKey({layout:KEYBOARD_LAYOUT_FRENCH, keyCode:WIN_VK_OEM_7, + modifiers:{capsLockKey:1}, chars:"\u00B2"}, +- "\u00B2", "Backquote", 0, "\u00B2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "\u00B2", "Backquote", nsIDOMKeyEvent.DOM_VK_QUOTE, "\u00B2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_FRENCH, keyCode:WIN_VK_OEM_7, + modifiers:{capsLockKey:1, shiftKey:1}, chars:""}, +- "", "Backquote", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "", "Backquote", nsIDOMKeyEvent.DOM_VK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_FRENCH, keyCode:WIN_VK_OEM_4, + modifiers:{capsLockKey:1}, chars:"\u00B0"}, + "\u00B0", "Minus", nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, "\u00B0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); +@@ -4223,10 +4224,10 @@ function* runKeyEventTests() + "=", "Equal", nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + //yield testKey({layout:KEYBOARD_LAYOUT_FRENCH, keyCode:WIN_VK_OEM_6, + // modifiers:{capsLockKey:1}, chars:""}, +- // "Dead", "BracketLeft", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Dead-key ++ // "Dead", "BracketLeft", nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Dead-key + //yield testKey({layout:KEYBOARD_LAYOUT_FRENCH, keyCode:WIN_VK_OEM_6, + // modifiers:{capsLockKey:1, shiftKey:1}, chars:""}, +- // ["\u00A8\u00A8", "\u00A8", "\u00A8", "\u00A8"], "BracketLeft", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Dead-key ++ // ["\u00A8\u00A8", "\u00A8", "\u00A8", "\u00A8"], "BracketLeft", nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Dead-key + yield testKey({layout:KEYBOARD_LAYOUT_FRENCH, keyCode:WIN_VK_OEM_1, + modifiers:{capsLockKey:1}, chars:"\u00A3"}, + "\u00A3", "BracketRight", nsIDOMKeyEvent.DOM_VK_DOLLAR, "\u00A3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); +@@ -4496,56 +4497,56 @@ function* runKeyEventTests() + + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_OEM_7, + modifiers:{}, chars:""}, +- "Dead", "Quote", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "Dead", "Quote", nsIDOMKeyEvent.DOM_VK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_OEM_7, + modifiers:{}, chars:"\u00B4\u00B4"}, +- ["\u00B4\u00B4", "\u00B4", "\u00B4", "\u00B4"], "Quote", 0, "\u00B4\u00B4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ ["\u00B4\u00B4", "\u00B4", "\u00B4", "\u00B4"], "Quote", nsIDOMKeyEvent.DOM_VK_QUOTE, "\u00B4\u00B4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_OEM_7, + modifiers:{}, chars:""}, +- "Dead", "Quote", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "Dead", "Quote", nsIDOMKeyEvent.DOM_VK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_A, + modifiers:{}, chars:"\u00E1"}, + ["\u00E1", "\u00E1", "a"], "KeyA", nsIDOMKeyEvent.DOM_VK_A, "\u00E1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_OEM_7, + modifiers:{}, chars:""}, +- "Dead", "Quote", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "Dead", "Quote", nsIDOMKeyEvent.DOM_VK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_A, + modifiers:{shiftKey:1}, chars:"\u00C1"}, + ["\u00C1", "\u00C1", "A"], "KeyA", nsIDOMKeyEvent.DOM_VK_A, "\u00C1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_OEM_7, + modifiers:{}, chars:""}, +- "Dead", "Quote", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "Dead", "Quote", nsIDOMKeyEvent.DOM_VK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_Q, + modifiers:{}, chars:"\u00B4q"}, + ["\u00B4q", "\u00B4", "q", "q"], "KeyQ", nsIDOMKeyEvent.DOM_VK_Q, "\u00B4q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_OEM_7, + modifiers:{shiftKey:1}, chars:""}, +- "Dead", "Quote", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "Dead", "Quote", nsIDOMKeyEvent.DOM_VK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_OEM_7, + modifiers:{shiftKey:1}, chars:"\u00A8\u00A8"}, +- ["\u00A8\u00A8", "\u00A8", "\u00A8", "\u00A8"], "Quote", 0, "\u00A8\u00A8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ ["\u00A8\u00A8", "\u00A8", "\u00A8", "\u00A8"], "Quote", nsIDOMKeyEvent.DOM_VK_QUOTE, "\u00A8\u00A8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_OEM_7, + modifiers:{shiftKey:1}, chars:""}, +- "Dead", "Quote", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "Dead", "Quote", nsIDOMKeyEvent.DOM_VK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_A, + modifiers:{shiftKey:1}, chars:"\u00C4"}, + ["\u00C4", "\u00C4", "A"], "KeyA", nsIDOMKeyEvent.DOM_VK_A, "\u00C4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_OEM_7, + modifiers:{shiftKey:1}, chars:""}, +- "Dead", "Quote", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "Dead", "Quote", nsIDOMKeyEvent.DOM_VK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_A, + modifiers:{}, chars:"\u00E4"}, + ["\u00E4", "\u00E4", "a"], "KeyA", nsIDOMKeyEvent.DOM_VK_A, "\u00E4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_OEM_7, + modifiers:{shiftKey:1}, chars:""}, +- "Dead", "Quote", 0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); ++ "Dead", "Quote", nsIDOMKeyEvent.DOM_VK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); + yield testKey({layout:KEYBOARD_LAYOUT_SPANISH, keyCode:WIN_VK_Q, + modifiers:{shiftKey:1}, chars:"\u00A8Q"}, + ["\u00A8Q", "\u00A8", "Q", "Q"], "KeyQ", nsIDOMKeyEvent.DOM_VK_Q, "\u00A8Q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); +diff --git widget/windows/KeyboardLayout.cpp widget/windows/KeyboardLayout.cpp +index e29c0b0655d9..947e914e4bef 100644 +--- widget/windows/KeyboardLayout.cpp ++++ widget/windows/KeyboardLayout.cpp +@@ -4721,7 +4721,75 @@ KeyboardLayout::ConvertNativeKeyCodeToDOMKeyCode(UINT aNativeKeyCode) const + uniChars = GetUniCharsAndModifiers(aNativeKeyCode, modKeyState); + if (uniChars.Length() != 1 || + uniChars.CharAt(0) < ' ' || uniChars.CharAt(0) > 0x7F) { +- return 0; ++ // In this case, we've returned 0 in this case for long time because ++ // we decided that we should avoid setting same keyCode value to 2 or ++ // more keys since active keyboard layout may have a key to input the ++ // punctuation with different key. However, setting keyCode to 0 ++ // makes some web applications which are aware of neither ++ // KeyboardEvent.key nor KeyboardEvent.code not work with Firefox ++ // when user selects non-ASCII capable keyboard layout such as ++ // Russian and Thai layout. So, let's decide keyCode value with ++ // major keyboard layout's key which causes the OEM keycode. ++ // Actually, this maps same keyCode value to 2 keys on Russian ++ // keyboard layout. "Period" key causes VK_OEM_PERIOD but inputs ++ // Yu of Cyrillic and "Slash" key causes VK_OEM_2 (same as US ++ // keyboard layout) but inputs "." (period of ASCII). Therefore, ++ // we return DOM_VK_PERIOD which is same as VK_OEM_PERIOD for ++ // "Period" key. On the other hand, we use same keyCode value for ++ // "Slash" key too because it inputs ".". ++ CodeNameIndex code; ++ switch (aNativeKeyCode) { ++ case VK_OEM_1: ++ code = CODE_NAME_INDEX_Semicolon; ++ break; ++ case VK_OEM_PLUS: ++ code = CODE_NAME_INDEX_Equal; ++ break; ++ case VK_OEM_COMMA: ++ code = CODE_NAME_INDEX_Comma; ++ break; ++ case VK_OEM_MINUS: ++ code = CODE_NAME_INDEX_Minus; ++ break; ++ case VK_OEM_PERIOD: ++ code = CODE_NAME_INDEX_Period; ++ break; ++ case VK_OEM_2: ++ code = CODE_NAME_INDEX_Slash; ++ break; ++ case VK_OEM_3: ++ code = CODE_NAME_INDEX_Backquote; ++ break; ++ case VK_OEM_4: ++ code = CODE_NAME_INDEX_BracketLeft; ++ break; ++ case VK_OEM_5: ++ code = CODE_NAME_INDEX_Backslash; ++ break; ++ case VK_OEM_6: ++ code = CODE_NAME_INDEX_BracketRight; ++ break; ++ case VK_OEM_7: ++ code = CODE_NAME_INDEX_Quote; ++ break; ++ case VK_OEM_8: ++ // Use keyCode value for "Backquote" key on UK keyboard layout. ++ code = CODE_NAME_INDEX_Backquote; ++ break; ++ case VK_OEM_102: ++ // Use keyCode value for "IntlBackslash" key. ++ code = CODE_NAME_INDEX_IntlBackslash; ++ break; ++ case VK_ABNT_C1: // "/" of ABNT. ++ // Use keyCode value for "IntlBackslash" key on ABNT keyboard ++ // layout. ++ code = CODE_NAME_INDEX_IntlBackslash; ++ break; ++ default: ++ MOZ_ASSERT_UNREACHABLE("Handle all OEM keycode values"); ++ return 0; ++ } ++ return WidgetKeyboardEvent::GetFallbackKeyCodeOfPunctuationKey(code); + } + } + return WidgetUtils::ComputeKeyCodeFromChar(uniChars.CharAt(0)); Copied: branches/2018Q1/www/waterfox/files/patch-bug1134077 (from r463037, head/www/waterfox/files/patch-bug1134077) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1134077 Mon Feb 26 18:57:17 2018 (r463038, copy of r463037, head/www/waterfox/files/patch-bug1134077) @@ -0,0 +1,65 @@ +commit a67756af6ac4 +Author: decltype +Date: Fri Feb 2 18:39:37 2018 +0100 + + Bug 1134077 - X11: Set EWMH property to keep top-level nsWindows composited. r=karlt + + Some compositors such as GNOME mutter use heuristics to unredirect fullscreen + windows in an effort to reduce output latency. This works fine for applications + that take the proper steps to ensure all framebuffer updates happen in the + vblank interval. Since this is not currently the case for Firefox, bypassing + the compositor will lead to frame tearing. + + Set _NET_WM_BYPASS_COMPOSITOR to 2 to opt out of fullscreen unredirection. + + MozReview-Commit-ID: 1xW2VAnbiJw + + --HG-- + extra : rebase_source : 77c4ae490413057d8d9dadf9b155c86ddbbcb4b5 +--- + widget/gtk/mozgtk/mozgtk.c | 1 + + widget/gtk/nsWindow.cpp | 19 +++++++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git widget/gtk/mozgtk/mozgtk.c widget/gtk/mozgtk/mozgtk.c +index a182d9b278e7..023cd192d522 100644 +--- widget/gtk/mozgtk/mozgtk.c ++++ widget/gtk/mozgtk/mozgtk.c +@@ -52,6 +52,7 @@ STUB(gdk_keyval_to_unicode) + STUB(gdk_pango_context_get) + STUB(gdk_pointer_grab) + STUB(gdk_pointer_ungrab) ++STUB(gdk_property_change) + STUB(gdk_property_get) + STUB(gdk_screen_get_default) + STUB(gdk_screen_get_display) +diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp +index 0e75cc8c5968..b59ac05dd3c4 100644 +--- widget/gtk/nsWindow.cpp ++++ widget/gtk/nsWindow.cpp +@@ -3803,6 +3803,25 @@ nsWindow::Create(nsIWidget* aParent, + cairo_region_destroy(region); + } + } ++ ++#ifdef MOZ_X11 ++ // Set window manager hint to keep fullscreen windows composited. ++ // ++ // If the window were to get unredirected, there could be visible ++ // tearing because Gecko does not align its framebuffer updates with ++ // vblank. ++ if (mIsX11Display) { ++ gulong value = 2; // Opt out of unredirection ++ GdkAtom cardinal_atom = gdk_x11_xatom_to_atom(XA_CARDINAL); ++ gdk_property_change(gtk_widget_get_window(mShell), ++ gdk_atom_intern("_NET_WM_BYPASS_COMPOSITOR", FALSE), ++ cardinal_atom, ++ 32, // format ++ GDK_PROP_MODE_REPLACE, ++ (guchar*)&value, ++ 1); ++ } ++#endif + } + break; + Copied: branches/2018Q1/www/waterfox/files/patch-bug1314928 (from r463037, head/www/waterfox/files/patch-bug1314928) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1314928 Mon Feb 26 18:57:17 2018 (r463038, copy of r463037, head/www/waterfox/files/patch-bug1314928) @@ -0,0 +1,64 @@ +commit 4cb65b680138 +Author: Martin Stransky +Date: Fri Aug 25 10:30:28 2017 +0200 + + Bug 1314928 - get link text color by GTK_STATE_FLAG_LINK on Gtk3 >= 3.12, r=karlt + + MozReview-Commit-ID: BPR2AgoUx5H + + --HG-- + extra : rebase_source : c4670cd6b7df84dd00a4d04c3bfc582f917795da +--- + widget/gtk/nsLookAndFeel.cpp | 32 ++++++++++++++++++++++++-------- + 1 file changed, 24 insertions(+), 8 deletions(-) + +diff --git widget/gtk/nsLookAndFeel.cpp widget/gtk/nsLookAndFeel.cpp +index 7cd8e8dcc163..6bb3e27c6653 100644 +--- widget/gtk/nsLookAndFeel.cpp ++++ widget/gtk/nsLookAndFeel.cpp +@@ -43,6 +43,10 @@ using mozilla::LookAndFeel; + ((nscolor) NS_RGBA((int)((c).red*255), (int)((c).green*255), \ + (int)((c).blue*255), (int)((c).alpha*255))) + ++#if !GTK_CHECK_VERSION(3,12,0) ++#define GTK_STATE_FLAG_LINK (static_cast(1 << 9)) ++#endif ++ + nsLookAndFeel::nsLookAndFeel() + : nsXPLookAndFeel(), + #if (MOZ_WIDGET_GTK == 2) +@@ -1457,14 +1461,26 @@ nsLookAndFeel::EnsureInit() + } + sMenuSupportsDrag = supports_menubar_drag; + +- colorValuePtr = nullptr; +- gtk_widget_style_get(linkButton, "link-color", &colorValuePtr, nullptr); +- if (colorValuePtr) { +- colorValue = *colorValuePtr; // we can't pass deref pointers to GDK_COLOR_TO_NS_RGB +- sNativeHyperLinkText = GDK_COLOR_TO_NS_RGB(colorValue); +- gdk_color_free(colorValuePtr); +- } else { +- sNativeHyperLinkText = NS_RGB(0x00,0x00,0xEE); ++#if (MOZ_WIDGET_GTK == 3) ++ if (gtk_check_version(3, 12, 0) == nullptr) { ++ // TODO: It returns wrong color for themes which ++ // sets link color for GtkLabel only as we query ++ // GtkLinkButton style here. ++ style = gtk_widget_get_style_context(linkButton); ++ gtk_style_context_get_color(style, GTK_STATE_FLAG_LINK, &color); ++ sNativeHyperLinkText = GDK_RGBA_TO_NS_RGBA(color); ++ } else ++#endif ++ { ++ colorValuePtr = nullptr; ++ gtk_widget_style_get(linkButton, "link-color", &colorValuePtr, nullptr); ++ if (colorValuePtr) { ++ colorValue = *colorValuePtr; // we can't pass deref pointers to GDK_COLOR_TO_NS_RGB ++ sNativeHyperLinkText = GDK_COLOR_TO_NS_RGB(colorValue); ++ gdk_color_free(colorValuePtr); ++ } else { ++ sNativeHyperLinkText = NS_RGB(0x00,0x00,0xEE); ++ } + } + + // invisible character styles Copied: branches/2018Q1/www/waterfox/files/patch-bug1360278 (from r463037, head/www/waterfox/files/patch-bug1360278) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1360278 Mon Feb 26 18:57:17 2018 (r463038, copy of r463037, head/www/waterfox/files/patch-bug1360278) @@ -0,0 +1,184 @@ +commit 5d127ad3bd50 +Author: Robin Grenet +Date: Thu Nov 16 13:35:58 2017 +0100 + + Bug 1360278 - Add preference to trigger context menu on mouse up for GTK+ and macOS, r=mstange,smaug a=gchang + + MozReview-Commit-ID: Bg60bD8jIg6 + + --HG-- + extra : source : f540f9e801cb2e0be5259baea13dfce953ccb520 +--- + modules/libpref/init/all.js | 4 ++++ + widget/cocoa/nsChildView.mm | 23 +++++++++++++++++++++-- + widget/gtk/nsWindow.cpp | 27 ++++++++++++++++++++------- + widget/gtk/nsWindow.h | 2 ++ + widget/nsBaseWidget.cpp | 16 ++++++++++++++++ + widget/nsBaseWidget.h | 6 ++++++ + 6 files changed, 69 insertions(+), 9 deletions(-) + +diff --git modules/libpref/init/all.js modules/libpref/init/all.js +index f9402630cf27..97ece9f13467 100644 +--- modules/libpref/init/all.js ++++ modules/libpref/init/all.js +@@ -234,6 +234,10 @@ pref("browser.sessionhistory.max_total_viewers", -1); + + pref("ui.use_native_colors", true); + pref("ui.click_hold_context_menus", false); ++ ++// Pop up context menu on mouseup instead of mousedown, if that's the OS default. ++// Note: ignored on Windows (context menus always use mouseup) ++pref("ui.context_menus.after_mouseup", false); + // Duration of timeout of incremental search in menus (ms). 0 means infinite. + pref("ui.menu.incremental_search.timeout", 1000); + // If true, all popups won't hide automatically on blur +diff --git widget/cocoa/nsChildView.mm widget/cocoa/nsChildView.mm +index cac897327a19..bf42b4f8c095 100644 +--- widget/cocoa/nsChildView.mm ++++ widget/cocoa/nsChildView.mm +@@ -4700,8 +4700,10 @@ NSEvent* gLastDragMouseDownEvent = nil; + if (!mGeckoChild) + return; + +- // Let the superclass do the context menu stuff. +- [super rightMouseDown:theEvent]; ++ if (!nsBaseWidget::ShowContextMenuAfterMouseUp()) { ++ // Let the superclass do the context menu stuff. ++ [super rightMouseDown:theEvent]; ++ } + + NS_OBJC_END_TRY_ABORT_BLOCK; + } +@@ -4724,6 +4726,23 @@ NSEvent* gLastDragMouseDownEvent = nil; + + nsAutoRetainCocoaObject kungFuDeathGrip(self); + mGeckoChild->DispatchInputEvent(&geckoEvent); ++ if (!mGeckoChild) ++ return; ++ ++ if (nsBaseWidget::ShowContextMenuAfterMouseUp()) { ++ // Let the superclass do the context menu stuff, but pretend it's rightMouseDown. ++ NSEvent *dupeEvent = [NSEvent mouseEventWithType:NSRightMouseDown ++ location:theEvent.locationInWindow ++ modifierFlags:theEvent.modifierFlags ++ timestamp:theEvent.timestamp ++ windowNumber:theEvent.windowNumber ++ context:theEvent.context ++ eventNumber:theEvent.eventNumber ++ clickCount:theEvent.clickCount ++ pressure:theEvent.pressure]; ++ ++ [super rightMouseDown:dupeEvent]; ++ } + + NS_OBJC_END_TRY_ABORT_BLOCK; + } +diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp +index c3da6dc00b0c..c220d0bb2192 100644 +--- widget/gtk/nsWindow.cpp ++++ widget/gtk/nsWindow.cpp +@@ -2737,6 +2737,19 @@ static guint ButtonMaskFromGDKButton(guint button) + return GDK_BUTTON1_MASK << (button - 1); + } + ++void ++nsWindow::DispatchContextMenuEventFromMouseEvent(uint16_t domButton, ++ GdkEventButton *aEvent) ++{ ++ if (domButton == WidgetMouseEvent::eRightButton && MOZ_LIKELY(!mIsDestroyed)) { ++ WidgetMouseEvent contextMenuEvent(true, eContextMenu, this, ++ WidgetMouseEvent::eReal); ++ InitButtonEvent(contextMenuEvent, aEvent); ++ contextMenuEvent.pressure = mLastMotionPressure; ++ DispatchInputEvent(&contextMenuEvent); ++ } ++} ++ + void + nsWindow::OnButtonPressEvent(GdkEventButton *aEvent) + { +@@ -2806,13 +2819,8 @@ nsWindow::OnButtonPressEvent(GdkEventButton *aEvent) + DispatchInputEvent(&event); + + // right menu click on linux should also pop up a context menu +- if (domButton == WidgetMouseEvent::eRightButton && +- MOZ_LIKELY(!mIsDestroyed)) { +- WidgetMouseEvent contextMenuEvent(true, eContextMenu, this, +- WidgetMouseEvent::eReal); +- InitButtonEvent(contextMenuEvent, aEvent); +- contextMenuEvent.pressure = mLastMotionPressure; +- DispatchInputEvent(&contextMenuEvent); ++ if (!nsBaseWidget::ShowContextMenuAfterMouseUp()) { ++ DispatchContextMenuEventFromMouseEvent(domButton, aEvent); + } + } + +@@ -2848,6 +2856,11 @@ nsWindow::OnButtonReleaseEvent(GdkEventButton *aEvent) + + DispatchInputEvent(&event); + mLastMotionPressure = pressure; ++ ++ // right menu click on linux should also pop up a context menu ++ if (nsBaseWidget::ShowContextMenuAfterMouseUp()) { ++ DispatchContextMenuEventFromMouseEvent(domButton, aEvent); ++ } + } + + void +diff --git widget/gtk/nsWindow.h widget/gtk/nsWindow.h +index 0fafc8994579..7a28e3260c0f 100644 +--- widget/gtk/nsWindow.h ++++ widget/gtk/nsWindow.h +@@ -245,6 +245,8 @@ private: + + void UpdateClientOffset(); + ++ void DispatchContextMenuEventFromMouseEvent(uint16_t domButton, ++ GdkEventButton *aEvent); + public: + void ThemeChanged(void); + void OnDPIChanged(void); +diff --git widget/nsBaseWidget.cpp widget/nsBaseWidget.cpp +index c0694714c69d..4a1320fe23d5 100644 +--- widget/nsBaseWidget.cpp ++++ widget/nsBaseWidget.cpp +@@ -1218,6 +1218,22 @@ nsBaseWidget::DispatchEventToAPZOnly(mozilla::WidgetInputEvent* aEvent) + } + } + ++// static ++bool ++nsBaseWidget::ShowContextMenuAfterMouseUp() ++{ ++ static bool gContextMenuAfterMouseUp = false; ++ static bool gContextMenuAfterMouseUpCached = false; ++ if (!gContextMenuAfterMouseUpCached) { ++ Preferences::AddBoolVarCache(&gContextMenuAfterMouseUp, ++ "ui.context_menus.after_mouseup", ++ false); ++ ++ gContextMenuAfterMouseUpCached = true; ++ } ++ return gContextMenuAfterMouseUp; ++} ++ + nsIDocument* + nsBaseWidget::GetDocument() const + { +diff --git widget/nsBaseWidget.h widget/nsBaseWidget.h +index f4e8e3d78330..3cb56f38b6ce 100644 +--- widget/nsBaseWidget.h ++++ widget/nsBaseWidget.h +@@ -417,6 +417,12 @@ public: + void RecvScreenPixels(mozilla::ipc::Shmem&& aMem, const ScreenIntSize& aSize) override {}; + #endif + ++ /** ++ * Whether context menus should only appear on mouseup instead of mousedown, ++ * on OSes where they normally appear on mousedown (macOS, *nix). ++ */ ++ static bool ShowContextMenuAfterMouseUp(); ++ + protected: + // These are methods for CompositorWidgetWrapper, and should only be + // accessed from that class. Derived widgets can choose which methods to Copied: branches/2018Q1/www/waterfox/files/patch-bug1381815 (from r463037, head/www/waterfox/files/patch-bug1381815) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1381815 Mon Feb 26 18:57:17 2018 (r463038, copy of r463037, head/www/waterfox/files/patch-bug1381815) @@ -0,0 +1,278 @@ +commit 165fab2f8596 +Author: Jan Horak +Date: Tue Oct 10 13:35:56 2017 +0200 + + Bug 1381815 - fixing dimensions of radio and checkbox for GTK 3.20+; r=karlt + + In the GTK < 3.20 the size of radio and checkbox toggle is determined by indicator + spacing and indicator size. By GTK 3.20+ it is replaced by standard box model + (padding, margin, border). The patch fixes that while keeping the functionality + for older GTK. The values are also cached by similar way as scrollbar metrics + are cached now. + + The focus is no longer rendered by GTK but by Mozilla code, so the extra + size for toggles has been removed from GetExtraSizeForWidget and toggles + no longer render focus indicator. + + MozReview-Commit-ID: 1Wg5AgHy1Vz + + --HG-- + extra : rebase_source : 81437f45b7d32555942d21fccc9de4a561d85111 +--- + widget/gtk/gtk3drawing.cpp | 121 ++++++++++++++++++++++++++++++---------- + widget/gtk/gtkdrawing.h | 14 +++++ + widget/gtk/nsNativeThemeGTK.cpp | 32 +---------- + 3 files changed, 107 insertions(+), 60 deletions(-) + +diff --git widget/gtk/gtk3drawing.cpp widget/gtk/gtk3drawing.cpp +index 4c562b380095..7968aef920f6 100644 +--- widget/gtk/gtk3drawing.cpp ++++ widget/gtk/gtk3drawing.cpp +@@ -22,6 +22,8 @@ static gboolean checkbox_check_state; + static gboolean notebook_has_tab_gap; + + static ScrollbarGTKMetrics sScrollbarMetrics[2]; ++static ToggleGTKMetrics sCheckboxMetrics; ++static ToggleGTKMetrics sRadioMetrics; + + #define ARROW_UP 0 + #define ARROW_DOWN G_PI +@@ -110,6 +112,8 @@ moz_gtk_refresh() + + sScrollbarMetrics[GTK_ORIENTATION_HORIZONTAL].initialized = false; + sScrollbarMetrics[GTK_ORIENTATION_VERTICAL].initialized = false; ++ sCheckboxMetrics.initialized = false; ++ sRadioMetrics.initialized = false; + } + + gint +@@ -308,33 +312,21 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect, + gboolean isradio, GtkTextDirection direction) + { + GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); +- gint indicator_size, indicator_spacing; + gint x, y, width, height; +- gint focus_x, focus_y, focus_width, focus_height; + GtkStyleContext *style; + +- GtkWidget *widget = GetWidget(isradio ? MOZ_GTK_RADIOBUTTON_CONTAINER : +- MOZ_GTK_CHECKBUTTON_CONTAINER); +- gtk_widget_style_get(widget, +- "indicator_size", &indicator_size, +- "indicator_spacing", &indicator_spacing, +- nullptr); ++ const ToggleGTKMetrics* metrics = GetToggleMetrics(isradio); + + // XXX we should assert rect->height >= indicator_size too + // after bug 369581 is fixed. +- MOZ_ASSERT(rect->width >= indicator_size, ++ MOZ_ASSERT(rect->width >= metrics->minSizeWithBorder.width, + "GetMinimumWidgetSize was ignored"); + + // Paint it center aligned in the rect. +- x = rect->x + (rect->width - indicator_size) / 2; +- y = rect->y + (rect->height - indicator_size) / 2; +- width = indicator_size; +- height = indicator_size; +- +- focus_x = x - indicator_spacing; +- focus_y = y - indicator_spacing; +- focus_width = width + 2 * indicator_spacing; +- focus_height = height + 2 * indicator_spacing; ++ width = metrics->minSizeWithBorder.width; ++ height = metrics->minSizeWithBorder.height; ++ x = rect->x + (rect->width - width) / 2; ++ y = rect->y + (rect->height - height) / 2; + + if (selected) + state_flags = static_cast(state_flags|checkbox_check_state); +@@ -348,20 +340,25 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect, + if (gtk_check_version(3, 20, 0) == nullptr) { + gtk_render_background(style, cr, x, y, width, height); + gtk_render_frame(style, cr, x, y, width, height); +- } +- +- if (isradio) { +- gtk_render_option(style, cr, x, y, width, height); +- if (state->focused) { +- gtk_render_focus(style, cr, focus_x, focus_y, +- focus_width, focus_height); ++ // Indicator is inset by the toggle's padding and border. ++ gint indicator_x = x + metrics->borderAndPadding.left; ++ gint indicator_y = y + metrics->borderAndPadding.top; ++ gint indicator_width = metrics->minSizeWithBorder.width - ++ metrics->borderAndPadding.left - metrics->borderAndPadding.right; ++ gint indicator_height = metrics->minSizeWithBorder.height - ++ metrics->borderAndPadding.top - metrics->borderAndPadding.bottom; ++ if (isradio) { ++ gtk_render_option(style, cr, indicator_x, indicator_y, ++ indicator_width, indicator_height); ++ } else { ++ gtk_render_check(style, cr, indicator_x, indicator_y, ++ indicator_width, indicator_height); + } +- } +- else { +- gtk_render_check(style, cr, x, y, width, height); +- if (state->focused) { +- gtk_render_focus(style, cr, +- focus_x, focus_y, focus_width, focus_height); ++ } else { ++ if (isradio) { ++ gtk_render_option(style, cr, x, y, width, height); ++ } else { ++ gtk_render_check(style, cr, x, y, width, height); + } + } + +@@ -2514,6 +2511,68 @@ SizeFromLengthAndBreadth(GtkOrientation aOrientation, + MozGtkSize({aLength, aBreadth}) : MozGtkSize({aBreadth, aLength}); + } + ++const ToggleGTKMetrics* ++GetToggleMetrics(bool isRadio) ++{ ++ ToggleGTKMetrics* metrics; ++ if (isRadio) { ++ metrics = &sRadioMetrics; ++ } else { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Mon Feb 26 23:18:51 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00408F2BFCE; Mon, 26 Feb 2018 23:18:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A8A22720B1; Mon, 26 Feb 2018 23:18:50 +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 9F2FE22054; Mon, 26 Feb 2018 23:18:50 +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 w1QNIot6050468; Mon, 26 Feb 2018 23:18:50 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1QNIo0E050466; Mon, 26 Feb 2018 23:18:50 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802262318.w1QNIo0E050466@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 26 Feb 2018 23:18:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463100 - branches/2018Q1/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/emulators/rpcs3 X-SVN-Commit-Revision: 463100 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, 26 Feb 2018 23:18:51 -0000 Author: jbeich Date: Mon Feb 26 23:18:50 2018 New Revision: 463100 URL: https://svnweb.freebsd.org/changeset/ports/463100 Log: MFH: r463099 emulators/rpcs3: update to 0.0.5.4 Changes: https://github.com/RPCS3/rpcs3/compare/ede76033a...b61a69c87 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q1/emulators/rpcs3/Makefile branches/2018Q1/emulators/rpcs3/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q1/emulators/rpcs3/Makefile Mon Feb 26 23:14:20 2018 (r463099) +++ branches/2018Q1/emulators/rpcs3/Makefile Mon Feb 26 23:18:50 2018 (r463100) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-382 -DISTVERSIONSUFFIX= -gede76033a +DISTVERSION= 0.0.5-4 +DISTVERSIONSUFFIX= -gb61a69c87 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Mon Feb 26 23:14:20 2018 (r463099) +++ branches/2018Q1/emulators/rpcs3/distinfo Mon Feb 26 23:18:50 2018 (r463100) @@ -1,6 +1,6 @@ -TIMESTAMP = 1519425523 -SHA256 (RPCS3-rpcs3-v0.0.4-382-gede76033a_GH0.tar.gz) = 2a74415e5721cc0d961c22d52108ac2c9a8c010d4d679a5ba59a6d224c47663a -SIZE (RPCS3-rpcs3-v0.0.4-382-gede76033a_GH0.tar.gz) = 3860559 +TIMESTAMP = 1519576244 +SHA256 (RPCS3-rpcs3-v0.0.5-4-gb61a69c87_GH0.tar.gz) = 43e61975e83b4e32d30d7a86df7cd8be4d2a39bc3783388ca4d884b540a32bc5 +SIZE (RPCS3-rpcs3-v0.0.5-4-gb61a69c87_GH0.tar.gz) = 3860339 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841 From owner-svn-ports-branches@freebsd.org Tue Feb 27 00:27: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 AF151F3031C; Tue, 27 Feb 2018 00:27: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 5C70C74AAC; Tue, 27 Feb 2018 00:27: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 5705F22BBD; Tue, 27 Feb 2018 00:27: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 w1R0RVAC085359; Tue, 27 Feb 2018 00:27:31 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1R0RV8g085357; Tue, 27 Feb 2018 00:27:31 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802270027.w1R0RV8g085357@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 27 Feb 2018 00:27:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463104 - branches/2018Q1/games/openbor X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/games/openbor X-SVN-Commit-Revision: 463104 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, 27 Feb 2018 00:27:31 -0000 Author: jbeich Date: Tue Feb 27 00:27:30 2018 New Revision: 463104 URL: https://svnweb.freebsd.org/changeset/ports/463104 Log: MFH: r463103 games/openbor: update to 4615 Changes: https://github.com/DCurrent/openbor/compare/d73408f...11cd2c0 Approved by: ports-secteam (feld, implicit for snapshots) Modified: branches/2018Q1/games/openbor/Makefile branches/2018Q1/games/openbor/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/games/openbor/Makefile ============================================================================== --- branches/2018Q1/games/openbor/Makefile Tue Feb 27 00:26:38 2018 (r463103) +++ branches/2018Q1/games/openbor/Makefile Tue Feb 27 00:27:30 2018 (r463104) @@ -2,7 +2,7 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 4604 +PORTVERSION?= 4615 .ifndef PKGNAMESUFFIX PORTREVISION= 0 .endif @@ -31,7 +31,7 @@ PORTSCOUT= ignore:1 USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= d73408f +GH_TAGNAME?= 11cd2c0 USES+= gmake pkgconfig .if ${PORTVERSION} < 4433 Modified: branches/2018Q1/games/openbor/distinfo ============================================================================== --- branches/2018Q1/games/openbor/distinfo Tue Feb 27 00:26:38 2018 (r463103) +++ branches/2018Q1/games/openbor/distinfo Tue Feb 27 00:27:30 2018 (r463104) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519248328 -SHA256 (DCurrent-openbor-4604-d73408f_GH0.tar.gz) = 1827f54f3340782ca11e3c17e3c6623f9fb88112db510e89db917909842de656 -SIZE (DCurrent-openbor-4604-d73408f_GH0.tar.gz) = 107146873 +TIMESTAMP = 1519600961 +SHA256 (DCurrent-openbor-4615-11cd2c0_GH0.tar.gz) = 4e18b243bb97090f0d1dd42f99a8da1b050ae77dea303116e18ab3d4832f7346 +SIZE (DCurrent-openbor-4615-11cd2c0_GH0.tar.gz) = 107147337 From owner-svn-ports-branches@freebsd.org Tue Feb 27 21:13: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 BBBC3F29A0B; Tue, 27 Feb 2018 21:13:30 +0000 (UTC) (envelope-from joneum@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 7204070624; Tue, 27 Feb 2018 21:13:30 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6CE9C101A9; Tue, 27 Feb 2018 21:13:30 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1RLDUij013128; Tue, 27 Feb 2018 21:13:30 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1RLDUaP013126; Tue, 27 Feb 2018 21:13:30 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201802272113.w1RLDUaP013126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Tue, 27 Feb 2018 21:13:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463162 - branches/2018Q1/www/drupal7 X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: branches/2018Q1/www/drupal7 X-SVN-Commit-Revision: 463162 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, 27 Feb 2018 21:13:30 -0000 Author: joneum Date: Tue Feb 27 21:13:29 2018 New Revision: 463162 URL: https://svnweb.freebsd.org/changeset/ports/463162 Log: MFH: r462992 www/drupal7: Update to 7.57 Changelog: https://www.drupal.org/SA-CORE-2018-001 CVE-2017-6926 CVE-2017-6927 CVE-2017-6928 CVE-2017-6929 CVE-2017-6930 CVE-2017-6931 CVE-2017-6932 Security: 57580fcc-1a61-11e8-97e0-00e04c1ea73d Approved by: ports-secteam (riggs) Modified: branches/2018Q1/www/drupal7/Makefile branches/2018Q1/www/drupal7/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/drupal7/Makefile ============================================================================== --- branches/2018Q1/www/drupal7/Makefile Tue Feb 27 20:55:28 2018 (r463161) +++ branches/2018Q1/www/drupal7/Makefile Tue Feb 27 21:13:29 2018 (r463162) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drupal7 -PORTVERSION= 7.56 +DISTVERSION= 7.57 CATEGORIES= www MASTER_SITES= http://ftp.drupal.org/files/projects/ DISTNAME= drupal-${PORTVERSION} Modified: branches/2018Q1/www/drupal7/distinfo ============================================================================== --- branches/2018Q1/www/drupal7/distinfo Tue Feb 27 20:55:28 2018 (r463161) +++ branches/2018Q1/www/drupal7/distinfo Tue Feb 27 21:13:29 2018 (r463162) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499531062 -SHA256 (drupal/drupal-7.56.tar.gz) = 02fb4b46060d53c2f876d2381a8741249819e3a02ea1d7291036f6ea280d7b69 -SIZE (drupal/drupal-7.56.tar.gz) = 3277833 +TIMESTAMP = 1519588287 +SHA256 (drupal/drupal-7.57.tar.gz) = c3bc1173d7830941fa9ee6061d555fec334bd6834d2fc5c870f3aef1fbf667e2 +SIZE (drupal/drupal-7.57.tar.gz) = 3279405 From owner-svn-ports-branches@freebsd.org Wed Feb 28 00:47:04 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 2C378F39D58; Wed, 28 Feb 2018 00:47: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 D2BC57A573; Wed, 28 Feb 2018 00:47:03 +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 CDA3A124C5; Wed, 28 Feb 2018 00:47:03 +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 w1S0l3pf032502; Wed, 28 Feb 2018 00:47:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1S0l36H032500; Wed, 28 Feb 2018 00:47:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802280047.w1S0l36H032500@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 28 Feb 2018 00:47:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463171 - branches/2018Q1/multimedia/ffmpeg X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/multimedia/ffmpeg X-SVN-Commit-Revision: 463171 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, 28 Feb 2018 00:47:04 -0000 Author: jbeich Date: Wed Feb 28 00:47:03 2018 New Revision: 463171 URL: https://svnweb.freebsd.org/changeset/ports/463171 Log: MFH: r463051 multimedia/ffmpeg: update to 3.4.2 Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n3.4.2:/Changelog ABI: https://abi-laboratory.pro/tracker/timeline/ffmpeg/ Approved by: ports-secteam (riggs) Modified: branches/2018Q1/multimedia/ffmpeg/Makefile branches/2018Q1/multimedia/ffmpeg/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/multimedia/ffmpeg/Makefile ============================================================================== --- branches/2018Q1/multimedia/ffmpeg/Makefile Wed Feb 28 00:24:52 2018 (r463170) +++ branches/2018Q1/multimedia/ffmpeg/Makefile Wed Feb 28 00:47:03 2018 (r463171) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 3.4.1 -PORTREVISION= 3 +PORTVERSION= 3.4.2 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ Modified: branches/2018Q1/multimedia/ffmpeg/distinfo ============================================================================== --- branches/2018Q1/multimedia/ffmpeg/distinfo Wed Feb 28 00:24:52 2018 (r463170) +++ branches/2018Q1/multimedia/ffmpeg/distinfo Wed Feb 28 00:47:03 2018 (r463171) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512943043 -SHA256 (ffmpeg-3.4.1.tar.xz) = 5a77278a63741efa74e26bf197b9bb09ac6381b9757391b922407210f0f991c0 -SIZE (ffmpeg-3.4.1.tar.xz) = 8481964 +TIMESTAMP = 1518395358 +SHA256 (ffmpeg-3.4.2.tar.xz) = 2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740 +SIZE (ffmpeg-3.4.2.tar.xz) = 8478376 From owner-svn-ports-branches@freebsd.org Wed Feb 28 06:55:24 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 E539AF2E151; Wed, 28 Feb 2018 06:55:23 +0000 (UTC) (envelope-from delphij@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 9359D6831C; Wed, 28 Feb 2018 06:55:23 +0000 (UTC) (envelope-from delphij@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 7497F16208; Wed, 28 Feb 2018 06:55:23 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1S6tNqJ018518; Wed, 28 Feb 2018 06:55:23 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1S6tN5x018515; Wed, 28 Feb 2018 06:55:23 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201802280655.w1S6tN5x018515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 28 Feb 2018 06:55:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463182 - in branches/2018Q1/net/ntp: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in branches/2018Q1/net/ntp: . files X-SVN-Commit-Revision: 463182 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, 28 Feb 2018 06:55:24 -0000 Author: delphij Date: Wed Feb 28 06:55:22 2018 New Revision: 463182 URL: https://svnweb.freebsd.org/changeset/ports/463182 Log: MFH: r460670, r463181 Fix RIPENCC TRIMBLE driver compile error. Security update 4.2.8p10 --> 4.2.8p11. Approved by: ports-secteam Added: branches/2018Q1/net/ntp/files/patch-ntpd__refclock__ripencc.c - copied unchanged from r460670, head/net/ntp/files/patch-ntpd__refclock__ripencc.c Modified: branches/2018Q1/net/ntp/Makefile branches/2018Q1/net/ntp/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net/ntp/Makefile ============================================================================== --- branches/2018Q1/net/ntp/Makefile Wed Feb 28 06:51:33 2018 (r463181) +++ branches/2018Q1/net/ntp/Makefile Wed Feb 28 06:55:22 2018 (r463182) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ntp -PORTVERSION= 4.2.8p10 -PORTREVISION= 2 +PORTVERSION= 4.2.8p11 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ \ Modified: branches/2018Q1/net/ntp/distinfo ============================================================================== --- branches/2018Q1/net/ntp/distinfo Wed Feb 28 06:51:33 2018 (r463181) +++ branches/2018Q1/net/ntp/distinfo Wed Feb 28 06:55:22 2018 (r463182) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490246780 -SHA256 (ntp-4.2.8p10.tar.gz) = ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f -SIZE (ntp-4.2.8p10.tar.gz) = 6998648 +TIMESTAMP = 1519799522 +SHA256 (ntp-4.2.8p11.tar.gz) = f14a39f753688252d683ff907035ffff106ba8d3db21309b742e09b5c3cd278e +SIZE (ntp-4.2.8p11.tar.gz) = 7076566 Copied: branches/2018Q1/net/ntp/files/patch-ntpd__refclock__ripencc.c (from r460670, head/net/ntp/files/patch-ntpd__refclock__ripencc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net/ntp/files/patch-ntpd__refclock__ripencc.c Wed Feb 28 06:55:22 2018 (r463182, copy of r460670, head/net/ntp/files/patch-ntpd__refclock__ripencc.c) @@ -0,0 +1,38 @@ +--- ntpd/refclock_ripencc.c.orig 2014-12-18 18:42:01.000000000 -0800 ++++ ntpd/refclock_ripencc.c 2017-11-23 19:41:57.473988000 -0800 +@@ -1517,7 +1517,7 @@ + + record_clock_stats(&peer->srcadr, logbuf); + +- if (!utcflags & UTCF_UTC_AVAIL) ++ if (!(utcflags & UTCF_UTC_AVAIL)) + return(-1); + + /* poll for UTC parameters once and then if UTC flag changed */ +@@ -3442,7 +3442,7 @@ + status1, status2; + const char + *text; +- static const char const ++ static const char + *sc_text[] = { + "Doing position fixes", + "Don't have GPS time yet", +@@ -4442,8 +4442,6 @@ + known = TRUE; + } + if (known == FALSE) pbuf += sprintf(pbuf, "No known"); +- reserved = reserved; +- + } + + /* 0x8F */ +@@ -5059,7 +5057,7 @@ + { + for (i=0; i<8; i++) + { +- if (Flags&(1< 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 CCB97F28744; Wed, 28 Feb 2018 22:23:15 +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 7B38B68DC3; Wed, 28 Feb 2018 22:23:15 +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 7644E1F91E; Wed, 28 Feb 2018 22:23:15 +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 w1SMNFIW004454; Wed, 28 Feb 2018 22:23:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1SMNF6l004452; Wed, 28 Feb 2018 22:23:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802282223.w1SMNF6l004452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 28 Feb 2018 22:23:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463269 - branches/2018Q1/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/emulators/citra X-SVN-Commit-Revision: 463269 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, 28 Feb 2018 22:23:16 -0000 Author: jbeich Date: Wed Feb 28 22:23:15 2018 New Revision: 463269 URL: https://svnweb.freebsd.org/changeset/ports/463269 Log: MFH: r463267 emulators/citra: update to s20180228 Changes: https://github.com/citra-emu/citra/compare/e51a642a...ac626eda Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q1/emulators/citra/Makefile branches/2018Q1/emulators/citra/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/citra/Makefile ============================================================================== --- branches/2018Q1/emulators/citra/Makefile Wed Feb 28 22:22:30 2018 (r463268) +++ branches/2018Q1/emulators/citra/Makefile Wed Feb 28 22:23:15 2018 (r463269) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180222 +PORTVERSION= s20180228 PORTREVISION?= 0 CATEGORIES= emulators @@ -26,7 +26,7 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dy USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= e51a642a +GH_TAGNAME= ac626eda GH_TUPLE= citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \ benhoyt:inih:r40:inih/externals/inih/inih \ Modified: branches/2018Q1/emulators/citra/distinfo ============================================================================== --- branches/2018Q1/emulators/citra/distinfo Wed Feb 28 22:22:30 2018 (r463268) +++ branches/2018Q1/emulators/citra/distinfo Wed Feb 28 22:23:15 2018 (r463269) @@ -1,6 +1,6 @@ -TIMESTAMP = 1519335714 -SHA256 (citra-emu-citra-s20180222-e51a642a_GH0.tar.gz) = 3a76840f9411ecf3205e5c8542164e5279da8ee7169c114999da293fab7f60b8 -SIZE (citra-emu-citra-s20180222-e51a642a_GH0.tar.gz) = 1677211 +TIMESTAMP = 1519827933 +SHA256 (citra-emu-citra-s20180228-ac626eda_GH0.tar.gz) = ea5aaa73a5eca109698c710efb7ae4cbbae2824c76d9f15ecc12ac79cbaa1a36 +SIZE (citra-emu-citra-s20180228-ac626eda_GH0.tar.gz) = 1677326 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7 SIZE (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = 59366 SHA256 (MerryMage-dynarmic-d1d4705_GH0.tar.gz) = cf120bc77912cf58e0965db2abcb2067c36aca612c42459e0eb72b740ea6cb0e From owner-svn-ports-branches@freebsd.org Wed Feb 28 22:25: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 963FDF288FE; Wed, 28 Feb 2018 22:25: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 486BF68F29; Wed, 28 Feb 2018 22:25: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 3F3B31F91F; Wed, 28 Feb 2018 22:25: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 w1SMP2P6004902; Wed, 28 Feb 2018 22:25:02 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1SMP14e004898; Wed, 28 Feb 2018 22:25:01 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802282225.w1SMP14e004898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 28 Feb 2018 22:25:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463270 - in branches/2018Q1/emulators/rpcs3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/emulators/rpcs3: . files X-SVN-Commit-Revision: 463270 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, 28 Feb 2018 22:25:02 -0000 Author: jbeich Date: Wed Feb 28 22:25:01 2018 New Revision: 463270 URL: https://svnweb.freebsd.org/changeset/ports/463270 Log: MFH: r463268 emulators/rpcs3: update to 0.0.5.24 Changes: https://github.com/RPCS3/rpcs3/compare/b61a69c87...8d7620d95 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q1/emulators/rpcs3/Makefile branches/2018Q1/emulators/rpcs3/distinfo branches/2018Q1/emulators/rpcs3/files/patch-qt57 Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q1/emulators/rpcs3/Makefile Wed Feb 28 22:23:15 2018 (r463269) +++ branches/2018Q1/emulators/rpcs3/Makefile Wed Feb 28 22:25:01 2018 (r463270) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-4 -DISTVERSIONSUFFIX= -gb61a69c87 +DISTVERSION= 0.0.5-24 +DISTVERSIONSUFFIX= -g8d7620d95 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Wed Feb 28 22:23:15 2018 (r463269) +++ branches/2018Q1/emulators/rpcs3/distinfo Wed Feb 28 22:25:01 2018 (r463270) @@ -1,6 +1,6 @@ -TIMESTAMP = 1519576244 -SHA256 (RPCS3-rpcs3-v0.0.5-4-gb61a69c87_GH0.tar.gz) = 43e61975e83b4e32d30d7a86df7cd8be4d2a39bc3783388ca4d884b540a32bc5 -SIZE (RPCS3-rpcs3-v0.0.5-4-gb61a69c87_GH0.tar.gz) = 3860339 +TIMESTAMP = 1519854102 +SHA256 (RPCS3-rpcs3-v0.0.5-24-g8d7620d95_GH0.tar.gz) = 40aa13c376417033b5f613b9464117a0b2c8812adada7d8ce5f1e4927badbc79 +SIZE (RPCS3-rpcs3-v0.0.5-24-g8d7620d95_GH0.tar.gz) = 3726855 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841 Modified: branches/2018Q1/emulators/rpcs3/files/patch-qt57 ============================================================================== --- branches/2018Q1/emulators/rpcs3/files/patch-qt57 Wed Feb 28 22:23:15 2018 (r463269) +++ branches/2018Q1/emulators/rpcs3/files/patch-qt57 Wed Feb 28 22:25:01 2018 (r463270) @@ -68,14 +68,14 @@ Revert https://github.com/RPCS3/rpcs3/commit/cf1c45dfe QVBoxLayout *dialog_layout = new QVBoxLayout(); QHBoxLayout *all_players = new QHBoxLayout(); ---- rpcs3/rpcs3qt/gui_settings.cpp.orig 2018-02-21 20:18:14 UTC +--- rpcs3/rpcs3qt/gui_settings.cpp.orig 2018-02-28 19:44:06 UTC +++ rpcs3/rpcs3qt/gui_settings.cpp -@@ -260,6 +260,7 @@ void gui_settings::ShowInfoBox(const gui_save& entry, +@@ -259,6 +259,7 @@ void gui_settings::ShowInfoBox(const gui_save& entry, + if (GetValue(entry).toBool()) { - QCheckBox* cb = new QCheckBox(tr("Don't show again")); QMessageBox* mb = new QMessageBox(QMessageBox::Information, title, text, QMessageBox::Ok, parent); + mb->setWindowFlags(mb->windowFlags() & ~Qt::WindowContextHelpButtonHint); - mb->setCheckBox(cb); + mb->setCheckBox(new QCheckBox(tr("Don't show again"))); mb->deleteLater(); mb->exec(); --- rpcs3/rpcs3qt/instruction_editor_dialog.cpp.orig 2018-02-21 20:18:14 UTC From owner-svn-ports-branches@freebsd.org Thu Mar 1 12:13:06 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 924E1F4352A; Thu, 1 Mar 2018 12:13:06 +0000 (UTC) (envelope-from woodsb02@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 4683E805B0; Thu, 1 Mar 2018 12:13:06 +0000 (UTC) (envelope-from woodsb02@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 3FE18755; Thu, 1 Mar 2018 12:13:06 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w21CD6sV030063; Thu, 1 Mar 2018 12:13:06 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w21CD5PI030059; Thu, 1 Mar 2018 12:13:05 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201803011213.w21CD5PI030059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Thu, 1 Mar 2018 12:13:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463299 - in branches/2018Q1/math/ogdf: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in branches/2018Q1/math/ogdf: . files X-SVN-Commit-Revision: 463299 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, 01 Mar 2018 12:13:06 -0000 Author: woodsb02 Date: Thu Mar 1 12:13:05 2018 New Revision: 463299 URL: https://svnweb.freebsd.org/changeset/ports/463299 Log: MFH: r463298 math/ogdf: unbreak build with Clang 6 (C++14 by default) The bundled version of CoinMP required the same patches as those applied to the port math/coinmp, so the patches were copied from there. Submitted by: jbeich (via commit r458136) Reported by: antoine (via bug 224669) Approved by: ports-secteam blanket Added: branches/2018Q1/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp - copied unchanged from r463298, head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp branches/2018Q1/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp - copied unchanged from r463298, head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp branches/2018Q1/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp - copied unchanged from r463298, head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp Modified: branches/2018Q1/math/ogdf/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/math/ogdf/Makefile ============================================================================== --- branches/2018Q1/math/ogdf/Makefile Thu Mar 1 12:09:48 2018 (r463298) +++ branches/2018Q1/math/ogdf/Makefile Thu Mar 1 12:13:05 2018 (r463299) @@ -3,6 +3,7 @@ PORTNAME= ogdf PORTVERSION= 2015.05 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.ogdf.net/lib/exe/fetch.php/tech: DISTNAME= ${PORTNAME}.v${PORTVERSION} Copied: branches/2018Q1/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp (from r463298, head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp Thu Mar 1 12:13:05 2018 (r463299, copy of r463298, head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp) @@ -0,0 +1,17 @@ +In file included from CglLandPSimplex.cpp:11: +In file included from ./CglLandPSimplex.hpp:31: +./CglLandPUtils.hpp:88:25: error: reinterpret_cast from 'nullptr_t' to 'OsiRowCut *' is not allowed + cuts_.resize(i, reinterpret_cast (NULL)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- include/coin/CglLandPUtils.hpp.orig 2015-05-29 15:36:11 UTC ++++ include/coin/CglLandPUtils.hpp +@@ -85,7 +85,7 @@ struct Cuts + /** resize vector.*/ + void resize(unsigned int i) + { +- cuts_.resize(i, reinterpret_cast (NULL)); ++ cuts_.resize(i, static_cast (NULL)); + } + private: + /** Stores the number of cuts.*/ Copied: branches/2018Q1/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp (from r463298, head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp Thu Mar 1 12:13:05 2018 (r463299, copy of r463298, head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp) @@ -0,0 +1,15 @@ +ClpModel.cpp:3848:24: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed + reinterpret_cast (NULL) /*integrality*/, + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- src/coin/Clp/ClpModel.cpp.orig 2015-05-29 15:36:41 UTC ++++ src/coin/Clp/ClpModel.cpp +@@ -3619,7 +3619,7 @@ ClpModel::writeMps(const char *filename, + writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX, + getColLower(), getColUpper(), + objective, +- reinterpret_cast (NULL) /*integrality*/, ++ static_cast (NULL) /*integrality*/, + getRowLower(), getRowUpper(), + columnNames, rowNames); + // Pass in array saying if each variable integer Copied: branches/2018Q1/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp (from r463298, head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp Thu Mar 1 12:13:05 2018 (r463299, copy of r463298, head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp) @@ -0,0 +1,15 @@ +OsiClpSolverInterface.cpp:1451:50: error: reinterpret_cast from 'nullptr_t' to 'int *' is not allowed + messagesPointer->setDetailMessages(100,10000,reinterpret_cast (NULL)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- src/coin/OsiClp/OsiClpSolverInterface.cpp.orig 2015-05-29 15:36:45 UTC ++++ src/coin/OsiClp/OsiClpSolverInterface.cpp +@@ -1422,7 +1422,7 @@ OsiClpSolverInterface::setupForRepeatedUse(int senseOf + if (stopPrinting) { + CoinMessages * messagesPointer = modelPtr_->messagesPointer(); + // won't even build messages +- messagesPointer->setDetailMessages(100,10000,reinterpret_cast (NULL)); ++ messagesPointer->setDetailMessages(100,10000,static_cast (NULL)); + } + #endif + } From owner-svn-ports-branches@freebsd.org Thu Mar 1 14:24:35 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6461F2F211; Thu, 1 Mar 2018 14:24:35 +0000 (UTC) (envelope-from ler@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 780D4685D2; Thu, 1 Mar 2018 14:24:35 +0000 (UTC) (envelope-from ler@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 729201D25; Thu, 1 Mar 2018 14:24:35 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w21EOZI7097002; Thu, 1 Mar 2018 14:24:35 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w21EOYb5096998; Thu, 1 Mar 2018 14:24:34 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201803011424.w21EOYb5096998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Thu, 1 Mar 2018 14:24:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463324 - in branches/2018Q1/mail: dovecot dovecot-pigeonhole dovecot/files X-SVN-Group: ports-branches X-SVN-Commit-Author: ler X-SVN-Commit-Paths: in branches/2018Q1/mail: dovecot dovecot-pigeonhole dovecot/files X-SVN-Commit-Revision: 463324 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, 01 Mar 2018 14:24:36 -0000 Author: ler Date: Thu Mar 1 14:24:34 2018 New Revision: 463324 URL: https://svnweb.freebsd.org/changeset/ports/463324 Log: MFH: r463271 Update dovecot to 2.2.34, and bump pigeonhole. * CVE-2017-15130: TLS SNI config lookups may lead to excessive memory usage, causing imap-login/pop3-login VSZ limit to be reached and the process restarted. This happens only if Dovecot config has local_name { } or local { } configuration blocks and attacker uses randomly generated SNI servernames. * CVE-2017-14461: Parsing invalid email addresses may cause a crash or leak memory contents to attacker. For example, these memory contents might contain parts of an email from another user if the same imap process is reused for multiple users. First discovered by Aleksandar Nikolic of Cisco Talos. Independently also discovered by "flxflndy" via HackerOne. * CVE-2017-15132: Aborted SASL authentication leaks memory in login process. * Linux: Core dumping is no longer enabled by default via PR_SET_DUMPABLE, because this may allow attackers to bypass chroot/group restrictions. Found by cPanel Security Team. Nowadays core dumps can be safely enabled by using "sysctl -w fs.suid_dumpable=2". If the old behaviour is wanted, it can still be enabled by setting: import_environment=$import_environment PR_SET_DUMPABLE=1 * doveconf output now includes the hostname. + mail_attachment_detection_options setting controls when $HasAttachment and $HasNoAttachment keywords are set for mails. + imap: Support fetching body snippets using FETCH (SNIPPET) or (SNIPPET (LAZY=FUZZY)) + fs-compress: Automatically detect whether input is compressed or not. Prefix the compression algorithm with "maybe-" to enable the detection, for example: "compress:maybe-gz:6:..." + Added settings to change dovecot.index* files' optimization behavior. See https://wiki2.dovecot.org/IndexFiles#Settings + Auth cache can now utilize auth workers to do password hash verification by setting auth_cache_verify_password_with_worker=yes. + Added charset_alias plugin. See https://wiki2.dovecot.org/Plugins/CharsetAlias + imap_logout_format and pop3_logout_format settings now support all of the generic variables (e.g. %{rip}, %{session}, etc.) + Added auth_policy_check_before_auth, auth_policy_check_after_auth and auth_policy_report_after_auth settings. - v2.2.33: doveadm-server: Various fixes related to log handling. - v2.2.33: doveadm failed when trying to access UNIX socket that didn't require authentication. - v2.2.33: doveadm log reopen stopped working - v2.2.30+: IMAP stopped advertising SPECIAL-USE capability - v2.2.30+: IMAP stopped sending untagged OK/NO storage notifications - replication: dsync sends unnecessary replication notification for changes it does internally. NOTE: Folder creates, renames, deletes and subscribes still trigger unnecessary replication notifications, but these should be rather rare. - mail_always/never_cache_fields setting changes weren't applied for existing dovecot.index.cache files. - Fix compiling and other problems with OpenSSL v1.1 - auth policy: With master user logins, lookup using login username. - FTS reindexed all mails unnecessarily after loss of dovecot.index.cache file - mdbox rebuild repeatedly fails with "missing map extension" - SSL connections may have been hanging with imapc or doveadm client. - cassandra: Using protocol v3 (Cassandra v2.1) caused memory leaks and also timestamps weren't set to queries. - fs-crypt silently ignored public/private keys specified in configuration (mail_crypt_global_public/private_key) and just emitted plaintext output. - lock_method=dotlock caused crashes - imapc: Reconnection may cause crashes and other errors Security: CVE-2017-14461 Security: CVE-2017-15130 Security: CVE-2017-15132 Approved by: ports-secteam (delphij), adamw Deleted: branches/2018Q1/mail/dovecot/files/patch-src_doveadm_Makefile.am branches/2018Q1/mail/dovecot/files/patch-src_lib-auth_auth-client-request.c branches/2018Q1/mail/dovecot/files/patch-src_lib-auth_auth-server-connection.c branches/2018Q1/mail/dovecot/files/patch-src_lib-auth_auth-server-connection.h Modified: branches/2018Q1/mail/dovecot-pigeonhole/Makefile branches/2018Q1/mail/dovecot/Makefile branches/2018Q1/mail/dovecot/distinfo branches/2018Q1/mail/dovecot/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/mail/dovecot-pigeonhole/Makefile ============================================================================== --- branches/2018Q1/mail/dovecot-pigeonhole/Makefile Thu Mar 1 13:53:15 2018 (r463323) +++ branches/2018Q1/mail/dovecot-pigeonhole/Makefile Thu Mar 1 14:24:34 2018 (r463324) @@ -3,7 +3,7 @@ PORTNAME= dovecot-pigeonhole PORTVERSION= 0.4.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} Modified: branches/2018Q1/mail/dovecot/Makefile ============================================================================== --- branches/2018Q1/mail/dovecot/Makefile Thu Mar 1 13:53:15 2018 (r463323) +++ branches/2018Q1/mail/dovecot/Makefile Thu Mar 1 14:24:34 2018 (r463324) @@ -12,8 +12,7 @@ ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.2.33.2 -PORTREVISION= 4 +PORTVERSION= 2.2.34 CATEGORIES= mail ipv6 MASTER_SITES= https://www.dovecot.org/releases/2.2/ Modified: branches/2018Q1/mail/dovecot/distinfo ============================================================================== --- branches/2018Q1/mail/dovecot/distinfo Thu Mar 1 13:53:15 2018 (r463323) +++ branches/2018Q1/mail/dovecot/distinfo Thu Mar 1 14:24:34 2018 (r463324) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508511506 -SHA256 (dovecot-2.2.33.2.tar.gz) = fe1e3b78609a56ee22fc209077e4b75348fa1bbd54c46f52bde2472a4c4cee84 -SIZE (dovecot-2.2.33.2.tar.gz) = 6131086 +TIMESTAMP = 1519859066 +SHA256 (dovecot-2.2.34.tar.gz) = 5e92a4325409e66b343f6aaa67174b8921ce83d0df792c6eeb0b7b7e2c808353 +SIZE (dovecot-2.2.34.tar.gz) = 6181270 Modified: branches/2018Q1/mail/dovecot/pkg-plist ============================================================================== --- branches/2018Q1/mail/dovecot/pkg-plist Thu Mar 1 13:53:15 2018 (r463323) +++ branches/2018Q1/mail/dovecot/pkg-plist Thu Mar 1 14:24:34 2018 (r463324) @@ -76,6 +76,7 @@ include/dovecot/bits.h include/dovecot/bsearch-insert-pos.h include/dovecot/buffer.h include/dovecot/byteorder.h +include/dovecot/charset-utf8-private.h include/dovecot/charset-utf8.h include/dovecot/child-wait.h include/dovecot/client-common.h @@ -310,6 +311,7 @@ include/dovecot/istream-seekable.h include/dovecot/istream-sized.h include/dovecot/istream-tee.h include/dovecot/istream-timeout.h +include/dovecot/istream-try.h include/dovecot/istream-unix.h include/dovecot/istream-zlib.h include/dovecot/istream.h @@ -622,6 +624,8 @@ lib/dovecot/lib15_notify_plugin.a lib/dovecot/lib15_notify_plugin.so lib/dovecot/lib20_autocreate_plugin.a lib/dovecot/lib20_autocreate_plugin.so +lib/dovecot/lib20_charset_alias_plugin.a +lib/dovecot/lib20_charset_alias_plugin.so lib/dovecot/lib20_expire_plugin.a lib/dovecot/lib20_expire_plugin.so lib/dovecot/lib20_fts_plugin.a From owner-svn-ports-branches@freebsd.org Thu Mar 1 16:01: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 83CA3F3794D; Thu, 1 Mar 2018 16:01:47 +0000 (UTC) (envelope-from girgen@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 340216DB96; Thu, 1 Mar 2018 16:01:47 +0000 (UTC) (envelope-from girgen@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 2E4E22D9A; Thu, 1 Mar 2018 16:01:47 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w21G1lim045941; Thu, 1 Mar 2018 16:01:47 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w21G1jEd045925; Thu, 1 Mar 2018 16:01:45 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201803011601.w21G1jEd045925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Thu, 1 Mar 2018 16:01:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463343 - in branches/2018Q1/databases: postgresql10-server postgresql93-server postgresql94-server postgresql95-server postgresql96-server X-SVN-Group: ports-branches X-SVN-Commit-Author: girgen X-SVN-Commit-Paths: in branches/2018Q1/databases: postgresql10-server postgresql93-server postgresql94-server postgresql95-server postgresql96-server X-SVN-Commit-Revision: 463343 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, 01 Mar 2018 16:01:47 -0000 Author: girgen Date: Thu Mar 1 16:01:45 2018 New Revision: 463343 URL: https://svnweb.freebsd.org/changeset/ports/463343 Log: MFH: r463327 2018-03-01 Security Update Release The PostgreSQL Global Development Group has released an update to all supported versions of the PostgreSQL database system, including 10.3, 9.6.8, 9.5.12, 9.4.17, and 9.3.22. The purpose of this release is to address CVE-2018-1058, which describes how a user can create like-named objects in different schemas that can change the behavior of other users' queries and cause unexpected or malicious behavior, also known as a "trojan-horse" attack. Most of this release centers around added documentation that describes the issue and how to take steps to mitigate the impact on PostgreSQL databases. We strongly encourage all of our users to please visit https://wiki.postgresql.org/wiki/A_Guide_to_CVE-2018-1058:_Protect_Your_Search_Path for a detailed explanation of CVE-2018-1058 and how to protect your PostgreSQL installations. After evaluating the documentation for CVE-2018-1058, a database administrator may need to take follow up steps on their PostgreSQL installations to ensure they are protected from exploitation. Security: CVE-2018-1058 Approved by: portmgr Modified: branches/2018Q1/databases/postgresql10-server/Makefile branches/2018Q1/databases/postgresql10-server/distinfo branches/2018Q1/databases/postgresql10-server/pkg-plist-client branches/2018Q1/databases/postgresql10-server/pkg-plist-server branches/2018Q1/databases/postgresql93-server/Makefile branches/2018Q1/databases/postgresql93-server/distinfo branches/2018Q1/databases/postgresql93-server/pkg-plist-client branches/2018Q1/databases/postgresql94-server/Makefile branches/2018Q1/databases/postgresql94-server/distinfo branches/2018Q1/databases/postgresql94-server/pkg-plist-client branches/2018Q1/databases/postgresql95-server/Makefile branches/2018Q1/databases/postgresql95-server/distinfo branches/2018Q1/databases/postgresql95-server/pkg-plist-client branches/2018Q1/databases/postgresql96-server/Makefile branches/2018Q1/databases/postgresql96-server/distinfo branches/2018Q1/databases/postgresql96-server/pkg-plist-client Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/postgresql10-server/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql10-server/Makefile Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql10-server/Makefile Thu Mar 1 16:01:45 2018 (r463343) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= postgresql -DISTVERSION?= 10.2 +DISTVERSION?= 10.3 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} Modified: branches/2018Q1/databases/postgresql10-server/distinfo ============================================================================== --- branches/2018Q1/databases/postgresql10-server/distinfo Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql10-server/distinfo Thu Mar 1 16:01:45 2018 (r463343) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518110073 -SHA256 (postgresql/postgresql-10.2.tar.bz2) = fe32009b62ddb97f7f014307ce9d0edb6972f5a698e63cb531088e147d145bad -SIZE (postgresql/postgresql-10.2.tar.bz2) = 19901836 +TIMESTAMP = 1519720433 +SHA256 (postgresql/postgresql-10.3.tar.bz2) = 6ea268780ee35e88c65cdb0af7955ad90b7d0ef34573867f223f14e43467931a +SIZE (postgresql/postgresql-10.3.tar.bz2) = 19959653 Modified: branches/2018Q1/databases/postgresql10-server/pkg-plist-client ============================================================================== --- branches/2018Q1/databases/postgresql10-server/pkg-plist-client Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql10-server/pkg-plist-client Thu Mar 1 16:01:45 2018 (r463343) @@ -309,6 +309,7 @@ include/postgresql/server/executor/tablefunc.h include/postgresql/server/executor/tqueue.h include/postgresql/server/executor/tstoreReceiver.h include/postgresql/server/executor/tuptable.h +include/postgresql/server/fe_utils/connect.h include/postgresql/server/fe_utils/mbprint.h include/postgresql/server/fe_utils/print.h include/postgresql/server/fe_utils/psqlscan.h @@ -1048,6 +1049,7 @@ man/man7/WITH.7.gz %%NLS%%share/locale/ja/LC_MESSAGES/pg_config-10.mo %%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-10.mo %%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-10.mo +%%NLS%%share/locale/ja/LC_MESSAGES/psql-10.mo %%NLS%%share/locale/ko/LC_MESSAGES/ecpg-10.mo %%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-10.mo %%NLS%%share/locale/ko/LC_MESSAGES/libpq5-10.mo @@ -1091,6 +1093,7 @@ man/man7/WITH.7.gz %%NLS%%share/locale/tr/LC_MESSAGES/libpq5-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/pg_config-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-10.mo Modified: branches/2018Q1/databases/postgresql10-server/pkg-plist-server ============================================================================== --- branches/2018Q1/databases/postgresql10-server/pkg-plist-server Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql10-server/pkg-plist-server Thu Mar 1 16:01:45 2018 (r463343) @@ -87,6 +87,7 @@ lib/libpgcommon.a %%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-10.mo %%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-10.mo %%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-10.mo +%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-10.mo %%NLS%%share/locale/es/LC_MESSAGES/plpgsql-10.mo %%NLS%%share/locale/es/LC_MESSAGES/postgres-10.mo %%NLS%%share/locale/fr/LC_MESSAGES/initdb-10.mo @@ -113,10 +114,16 @@ lib/libpgcommon.a %%NLS%%share/locale/it/LC_MESSAGES/plpgsql-10.mo %%NLS%%share/locale/it/LC_MESSAGES/postgres-10.mo %%NLS%%share/locale/ja/LC_MESSAGES/initdb-10.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-10.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-10.mo %%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-10.mo %%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-10.mo %%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-10.mo %%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-10.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-10.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-10.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-10.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-10.mo %%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-10.mo %%NLS%%share/locale/ko/LC_MESSAGES/initdb-10.mo %%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-10.mo @@ -175,11 +182,18 @@ lib/libpgcommon.a %%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-10.mo %%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-10.mo %%NLS%%share/locale/sv/LC_MESSAGES/postgres-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/initdb-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/postgres-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-10.mo Modified: branches/2018Q1/databases/postgresql93-server/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql93-server/Makefile Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql93-server/Makefile Thu Mar 1 16:01:45 2018 (r463343) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.3.21 +DISTVERSION?= 9.3.22 PORTREVISION= 0 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} Modified: branches/2018Q1/databases/postgresql93-server/distinfo ============================================================================== --- branches/2018Q1/databases/postgresql93-server/distinfo Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql93-server/distinfo Thu Mar 1 16:01:45 2018 (r463343) @@ -1,5 +1,5 @@ -TIMESTAMP = 1517868536 -SHA256 (postgresql/postgresql-9.3.21.tar.bz2) = b9babc5148188a410e023d7178a5678e989ec2e276498de6cd0028bc331a40e0 -SIZE (postgresql/postgresql-9.3.21.tar.bz2) = 17014472 +TIMESTAMP = 1519745501 +SHA256 (postgresql/postgresql-9.3.22.tar.bz2) = 1b18ed4aa59bab6283a0d8f3a00b9d896f4588bb2ba88ceef2816cb5c4cce91a +SIZE (postgresql/postgresql-9.3.22.tar.bz2) = 17022938 SHA256 (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 4be31ad9899d5caf9f57ad7ebfc0d14f0fcf58ad539c82fb353b016fb76c0c30 SIZE (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 5583 Modified: branches/2018Q1/databases/postgresql93-server/pkg-plist-client ============================================================================== --- branches/2018Q1/databases/postgresql93-server/pkg-plist-client Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql93-server/pkg-plist-client Thu Mar 1 16:01:45 2018 (r463343) @@ -238,6 +238,7 @@ include/postgresql/server/executor/spi.h include/postgresql/server/executor/spi_priv.h include/postgresql/server/executor/tstoreReceiver.h include/postgresql/server/executor/tuptable.h +include/postgresql/server/fe_utils/connect.h include/postgresql/server/fmgr.h include/postgresql/server/foreign/fdwapi.h include/postgresql/server/foreign/foreign.h Modified: branches/2018Q1/databases/postgresql94-server/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql94-server/Makefile Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql94-server/Makefile Thu Mar 1 16:01:45 2018 (r463343) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.4.16 +DISTVERSION?= 9.4.17 PORTREVISION= 0 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} Modified: branches/2018Q1/databases/postgresql94-server/distinfo ============================================================================== --- branches/2018Q1/databases/postgresql94-server/distinfo Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql94-server/distinfo Thu Mar 1 16:01:45 2018 (r463343) @@ -1,5 +1,5 @@ -TIMESTAMP = 1517868536 -SHA256 (postgresql/postgresql-9.4.16.tar.bz2) = dcbc62b621e4d8a445c2f33750f7d96257c38103cccebeb934e6913a3c135e81 -SIZE (postgresql/postgresql-9.4.16.tar.bz2) = 17778763 +TIMESTAMP = 1519745501 +SHA256 (postgresql/postgresql-9.4.17.tar.bz2) = 7a320cd335052b840d209dc9688f09965763351c590e3cc7bf577591179fd7c6 +SIZE (postgresql/postgresql-9.4.17.tar.bz2) = 17807762 SHA256 (postgresql/pg-949-icu-2016-10-02.diff.gz) = 34612e685a79874db04bc6b66c700bfc6412042840c532eef0da7832d1f70d43 SIZE (postgresql/pg-949-icu-2016-10-02.diff.gz) = 5289 Modified: branches/2018Q1/databases/postgresql94-server/pkg-plist-client ============================================================================== --- branches/2018Q1/databases/postgresql94-server/pkg-plist-client Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql94-server/pkg-plist-client Thu Mar 1 16:01:45 2018 (r463343) @@ -241,6 +241,7 @@ include/postgresql/server/executor/spi.h include/postgresql/server/executor/spi_priv.h include/postgresql/server/executor/tstoreReceiver.h include/postgresql/server/executor/tuptable.h +include/postgresql/server/fe_utils/connect.h include/postgresql/server/fmgr.h include/postgresql/server/foreign/fdwapi.h include/postgresql/server/foreign/foreign.h Modified: branches/2018Q1/databases/postgresql95-server/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql95-server/Makefile Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql95-server/Makefile Thu Mar 1 16:01:45 2018 (r463343) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.5.11 +DISTVERSION?= 9.5.12 PORTREVISION= 0 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} Modified: branches/2018Q1/databases/postgresql95-server/distinfo ============================================================================== --- branches/2018Q1/databases/postgresql95-server/distinfo Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql95-server/distinfo Thu Mar 1 16:01:45 2018 (r463343) @@ -1,5 +1,5 @@ -TIMESTAMP = 1517868536 -SHA256 (postgresql/postgresql-9.5.11.tar.bz2) = 8182cd74e27a75ae39166b2603b5014f4272855b4101b40819761b853a77c8dd -SIZE (postgresql/postgresql-9.5.11.tar.bz2) = 18572811 +TIMESTAMP = 1519745501 +SHA256 (postgresql/postgresql-9.5.12.tar.bz2) = 02e86f5c66467731bbec18fde96e0daf38c13c9141d8e7d41be663ab6fa6f698 +SIZE (postgresql/postgresql-9.5.12.tar.bz2) = 18589538 SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365 SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952 Modified: branches/2018Q1/databases/postgresql95-server/pkg-plist-client ============================================================================== --- branches/2018Q1/databases/postgresql95-server/pkg-plist-client Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql95-server/pkg-plist-client Thu Mar 1 16:01:45 2018 (r463343) @@ -266,6 +266,7 @@ include/postgresql/server/executor/spi.h include/postgresql/server/executor/spi_priv.h include/postgresql/server/executor/tstoreReceiver.h include/postgresql/server/executor/tuptable.h +include/postgresql/server/fe_utils/connect.h include/postgresql/server/fmgr.h include/postgresql/server/foreign/fdwapi.h include/postgresql/server/foreign/foreign.h Modified: branches/2018Q1/databases/postgresql96-server/Makefile ============================================================================== --- branches/2018Q1/databases/postgresql96-server/Makefile Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql96-server/Makefile Thu Mar 1 16:01:45 2018 (r463343) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.6.7 +DISTVERSION?= 9.6.8 PORTREVISION?= 0 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} Modified: branches/2018Q1/databases/postgresql96-server/distinfo ============================================================================== --- branches/2018Q1/databases/postgresql96-server/distinfo Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql96-server/distinfo Thu Mar 1 16:01:45 2018 (r463343) @@ -1,5 +1,5 @@ -TIMESTAMP = 1517868545 -SHA256 (postgresql/postgresql-9.6.7.tar.bz2) = 2ebe3df3c1d1eab78023bdc3ffa55a154aa84300416b075ef996598d78a624c6 -SIZE (postgresql/postgresql-9.6.7.tar.bz2) = 19504886 +TIMESTAMP = 1519720435 +SHA256 (postgresql/postgresql-9.6.8.tar.bz2) = eafdb3b912e9ec34bdd28b651d00226a6253ba65036cb9a41cad2d9e82e3eb70 +SIZE (postgresql/postgresql-9.6.8.tar.bz2) = 19528927 SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998 Modified: branches/2018Q1/databases/postgresql96-server/pkg-plist-client ============================================================================== --- branches/2018Q1/databases/postgresql96-server/pkg-plist-client Thu Mar 1 15:58:43 2018 (r463342) +++ branches/2018Q1/databases/postgresql96-server/pkg-plist-client Thu Mar 1 16:01:45 2018 (r463343) @@ -279,6 +279,7 @@ include/postgresql/server/executor/spi_priv.h include/postgresql/server/executor/tqueue.h include/postgresql/server/executor/tstoreReceiver.h include/postgresql/server/executor/tuptable.h +include/postgresql/server/fe_utils/connect.h include/postgresql/server/fe_utils/mbprint.h include/postgresql/server/fe_utils/print.h include/postgresql/server/fe_utils/psqlscan.h From owner-svn-ports-branches@freebsd.org Fri Mar 2 00:38:46 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 7A472F3863C; Fri, 2 Mar 2018 00:38:46 +0000 (UTC) (envelope-from leres@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 29DBE8269F; Fri, 2 Mar 2018 00:38:46 +0000 (UTC) (envelope-from leres@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 203B410595; Fri, 2 Mar 2018 00:38:46 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w220cjCi003691; Fri, 2 Mar 2018 00:38:45 GMT (envelope-from leres@FreeBSD.org) Received: (from leres@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w220cj4t003683; Fri, 2 Mar 2018 00:38:45 GMT (envelope-from leres@FreeBSD.org) Message-Id: <201803020038.w220cj4t003683@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: leres set sender to leres@FreeBSD.org using -f From: Craig Leres Date: Fri, 2 Mar 2018 00:38:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463362 - in branches/2018Q1: mail/imapsync security/bro sysutils/cmockery2 X-SVN-Group: ports-branches X-SVN-Commit-Author: leres X-SVN-Commit-Paths: in branches/2018Q1: mail/imapsync security/bro sysutils/cmockery2 X-SVN-Commit-Revision: 463362 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, 02 Mar 2018 00:38:46 -0000 Author: leres Date: Fri Mar 2 00:38:45 2018 New Revision: 463362 URL: https://svnweb.freebsd.org/changeset/ports/463362 Log: MFH: r461924 r462351 r462460 Use USE_GITHUB instead of hand crafting urls. Sponsored by: Absolight Add a NETMAP option to build and install the bro netmap plugin. PR: 224918 Reported by: Shane Peters Reviewed by: matthew (mentor) Approved by: matthew (mentor) Differential Revision: https://reviews.freebsd.org/D14378 Update to 2.5.3 which fixes an integer overflow: http://blog.bro.org/2018/02/bro-253-released-security-update.html Note that a CVE has not been assigned yet. Reviewed by: matthew (mentor) Approved by: matthew (mentor) Differential Revision: https://reviews.freebsd.org/D14444 Approved by: ports-secteam (swills) Modified: branches/2018Q1/mail/imapsync/Makefile branches/2018Q1/mail/imapsync/distinfo branches/2018Q1/security/bro/Makefile branches/2018Q1/security/bro/distinfo branches/2018Q1/security/bro/pkg-plist branches/2018Q1/sysutils/cmockery2/Makefile branches/2018Q1/sysutils/cmockery2/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/mail/imapsync/Makefile ============================================================================== --- branches/2018Q1/mail/imapsync/Makefile Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/mail/imapsync/Makefile Fri Mar 2 00:38:45 2018 (r463362) @@ -3,9 +3,8 @@ PORTNAME= imapsync PORTVERSION= 1.836 -DISTVERSIONPREFIX= v +DISTVERSIONPREFIX= imapsync- CATEGORIES= mail perl5 -MASTER_SITES= https://codeload.github.com/imapsync/imapsync/tar.gz/imapsync-${PORTVERSION}?dummy=/ MAINTAINER= pi@FreeBSD.org COMMENT= IMAP synchronization, copy or migration tool @@ -25,10 +24,9 @@ RUN_DEPENDS= p5-Mail-IMAPClient>0:mail/p5-Mail-IMAPCli p5-Sys-MemInfo>0:devel/p5-Sys-MemInfo \ p5-IO-Socket-INET6>0:net/p5-IO-Socket-INET6 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION} - USES= cpe perl5 tar:tgz shebangfix SHEBANG_FILES= ${PORTNAME} +USE_GITHUB= yes CPE_VENDOR= gilles_lamiral NO_BUILD= yes Modified: branches/2018Q1/mail/imapsync/distinfo ============================================================================== --- branches/2018Q1/mail/imapsync/distinfo Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/mail/imapsync/distinfo Fri Mar 2 00:38:45 2018 (r463362) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509971458 -SHA256 (imapsync-v1.836.tgz) = 544b8394df6db8722bfd02c8150f3dc5ca48900605efc7f965c1968ce64f3d0a -SIZE (imapsync-v1.836.tgz) = 1741595 +TIMESTAMP = 1518701382 +SHA256 (imapsync-imapsync-imapsync-1.836_GH0.tar.gz) = 544b8394df6db8722bfd02c8150f3dc5ca48900605efc7f965c1968ce64f3d0a +SIZE (imapsync-imapsync-imapsync-1.836_GH0.tar.gz) = 1741595 Modified: branches/2018Q1/security/bro/Makefile ============================================================================== --- branches/2018Q1/security/bro/Makefile Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/security/bro/Makefile Fri Mar 2 00:38:45 2018 (r463362) @@ -2,12 +2,10 @@ # $FreeBSD$ PORTNAME= bro -PORTVERSION= 2.5.2 +PORTVERSION= 2.5.3 CATEGORIES= security -MASTER_SITES= https://www.bro.org/downloads/:source1 \ - https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${PORTVERSION2}?dummy=/:source2 -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:source1 \ - ${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION2}_GH0${EXTRACT_SUFX}:source2 +MASTER_SITES= https://www.bro.org/downloads/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= leres@FreeBSD.org COMMENT= System for detecting network intruders in real-time @@ -18,16 +16,11 @@ BROKEN_powerpc64= Does not build: error: zero-size arr LIB_DEPENDS= libGeoIP.so:net/GeoIP -GH_ACCOUNT= actor-framework -GH_PROJECT= ${GH_ACCOUNT} - USES= bison cmake:outsource compiler:c++11-lang ninja perl5 python shebangfix ssl CMAKE_ARGS+= -DPYTHON_EXECUTABLE:PATH=${PYTHON_CMD} CXXFLAGS+= -std=c++11 -Wall -PORTVERSION2= 0.14.6 -WRKSRC2= ${WRKDIR}/${GH_PROJECT}-${PORTVERSION2} STAGEDIR2= ${STAGEDIR}-caf SHEBANG_FILES= aux/broctl/aux/trace-summary/trace-summary @@ -51,14 +44,17 @@ CMAKE_ARGS+= -GNinja \ BROUSER?= bro BROGROUP?= bro -PLIST_SUB+= BROUSER=${BROUSER} \ - BROGROUP=${BROGROUP} +PLIST_SUB+= ARCH=${ARCH} \ + BROUSER=${BROUSER} \ + BROGROUP=${BROGROUP} \ + LCASE_OPSYS=${OPSYS:tl} USERS= ${BROUSER} GROUPS= ${BROGROUP} -OPTIONS_DEFINE= BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS -OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF +OPTIONS_DEFINE= BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF \ + NETMAP PERFTOOLS +OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF NETMAP OPTIONS_SUB= yes BROCCOLI_DESC= Build support for libbroccoli communications @@ -81,12 +77,16 @@ BROCTL_CMAKE_BOOL= INSTALL_BROCTL BROCTL_USE= LDCONFIG=yes IPSUMDUMP_BUILD_DEPENDS=ipsumdump:net/ipsumdump IPSUMDUMP_RUN_DEPENDS= ipsumdump:net/ipsumdump -BROKER_CMAKE_BOOL= ENABLE_BROKER BROKER_BUILD_DEPENDS= swig3.0:devel/swig30 +BROKER_CMAKE_BOOL= ENABLE_BROKER BROKER_CMAKE_ON+= -DCAF_ROOT_DIR=${STAGEDIR2}${PREFIX} +BROKER_GH_TUPLE= actor-framework:actor-framework:0.14.6:actor_framework +BROKER_USE= GITHUB=nodefault DEBUG_CMAKE_BOOL= ENABLE_DEBUG LBL_HF_RUN_DEPENDS= ${LOCALBASE}/bin/hf:sysutils/lbl-hf LBL_CF_RUN_DEPENDS= ${LOCALBASE}/bin/cf:sysutils/lbl-cf +NETMAP_GH_TUPLE= bro:bro-netmap:cf88debf487b31ab30dc3b5bac64783b4e49997e:bro_netmap +NETMAP_USE= GITHUB=nodefault PERFTOOLS_CMAKE_BOOL= ENABLE_PERFTOOLS PERFTOOLS_RUN_DEPENDS= ${LOCALBASE}/bin/pprof:devel/google-perftools PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 @@ -105,8 +105,6 @@ CMAKE_ARGS2= -GNinja \ -D CAF_NO_OPENCL:BOOL=yes \ -D CAF_NO_UNIT_TESTS:BOOL=yes -CMAKE_SOURCE_PATH2= ${WRKSRC2} - CONFIGURE_WRKSRC2= ${WRKDIR}/.build-caf BUILD_WRKSRC2= ${CONFIGURE_WRKSRC2} INSTALL_WRKSRC2= ${CONFIGURE_WRKSRC2} @@ -115,7 +113,7 @@ INSTALL_WRKSRC2= ${CONFIGURE_WRKSRC2} pre-configure-BROKER-on: ${MKDIR} ${CONFIGURE_WRKSRC2} (cd ${CONFIGURE_WRKSRC2} && \ - ${CMAKE_BIN} ${CMAKE_ARGS2} ${CMAKE_SOURCE_PATH2}) + ${CMAKE_BIN} ${CMAKE_ARGS2} ${WRKSRC_actor_framework}) ${MKDIR} ${STAGEDIR2} (cd ${BUILD_WRKSRC2} && \ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} install) @@ -133,5 +131,11 @@ post-install-BROCTL-on: pre-install-BROCTL-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d + +post-build-NETMAP-on: + ${LN} -s ../.build ${WRKSRC}/build + (cd ${WRKSRC_bro_netmap} && ./configure --bro-dist=${WRKSRC} \ + --install-root=${STAGEDIR}${PREFIX}/lib/bro/plugins && \ + make && make install) .include Modified: branches/2018Q1/security/bro/distinfo ============================================================================== --- branches/2018Q1/security/bro/distinfo Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/security/bro/distinfo Fri Mar 2 00:38:45 2018 (r463362) @@ -1,5 +1,7 @@ -TIMESTAMP = 1508621466 -SHA256 (bro-2.5.2.tar.gz) = ab95b1bc376282919e5fa6b25b5ef8864e2e7bd5efe842db35d4a223b8f5b970 -SIZE (bro-2.5.2.tar.gz) = 18512696 +TIMESTAMP = 1518744511 +SHA256 (bro-2.5.3.tar.gz) = 7384fa14e6cebc86488040877fc0bfd50868e969f0fa05178cef0116e4116225 +SIZE (bro-2.5.3.tar.gz) = 18514905 SHA256 (actor-framework-actor-framework-0.14.6_GH0.tar.gz) = cbc2033896fe41e42604de2f74673971718a40684996650157484485755f7720 SIZE (actor-framework-actor-framework-0.14.6_GH0.tar.gz) = 1239451 +SHA256 (bro-bro-netmap-cf88debf487b31ab30dc3b5bac64783b4e49997e_GH0.tar.gz) = 383423f92932c3ef244194954708b3a237b4f37ebc358014f51dcb3b9786896b +SIZE (bro-bro-netmap-cf88debf487b31ab30dc3b5bac64783b4e49997e_GH0.tar.gz) = 24630 Modified: branches/2018Q1/security/bro/pkg-plist ============================================================================== --- branches/2018Q1/security/bro/pkg-plist Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/security/bro/pkg-plist Fri Mar 2 00:38:45 2018 (r463362) @@ -56,6 +56,12 @@ bin/bro-cut %%BROKER%%include/broker/util/operators.hh %%BROKER%%include/broker/util/optional.hh %%BROKER%%include/broker/util/variant.hh +%%NETMAP%%lib/bro/plugins/Bro_Netmap/COPYING +%%NETMAP%%lib/bro/plugins/Bro_Netmap/__bro_plugin__ +%%NETMAP%%lib/bro/plugins/Bro_Netmap/broctl/netmap.py +%%NETMAP%%lib/bro/plugins/Bro_Netmap/lib/Bro-Netmap.%%LCASE_OPSYS%%-%%ARCH%%.so +%%NETMAP%%lib/bro/plugins/Bro_Netmap/scripts/__load__.bro +%%NETMAP%%lib/bro/plugins/Bro_Netmap/scripts/init.bro %%BROCTL%%lib/broctl/BroControl/__init__.py %%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/__init__.pyc %%BROCTL%%lib/broctl/BroControl/brocmd.py @@ -780,5 +786,9 @@ man/man8/bro.8.gz %%BROCTL%%@dir lib/broctl/plugins %%BROCTL%%@dir lib/broctl/BroControl %%BROCTL%%@dir lib/broctl +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/scripts +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/lib +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/broctl +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap @dir lib/bro/plugins %%BROCTL%%@postexec su -fm %%BROUSER%% -c '%D/bin/broctl install; rm -f %D/spool/debug.log' Modified: branches/2018Q1/sysutils/cmockery2/Makefile ============================================================================== --- branches/2018Q1/sysutils/cmockery2/Makefile Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/sysutils/cmockery2/Makefile Fri Mar 2 00:38:45 2018 (r463362) @@ -4,21 +4,19 @@ PORTNAME= cmockery2 PORTVERSION= 1.3.8 +DISTVERSIONPREFIX= v CATEGORIES= sysutils -MASTER_SITES= https://codeload.github.com/lpabon/cmockery2/tar.gz/ -DISTNAME= v1.3.8 -EXTRACT_SUFX= MAINTAINER= harsha@harshavardhana.net COMMENT= Cmockery2 revival of Cmockery unit test framework from Google LICENSE= APACHE20 -WRKSRC= ${WRKDIR}/cmockery2-${PORTVERSION} - -GNU_CONFIGURE= yes USES= autoreconf libtool pkgconfig USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= lpabon +GNU_CONFIGURE= yes INSTALL_TARGET= install-strip # Disable gcov on FreeBSD Modified: branches/2018Q1/sysutils/cmockery2/distinfo ============================================================================== --- branches/2018Q1/sysutils/cmockery2/distinfo Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/sysutils/cmockery2/distinfo Fri Mar 2 00:38:45 2018 (r463362) @@ -1,2 +1,3 @@ -SHA256 (v1.3.8) = 6178e2fc51653d1b15f5d7cc10e0f48adcbf6cd07c1acf793ea26bfa789e7ef7 -SIZE (v1.3.8) = 54110 +TIMESTAMP = 1518701569 +SHA256 (lpabon-cmockery2-v1.3.8_GH0.tar.gz) = 6178e2fc51653d1b15f5d7cc10e0f48adcbf6cd07c1acf793ea26bfa789e7ef7 +SIZE (lpabon-cmockery2-v1.3.8_GH0.tar.gz) = 54110 From owner-svn-ports-branches@freebsd.org Fri Mar 2 14:34: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 8F2BAF28B58; Fri, 2 Mar 2018 14:34:53 +0000 (UTC) (envelope-from girgen@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 3DEC383CFC; Fri, 2 Mar 2018 14:34:53 +0000 (UTC) (envelope-from girgen@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 1AA5D18BCB; Fri, 2 Mar 2018 14:34:53 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w22EYqCG026083; Fri, 2 Mar 2018 14:34:52 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w22EYqxD026080; Fri, 2 Mar 2018 14:34:52 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201803021434.w22EYqxD026080@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Fri, 2 Mar 2018 14:34:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463405 - branches/2018Q1/devel/xmltooling X-SVN-Group: ports-branches X-SVN-Commit-Author: girgen X-SVN-Commit-Paths: branches/2018Q1/devel/xmltooling X-SVN-Commit-Revision: 463405 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, 02 Mar 2018 14:34:53 -0000 Author: girgen Date: Fri Mar 2 14:34:52 2018 New Revision: 463405 URL: https://svnweb.freebsd.org/changeset/ports/463405 Log: MFH: r458860 r463146 Update to version 1.6.3 Shibboleth SP software vulnerable to forged user attribute data ==================================================================== The Service Provider software relies on a generic XML parser to process SAML responses and there are limitations in older versions of the parser that make it impossible to fully disable Document Type Definition (DTD) processing. Through addition/manipulation of a DTD, it's possible to make changes to an XML document that do not break a digital signature but are mishandled by the SP and its libraries. These manipulations can alter the user data passed through to applications behind the SP and result in impersonation attacks and exposure of protected information. While the use of XML Encryption can serve as a mitigation for this bug, it may still be possible to construct attacks in such cases, and the SP does not provide a means to enforce its use. An updated version of XMLTooling-C (V1.6.3) is available that works around this specific bug. While newer versions of the parser are configured by the SP into disallowing the use of a DTD via an environment variable, this feature is not present in the parser used on some supported platforms (notably Red Hat and CentOS 7), so an additional fix is being provided now that an actual DTD exploit has been identified. Security: CVE-2018-0486 Shibboleth SP software vulnerable to additional data forgery flaws The XML processing performed by the Service Provider software has been found to be vulnerable to new flaws similar in nature to the one addressed in an advisory last month. Security: 22438240-1bd0-11e8-a2ec-6cc21735f730 URL: https://shibboleth.net/community/advisories/secadv_20180227.txt Approved by: ports-secteam Modified: branches/2018Q1/devel/xmltooling/Makefile branches/2018Q1/devel/xmltooling/distinfo branches/2018Q1/devel/xmltooling/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/devel/xmltooling/Makefile ============================================================================== --- branches/2018Q1/devel/xmltooling/Makefile Fri Mar 2 14:32:37 2018 (r463404) +++ branches/2018Q1/devel/xmltooling/Makefile Fri Mar 2 14:34:52 2018 (r463405) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xmltooling -PORTVERSION= 1.6.2 +PORTVERSION= 1.6.4 CATEGORIES= devel security MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/2.6.1/ Modified: branches/2018Q1/devel/xmltooling/distinfo ============================================================================== --- branches/2018Q1/devel/xmltooling/distinfo Fri Mar 2 14:32:37 2018 (r463404) +++ branches/2018Q1/devel/xmltooling/distinfo Fri Mar 2 14:34:52 2018 (r463405) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510878752 -SHA256 (xmltooling-1.6.2.tar.bz2) = 9fa592b2c000f6775e34c6898a4cc21d0a0b9af3fc26a16cc327a426f9caae3c -SIZE (xmltooling-1.6.2.tar.bz2) = 580621 +TIMESTAMP = 1519744998 +SHA256 (xmltooling-1.6.4.tar.bz2) = 4c0c4a08b8c55f1210673281f37fc95b6d1d365a8cdc726fd189dea96c45efca +SIZE (xmltooling-1.6.4.tar.bz2) = 581796 Modified: branches/2018Q1/devel/xmltooling/pkg-plist ============================================================================== --- branches/2018Q1/devel/xmltooling/pkg-plist Fri Mar 2 14:32:37 2018 (r463404) +++ branches/2018Q1/devel/xmltooling/pkg-plist Fri Mar 2 14:34:52 2018 (r463405) @@ -83,10 +83,10 @@ include/xmltooling/validation/ValidatorSuite.h include/xmltooling/version.h lib/libxmltooling-lite.so lib/libxmltooling-lite.so.7 -lib/libxmltooling-lite.so.7.0.2 +lib/libxmltooling-lite.so.7.0.4 lib/libxmltooling.so lib/libxmltooling.so.7 -lib/libxmltooling.so.7.0.2 +lib/libxmltooling.so.7.0.4 libdata/pkgconfig/xmltooling.pc share/xml/xmltooling/catalog.xml share/xml/xmltooling/soap-envelope.xsd From owner-svn-ports-branches@freebsd.org Fri Mar 2 21:39: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 EB368F47DCC; Fri, 2 Mar 2018 21:39:40 +0000 (UTC) (envelope-from leres@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 9EC177A277; Fri, 2 Mar 2018 21:39:40 +0000 (UTC) (envelope-from leres@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 99B951CFE7; Fri, 2 Mar 2018 21:39:40 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w22Lde4x040123; Fri, 2 Mar 2018 21:39:40 GMT (envelope-from leres@FreeBSD.org) Received: (from leres@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w22LdegM040121; Fri, 2 Mar 2018 21:39:40 GMT (envelope-from leres@FreeBSD.org) Message-Id: <201803022139.w22LdegM040121@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: leres set sender to leres@FreeBSD.org using -f From: Craig Leres Date: Fri, 2 Mar 2018 21:39:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463449 - branches/2018Q1/www/mini_httpd X-SVN-Group: ports-branches X-SVN-Commit-Author: leres X-SVN-Commit-Paths: branches/2018Q1/www/mini_httpd X-SVN-Commit-Revision: 463449 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, 02 Mar 2018 21:39:41 -0000 Author: leres Date: Fri Mar 2 21:39:40 2018 New Revision: 463449 URL: https://svnweb.freebsd.org/changeset/ports/463449 Log: MFH: r461322 Update to 1.28 which fixes a buffer overflow (that will be) documented in CVE-2017-17663. Reviewed by: matthew (mentor) Approved by: matthew (mentor) Security: f5524753-67b1-4c88-8114-29c2d258b383 Differential Revision: https://reviews.freebsd.org/D14218 Approved by: ports-secteam (feld) Modified: branches/2018Q1/www/mini_httpd/Makefile branches/2018Q1/www/mini_httpd/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/mini_httpd/Makefile ============================================================================== --- branches/2018Q1/www/mini_httpd/Makefile Fri Mar 2 20:11:57 2018 (r463448) +++ branches/2018Q1/www/mini_httpd/Makefile Fri Mar 2 21:39:40 2018 (r463449) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mini_httpd -PORTVERSION= 1.27 +PORTVERSION= 1.28 CATEGORIES= www ipv6 MASTER_SITES= https://www.acme.com/software/mini_httpd/ Modified: branches/2018Q1/www/mini_httpd/distinfo ============================================================================== --- branches/2018Q1/www/mini_httpd/distinfo Fri Mar 2 20:11:57 2018 (r463448) +++ branches/2018Q1/www/mini_httpd/distinfo Fri Mar 2 21:39:40 2018 (r463449) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488912725 -SHA256 (mini_httpd-1.27.tar.gz) = e5d6041f2906f4099284e004d7641b8f06414fe54901e554bebe777e6d889d37 -SIZE (mini_httpd-1.27.tar.gz) = 43473 +TIMESTAMP = 1517878208 +SHA256 (mini_httpd-1.28.tar.gz) = d4ea88a0493a2794ea62ac5a2aaf6825c8b064405959a22af3c04b587e87d971 +SIZE (mini_httpd-1.28.tar.gz) = 43759 From owner-svn-ports-branches@freebsd.org Fri Mar 2 23:31: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 1ABFEF2C60C; Fri, 2 Mar 2018 23:31:39 +0000 (UTC) (envelope-from ler@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 C4CDA7F337; Fri, 2 Mar 2018 23:31:38 +0000 (UTC) (envelope-from ler@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 BFADD1E30E; Fri, 2 Mar 2018 23:31:38 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w22NVciB096165; Fri, 2 Mar 2018 23:31:38 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w22NVcwm096163; Fri, 2 Mar 2018 23:31:38 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201803022331.w22NVcwm096163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Fri, 2 Mar 2018 23:31:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463453 - branches/2018Q1/security/clamav X-SVN-Group: ports-branches X-SVN-Commit-Author: ler X-SVN-Commit-Paths: branches/2018Q1/security/clamav X-SVN-Commit-Revision: 463453 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, 02 Mar 2018 23:31:39 -0000 Author: ler Date: Fri Mar 2 23:31:38 2018 New Revision: 463453 URL: https://svnweb.freebsd.org/changeset/ports/463453 Log: MFH: r463407 security/clamav: upgrade to 0.99.4 Release notes: http://blog.clamav.net/2018/03/clamav-0994-has-been-released.html Submitted by: mmokhi Security: CVE-2012-6706 Security: CVE-2017-6419 Security: CVE-2017-11423 Security: CVE-2018-1000085 Security: CVE-2018-0202 Differential Revision: https://reviews.freebsd.org/D14562 Approved by: ports-secteam (zi) Modified: branches/2018Q1/security/clamav/Makefile branches/2018Q1/security/clamav/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/security/clamav/Makefile ============================================================================== --- branches/2018Q1/security/clamav/Makefile Fri Mar 2 22:34:53 2018 (r463452) +++ branches/2018Q1/security/clamav/Makefile Fri Mar 2 23:31:38 2018 (r463453) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= clamav -PORTVERSION= 0.99.3 +PORTVERSION= 0.99.4 CATEGORIES= security MASTER_SITES= http://www.clamav.net/downloads/production/ Modified: branches/2018Q1/security/clamav/distinfo ============================================================================== --- branches/2018Q1/security/clamav/distinfo Fri Mar 2 22:34:53 2018 (r463452) +++ branches/2018Q1/security/clamav/distinfo Fri Mar 2 23:31:38 2018 (r463453) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516919350 -SHA256 (clamav-0.99.3.tar.gz) = 00fa5292a6e00a3a4035b826267748965d5d2c4943d8ff417d740238263e8e84 -SIZE (clamav-0.99.3.tar.gz) = 16082645 +TIMESTAMP = 1520002083 +SHA256 (clamav-0.99.4.tar.gz) = d72ac3273bde8d2e5e28ec9978373ee3ab4529fd868bc3fc4d2d2671228f2461 +SIZE (clamav-0.99.4.tar.gz) = 16083015 From owner-svn-ports-branches@freebsd.org Sat Mar 3 00:55: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 58953F32CEE; Sat, 3 Mar 2018 00:55: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 06AAD8379F; Sat, 3 Mar 2018 00:55: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 DB82B1F092; Sat, 3 Mar 2018 00:55:06 +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 w230t66C040358; Sat, 3 Mar 2018 00:55:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w230t6GG040350; Sat, 3 Mar 2018 00:55:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201803030055.w230t6GG040350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 3 Mar 2018 00:55:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463458 - in branches/2018Q1/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www/waterfox: . files X-SVN-Commit-Revision: 463458 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, 03 Mar 2018 00:55:07 -0000 Author: jbeich Date: Sat Mar 3 00:55:06 2018 New Revision: 463458 URL: https://svnweb.freebsd.org/changeset/ports/463458 Log: MFH: r463455 www/waterfox: apply some FF59 fixes Approved by: ports-secteam blanket Added: branches/2018Q1/www/waterfox/files/patch-bug1382359 - copied unchanged from r463455, head/www/waterfox/files/patch-bug1382359 branches/2018Q1/www/waterfox/files/patch-bug1404297 - copied unchanged from r463455, head/www/waterfox/files/patch-bug1404297 branches/2018Q1/www/waterfox/files/patch-bug1425520 - copied unchanged from r463455, head/www/waterfox/files/patch-bug1425520 branches/2018Q1/www/waterfox/files/patch-bug1437450 - copied unchanged from r463455, head/www/waterfox/files/patch-bug1437450 branches/2018Q1/www/waterfox/files/patch-bug1440775 - copied unchanged from r463455, head/www/waterfox/files/patch-bug1440775 branches/2018Q1/www/waterfox/files/patch-bug1441006 - copied unchanged from r463455, head/www/waterfox/files/patch-bug1441006 Modified: branches/2018Q1/www/waterfox/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/waterfox/Makefile ============================================================================== --- branches/2018Q1/www/waterfox/Makefile Sat Mar 3 00:53:46 2018 (r463457) +++ branches/2018Q1/www/waterfox/Makefile Sat Mar 3 00:55:06 2018 (r463458) @@ -3,7 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.0.4-20 DISTVERSIONSUFFIX= -ge03e284b083d -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q1/www/waterfox/files/patch-bug1382359 (from r463455, head/www/waterfox/files/patch-bug1382359) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1382359 Sat Mar 3 00:55:06 2018 (r463458, copy of r463455, head/www/waterfox/files/patch-bug1382359) @@ -0,0 +1,138 @@ +commit dd4fb3ba9f14 +Author: Georg Koppen +Date: Thu Mar 1 09:44:30 2018 +0100 + + Bug 1382359: Treat .onion as a secure context + + Websites which collect passwords but don't use HTTPS start showing scary + warnings from Firefox 51 onwards and mixed context blocking has been + available even longer. + + .onion sites without HTTPS support are affected as well, although their + traffic is encrypted and authenticated. This patch addresses this + shortcoming by making sure .onion sites are treated as potentially + trustworthy origins. + + The secure context specification + (https://w3c.github.io/webappsec-secure-contexts/) is pretty much focused + on tying security and trustworthiness to the protocol over which domains + are accessed. However, it is not obvious why .onion sites should not be + treated as potentially trustworthy given: + + "A potentially trustworthy origin is one which a user agent can + generally trust as delivering data securely. + + This algorithms [sic] considers certain hosts, scheme, and origins as + potentially trustworthy, even though they might not be authenticated and + encrypted in the traditional sense." + (https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy) + + We use step 8 in the algorithm to establish trustworthiness of .onion + sites by whitelisting them given the encrypted and authenticated nature + of their traffic. +--- + dom/html/HTMLFormElement.cpp | 4 ++++ + dom/security/nsContentSecurityManager.cpp | 7 +++++++ + dom/security/nsMixedContentBlocker.cpp | 29 +++++++++++++++++++++++++++++ + dom/security/nsMixedContentBlocker.h | 1 + + 4 files changed, 41 insertions(+) + +diff --git dom/html/HTMLFormElement.cpp dom/html/HTMLFormElement.cpp +index 02b3553c8a14..0e00b961ed45 100644 +--- dom/html/HTMLFormElement.cpp ++++ dom/html/HTMLFormElement.cpp +@@ -867,6 +867,10 @@ HTMLFormElement::DoSecureToInsecureSubmitCheck(nsIURI* aActionURL, + return NS_OK; + } + ++ if (nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(aActionURL)) { ++ return NS_OK; ++ } ++ + nsCOMPtr window = OwnerDoc()->GetWindow(); + if (!window) { + return NS_ERROR_FAILURE; +diff --git dom/security/nsContentSecurityManager.cpp dom/security/nsContentSecurityManager.cpp +index ed83d490ca3f..d0e50d51bfd2 100644 +--- dom/security/nsContentSecurityManager.cpp ++++ dom/security/nsContentSecurityManager.cpp +@@ -13,6 +13,7 @@ + #include "nsIImageLoadingContent.h" + + #include "mozilla/dom/Element.h" ++#include "mozilla/dom/nsMixedContentBlocker.h" + + NS_IMPL_ISUPPORTS(nsContentSecurityManager, + nsIContentSecurityManager, +@@ -879,6 +880,12 @@ nsContentSecurityManager::IsOriginPotentiallyTrustworthy(nsIPrincipal* aPrincipa + } + } + } ++ // Maybe we have a .onion URL. Treat it as whitelisted as well if ++ // `dom.securecontext.whitelist_onions` is `true`. ++ if (nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(uri)) { ++ *aIsTrustWorthy = true; ++ return NS_OK; ++ } + } + + return NS_OK; +diff --git dom/security/nsMixedContentBlocker.cpp dom/security/nsMixedContentBlocker.cpp +index 918a6ce53132..0361e744c800 100644 +--- dom/security/nsMixedContentBlocker.cpp ++++ dom/security/nsMixedContentBlocker.cpp +@@ -395,6 +395,28 @@ nsMixedContentBlocker::IsPotentiallyTrustworthyLoopbackURL(nsIURI* aURL) { + return host.EqualsLiteral("127.0.0.1") || host.EqualsLiteral("::1"); + } + ++/* Maybe we have a .onion URL. Treat it as whitelisted as well if ++ * `dom.securecontext.whitelist_onions` is `true`. ++ */ ++bool ++nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(nsIURI* aURL) { ++ static bool sInited = false; ++ static bool sWhiteListOnions = false; ++ if (!sInited) { ++ Preferences::AddBoolVarCache(&sWhiteListOnions, ++ "dom.securecontext.whitelist_onions"); ++ sInited = true; ++ } ++ if (!sWhiteListOnions) { ++ return false; ++ } ++ ++ nsAutoCString host; ++ nsresult rv = aURL->GetHost(host); ++ NS_ENSURE_SUCCESS(rv, false); ++ return StringEndsWith(host, NS_LITERAL_CSTRING(".onion")); ++} ++ + /* Static version of ShouldLoad() that contains all the Mixed Content Blocker + * logic. Called from non-static ShouldLoad(). + */ +@@ -725,6 +747,13 @@ nsMixedContentBlocker::ShouldLoad(bool aHadInsecureImageRedirect, + return NS_OK; + } + ++ // .onion URLs are encrypted and authenticated. Don't treat them as mixed ++ // content if potentially trustworthy (i.e. whitelisted). ++ if (isHttpScheme && IsPotentiallyTrustworthyOnion(innerContentLocation)) { ++ *aDecision = ACCEPT; ++ return NS_OK; ++ } ++ + // The page might have set the CSP directive 'upgrade-insecure-requests'. In such + // a case allow the http: load to succeed with the promise that the channel will + // get upgraded to https before fetching any data from the netwerk. +diff --git dom/security/nsMixedContentBlocker.h dom/security/nsMixedContentBlocker.h +index b7e4a7457bd2..a9b4dbdb612e 100644 +--- dom/security/nsMixedContentBlocker.h ++++ dom/security/nsMixedContentBlocker.h +@@ -48,6 +48,7 @@ public: + // See: + // https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy + static bool IsPotentiallyTrustworthyLoopbackURL(nsIURI* aURL); ++ static bool IsPotentiallyTrustworthyOnion(nsIURI* aURL); + + /* Static version of ShouldLoad() that contains all the Mixed Content Blocker + * logic. Called from non-static ShouldLoad(). Copied: branches/2018Q1/www/waterfox/files/patch-bug1404297 (from r463455, head/www/waterfox/files/patch-bug1404297) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1404297 Sat Mar 3 00:55:06 2018 (r463458, copy of r463455, head/www/waterfox/files/patch-bug1404297) @@ -0,0 +1,260 @@ +commit 586e13b2b708 +Author: Blake Kaplan +Date: Wed Jan 10 18:48:26 2018 -0500 + + Bug 1404297 - Temporarily assert that we don't re-enter this function. r=bzbarsky + + MozReview-Commit-ID: FoQGVDWtwN1 + + --HG-- + extra : rebase_source : c22cc3a022dc01923696940fc0b0aae708232db0 +--- + dom/base/nsDocument.cpp | 8 ++------ + dom/base/nsIDocument.h | 2 -- + 2 files changed, 2 insertions(+), 8 deletions(-) + +diff --git dom/base/nsDocument.cpp dom/base/nsDocument.cpp +index 1b98f94341c2..ad08c02d51dc 100644 +--- dom/base/nsDocument.cpp ++++ dom/base/nsDocument.cpp +@@ -1496,9 +1496,7 @@ nsIDocument::nsIDocument() + mType(eUnknown), + mDefaultElementType(0), + mAllowXULXBL(eTriUnset), +-#ifdef DEBUG + mIsLinkUpdateRegistrationsForbidden(false), +-#endif + mBidiOptions(IBMBIDI_DEFAULT_BIDI_OPTIONS), + mSandboxFlags(0), + mPartID(0), +@@ -10117,7 +10115,7 @@ nsIDocument::EnumerateActivityObservers(ActivityObserverEnumerator aEnumerator, + void + nsIDocument::RegisterPendingLinkUpdate(Link* aLink) + { +- MOZ_ASSERT(!mIsLinkUpdateRegistrationsForbidden); ++ MOZ_RELEASE_ASSERT(!mIsLinkUpdateRegistrationsForbidden); + + if (aLink->HasPendingLinkUpdate()) { + return; +@@ -10156,14 +10154,12 @@ nsIDocument::FlushPendingLinkUpdatesFromRunnable() + void + nsIDocument::FlushPendingLinkUpdates() + { +- MOZ_ASSERT(!mIsLinkUpdateRegistrationsForbidden); ++ MOZ_RELEASE_ASSERT(!mIsLinkUpdateRegistrationsForbidden); + if (!mHasLinksToUpdate) + return; + +-#ifdef DEBUG + AutoRestore saved(mIsLinkUpdateRegistrationsForbidden); + mIsLinkUpdateRegistrationsForbidden = true; +-#endif + for (auto iter = mLinksToUpdate.Iter(); !iter.Done(); iter.Next()) { + Link* link = iter.Get(); + Element* element = link->GetElement(); +diff --git dom/base/nsIDocument.h dom/base/nsIDocument.h +index f0a3a32ede08..59deb3289f56 100644 +--- dom/base/nsIDocument.h ++++ dom/base/nsIDocument.h +@@ -3621,13 +3621,11 @@ protected: + + Tri mAllowXULXBL; + +-#ifdef DEBUG + /** + * This is true while FlushPendingLinkUpdates executes. Calls to + * [Un]RegisterPendingLinkUpdate will assert when this is true. + */ + bool mIsLinkUpdateRegistrationsForbidden; +-#endif + + // The document's script global object, the object from which the + // document can get its script context and scope. This is the +commit 75a57d01385d +Author: Blake Kaplan +Date: Thu Mar 1 11:26:54 2018 -0800 + + Bug 1404297 - Change the way we iterate over our links to update. r=smaug, a=RyanVM + + MozReview-Commit-ID: BTADrB9itjh + + --HG-- + extra : source : 3ce55799da20fcf99ceb7a209db65b2830f38630 + extra : histedit_source : 413764b6db689b36ed74b176c382cd3600f05a77 +--- + dom/base/nsDocument.cpp | 36 +++++++++++++++++------------------- + dom/base/nsIDocument.h | 23 ++++++++++------------- + 2 files changed, 27 insertions(+), 32 deletions(-) + +diff --git dom/base/nsDocument.cpp dom/base/nsDocument.cpp +index 3045f0f20ef2..336670b96c76 100644 +--- dom/base/nsDocument.cpp ++++ dom/base/nsDocument.cpp +@@ -1450,8 +1450,8 @@ nsIDocument::nsIDocument() + mHasHadScriptHandlingObject(false), + mIsBeingUsedAsImage(false), + mIsSyntheticDocument(false), +- mHasLinksToUpdate(false), + mHasLinksToUpdateRunnable(false), ++ mFlushingPendingLinkUpdates(false), + mMayHaveDOMMutationObservers(false), + mMayHaveAnimationObservers(false), + mHasMixedActiveContentLoaded(false), +@@ -1496,7 +1496,6 @@ nsIDocument::nsIDocument() + mType(eUnknown), + mDefaultElementType(0), + mAllowXULXBL(eTriUnset), +- mIsLinkUpdateRegistrationsForbidden(false), + mBidiOptions(IBMBIDI_DEFAULT_BIDI_OPTIONS), + mSandboxFlags(0), + mPartID(0), +@@ -10017,15 +10016,13 @@ nsIDocument::EnumerateActivityObservers(ActivityObserverEnumerator aEnumerator, + void + nsIDocument::RegisterPendingLinkUpdate(Link* aLink) + { +- MOZ_RELEASE_ASSERT(!mIsLinkUpdateRegistrationsForbidden); +- + if (aLink->HasPendingLinkUpdate()) { + return; + } + + aLink->SetHasPendingLinkUpdate(); + +- if (!mHasLinksToUpdateRunnable) { ++ if (!mHasLinksToUpdateRunnable && !mFlushingPendingLinkUpdates) { + nsCOMPtr event = + NewRunnableMethod("nsIDocument::FlushPendingLinkUpdatesFromRunnable", + this, +@@ -10042,7 +10039,6 @@ nsIDocument::RegisterPendingLinkUpdate(Link* aLink) + } + + mLinksToUpdate.InfallibleAppend(aLink); +- mHasLinksToUpdate = true; + } + + void +@@ -10056,24 +10052,26 @@ nsIDocument::FlushPendingLinkUpdatesFromRunnable() + void + nsIDocument::FlushPendingLinkUpdates() + { +- MOZ_RELEASE_ASSERT(!mIsLinkUpdateRegistrationsForbidden); +- if (!mHasLinksToUpdate) ++ if (mFlushingPendingLinkUpdates) { + return; ++ } + +- AutoRestore saved(mIsLinkUpdateRegistrationsForbidden); +- mIsLinkUpdateRegistrationsForbidden = true; +- for (auto iter = mLinksToUpdate.Iter(); !iter.Done(); iter.Next()) { +- Link* link = iter.Get(); +- Element* element = link->GetElement(); +- if (element->OwnerDoc() == this) { +- link->ClearHasPendingLinkUpdate(); +- if (element->IsInComposedDoc()) { +- element->UpdateLinkState(link->LinkState()); ++ auto restore = MakeScopeExit([&] { mFlushingPendingLinkUpdates = false; }); ++ mFlushingPendingLinkUpdates = true; ++ ++ while (!mLinksToUpdate.IsEmpty()) { ++ LinksToUpdateList links(Move(mLinksToUpdate)); ++ for (auto iter = links.Iter(); !iter.Done(); iter.Next()) { ++ Link* link = iter.Get(); ++ Element* element = link->GetElement(); ++ if (element->OwnerDoc() == this) { ++ link->ClearHasPendingLinkUpdate(); ++ if (element->IsInComposedDoc()) { ++ element->UpdateLinkState(link->LinkState()); ++ } + } + } + } +- mLinksToUpdate.Clear(); +- mHasLinksToUpdate = false; + } + + already_AddRefed +diff --git dom/base/nsIDocument.h dom/base/nsIDocument.h +index 42e7a07ebf2a..e1c2ea24339d 100644 +--- dom/base/nsIDocument.h ++++ dom/base/nsIDocument.h +@@ -3353,10 +3353,13 @@ protected: + // The array of all links that need their status resolved. Links must add themselves + // to this set by calling RegisterPendingLinkUpdate when added to a document. + static const size_t kSegmentSize = 128; +- mozilla::SegmentedVector, +- kSegmentSize, +- InfallibleAllocPolicy> +- mLinksToUpdate; ++ ++ typedef mozilla::SegmentedVector, ++ kSegmentSize, ++ InfallibleAllocPolicy> ++ LinksToUpdateList; ++ ++ LinksToUpdateList mLinksToUpdate; + + // SMIL Animation Controller, lazily-initialized in GetAnimationController + RefPtr mAnimationController; +@@ -3448,12 +3451,12 @@ protected: + // file, etc. + bool mIsSyntheticDocument : 1; + +- // True if this document has links whose state needs updating +- bool mHasLinksToUpdate : 1; +- + // True is there is a pending runnable which will call FlushPendingLinkUpdates(). + bool mHasLinksToUpdateRunnable : 1; + ++ // True if we're flushing pending link updates. ++ bool mFlushingPendingLinkUpdates : 1; ++ + // True if a DOMMutationObserver is perhaps attached to a node in the document. + bool mMayHaveDOMMutationObservers : 1; + +@@ -3605,12 +3608,6 @@ protected: + + Tri mAllowXULXBL; + +- /** +- * This is true while FlushPendingLinkUpdates executes. Calls to +- * [Un]RegisterPendingLinkUpdate will assert when this is true. +- */ +- bool mIsLinkUpdateRegistrationsForbidden; +- + // The document's script global object, the object from which the + // document can get its script context and scope. This is the + // *inner* window object. +commit c22a2a29bde1 +Author: Blake Kaplan +Date: Thu Mar 1 11:26:54 2018 -0800 + + Bug 1404297 - Add a move constructor to SegmentedVector. r=smaug, a=RyanVM + + Given that we have a SegmentedVector of nsCOMPtrs, it's probably worth + avoiding copying it. + + MozReview-Commit-ID: GHyfVLrdnlQ + + --HG-- + extra : source : 1d53ede1a1d3c1afd847fb50f31aa9ab3e48cc21 + extra : histedit_source : 4f77aeff6b56fffc31af54a5d032588cc4f8c8c0 +--- + mfbt/SegmentedVector.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git mfbt/SegmentedVector.h mfbt/SegmentedVector.h +index d1aa9c886c72..923a467f5d68 100644 +--- mfbt/SegmentedVector.h ++++ mfbt/SegmentedVector.h +@@ -139,6 +139,11 @@ public: + aIdealSegmentSize - sizeof(Segment) < sizeof(T)); + } + ++ SegmentedVector(SegmentedVector&& aOther) ++ : mSegments(mozilla::Move(aOther.mSegments)) ++ { ++ } ++ + ~SegmentedVector() { Clear(); } + + bool IsEmpty() const { return !mSegments.getFirst(); } Copied: branches/2018Q1/www/waterfox/files/patch-bug1425520 (from r463455, head/www/waterfox/files/patch-bug1425520) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1425520 Sat Mar 3 00:55:06 2018 (r463458, copy of r463455, head/www/waterfox/files/patch-bug1425520) @@ -0,0 +1,27 @@ +commit c4088252ee68 +Author: Henri Sivonen +Date: Wed Feb 28 13:53:29 2018 +0200 + + Bug 1425520. r=smaug. a=abillings + + MozReview-Commit-ID: IoZeR5BGjmQ + + --HG-- + extra : source : e20052aa341d6da4505eb84be6e061bb7f37de51 +--- + dom/base/nsDocumentEncoder.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git dom/base/nsDocumentEncoder.cpp dom/base/nsDocumentEncoder.cpp +index d591f61c6244..9c0eaaa63bc4 100644 +--- dom/base/nsDocumentEncoder.cpp ++++ dom/base/nsDocumentEncoder.cpp +@@ -517,7 +517,7 @@ nsDocumentEncoder::SerializeToStringRecursive(nsINode* aNode, + } + + if (!aDontSerializeRoot) { +- rv = SerializeNodeEnd(node, aStr); ++ rv = SerializeNodeEnd(maybeFixedNode, aStr); + NS_ENSURE_SUCCESS(rv, rv); + } + Copied: branches/2018Q1/www/waterfox/files/patch-bug1437450 (from r463455, head/www/waterfox/files/patch-bug1437450) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1437450 Sat Mar 3 00:55:06 2018 (r463458, copy of r463455, head/www/waterfox/files/patch-bug1437450) @@ -0,0 +1,30 @@ +commit 0f7fe8623060 +Author: Jan de Mooij +Date: Thu Mar 1 15:36:13 2018 +0100 + + Bug 1437450 - Disable Ion no-clone optimization for regexps if the graph contains try blocks. r=nbp, a=RyanVM + + --HG-- + extra : source : 61b461277369e0cec89c79d8526a82c575818e94 + extra : histedit_source : 6bc47921de07340f563a8d7d81b260579483c753 +--- + js/src/jit/IonAnalysis.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git js/src/jit/IonAnalysis.cpp js/src/jit/IonAnalysis.cpp +index ff8de4dc9a83..3bb7f5fa0754 100644 +--- js/src/jit/IonAnalysis.cpp ++++ js/src/jit/IonAnalysis.cpp +@@ -2231,6 +2231,12 @@ IsRegExpHoistable(MIRGenerator* mir, MDefinition* regexp, MDefinitionVector& wor + bool + jit::MakeMRegExpHoistable(MIRGenerator* mir, MIRGraph& graph) + { ++ // If we are compiling try blocks, regular expressions may be observable ++ // from catch blocks (which Ion does not compile). For now just disable the ++ // pass in this case. ++ if (graph.hasTryBlock()) ++ return true; ++ + MDefinitionVector worklist(graph.alloc()); + + for (ReversePostorderIterator block(graph.rpoBegin()); block != graph.rpoEnd(); block++) { Copied: branches/2018Q1/www/waterfox/files/patch-bug1440775 (from r463455, head/www/waterfox/files/patch-bug1440775) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1440775 Sat Mar 3 00:55:06 2018 (r463458, copy of r463455, head/www/waterfox/files/patch-bug1440775) @@ -0,0 +1,48 @@ +commit ee49d895ca4d +Author: Ben Kelly +Date: Thu Mar 1 07:37:31 2018 -0800 + + Bug 1440775 - Make fetch API force-cache and only-if-cached use VALIDATE_NEVER instead of LOAD_FROM_CACHE. r=mayhemer, a=lizzard + + --HG-- + extra : source : 60fb09de57ec145923da102f856399d3323f632b + extra : amend_source : 8313874cbe86a98931cec9300705c413925ab86e + extra : histedit_source : 460a462c383183c353eb1bebff0f349261908d6a +--- + netwerk/protocol/http/HttpBaseChannel.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git netwerk/protocol/http/HttpBaseChannel.cpp netwerk/protocol/http/HttpBaseChannel.cpp +index 8c984e6531e0..8b56edd01bde 100644 +--- netwerk/protocol/http/HttpBaseChannel.cpp ++++ netwerk/protocol/http/HttpBaseChannel.cpp +@@ -2825,9 +2825,9 @@ HttpBaseChannel::GetFetchCacheMode(uint32_t* aFetchCacheMode) + *aFetchCacheMode = nsIHttpChannelInternal::FETCH_CACHE_MODE_RELOAD; + } else if (mLoadFlags & VALIDATE_ALWAYS) { + *aFetchCacheMode = nsIHttpChannelInternal::FETCH_CACHE_MODE_NO_CACHE; +- } else if (mLoadFlags & (LOAD_FROM_CACHE | nsICachingChannel::LOAD_ONLY_FROM_CACHE)) { ++ } else if (mLoadFlags & (VALIDATE_NEVER | nsICachingChannel::LOAD_ONLY_FROM_CACHE)) { + *aFetchCacheMode = nsIHttpChannelInternal::FETCH_CACHE_MODE_ONLY_IF_CACHED; +- } else if (mLoadFlags & LOAD_FROM_CACHE) { ++ } else if (mLoadFlags & VALIDATE_NEVER) { + *aFetchCacheMode = nsIHttpChannelInternal::FETCH_CACHE_MODE_FORCE_CACHE; + } else { + *aFetchCacheMode = nsIHttpChannelInternal::FETCH_CACHE_MODE_DEFAULT; +@@ -2863,7 +2863,7 @@ HttpBaseChannel::SetFetchCacheMode(uint32_t aFetchCacheMode) + break; + case nsIHttpChannelInternal::FETCH_CACHE_MODE_FORCE_CACHE: + // force-cache means don't validate unless if the response would vary. +- mLoadFlags |= LOAD_FROM_CACHE; ++ mLoadFlags |= VALIDATE_NEVER; + break; + case nsIHttpChannelInternal::FETCH_CACHE_MODE_ONLY_IF_CACHED: + // only-if-cached means only from cache, no network, no validation, generate +@@ -2872,7 +2872,7 @@ HttpBaseChannel::SetFetchCacheMode(uint32_t aFetchCacheMode) + // the user has things in their cache without any network traffic side + // effects) are addressed in the Request constructor which enforces/requires + // same-origin request mode. +- mLoadFlags |= LOAD_FROM_CACHE | nsICachingChannel::LOAD_ONLY_FROM_CACHE; ++ mLoadFlags |= VALIDATE_NEVER | nsICachingChannel::LOAD_ONLY_FROM_CACHE; + break; + } + Copied: branches/2018Q1/www/waterfox/files/patch-bug1441006 (from r463455, head/www/waterfox/files/patch-bug1441006) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/waterfox/files/patch-bug1441006 Sat Mar 3 00:55:06 2018 (r463458, copy of r463455, head/www/waterfox/files/patch-bug1441006) @@ -0,0 +1,109 @@ +commit 2b7e4dc17f0e +Author: Jan de Mooij +Date: Thu Mar 1 15:37:29 2018 +0100 + + Bug 1441006 - Use unsigned type for SlotsEdge start/count. r=jonco, a=RyanVM + + --HG-- + extra : source : 1f4e74a5ace81acdcf8a973e841c62099f238251 + extra : histedit_source : 85b5a92599c8452a61da9c921546e73660c402a9 +--- + js/src/gc/Marking.cpp | 19 +++++++++++-------- + js/src/gc/StoreBuffer.h | 20 +++++++++++--------- + js/src/jit/VMFunctions.cpp | 5 ++++- + 3 files changed, 26 insertions(+), 18 deletions(-) + +diff --git js/src/gc/Marking.cpp js/src/gc/Marking.cpp +index 1998b2a397c4..5089b1e6dde5 100644 +--- js/src/gc/Marking.cpp ++++ js/src/gc/Marking.cpp +@@ -2762,18 +2762,21 @@ js::gc::StoreBuffer::SlotsEdge::trace(TenuringTracer& mover) const + return; + + if (kind() == ElementKind) { +- int32_t initLen = obj->getDenseInitializedLength(); +- int32_t numShifted = obj->getElementsHeader()->numShiftedElements(); +- int32_t clampedStart = Min(Max(0, start_ - numShifted), initLen); +- int32_t clampedEnd = Min(Max(0, start_ + count_ - numShifted), initLen); +- MOZ_ASSERT(clampedStart >= 0); ++ uint32_t initLen = obj->getDenseInitializedLength(); ++ uint32_t numShifted = obj->getElementsHeader()->numShiftedElements(); ++ uint32_t clampedStart = start_; ++ clampedStart = numShifted < clampedStart ? clampedStart - numShifted : 0; ++ clampedStart = Min(clampedStart, initLen); ++ uint32_t clampedEnd = start_ + count_; ++ clampedEnd = numShifted < clampedEnd ? clampedEnd - numShifted : 0; ++ clampedEnd = Min(clampedEnd, initLen); + MOZ_ASSERT(clampedStart <= clampedEnd); + mover.traceSlots(static_cast(obj->getDenseElements() + clampedStart) + ->unsafeUnbarrieredForTracing(), clampedEnd - clampedStart); + } else { +- int32_t start = Min(uint32_t(start_), obj->slotSpan()); +- int32_t end = Min(uint32_t(start_) + count_, obj->slotSpan()); +- MOZ_ASSERT(end >= start); ++ uint32_t start = Min(start_, obj->slotSpan()); ++ uint32_t end = Min(start_ + count_, obj->slotSpan()); ++ MOZ_ASSERT(start <= end); + mover.traceObjectSlots(obj, start, end - start); + } + } +diff --git js/src/gc/StoreBuffer.h js/src/gc/StoreBuffer.h +index cf54928a6315..f848836533ca 100644 +--- js/src/gc/StoreBuffer.h ++++ js/src/gc/StoreBuffer.h +@@ -277,17 +277,17 @@ class StoreBuffer + const static int ElementKind = 1; + + uintptr_t objectAndKind_; // NativeObject* | Kind +- int32_t start_; +- int32_t count_; ++ uint32_t start_; ++ uint32_t count_; + + SlotsEdge() : objectAndKind_(0), start_(0), count_(0) {} +- SlotsEdge(NativeObject* object, int kind, int32_t start, int32_t count) ++ SlotsEdge(NativeObject* object, int kind, uint32_t start, uint32_t count) + : objectAndKind_(uintptr_t(object) | kind), start_(start), count_(count) + { + MOZ_ASSERT((uintptr_t(object) & 1) == 0); + MOZ_ASSERT(kind <= 1); +- MOZ_ASSERT(start >= 0); + MOZ_ASSERT(count > 0); ++ MOZ_ASSERT(start + count > start); + } + + NativeObject* object() const { return reinterpret_cast(objectAndKind_ & ~1); } +@@ -314,10 +314,12 @@ class StoreBuffer + // is particularly useful for coalescing a series of increasing or + // decreasing single index writes 0, 1, 2, ..., N into a SlotsEdge + // range of elements [0, N]. +- auto end = start_ + count_ + 1; +- auto start = start_ - 1; ++ uint32_t end = start_ + count_ + 1; ++ uint32_t start = start_ > 0 ? start_ - 1 : 0; ++ MOZ_ASSERT(start < end); + +- auto otherEnd = other.start_ + other.count_; ++ uint32_t otherEnd = other.start_ + other.count_; ++ MOZ_ASSERT(other.start_ <= otherEnd); + return (start <= other.start_ && other.start_ <= end) || + (start <= otherEnd && otherEnd <= end); + } +@@ -327,7 +329,7 @@ class StoreBuffer + // overlap. + void merge(const SlotsEdge& other) { + MOZ_ASSERT(overlaps(other)); +- auto end = Max(start_ + count_, other.start_ + other.count_); ++ uint32_t end = Max(start_ + count_, other.start_ + other.count_); + start_ = Min(start_, other.start_); + count_ = end - start_; + } +@@ -415,7 +417,7 @@ class StoreBuffer + void unputValue(JS::Value* vp) { unput(bufferVal, ValueEdge(vp)); } + void putCell(Cell** cellp) { put(bufferCell, CellPtrEdge(cellp)); } + void unputCell(Cell** cellp) { unput(bufferCell, CellPtrEdge(cellp)); } +- void putSlot(NativeObject* obj, int kind, int32_t start, int32_t count) { ++ void putSlot(NativeObject* obj, int kind, uint32_t start, uint32_t count) { + SlotsEdge edge(obj, kind, start, count); + if (bufferSlot.last_.overlaps(edge)) + bufferSlot.last_.merge(edge); From owner-svn-ports-branches@freebsd.org Sat Mar 3 00:55: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 694F9F32DFB; Sat, 3 Mar 2018 00:55: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 07982838C2; Sat, 3 Mar 2018 00:55: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 D67441F093; Sat, 3 Mar 2018 00:55:57 +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 w230tveT040531; Sat, 3 Mar 2018 00:55:57 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w230tvj9040528; Sat, 3 Mar 2018 00:55:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201803030055.w230tvj9040528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 3 Mar 2018 00:55:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463459 - branches/2018Q1/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/emulators/rpcs3 X-SVN-Commit-Revision: 463459 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, 03 Mar 2018 00:55:58 -0000 Author: jbeich Date: Sat Mar 3 00:55:57 2018 New Revision: 463459 URL: https://svnweb.freebsd.org/changeset/ports/463459 Log: MFH: r463456 emulators/rpcs3: update to 0.0.5.34 Changes: https://github.com/RPCS3/rpcs3/compare/8d7620d95...ec0cd9f00 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q1/emulators/rpcs3/Makefile branches/2018Q1/emulators/rpcs3/distinfo branches/2018Q1/emulators/rpcs3/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q1/emulators/rpcs3/Makefile Sat Mar 3 00:55:06 2018 (r463458) +++ branches/2018Q1/emulators/rpcs3/Makefile Sat Mar 3 00:55:57 2018 (r463459) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-24 -DISTVERSIONSUFFIX= -g8d7620d95 +DISTVERSION= 0.0.5-34 +DISTVERSIONSUFFIX= -gec0cd9f00 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q1/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q1/emulators/rpcs3/distinfo Sat Mar 3 00:55:06 2018 (r463458) +++ branches/2018Q1/emulators/rpcs3/distinfo Sat Mar 3 00:55:57 2018 (r463459) @@ -1,6 +1,6 @@ -TIMESTAMP = 1519854102 -SHA256 (RPCS3-rpcs3-v0.0.5-24-g8d7620d95_GH0.tar.gz) = 40aa13c376417033b5f613b9464117a0b2c8812adada7d8ce5f1e4927badbc79 -SIZE (RPCS3-rpcs3-v0.0.5-24-g8d7620d95_GH0.tar.gz) = 3726855 +TIMESTAMP = 1520013048 +SHA256 (RPCS3-rpcs3-v0.0.5-34-gec0cd9f00_GH0.tar.gz) = 602fbf011e8168c94b85636c975d81d2b77401bf39c199bd1b5d3e39df977e16 +SIZE (RPCS3-rpcs3-v0.0.5-34-gec0cd9f00_GH0.tar.gz) = 4305157 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841 Modified: branches/2018Q1/emulators/rpcs3/pkg-plist ============================================================================== --- branches/2018Q1/emulators/rpcs3/pkg-plist Sat Mar 3 00:55:06 2018 (r463458) +++ branches/2018Q1/emulators/rpcs3/pkg-plist Sat Mar 3 00:55:57 2018 (r463459) @@ -5,6 +5,8 @@ share/icons/hicolor/scalable/apps/rpcs3.svg %%DATADIR%%/GuiConfigs/Darker Style by TheMitoSan.qss %%DATADIR%%/GuiConfigs/Kuroi (Dark) by Ani.qss %%DATADIR%%/GuiConfigs/ModernBlue Theme by TheMitoSan.qss +%%DATADIR%%/GuiConfigs/YoRHa by Ani.qss +%%DATADIR%%/GuiConfigs/YoRHa-background.jpg %%DATADIR%%/Icons/ui/L1.png %%DATADIR%%/Icons/ui/L2.png %%DATADIR%%/Icons/ui/R1.png From owner-svn-ports-branches@freebsd.org Sat Mar 3 15:39:06 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 CE7C7F45A7E; Sat, 3 Mar 2018 15:39:06 +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 79C04869A3; Sat, 3 Mar 2018 15:39:06 +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 74AEA2AC; Sat, 3 Mar 2018 15:39:06 +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 w23Fd6lm081057; Sat, 3 Mar 2018 15:39:06 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w23Fd6HW081055; Sat, 3 Mar 2018 15:39:06 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201803031539.w23Fd6HW081055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 3 Mar 2018 15:39:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463488 - in branches/2018Q1/x11-wm/icewm: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2018Q1/x11-wm/icewm: . files X-SVN-Commit-Revision: 463488 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, 03 Mar 2018 15:39:07 -0000 Author: riggs Date: Sat Mar 3 15:39:06 2018 New Revision: 463488 URL: https://svnweb.freebsd.org/changeset/ports/463488 Log: MFH: r463487 Fix build on 11 and later with c++ compilers by default in c++11 mode PR: 226213 Submitted by: portmaster@bsdforge.com (maintainer) Approved by: ports-secteam (build fix blanket) Added: branches/2018Q1/x11-wm/icewm/files/patch-src_wmabout.cc - copied unchanged from r463487, head/x11-wm/icewm/files/patch-src_wmabout.cc Modified: branches/2018Q1/x11-wm/icewm/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/x11-wm/icewm/Makefile ============================================================================== --- branches/2018Q1/x11-wm/icewm/Makefile Sat Mar 3 15:37:03 2018 (r463487) +++ branches/2018Q1/x11-wm/icewm/Makefile Sat Mar 3 15:39:06 2018 (r463488) @@ -3,7 +3,7 @@ PORTNAME= icewm PORTVERSION= 1.3.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION} Copied: branches/2018Q1/x11-wm/icewm/files/patch-src_wmabout.cc (from r463487, head/x11-wm/icewm/files/patch-src_wmabout.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/x11-wm/icewm/files/patch-src_wmabout.cc Sat Mar 3 15:39:06 2018 (r463488, copy of r463487, head/x11-wm/icewm/files/patch-src_wmabout.cc) @@ -0,0 +1,11 @@ +--- src/wmabout.cc.orig 2018-02-25 21:00:14.796410000 -0800 ++++ src/wmabout.cc 2018-02-25 21:00:22.254233000 -0800 +@@ -23,7 +23,7 @@ + AboutDlg *aboutDlg = 0; + + AboutDlg::AboutDlg(): YDialog() { +- char const *version("IceWM "VERSION" ("HOSTOS"/"HOSTCPU")"); ++ char const *version("IceWM " VERSION" (" HOSTOS"/" HOSTCPU")"); + ustring copyright = + ustring("Copyright ") + .append(_("(C)")) From owner-svn-ports-branches@freebsd.org Sat Mar 3 20:04: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 735A8F370E1; Sat, 3 Mar 2018 20:04: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 1F963739F4; Sat, 3 Mar 2018 20:04: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 19E6F2E89; Sat, 3 Mar 2018 20:04: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 w23K49Or022550; Sat, 3 Mar 2018 20:04:09 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w23K49gO022549; Sat, 3 Mar 2018 20:04:09 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201803032004.w23K49gO022549@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 3 Mar 2018 20:04:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463529 - branches/2018Q1/Mk X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/Mk X-SVN-Commit-Revision: 463529 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, 03 Mar 2018 20:04:10 -0000 Author: jbeich Date: Sat Mar 3 20:04:09 2018 New Revision: 463529 URL: https://svnweb.freebsd.org/changeset/ports/463529 Log: MFH: r462941 gecko: convert to CONFIGURE_OUTSOURCE client.mk is on its way out upstream, switching to it was a mistake. $ MACH=1 gmake -f client.mk build client.mk:40: /.mozconfig-client-mk: No such file or directory gmake: *** No rule to make target '/.mozconfig-client-mk'. Stop. Approved by: ports-secteam (riggs) Modified: branches/2018Q1/Mk/bsd.gecko.mk Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/Mk/bsd.gecko.mk ============================================================================== --- branches/2018Q1/Mk/bsd.gecko.mk Sat Mar 3 19:54:26 2018 (r463528) +++ branches/2018Q1/Mk/bsd.gecko.mk Sat Mar 3 20:04:09 2018 (r463529) @@ -88,6 +88,8 @@ USES+= cpe gmake iconv localbase perl5 pkgconfig \ CPE_VENDOR?=mozilla USE_PERL5= build USE_XORG= x11 xcomposite xdamage xext xfixes xrender xt +HAS_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if ${MOZILLA} != "libxul" BUNDLE_LIBS= yes @@ -128,14 +130,10 @@ MOZILLA_SUFX?= none MOZSRC?= ${WRKSRC} PLISTF?= ${WRKDIR}/plist_files -MOZ_OBJDIR?= ${WRKSRC}/obj-${ARCH:C/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL} - MOZ_PIS_DIR?= lib/${MOZILLA}/init.d PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig -# XXX Not ?= because fmake uses MAKEFILE internally -MAKEFILE= ${WRKSRC}/client.mk MOZILLA_PLIST_DIRS?= bin lib share/pixmaps share/applications PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall @@ -145,14 +143,11 @@ PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/ MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin -MAKE_ENV+= MACH=1 # XXX bug 1412398 -ALL_TARGET?= build - MOZ_EXPORT+= ${CONFIGURE_ENV} \ RUSTFLAGS="${RUSTFLAGS}" \ PERL="${PERL}" MOZ_OPTIONS+= --prefix="${PREFIX}" -MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}" +MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}" LDFLAGS+= -Wl,--as-needed From owner-svn-ports-branches@freebsd.org Sat Mar 3 20:05: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 396CBF372BD; Sat, 3 Mar 2018 20:05:53 +0000 (UTC) (envelope-from cy@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 D0C3373B1D; Sat, 3 Mar 2018 20:05:52 +0000 (UTC) (envelope-from cy@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 C7FBC2E8F; Sat, 3 Mar 2018 20:05:52 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w23K5qiw022719; Sat, 3 Mar 2018 20:05:52 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w23K5qPg022718; Sat, 3 Mar 2018 20:05:52 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201803032005.w23K5qPg022718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 3 Mar 2018 20:05:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463530 - branches/2018Q1/net/ntp-devel X-SVN-Group: ports-branches X-SVN-Commit-Author: cy X-SVN-Commit-Paths: branches/2018Q1/net/ntp-devel X-SVN-Commit-Revision: 463530 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, 03 Mar 2018 20:05:53 -0000 Author: cy Date: Sat Mar 3 20:05:52 2018 New Revision: 463530 URL: https://svnweb.freebsd.org/changeset/ports/463530 Log: MFH: r463183 It appears as if the development branch of ntp is dead as no new development tarballs have been relesed for ~ 17 months now. This is a security concern. Approved by: portmgr (riggs) Modified: branches/2018Q1/net/ntp-devel/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net/ntp-devel/Makefile ============================================================================== --- branches/2018Q1/net/ntp-devel/Makefile Sat Mar 3 20:04:09 2018 (r463529) +++ branches/2018Q1/net/ntp-devel/Makefile Sat Mar 3 20:05:52 2018 (r463530) @@ -13,6 +13,8 @@ DISTNAME= ${PORTNAME}-dev-${PORTVERSION:S/P/p/:S/r/-RC MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution +IGNORE= It appears the development branch of NTP is dead. + LIB_DEPENDS= libevent.so:devel/libevent \ libmd5.so:www/libwww From owner-svn-ports-branches@freebsd.org Sat Mar 3 20:06:51 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58E09F37417; Sat, 3 Mar 2018 20:06:51 +0000 (UTC) (envelope-from cy@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 0C03F73C4A; Sat, 3 Mar 2018 20:06:51 +0000 (UTC) (envelope-from cy@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 06F4D2E92; Sat, 3 Mar 2018 20:06:51 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w23K6osd022858; Sat, 3 Mar 2018 20:06:50 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w23K6ou6022857; Sat, 3 Mar 2018 20:06:50 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201803032006.w23K6ou6022857@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 3 Mar 2018 20:06:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463531 - branches/2018Q1/net/ntp-devel X-SVN-Group: ports-branches X-SVN-Commit-Author: cy X-SVN-Commit-Paths: branches/2018Q1/net/ntp-devel X-SVN-Commit-Revision: 463531 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, 03 Mar 2018 20:06:51 -0000 Author: cy Date: Sat Mar 3 20:06:50 2018 New Revision: 463531 URL: https://svnweb.freebsd.org/changeset/ports/463531 Log: MFH: r463211 Flag FORBIDDEN instead of IGNORE due to possbile security issues. Reported by: mat Approved by: portmgr (riggs) Modified: branches/2018Q1/net/ntp-devel/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/net/ntp-devel/Makefile ============================================================================== --- branches/2018Q1/net/ntp-devel/Makefile Sat Mar 3 20:05:52 2018 (r463530) +++ branches/2018Q1/net/ntp-devel/Makefile Sat Mar 3 20:06:50 2018 (r463531) @@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-dev-${PORTVERSION:S/P/p/:S/r/-RC MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution -IGNORE= It appears the development branch of NTP is dead. +FORBIDDEN= It appears the development branch of NTP is dead. LIB_DEPENDS= libevent.so:devel/libevent \ libmd5.so:www/libwww From owner-svn-ports-branches@freebsd.org Sat Mar 3 22:42:24 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 A48E1F42B1E; Sat, 3 Mar 2018 22:42:24 +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 7B83C7A869; Sat, 3 Mar 2018 22:42:24 +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 766414D16; Sat, 3 Mar 2018 22:42:24 +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 w23MgOmQ002319; Sat, 3 Mar 2018 22:42:24 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w23MgOQq002317; Sat, 3 Mar 2018 22:42:24 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201803032242.w23MgOQq002317@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 3 Mar 2018 22:42:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463539 - in branches/2018Q1/games/spring: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/games/spring: . files X-SVN-Commit-Revision: 463539 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, 03 Mar 2018 22:42:24 -0000 Author: jbeich Date: Sat Mar 3 22:42:24 2018 New Revision: 463539 URL: https://svnweb.freebsd.org/changeset/ports/463539 Log: MFH: r463537 games/spring: unbreak with boost 1.65 PR: 220762 Submitted by: Walter Schwarzenfeld Approved by: maintainer timeout (3 months) Approved by: ports-secteam blanket Modified: branches/2018Q1/games/spring/Makefile branches/2018Q1/games/spring/files/patch-math Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/games/spring/Makefile ============================================================================== --- branches/2018Q1/games/spring/Makefile Sat Mar 3 22:40:56 2018 (r463538) +++ branches/2018Q1/games/spring/Makefile Sat Mar 3 22:42:24 2018 (r463539) @@ -14,8 +14,6 @@ COMMENT= Project aiming to create a new and versatile LICENSE= GPLv2 -BROKEN_FreeBSD_10= fails to build with boost 1.65, see bug 220762 - LIB_DEPENDS= libfreetype.so:print/freetype2 \ libboost_thread.so:devel/boost-libs \ libIL.so:graphics/devil \ Modified: branches/2018Q1/games/spring/files/patch-math ============================================================================== --- branches/2018Q1/games/spring/files/patch-math Sat Mar 3 22:40:56 2018 (r463538) +++ branches/2018Q1/games/spring/files/patch-math Sat Mar 3 22:42:24 2018 (r463539) @@ -5,6 +5,16 @@ +#include #include #include ++++ rts/lib/streflop/SMath.h +@@ -16,6 +16,8 @@ + #ifndef STREFLOP_MATH_H + #define STREFLOP_MATH_H + ++#include ++ + // just in case, should already be included + #include "streflop.h" + +++ rts/Sim/Weapons/LaserCannon.cpp 2015-04-07 20:49:52 -0400 @@ -1,4 +1,6 @@ /* This file is part of the Spring engine (GPL v2 or later), see LICENSE.html */ From owner-svn-ports-branches@freebsd.org Sat Mar 3 23:13: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 60085F44DA6; Sat, 3 Mar 2018 23:13: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 1302A7BF6F; Sat, 3 Mar 2018 23:13: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 0BD3551F4; Sat, 3 Mar 2018 23:13: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 w23NDQEI018236; Sat, 3 Mar 2018 23:13:26 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w23NDQrD018234; Sat, 3 Mar 2018 23:13:26 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201803032313.w23NDQrD018234@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 3 Mar 2018 23:13:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463541 - in branches/2018Q1/security/clamfs: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/security/clamfs: . files X-SVN-Commit-Revision: 463541 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, 03 Mar 2018 23:13:27 -0000 Author: jbeich Date: Sat Mar 3 23:13:26 2018 New Revision: 463541 URL: https://svnweb.freebsd.org/changeset/ports/463541 Log: MFH: r463540 security/clamfs: unbreak with boost 1.65 PR: 220725 Submitted by: Walter Schwarzenfeld Approved by: maintainer timeout (7 months) Approved by: ports-secteam blanket Added: branches/2018Q1/security/clamfs/files/patch-src_config.hxx - copied unchanged from r463540, head/security/clamfs/files/patch-src_config.hxx Modified: branches/2018Q1/security/clamfs/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/security/clamfs/Makefile ============================================================================== --- branches/2018Q1/security/clamfs/Makefile Sat Mar 3 23:12:06 2018 (r463540) +++ branches/2018Q1/security/clamfs/Makefile Sat Mar 3 23:13:26 2018 (r463541) @@ -12,8 +12,6 @@ COMMENT= User-space fs with on-access antivirus scanni LICENSE= GPLv2 -BROKEN= fails to build with boost 1.65, see bug 220725 - LIB_DEPENDS= libccgnu2.so:devel/commoncpp \ libPocoNet.so:devel/poco-ssl \ librlog.so:devel/rlog @@ -22,9 +20,7 @@ RUN_DEPENDS= clamd:security/clamav GNU_CONFIGURE= yes -USES= fuse - -CPPFLAGS+= -I${LOCALBASE}/include/boost/tr1 +USES= compiler:c++11-lib fuse PLIST_FILES= bin/clamfs \ man/man1/clamfs.1.gz Copied: branches/2018Q1/security/clamfs/files/patch-src_config.hxx (from r463540, head/security/clamfs/files/patch-src_config.hxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/security/clamfs/files/patch-src_config.hxx Sat Mar 3 23:13:26 2018 (r463541, copy of r463540, head/security/clamfs/files/patch-src_config.hxx) @@ -0,0 +1,23 @@ +--- src/config.hxx.orig 2009-11-29 19:19:33 UTC ++++ src/config.hxx +@@ -30,7 +30,7 @@ + #include "config.h" + + #include +-#include ++#include + #include + + #ifdef DMALLOC +@@ -45,11 +45,6 @@ namespace clamfs { + \brief STanDard namespace + */ + using namespace std; +- +-/*!\namespace tr1 +- \brief ISO/IEC TR 19768 namespace +-*/ +-using namespace tr1; + + /*!\namespace ost + \brief GNU CommonC++ namespace From owner-svn-ports-branches@freebsd.org Sat Mar 3 23:34: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 15A6BF46247; Sat, 3 Mar 2018 23:34:05 +0000 (UTC) (envelope-from bdrewery@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 B814B7D047; Sat, 3 Mar 2018 23:34:04 +0000 (UTC) (envelope-from bdrewery@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 B3198553B; Sat, 3 Mar 2018 23:34:04 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w23NY4Cn028220; Sat, 3 Mar 2018 23:34:04 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w23NY4mp028218; Sat, 3 Mar 2018 23:34:04 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201803032334.w23NY4mp028218@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 3 Mar 2018 23:34:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463543 - in branches/2018Q1/news/nzbget: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in branches/2018Q1/news/nzbget: . files X-SVN-Commit-Revision: 463543 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, 03 Mar 2018 23:34:05 -0000 Author: bdrewery Date: Sat Mar 3 23:34:04 2018 New Revision: 463543 URL: https://svnweb.freebsd.org/changeset/ports/463543 Log: MFH: r463542 Add missing requirement on LOGIN for rc script. PR: 225857 Submitted by: will@worrbase.com Differential Revision: https://reviews.freebsd.org/D14575 Approved by: portmgr (implicit) Modified: branches/2018Q1/news/nzbget/Makefile branches/2018Q1/news/nzbget/files/nzbget.in Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/news/nzbget/Makefile ============================================================================== --- branches/2018Q1/news/nzbget/Makefile Sat Mar 3 23:33:33 2018 (r463542) +++ branches/2018Q1/news/nzbget/Makefile Sat Mar 3 23:34:04 2018 (r463543) @@ -3,7 +3,7 @@ PORTNAME= nzbget PORTVERSION= 19.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= news Modified: branches/2018Q1/news/nzbget/files/nzbget.in ============================================================================== --- branches/2018Q1/news/nzbget/files/nzbget.in Sat Mar 3 23:33:33 2018 (r463542) +++ branches/2018Q1/news/nzbget/files/nzbget.in Sat Mar 3 23:34:04 2018 (r463543) @@ -3,6 +3,7 @@ # $FreeBSD$ # # PROVIDE: nzbget +# REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf