From owner-svn-ports-branches@freebsd.org Sun May 20 00:01: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 E4552EE9813; Sun, 20 May 2018 00:01:50 +0000 (UTC) (envelope-from gordon@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 95D1485914; Sun, 20 May 2018 00:01:50 +0000 (UTC) (envelope-from gordon@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 7702D6721; Sun, 20 May 2018 00:01:50 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4K01ocT034945; Sun, 20 May 2018 00:01:50 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4K01oBr034944; Sun, 20 May 2018 00:01:50 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201805200001.w4K01oBr034944@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sun, 20 May 2018 00:01:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470436 - in branches/2018Q2/devel: . p4d p4ftpd p4p p4web X-SVN-Group: ports-branches X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in branches/2018Q2/devel: . p4d p4ftpd p4p p4web X-SVN-Commit-Revision: 470436 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.26 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, 20 May 2018 00:01:51 -0000 Author: gordon Date: Sun May 20 00:01:50 2018 New Revision: 470436 URL: https://svnweb.freebsd.org/changeset/ports/470436 Log: MFH: r469706 Perforce has removed the server components for FreeBSD. Since the binaries are gone, nothing much to do other than remove it. Approved by: portmgr (antoine) Deleted: branches/2018Q2/devel/p4d/ branches/2018Q2/devel/p4ftpd/ branches/2018Q2/devel/p4p/ branches/2018Q2/devel/p4web/ Modified: branches/2018Q2/devel/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/devel/Makefile ============================================================================== --- branches/2018Q2/devel/Makefile Sat May 19 22:19:54 2018 (r470435) +++ branches/2018Q2/devel/Makefile Sun May 20 00:01:50 2018 (r470436) @@ -1850,12 +1850,8 @@ SUBDIR += p4 SUBDIR += p4.el SUBDIR += p4api - SUBDIR += p4d SUBDIR += p4delta - SUBDIR += p4ftpd SUBDIR += p4genpatch - SUBDIR += p4p - SUBDIR += p4web SUBDIR += p5-AI-Pathfinding-AStar SUBDIR += p5-AI-Prolog SUBDIR += p5-ARGV-Struct From owner-svn-ports-branches@freebsd.org Sun May 20 08:01: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 66BF6EAB5A1; Sun, 20 May 2018 08:01:58 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 16E4275A7F; Sun, 20 May 2018 08:01:58 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EDCB513AA0; Sun, 20 May 2018 08:01:57 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4K81vd7077817; Sun, 20 May 2018 08:01:57 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4K81uMw077809; Sun, 20 May 2018 08:01:56 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201805200801.w4K81uMw077809@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 20 May 2018 08:01:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470441 - in branches/2018Q2/databases: mariadb102-client mariadb102-client/files mariadb102-server mariadb102-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2018Q2/databases: mariadb102-client mariadb102-client/files mariadb102-server mariadb102-server/files X-SVN-Commit-Revision: 470441 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.26 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, 20 May 2018 08:01:58 -0000 Author: brnrd Date: Sun May 20 08:01:56 2018 New Revision: 470441 URL: https://svnweb.freebsd.org/changeset/ports/470441 Log: MFH: r470246 databases/mariadb102-server: Security update to 10.2.15 Security: 57aec168-453e-11e8-8777-b499baebfeaf Approved by: ports-secteam (miwi) Added: branches/2018Q2/databases/mariadb102-server/files/patch-MDEV-15961 (contents, props changed) Deleted: branches/2018Q2/databases/mariadb102-client/files/patch-sql-common_client.c Modified: branches/2018Q2/databases/mariadb102-client/Makefile branches/2018Q2/databases/mariadb102-server/Makefile branches/2018Q2/databases/mariadb102-server/distinfo branches/2018Q2/databases/mariadb102-server/files/mysql-server.in branches/2018Q2/databases/mariadb102-server/files/patch-sql-common_client.c branches/2018Q2/databases/mariadb102-server/files/patch-sql_mysqld.cc Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/databases/mariadb102-client/Makefile ============================================================================== --- branches/2018Q2/databases/mariadb102-client/Makefile Sun May 20 06:43:40 2018 (r470440) +++ branches/2018Q2/databases/mariadb102-client/Makefile Sun May 20 08:01:56 2018 (r470441) @@ -22,7 +22,7 @@ CLIENT_ONLY= yes post-configure: ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ - -e 's|(#define LIBS.*)"\\ $$|\1 -L${PREFIX}/lib "\\|' \ + -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c post-install: @@ -33,7 +33,7 @@ post-install: ${STAGEDIR}${DATADIR}/policy \ ${STAGEDIR}${PREFIX}/include/mysql/server # Fix https://mariadb.atlassian.net/browse/MDEV-9388 - @${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config + @${REINPLACE_CMD} 's/-l-pthread/-pthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config post-install-GSSAPI_NONE: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so Modified: branches/2018Q2/databases/mariadb102-server/Makefile ============================================================================== --- branches/2018Q2/databases/mariadb102-server/Makefile Sun May 20 06:43:40 2018 (r470440) +++ branches/2018Q2/databases/mariadb102-server/Makefile Sun May 20 08:01:56 2018 (r470441) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.14 +PORTVERSION= 10.2.15 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -22,10 +22,7 @@ LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN_aarch64= fails to link: stacktrace.c: undefined reference to 'sbrk' - SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb102-client USES= bison:build cmake:noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl @@ -192,6 +189,14 @@ post-install: .if defined(WITH_OPENSSL_PORT) GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system +.endif + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include Modified: branches/2018Q2/databases/mariadb102-server/distinfo ============================================================================== --- branches/2018Q2/databases/mariadb102-server/distinfo Sun May 20 06:43:40 2018 (r470440) +++ branches/2018Q2/databases/mariadb102-server/distinfo Sun May 20 08:01:56 2018 (r470441) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522324208 -SHA256 (mariadb-10.2.14.tar.gz) = 3443ec2d6e8af1eba49d097f6b2f6741c8d94b75abf19b8dd5753608f0703f7e -SIZE (mariadb-10.2.14.tar.gz) = 72607526 +TIMESTAMP = 1526556031 +SHA256 (mariadb-10.2.15.tar.gz) = 33de205158fc22fd8eb4e5770cc5ffa1cb4029f9c398dfd8c554ccb3e636ba11 +SIZE (mariadb-10.2.15.tar.gz) = 73329750 Modified: branches/2018Q2/databases/mariadb102-server/files/mysql-server.in ============================================================================== --- branches/2018Q2/databases/mariadb102-server/files/mysql-server.in Sun May 20 06:43:40 2018 (r470440) +++ branches/2018Q2/databases/mariadb102-server/files/mysql-server.in Sun May 20 08:01:56 2018 (r470441) @@ -9,9 +9,9 @@ # Add the following line to /etc/rc.conf to enable mysql: # mysql_(instance_)?enable (bool): Set to "NO" by default. # Set it to "YES" to enable MySQL. -# mysql_(instance_)?limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mysql` -# just before mysql starts. +%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` +%%LEGACY_LIMITS%%# just before mysql starts. # mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" # Base database directory. # mysql_(instance_)?args (str): Custom additional arguments to be passed @@ -22,7 +22,7 @@ # Default to "mysql" created by the port # mysql_(instance_)?optfile (str): Server-specific option file. # Default to "${mysql_dbdir}/my.cnf". -# mysql_instances (str): Set to "" by default. +# mysql_instances (str): Set to "" by default. # If defined, list of instances to enable . /etc/rc.subr @@ -33,9 +33,9 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -: ${mysql_limits="NO"} +%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_user="mysql"} -: ${mysql_limits_args="-e -U $mysql_user"} +%%LEGACY_LIMITS%%: ${mysql_limits_args="-e -U $mysql_user"} : ${mysql_dbdir="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} @@ -51,9 +51,9 @@ if [ -n "$2" ]; then "$2 "*|*" $2 "*|*" $2"|"$2") eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" - eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" +%%LEGACY_LIMITS%% eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" - eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" +%%LEGACY_LIMITS%% eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" ;; @@ -119,11 +119,12 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 fi - if checkyesno mysql_limits; then - eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null - else - return 0 - fi +%%LEGACY_LIMITS%% if checkyesno mysql_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 } mysql_poststart() Added: branches/2018Q2/databases/mariadb102-server/files/patch-MDEV-15961 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/databases/mariadb102-server/files/patch-MDEV-15961 Sun May 20 08:01:56 2018 (r470441) @@ -0,0 +1,47 @@ +--- mysys/stacktrace.c.orig 2018-03-26 16:41:18 UTC ++++ mysys/stacktrace.c +@@ -34,19 +34,19 @@ + #include + #endif + ++#ifdef __linux__ + #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) +- + static char *heap_start; +- +-#if(defined HAVE_BSS_START) && !(defined __linux__) + extern char *__bss_start; +-#endif ++#else ++#define PTR_SANE(p) (p) ++#endif /* __linux */ + + void my_init_stacktrace() + { +-#if(defined HAVE_BSS_START) && !(defined __linux__) ++#ifdef __linux__ + heap_start = (char*) &__bss_start; +-#endif ++#endif /* __linux__ */ + } + + #ifdef __linux__ +@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad + + int my_safe_print_str(const char* val, int max_len) + { ++#ifdef __linux__ ++/* Only needed by the linux version of PTR_SANE */ + char *heap_end; + +-#ifdef __linux__ + // Try and make use of /proc filesystem to safely print memory contents. + if (!safe_print_str(val, max_len)) + return 0; +-#endif + + heap_end= (char*) sbrk(0); ++#endif + + if (!PTR_SANE(val)) + { Modified: branches/2018Q2/databases/mariadb102-server/files/patch-sql-common_client.c ============================================================================== --- branches/2018Q2/databases/mariadb102-server/files/patch-sql-common_client.c Sun May 20 06:43:40 2018 (r470440) +++ branches/2018Q2/databases/mariadb102-server/files/patch-sql-common_client.c Sun May 20 08:01:56 2018 (r470441) @@ -11,13 +11,3 @@ #include "client_settings.h" #include #include -@@ -1822,7 +1826,8 @@ - */ - - #ifdef HAVE_X509_check_host -- ret_validation= X509_check_host(server_cert, server_hostname, 0, 0, 0) != 1; -+ ret_validation= X509_check_host(server_cert, server_hostname, -+ strlen(server_hostname), 0, 0) != 1; - #else - subject= X509_get_subject_name(server_cert); - cn_loc= X509_NAME_get_index_by_NID(subject, NID_commonName, -1); Modified: branches/2018Q2/databases/mariadb102-server/files/patch-sql_mysqld.cc ============================================================================== --- branches/2018Q2/databases/mariadb102-server/files/patch-sql_mysqld.cc Sun May 20 06:43:40 2018 (r470440) +++ branches/2018Q2/databases/mariadb102-server/files/patch-sql_mysqld.cc Sun May 20 08:01:56 2018 (r470441) @@ -1,21 +1,5 @@ --- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC +++ sql/mysqld.cc -@@ -111,6 +111,7 @@ - #endif - - #include -+#include - - #define mysqld_charset &my_charset_latin1 - -@@ -120,6 +121,7 @@ - #define HAVE_CLOSE_SERVER_SOCK 1 - #endif - -+ - extern "C" { // Because of SCO 3.2V4.2 - #include - #ifndef __GNU_LIBRARY__ @@ -4838,8 +4840,9 @@ static void init_ssl() while ((err= ERR_get_error())) sql_print_warning("SSL error: %s", ERR_error_string(err, NULL)); From owner-svn-ports-branches@freebsd.org Sun May 20 13:28:59 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED0E9EE0F0A; Sun, 20 May 2018 13:28:58 +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 9AE1C7F45B; Sun, 20 May 2018 13:28:58 +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 6DCC216E85; Sun, 20 May 2018 13:28:58 +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 w4KDSwkj038693; Sun, 20 May 2018 13:28:58 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4KDSvZ1038690; Sun, 20 May 2018 13:28:57 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201805201328.w4KDSvZ1038690@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 20 May 2018 13:28:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470457 - branches/2018Q2/archivers/zopfli X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q2/archivers/zopfli X-SVN-Commit-Revision: 470457 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.26 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, 20 May 2018 13:28:59 -0000 Author: riggs Date: Sun May 20 13:28:57 2018 New Revision: 470457 URL: https://svnweb.freebsd.org/changeset/ports/470457 Log: MFH: r470456 Update to upstream version 1.0.2 Approved by: ports-secteam (riggs) Modified: branches/2018Q2/archivers/zopfli/Makefile branches/2018Q2/archivers/zopfli/distinfo branches/2018Q2/archivers/zopfli/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/archivers/zopfli/Makefile ============================================================================== --- branches/2018Q2/archivers/zopfli/Makefile Sun May 20 13:26:28 2018 (r470456) +++ branches/2018Q2/archivers/zopfli/Makefile Sun May 20 13:28:57 2018 (r470457) @@ -3,7 +3,7 @@ PORTNAME= zopfli DISTVERSIONPREFIX= ${PORTNAME}- -DISTVERSION= 1.0.1 +DISTVERSION= 1.0.2 CATEGORIES= archivers MAINTAINER= ports@FreeBSD.org @@ -31,7 +31,7 @@ do-install: .for f in ${PORTNAME} ${PORTNAME}png ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor -.for f in lib${PORTNAME}.so.1.0.1 lib${PORTNAME}png.so.1.0.0 +.for f in lib${PORTNAME}.so.1.0.2 lib${PORTNAME}png.so.1.0.2 ${INSTALL_LIB} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/lib ${LN} -fs ${f} ${STAGEDIR}${PREFIX}/lib/${f:R:R} ${LN} -fs ${f:R:R} ${STAGEDIR}${PREFIX}/lib/${f:R:R:R} Modified: branches/2018Q2/archivers/zopfli/distinfo ============================================================================== --- branches/2018Q2/archivers/zopfli/distinfo Sun May 20 13:26:28 2018 (r470456) +++ branches/2018Q2/archivers/zopfli/distinfo Sun May 20 13:28:57 2018 (r470457) @@ -1,2 +1,3 @@ -SHA256 (google-zopfli-zopfli-1.0.1_GH0.tar.gz) = 29743d727a4e0ecd1b93e0bf89476ceeb662e809ab2e6ab007a0b0344800e9b4 -SIZE (google-zopfli-zopfli-1.0.1_GH0.tar.gz) = 128178 +TIMESTAMP = 1526822287 +SHA256 (google-zopfli-zopfli-1.0.2_GH0.tar.gz) = 4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a55 +SIZE (google-zopfli-zopfli-1.0.2_GH0.tar.gz) = 136035 Modified: branches/2018Q2/archivers/zopfli/pkg-plist ============================================================================== --- branches/2018Q2/archivers/zopfli/pkg-plist Sun May 20 13:26:28 2018 (r470456) +++ branches/2018Q2/archivers/zopfli/pkg-plist Sun May 20 13:28:57 2018 (r470457) @@ -8,6 +8,7 @@ include/zopfli/hash.h include/zopfli/katajainen.h include/zopfli/lz77.h include/zopfli/squeeze.h +include/zopfli/symbols.h include/zopfli/tree.h include/zopfli/util.h include/zopfli/zlib_container.h @@ -17,7 +18,7 @@ include/zopflipng/lodepng/lodepng_util.h include/zopflipng/zopflipng_lib.h lib/libzopfli.so lib/libzopfli.so.1 -lib/libzopfli.so.1.0.1 +lib/libzopfli.so.1.0.2 lib/libzopflipng.so lib/libzopflipng.so.1 -lib/libzopflipng.so.1.0.0 +lib/libzopflipng.so.1.0.2 From owner-svn-ports-branches@freebsd.org Mon May 21 01:04:00 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCA63EA9348; Mon, 21 May 2018 01:04:00 +0000 (UTC) (envelope-from mandree@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 80D947FD9D; Mon, 21 May 2018 01:04:00 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6388A1E01A; Mon, 21 May 2018 01:04:00 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4L1407J093441; Mon, 21 May 2018 01:04:00 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4L140A5093436; Mon, 21 May 2018 01:04:00 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201805210104.w4L140A5093436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Mon, 21 May 2018 01:04:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470493 - in branches/2018Q2/sysutils/e2fsprogs: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2018Q2/sysutils/e2fsprogs: . files X-SVN-Commit-Revision: 470493 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.26 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, 21 May 2018 01:04:01 -0000 Author: mandree Date: Mon May 21 01:03:59 2018 New Revision: 470493 URL: https://svnweb.freebsd.org/changeset/ports/470493 Log: MFH: r470322 Update to new upstream release 1.44.2. Most important changes over 1.44.1_1: e2fsck: adjust quota counters when clearing orphaned inodes e2fsprogs: fix Free Software Foundation address mke2fs: print error string if ext2fs_close_free() fails po: update pl.po (from translationproject.org) Use @AR@ instead of hardcoded 'ar' Changelog over 1.44.1: Approved by: ports-secteam (riggs@) Deleted: branches/2018Q2/sysutils/e2fsprogs/files/patch-tests_f__bigalloc__badinode_script branches/2018Q2/sysutils/e2fsprogs/files/patch-tests_f__bigalloc__orphan__list_script branches/2018Q2/sysutils/e2fsprogs/files/patch-za branches/2018Q2/sysutils/e2fsprogs/files/patch-zb branches/2018Q2/sysutils/e2fsprogs/files/patch-zc branches/2018Q2/sysutils/e2fsprogs/files/patch-zd branches/2018Q2/sysutils/e2fsprogs/files/patch-ze branches/2018Q2/sysutils/e2fsprogs/files/patch-zf branches/2018Q2/sysutils/e2fsprogs/files/patch-zg Modified: branches/2018Q2/sysutils/e2fsprogs/Makefile branches/2018Q2/sysutils/e2fsprogs/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/sysutils/e2fsprogs/Makefile ============================================================================== --- branches/2018Q2/sysutils/e2fsprogs/Makefile Mon May 21 00:03:43 2018 (r470492) +++ branches/2018Q2/sysutils/e2fsprogs/Makefile Mon May 21 01:03:59 2018 (r470493) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.44.1 -PORTREVISION?= 1 +PORTVERSION= 1.44.2 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} Modified: branches/2018Q2/sysutils/e2fsprogs/distinfo ============================================================================== --- branches/2018Q2/sysutils/e2fsprogs/distinfo Mon May 21 00:03:43 2018 (r470492) +++ branches/2018Q2/sysutils/e2fsprogs/distinfo Mon May 21 01:03:59 2018 (r470493) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524922817 -SHA256 (e2fsprogs-1.44.1.tar.xz) = 0ca164c1c87724df904c918b2d7051ef989b51de725db66c67514dbe6dd2b9ef -SIZE (e2fsprogs-1.44.1.tar.xz) = 5331960 +TIMESTAMP = 1526665210 +SHA256 (e2fsprogs-1.44.2.tar.xz) = 8324cf0b6e81805a741d94087b00e99f7e16144f1ee5a413709a1fa6948b126c +SIZE (e2fsprogs-1.44.2.tar.xz) = 5349784 From owner-svn-ports-branches@freebsd.org Mon May 21 03:14:21 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D191EB1741; Mon, 21 May 2018 03:14:21 +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 1E53569849; Mon, 21 May 2018 03:14:21 +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 000971F5A8; Mon, 21 May 2018 03:14:20 +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 w4L3EKNm061096; Mon, 21 May 2018 03:14:20 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4L3EKlQ061094; Mon, 21 May 2018 03:14:20 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201805210314.w4L3EKlQ061094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 21 May 2018 03:14:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470508 - branches/2018Q2/dns/bind912 X-SVN-Group: ports-branches X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: branches/2018Q2/dns/bind912 X-SVN-Commit-Revision: 470508 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.26 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, 21 May 2018 03:14:21 -0000 Author: delphij Date: Mon May 21 03:14:20 2018 New Revision: 470508 URL: https://svnweb.freebsd.org/changeset/ports/470508 Log: MFH: r470507 Security update to 9.12.1P2. Security: 94599fe0-5ca3-11e8-8be1-d05099c0ae8c Security: CVE-2018-5736, CVE-2018-5737 Approved by: ports-secteam Modified: branches/2018Q2/dns/bind912/Makefile branches/2018Q2/dns/bind912/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/dns/bind912/Makefile ============================================================================== --- branches/2018Q2/dns/bind912/Makefile Mon May 21 03:13:33 2018 (r470507) +++ branches/2018Q2/dns/bind912/Makefile Mon May 21 03:14:20 2018 (r470508) @@ -30,7 +30,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.1 +ISCVERSION= 9.12.1-P2 USES= cpe libedit Modified: branches/2018Q2/dns/bind912/distinfo ============================================================================== --- branches/2018Q2/dns/bind912/distinfo Mon May 21 03:13:33 2018 (r470507) +++ branches/2018Q2/dns/bind912/distinfo Mon May 21 03:14:20 2018 (r470508) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521456447 -SHA256 (bind-9.12.1.tar.gz) = 16e446425c35e48b651ddf1171d2115ebf32b07670b652e1030a174038937510 -SIZE (bind-9.12.1.tar.gz) = 9302783 +TIMESTAMP = 1526711298 +SHA256 (bind-9.12.1-P2.tar.gz) = 0de7c3453461e2f0505ac634b984f8e7afa1952cf7fc972cbefbcc169edf2d29 +SIZE (bind-9.12.1-P2.tar.gz) = 9305005 From owner-svn-ports-branches@freebsd.org Tue May 22 00:24:29 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6206BEAA72F; Tue, 22 May 2018 00:24:29 +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 115327755F; Tue, 22 May 2018 00:24:29 +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 E5271471B; Tue, 22 May 2018 00:24:28 +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 w4M0OS9m008643; Tue, 22 May 2018 00:24:28 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4M0OShu008642; Tue, 22 May 2018 00:24:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805220024.w4M0OShu008642@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 22 May 2018 00:24:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470588 - branches/2018Q2/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/emulators/rpcs3 X-SVN-Commit-Revision: 470588 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.26 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, 22 May 2018 00:24:29 -0000 Author: jbeich Date: Tue May 22 00:24:28 2018 New Revision: 470588 URL: https://svnweb.freebsd.org/changeset/ports/470588 Log: MFH: r470585 emulators/rpcs3: update to 0.0.5.355 Changes: https://github.com/RPCS3/rpcs3/compare/4e8ce7fac...c9669818e Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q2/emulators/rpcs3/Makefile branches/2018Q2/emulators/rpcs3/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q2/emulators/rpcs3/Makefile Tue May 22 00:23:15 2018 (r470587) +++ branches/2018Q2/emulators/rpcs3/Makefile Tue May 22 00:24:28 2018 (r470588) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-336 -DISTVERSIONSUFFIX= -g4e8ce7fac +DISTVERSION= 0.0.5-355 +DISTVERSIONSUFFIX= -gc9669818e CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q2/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q2/emulators/rpcs3/distinfo Tue May 22 00:23:15 2018 (r470587) +++ branches/2018Q2/emulators/rpcs3/distinfo Tue May 22 00:24:28 2018 (r470588) @@ -1,6 +1,6 @@ -TIMESTAMP = 1526671030 -SHA256 (RPCS3-rpcs3-v0.0.5-336-g4e8ce7fac_GH0.tar.gz) = 3f8d9e08c518410c9dabd169f4ff7188aad870a03e0c1d6b23127e40aea09348 -SIZE (RPCS3-rpcs3-v0.0.5-336-g4e8ce7fac_GH0.tar.gz) = 4851521 +TIMESTAMP = 1526907325 +SHA256 (RPCS3-rpcs3-v0.0.5-355-gc9669818e_GH0.tar.gz) = 17655d77fd91cd7123f90073940204874f6e7883308ba6edb22191939726268b +SIZE (RPCS3-rpcs3-v0.0.5-355-gc9669818e_GH0.tar.gz) = 4852290 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-llvm-17ec6d78a73_GH0.tar.gz) = 4567d1d946429ce55d6c0480fad3b82874aad22c2b1928ac4d4ba5ba40338604 From owner-svn-ports-branches@freebsd.org Tue May 22 00:25:16 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CA01EAA774; Tue, 22 May 2018 00:25:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BB8DA77635; Tue, 22 May 2018 00:25: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 98008471C; Tue, 22 May 2018 00:25: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 w4M0PFt0008830; Tue, 22 May 2018 00:25:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4M0PF6Z008827; Tue, 22 May 2018 00:25:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805220025.w4M0PF6Z008827@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 22 May 2018 00:25:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470589 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 470589 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.26 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, 22 May 2018 00:25:16 -0000 Author: jbeich Date: Tue May 22 00:25:14 2018 New Revision: 470589 URL: https://svnweb.freebsd.org/changeset/ports/470589 Log: MFH: r470586 www/waterfox: update to 56.2.0.13 Changes: https://github.com/MrAlex94/Waterfox/compare/436898372f858...d2cdd42f4115b Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1461203 - copied unchanged from r470586, head/www/waterfox/files/patch-bug1461203 Modified: branches/2018Q2/www/waterfox/Makefile branches/2018Q2/www/waterfox/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Tue May 22 00:24:28 2018 (r470588) +++ branches/2018Q2/www/waterfox/Makefile Tue May 22 00:25:14 2018 (r470589) @@ -1,16 +1,15 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.2.0-7 -DISTVERSIONSUFFIX= -g436898372f858 -PORTREVISION= 1 +DISTVERSION= 56.2.0-13 +DISTVERSIONSUFFIX= -gd2cdd42f4115b CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org COMMENT= Distilled fork of Firefox DEPRECATED= Temporary experiment -EXPIRATION_DATE=2018-07-03 +EXPIRATION_DATE=2018-07-10 BUILD_DEPENDS= nspr>=4.16:devel/nspr \ nss>=3.32.1:security/nss \ Modified: branches/2018Q2/www/waterfox/distinfo ============================================================================== --- branches/2018Q2/www/waterfox/distinfo Tue May 22 00:24:28 2018 (r470588) +++ branches/2018Q2/www/waterfox/distinfo Tue May 22 00:25:14 2018 (r470589) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526343922 -SHA256 (MrAlex94-Waterfox-56.2.0-7-g436898372f858_GH0.tar.gz) = ed9b870b81e3263afaf92efa9830b2a8e84cd71d78e300feaa5de70395974aae -SIZE (MrAlex94-Waterfox-56.2.0-7-g436898372f858_GH0.tar.gz) = 395153667 +TIMESTAMP = 1526579170 +SHA256 (MrAlex94-Waterfox-56.2.0-13-gd2cdd42f4115b_GH0.tar.gz) = 3722c20ec52309b1b184e0c82d15ebd2bf0d793c3306099028f789415256c6ca +SIZE (MrAlex94-Waterfox-56.2.0-13-gd2cdd42f4115b_GH0.tar.gz) = 395161904 Copied: branches/2018Q2/www/waterfox/files/patch-bug1461203 (from r470586, head/www/waterfox/files/patch-bug1461203) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1461203 Tue May 22 00:25:14 2018 (r470589, copy of r470586, head/www/waterfox/files/patch-bug1461203) @@ -0,0 +1,41 @@ +commit c0a881204f3a +Author: Martin Stransky +Date: Thu May 17 14:40:21 2018 +0200 + + Bug 1461203 - Use GetScrollbarMetrics() to access scrollbar metrics. r=jhorak, a=RyanVM + + MozReview-Commit-ID: 3gnFNfxQJZi + + --HG-- + extra : source : bdfce06ecdb44275214caa0c8333d3112bbb4d16 +--- + widget/gtk/gtk3drawing.cpp | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git widget/gtk/gtk3drawing.cpp widget/gtk/gtk3drawing.cpp +index 8efc4f70d1be2..71ddd1e9d4bb7 100644 +--- widget/gtk/gtk3drawing.cpp ++++ widget/gtk/gtk3drawing.cpp +@@ -888,16 +888,14 @@ moz_gtk_scrollbar_button_paint(cairo_t *cr, const GdkRectangle* aRect, + // in case of horizontal scrollbars). + GtkOrientation orientation = flags & MOZ_GTK_STEPPER_VERTICAL ? + GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL; +- const auto& metrics = sScrollbarMetrics[orientation]; +- if (!metrics.initialized) { +- NS_WARNING("Didn't measure before drawing?"); +- } ++ ++ const ScrollbarGTKMetrics* metrics = GetScrollbarMetrics(orientation); + if (flags & MOZ_GTK_STEPPER_VERTICAL) { +- rect.x += metrics.border.track.left; +- rect.width = metrics.size.thumb.width; ++ rect.x += metrics->border.track.left; ++ rect.width = metrics->size.thumb.width; + } else { +- rect.y += metrics.border.track.top; +- rect.height = metrics.size.thumb.height; ++ rect.y += metrics->border.track.top; ++ rect.height = metrics->size.thumb.height; + } + } + From owner-svn-ports-branches@freebsd.org Tue May 22 00:26:14 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89C70EAA7C5; Tue, 22 May 2018 00:26:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2712E7771C; Tue, 22 May 2018 00:26:14 +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 03C0A471D; Tue, 22 May 2018 00:26:14 +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 w4M0QDq5008994; Tue, 22 May 2018 00:26:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4M0QDuq008993; Tue, 22 May 2018 00:26:13 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805220026.w4M0QDuq008993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 22 May 2018 00:26:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470590 - branches/2018Q2/games/openbor X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/games/openbor X-SVN-Commit-Revision: 470590 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.26 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, 22 May 2018 00:26:14 -0000 Author: jbeich Date: Tue May 22 00:26:13 2018 New Revision: 470590 URL: https://svnweb.freebsd.org/changeset/ports/470590 Log: MFH: r470587 games/openbor: update to 6174 Changes: https://github.com/DCurrent/openbor/compare/7b12a9cc...3a407fb8 Approved by: ports-secteam (feld, implicit for snapshots) Modified: branches/2018Q2/games/openbor/Makefile branches/2018Q2/games/openbor/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/games/openbor/Makefile ============================================================================== --- branches/2018Q2/games/openbor/Makefile Tue May 22 00:25:14 2018 (r470589) +++ branches/2018Q2/games/openbor/Makefile Tue May 22 00:26:13 2018 (r470590) @@ -2,7 +2,7 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 6172 +PORTVERSION?= 6174 .ifndef PKGNAMESUFFIX PORTREVISION= 0 .endif @@ -31,7 +31,7 @@ PORTSCOUT= ignore:1 USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= 7b12a9cc +GH_TAGNAME?= 3a407fb8 USES+= gmake pkgconfig .if ${PORTVERSION} < 4433 Modified: branches/2018Q2/games/openbor/distinfo ============================================================================== --- branches/2018Q2/games/openbor/distinfo Tue May 22 00:25:14 2018 (r470589) +++ branches/2018Q2/games/openbor/distinfo Tue May 22 00:26:13 2018 (r470590) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526418962 -SHA256 (DCurrent-openbor-6172-7b12a9cc_GH0.tar.gz) = 84d8e67d37de390433bfce12b71bbb7a8794c21266eee7eaf389218a8a334ede -SIZE (DCurrent-openbor-6172-7b12a9cc_GH0.tar.gz) = 74512025 +TIMESTAMP = 1526839433 +SHA256 (DCurrent-openbor-6174-3a407fb8_GH0.tar.gz) = 2f2ced376da224fc80fb25bdbad40f864e06f2a8536724961efb2a0b43966ad9 +SIZE (DCurrent-openbor-6174-3a407fb8_GH0.tar.gz) = 74510589 From owner-svn-ports-branches@freebsd.org Tue May 22 13:59: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 E0E2BEF6E63; Tue, 22 May 2018 13:59:01 +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 9248276192; Tue, 22 May 2018 13:59:01 +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 5929814E76; Tue, 22 May 2018 13:59:01 +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 w4MDx1tC021393; Tue, 22 May 2018 13:59:01 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4MDx0Dt021391; Tue, 22 May 2018 13:59:00 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201805221359.w4MDx0Dt021391@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 22 May 2018 13:59:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470616 - in branches/2018Q2/sysutils/py-google-compute-engine: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2018Q2/sysutils/py-google-compute-engine: . files X-SVN-Commit-Revision: 470616 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.26 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, 22 May 2018 13:59:02 -0000 Author: swills Date: Tue May 22 13:59:00 2018 New Revision: 470616 URL: https://svnweb.freebsd.org/changeset/ports/470616 Log: MFH: r470608 sysutils/py-google-compute-engine: Fixes agent logging to syslog (console) PR: 228411 Submitted by: Helen Koike (maintainer) Approved by: ports-secteam (implicit) Added: branches/2018Q2/sysutils/py-google-compute-engine/files/90-google.conf.sample - copied unchanged from r470608, head/sysutils/py-google-compute-engine/files/90-google.conf.sample Modified: branches/2018Q2/sysutils/py-google-compute-engine/Makefile branches/2018Q2/sysutils/py-google-compute-engine/pkg-plist (contents, props changed) Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/sysutils/py-google-compute-engine/Makefile ============================================================================== --- branches/2018Q2/sysutils/py-google-compute-engine/Makefile Tue May 22 13:58:33 2018 (r470615) +++ branches/2018Q2/sysutils/py-google-compute-engine/Makefile Tue May 22 13:59:00 2018 (r470616) @@ -2,7 +2,7 @@ PORTNAME= google-compute-engine DISTVERSION= 2.7.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -34,7 +34,11 @@ SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" REINPLACE_ARGS= -i '' post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d ${INSTALL_DATA} ${FILESDIR}/instance_configs.cfg.distro.sample \ ${STAGEDIR}${PREFIX}/etc/instance_configs.cfg.distro.sample + ${INSTALL_DATA} ${FILESDIR}/90-google.conf.sample \ + ${STAGEDIR}${PREFIX}/etc/syslog.d/90-google.conf.sample + .include Copied: branches/2018Q2/sysutils/py-google-compute-engine/files/90-google.conf.sample (from r470608, head/sysutils/py-google-compute-engine/files/90-google.conf.sample) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/py-google-compute-engine/files/90-google.conf.sample Tue May 22 13:59:00 2018 (r470616, copy of r470608, head/sysutils/py-google-compute-engine/files/90-google.conf.sample) @@ -0,0 +1,7 @@ +# $FreeBSD$ +# Google Compute Engine default console logging. +# +# daemon: logging from Google provided daemons. +# kern: logging information in case of an unexpected crash during boot. +# +daemon,kern.* /dev/console Modified: branches/2018Q2/sysutils/py-google-compute-engine/pkg-plist ============================================================================== --- branches/2018Q2/sysutils/py-google-compute-engine/pkg-plist Tue May 22 13:58:33 2018 (r470615) +++ branches/2018Q2/sysutils/py-google-compute-engine/pkg-plist Tue May 22 13:59:00 2018 (r470616) @@ -1 +1,2 @@ @sample etc/instance_configs.cfg.distro.sample +@sample etc/syslog.d/90-google.conf.sample From owner-svn-ports-branches@freebsd.org Tue May 22 13:59: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 AD9C7EF6EDF; Tue, 22 May 2018 13:59:39 +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 5BCDC762C0; Tue, 22 May 2018 13:59:39 +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 3CE4014E79; Tue, 22 May 2018 13:59:39 +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 w4MDxdrr021593; Tue, 22 May 2018 13:59:39 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4MDxc4h021591; Tue, 22 May 2018 13:59:38 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201805221359.w4MDxc4h021591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 22 May 2018 13:59:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470617 - in branches/2018Q2/sysutils/py-google-compute-engine: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2018Q2/sysutils/py-google-compute-engine: . files X-SVN-Commit-Revision: 470617 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.26 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, 22 May 2018 13:59:39 -0000 Author: swills Date: Tue May 22 13:59:38 2018 New Revision: 470617 URL: https://svnweb.freebsd.org/changeset/ports/470617 Log: MFH: r470611 sysutils/py-google-compute-engine: Fix gsutil not being found PR: 228415 Submitted by: Helen Koike (maintainer Approved by: ports-secteam (implicit) Modified: branches/2018Q2/sysutils/py-google-compute-engine/Makefile branches/2018Q2/sysutils/py-google-compute-engine/files/google_startup.in Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/sysutils/py-google-compute-engine/Makefile ============================================================================== --- branches/2018Q2/sysutils/py-google-compute-engine/Makefile Tue May 22 13:59:00 2018 (r470616) +++ branches/2018Q2/sysutils/py-google-compute-engine/Makefile Tue May 22 13:59:38 2018 (r470617) @@ -2,7 +2,7 @@ PORTNAME= google-compute-engine DISTVERSION= 2.7.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -39,6 +39,5 @@ post-install: ${STAGEDIR}${PREFIX}/etc/instance_configs.cfg.distro.sample ${INSTALL_DATA} ${FILESDIR}/90-google.conf.sample \ ${STAGEDIR}${PREFIX}/etc/syslog.d/90-google.conf.sample - .include Modified: branches/2018Q2/sysutils/py-google-compute-engine/files/google_startup.in ============================================================================== --- branches/2018Q2/sysutils/py-google-compute-engine/files/google_startup.in Tue May 22 13:59:00 2018 (r470616) +++ branches/2018Q2/sysutils/py-google-compute-engine/files/google_startup.in Tue May 22 13:59:38 2018 (r470617) @@ -13,6 +13,9 @@ . /etc/rc.subr +# Required to execute gsutil +export PATH=%%LOCALBASE%%/bin:$PATH + name="google_startup" rcvar="google_startup_enable" From owner-svn-ports-branches@freebsd.org Tue May 22 23:55:00 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 59636EE696D; Tue, 22 May 2018 23:55:00 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 076156EC6A; Tue, 22 May 2018 23:55:00 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE0FF1B0CF; Tue, 22 May 2018 23:54:59 +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 w4MNsx7m028502; Tue, 22 May 2018 23:54:59 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4MNsx4h028498; Tue, 22 May 2018 23:54:59 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201805222354.w4MNsx4h028498@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 22 May 2018 23:54:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470667 - in branches/2018Q2/sysutils/py-google-compute-engine: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2018Q2/sysutils/py-google-compute-engine: . files X-SVN-Commit-Revision: 470667 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.26 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, 22 May 2018 23:55:00 -0000 Author: swills Date: Tue May 22 23:54:58 2018 New Revision: 470667 URL: https://svnweb.freebsd.org/changeset/ports/470667 Log: MFH: r470666 sysutils/py-google-compute-engine: Fix hostname and bash usage PR: 228428 PR: 228252 Submitted by: Helen Koike (maintainer) Approved by: ports-secteam (implicit) Added: branches/2018Q2/sysutils/py-google-compute-engine/files/google_set_hostname - copied unchanged from r470666, head/sysutils/py-google-compute-engine/files/google_set_hostname branches/2018Q2/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py - copied unchanged from r470666, head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py Modified: branches/2018Q2/sysutils/py-google-compute-engine/Makefile branches/2018Q2/sysutils/py-google-compute-engine/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/sysutils/py-google-compute-engine/Makefile ============================================================================== --- branches/2018Q2/sysutils/py-google-compute-engine/Makefile Tue May 22 23:52:40 2018 (r470666) +++ branches/2018Q2/sysutils/py-google-compute-engine/Makefile Tue May 22 23:54:58 2018 (r470667) @@ -2,7 +2,7 @@ PORTNAME= google-compute-engine DISTVERSION= 2.7.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -34,10 +34,12 @@ SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" REINPLACE_ARGS= -i '' post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d ${STAGEDIR}/etc ${INSTALL_DATA} ${FILESDIR}/instance_configs.cfg.distro.sample \ ${STAGEDIR}${PREFIX}/etc/instance_configs.cfg.distro.sample ${INSTALL_DATA} ${FILESDIR}/90-google.conf.sample \ ${STAGEDIR}${PREFIX}/etc/syslog.d/90-google.conf.sample + ${INSTALL_DATA} ${FILESDIR}/google_set_hostname \ + ${STAGEDIR}/etc/dhclient-exit-hooks .include Copied: branches/2018Q2/sysutils/py-google-compute-engine/files/google_set_hostname (from r470666, head/sysutils/py-google-compute-engine/files/google_set_hostname) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/py-google-compute-engine/files/google_set_hostname Tue May 22 23:54:58 2018 (r470667, copy of r470666, head/sysutils/py-google-compute-engine/files/google_set_hostname) @@ -0,0 +1,121 @@ +#!/bin/sh +# $FreeBSD$ +# Copyright 2016 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Deal with a new hostname assignment. + +if [ -n "$new_host_name" ] && [ -n "$new_ip_address" ]; then + # Delete entries with new_host_name or new_ip_address in /etc/hosts. + sed -i '/Added by Google/d' /etc/hosts + + # Add an entry for our new_host_name/new_ip_address in /etc/hosts. + echo "${new_ip_address} ${new_host_name} ${new_host_name%%.*} # Added by Google" >> /etc/hosts + + # Add an entry for reaching the metadata server in /etc/hosts. + echo "169.254.169.254 metadata.google.internal # Added by Google" >> /etc/hosts +fi + +# /sbin/dhclient-scripts in both ubuntu and centos have some problems for us: +# 1) BOUND doesn't always set hostname (e.g. if old_host_name is unset in +# precise pangolin) +# 2) Using too long of a FQDN as a hostname causes some tools to break in +# some distros (e.g. ssh-keygen) and hostname tool complains when given +# a FQDN that is > 64 bytes. +# +# As a result, we set the host name in all circumstances here, to the truncated +# unqualified domain name. + +if [ -n "$new_host_name" ]; then + hostname "${new_host_name%%.*}" + + # If NetworkManager is installed set the hostname with nmcli. + # to resolve issues with NetworkManager resetting the hostname + # to the FQDN on DHCP renew. + nmcli=$(which nmcli 2> /dev/null) + if [ -x "$nmcli" ]; then + nmcli general hostname "${new_host_name%%.*}" + fi + + # Restart rsyslog to update the hostname. + systemctl=$(which systemctl 2> /dev/null) + if [ -x "$systemctl" ]; then + hasrsyslog=$($systemctl | grep rsyslog | cut -f1 -d' ') + if [ ! -z "$hasrsyslog" ]; then + $systemctl -q --no-block restart "$hasrsyslog" + fi + else + pkill -HUP syslogd + fi +fi +#!/bin/sh +# Copyright 2016 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Deal with a new hostname assignment. + +if [ -n "$new_host_name" ] && [ -n "$new_ip_address" ]; then + # Delete entries with new_host_name or new_ip_address in /etc/hosts. + sed -i '/Added by Google/d' /etc/hosts + + # Add an entry for our new_host_name/new_ip_address in /etc/hosts. + echo "${new_ip_address} ${new_host_name} ${new_host_name%%.*} # Added by Google" >> /etc/hosts + + # Add an entry for reaching the metadata server in /etc/hosts. + echo "169.254.169.254 metadata.google.internal # Added by Google" >> /etc/hosts +fi + +# /sbin/dhclient-scripts in both ubuntu and centos have some problems for us: +# 1) BOUND doesn't always set hostname (e.g. if old_host_name is unset in +# precise pangolin) +# 2) Using too long of a FQDN as a hostname causes some tools to break in +# some distros (e.g. ssh-keygen) and hostname tool complains when given +# a FQDN that is > 64 bytes. +# +# As a result, we set the host name in all circumstances here, to the truncated +# unqualified domain name. + +if [ -n "$new_host_name" ]; then + hostname "${new_host_name%%.*}" + + # If NetworkManager is installed set the hostname with nmcli. + # to resolve issues with NetworkManager resetting the hostname + # to the FQDN on DHCP renew. + nmcli=$(which nmcli 2> /dev/null) + if [ -x "$nmcli" ]; then + nmcli general hostname "${new_host_name%%.*}" + fi + + # Restart rsyslog to update the hostname. + systemctl=$(which systemctl 2> /dev/null) + if [ -x "$systemctl" ]; then + hasrsyslog=$($systemctl | grep rsyslog | cut -f1 -d' ') + if [ ! -z "$hasrsyslog" ]; then + $systemctl -q --no-block restart "$hasrsyslog" + fi + else + pkill -HUP syslogd + fi +fi Copied: branches/2018Q2/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py (from r470666, head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py Tue May 22 23:54:58 2018 (r470667, copy of r470666, head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py) @@ -0,0 +1,11 @@ +--- google_compute_engine/metadata_scripts/script_executor.py.orig 2018-02-22 19:44:17 UTC ++++ google_compute_engine/metadata_scripts/script_executor.py +@@ -53,7 +53,7 @@ class ScriptExecutor(object): + """ + process = subprocess.Popen( + metadata_script, shell=True, +- executable=constants.LOCALBASE + '/bin/bash', ++ executable='/bin/sh', + stderr=subprocess.STDOUT, stdout=subprocess.PIPE) + while True: + for line in iter(process.stdout.readline, b''): Modified: branches/2018Q2/sysutils/py-google-compute-engine/pkg-plist ============================================================================== --- branches/2018Q2/sysutils/py-google-compute-engine/pkg-plist Tue May 22 23:52:40 2018 (r470666) +++ branches/2018Q2/sysutils/py-google-compute-engine/pkg-plist Tue May 22 23:54:58 2018 (r470667) @@ -1,2 +1,3 @@ @sample etc/instance_configs.cfg.distro.sample @sample etc/syslog.d/90-google.conf.sample +/etc/dhclient-exit-hooks From owner-svn-ports-branches@freebsd.org Wed May 23 07:51: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 40F3EEF3BD4; Wed, 23 May 2018 07:51:04 +0000 (UTC) (envelope-from krion@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 E89BF7CEF3; Wed, 23 May 2018 07:51:03 +0000 (UTC) (envelope-from krion@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 C9D671FFAF; Wed, 23 May 2018 07:51:03 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4N7p3Wg069942; Wed, 23 May 2018 07:51:03 GMT (envelope-from krion@FreeBSD.org) Received: (from krion@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4N7p2MM069938; Wed, 23 May 2018 07:51:02 GMT (envelope-from krion@FreeBSD.org) Message-Id: <201805230751.w4N7p2MM069938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: krion set sender to krion@FreeBSD.org using -f From: Kirill Ponomarev Date: Wed, 23 May 2018 07:51:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470684 - in branches/2018Q2/mail/sympa: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: krion X-SVN-Commit-Paths: in branches/2018Q2/mail/sympa: . files X-SVN-Commit-Revision: 470684 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.26 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, 23 May 2018 07:51:04 -0000 Author: krion Date: Wed May 23 07:51:02 2018 New Revision: 470684 URL: https://svnweb.freebsd.org/changeset/ports/470684 Log: MFH: r466641 - Update to 6.2.30 PR: 227258 Submitted by: dgeo@centrale-marseille.fr(maintainer) Approved by: ports-secteam Modified: branches/2018Q2/mail/sympa/Makefile branches/2018Q2/mail/sympa/distinfo branches/2018Q2/mail/sympa/files/pkg-message.in branches/2018Q2/mail/sympa/files/sympa.in branches/2018Q2/mail/sympa/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/mail/sympa/Makefile ============================================================================== --- branches/2018Q2/mail/sympa/Makefile Wed May 23 07:44:03 2018 (r470683) +++ branches/2018Q2/mail/sympa/Makefile Wed May 23 07:51:02 2018 (r470684) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sympa -DISTVERSION= 6.2.24 +DISTVERSION= 6.2.30 CATEGORIES= mail MAINTAINER= dgeo@centrale-marseille.fr @@ -54,7 +54,7 @@ PORTDOCS= NEWS.md USERS= sympa GROUPS= sympa # Shebang is corrected by configure script -USES= autoreconf cpe fakeroot perl5 shebangfix +USES= autoreconf cpe fakeroot perl5 shebangfix gettext SHEBANG_FILES= po/sympa/xgettext.pl \ po/sympa/add-lang.pl \ @@ -77,6 +77,8 @@ CONFIGURE_ARGS+=--enable-fhs \ --with-lockdir=/var/spool/lock \ --with-modulesdir=${PREFIX}/libexec/${PORTNAME} \ --with-staticdir=${DATADIR}/static \ + --with-cssdir=${DATADIR}/static/css \ + --with-picturesdir=${DATADIR}/static/pictures \ --with-piddir=/var/run/${PORTNAME} \ --with-scriptdir=${PREFIX}/libexec/${PORTNAME} \ --with-spooldir=/var/spool/${PORTNAME} \ @@ -97,8 +99,8 @@ USE_RC_SUBR= sympa CONFLICTS= sympa-5* -OPTIONS_DEFINE= FASTCGI APACHE NLS -OPTIONS_DEFAULT=APACHE NLS +OPTIONS_DEFINE= FASTCGI APACHE +OPTIONS_DEFAULT=APACHE OPTIONS_RADIO= DATABASE OPTIONS_RADIO_DATABASE= PGSQL SYBASE MYSQL OPTIONS_SUB= yes @@ -115,11 +117,9 @@ OPTIONS_DEFAULT+= ${option} . endfor .endif -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls FASTCGI_RUN_DEPENDS= p5-FCGI>=0:www/p5-FCGI APACHE_IMPLIES= FASTCGI -APACHE_USE= APACHE_RUN=22+ +APACHE_USES+= apache:run APACHE_RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi PGSQL_SUB_LIST= REQ_PGSQL=postgresql Modified: branches/2018Q2/mail/sympa/distinfo ============================================================================== --- branches/2018Q2/mail/sympa/distinfo Wed May 23 07:44:03 2018 (r470683) +++ branches/2018Q2/mail/sympa/distinfo Wed May 23 07:51:02 2018 (r470684) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513872738 -SHA256 (sympa-community-sympa-6.2.24_GH0.tar.gz) = 4eeea0a4a41f99d3bf46fc2de250152d53ececf545b05ea3da447f871c67965f -SIZE (sympa-community-sympa-6.2.24_GH0.tar.gz) = 10676960 +TIMESTAMP = 1522755872 +SHA256 (sympa-community-sympa-6.2.30_GH0.tar.gz) = 3613738824c482719461675f93672811ba0618fb53caa5d8e6c9c956bb6d9fb1 +SIZE (sympa-community-sympa-6.2.30_GH0.tar.gz) = 10303628 Modified: branches/2018Q2/mail/sympa/files/pkg-message.in ============================================================================== --- branches/2018Q2/mail/sympa/files/pkg-message.in Wed May 23 07:44:03 2018 (r470683) +++ branches/2018Q2/mail/sympa/files/pkg-message.in Wed May 23 07:51:02 2018 (r470684) @@ -1,14 +1,13 @@ If you upgrade: - * from <6.2, read - read https://www.sympa.org/faq/upgrade-to-v6.2 - * else, run + * from < 6.2.25, read + read https://sympa-community.github.io/manual/upgrade/notes.html + * else, simply run # sympa.pl --upgrade First install: * run # sympa_wizard.pl * create database with # sympa.pl --health_check - Sybase: see https://www.sympa.org/manual_6.2/database + Sybase: see https://sympa-community.github.io/manual/install/setup-database.html for wwsympa server, see samples configs in %%EXAMPLESDIR%% - Modified: branches/2018Q2/mail/sympa/files/sympa.in ============================================================================== --- branches/2018Q2/mail/sympa/files/sympa.in Wed May 23 07:44:03 2018 (r470683) +++ branches/2018Q2/mail/sympa/files/sympa.in Wed May 23 07:51:02 2018 (r470684) @@ -38,6 +38,7 @@ extra_commands=status sympadir=%%PREFIX%%/libexec/sympa sympaconf=%%ETCDIR%%/sympa.conf +echo_opt="-n" sub_status() { @@ -72,7 +73,6 @@ sub_module_start() return 1 fi $sympadir/$1.pl $startparam && echo "success" || echo "failure" - echo } sub_start() @@ -142,7 +142,6 @@ sub_stop() else echo 'died' fi - echo else echo "Module $1.pl not running" fi @@ -167,7 +166,6 @@ sympa_start() sub_start bounced sub_start task_manager touch /var/spool/lock/sympa - echo else echo "Sympa seems active. No action will be taken." echo "Try \"sympa status\" or \"sympa restart"\". Modified: branches/2018Q2/mail/sympa/pkg-plist ============================================================================== --- branches/2018Q2/mail/sympa/pkg-plist Wed May 23 07:44:03 2018 (r470683) +++ branches/2018Q2/mail/sympa/pkg-plist Wed May 23 07:51:02 2018 (r470684) @@ -3,7 +3,6 @@ bin/sympa.pl bin/sympa_wizard.pl bin/upgrade_bulk_spool.pl bin/upgrade_send_spool.pl -bin/sympa_smtpc %%ETCDIR%%/data_structure.version.sample %%ETCDIR%%/README libexec/sympa/Conf.pm @@ -14,7 +13,6 @@ libexec/sympa/Sympa/Aliases/CheckSMTP.pm libexec/sympa/Sympa/Aliases/External.pm libexec/sympa/Sympa/Aliases/Template.pm libexec/sympa/Sympa/Archive.pm -libexec/sympa/Sympa/Auth.pm libexec/sympa/Sympa/Bulk.pm libexec/sympa/Sympa/CommandDef.pm libexec/sympa/Sympa/ConfDef.pm @@ -49,8 +47,6 @@ libexec/sympa/Sympa/List/Config.pm libexec/sympa/Sympa/LockedFile.pm libexec/sympa/Sympa/Log.pm libexec/sympa/Sympa/Mailer.pm -libexec/sympa/Sympa/Marc.pm -libexec/sympa/Sympa/Marc/Search.pm libexec/sympa/Sympa/Message.pm libexec/sympa/Sympa/Message/Plugin.pm libexec/sympa/Sympa/Message/Plugin/FixEncoding.pm @@ -97,13 +93,8 @@ libexec/sympa/Sympa/Request/Handler/decl.pm libexec/sympa/Sympa/Request/Handler/move_list.pm libexec/sympa/Sympa/Request/Handler/open_list.pm libexec/sympa/Sympa/Request/Message.pm -libexec/sympa/Sympa/Report.pm libexec/sympa/Sympa/Robot.pm -libexec/sympa/Sympa/SOAP.pm -libexec/sympa/Sympa/SOAP/Transport.pm libexec/sympa/Sympa/Scenario.pm -libexec/sympa/Sympa/Session.pm -libexec/sympa/Sympa/SharedDocument.pm libexec/sympa/Sympa/Spindle.pm libexec/sympa/Sympa/Spindle/AuthorizeMessage.pm libexec/sympa/Sympa/Spindle/AuthorizeRequest.pm @@ -159,11 +150,19 @@ libexec/sympa/Sympa/Tools/Password.pm libexec/sympa/Sympa/Tools/SMIME.pm libexec/sympa/Sympa/Tools/Text.pm libexec/sympa/Sympa/Tools/Time.pm -libexec/sympa/Sympa/Tools/WWW.pm libexec/sympa/Sympa/Topic.pm libexec/sympa/Sympa/Tracking.pm libexec/sympa/Sympa/Upgrade.pm libexec/sympa/Sympa/User.pm +libexec/sympa/Sympa/WWW/Auth.pm +libexec/sympa/Sympa/WWW/Marc.pm +libexec/sympa/Sympa/WWW/Marc/Search.pm +libexec/sympa/Sympa/WWW/Report.pm +libexec/sympa/Sympa/WWW/SOAP.pm +libexec/sympa/Sympa/WWW/SOAP/Transport.pm +libexec/sympa/Sympa/WWW/Session.pm +libexec/sympa/Sympa/WWW/SharedDocument.pm +libexec/sympa/Sympa/WWW/Tools.pm libexec/sympa/alias_manager.pl libexec/sympa/arc2webarc.pl libexec/sympa/archived.pl @@ -242,7 +241,6 @@ man/man3/Sympa::List::Config.3Sympa.gz man/man3/Sympa::LockedFile.3Sympa.gz man/man3/Sympa::Log.3Sympa.gz man/man3/Sympa::Mailer.3Sympa.gz -man/man3/Sympa::Marc::Search.3Sympa.gz man/man3/Sympa::Message.3Sympa.gz man/man3/Sympa::Message::Plugin.3Sympa.gz man/man3/Sympa::Message::Plugin::FixEncoding.3Sympa.gz @@ -289,8 +287,6 @@ man/man3/Sympa::Request::Handler::unknown.3Sympa.gz man/man3/Sympa::Request::Handler::verify.3Sympa.gz man/man3/Sympa::Request::Handler::which.3Sympa.gz man/man3/Sympa::Request::Message.3Sympa.gz -man/man3/Sympa::Session.3Sympa.gz -man/man3/Sympa::SharedDocument.3Sympa.gz man/man3/Sympa::Spindle.3Sympa.gz man/man3/Sympa::Spindle::AuthorizeMessage.3Sympa.gz man/man3/Sympa::Spindle::AuthorizeRequest.3Sympa.gz @@ -344,6 +340,9 @@ man/man3/Sympa::Tools::Time.3Sympa.gz man/man3/Sympa::Topic.3Sympa.gz man/man3/Sympa::Tracking.3Sympa.gz man/man3/Sympa::User.3Sympa.gz +man/man3/Sympa::WWW::Marc::Search.3Sympa.gz +man/man3/Sympa::WWW::Session.3Sympa.gz +man/man3/Sympa::WWW::SharedDocument.3Sympa.gz man/man5/auth.conf.5.gz man/man5/automatic_lists_description.conf.5.gz man/man5/charset.conf.5.gz @@ -367,76 +366,75 @@ man/man8/sympa_msg.8.gz man/man8/sympa_soap_server.8.gz man/man8/task_manager.8.gz man/man8/wwsympa.8.gz -share/doc/smtpc/smtpc.1.md -%%NLS%%share/locale/af/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/ar/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/ar/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/bg/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/bg/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/br/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/br/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/ca/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/ca/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/cs/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/cs/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/de/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/de/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/el/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/el/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/en_US/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/en_US/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/eo/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/es/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/es/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/et/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/et/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/eu/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/eu/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/fi/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/fi/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/fr/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/fr/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/gl/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/gl/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/hu/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/hu/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/id/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/id/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/io/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/it/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/it/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/ja/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/ja/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/ko/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/la/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/ml/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/nb/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/nb/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/nl/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/nl/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/nn/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/oc/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/oc/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/pl/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/pl/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/pt/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/pt/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/ro/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/ro/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/rm/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/ru/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/ru/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/sv/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/sv/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/tr/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/tr/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/vi/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/vi/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/sympa.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/web_help.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/sympa.mo +share/locale/af/LC_MESSAGES/sympa.mo +share/locale/ar/LC_MESSAGES/sympa.mo +share/locale/ar/LC_MESSAGES/web_help.mo +share/locale/bg/LC_MESSAGES/sympa.mo +share/locale/bg/LC_MESSAGES/web_help.mo +share/locale/br/LC_MESSAGES/sympa.mo +share/locale/br/LC_MESSAGES/web_help.mo +share/locale/ca/LC_MESSAGES/sympa.mo +share/locale/ca/LC_MESSAGES/web_help.mo +share/locale/cs/LC_MESSAGES/sympa.mo +share/locale/cs/LC_MESSAGES/web_help.mo +share/locale/de/LC_MESSAGES/sympa.mo +share/locale/de/LC_MESSAGES/web_help.mo +share/locale/el/LC_MESSAGES/sympa.mo +share/locale/el/LC_MESSAGES/web_help.mo +share/locale/en_US/LC_MESSAGES/sympa.mo +share/locale/en_US/LC_MESSAGES/web_help.mo +share/locale/eo/LC_MESSAGES/sympa.mo +share/locale/es/LC_MESSAGES/sympa.mo +share/locale/es/LC_MESSAGES/web_help.mo +share/locale/et/LC_MESSAGES/sympa.mo +share/locale/et/LC_MESSAGES/web_help.mo +share/locale/eu/LC_MESSAGES/sympa.mo +share/locale/eu/LC_MESSAGES/web_help.mo +share/locale/fi/LC_MESSAGES/sympa.mo +share/locale/fi/LC_MESSAGES/web_help.mo +share/locale/fr/LC_MESSAGES/sympa.mo +share/locale/fr/LC_MESSAGES/web_help.mo +share/locale/gl/LC_MESSAGES/sympa.mo +share/locale/gl/LC_MESSAGES/web_help.mo +share/locale/hu/LC_MESSAGES/sympa.mo +share/locale/hu/LC_MESSAGES/web_help.mo +share/locale/id/LC_MESSAGES/sympa.mo +share/locale/id/LC_MESSAGES/web_help.mo +share/locale/io/LC_MESSAGES/sympa.mo +share/locale/it/LC_MESSAGES/sympa.mo +share/locale/it/LC_MESSAGES/web_help.mo +share/locale/ja/LC_MESSAGES/sympa.mo +share/locale/ja/LC_MESSAGES/web_help.mo +share/locale/ko/LC_MESSAGES/sympa.mo +share/locale/la/LC_MESSAGES/sympa.mo +share/locale/ml/LC_MESSAGES/sympa.mo +share/locale/nb/LC_MESSAGES/sympa.mo +share/locale/nb/LC_MESSAGES/web_help.mo +share/locale/nl/LC_MESSAGES/sympa.mo +share/locale/nl/LC_MESSAGES/web_help.mo +share/locale/nn/LC_MESSAGES/sympa.mo +share/locale/oc/LC_MESSAGES/sympa.mo +share/locale/oc/LC_MESSAGES/web_help.mo +share/locale/pl/LC_MESSAGES/sympa.mo +share/locale/pl/LC_MESSAGES/web_help.mo +share/locale/pt/LC_MESSAGES/sympa.mo +share/locale/pt/LC_MESSAGES/web_help.mo +share/locale/pt_BR/LC_MESSAGES/sympa.mo +share/locale/pt_BR/LC_MESSAGES/web_help.mo +share/locale/ro/LC_MESSAGES/sympa.mo +share/locale/ro/LC_MESSAGES/web_help.mo +share/locale/rm/LC_MESSAGES/sympa.mo +share/locale/ru/LC_MESSAGES/sympa.mo +share/locale/ru/LC_MESSAGES/web_help.mo +share/locale/sv/LC_MESSAGES/sympa.mo +share/locale/sv/LC_MESSAGES/web_help.mo +share/locale/tr/LC_MESSAGES/sympa.mo +share/locale/tr/LC_MESSAGES/web_help.mo +share/locale/vi/LC_MESSAGES/sympa.mo +share/locale/vi/LC_MESSAGES/web_help.mo +share/locale/zh_CN/LC_MESSAGES/sympa.mo +share/locale/zh_CN/LC_MESSAGES/web_help.mo +share/locale/zh_TW/LC_MESSAGES/sympa.mo %%DATADIR%%/defaults/auth.conf %%DATADIR%%/defaults/charset.conf %%DATADIR%%/defaults/crawlers_detection.conf @@ -527,12 +525,12 @@ share/doc/smtpc/smtpc.1.md %%DATADIR%%/defaults/mhonarc-ressources.tt2 %%DATADIR%%/defaults/mime.types %%DATADIR%%/defaults/nrcpt_by_domain.conf -%%DATADIR%%/defaults/scenari/access_web_archive.closed -%%DATADIR%%/defaults/scenari/access_web_archive.intranet -%%DATADIR%%/defaults/scenari/access_web_archive.listmaster -%%DATADIR%%/defaults/scenari/access_web_archive.owner -%%DATADIR%%/defaults/scenari/access_web_archive.private -%%DATADIR%%/defaults/scenari/access_web_archive.public +%%DATADIR%%/defaults/scenari/archive_web_access.closed +%%DATADIR%%/defaults/scenari/archive_web_access.intranet +%%DATADIR%%/defaults/scenari/archive_web_access.listmaster +%%DATADIR%%/defaults/scenari/archive_web_access.owner +%%DATADIR%%/defaults/scenari/archive_web_access.private +%%DATADIR%%/defaults/scenari/archive_web_access.public %%DATADIR%%/defaults/scenari/add.auth %%DATADIR%%/defaults/scenari/add.authdkim %%DATADIR%%/defaults/scenari/add.closed @@ -861,15 +859,7 @@ share/doc/smtpc/smtpc.1.md %%DATADIR%%/static/external/modernizr.custom.js %%DATADIR%%/static/external/respondjs/respond.min.js %%DATADIR%%/static/fonts/Raleway/OFL.txt -%%DATADIR%%/static/fonts/Raleway/Raleway-Bold.ttf -%%DATADIR%%/static/fonts/Raleway/Raleway-ExtraBold.ttf -%%DATADIR%%/static/fonts/Raleway/Raleway-ExtraLight.ttf -%%DATADIR%%/static/fonts/Raleway/Raleway-Heavy.ttf -%%DATADIR%%/static/fonts/Raleway/Raleway-Light.ttf -%%DATADIR%%/static/fonts/Raleway/Raleway-Medium.ttf -%%DATADIR%%/static/fonts/Raleway/Raleway-Regular.ttf -%%DATADIR%%/static/fonts/Raleway/Raleway-SemiBold.ttf -%%DATADIR%%/static/fonts/Raleway/Raleway-Thin.ttf +%%DATADIR%%/static/fonts/Raleway/Raleway-Regular.otf %%DATADIR%%/static/fonts/foundation-icons/foundation-icons.css %%DATADIR%%/static/fonts/foundation-icons/foundation-icons.eot %%DATADIR%%/static/fonts/foundation-icons/foundation-icons.svg @@ -1205,11 +1195,13 @@ share/doc/smtpc/smtpc.1.md @dir %%ETCDIR%%/search_filters @dir %%ETCDIR%%/web_tt2 @dir libexec/sympa/Sympa/Template/Plugin -@dir share/doc/smtpc @dir %%DATADIR%%/arc @dir %%DATADIR%%/bounce @dir %%DATADIR%%/list_data +@dir %%DATADIR%%/static @owner sympa +@dir %%DATADIR%%/static/css +@dir %%DATADIR%%/static/pictures @dir /var/run/sympa @dir /var/spool/sympa/automatic @dir /var/spool/sympa/bounce From owner-svn-ports-branches@freebsd.org Wed May 23 07:52: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 F2C09EF3D80; Wed, 23 May 2018 07:52:05 +0000 (UTC) (envelope-from krion@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 A366F7D194; Wed, 23 May 2018 07:52:05 +0000 (UTC) (envelope-from krion@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 842B120004; Wed, 23 May 2018 07:52:05 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4N7q54N070164; Wed, 23 May 2018 07:52:05 GMT (envelope-from krion@FreeBSD.org) Received: (from krion@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4N7q5ge070162; Wed, 23 May 2018 07:52:05 GMT (envelope-from krion@FreeBSD.org) Message-Id: <201805230752.w4N7q5ge070162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: krion set sender to krion@FreeBSD.org using -f From: Kirill Ponomarev Date: Wed, 23 May 2018 07:52:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470685 - branches/2018Q2/mail/sympa X-SVN-Group: ports-branches X-SVN-Commit-Author: krion X-SVN-Commit-Paths: branches/2018Q2/mail/sympa X-SVN-Commit-Revision: 470685 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.26 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, 23 May 2018 07:52:06 -0000 Author: krion Date: Wed May 23 07:52:04 2018 New Revision: 470685 URL: https://svnweb.freebsd.org/changeset/ports/470685 Log: MFH: r470654 Security update to 6.2.32 Description: A vulnerability has been discovered in Sympa web interface that allows write access to files on the server filesystem. This flaw allows to create or modify any file writable by the Sympa user, located on the server filesystem, using the function of Sympa web interface template file saving. PR: 227642 Submitted by: maintainer Approved by: ports-secteam Modified: branches/2018Q2/mail/sympa/Makefile branches/2018Q2/mail/sympa/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/mail/sympa/Makefile ============================================================================== --- branches/2018Q2/mail/sympa/Makefile Wed May 23 07:51:02 2018 (r470684) +++ branches/2018Q2/mail/sympa/Makefile Wed May 23 07:52:04 2018 (r470685) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sympa -DISTVERSION= 6.2.30 +DISTVERSION= 6.2.32 CATEGORIES= mail MAINTAINER= dgeo@centrale-marseille.fr Modified: branches/2018Q2/mail/sympa/distinfo ============================================================================== --- branches/2018Q2/mail/sympa/distinfo Wed May 23 07:51:02 2018 (r470684) +++ branches/2018Q2/mail/sympa/distinfo Wed May 23 07:52:04 2018 (r470685) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522755872 -SHA256 (sympa-community-sympa-6.2.30_GH0.tar.gz) = 3613738824c482719461675f93672811ba0618fb53caa5d8e6c9c956bb6d9fb1 -SIZE (sympa-community-sympa-6.2.30_GH0.tar.gz) = 10303628 +TIMESTAMP = 1524158051 +SHA256 (sympa-community-sympa-6.2.32_GH0.tar.gz) = ab3a17826846e74fe222f482aa6ab68fa5349f726dc1700d4512c348ab82807a +SIZE (sympa-community-sympa-6.2.32_GH0.tar.gz) = 10305699 From owner-svn-ports-branches@freebsd.org Wed May 23 13:58: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 06E28EFE530; Wed, 23 May 2018 13:58:33 +0000 (UTC) (envelope-from tz@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 A73F36C02E; Wed, 23 May 2018 13:58:32 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8884023ABC; Wed, 23 May 2018 13:58:32 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4NDwWAh055924; Wed, 23 May 2018 13:58:32 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4NDwWTH055923; Wed, 23 May 2018 13:58:32 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201805231358.w4NDwWTH055923@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Wed, 23 May 2018 13:58:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470702 - branches/2018Q2/devel/aphpunit X-SVN-Group: ports-branches X-SVN-Commit-Author: tz X-SVN-Commit-Paths: branches/2018Q2/devel/aphpunit X-SVN-Commit-Revision: 470702 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.26 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, 23 May 2018 13:58:33 -0000 Author: tz Date: Wed May 23 13:58:32 2018 New Revision: 470702 URL: https://svnweb.freebsd.org/changeset/ports/470702 Log: MFH: r470701 devel/aphpunit: Add missing php module dependency Without it the tool is broken Approved by: ports-secteam (blanket) Modified: branches/2018Q2/devel/aphpunit/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/devel/aphpunit/Makefile ============================================================================== --- branches/2018Q2/devel/aphpunit/Makefile Wed May 23 13:54:32 2018 (r470701) +++ branches/2018Q2/devel/aphpunit/Makefile Wed May 23 13:58:32 2018 (r470702) @@ -2,6 +2,7 @@ PORTNAME= aphpunit DISTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= devel www MASTER_SITES= http://phar.toco-domains.de/ PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} @@ -15,7 +16,7 @@ LICENSE= BSD2CLAUSE IGNORE_WITH_PHP= 56 USES= php:flavors -USE_PHP= pcntl phar posix sysvmsg +USE_PHP= mbstring pcntl phar posix sysvmsg NO_ARCH= yes NO_BUILD= yes From owner-svn-ports-branches@freebsd.org Wed May 23 16:45: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 0004AF1E79C; Wed, 23 May 2018 16:45:37 +0000 (UTC) (envelope-from zeising@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 A935972F45; Wed, 23 May 2018 16:45:37 +0000 (UTC) (envelope-from zeising@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 8757A2565B; Wed, 23 May 2018 16:45:37 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4NGjbK1042009; Wed, 23 May 2018 16:45:37 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4NGjasB042005; Wed, 23 May 2018 16:45:36 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201805231645.w4NGjasB042005@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 23 May 2018 16:45:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470709 - in branches/2018Q2/x11-servers/xorg-server: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in branches/2018Q2/x11-servers/xorg-server: . files X-SVN-Commit-Revision: 470709 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.26 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, 23 May 2018 16:45:38 -0000 Author: zeising Date: Wed May 23 16:45:36 2018 New Revision: 470709 URL: https://svnweb.freebsd.org/changeset/ports/470709 Log: MFH: r470454 x11-servers/xorg-server: Backport security fixes Backport security fixes for CVE-2017-10971 and CVE-2017-10972 (yes, 2017). For some reason this was not done when the vulnerabilities were documented in VuXML, and a typo in the version range in VuXML meant that the entries never matched. This fixes a memory disclosure and a couple of buffer overruns. PR: 220584 Reported by: Vladimir Krstulja Security: ab881a74-c016-4e6d-9f7d-68c8e7cedafb Approved by: ports-secteam (riggs) Added: branches/2018Q2/x11-servers/xorg-server/files/patch-CVE-2017-10971 - copied unchanged from r470454, head/x11-servers/xorg-server/files/patch-CVE-2017-10971 branches/2018Q2/x11-servers/xorg-server/files/patch-CVE-2017-10972 - copied unchanged from r470454, head/x11-servers/xorg-server/files/patch-CVE-2017-10972 Modified: branches/2018Q2/x11-servers/xorg-server/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/x11-servers/xorg-server/Makefile ============================================================================== --- branches/2018Q2/x11-servers/xorg-server/Makefile Wed May 23 16:31:17 2018 (r470708) +++ branches/2018Q2/x11-servers/xorg-server/Makefile Wed May 23 16:45:36 2018 (r470709) @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.18.4 -PORTREVISION?= 6 +PORTREVISION?= 7 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver Copied: branches/2018Q2/x11-servers/xorg-server/files/patch-CVE-2017-10971 (from r470454, head/x11-servers/xorg-server/files/patch-CVE-2017-10971) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/x11-servers/xorg-server/files/patch-CVE-2017-10971 Wed May 23 16:45:36 2018 (r470709, copy of r470454, head/x11-servers/xorg-server/files/patch-CVE-2017-10971) @@ -0,0 +1,163 @@ +From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:40 +0300 +Subject: dix: Disallow GenericEvent in SendEvent request. + +The SendEvent request holds xEvent which is exactly 32 bytes long, no more, +no less. Both ProcSendEvent and SProcSendEvent verify that the received data +exactly match the request size. However nothing stops the client from passing +in event with xEvent::type = GenericEvent and any value of +xGenericEvent::length. + +In the case of ProcSendEvent, the event will be eventually passed to +WriteEventsToClient which will see that it is Generic event and copy the +arbitrary length from the receive buffer (and possibly past it) and send it to +the other client. This allows clients to copy unitialized heap memory out of X +server or to crash it. + +In case of SProcSendEvent, it will attempt to swap the incoming event by +calling a swapping function from the EventSwapVector array. The swapped event +is written to target buffer, which in this case is local xEvent variable. The +xEvent variable is 32 bytes long, but the swapping functions for GenericEvents +expect that the target buffer has size matching the size of the source +GenericEvent. This allows clients to cause stack buffer overflows. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + dix/events.c | 6 ++++++ + dix/swapreq.c | 7 +++++++ + 2 files changed, 13 insertions(+) + +diff --git a/dix/events.c b/dix/events.c +index 3e3a01e..d3a33ea 100644 +--- dix/events.c ++++ dix/events.c +@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client) + client->errorValue = stuff->event.u.u.type; + return BadValue; + } ++ /* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++ if (stuff->event.u.u.type == GenericEvent) { ++ client->errorValue = stuff->event.u.u.type; ++ return BadValue; ++ } + if (stuff->event.u.u.type == ClientMessage && + stuff->event.u.u.detail != 8 && + stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) { +diff --git a/dix/swapreq.c b/dix/swapreq.c +index 719e9b8..6785059 100644 +--- dix/swapreq.c ++++ dix/swapreq.c +@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client) + swapl(&stuff->destination); + swapl(&stuff->eventMask); + ++ /* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++ if (stuff->event.u.u.type == GenericEvent) { ++ client->errorValue = stuff->event.u.u.type; ++ return BadValue; ++ } ++ + /* Swap event */ + proc = EventSwapVector[stuff->event.u.u.type & 0177]; + if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */ +-- +cgit v1.1 + +From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:41 +0300 +Subject: Xi: Verify all events in ProcXSendExtensionEvent. + +The requirement is that events have type in range +EXTENSION_EVENT_BASE..lastEvent, but it was tested +only for first event of all. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + Xi/sendexev.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 1cf118a..5e63bfc 100644 +--- Xi/sendexev.c ++++ Xi/sendexev.c +@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client) + int + ProcXSendExtensionEvent(ClientPtr client) + { +- int ret; ++ int ret, i; + DeviceIntPtr dev; + xEvent *first; + XEventClass *list; +@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client) + /* The client's event type must be one defined by an extension. */ + + first = ((xEvent *) &stuff[1]); +- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && +- (first->u.u.type < lastEvent))) { +- client->errorValue = first->u.u.type; +- return BadValue; ++ for (i = 0; i < stuff->num_events; i++) { ++ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) && ++ (first[i].u.u.type < lastEvent))) { ++ client->errorValue = first[i].u.u.type; ++ return BadValue; ++ } + } + + list = (XEventClass *) (first + stuff->num_events); +-- +cgit v1.1 + +From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:42 +0300 +Subject: Xi: Do not try to swap GenericEvent. + +The SProcXSendExtensionEvent must not attempt to swap GenericEvent because +it is assuming that the event has fixed size and gives the swapping function +xEvent-sized buffer. + +A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + Xi/sendexev.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 5e63bfc..5c2e0fc 100644 +--- Xi/sendexev.c ++++ Xi/sendexev.c +@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client) + + eventP = (xEvent *) &stuff[1]; + for (i = 0; i < stuff->num_events; i++, eventP++) { ++ if (eventP->u.u.type == GenericEvent) { ++ client->errorValue = eventP->u.u.type; ++ return BadValue; ++ } ++ + proc = EventSwapVector[eventP->u.u.type & 0177]; +- if (proc == NotImplemented) /* no swapping proc; invalid event type? */ ++ /* no swapping proc; invalid event type? */ ++ if (proc == NotImplemented) { ++ client->errorValue = eventP->u.u.type; + return BadValue; ++ } + (*proc) (eventP, &eventT); + *eventP = eventT; + } +-- +cgit v1.1 + Copied: branches/2018Q2/x11-servers/xorg-server/files/patch-CVE-2017-10972 (from r470454, head/x11-servers/xorg-server/files/patch-CVE-2017-10972) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/x11-servers/xorg-server/files/patch-CVE-2017-10972 Wed May 23 16:45:36 2018 (r470709, copy of r470454, head/x11-servers/xorg-server/files/patch-CVE-2017-10972) @@ -0,0 +1,38 @@ +From 05442de962d3dc624f79fc1a00eca3ffc5489ced Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:39 +0300 +Subject: Xi: Zero target buffer in SProcXSendExtensionEvent. + +Make sure that the xEvent eventT is initialized with zeros, the same way as +in SProcSendEvent. + +Some event swapping functions do not overwrite all 32 bytes of xEvent +structure, for example XSecurityAuthorizationRevoked. Two cooperating +clients, one swapped and the other not, can send +XSecurityAuthorizationRevoked event to each other to retrieve old stack data +from X server. This can be potentialy misused to go around ASLR or +stack-protector. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + Xi/sendexev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 11d8202..1cf118a 100644 +--- Xi/sendexev.c ++++ Xi/sendexev.c +@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr client) + { + CARD32 *p; + int i; +- xEvent eventT; ++ xEvent eventT = { .u.u.type = 0 }; + xEvent *eventP; + EventSwapPtr proc; + +-- +cgit v1.1 + From owner-svn-ports-branches@freebsd.org Wed May 23 18:39:13 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18AF0EAD328; Wed, 23 May 2018 18:39:13 +0000 (UTC) (envelope-from zeising@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 BA1BC785D6; Wed, 23 May 2018 18:39:12 +0000 (UTC) (envelope-from zeising@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 985EA26897; Wed, 23 May 2018 18:39:12 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4NIdCXU098414; Wed, 23 May 2018 18:39:12 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4NIdC3Q098413; Wed, 23 May 2018 18:39:12 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201805231839.w4NIdC3Q098413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 23 May 2018 18:39:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470714 - in branches/2018Q2/x11-wm/xcompmgr: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in branches/2018Q2/x11-wm/xcompmgr: . files X-SVN-Commit-Revision: 470714 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.26 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, 23 May 2018 18:39:13 -0000 Author: zeising Date: Wed May 23 18:39:12 2018 New Revision: 470714 URL: https://svnweb.freebsd.org/changeset/ports/470714 Log: MFH: r470458 x11-wm/xcompmgr: Add patch to fix shadow rendering The patch has been laying in upstream bugzilla for quite some time, but is used on some linux distribution packages, such as debian packages. While here, add missing dependency on xext. PR: 182002 Submitted by: Brandon Gooch Obtained from: https://bugs.freedesktop.org/show_bug.cgi?id=46285 (patch) Approved by: ports-secteam (riggs) Added: branches/2018Q2/x11-wm/xcompmgr/files/ - copied from r470458, head/x11-wm/xcompmgr/files/ Modified: branches/2018Q2/x11-wm/xcompmgr/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/x11-wm/xcompmgr/Makefile ============================================================================== --- branches/2018Q2/x11-wm/xcompmgr/Makefile Wed May 23 18:31:50 2018 (r470713) +++ branches/2018Q2/x11-wm/xcompmgr/Makefile Wed May 23 18:39:12 2018 (r470714) @@ -3,13 +3,14 @@ PORTNAME= xcompmgr PORTVERSION= 1.1.7 +PORTREVISION= 1 CATEGORIES= x11-wm MAINTAINER= x11@FreeBSD.org COMMENT= Sample X compositing manager XORG_CAT= app -USE_XORG= x11 xcomposite xfixes xdamage xrender +USE_XORG= x11 xcomposite xext xfixes xdamage xrender PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz From owner-svn-ports-branches@freebsd.org Wed May 23 19:56:17 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 A5A1CEAFD1C; Wed, 23 May 2018 19:56:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 555AD7BACB; Wed, 23 May 2018 19:56:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3699B2757D; Wed, 23 May 2018 19:56:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4NJuGMT039120; Wed, 23 May 2018 19:56:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4NJuEIl039109; Wed, 23 May 2018 19:56:14 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805231956.w4NJuEIl039109@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 23 May 2018 19:56:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470716 - in branches/2018Q2: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/seamonkey www/seamonkey/files www/waterfox ... X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/seamonkey www/seamonkey/files www/waterfox www/waterfox/files X-SVN-Commit-Revision: 470716 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.26 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, 23 May 2018 19:56:17 -0000 Author: jbeich Date: Wed May 23 19:56:13 2018 New Revision: 470716 URL: https://svnweb.freebsd.org/changeset/ports/470716 Log: MFH: r470668 r470672 r470675 gecko: mask as Linux on AMO for compatibility Many extensions on addons.mozilla.org aren't listed or updated due to platform whitelist abuse. On DragonFly the search is broken because such a platform isn't recognized. PR: 226919 Reported by: Graham Perrin, Corpo (Lightning) Approved by: ports-secteam blanket Added: branches/2018Q2/mail/thunderbird/files/patch-addon-search - copied, changed from r470668, head/mail/thunderbird/files/patch-addon-search branches/2018Q2/www/firefox-esr/files/patch-addon-search - copied, changed from r470668, head/www/firefox-esr/files/patch-addon-search branches/2018Q2/www/firefox/files/patch-addon-search - copied, changed from r470668, head/www/firefox/files/patch-addon-search branches/2018Q2/www/seamonkey/files/patch-addon-search - copied, changed from r470668, head/www/seamonkey/files/patch-addon-search branches/2018Q2/www/waterfox/files/patch-addon-search - copied, changed from r470668, head/www/waterfox/files/patch-addon-search Modified: branches/2018Q2/mail/thunderbird/Makefile branches/2018Q2/www/firefox-esr/Makefile branches/2018Q2/www/firefox/Makefile branches/2018Q2/www/seamonkey/Makefile branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/mail/thunderbird/Makefile ============================================================================== --- branches/2018Q2/mail/thunderbird/Makefile Wed May 23 18:53:24 2018 (r470715) +++ branches/2018Q2/mail/thunderbird/Makefile Wed May 23 19:56:13 2018 (r470716) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 52.8.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Copied and modified: branches/2018Q2/mail/thunderbird/files/patch-addon-search (from r470668, head/mail/thunderbird/files/patch-addon-search) ============================================================================== --- head/mail/thunderbird/files/patch-addon-search Wed May 23 01:21:20 2018 (r470668, copy source) +++ branches/2018Q2/mail/thunderbird/files/patch-addon-search Wed May 23 19:56:13 2018 (r470716) @@ -45,7 +45,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 addon.isPlatformCompatible = Array.some(nodes, function(aNode) { let text = aNode.textContent.toLowerCase().trim(); - return text == "all" || text == Services.appinfo.OS.toLowerCase(); -+ return text == "all" || text == "linux"; ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); }); break; case "install": @@ -54,7 +54,20 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 let os = node.getAttribute("os").trim().toLowerCase(); // If the os is not ALL and not the current OS then ignore this xpi - if (os != "all" && os != Services.appinfo.OS.toLowerCase()) -+ if (os != "all" && os != "linux") ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) break; } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Modified: branches/2018Q2/www/firefox-esr/Makefile ============================================================================== --- branches/2018Q2/www/firefox-esr/Makefile Wed May 23 18:53:24 2018 (r470715) +++ branches/2018Q2/www/firefox-esr/Makefile Wed May 23 19:56:13 2018 (r470716) @@ -4,6 +4,7 @@ PORTNAME= firefox DISTVERSION= 52.8.0 DISTVERSIONSUFFIX=esr +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Copied and modified: branches/2018Q2/www/firefox-esr/files/patch-addon-search (from r470668, head/www/firefox-esr/files/patch-addon-search) ============================================================================== --- head/www/firefox-esr/files/patch-addon-search Wed May 23 01:21:20 2018 (r470668, copy source) +++ branches/2018Q2/www/firefox-esr/files/patch-addon-search Wed May 23 19:56:13 2018 (r470716) @@ -44,7 +44,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 addon.isPlatformCompatible = Array.some(nodes, function(aNode) { let text = aNode.textContent.toLowerCase().trim(); - return text == "all" || text == Services.appinfo.OS.toLowerCase(); -+ return text == "all" || text == "linux"; ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); }); break; case "install": @@ -53,7 +53,20 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 let os = node.getAttribute("os").trim().toLowerCase(); // If the os is not ALL and not the current OS then ignore this xpi - if (os != "all" && os != Services.appinfo.OS.toLowerCase()) -+ if (os != "all" && os != "linux") ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) break; } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Modified: branches/2018Q2/www/firefox/Makefile ============================================================================== --- branches/2018Q2/www/firefox/Makefile Wed May 23 18:53:24 2018 (r470715) +++ branches/2018Q2/www/firefox/Makefile Wed May 23 19:56:13 2018 (r470716) @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 60.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Copied and modified: branches/2018Q2/www/firefox/files/patch-addon-search (from r470668, head/www/firefox/files/patch-addon-search) ============================================================================== --- head/www/firefox/files/patch-addon-search Wed May 23 01:21:20 2018 (r470668, copy source) +++ branches/2018Q2/www/firefox/files/patch-addon-search Wed May 23 19:56:13 2018 (r470716) @@ -36,7 +36,20 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 if (Array.isArray(aEntry.current_version.files)) { for (let file of aEntry.current_version.files) { - if (file.platform == "all" || file.platform == Services.appinfo.OS.toLowerCase()) { -+ if (file.platform == "all" || file.platform == "linux") { ++ if (file.platform == "all" || file.platform == "linux" || file.platform == Services.appinfo.OS.toLowerCase()) { if (file.url) { addon.sourceURI = NetUtil.newURI(file.url); } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -4974,7 +4974,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Modified: branches/2018Q2/www/seamonkey/Makefile ============================================================================== --- branches/2018Q2/www/seamonkey/Makefile Wed May 23 18:53:24 2018 (r470715) +++ branches/2018Q2/www/seamonkey/Makefile Wed May 23 19:56:13 2018 (r470716) @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.49.3 -PORTREVISION= 1 +PORTREVISION= 2 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Copied and modified: branches/2018Q2/www/seamonkey/files/patch-addon-search (from r470668, head/www/seamonkey/files/patch-addon-search) ============================================================================== --- head/www/seamonkey/files/patch-addon-search Wed May 23 01:21:20 2018 (r470668, copy source) +++ branches/2018Q2/www/seamonkey/files/patch-addon-search Wed May 23 19:56:13 2018 (r470716) @@ -42,7 +42,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 addon.isPlatformCompatible = Array.some(nodes, function(aNode) { let text = aNode.textContent.toLowerCase().trim(); - return text == "all" || text == Services.appinfo.OS.toLowerCase(); -+ return text == "all" || text == "linux"; ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); }); break; case "install": @@ -51,7 +51,20 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 let os = node.getAttribute("os").trim().toLowerCase(); // If the os is not ALL and not the current OS then ignore this xpi - if (os != "all" && os != Services.appinfo.OS.toLowerCase()) -+ if (os != "all" && os != "linux") ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) break; } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Wed May 23 18:53:24 2018 (r470715) +++ branches/2018Q2/www/waterfox/Makefile Wed May 23 19:56:13 2018 (r470716) @@ -3,6 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.2.0-13 DISTVERSIONSUFFIX= -gd2cdd42f4115b +PORTREVISION= 1 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied and modified: branches/2018Q2/www/waterfox/files/patch-addon-search (from r470668, head/www/waterfox/files/patch-addon-search) ============================================================================== --- head/www/waterfox/files/patch-addon-search Wed May 23 01:21:20 2018 (r470668, copy source) +++ branches/2018Q2/www/waterfox/files/patch-addon-search Wed May 23 19:56:13 2018 (r470716) @@ -42,7 +42,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 addon.isPlatformCompatible = Array.some(nodes, function(aNode) { let text = aNode.textContent.toLowerCase().trim(); - return text == "all" || text == Services.appinfo.OS.toLowerCase(); -+ return text == "all" || text == "linux"; ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); }); break; case "install": @@ -51,7 +51,20 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 let os = node.getAttribute("os").trim().toLowerCase(); // If the os is not ALL and not the current OS then ignore this xpi - if (os != "all" && os != Services.appinfo.OS.toLowerCase()) -+ if (os != "all" && os != "linux") ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) break; } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) From owner-svn-ports-branches@freebsd.org Wed May 23 20:10:34 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 3A2E5EB02AC; Wed, 23 May 2018 20:10:34 +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 E0CFA7C567; Wed, 23 May 2018 20:10:33 +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 C19F527725; Wed, 23 May 2018 20:10:33 +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 w4NKAXcM044811; Wed, 23 May 2018 20:10:33 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4NKAWc5044807; Wed, 23 May 2018 20:10:32 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805232010.w4NKAWc5044807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 23 May 2018 20:10:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470718 - in branches/2018Q2: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/seamonkey/files www/waterfox/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/seamonkey/files www/waterfox/files X-SVN-Commit-Revision: 470718 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.26 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, 23 May 2018 20:10:34 -0000 Author: jbeich Date: Wed May 23 20:10:32 2018 New Revision: 470718 URL: https://svnweb.freebsd.org/changeset/ports/470718 Log: MFH: r470668 r470672 r470675 gecko: mask as Linux on AMO for compatibility (r470716 followup) Many extensions on addons.mozilla.org aren't listed or updated due to platform whitelist abuse. On DragonFly the search is broken because such a platform isn't recognized. PR: 226919 Reported by: Graham Perrin, Corpo (Lightning) Approved by: ports-secteam blanket Replaced: branches/2018Q2/mail/thunderbird/files/patch-addon-search - copied unchanged from r470717, head/mail/thunderbird/files/patch-addon-search branches/2018Q2/www/firefox-esr/files/patch-addon-search - copied unchanged from r470717, head/www/firefox-esr/files/patch-addon-search branches/2018Q2/www/firefox/files/patch-addon-search - copied unchanged from r470717, head/www/firefox/files/patch-addon-search branches/2018Q2/www/seamonkey/files/patch-addon-search - copied unchanged from r470717, head/www/seamonkey/files/patch-addon-search branches/2018Q2/www/waterfox/files/patch-addon-search - copied unchanged from r470717, head/www/waterfox/files/patch-addon-search Copied: branches/2018Q2/mail/thunderbird/files/patch-addon-search (from r470717, head/mail/thunderbird/files/patch-addon-search) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/mail/thunderbird/files/patch-addon-search Wed May 23 20:10:32 2018 (r470718, copy of r470717, head/mail/thunderbird/files/patch-addon-search) @@ -0,0 +1,73 @@ +https://github.com/mozilla/addons/issues/708 +https://github.com/mozilla/addons-frontend/issues/4610 + +diff --git mail/app/profile/all-thunderbird.js mail/app/profile/all-thunderbird.js +index 75c2c5e435e35..4d8c09c02759b 100644 +--- mail/app/profile/all-thunderbird.js ++++ mail/app/profile/all-thunderbird.js +@@ -156,13 +156,13 @@ pref("extensions.autoDisableScopes", 15); + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); +-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); ++pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=Linux&appVersion=%VERSION%"); ++pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=Linux&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); + pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/%APP%/"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); ++pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/Linux/%VERSION%?src=thunderbird"); + pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/Linux/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); ++pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/Linux"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -202,9 +202,9 @@ pref("extensions.logging.enabled", false); + // .. etc .. + // + pref("extensions.update.enabled", true); +-pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); + +-pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); + + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day +diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- mozilla/toolkit/mozapps/extensions/internal/AddonRepository.jsm ++++ mozilla/toolkit/mozapps/extensions/internal/AddonRepository.jsm +@@ -1179,7 +1179,7 @@ this.AddonRepository = { + let nodes = node.getElementsByTagName("os"); + addon.isPlatformCompatible = Array.some(nodes, function(aNode) { + let text = aNode.textContent.toLowerCase().trim(); +- return text == "all" || text == Services.appinfo.OS.toLowerCase(); ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); + }); + break; + case "install": +@@ -1187,7 +1187,7 @@ this.AddonRepository = { + if (node.hasAttribute("os")) { + let os = node.getAttribute("os").trim().toLowerCase(); + // If the os is not ALL and not the current OS then ignore this xpi +- if (os != "all" && os != Services.appinfo.OS.toLowerCase()) ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) + break; + } + +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Copied: branches/2018Q2/www/firefox-esr/files/patch-addon-search (from r470717, head/www/firefox-esr/files/patch-addon-search) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/firefox-esr/files/patch-addon-search Wed May 23 20:10:32 2018 (r470718, copy of r470717, head/www/firefox-esr/files/patch-addon-search) @@ -0,0 +1,72 @@ +https://github.com/mozilla/addons/issues/708 +https://github.com/mozilla/addons-frontend/issues/4610 + +diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js +index 75c2c5e435e35..4d8c09c02759b 100644 +--- browser/app/profile/firefox.js ++++ browser/app/profile/firefox.js +@@ -42,12 +42,12 @@ pref("xpinstall.customConfirmationUI", true); + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%"); +-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); ++pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=Linux&appVersion=%VERSION%"); ++pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=Linux&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); ++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=Linux&appver=%VERSION%"); ++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/Linux/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); ++pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/Linux/%COMPATIBILITY_MODE%"); ++pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/Linux/%VERSION%?src=firefox"); + pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); + + pref("extensions.update.autoUpdateDefault", true); +@@ -156,8 +156,8 @@ pref("app.update.service.enabled", true); + // .. etc .. + // + pref("extensions.update.enabled", true); +-pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); +-pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/AddonRepository.jsm ++++ toolkit/mozapps/extensions/internal/AddonRepository.jsm +@@ -1179,7 +1179,7 @@ this.AddonRepository = { + let nodes = node.getElementsByTagName("os"); + addon.isPlatformCompatible = Array.some(nodes, function(aNode) { + let text = aNode.textContent.toLowerCase().trim(); +- return text == "all" || text == Services.appinfo.OS.toLowerCase(); ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); + }); + break; + case "install": +@@ -1187,7 +1187,7 @@ this.AddonRepository = { + if (node.hasAttribute("os")) { + let os = node.getAttribute("os").trim().toLowerCase(); + // If the os is not ALL and not the current OS then ignore this xpi +- if (os != "all" && os != Services.appinfo.OS.toLowerCase()) ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) + break; + } + +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Copied: branches/2018Q2/www/firefox/files/patch-addon-search (from r470717, head/www/firefox/files/patch-addon-search) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/firefox/files/patch-addon-search Wed May 23 20:10:32 2018 (r470718, copy of r470717, head/www/firefox/files/patch-addon-search) @@ -0,0 +1,55 @@ +https://github.com/mozilla/addons/issues/708 +https://github.com/mozilla/addons-frontend/issues/4610 + +diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js +index 75c2c5e435e35..4d8c09c02759b 100644 +--- browser/app/profile/firefox.js ++++ browser/app/profile/firefox.js +@@ -45,8 +45,8 @@ pref("extensions.webextOptionalPermissionPrompts", tru + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); + pref("extensions.getAddons.compatOverides.url", "https://services.addons.mozilla.org/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); +-pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); ++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=Linux&appver=%VERSION%"); ++pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/Linux/%COMPATIBILITY_MODE%"); + pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); + pref("extensions.getAddons.themes.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes/?src=firefox"); + +@@ -186,8 +186,8 @@ pref("app.update.service.enabled", true); + // .. etc .. + // + pref("extensions.update.enabled", true); +-pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); +-pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/AddonRepository.jsm ++++ toolkit/mozapps/extensions/internal/AddonRepository.jsm +@@ -588,7 +588,7 @@ var AddonRepository = { + addon.version = String(aEntry.current_version.version); + if (Array.isArray(aEntry.current_version.files)) { + for (let file of aEntry.current_version.files) { +- if (file.platform == "all" || file.platform == Services.appinfo.OS.toLowerCase()) { ++ if (file.platform == "all" || file.platform == "linux" || file.platform == Services.appinfo.OS.toLowerCase()) { + if (file.url) { + addon.sourceURI = NetUtil.newURI(file.url); + } +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -4974,7 +4974,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Copied: branches/2018Q2/www/seamonkey/files/patch-addon-search (from r470717, head/www/seamonkey/files/patch-addon-search) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/seamonkey/files/patch-addon-search Wed May 23 20:10:32 2018 (r470718, copy of r470717, head/www/seamonkey/files/patch-addon-search) @@ -0,0 +1,70 @@ +https://github.com/mozilla/addons/issues/708 +https://github.com/mozilla/addons-frontend/issues/4610 + +diff --git suite/browser/browser-prefs.js suite/browser/browser-prefs.js +index 75c2c5e435e35..4d8c09c02759b 100644 +--- suite/browser/browser-prefs.js ++++ suite/browser/browser-prefs.js +@@ -580,7 +580,7 @@ pref("extensions.minCompatibleAppVersion", "2.1"); + // .. etc .. + // + pref("extensions.update.enabled", true); +-pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); + pref("extensions.update.interval", 86400); // Check daily for updates to add-ons + pref("extensions.update.autoUpdateDefault", true); // Download and install automatically + +@@ -592,13 +592,13 @@ pref("extensions.autoDisableScopes", 15); + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%"); +-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); ++pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=Linux&appVersion=%VERSION%"); ++pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=Linux&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); + pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/%APP%/"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=seamonkey"); ++pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/Linux/%VERSION%?src=seamonkey"); + pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/Linux/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey"); ++pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/Linux"); + + // getMoreThemes is used by our UI under our switch theme menu + pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties"); +diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- mozilla/toolkit/mozapps/extensions/internal/AddonRepository.jsm ++++ mozilla/toolkit/mozapps/extensions/internal/AddonRepository.jsm +@@ -1179,7 +1179,7 @@ this.AddonRepository = { + let nodes = node.getElementsByTagName("os"); + addon.isPlatformCompatible = Array.some(nodes, function(aNode) { + let text = aNode.textContent.toLowerCase().trim(); +- return text == "all" || text == Services.appinfo.OS.toLowerCase(); ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); + }); + break; + case "install": +@@ -1187,7 +1187,7 @@ this.AddonRepository = { + if (node.hasAttribute("os")) { + let os = node.getAttribute("os").trim().toLowerCase(); + // If the os is not ALL and not the current OS then ignore this xpi +- if (os != "all" && os != Services.appinfo.OS.toLowerCase()) ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) + break; + } + +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) Copied: branches/2018Q2/www/waterfox/files/patch-addon-search (from r470717, head/www/waterfox/files/patch-addon-search) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-addon-search Wed May 23 20:10:32 2018 (r470718, copy of r470717, head/www/waterfox/files/patch-addon-search) @@ -0,0 +1,70 @@ +https://github.com/mozilla/addons/issues/708 +https://github.com/mozilla/addons-frontend/issues/4610 + +diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js +index 75c2c5e435e35..4d8c09c02759b 100644 +--- browser/app/profile/firefox.js ++++ browser/app/profile/firefox.js +@@ -48,12 +48,12 @@ pref("extensions.webextOptionalPermissionPrompts", true); + sticky_pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.showPane", false); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%"); ++pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=Linux&appVersion=%VERSION%"); + pref("extensions.getAddons.getWithPerformance.url", ""); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); ++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=Linux&appver=%VERSION%"); ++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/Linux/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); + pref("extensions.webservice.discoverURL", ""); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); ++pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/Linux/%VERSION%?src=firefox"); + pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); + pref("extensions.getAddons.themes.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes/?src=firefox"); + +@@ -204,8 +204,8 @@ pref("app.update.service.enabled", true); + // .. etc .. + // + pref("extensions.update.enabled", true); +-pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); +-pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/AddonRepository.jsm ++++ toolkit/mozapps/extensions/internal/AddonRepository.jsm +@@ -1179,7 +1179,7 @@ this.AddonRepository = { + let nodes = node.getElementsByTagName("os"); + addon.isPlatformCompatible = Array.some(nodes, function(aNode) { + let text = aNode.textContent.toLowerCase().trim(); +- return text == "all" || text == Services.appinfo.OS.toLowerCase(); ++ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase(); + }); + break; + case "install": +@@ -1187,7 +1187,7 @@ this.AddonRepository = { + if (node.hasAttribute("os")) { + let os = node.getAttribute("os").trim().toLowerCase(); + // If the os is not ALL and not the current OS then ignore this xpi +- if (os != "all" && os != Services.appinfo.OS.toLowerCase()) ++ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase()) + break; + } + +diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +index f70fd8d7e3bd8..81e8cd7764fdf 100644 +--- toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -7186,7 +7186,7 @@ AddonInternal.prototype = { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) From owner-svn-ports-branches@freebsd.org Thu May 24 00:54:29 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1F78EEF439; Thu, 24 May 2018 00:54:28 +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 99B296812B; Thu, 24 May 2018 00:54:28 +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 7A4D927F8; Thu, 24 May 2018 00:54:28 +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 w4O0sS4x093482; Thu, 24 May 2018 00:54:28 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4O0sSsC093480; Thu, 24 May 2018 00:54:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805240054.w4O0sSsC093480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 24 May 2018 00:54:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470750 - branches/2018Q2/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/emulators/rpcs3 X-SVN-Commit-Revision: 470750 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.26 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, 24 May 2018 00:54:29 -0000 Author: jbeich Date: Thu May 24 00:54:27 2018 New Revision: 470750 URL: https://svnweb.freebsd.org/changeset/ports/470750 Log: MFH: r470748 emulators/rpcs3: update to 0.0.5.382 Changes: https://github.com/RPCS3/rpcs3/compare/c9669818e...c10b39923 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q2/emulators/rpcs3/Makefile branches/2018Q2/emulators/rpcs3/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q2/emulators/rpcs3/Makefile Thu May 24 00:53:46 2018 (r470749) +++ branches/2018Q2/emulators/rpcs3/Makefile Thu May 24 00:54:27 2018 (r470750) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-355 -DISTVERSIONSUFFIX= -gc9669818e +DISTVERSION= 0.0.5-382 +DISTVERSIONSUFFIX= -gc10b39923 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2018Q2/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q2/emulators/rpcs3/distinfo Thu May 24 00:53:46 2018 (r470749) +++ branches/2018Q2/emulators/rpcs3/distinfo Thu May 24 00:54:27 2018 (r470750) @@ -1,6 +1,6 @@ -TIMESTAMP = 1526907325 -SHA256 (RPCS3-rpcs3-v0.0.5-355-gc9669818e_GH0.tar.gz) = 17655d77fd91cd7123f90073940204874f6e7883308ba6edb22191939726268b -SIZE (RPCS3-rpcs3-v0.0.5-355-gc9669818e_GH0.tar.gz) = 4852290 +TIMESTAMP = 1527091628 +SHA256 (RPCS3-rpcs3-v0.0.5-382-gc10b39923_GH0.tar.gz) = feae291e55d513726939ba8f05b2de65ceca15b2b68d3c4f112f5ab2532cb382 +SIZE (RPCS3-rpcs3-v0.0.5-382-gc10b39923_GH0.tar.gz) = 4920581 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-llvm-17ec6d78a73_GH0.tar.gz) = 4567d1d946429ce55d6c0480fad3b82874aad22c2b1928ac4d4ba5ba40338604 From owner-svn-ports-branches@freebsd.org Thu May 24 00:58: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 6679CEEF4D3; Thu, 24 May 2018 00:58:46 +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 036556825C; Thu, 24 May 2018 00:58:46 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF9D327FA; Thu, 24 May 2018 00:58:45 +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 w4O0wjHq093846; Thu, 24 May 2018 00:58:45 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4O0wjpM093842; Thu, 24 May 2018 00:58:45 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805240058.w4O0wjpM093842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 24 May 2018 00:58:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470751 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 470751 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.26 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, 24 May 2018 00:58:46 -0000 Author: jbeich Date: Thu May 24 00:58:44 2018 New Revision: 470751 URL: https://svnweb.freebsd.org/changeset/ports/470751 Log: MFH: r470749 www/waterfox: apply some FF61 fixes Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1412882 - copied unchanged from r470749, head/www/waterfox/files/patch-bug1412882 branches/2018Q2/www/waterfox/files/patch-bug1454285 - copied unchanged from r470749, head/www/waterfox/files/patch-bug1454285 branches/2018Q2/www/waterfox/files/patch-bug1456189 - copied unchanged from r470749, head/www/waterfox/files/patch-bug1456189 branches/2018Q2/www/waterfox/files/patch-bug1456512 - copied unchanged from r470749, head/www/waterfox/files/patch-bug1456512 branches/2018Q2/www/waterfox/files/patch-bug1462912 - copied unchanged from r470749, head/www/waterfox/files/patch-bug1462912 Modified: branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Thu May 24 00:54:27 2018 (r470750) +++ branches/2018Q2/www/waterfox/Makefile Thu May 24 00:58:44 2018 (r470751) @@ -3,7 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.2.0-13 DISTVERSIONSUFFIX= -gd2cdd42f4115b -PORTREVISION= 1 +PORTREVISION= 4 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q2/www/waterfox/files/patch-bug1412882 (from r470749, head/www/waterfox/files/patch-bug1412882) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1412882 Thu May 24 00:58:44 2018 (r470751, copy of r470749, head/www/waterfox/files/patch-bug1412882) @@ -0,0 +1,192 @@ +commit 7513891383a1 +Author: Jonathan Kew +Date: Sat May 19 08:32:22 2018 +0100 + + Bug 1412882 - Rework gfxFontUtils::MapCharToGlyphFormat4 to be more robust. r=lsalzman, a=RyanVM + + --HG-- + extra : source : e96eaa6603005c3e2361d9d32ef59adb718d4203 +--- + gfx/thebes/gfxFontUtils.cpp | 89 ++++++++++++++++++++++------------------ + gfx/thebes/gfxFontUtils.h | 2 +- + gfx/thebes/gfxHarfBuzzShaper.cpp | 8 +++- + 3 files changed, 57 insertions(+), 42 deletions(-) + +diff --git gfx/thebes/gfxFontUtils.cpp gfx/thebes/gfxFontUtils.cpp +index b3c1cae1bbb67..1590fb52ab6b7 100644 +--- gfx/thebes/gfxFontUtils.cpp ++++ gfx/thebes/gfxFontUtils.cpp +@@ -569,55 +569,64 @@ typedef struct { + #pragma pack() + + uint32_t +-gfxFontUtils::MapCharToGlyphFormat4(const uint8_t *aBuf, char16_t aCh) ++gfxFontUtils::MapCharToGlyphFormat4(const uint8_t* aBuf, uint32_t aLength, ++ char16_t aCh) + { + const Format4Cmap *cmap4 = reinterpret_cast(aBuf); +- uint16_t segCount; +- const AutoSwap_PRUint16 *endCodes; +- const AutoSwap_PRUint16 *startCodes; +- const AutoSwap_PRUint16 *idDelta; +- const AutoSwap_PRUint16 *idRangeOffset; +- uint16_t probe; +- uint16_t rangeShiftOver2; +- uint16_t index; +- +- segCount = (uint16_t)(cmap4->segCountX2) / 2; +- +- endCodes = &cmap4->arrays[0]; +- startCodes = &cmap4->arrays[segCount + 1]; // +1 for reserved word between arrays +- idDelta = &startCodes[segCount]; +- idRangeOffset = &idDelta[segCount]; +- +- probe = 1 << (uint16_t)(cmap4->entrySelector); +- rangeShiftOver2 = (uint16_t)(cmap4->rangeShift) / 2; +- +- if ((uint16_t)(startCodes[rangeShiftOver2]) <= aCh) { +- index = rangeShiftOver2; +- } else { +- index = 0; +- } +- +- while (probe > 1) { +- probe >>= 1; +- if ((uint16_t)(startCodes[index + probe]) <= aCh) { +- index += probe; ++ ++ uint16_t segCount = (uint16_t)(cmap4->segCountX2) / 2; ++ ++ const AutoSwap_PRUint16* endCodes = &cmap4->arrays[0]; ++ const AutoSwap_PRUint16* startCodes = &cmap4->arrays[segCount + 1]; ++ const AutoSwap_PRUint16* idDelta = &startCodes[segCount]; ++ const AutoSwap_PRUint16* idRangeOffset = &idDelta[segCount]; ++ ++ // Sanity-check that the fixed-size arrays don't exceed the buffer. ++ const uint8_t* const limit = aBuf + aLength; ++ if ((const uint8_t*)(&idRangeOffset[segCount]) > limit) { ++ return 0; // broken font, just bail out safely ++ } ++ ++ // For most efficient binary search, we want to work on a range of segment ++ // indexes that is a power of 2 so that we can always halve it by shifting. ++ // So we find the largest power of 2 that is <= segCount. ++ // We will offset this range by segOffset so as to reach the end ++ // of the table, provided that doesn't put us beyond the target ++ // value from the outset. ++ uint32_t powerOf2 = mozilla::FindHighestBit(segCount); ++ uint32_t segOffset = segCount - powerOf2; ++ uint32_t idx = 0; ++ ++ if (uint16_t(startCodes[segOffset]) <= aCh) { ++ idx = segOffset; ++ } ++ ++ // Repeatedly halve the size of the range until we find the target group ++ while (powerOf2 > 1) { ++ powerOf2 >>= 1; ++ if (uint16_t(startCodes[idx + powerOf2]) <= aCh) { ++ idx += powerOf2; + } + } + +- if (aCh >= (uint16_t)(startCodes[index]) && aCh <= (uint16_t)(endCodes[index])) { ++ if (aCh >= uint16_t(startCodes[idx]) && aCh <= uint16_t(endCodes[idx])) { + uint16_t result; +- if ((uint16_t)(idRangeOffset[index]) == 0) { ++ if (uint16_t(idRangeOffset[idx]) == 0) { + result = aCh; + } else { +- uint16_t offset = aCh - (uint16_t)(startCodes[index]); +- const AutoSwap_PRUint16 *glyphIndexTable = +- (const AutoSwap_PRUint16*)((const char*)&idRangeOffset[index] + +- (uint16_t)(idRangeOffset[index])); ++ uint16_t offset = aCh - uint16_t(startCodes[idx]); ++ const AutoSwap_PRUint16* glyphIndexTable = ++ (const AutoSwap_PRUint16*)((const char*)&idRangeOffset[idx] + ++ uint16_t(idRangeOffset[idx])); ++ if ((const uint8_t*)(glyphIndexTable + offset + 1) > limit) { ++ return 0; // broken font, just bail out safely ++ } + result = glyphIndexTable[offset]; + } + +- // note that this is unsigned 16-bit arithmetic, and may wrap around +- result += (uint16_t)(idDelta[index]); ++ // Note that this is unsigned 16-bit arithmetic, and may wrap around ++ // (which is required behavior per spec) ++ result += uint16_t(idDelta[idx]); + return result; + } + +@@ -761,7 +770,8 @@ gfxFontUtils::MapCharToGlyph(const uint8_t *aCmapBuf, uint32_t aBufLength, + switch (format) { + case 4: + gid = aUnicode < UNICODE_BMP_LIMIT ? +- MapCharToGlyphFormat4(aCmapBuf + offset, char16_t(aUnicode)) : 0; ++ MapCharToGlyphFormat4(aCmapBuf + offset, aBufLength - offset, ++ char16_t(aUnicode)) : 0; + break; + case 10: + gid = MapCharToGlyphFormat10(aCmapBuf + offset, aUnicode); +@@ -786,6 +796,7 @@ gfxFontUtils::MapCharToGlyph(const uint8_t *aCmapBuf, uint32_t aBufLength, + case 4: + if (aUnicode < UNICODE_BMP_LIMIT) { + varGID = MapCharToGlyphFormat4(aCmapBuf + offset, ++ aBufLength - offset, + char16_t(aUnicode)); + } + break; +diff --git gfx/thebes/gfxFontUtils.h gfx/thebes/gfxFontUtils.h +index 250df442c3a2e..be2f54a9a7026 100644 +--- gfx/thebes/gfxFontUtils.h ++++ gfx/thebes/gfxFontUtils.h +@@ -804,7 +804,7 @@ public: + uint32_t& aUVSOffset); + + static uint32_t +- MapCharToGlyphFormat4(const uint8_t *aBuf, char16_t aCh); ++ MapCharToGlyphFormat4(const uint8_t *aBuf, uint32_t aLength, char16_t aCh); + + static uint32_t + MapCharToGlyphFormat10(const uint8_t *aBuf, uint32_t aCh); +diff --git gfx/thebes/gfxHarfBuzzShaper.cpp gfx/thebes/gfxHarfBuzzShaper.cpp +index c57504a4d9db4..ff638dcef73ad 100644 +--- gfx/thebes/gfxHarfBuzzShaper.cpp ++++ gfx/thebes/gfxHarfBuzzShaper.cpp +@@ -116,13 +116,15 @@ gfxHarfBuzzShaper::GetNominalGlyph(hb_codepoint_t unicode) const + NS_ASSERTION(mCmapTable && (mCmapFormat > 0) && (mSubtableOffset > 0), + "cmap data not correctly set up, expect disaster"); + ++ uint32_t length; + const uint8_t* data = +- (const uint8_t*)hb_blob_get_data(mCmapTable, nullptr); ++ (const uint8_t*)hb_blob_get_data(mCmapTable, &length); + + switch (mCmapFormat) { + case 4: + gid = unicode < UNICODE_BMP_LIMIT ? + gfxFontUtils::MapCharToGlyphFormat4(data + mSubtableOffset, ++ length - mSubtableOffset, + unicode) : 0; + break; + case 10: +@@ -164,8 +166,9 @@ gfxHarfBuzzShaper::GetVariationGlyph(hb_codepoint_t unicode, + NS_ASSERTION(mCmapTable && (mCmapFormat > 0) && (mSubtableOffset > 0), + "cmap data not correctly set up, expect disaster"); + ++ uint32_t length; + const uint8_t* data = +- (const uint8_t*)hb_blob_get_data(mCmapTable, nullptr); ++ (const uint8_t*)hb_blob_get_data(mCmapTable, &length); + + if (mUVSTableOffset) { + hb_codepoint_t gid = +@@ -183,6 +186,7 @@ gfxHarfBuzzShaper::GetVariationGlyph(hb_codepoint_t unicode, + case 4: + if (compat < UNICODE_BMP_LIMIT) { + return gfxFontUtils::MapCharToGlyphFormat4(data + mSubtableOffset, ++ length - mSubtableOffset, + compat); + } + break; Copied: branches/2018Q2/www/waterfox/files/patch-bug1454285 (from r470749, head/www/waterfox/files/patch-bug1454285) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1454285 Thu May 24 00:58:44 2018 (r470751, copy of r470749, head/www/waterfox/files/patch-bug1454285) @@ -0,0 +1,713 @@ +commit 58db23895d95 +Author: Tooru Fujisawa +Date: Tue May 22 18:10:28 2018 +0900 + + Bug 1454285 - Part 1: Specify the current scope when emitting await and .generator. r=jwalden, a=RyanVM + + --HG-- + extra : source : 6ca6ced5189a5760c96afa31a6575cd3d3f56639 +--- + js/src/frontend/BytecodeEmitter.cpp | 104 +++++++++++++++++++++--------------- + js/src/frontend/BytecodeEmitter.h | 25 ++++++--- + 2 files changed, 81 insertions(+), 48 deletions(-) + +diff --git js/src/frontend/BytecodeEmitter.cpp js/src/frontend/BytecodeEmitter.cpp +index df999dfb2b0dc..e8edc66658804 100644 +--- js/src/frontend/BytecodeEmitter.cpp ++++ js/src/frontend/BytecodeEmitter.cpp +@@ -2004,6 +2004,8 @@ class MOZ_STACK_CLASS IfThenElseEmitter + + class ForOfLoopControl : public LoopControl + { ++ using EmitterScope = BytecodeEmitter::EmitterScope; ++ + // The stack depth of the iterator. + int32_t iterDepth_; + +@@ -2096,8 +2098,8 @@ class ForOfLoopControl : public LoopControl + MOZ_ASSERT(slotFromTop == unsigned(bce->stackDepth - iterDepth_)); + if (!bce->emitDupAt(slotFromTop)) // ITER ... EXCEPTION ITER + return false; +- if (!emitIteratorClose(bce, CompletionKind::Throw)) // ITER ... EXCEPTION +- return false; ++ if (!emitIteratorCloseInInnermostScope(bce, CompletionKind::Throw)) ++ return false; // ITER ... EXCEPTION + + if (!ifIteratorIsNotClosed.emitEnd()) // ITER ... EXCEPTION + return false; +@@ -2120,8 +2122,8 @@ class ForOfLoopControl : public LoopControl + return false; + if (!bce->emitDupAt(slotFromTop + 1)) // ITER ... FTYPE FVALUE ITER + return false; +- if (!emitIteratorClose(bce, CompletionKind::Normal)) // ITER ... FTYPE FVALUE +- return false; ++ if (!emitIteratorCloseInInnermostScope(bce, CompletionKind::Normal)) ++ return false; // ITER ... FTYPE FVALUE + if (!ifGeneratorClosing.emitEnd()) // ITER ... FTYPE FVALUE + return false; + } +@@ -2135,16 +2137,27 @@ class ForOfLoopControl : public LoopControl + return true; + } + +- bool emitIteratorClose(BytecodeEmitter* bce, +- CompletionKind completionKind = CompletionKind::Normal) { ++ bool emitIteratorCloseInInnermostScope(BytecodeEmitter* bce, ++ CompletionKind completionKind = CompletionKind::Normal) { ++ return emitIteratorCloseInScope(bce, *bce->innermostEmitterScope, completionKind); ++ } ++ ++ bool emitIteratorCloseInScope(BytecodeEmitter* bce, ++ EmitterScope& currentScope, ++ CompletionKind completionKind = CompletionKind::Normal) { + ptrdiff_t start = bce->offset(); +- if (!bce->emitIteratorClose(iterKind_, completionKind, allowSelfHosted_)) ++ if (!bce->emitIteratorCloseInScope(currentScope, iterKind_, completionKind, ++ allowSelfHosted_)) ++ { + return false; ++ } + ptrdiff_t end = bce->offset(); + return bce->tryNoteList.append(JSTRY_FOR_OF_ITERCLOSE, 0, start, end); + } + +- bool emitPrepareForNonLocalJump(BytecodeEmitter* bce, bool isTarget) { ++ bool emitPrepareForNonLocalJumpFromScope(BytecodeEmitter* bce, ++ EmitterScope& currentScope, ++ bool isTarget) { + // Pop unnecessary value from the stack. Effectively this means + // leaving try-catch block. However, the performing IteratorClose can + // reach the depth for try-catch, and effectively re-enter the +@@ -2159,7 +2172,7 @@ class ForOfLoopControl : public LoopControl + if (!bce->emit1(JSOP_SWAP)) // UNDEF ITER + return false; + +- if (!emitIteratorClose(bce)) // UNDEF ++ if (!emitIteratorCloseInScope(bce, currentScope, CompletionKind::Normal)) // UNDEF + return false; + + if (isTarget) { +@@ -2843,8 +2856,11 @@ NonLocalExitControl::prepareForNonLocalJump(BytecodeEmitter::NestableControl* ta + return false; + + ForOfLoopControl& loopinfo = control->as(); +- if (!loopinfo.emitPrepareForNonLocalJump(bce_, /* isTarget = */ false)) // ... ++ if (!loopinfo.emitPrepareForNonLocalJumpFromScope(bce_, *es, ++ /* isTarget = */ false)) ++ { // ... + return false; ++ } + } else { + npops += 2; + } +@@ -2871,8 +2887,9 @@ NonLocalExitControl::prepareForNonLocalJump(BytecodeEmitter::NestableControl* ta + + if (target && emitIteratorCloseAtTarget && target->is()) { + ForOfLoopControl& loopinfo = target->as(); +- if (!loopinfo.emitPrepareForNonLocalJump(bce_, /* isTarget = */ true)) // ... UNDEF UNDEF ++ if (!loopinfo.emitPrepareForNonLocalJumpFromScope(bce_, *es, /* isTarget = */ true)) { // ... UNDEF UNDEF + return false; ++ } + } + + EmitterScope* targetEmitterScope = target ? target->emitterScope() : bce_->varEmitterScope; +@@ -5325,7 +5342,7 @@ BytecodeEmitter::emitIteratorNext(ParseNode* pn, IteratorKind iterKind /* = Iter + return false; + + if (iterKind == IteratorKind::Async) { +- if (!emitAwait()) // ... RESULT ++ if (!emitAwaitInInnermostScope()) // ... RESULT + return false; + } + +@@ -5336,9 +5353,10 @@ BytecodeEmitter::emitIteratorNext(ParseNode* pn, IteratorKind iterKind /* = Iter + } + + bool +-BytecodeEmitter::emitIteratorClose(IteratorKind iterKind /* = IteratorKind::Sync */, +- CompletionKind completionKind /* = CompletionKind::Normal */, +- bool allowSelfHosted /* = false */) ++BytecodeEmitter::emitIteratorCloseInScope(EmitterScope& currentScope, ++ IteratorKind iterKind /* = IteratorKind::Sync */, ++ CompletionKind completionKind /* = CompletionKind::Normal */, ++ bool allowSelfHosted /* = false */) + { + MOZ_ASSERT(allowSelfHosted || emitterMode != BytecodeEmitter::SelfHosting, + ".close() on iterators is prohibited in self-hosted code because it " +@@ -5430,7 +5448,7 @@ BytecodeEmitter::emitIteratorClose(IteratorKind iterKind /* = IteratorKind::Sync + if (!emit1(JSOP_SWAP)) // ... ... RVAL RESULT + return false; + } +- if (!emitAwait()) // ... ... RVAL? RESULT ++ if (!emitAwaitInScope(currentScope)) // ... ... RVAL? RESULT + return false; + } + +@@ -5690,7 +5708,7 @@ BytecodeEmitter::emitDestructuringOpsArray(ParseNode* pattern, DestructuringFlav + // For an empty pattern [], call IteratorClose unconditionally. Nothing + // else needs to be done. + if (!pattern->pn_head) +- return emitIteratorClose(); // ... OBJ ++ return emitIteratorCloseInInnermostScope(); // ... OBJ + + // Push an initial FALSE value for DONE. + if (!emit1(JSOP_FALSE)) // ... OBJ ITER FALSE +@@ -5886,7 +5904,7 @@ BytecodeEmitter::emitDestructuringOpsArray(ParseNode* pattern, DestructuringFlav + return false; + if (!ifDone.emitElse()) // ... OBJ ITER + return false; +- if (!emitIteratorClose()) // ... OBJ ++ if (!emitIteratorCloseInInnermostScope()) // ... OBJ + return false; + if (!ifDone.emitEnd()) + return false; +@@ -8682,9 +8700,9 @@ BytecodeEmitter::emitReturn(ParseNode* pn) + } + + bool +-BytecodeEmitter::emitGetDotGenerator() ++BytecodeEmitter::emitGetDotGeneratorInScope(EmitterScope& currentScope) + { +- NameLocation loc = *locationOfNameBoundInFunctionScope(cx->names().dotGenerator); ++ NameLocation loc = *locationOfNameBoundInFunctionScope(cx->names().dotGenerator, ¤tScope); + return emitGetNameAtLocation(cx->names().dotGenerator, loc); + } + +@@ -8726,7 +8744,7 @@ BytecodeEmitter::emitYield(ParseNode* pn) + return false; + } + +- if (!emitGetDotGenerator()) ++ if (!emitGetDotGeneratorInInnermostScope()) + return false; + + if (!emitYieldOp(JSOP_YIELD)) +@@ -8736,24 +8754,24 @@ BytecodeEmitter::emitYield(ParseNode* pn) + } + + bool +-BytecodeEmitter::emitAwait() ++BytecodeEmitter::emitAwaitInInnermostScope(ParseNode* pn) + { +- if (!emitGetDotGenerator()) +- return false; +- if (!emitYieldOp(JSOP_AWAIT)) ++ MOZ_ASSERT(sc->isFunctionBox()); ++ MOZ_ASSERT(pn->getOp() == JSOP_AWAIT); ++ ++ if (!emitTree(pn->pn_kid)) + return false; +- return true; ++ return emitAwaitInInnermostScope(); + } + + bool +-BytecodeEmitter::emitAwait(ParseNode* pn) ++BytecodeEmitter::emitAwaitInScope(EmitterScope& currentScope) + { +- MOZ_ASSERT(sc->isFunctionBox()); +- MOZ_ASSERT(pn->getOp() == JSOP_AWAIT); +- +- if (!emitTree(pn->pn_kid)) ++ if (!emitGetDotGeneratorInScope(currentScope)) + return false; +- return emitAwait(); ++ if (!emitYieldOp(JSOP_AWAIT)) ++ return false; ++ return true; + } + + bool +@@ -8794,7 +8812,7 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter) + MOZ_ASSERT(this->stackDepth == startDepth); + + // Load the generator object. +- if (!emitGetDotGenerator()) // ITER RESULT GENOBJ ++ if (!emitGetDotGeneratorInInnermostScope()) // ITER RESULT GENOBJ + return false; + + // Yield RESULT as-is, without re-boxing. +@@ -8831,7 +8849,7 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter) + // If the iterator does not have a "throw" method, it calls IteratorClose + // and then throws a TypeError. + IteratorKind iterKind = isAsyncGenerator ? IteratorKind::Async : IteratorKind::Sync; +- if (!emitIteratorClose(iterKind)) // ITER RESULT EXCEPTION ++ if (!emitIteratorCloseInInnermostScope(iterKind)) // ITER RESULT EXCEPTION + return false; + if (!emitUint16Operand(JSOP_THROWMSG, JSMSG_ITERATOR_NO_THROW)) // throw + return false; +@@ -8849,7 +8867,7 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter) + checkTypeSet(JSOP_CALL); + + if (isAsyncGenerator) { +- if (!emitAwait()) // ITER OLDRESULT RESULT ++ if (!emitAwaitInInnermostScope()) // ITER OLDRESULT RESULT + return false; + } + +@@ -8920,7 +8938,7 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter) + checkTypeSet(JSOP_CALL); + + if (iterKind == IteratorKind::Async) { +- if (!emitAwait()) // ... FTYPE FVALUE RESULT ++ if (!emitAwaitInInnermostScope()) // ... FTYPE FVALUE RESULT + return false; + } + +@@ -8943,7 +8961,7 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter) + return false; + + if (isAsyncGenerator) { +- if (!emitAwait()) // ITER OLDRESULT FTYPE FVALUE VALUE ++ if (!emitAwaitInInnermostScope()) // ITER OLDRESULT FTYPE FVALUE VALUE + return false; + } + +@@ -9005,7 +9023,7 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter) + checkTypeSet(JSOP_CALL); + + if (isAsyncGenerator) { +- if (!emitAwait()) // ITER RESULT RESULT ++ if (!emitAwaitInInnermostScope()) // ITER RESULT RESULT + return false; + } + +@@ -9038,7 +9056,7 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter) + return false; + + if (isAsyncGenerator) { +- if (!emitAwait()) // VALUE ++ if (!emitAwaitInInnermostScope()) // VALUE + return false; + } + +@@ -10592,7 +10610,7 @@ BytecodeEmitter::emitFunctionBody(ParseNode* funBody) + if (!emit1(JSOP_SETRVAL)) + return false; + +- if (!emitGetDotGenerator()) ++ if (!emitGetDotGeneratorInInnermostScope()) + return false; + + // No need to check for finally blocks, etc as in EmitReturn. +@@ -10954,7 +10972,7 @@ BytecodeEmitter::emitTree(ParseNode* pn, ValueUsage valueUsage /* = ValueUsage:: + break; + + case PNK_AWAIT: +- if (!emitAwait(pn)) ++ if (!emitAwaitInInnermostScope(pn)) + return false; + break; + +diff --git js/src/frontend/BytecodeEmitter.h js/src/frontend/BytecodeEmitter.h +index f238cc12c0247..039d271e4d965 100644 +--- js/src/frontend/BytecodeEmitter.h ++++ js/src/frontend/BytecodeEmitter.h +@@ -634,14 +634,20 @@ struct MOZ_STACK_CLASS BytecodeEmitter + MOZ_MUST_USE bool iteratorResultShape(unsigned* shape); + MOZ_MUST_USE bool emitToIteratorResult(bool done); + +- MOZ_MUST_USE bool emitGetDotGenerator(); ++ MOZ_MUST_USE bool emitGetDotGeneratorInInnermostScope() { ++ return emitGetDotGeneratorInScope(*innermostEmitterScope); ++ } ++ MOZ_MUST_USE bool emitGetDotGeneratorInScope(EmitterScope& currentScope); + + MOZ_MUST_USE bool emitInitialYield(ParseNode* pn); + MOZ_MUST_USE bool emitYield(ParseNode* pn); + MOZ_MUST_USE bool emitYieldOp(JSOp op); + MOZ_MUST_USE bool emitYieldStar(ParseNode* iter); +- MOZ_MUST_USE bool emitAwait(); +- MOZ_MUST_USE bool emitAwait(ParseNode* pn); ++ MOZ_MUST_USE bool emitAwaitInInnermostScope() { ++ return emitAwaitInScope(*innermostEmitterScope); ++ } ++ MOZ_MUST_USE bool emitAwaitInInnermostScope(ParseNode* pn); ++ MOZ_MUST_USE bool emitAwaitInScope(EmitterScope& currentScope); + + MOZ_MUST_USE bool emitPropLHS(ParseNode* pn); + MOZ_MUST_USE bool emitPropOp(ParseNode* pn, JSOp op); +@@ -738,9 +744,16 @@ struct MOZ_STACK_CLASS BytecodeEmitter + // onto the stack. + MOZ_MUST_USE bool emitIteratorNext(ParseNode* pn, IteratorKind kind = IteratorKind::Sync, + bool allowSelfHosted = false); +- MOZ_MUST_USE bool emitIteratorClose(IteratorKind iterKind = IteratorKind::Sync, +- CompletionKind completionKind = CompletionKind::Normal, +- bool allowSelfHosted = false); ++ MOZ_MUST_USE bool emitIteratorCloseInScope(EmitterScope& currentScope, ++ IteratorKind iterKind = IteratorKind::Sync, ++ CompletionKind completionKind = CompletionKind::Normal, ++ bool allowSelfHosted = false); ++ MOZ_MUST_USE bool emitIteratorCloseInInnermostScope(IteratorKind iterKind = IteratorKind::Sync, ++ CompletionKind completionKind = CompletionKind::Normal, ++ bool allowSelfHosted = false) { ++ return emitIteratorCloseInScope(*innermostEmitterScope, iterKind, completionKind, ++ allowSelfHosted); ++ } + + template + MOZ_MUST_USE bool wrapWithDestructuringIteratorCloseTryNote(int32_t iterDepth, + +commit 0cd861187fc0 +Author: Tooru Fujisawa +Date: Tue May 22 18:10:28 2018 +0900 + + Bug 1454285 - Part 2: Disallow using innermostEmitterScope while the value does not match the bytecode environment. r=jwalden, a=RyanVM + + --HG-- + extra : source : 567757b97ff0f511bb142b966f5b5777bad7fdc2 +--- + js/src/frontend/BytecodeEmitter.cpp | 59 ++++++++++++++++++++----------------- + js/src/frontend/BytecodeEmitter.h | 49 ++++++++++++++++++++++++++---- + 2 files changed, 76 insertions(+), 32 deletions(-) + +diff --git js/src/frontend/BytecodeEmitter.cpp js/src/frontend/BytecodeEmitter.cpp +index e8edc66658804..e13f5bfdd243b 100644 +--- js/src/frontend/BytecodeEmitter.cpp ++++ js/src/frontend/BytecodeEmitter.cpp +@@ -102,7 +102,7 @@ class BytecodeEmitter::NestableControl : public Nestable(&bce->innermostNestableControl), + kind_(kind), +- emitterScope_(bce->innermostEmitterScope) ++ emitterScope_(bce->innermostEmitterScopeNoCheck()) + { } + + public: +@@ -436,7 +436,7 @@ class BytecodeEmitter::EmitterScope : public Nestableparent) { + *bce = (*bce)->parent; +- return (*bce)->innermostEmitterScope; ++ return (*bce)->innermostEmitterScopeNoCheck(); + } + + return nullptr; +@@ -470,7 +470,7 @@ class BytecodeEmitter::EmitterScope : public Nestable(&bce->innermostEmitterScope), ++ : Nestable(&bce->innermostEmitterScope_), + nameCache_(bce->cx->frontendCollectionPool()), + hasEnvironment_(false), + environmentChainLength_(0), +@@ -879,7 +879,7 @@ BytecodeEmitter::EmitterScope::enterLexical(BytecodeEmitter* bce, ScopeKind kind + Handle bindings) + { + MOZ_ASSERT(kind != ScopeKind::NamedLambda && kind != ScopeKind::StrictNamedLambda); +- MOZ_ASSERT(this == bce->innermostEmitterScope); ++ MOZ_ASSERT(this == bce->innermostEmitterScopeNoCheck()); + + if (!ensureCache(bce)) + return false; +@@ -948,7 +948,7 @@ BytecodeEmitter::EmitterScope::enterLexical(BytecodeEmitter* bce, ScopeKind kind + bool + BytecodeEmitter::EmitterScope::enterNamedLambda(BytecodeEmitter* bce, FunctionBox* funbox) + { +- MOZ_ASSERT(this == bce->innermostEmitterScope); ++ MOZ_ASSERT(this == bce->innermostEmitterScopeNoCheck()); + MOZ_ASSERT(funbox->namedLambdaBindings()); + + if (!ensureCache(bce)) +@@ -1015,7 +1015,7 @@ BytecodeEmitter::EmitterScope::enterComprehensionFor(BytecodeEmitter* bce, + bool + BytecodeEmitter::EmitterScope::enterParameterExpressionVar(BytecodeEmitter* bce) + { +- MOZ_ASSERT(this == bce->innermostEmitterScope); ++ MOZ_ASSERT(this == bce->innermostEmitterScopeNoCheck()); + + if (!ensureCache(bce)) + return false; +@@ -1048,7 +1048,7 @@ BytecodeEmitter::EmitterScope::enterParameterExpressionVar(BytecodeEmitter* bce) + bool + BytecodeEmitter::EmitterScope::enterFunction(BytecodeEmitter* bce, FunctionBox* funbox) + { +- MOZ_ASSERT(this == bce->innermostEmitterScope); ++ MOZ_ASSERT(this == bce->innermostEmitterScopeNoCheck()); + + // If there are parameter expressions, there is an extra var scope. + if (!funbox->hasExtraBodyVarScope()) +@@ -1139,7 +1139,7 @@ BytecodeEmitter::EmitterScope::enterFunctionExtraBodyVar(BytecodeEmitter* bce, F + MOZ_ASSERT(funbox->hasParameterExprs); + MOZ_ASSERT(funbox->extraVarScopeBindings() || + funbox->needsExtraBodyVarEnvironmentRegardlessOfBindings()); +- MOZ_ASSERT(this == bce->innermostEmitterScope); ++ MOZ_ASSERT(this == bce->innermostEmitterScopeNoCheck()); + + // The extra var scope is never popped once it's entered. It replaces the + // function scope as the var emitter scope. +@@ -1225,7 +1225,7 @@ class DynamicBindingIter : public BindingIter + bool + BytecodeEmitter::EmitterScope::enterGlobal(BytecodeEmitter* bce, GlobalSharedContext* globalsc) + { +- MOZ_ASSERT(this == bce->innermostEmitterScope); ++ MOZ_ASSERT(this == bce->innermostEmitterScopeNoCheck()); + + bce->setVarEmitterScope(this); + +@@ -1285,7 +1285,7 @@ BytecodeEmitter::EmitterScope::enterGlobal(BytecodeEmitter* bce, GlobalSharedCon + bool + BytecodeEmitter::EmitterScope::enterEval(BytecodeEmitter* bce, EvalSharedContext* evalsc) + { +- MOZ_ASSERT(this == bce->innermostEmitterScope); ++ MOZ_ASSERT(this == bce->innermostEmitterScopeNoCheck()); + + bce->setVarEmitterScope(this); + +@@ -1340,7 +1340,7 @@ BytecodeEmitter::EmitterScope::enterEval(BytecodeEmitter* bce, EvalSharedContext + bool + BytecodeEmitter::EmitterScope::enterModule(BytecodeEmitter* bce, ModuleSharedContext* modulesc) + { +- MOZ_ASSERT(this == bce->innermostEmitterScope); ++ MOZ_ASSERT(this == bce->innermostEmitterScopeNoCheck()); + + bce->setVarEmitterScope(this); + +@@ -1397,7 +1397,7 @@ BytecodeEmitter::EmitterScope::enterModule(BytecodeEmitter* bce, ModuleSharedCon + bool + BytecodeEmitter::EmitterScope::enterWith(BytecodeEmitter* bce) + { +- MOZ_ASSERT(this == bce->innermostEmitterScope); ++ MOZ_ASSERT(this == bce->innermostEmitterScopeNoCheck()); + + if (!ensureCache(bce)) + return false; +@@ -1425,7 +1425,7 @@ BytecodeEmitter::EmitterScope::leave(BytecodeEmitter* bce, bool nonLocal) + { + // If we aren't leaving the scope due to a non-local jump (e.g., break), + // we must be the innermost scope. +- MOZ_ASSERT_IF(!nonLocal, this == bce->innermostEmitterScope); ++ MOZ_ASSERT_IF(!nonLocal, this == bce->innermostEmitterScopeNoCheck()); + + ScopeKind kind = scope(bce)->kind(); + switch (kind) { +@@ -2139,7 +2139,7 @@ class ForOfLoopControl : public LoopControl + + bool emitIteratorCloseInInnermostScope(BytecodeEmitter* bce, + CompletionKind completionKind = CompletionKind::Normal) { +- return emitIteratorCloseInScope(bce, *bce->innermostEmitterScope, completionKind); ++ return emitIteratorCloseInScope(bce, *bce->innermostEmitterScope(), completionKind); + } + + bool emitIteratorCloseInScope(BytecodeEmitter* bce, +@@ -2213,8 +2213,11 @@ BytecodeEmitter::BytecodeEmitter(BytecodeEmitter* parent, + bodyScopeIndex(UINT32_MAX), + varEmitterScope(nullptr), + innermostNestableControl(nullptr), +- innermostEmitterScope(nullptr), ++ innermostEmitterScope_(nullptr), + innermostTDZCheckCache(nullptr), ++#ifdef DEBUG ++ unstableEmitterScope(false), ++#endif + constList(cx), + scopeList(cx), + tryNoteList(cx), +@@ -2271,13 +2274,13 @@ BytecodeEmitter::findInnermostNestableControl(Predicate predicate) const + NameLocation + BytecodeEmitter::lookupName(JSAtom* name) + { +- return innermostEmitterScope->lookup(this, name); ++ return innermostEmitterScope()->lookup(this, name); + } + + Maybe + BytecodeEmitter::locationOfNameBoundInScope(JSAtom* name, EmitterScope* target) + { +- return innermostEmitterScope->locationBoundInScope(this, name, target); ++ return innermostEmitterScope()->locationBoundInScope(this, name, target); + } + + Maybe +@@ -2757,7 +2760,7 @@ class NonLocalExitControl + : bce_(bce), + savedScopeNoteIndex_(bce->scopeNoteList.length()), + savedDepth_(bce->stackDepth), +- openScopeNoteIndex_(bce->innermostEmitterScope->noteIndex()), ++ openScopeNoteIndex_(bce->innermostEmitterScope()->noteIndex()), + kind_(kind) + { } + +@@ -2803,9 +2806,11 @@ NonLocalExitControl::prepareForNonLocalJump(BytecodeEmitter::NestableControl* ta + using NestableControl = BytecodeEmitter::NestableControl; + using EmitterScope = BytecodeEmitter::EmitterScope; + +- EmitterScope* es = bce_->innermostEmitterScope; ++ EmitterScope* es = bce_->innermostEmitterScope(); + int npops = 0; + ++ AutoCheckUnstableEmitterScope cues(bce_); ++ + // For 'continue', 'break', and 'return' statements, emit IteratorClose + // bytecode inline. 'continue' statements do not call IteratorClose for + // the loop they are continuing. +@@ -2924,7 +2929,7 @@ BytecodeEmitter::emitGoto(NestableControl* target, JumpList* jumplist, SrcNoteTy + Scope* + BytecodeEmitter::innermostScope() const + { +- return innermostEmitterScope->scope(this); ++ return innermostEmitterScope()->scope(this); + } + + bool +@@ -3585,7 +3590,7 @@ BytecodeEmitter::needsImplicitThis() + return true; + + // Otherwise see if the current point is under a 'with'. +- for (EmitterScope* es = innermostEmitterScope; es; es = es->enclosingInFrame()) { ++ for (EmitterScope* es = innermostEmitterScope(); es; es = es->enclosingInFrame()) { + if (es->scope(this)->kind() == ScopeKind::With) + return true; + } +@@ -5262,7 +5267,7 @@ BytecodeEmitter::emitSetOrInitializeDestructuring(ParseNode* target, Destructuri + // destructuring declaration needs to initialize the name in + // the function scope. The innermost scope is the var scope, + // and its enclosing scope is the function scope. +- EmitterScope* funScope = innermostEmitterScope->enclosingInFrame(); ++ EmitterScope* funScope = innermostEmitterScope()->enclosingInFrame(); + NameLocation paramLoc = *locationOfNameBoundInScope(name, funScope); + if (!emitSetOrInitializeNameAtLocation(name, paramLoc, emitSwapScopeAndRhs, true)) + return false; +@@ -7304,7 +7309,7 @@ BytecodeEmitter::emitForOf(ParseNode* forOfLoop, EmitterScope* headLexicalEmitte + // bindings inducing an environment, recreate the current environment. + DebugOnly forOfTarget = forOfHead->pn_kid1; + MOZ_ASSERT(forOfTarget->isKind(PNK_LET) || forOfTarget->isKind(PNK_CONST)); +- MOZ_ASSERT(headLexicalEmitterScope == innermostEmitterScope); ++ MOZ_ASSERT(headLexicalEmitterScope == innermostEmitterScope()); + MOZ_ASSERT(headLexicalEmitterScope->scope(this)->kind() == ScopeKind::Lexical); + + if (headLexicalEmitterScope->hasEnvironment()) { +@@ -7502,7 +7507,7 @@ BytecodeEmitter::emitForIn(ParseNode* forInLoop, EmitterScope* headLexicalEmitte + // it must be the innermost one. If that scope has closed-over + // bindings inducing an environment, recreate the current environment. + MOZ_ASSERT(forInTarget->isKind(PNK_LET) || forInTarget->isKind(PNK_CONST)); +- MOZ_ASSERT(headLexicalEmitterScope == innermostEmitterScope); ++ MOZ_ASSERT(headLexicalEmitterScope == innermostEmitterScope()); + MOZ_ASSERT(headLexicalEmitterScope->scope(this)->kind() == ScopeKind::Lexical); + + if (headLexicalEmitterScope->hasEnvironment()) { +@@ -7635,7 +7640,7 @@ BytecodeEmitter::emitCStyleFor(ParseNode* pn, EmitterScope* headLexicalEmitterSc + // exists for the head, it must be the innermost one. If that scope + // has closed-over bindings inducing an environment, recreate the + // current environment. +- MOZ_ASSERT(headLexicalEmitterScope == innermostEmitterScope); ++ MOZ_ASSERT(headLexicalEmitterScope == innermostEmitterScope()); + MOZ_ASSERT(headLexicalEmitterScope->scope(this)->kind() == ScopeKind::Lexical); + + if (headLexicalEmitterScope->hasEnvironment()) { +@@ -7683,7 +7688,7 @@ BytecodeEmitter::emitCStyleFor(ParseNode* pn, EmitterScope* headLexicalEmitterSc + + // ES 13.7.4.8 step 3.e. The per-iteration freshening. + if (forLoopRequiresFreshening) { +- MOZ_ASSERT(headLexicalEmitterScope == innermostEmitterScope); ++ MOZ_ASSERT(headLexicalEmitterScope == innermostEmitterScope()); + MOZ_ASSERT(headLexicalEmitterScope->scope(this)->kind() == ScopeKind::Lexical); + + if (headLexicalEmitterScope->hasEnvironment()) { +@@ -10410,7 +10415,7 @@ BytecodeEmitter::emitFunctionFormalParameters(ParseNode* pn) + { + ParseNode* funBody = pn->last(); + FunctionBox* funbox = sc->asFunctionBox(); +- EmitterScope* funScope = innermostEmitterScope; ++ EmitterScope* funScope = innermostEmitterScope(); + + bool hasParameterExprs = funbox->hasParameterExprs; + bool hasRest = funbox->hasRest(); +diff --git js/src/frontend/BytecodeEmitter.h js/src/frontend/BytecodeEmitter.h +index 039d271e4d965..91826f27bf9fd 100644 +--- js/src/frontend/BytecodeEmitter.h ++++ js/src/frontend/BytecodeEmitter.h +@@ -232,9 +232,23 @@ struct MOZ_STACK_CLASS BytecodeEmitter + + EmitterScope* varEmitterScope; + NestableControl* innermostNestableControl; +- EmitterScope* innermostEmitterScope; ++ EmitterScope* innermostEmitterScope_; + TDZCheckCache* innermostTDZCheckCache; + ++#ifdef DEBUG ++ bool unstableEmitterScope; ++ ++ friend class AutoCheckUnstableEmitterScope; ++#endif ++ ++ EmitterScope* innermostEmitterScope() const { ++ MOZ_ASSERT(!unstableEmitterScope); ++ return innermostEmitterScopeNoCheck(); ++ } ++ EmitterScope* innermostEmitterScopeNoCheck() const { ++ return innermostEmitterScope_; ++ } ++ + CGConstList constList; /* constants to be included with the script */ + CGObjectList objectList; /* list of emitted objects */ + CGScopeList scopeList; /* list of emitted scopes */ +@@ -339,7 +353,7 @@ struct MOZ_STACK_CLASS BytecodeEmitter + EmitterScope* source); + + mozilla::Maybe locationOfNameBoundInFunctionScope(JSAtom* name) { +- return locationOfNameBoundInFunctionScope(name, innermostEmitterScope); ++ return locationOfNameBoundInFunctionScope(name, innermostEmitterScope()); + } + + void setVarEmitterScope(EmitterScope* emitterScope) { +@@ -635,7 +649,7 @@ struct MOZ_STACK_CLASS BytecodeEmitter + MOZ_MUST_USE bool emitToIteratorResult(bool done); + + MOZ_MUST_USE bool emitGetDotGeneratorInInnermostScope() { +- return emitGetDotGeneratorInScope(*innermostEmitterScope); ++ return emitGetDotGeneratorInScope(*innermostEmitterScope()); + } + MOZ_MUST_USE bool emitGetDotGeneratorInScope(EmitterScope& currentScope); + +@@ -644,7 +658,7 @@ struct MOZ_STACK_CLASS BytecodeEmitter + MOZ_MUST_USE bool emitYieldOp(JSOp op); + MOZ_MUST_USE bool emitYieldStar(ParseNode* iter); + MOZ_MUST_USE bool emitAwaitInInnermostScope() { +- return emitAwaitInScope(*innermostEmitterScope); ++ return emitAwaitInScope(*innermostEmitterScope()); + } + MOZ_MUST_USE bool emitAwaitInInnermostScope(ParseNode* pn); + MOZ_MUST_USE bool emitAwaitInScope(EmitterScope& currentScope); +@@ -751,7 +765,7 @@ struct MOZ_STACK_CLASS BytecodeEmitter + MOZ_MUST_USE bool emitIteratorCloseInInnermostScope(IteratorKind iterKind = IteratorKind::Sync, + CompletionKind completionKind = CompletionKind::Normal, + bool allowSelfHosted = false) { +- return emitIteratorCloseInScope(*innermostEmitterScope, iterKind, completionKind, ++ return emitIteratorCloseInScope(*innermostEmitterScope(), iterKind, completionKind, + allowSelfHosted); + } + +@@ -852,6 +866,31 @@ struct MOZ_STACK_CLASS BytecodeEmitter + MOZ_MUST_USE bool emitSuperElemOp(ParseNode* pn, JSOp op, bool isCall = false); + }; + ++class MOZ_RAII AutoCheckUnstableEmitterScope { ++#ifdef DEBUG ++ bool prev_; ++ BytecodeEmitter* bce_; ++#endif ++ ++ public: ++ AutoCheckUnstableEmitterScope() = delete; ++ explicit AutoCheckUnstableEmitterScope(BytecodeEmitter* bce) ++#ifdef DEBUG ++ : bce_(bce) ++#endif ++ { ++#ifdef DEBUG ++ prev_ = bce_->unstableEmitterScope; ++ bce_->unstableEmitterScope = true; ++#endif ++ } ++ ~AutoCheckUnstableEmitterScope() { ++#ifdef DEBUG ++ bce_->unstableEmitterScope = prev_; ++#endif ++ } ++}; ++ + } /* namespace frontend */ + } /* namespace js */ + Copied: branches/2018Q2/www/waterfox/files/patch-bug1456189 (from r470749, head/www/waterfox/files/patch-bug1456189) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1456189 Thu May 24 00:58:44 2018 (r470751, copy of r470749, head/www/waterfox/files/patch-bug1456189) @@ -0,0 +1,218 @@ +commit e5c1015f6968 +Author: Alex Gaynor +Date: Fri May 18 18:59:00 2018 -0400 + + Bug 1456189 - Simplify BufferList::Extract to make the lifetimes clearer. r=froydnj, a=RyanVM + + --HG-- + extra : source : 9d8c922db947eadeca8278bb33d4f5fe271cef05 +--- + mfbt/BufferList.h | 129 ++++++++++++++++++++++++++++-------------- + mfbt/tests/TestBufferList.cpp | 33 ++++++++++- + 2 files changed, 115 insertions(+), 47 deletions(-) + +diff --git mfbt/BufferList.h mfbt/BufferList.h +index 62ab540df0fbb..a2e7aac32a9f3 100644 +--- mfbt/BufferList.h ++++ mfbt/BufferList.h +@@ -9,6 +9,7 @@ + + #include + #include "mozilla/AllocPolicy.h" ++#include "mozilla/Maybe.h" + #include "mozilla/MemoryReporting.h" + #include "mozilla/Move.h" + #include "mozilla/ScopeExit.h" +@@ -538,61 +539,101 @@ BufferList::Extract(IterImpl& aIter, size_t aSize, bool* aSuccess) + MOZ_ASSERT(aSize % kSegmentAlignment == 0); + MOZ_ASSERT(intptr_t(aIter.mData) % kSegmentAlignment == 0); + +- IterImpl iter = aIter; +- size_t size = aSize; +- size_t toCopy = std::min(size, aIter.RemainingInSegment()); +- MOZ_ASSERT(toCopy % kSegmentAlignment == 0); ++ auto failure = [this, aSuccess]() { ++ *aSuccess = false; ++ return BufferList(0, 0, mStandardCapacity); ++ }; + +- BufferList result(0, toCopy, mStandardCapacity); +- BufferList error(0, 0, mStandardCapacity); ++ // Number of segments we'll need to copy data from to satisfy the request. ++ size_t segmentsNeeded = 0; ++ // If this is None then the last segment is a full segment, otherwise we need ++ // to copy this many bytes. ++ Maybe lastSegmentSize; ++ { ++ // Copy of the iterator to walk the BufferList and see how many segments we ++ // need to copy. ++ IterImpl iter = aIter; ++ size_t remaining = aSize; ++ while (!iter.Done() && remaining && ++ remaining >= iter.RemainingInSegment()) { ++ remaining -= iter.RemainingInSegment(); ++ iter.Advance(*this, iter.RemainingInSegment()); ++ segmentsNeeded++; ++ } + +- // Copy the head +- if (!result.WriteBytes(aIter.mData, toCopy)) { +- *aSuccess = false; +- return error; ++ if (remaining) { ++ if (iter.Done()) { ++ // We reached the end of the BufferList and there wasn't enough data to ++ // satisfy the request. ++ return failure(); ++ } ++ lastSegmentSize.emplace(remaining); ++ // The last block also counts as a segment. This makes the conditionals ++ // on segmentsNeeded work in the rest of the function. ++ segmentsNeeded++; ++ } + } +- iter.Advance(*this, toCopy); +- size -= toCopy; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Thu May 24 12:06: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 A5618EEDF61; Thu, 24 May 2018 12:06:27 +0000 (UTC) (envelope-from wen@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 5882D873DF; Thu, 24 May 2018 12:06:27 +0000 (UTC) (envelope-from wen@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 367891201B; Thu, 24 May 2018 12:06:27 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4OC6RcI032744; Thu, 24 May 2018 12:06:27 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4OC6Ppl032737; Thu, 24 May 2018 12:06:25 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201805241206.w4OC6Ppl032737@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Thu, 24 May 2018 12:06:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470771 - in branches/2018Q2/www: moodle31 moodle32 moodle33 moodle34 X-SVN-Group: ports-branches X-SVN-Commit-Author: wen X-SVN-Commit-Paths: in branches/2018Q2/www: moodle31 moodle32 moodle33 moodle34 X-SVN-Commit-Revision: 470771 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.26 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, 24 May 2018 12:06:28 -0000 Author: wen Date: Thu May 24 12:06:25 2018 New Revision: 470771 URL: https://svnweb.freebsd.org/changeset/ports/470771 Log: MFH: r470271 - Update moodle to 3.4.3, 3.3.6, 3.2.9 and 3.1.12 (include security fix) Approved by: ports-secteam@(miwi@) Modified: branches/2018Q2/www/moodle31/Makefile branches/2018Q2/www/moodle31/distinfo branches/2018Q2/www/moodle32/Makefile branches/2018Q2/www/moodle32/distinfo branches/2018Q2/www/moodle33/Makefile branches/2018Q2/www/moodle33/distinfo branches/2018Q2/www/moodle34/Makefile branches/2018Q2/www/moodle34/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/moodle31/Makefile ============================================================================== --- branches/2018Q2/www/moodle31/Makefile Thu May 24 11:43:56 2018 (r470770) +++ branches/2018Q2/www/moodle31/Makefile Thu May 24 12:06:25 2018 (r470771) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 3.1.11 +PORTVERSION= 3.1.12 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable31/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} Modified: branches/2018Q2/www/moodle31/distinfo ============================================================================== --- branches/2018Q2/www/moodle31/distinfo Thu May 24 11:43:56 2018 (r470770) +++ branches/2018Q2/www/moodle31/distinfo Thu May 24 12:06:25 2018 (r470771) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521465894 -SHA256 (moodle-3.1.11.tgz) = c75d3f2e290adaf7b3bb70c98305efc9368e4873d809b02880c13c488aec7156 -SIZE (moodle-3.1.11.tgz) = 38028187 +TIMESTAMP = 1526632513 +SHA256 (moodle-3.1.12.tgz) = f7a277ac9f691ee864a9092544d1ee11caf7f9e4dc40525ccbcf697143dd1008 +SIZE (moodle-3.1.12.tgz) = 38023724 Modified: branches/2018Q2/www/moodle32/Makefile ============================================================================== --- branches/2018Q2/www/moodle32/Makefile Thu May 24 11:43:56 2018 (r470770) +++ branches/2018Q2/www/moodle32/Makefile Thu May 24 12:06:25 2018 (r470771) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 3.2.8 +PORTVERSION= 3.2.9 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable32/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} Modified: branches/2018Q2/www/moodle32/distinfo ============================================================================== --- branches/2018Q2/www/moodle32/distinfo Thu May 24 11:43:56 2018 (r470770) +++ branches/2018Q2/www/moodle32/distinfo Thu May 24 12:06:25 2018 (r470771) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521465667 -SHA256 (moodle-3.2.8.tgz) = bb331dd45f9b703d26c27b1aa2b4b1cdab16728965079e827754de97c9bff0f9 -SIZE (moodle-3.2.8.tgz) = 40323405 +TIMESTAMP = 1526632441 +SHA256 (moodle-3.2.9.tgz) = 91f1deeafd3e20d07deb59bd3cd3673da7e4a870336d95dadbae7e26722c61a3 +SIZE (moodle-3.2.9.tgz) = 40333782 Modified: branches/2018Q2/www/moodle33/Makefile ============================================================================== --- branches/2018Q2/www/moodle33/Makefile Thu May 24 11:43:56 2018 (r470770) +++ branches/2018Q2/www/moodle33/Makefile Thu May 24 12:06:25 2018 (r470771) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 3.3.5 +PORTVERSION= 3.3.6 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable33/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} Modified: branches/2018Q2/www/moodle33/distinfo ============================================================================== --- branches/2018Q2/www/moodle33/distinfo Thu May 24 11:43:56 2018 (r470770) +++ branches/2018Q2/www/moodle33/distinfo Thu May 24 12:06:25 2018 (r470771) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521467601 -SHA256 (moodle-3.3.5.tgz) = 13f7d97fd7daeb9cfd1117806dc1468996cf2182a78888a880272e2d56d8cfe3 -SIZE (moodle-3.3.5.tgz) = 44374771 +TIMESTAMP = 1526628775 +SHA256 (moodle-3.3.6.tgz) = 7211d7500f7e7f703eaf58111927880b35d5d1c57752053868be0375d1f6483c +SIZE (moodle-3.3.6.tgz) = 44870790 Modified: branches/2018Q2/www/moodle34/Makefile ============================================================================== --- branches/2018Q2/www/moodle34/Makefile Thu May 24 11:43:56 2018 (r470770) +++ branches/2018Q2/www/moodle34/Makefile Thu May 24 12:06:25 2018 (r470771) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 3.4.2 +PORTVERSION= 3.4.3 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable34/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX} Modified: branches/2018Q2/www/moodle34/distinfo ============================================================================== --- branches/2018Q2/www/moodle34/distinfo Thu May 24 11:43:56 2018 (r470770) +++ branches/2018Q2/www/moodle34/distinfo Thu May 24 12:06:25 2018 (r470771) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521463086 -SHA256 (moodle-3.4.2.tgz) = 1856c045ee52aa97a13ae6c078ee2c270ee966cd80b79cd12f0d2395b592bd8f -SIZE (moodle-3.4.2.tgz) = 45012231 +TIMESTAMP = 1526627845 +SHA256 (moodle-3.4.3.tgz) = 115601e8e336b61c596d96edaf49e999b5227e65d911fbd09d90aad93fd18e6a +SIZE (moodle-3.4.3.tgz) = 45524224 From owner-svn-ports-branches@freebsd.org Thu May 24 19:53:43 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 BD87AEFCAB7; Thu, 24 May 2018 19:53:43 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 666C5807D1; Thu, 24 May 2018 19:53:43 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4487916CD9; Thu, 24 May 2018 19:53:43 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4OJrh6a073664; Thu, 24 May 2018 19:53:43 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4OJrgxn073661; Thu, 24 May 2018 19:53:42 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201805241953.w4OJrgxn073661@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Thu, 24 May 2018 19:53:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470806 - in branches/2018Q2/lang/php56: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: flo X-SVN-Commit-Paths: in branches/2018Q2/lang/php56: . files X-SVN-Commit-Revision: 470806 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.26 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, 24 May 2018 19:53:44 -0000 Author: flo Date: Thu May 24 19:53:42 2018 New Revision: 470806 URL: https://svnweb.freebsd.org/changeset/ports/470806 Log: MFH: r469895 Prevent php 5.6 (opcache) from segfaulting when compiled with clang 6.0 PR: 227723 Submitted by: dim Reported by: flo, lampa@fit.vutbr.cz Approved by: maintainer timeout Approved by: ports-secteam (riggs) Added: branches/2018Q2/lang/php56/files/patch-Zend_zend__compile.h - copied unchanged from r469895, head/lang/php56/files/patch-Zend_zend__compile.h branches/2018Q2/lang/php56/files/patch-Zend_zend__execute.h - copied unchanged from r469895, head/lang/php56/files/patch-Zend_zend__execute.h Modified: branches/2018Q2/lang/php56/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/lang/php56/Makefile ============================================================================== --- branches/2018Q2/lang/php56/Makefile Thu May 24 19:45:55 2018 (r470805) +++ branches/2018Q2/lang/php56/Makefile Thu May 24 19:53:42 2018 (r470806) @@ -3,7 +3,7 @@ PORTNAME= php56 PORTVERSION= 5.6.35 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Copied: branches/2018Q2/lang/php56/files/patch-Zend_zend__compile.h (from r469895, head/lang/php56/files/patch-Zend_zend__compile.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/lang/php56/files/patch-Zend_zend__compile.h Thu May 24 19:53:42 2018 (r470806, copy of r469895, head/lang/php56/files/patch-Zend_zend__compile.h) @@ -0,0 +1,12 @@ +--- Zend/zend_compile.h.orig 2018-02-27 23:15:25 UTC ++++ Zend/zend_compile.h +@@ -414,9 +414,6 @@ struct _zend_execute_data { + + #define EX(element) execute_data.element + +-#define EX_TMP_VAR(ex, n) ((temp_variable*)(((char*)(ex)) + ((int)(n)))) +-#define EX_TMP_VAR_NUM(ex, n) (EX_TMP_VAR(ex, 0) - (1 + (n))) +- + #define EX_CV_NUM(ex, n) (((zval***)(((char*)(ex))+ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data))))+(n)) + + Copied: branches/2018Q2/lang/php56/files/patch-Zend_zend__execute.h (from r469895, head/lang/php56/files/patch-Zend_zend__execute.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/lang/php56/files/patch-Zend_zend__execute.h Thu May 24 19:53:42 2018 (r470806, copy of r469895, head/lang/php56/files/patch-Zend_zend__execute.h) @@ -0,0 +1,18 @@ +--- Zend/zend_execute.h.orig 2018-02-27 23:15:25 UTC ++++ Zend/zend_execute.h +@@ -71,6 +71,15 @@ ZEND_API int zend_eval_stringl_ex(char *str, int str_l + ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, ulong fetch_type, const char **class_name, zend_class_entry **pce TSRMLS_DC); + ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf, zend_uint arg_num, const char *need_msg, const char *need_kind, const char *given_msg, const char *given_kind TSRMLS_DC); + ++static zend_always_inline temp_variable *EX_TMP_VAR(void *ex, int n) ++{ ++ return (temp_variable *)((zend_uintptr_t)ex + n); ++} ++static inline temp_variable *EX_TMP_VAR_NUM(void *ex, int n) ++{ ++ return (temp_variable *)((zend_uintptr_t)ex - (1 + n) * sizeof(temp_variable)); ++} ++ + static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC TSRMLS_DC) + { + if (!Z_DELREF_P(zval_ptr)) { From owner-svn-ports-branches@freebsd.org Fri May 25 01:01:54 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB3F4F6F507; Fri, 25 May 2018 01:01:53 +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 9FFB86C4BC; Fri, 25 May 2018 01:01:53 +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 81DDA19EB8; Fri, 25 May 2018 01:01:53 +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 w4P11ruE029640; Fri, 25 May 2018 01:01:53 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4P11rs3029639; Fri, 25 May 2018 01:01:53 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805250101.w4P11rs3029639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 25 May 2018 01:01:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470818 - branches/2018Q2/www/firefox/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/www/firefox/files X-SVN-Commit-Revision: 470818 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.26 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, 25 May 2018 01:01:54 -0000 Author: jbeich Date: Fri May 25 01:01:53 2018 New Revision: 470818 URL: https://svnweb.freebsd.org/changeset/ports/470818 Log: MFH: r470817 www/firefox: switch Skia to upstream big-endian fix No PORTREVISION bump because powerpc*/sparc64 don't have a working lang/rust, anyway. Approved by: ports-secteam blanket (to simplify future MFHs) Modified: branches/2018Q2/www/firefox/files/patch-bug1144632 Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/firefox/files/patch-bug1144632 ============================================================================== --- branches/2018Q2/www/firefox/files/patch-bug1144632 Fri May 25 01:00:36 2018 (r470817) +++ branches/2018Q2/www/firefox/files/patch-bug1144632 Fri May 25 01:01:53 2018 (r470818) @@ -1,23 +1,100 @@ -Revert bug 1323303 to unbreak build on big-endian architectures. +commit 7e0038706036 +Author: Lee Salzman +Date: Thu May 24 14:50:31 2018 -0400 -diff --git toolkit/moz.configure toolkit/moz.configure -index 67fcbc39d075..c117fd11a358 100644 ---- toolkit/moz.configure -+++ toolkit/moz.configure -@@ -1032,11 +1032,11 @@ add_old_configure_assignment('NECKO_PROTOCOLS', necko_protocols) - # ============================================================== - option('--disable-skia', help='Disable use of Skia') + Bug 1144632 - fix big-endian Skia builds. r=rhunt + + MozReview-Commit-ID: JQivGBE45qy +--- + gfx/skia/skia/include/core/SkColorPriv.h | 15 ++++----------- + gfx/skia/skia/include/core/SkImageInfo.h | 2 +- + gfx/skia/skia/include/gpu/GrTypes.h | 5 +---- + gfx/skia/skia/src/core/SkColorData.h | 15 ++++----------- + 4 files changed, 10 insertions(+), 27 deletions(-) + +diff --git gfx/skia/skia/include/core/SkColorPriv.h gfx/skia/skia/include/core/SkColorPriv.h +index 0cd02e8034062..8a7f1501ba434 100644 +--- gfx/skia/skia/include/core/SkColorPriv.h ++++ gfx/skia/skia/include/core/SkColorPriv.h +@@ -55,17 +55,10 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) { + * Here we enforce this constraint. + */ --@depends('--disable-skia') --def skia(value): -- if not value: -- die('--disable-skia is not supported anymore') -- else: -+@depends('--disable-skia', target) -+def skia(value, target): -+ if value.origin == 'default' and target.endianness == 'big': -+ return None -+ if value: - return True +-#ifdef SK_CPU_BENDIAN +- #define SK_RGBA_R32_SHIFT 24 +- #define SK_RGBA_G32_SHIFT 16 +- #define SK_RGBA_B32_SHIFT 8 +- #define SK_RGBA_A32_SHIFT 0 +-#else +- #define SK_RGBA_R32_SHIFT 0 +- #define SK_RGBA_G32_SHIFT 8 +- #define SK_RGBA_B32_SHIFT 16 +- #define SK_RGBA_A32_SHIFT 24 +-#endif ++#define SK_RGBA_R32_SHIFT 0 ++#define SK_RGBA_G32_SHIFT 8 ++#define SK_RGBA_B32_SHIFT 16 ++#define SK_RGBA_A32_SHIFT 24 - set_config('MOZ_ENABLE_SKIA', skia) + #define SkGetPackedA32(packed) ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24) + #define SkGetPackedR32(packed) ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24) +diff --git gfx/skia/skia/include/core/SkImageInfo.h gfx/skia/skia/include/core/SkImageInfo.h +index ece47f5c418a8..5b36ba1e4518a 100644 +--- gfx/skia/skia/include/core/SkImageInfo.h ++++ gfx/skia/skia/include/core/SkImageInfo.h +@@ -84,7 +84,7 @@ enum SkColorType { + #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) + kN32_SkColorType = kRGBA_8888_SkColorType, + #else +- #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order" ++ kN32_SkColorType = kBGRA_8888_SkColorType, + #endif + }; + +diff --git gfx/skia/skia/include/gpu/GrTypes.h gfx/skia/skia/include/gpu/GrTypes.h +index c88d9ee63b38f..fdca5f29e527b 100644 +--- gfx/skia/skia/include/gpu/GrTypes.h ++++ gfx/skia/skia/include/gpu/GrTypes.h +@@ -344,15 +344,12 @@ enum GrPixelConfig { + static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1; + + // Aliases for pixel configs that match skia's byte order. +-#ifndef SK_CPU_LENDIAN +- #error "Skia gpu currently assumes little endian" +-#endif + #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) + static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; + #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) + static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig; + #else +- #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format." ++ static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; + #endif + + /** +diff --git gfx/skia/skia/src/core/SkColorData.h gfx/skia/skia/src/core/SkColorData.h +index 3fc0113105a5b..43ae01eeaee3e 100644 +--- gfx/skia/skia/src/core/SkColorData.h ++++ gfx/skia/skia/src/core/SkColorData.h +@@ -32,17 +32,10 @@ + * Here we enforce this constraint. + */ + +-#ifdef SK_CPU_BENDIAN +- #define SK_BGRA_B32_SHIFT 24 +- #define SK_BGRA_G32_SHIFT 16 +- #define SK_BGRA_R32_SHIFT 8 +- #define SK_BGRA_A32_SHIFT 0 +-#else +- #define SK_BGRA_B32_SHIFT 0 +- #define SK_BGRA_G32_SHIFT 8 +- #define SK_BGRA_R32_SHIFT 16 +- #define SK_BGRA_A32_SHIFT 24 +-#endif ++#define SK_BGRA_B32_SHIFT 0 ++#define SK_BGRA_G32_SHIFT 8 ++#define SK_BGRA_R32_SHIFT 16 ++#define SK_BGRA_A32_SHIFT 24 + + #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA) + #error "can't define PMCOLOR to be RGBA and BGRA" From owner-svn-ports-branches@freebsd.org Fri May 25 14:01:49 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7CA5CEE31E3; Fri, 25 May 2018 14:01:49 +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 2C57082BF6; Fri, 25 May 2018 14:01:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0E3C921C09; Fri, 25 May 2018 14:01:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4PE1mcp019655; Fri, 25 May 2018 14:01:48 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4PE1m5K019651; Fri, 25 May 2018 14:01:48 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805251401.w4PE1m5K019651@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 25 May 2018 14:01:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470841 - in branches/2018Q2/security: ca_root_nss nss X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/security: ca_root_nss nss X-SVN-Commit-Revision: 470841 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.26 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, 25 May 2018 14:01:49 -0000 Author: jbeich Date: Fri May 25 14:01:47 2018 New Revision: 470841 URL: https://svnweb.freebsd.org/changeset/ports/470841 Log: MFH: r470840 security/nss: update to 3.37.1 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.37.1_release_notes Changes: https://hg.mozilla.org/projects/nss/shortlog/NSS_3_37_1_RTM ABI: https://abi-laboratory.pro/tracker/timeline/nss/ Approved by: ports-secteam blanket (required by Firefox 61) Modified: branches/2018Q2/security/ca_root_nss/Makefile branches/2018Q2/security/ca_root_nss/distinfo branches/2018Q2/security/nss/Makefile branches/2018Q2/security/nss/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/security/ca_root_nss/Makefile ============================================================================== --- branches/2018Q2/security/ca_root_nss/Makefile Fri May 25 14:00:41 2018 (r470840) +++ branches/2018Q2/security/ca_root_nss/Makefile Fri May 25 14:01:47 2018 (r470841) @@ -32,7 +32,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.37 +VERSION_NSS= 3.37.1 #NSS_SUFFIX= -with-ckbi-1.98 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl Modified: branches/2018Q2/security/ca_root_nss/distinfo ============================================================================== --- branches/2018Q2/security/ca_root_nss/distinfo Fri May 25 14:00:41 2018 (r470840) +++ branches/2018Q2/security/ca_root_nss/distinfo Fri May 25 14:01:47 2018 (r470841) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525452051 -SHA256 (nss-3.37.tar.gz) = 5821969e85d241833e96cb82bd4211ddea6d87003f2cccce25e0eab4aefa6268 -SIZE (nss-3.37.tar.gz) = 23027581 +TIMESTAMP = 1526459045 +SHA256 (nss-3.37.1.tar.gz) = 097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405 +SIZE (nss-3.37.1.tar.gz) = 23034142 Modified: branches/2018Q2/security/nss/Makefile ============================================================================== --- branches/2018Q2/security/nss/Makefile Fri May 25 14:00:41 2018 (r470840) +++ branches/2018Q2/security/nss/Makefile Fri May 25 14:01:47 2018 (r470841) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.37 +PORTVERSION= 3.37.1 #DISTVERSIONSUFFIX= -with-ckbi-1.98 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: branches/2018Q2/security/nss/distinfo ============================================================================== --- branches/2018Q2/security/nss/distinfo Fri May 25 14:00:41 2018 (r470840) +++ branches/2018Q2/security/nss/distinfo Fri May 25 14:01:47 2018 (r470841) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525452051 -SHA256 (nss-3.37.tar.gz) = 5821969e85d241833e96cb82bd4211ddea6d87003f2cccce25e0eab4aefa6268 -SIZE (nss-3.37.tar.gz) = 23027581 +TIMESTAMP = 1526459045 +SHA256 (nss-3.37.1.tar.gz) = 097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405 +SIZE (nss-3.37.1.tar.gz) = 23034142 From owner-svn-ports-branches@freebsd.org Fri May 25 16:50:17 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 CF45FEEDD30; Fri, 25 May 2018 16:50:17 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 78EEB6930A; Fri, 25 May 2018 16:50:17 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 55F66236DE; Fri, 25 May 2018 16:50:17 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4PGoH7G004444; Fri, 25 May 2018 16:50:17 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4PGoGai004442; Fri, 25 May 2018 16:50:16 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201805251650.w4PGoGai004442@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 25 May 2018 16:50:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470852 - branches/2018Q2/devel/awscli X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2018Q2/devel/awscli X-SVN-Commit-Revision: 470852 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.26 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, 25 May 2018 16:50:18 -0000 Author: feld Date: Fri May 25 16:50:16 2018 New Revision: 470852 URL: https://svnweb.freebsd.org/changeset/ports/470852 Log: MFH: r466130 devel/awscli: Update 1.4.63 -> 1.4.68 Modified: branches/2018Q2/devel/awscli/Makefile branches/2018Q2/devel/awscli/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/devel/awscli/Makefile ============================================================================== --- branches/2018Q2/devel/awscli/Makefile Fri May 25 16:31:21 2018 (r470851) +++ branches/2018Q2/devel/awscli/Makefile Fri May 25 16:50:16 2018 (r470852) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= awscli -PORTVERSION= 1.14.63 +PORTVERSION= 1.14.68 CATEGORIES= devel MASTER_SITES= CHEESESHOP @@ -12,7 +12,7 @@ COMMENT= Universal Command Line Interface for Amazon W LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.9.16:devel/py-botocore@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.9.21:devel/py-botocore@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.12:net/py-s3transfer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${PY_FLAVOR} \ Modified: branches/2018Q2/devel/awscli/distinfo ============================================================================== --- branches/2018Q2/devel/awscli/distinfo Fri May 25 16:31:21 2018 (r470851) +++ branches/2018Q2/devel/awscli/distinfo Fri May 25 16:50:16 2018 (r470852) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522013564 -SHA256 (awscli-1.14.63.tar.gz) = 9938aabc2b442ddf49d94a63b1ea2b36086280982796029c63c9d966dd8addf5 -SIZE (awscli-1.14.63.tar.gz) = 588003 +TIMESTAMP = 1522526554 +SHA256 (awscli-1.14.68.tar.gz) = 4aeca66dff5d1dee82d4af13da148a6b7989238441c42a6d70900a544cb530ae +SIZE (awscli-1.14.68.tar.gz) = 588249 From owner-svn-ports-branches@freebsd.org Fri May 25 17:13: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 5C64EEEE45E; Fri, 25 May 2018 17:13:46 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 047DC6A114; Fri, 25 May 2018 17:13:46 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D7EEC23C1B; Fri, 25 May 2018 17:13:45 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4PHDjHA020290; Fri, 25 May 2018 17:13:45 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4PHDiY2020283; Fri, 25 May 2018 17:13:44 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201805251713.w4PHDiY2020283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 25 May 2018 17:13:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470854 - in branches/2018Q2/graphics/ufraw: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q2/graphics/ufraw: . files X-SVN-Commit-Revision: 470854 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.26 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, 25 May 2018 17:13:46 -0000 Author: feld Date: Fri May 25 17:13:44 2018 New Revision: 470854 URL: https://svnweb.freebsd.org/changeset/ports/470854 Log: MFH: r466382 Move ufraw from sourceforge to github On the same time recover updates done in development branch and never released - Add WB for multiple new cameras : FUJIFILM X-T2, PENTAX K-1, Panasonic DMC-FZ300/DMC-FZ330, Canon PowerShot G7 X Mark II, Canon EOS M10, Canon EOS 700D, Canon EOS 80D, NIKON D200, FUJIFILM X-T10, PENTAX K-S2, NIKON D5500, NIKON D810, FUJIFILM X100T, Canon PowerShot G5 X, Panasonic DMC-LF1, SONY RX10M2, Canon EOS M2, Canon PowerShot S120, FUJIFILM X-M1, OLYMPUS E-M10 Mark II, etc - multiple bug fixes : memory leak, etc Remove existing patches since they coming from upstream and are now provided by default in the distfile. Incorporate the patched made by the debian project, including a fix for the CVE-2015-8366. Security: CVE-2015-8366 Added: branches/2018Q2/graphics/ufraw/files/patch-ufraw__conf.c - copied unchanged from r466382, head/graphics/ufraw/files/patch-ufraw__conf.c Modified: branches/2018Q2/graphics/ufraw/Makefile branches/2018Q2/graphics/ufraw/distinfo branches/2018Q2/graphics/ufraw/files/patch-dcraw.cc branches/2018Q2/graphics/ufraw/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/graphics/ufraw/Makefile ============================================================================== --- branches/2018Q2/graphics/ufraw/Makefile Fri May 25 17:07:35 2018 (r470853) +++ branches/2018Q2/graphics/ufraw/Makefile Fri May 25 17:13:44 2018 (r470854) @@ -3,9 +3,8 @@ PORTNAME= ufraw PORTVERSION= 0.22 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= rodrigo@FreeBSD.org COMMENT= Read and manipulate raw images from various digital cameras @@ -14,15 +13,17 @@ LICENSE= GPLv2 LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng.so:graphics/png \ - liblcms2.so:graphics/lcms2 + liblcms2.so:graphics/lcms2 \ + libjasper.so:graphics/jasper \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-extras -USES= desktop-file-utils gettext gmake jpeg pkgconfig +USES= gettext gmake jpeg pkgconfig autoreconf CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib -PC_FALSE= cinepaint OPTIONS_DEFINE= CONTRAST DST EXIV2 LENSFUN FITS GIMP GTK2 GNOME OPTIONS_DEFAULT=CONTRAST EXIV2 LENSFUN GTK2 @@ -33,6 +34,13 @@ DST_DESC= Use local time for timestamps FITS_DESC= FITS output support GIMP_DESC= Install GIMP plugin +USE_GITHUB= yes +GH_ACCOUNT= sergiomb2 +GH_PROJECT= ufraw +GH_TAGNAME= 6d3259a + +USE_GNOME+=glib20 gtk20 cairo gdkpixbuf2 + CONTRAST_CONFIGURE_ENABLE= contrast DST_CONFIGURE_ENABLE= dst-correction EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 @@ -51,17 +59,12 @@ GNOME_USE= GNOME=gconf2 GNOME_CONFIGURE_ENABLE= mime GNOME_VARS= CATEGORIES+=gnome GCONF_SCHEMAS=${PORTNAME}.schemas -post-patch: - @${REINPLACE_CMD} -e '18s|^$$|#include |' \ - ${WRKSRC}/dcraw.h -# Fix GConf2 schemas installation path; unconditionalize installation of -# .desktop file; avoid conflict with `graphics/dcraw' (rename the binary) - @${REINPLACE_CMD} -e '/@schemasdir/s|datadir|sysconfdir| ; \ - /@app/s|@INSTALL_MIME_TRUE@|| ; \ - s|dcraw\$$(EXEEXT)|${PORTNAME}-&|' ${WRKSRC}/Makefile.in -.for i in ${PC_FALSE} - @${REINPLACE_CMD} -e '/PKG_CONFIG.*${i}/s|$$PKG_CONFIG|${FALSE}|' \ - ${WRKSRC}/configure -.endfor - +#post-patch: +# echo "START REPLACE" ; \ +# ${REINPLACE_CMD} -e '18s|^$$|#include |' \ +# ${WRKSRC}/dcraw.h +## Fix GConf2 schemas installation path; unconditionalize installation of +## .desktop file; avoid conflict with `graphics/dcraw' (rename the binary) +# ${REINPLACE_CMD} -e '/schemasdir/s|datadir|sysconfdir|' ${WRKSRC}/Makefile.am +# .include Modified: branches/2018Q2/graphics/ufraw/distinfo ============================================================================== --- branches/2018Q2/graphics/ufraw/distinfo Fri May 25 17:07:35 2018 (r470853) +++ branches/2018Q2/graphics/ufraw/distinfo Fri May 25 17:13:44 2018 (r470854) @@ -1,2 +1,3 @@ -SHA256 (ufraw-0.22.tar.gz) = f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e -SIZE (ufraw-0.22.tar.gz) = 1103554 +TIMESTAMP = 1521620815 +SHA256 (sergiomb2-ufraw-0.22-6d3259a_GH0.tar.gz) = 4a3b415bf86c7cadc71350a8f0a206cef79bb3c22a6a794a9d9894d6bc7ec6dc +SIZE (sergiomb2-ufraw-0.22-6d3259a_GH0.tar.gz) = 870086 Modified: branches/2018Q2/graphics/ufraw/files/patch-dcraw.cc ============================================================================== --- branches/2018Q2/graphics/ufraw/files/patch-dcraw.cc Fri May 25 17:07:35 2018 (r470853) +++ branches/2018Q2/graphics/ufraw/files/patch-dcraw.cc Fri May 25 17:13:44 2018 (r470854) @@ -1,30 +1,23 @@ ---- dcraw.cc.orig 2015-06-16 03:58:38 UTC +--- dcraw.cc.orig 2018-04-03 22:16:35 UTC +++ dcraw.cc -@@ -9240,13 +9240,13 @@ canon_a5: - filters = 0x16161616; - } - if (make[0] == 'O') { -- i = find_green (12, 32, 1188864, 3576832); -- c = find_green (12, 32, 2383920, 2387016); -- if (abs(i) < abs(c)) { -- SWAP(i,c); -+ float g1 = find_green (12, 32, 1188864, 3576832); -+ float g2 = find_green (12, 32, 2383920, 2387016); -+ if (fabsf(g1) < fabsf(g2)) { -+ SWAP(g1,g2); - load_flags = 24; - } -- if ((int) i < 0) filters = 0x61616161; -+ if (g1 < 0) filters = 0x61616161; - } - } else if (fsize == 5869568) { - if (!timestamp && minolta_z2()) { -@@ -10073,7 +10073,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full) - strncpy (th->desc, desc, 512); - strncpy (th->make, make, 64); - strncpy (th->model, model, 64); -- strcpy (th->soft, "dcraw v"DCRAW_VERSION); -+ strcpy (th->soft, "dcraw v" DCRAW_VERSION); - t = localtime (×tamp); - sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d", - t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec); +@@ -2287,7 +2287,7 @@ void CLASS quicktake_100_load_raw() + + void CLASS kodak_radc_load_raw() + { +- static const char src[] = { ++ static const signed char src[] = { + 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8, + 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8, + 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8, +@@ -3017,7 +3017,10 @@ void CLASS smal_decode_segment (unsigned + diff = diff ? -diff : 0x80; + if (ftell(ifp) + 12 >= (int) seg[1][1]) + diff = 0; +- raw_image[pix] = pred[pix & 1] += diff; ++ if(pix>=raw_width*raw_height) ++ derror(); ++ else ++ raw_image[pix] = pred[pix & 1] += diff; + if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2; + } + maximum = 0xff; Copied: branches/2018Q2/graphics/ufraw/files/patch-ufraw__conf.c (from r466382, head/graphics/ufraw/files/patch-ufraw__conf.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/graphics/ufraw/files/patch-ufraw__conf.c Fri May 25 17:13:44 2018 (r470854, copy of r466382, head/graphics/ufraw/files/patch-ufraw__conf.c) @@ -0,0 +1,11 @@ +--- ufraw_conf.c.orig 2016-11-13 04:00:05 UTC ++++ ufraw_conf.c +@@ -138,7 +138,7 @@ const conf_data conf_default = { + #elif HAVE_GIMP_2_4 + "gimp", /* remoteGimpCommand */ + #else +- "gimp-remote", /* remoteGimpCommand */ ++ "gimp", /* remoteGimpCommand */ + #endif + + /* EXIF data */ Modified: branches/2018Q2/graphics/ufraw/pkg-plist ============================================================================== --- branches/2018Q2/graphics/ufraw/pkg-plist Fri May 25 17:07:35 2018 (r470853) +++ branches/2018Q2/graphics/ufraw/pkg-plist Fri May 25 17:13:44 2018 (r470854) @@ -1,10 +1,8 @@ +bin/dcraw bin/nikon-curve +bin/ufraw bin/ufraw-batch -bin/ufraw-dcraw -%%GIMP%%libexec/gimp/2.2/plug-ins/ufraw-gimp man/man1/ufraw.1.gz -share/appdata/ufraw.appdata.xml -share/applications/ufraw.desktop share/locale/ca/LC_MESSAGES/ufraw.mo share/locale/cs/LC_MESSAGES/ufraw.mo share/locale/da/LC_MESSAGES/ufraw.mo @@ -25,4 +23,3 @@ share/locale/sv/LC_MESSAGES/ufraw.mo share/locale/zh_CN/LC_MESSAGES/ufraw.mo share/locale/zh_TW/LC_MESSAGES/ufraw.mo share/pixmaps/ufraw.png -%%GTK2%%bin/ufraw From owner-svn-ports-branches@freebsd.org Fri May 25 17:29:03 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C31E4EEEB62; Fri, 25 May 2018 17:29:03 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 74C456ABB6; Fri, 25 May 2018 17:29:03 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51F4223DE5; Fri, 25 May 2018 17:29:03 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4PHT3MA026704; Fri, 25 May 2018 17:29:03 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4PHT201026703; Fri, 25 May 2018 17:29:02 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201805251729.w4PHT201026703@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 25 May 2018 17:29:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470855 - branches/2018Q2/sysutils/android-file-transfer X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2018Q2/sysutils/android-file-transfer X-SVN-Commit-Revision: 470855 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.26 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, 25 May 2018 17:29:04 -0000 Author: feld Date: Fri May 25 17:29:02 2018 New Revision: 470855 URL: https://svnweb.freebsd.org/changeset/ports/470855 Log: MFH: r467116 sysutils/android-file-transfer: update to 3.3 Changes: https://github.com/whoozle/android-file-transfer-linux/releases/tag/v3.3 Modified: branches/2018Q2/sysutils/android-file-transfer/Makefile branches/2018Q2/sysutils/android-file-transfer/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/sysutils/android-file-transfer/Makefile ============================================================================== --- branches/2018Q2/sysutils/android-file-transfer/Makefile Fri May 25 17:13:44 2018 (r470854) +++ branches/2018Q2/sysutils/android-file-transfer/Makefile Fri May 25 17:29:02 2018 (r470855) @@ -2,8 +2,8 @@ PORTNAME= android-file-transfer DISTVERSIONPREFIX= v -DISTVERSION= 3.2 -PORTREVISION?= 2 +DISTVERSION= 3.3 +PORTREVISION?= 0 CATEGORIES= sysutils MAINTAINER= jbeich@FreeBSD.org @@ -17,6 +17,7 @@ GH_PROJECT= ${PORTNAME}-linux USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig CMAKE_ON= USB_BACKEND_LIBUSB +PLIST_FILES= "@comment lib/libmtp-ng-static.a" OPTIONS_DEFAULT=CLI FUSE OPTIONS_MULTI= COMP @@ -41,7 +42,8 @@ FUSE_PLIST_FILES=bin/aft-mtp-mount QT_CMAKE_BOOL= BUILD_QT_UI QT_PLIST_FILES= bin/android-file-transfer \ share/applications/android-file-transfer.desktop \ - share/icons/hicolor/128x128/apps/android-file-transfer.png + share/icons/hicolor/512x512/apps/android-file-transfer.png \ + share/metainfo/android-file-transfer.appdata.xml QT4_USE= QT4=qmake_build,moc_build,rcc_build,uic_build,corelib,gui QT4_CMAKE_ON= -DDESIRED_QT_VERSION:STRING=4 Modified: branches/2018Q2/sysutils/android-file-transfer/distinfo ============================================================================== --- branches/2018Q2/sysutils/android-file-transfer/distinfo Fri May 25 17:13:44 2018 (r470854) +++ branches/2018Q2/sysutils/android-file-transfer/distinfo Fri May 25 17:29:02 2018 (r470855) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498212490 -SHA256 (whoozle-android-file-transfer-linux-v3.2_GH0.tar.gz) = 56d0ff8b5197a9089dd30533006fafb9a1b1c7a1e310a78d359ff00145107bcf -SIZE (whoozle-android-file-transfer-linux-v3.2_GH0.tar.gz) = 548831 +TIMESTAMP = 1521888607 +SHA256 (whoozle-android-file-transfer-linux-v3.3_GH0.tar.gz) = fa33ddf79cb5e6e62248868534c7b54096e67613ae1788a243617348a6d839a0 +SIZE (whoozle-android-file-transfer-linux-v3.3_GH0.tar.gz) = 551320 From owner-svn-ports-branches@freebsd.org Fri May 25 17:45: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 C3697EEF165; Fri, 25 May 2018 17:45:24 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5A5246B8AE; Fri, 25 May 2018 17:45:24 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 37A5E2411A; Fri, 25 May 2018 17:45:24 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4PHjOQV037424; Fri, 25 May 2018 17:45:24 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4PHjNvE037420; Fri, 25 May 2018 17:45:23 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201805251745.w4PHjNvE037420@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 25 May 2018 17:45:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470857 - in branches/2018Q2/lang: python-doc-html python36 X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q2/lang: python-doc-html python36 X-SVN-Commit-Revision: 470857 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.26 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, 25 May 2018 17:45:25 -0000 Author: feld Date: Fri May 25 17:45:23 2018 New Revision: 470857 URL: https://svnweb.freebsd.org/changeset/ports/470857 Log: MFH: r466295 Update to 3.6.5 Changes: https://docs.python.org/3.6/whatsnew/changelog.html PR: 227090 Exp-run by: antoine Modified: branches/2018Q2/lang/python-doc-html/distinfo branches/2018Q2/lang/python36/Makefile.version branches/2018Q2/lang/python36/distinfo branches/2018Q2/lang/python36/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/lang/python-doc-html/distinfo ============================================================================== --- branches/2018Q2/lang/python-doc-html/distinfo Fri May 25 17:40:24 2018 (r470856) +++ branches/2018Q2/lang/python-doc-html/distinfo Fri May 25 17:45:23 2018 (r470857) @@ -1,4 +1,4 @@ -TIMESTAMP = 1518604216 +TIMESTAMP = 1522419984 SHA256 (python/python-2.7.14-docs-html.tar.bz2) = 624ef76fd4c94631f2c5ebf890dd44930f2fbcae4176c4879f457d5abfe3d483 SIZE (python/python-2.7.14-docs-html.tar.bz2) = 4604956 SHA256 (python/python-2.7.14-docs-pdf-a4.tar.bz2) = fa4f4a437242e479cc210fd74a9e9f7a28a4420e1d8267f108a8b20198bb14db @@ -15,11 +15,11 @@ SHA256 (python/python-3.4.8-docs-pdf-letter.tar.bz2) = SIZE (python/python-3.4.8-docs-pdf-letter.tar.bz2) = 11993776 SHA256 (python/python-3.4.8-docs-text.tar.bz2) = cbf9681c85f37144ffadee5a3e7a3506831c29b7310fa063ad2d4d97a1a33d2e SIZE (python/python-3.4.8-docs-text.tar.bz2) = 1988981 -SHA256 (python/python-3.6.4-docs-html.tar.bz2) = 76ea43184af64053ad451e0eb1fddb204c718cda12ab36d1ef38f11a5a85baa0 -SIZE (python/python-3.6.4-docs-html.tar.bz2) = 5955729 -SHA256 (python/python-3.6.4-docs-pdf-a4.tar.bz2) = 43000dc270d20ba409ca96ec309d14b80db2eda6a638a41984ed735eaf85d4bb -SIZE (python/python-3.6.4-docs-pdf-a4.tar.bz2) = 13550072 -SHA256 (python/python-3.6.4-docs-pdf-letter.tar.bz2) = cf9ac5cbc1d7b728cede79baae02917f6df83eaaf2383f4b5638cbce105256c5 -SIZE (python/python-3.6.4-docs-pdf-letter.tar.bz2) = 13549543 -SHA256 (python/python-3.6.4-docs-text.tar.bz2) = be7a4c533b209297b50f221f88d2a553ac80f085168d6152b12510874d1f8751 -SIZE (python/python-3.6.4-docs-text.tar.bz2) = 2114224 +SHA256 (python/python-3.6.5-docs-html.tar.bz2) = bb239691e3ace920e1692eef48c8d8e567407b30434afe462bc6ebdb6544d9d2 +SIZE (python/python-3.6.5-docs-html.tar.bz2) = 5970853 +SHA256 (python/python-3.6.5-docs-pdf-a4.tar.bz2) = aaffb3ad721395309e148e58be37fe2058dbd41d2f904d018d517f03f61453af +SIZE (python/python-3.6.5-docs-pdf-a4.tar.bz2) = 13687656 +SHA256 (python/python-3.6.5-docs-pdf-letter.tar.bz2) = 487e6f146e072d0ec35ad1a5d1f3dc202d4842c3fab2d585431bb8fa0f8b297b +SIZE (python/python-3.6.5-docs-pdf-letter.tar.bz2) = 13687120 +SHA256 (python/python-3.6.5-docs-text.tar.bz2) = 5c832942ef30cad209f91a00812890c8ac4d2681be4f05f01026242c6328316d +SIZE (python/python-3.6.5-docs-text.tar.bz2) = 2136332 Modified: branches/2018Q2/lang/python36/Makefile.version ============================================================================== --- branches/2018Q2/lang/python36/Makefile.version Fri May 25 17:40:24 2018 (r470856) +++ branches/2018Q2/lang/python36/Makefile.version Fri May 25 17:45:23 2018 (r470857) @@ -1,4 +1,4 @@ # Mk/Uses/python.mk includes this file, don't remove it! # $FreeBSD$ -PYTHON_PORTVERSION= 3.6.4 +PYTHON_PORTVERSION= 3.6.5 Modified: branches/2018Q2/lang/python36/distinfo ============================================================================== --- branches/2018Q2/lang/python36/distinfo Fri May 25 17:40:24 2018 (r470856) +++ branches/2018Q2/lang/python36/distinfo Fri May 25 17:45:23 2018 (r470857) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513768972 -SHA256 (python/Python-3.6.4.tar.xz) = 159b932bf56aeaa76fd66e7420522d8c8853d486b8567c459b84fe2ed13bcaba -SIZE (python/Python-3.6.4.tar.xz) = 16992824 +TIMESTAMP = 1522342511 +SHA256 (python/Python-3.6.5.tar.xz) = f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6 +SIZE (python/Python-3.6.5.tar.xz) = 17049912 Modified: branches/2018Q2/lang/python36/pkg-plist ============================================================================== --- branches/2018Q2/lang/python36/pkg-plist Fri May 25 17:40:24 2018 (r470856) +++ branches/2018Q2/lang/python36/pkg-plist Fri May 25 17:45:23 2018 (r470857) @@ -2112,8 +2112,8 @@ lib/python%%XYDOT%%/ensurepip/__pycache__/__main__.cpy lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.pyc -lib/python%%XYDOT%%/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl -lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl +lib/python%%XYDOT%%/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl +lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl lib/python%%XYDOT%%/ensurepip/_uninstall.py lib/python%%XYDOT%%/enum.py lib/python%%XYDOT%%/filecmp.py @@ -2484,6 +2484,9 @@ lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_percolator.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_percolator.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_percolator.cpython-%%XY%%.pyc +lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_pyparse.cpython-%%XY%%.opt-1.pyc +lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_pyparse.cpython-%%XY%%.opt-2.pyc +lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_pyparse.cpython-%%XY%%.pyc lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_query.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_query.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_query.cpython-%%XY%%.pyc @@ -2553,6 +2556,7 @@ lib/python%%XYDOT%%/idlelib/idle_test/test_paragraph.p lib/python%%XYDOT%%/idlelib/idle_test/test_parenmatch.py lib/python%%XYDOT%%/idlelib/idle_test/test_pathbrowser.py lib/python%%XYDOT%%/idlelib/idle_test/test_percolator.py +lib/python%%XYDOT%%/idlelib/idle_test/test_pyparse.py lib/python%%XYDOT%%/idlelib/idle_test/test_query.py lib/python%%XYDOT%%/idlelib/idle_test/test_redirector.py lib/python%%XYDOT%%/idlelib/idle_test/test_replace.py @@ -3396,15 +3400,15 @@ lib/python%%XYDOT%%/test/__pycache__/memory_watchdog.c lib/python%%XYDOT%%/test/__pycache__/mock_socket.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/mock_socket.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/mock_socket.cpython-%%XY%%.pyc -lib/python%%XYDOT%%/test/__pycache__/mod_generics_cache.cpython-36.opt-1.pyc -lib/python%%XYDOT%%/test/__pycache__/mod_generics_cache.cpython-36.opt-2.pyc -lib/python%%XYDOT%%/test/__pycache__/mod_generics_cache.cpython-36.pyc +lib/python%%XYDOT%%/test/__pycache__/mod_generics_cache.cpython-%%XY%%.opt-1.pyc +lib/python%%XYDOT%%/test/__pycache__/mod_generics_cache.cpython-%%XY%%.opt-2.pyc +lib/python%%XYDOT%%/test/__pycache__/mod_generics_cache.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/__pycache__/mp_fork_bomb.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/mp_fork_bomb.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/mp_fork_bomb.cpython-%%XY%%.pyc -lib/python%%XYDOT%%/test/__pycache__/mp_preload.cpython-36.opt-1.pyc -lib/python%%XYDOT%%/test/__pycache__/mp_preload.cpython-36.opt-2.pyc -lib/python%%XYDOT%%/test/__pycache__/mp_preload.cpython-36.pyc +lib/python%%XYDOT%%/test/__pycache__/mp_preload.cpython-%%XY%%.opt-1.pyc +lib/python%%XYDOT%%/test/__pycache__/mp_preload.cpython-%%XY%%.opt-2.pyc +lib/python%%XYDOT%%/test/__pycache__/mp_preload.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/__pycache__/multibytecodec_support.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/multibytecodec_support.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/multibytecodec_support.cpython-%%XY%%.pyc From owner-svn-ports-branches@freebsd.org Fri May 25 17:46:43 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 3F129EEF213; Fri, 25 May 2018 17:46:43 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D8E486B9E1; Fri, 25 May 2018 17:46:42 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B54C224135; Fri, 25 May 2018 17:46:42 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4PHkggJ037737; Fri, 25 May 2018 17:46:42 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4PHkfMU037732; Fri, 25 May 2018 17:46:41 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201805251746.w4PHkfMU037732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 25 May 2018 17:46:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470858 - in branches/2018Q2/lang: python-doc-html python27 python27/files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q2/lang: python-doc-html python27 python27/files X-SVN-Commit-Revision: 470858 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.26 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, 25 May 2018 17:46:43 -0000 Author: feld Date: Fri May 25 17:46:41 2018 New Revision: 470858 URL: https://svnweb.freebsd.org/changeset/ports/470858 Log: MFH: r468566 r469635 lang/python27: Fix build with LibreSSL 2.7 PR: 226883 Submitted by: Charlie Li Approved by: python (koobs) Differential Revision: https://reviews.freebsd.org/D14837 - Update to 2.7.15(include security fix) PR: 228028 Submitted by: wen@(myself) Exp-run by: antoine@ Deleted: branches/2018Q2/lang/python27/files/patch-issue30622 Modified: branches/2018Q2/lang/python-doc-html/distinfo branches/2018Q2/lang/python27/Makefile branches/2018Q2/lang/python27/Makefile.version branches/2018Q2/lang/python27/distinfo branches/2018Q2/lang/python27/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/lang/python-doc-html/distinfo ============================================================================== --- branches/2018Q2/lang/python-doc-html/distinfo Fri May 25 17:45:23 2018 (r470857) +++ branches/2018Q2/lang/python-doc-html/distinfo Fri May 25 17:46:41 2018 (r470858) @@ -1,12 +1,12 @@ -TIMESTAMP = 1522419984 -SHA256 (python/python-2.7.14-docs-html.tar.bz2) = 624ef76fd4c94631f2c5ebf890dd44930f2fbcae4176c4879f457d5abfe3d483 -SIZE (python/python-2.7.14-docs-html.tar.bz2) = 4604956 -SHA256 (python/python-2.7.14-docs-pdf-a4.tar.bz2) = fa4f4a437242e479cc210fd74a9e9f7a28a4420e1d8267f108a8b20198bb14db -SIZE (python/python-2.7.14-docs-pdf-a4.tar.bz2) = 10810797 -SHA256 (python/python-2.7.14-docs-pdf-letter.tar.bz2) = 9e7c4db5a9c35a8b9c67b5d5c83fe41382e6e87a0cbc7ed0e1bc5fcd5e3834d9 -SIZE (python/python-2.7.14-docs-pdf-letter.tar.bz2) = 10809931 -SHA256 (python/python-2.7.14-docs-text.tar.bz2) = dec89643056f682f27c0f0af2b42e5eb9977ef04d9d91bc20eb229219dbcdf1b -SIZE (python/python-2.7.14-docs-text.tar.bz2) = 1614171 +TIMESTAMP = 1525595232 +SHA256 (python/python-2.7.15-docs-html.tar.bz2) = 5582aa8f59c2d5457ae87e266000f9ef75ed041a02fa72bd988a5169aae8ebde +SIZE (python/python-2.7.15-docs-html.tar.bz2) = 4627519 +SHA256 (python/python-2.7.15-docs-pdf-a4.tar.bz2) = f747ca034cae426876017c37dfac0648ae535ad0b95d1e3a27385feee602d956 +SIZE (python/python-2.7.15-docs-pdf-a4.tar.bz2) = 9429818 +SHA256 (python/python-2.7.15-docs-pdf-letter.tar.bz2) = 698413a74cfa5453a95a12ec34f6cc82e19e4ef53ebad4d736fe608d64f14267 +SIZE (python/python-2.7.15-docs-pdf-letter.tar.bz2) = 9429554 +SHA256 (python/python-2.7.15-docs-text.tar.bz2) = 92b32e57182b1b7110f71db43a8c49aaaf9833186d7ea1021fe3b166e7164535 +SIZE (python/python-2.7.15-docs-text.tar.bz2) = 1617467 SHA256 (python/python-3.4.8-docs-html.tar.bz2) = 62e810fba6cbb757216e556421c84142d51148b5bf7dc54c2b07478fc4e5661f SIZE (python/python-3.4.8-docs-html.tar.bz2) = 5495911 SHA256 (python/python-3.4.8-docs-pdf-a4.tar.bz2) = 5af92fe2cc242a2ff3e441fe33b9d68bb2eccc661e0fe3ea111edc68371480da Modified: branches/2018Q2/lang/python27/Makefile ============================================================================== --- branches/2018Q2/lang/python27/Makefile Fri May 25 17:45:23 2018 (r470857) +++ branches/2018Q2/lang/python27/Makefile Fri May 25 17:46:41 2018 (r470858) @@ -2,7 +2,6 @@ PORTNAME= python PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMESUFFIX= 27 Modified: branches/2018Q2/lang/python27/Makefile.version ============================================================================== --- branches/2018Q2/lang/python27/Makefile.version Fri May 25 17:45:23 2018 (r470857) +++ branches/2018Q2/lang/python27/Makefile.version Fri May 25 17:46:41 2018 (r470858) @@ -1,4 +1,4 @@ # Mk/Uses/python.mk includes this file, don't remove it! # $FreeBSD$ -PYTHON_PORTVERSION= 2.7.14 +PYTHON_PORTVERSION= 2.7.15 Modified: branches/2018Q2/lang/python27/distinfo ============================================================================== --- branches/2018Q2/lang/python27/distinfo Fri May 25 17:45:23 2018 (r470857) +++ branches/2018Q2/lang/python27/distinfo Fri May 25 17:46:41 2018 (r470858) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505677472 -SHA256 (python/Python-2.7.14.tar.xz) = 71ffb26e09e78650e424929b2b457b9c912ac216576e6bd9e7d204ed03296a66 -SIZE (python/Python-2.7.14.tar.xz) = 12576112 +TIMESTAMP = 1525598061 +SHA256 (python/Python-2.7.15.tar.xz) = 22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574 +SIZE (python/Python-2.7.15.tar.xz) = 12642436 Modified: branches/2018Q2/lang/python27/pkg-plist ============================================================================== --- branches/2018Q2/lang/python27/pkg-plist Fri May 25 17:45:23 2018 (r470857) +++ branches/2018Q2/lang/python27/pkg-plist Fri May 25 17:46:41 2018 (r470858) @@ -1436,8 +1436,8 @@ lib/python2.7/ensurepip/__init__.pyo lib/python2.7/ensurepip/__main__.py lib/python2.7/ensurepip/__main__.pyc lib/python2.7/ensurepip/__main__.pyo -lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl -lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl +lib/python2.7/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl +lib/python2.7/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl lib/python2.7/ensurepip/_uninstall.py lib/python2.7/ensurepip/_uninstall.pyc lib/python2.7/ensurepip/_uninstall.pyo @@ -3038,7 +3038,6 @@ lib/python2.7/test/seq_tests.py lib/python2.7/test/seq_tests.pyc lib/python2.7/test/seq_tests.pyo lib/python2.7/test/sgml_input.html -lib/python2.7/test/sha256.pem lib/python2.7/test/sortperf.py lib/python2.7/test/sortperf.pyc lib/python2.7/test/sortperf.pyo @@ -4322,6 +4321,7 @@ lib/python2.7/test/win_console_handler.py lib/python2.7/test/win_console_handler.pyc lib/python2.7/test/win_console_handler.pyo lib/python2.7/test/wrongcert.pem +lib/python2.7/test/xmltestdata/expat224_utf8_bug.xml lib/python2.7/test/xmltestdata/simple-ns.xml lib/python2.7/test/xmltestdata/simple.xml lib/python2.7/test/xmltestdata/test.xml From owner-svn-ports-branches@freebsd.org Fri May 25 17:53:55 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2687EEF703; Fri, 25 May 2018 17:53:55 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6E2C36C1D6; Fri, 25 May 2018 17:53:55 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 49731242C6; Fri, 25 May 2018 17:53:55 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4PHrtlk042998; Fri, 25 May 2018 17:53:55 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4PHrsS4042997; Fri, 25 May 2018 17:53:54 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201805251753.w4PHrsS4042997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 25 May 2018 17:53:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470860 - branches/2018Q2/net-im/py-matrix-synapse X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2018Q2/net-im/py-matrix-synapse X-SVN-Commit-Revision: 470860 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.26 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, 25 May 2018 17:53:55 -0000 Author: feld Date: Fri May 25 17:53:54 2018 New Revision: 470860 URL: https://svnweb.freebsd.org/changeset/ports/470860 Log: MFH: r470859 net-im/py-matrix-synapse: Update to 0.28.1 Security: https://matrix.org/blog/2018/05/01/security-update-synapse-0-28-1/ Modified: branches/2018Q2/net-im/py-matrix-synapse/Makefile branches/2018Q2/net-im/py-matrix-synapse/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/net-im/py-matrix-synapse/Makefile ============================================================================== --- branches/2018Q2/net-im/py-matrix-synapse/Makefile Fri May 25 17:50:07 2018 (r470859) +++ branches/2018Q2/net-im/py-matrix-synapse/Makefile Fri May 25 17:53:54 2018 (r470860) @@ -3,7 +3,7 @@ PORTNAME= matrix-synapse DISTVERSIONPREFIX= v -DISTVERSION= 0.27.2 +DISTVERSION= 0.28.1 PORTREVISION= 0 CATEGORIES= net-im python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2018Q2/net-im/py-matrix-synapse/distinfo ============================================================================== --- branches/2018Q2/net-im/py-matrix-synapse/distinfo Fri May 25 17:50:07 2018 (r470859) +++ branches/2018Q2/net-im/py-matrix-synapse/distinfo Fri May 25 17:53:54 2018 (r470860) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522156316 -SHA256 (matrix-org-synapse-v0.27.2_GH0.tar.gz) = 01080b19f66779335eb68d203c34a4caf681d3c3ed66a1ebd923dcd0833effa2 -SIZE (matrix-org-synapse-v0.27.2_GH0.tar.gz) = 932894 +TIMESTAMP = 1527270564 +SHA256 (matrix-org-synapse-v0.28.1_GH0.tar.gz) = 3f2238172341506614a1b6ba5275bee79b418fee639a7fef3917b1188c515e70 +SIZE (matrix-org-synapse-v0.28.1_GH0.tar.gz) = 944101 From owner-svn-ports-branches@freebsd.org Fri May 25 19:58:18 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 493FDEF2C8F; Fri, 25 May 2018 19:58:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D5FB471895; Fri, 25 May 2018 19:58:17 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id A4B5677FD; Fri, 25 May 2018 19:58:17 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 6B55A3E1; Fri, 25 May 2018 19:58:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id av0f-xRK8wqk; Fri, 25 May 2018 19:58:13 +0000 (UTC) Subject: Re: svn commit: r470852 - branches/2018Q2/devel/awscli DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 7A32C3DC To: Mark Felder , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org References: <201805251650.w4PGoGai004442@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Autocrypt: addr=bdrewery@FreeBSD.org; prefer-encrypt=mutual; keydata= xsBNBFJphmsBCADiFgmS4bIzwZijrS31SjEMzg+n5zNellgM+HkShwehpqCiyhXdWrvH6dTZ a6u50pbUIX7doTR7W7PQHCjCTqtpwvcj0eulZva+iHFp+XrbgSFHn+VVXgkYP2MFySyZRFab D2qqzJBEJofhpv4HvY6uQI5K99pMqKr1Z/lHqsijYYu4RH2OfwB5PinId7xeldzWEonVoCr+ rfxzO/UrgA6v/3layGZcKNHFjmc3NqoN1DXtdaEHqtjIozzbndVkH6lkFvIpIrI6i5ox8pwp VxsxLCr/4Musd5CWgHiet5kSw2SzNeA8FbxdLYCpXNVu+uBACEbCUP+CSNy3NVfEUxsBABEB AAHNJEJyeWFuIERyZXdlcnkgPGJkcmV3ZXJ5QEZyZWVCU0Qub3JnPsLAgAQTAQoAKgIbAwUL CQgHAwUVCgkICwUWAwIBAAIeAQIXgAIZAQUCWujOIgUJCmB7NwAKCRA113G7bkaXz/xpB/9b /UWIPbieY1IeIuHF2pyYPE7Hytkh3HVsxMA0F5Ma2AYQsXZZeKNKWrF7RPyDyDwUklLHJkhm k3EfClBbHxf08kMIm1vWCJRtgxic9knY/bzYGiWMpHjg3cSd1XfrYH1autYqTZAjDwIkgOjU dR//Tbn4V36sY7y2jz+kdMVWvK53U32aZqiwBbCn4DPe1wSZcUs17mV/0uZdIoGdj74B1orN A/0py5vHYo6HcbBNoaR8pKRLf5VZNRsxqGIMhTucx4SJWcHpuRBWYyvJSFzwvxdK4ZD4Yqoc kFGPVtOXktVMai9exrLvP3G77fKMu8DI6j4QRU4wCesnHuIfRPFuzsBNBFJphmsBCACiVFPf kNfaFtUSuY0395ueo/rMyHPGPQ2iwvERFCpeFGSQSgagpenNHLpFQKTg/dl6FOoST5tqyxMq fyHGHDzzU51bvA/IfaGoNi/BIhTe/toZNMRvpcI3PLjiGcnJnuwCCbAVOAGdb+t5cZtpNdOI cKYmrYG3u9RiBpe6dTF+qLrD/8Bs1wjhduQ8fcNNgnkXu8xDH4ZxY0lIc3QgvYWp9vimlQe6 iKjUd2/DX28ETZcD5h6pYV331KMPTrEI0p0yvFijUZce8c1XHFyL1j9sBAha5qpszJl6Uq5i LolhKRcGfcdmtD72vHQjUYglUyudSJUVyo2gMYjdbiFKzJulABEBAAHCwGUEGAEKAA8CGwwF AlrozigFCQpgez0ACgkQNddxu25Gl8+m5Af/R3VEdxNMAcDIes9ADhQyofj20SPV3eCJ3HYR OebTSuNdOudGt4AAyA8Ks94u9hiIp5IGsc6RDsT9W7O2vgXhd6eV3eiY5Oif5xLIYrIDVu1Y 1GyRxRrPEn/QOqDN6uFZCPwK1aOapGcYCrO9lB0gMuTVfgHanU61rgC9tMX0OoAOyRd+V3/M 8lDNhjJdF/IpO3SdYzKfkwduy4qamw4Gphcx/RfYQvYLq/eDkP8d50PphWdboqWBwNRHayro W/07OGzfxM5fJ5mBsXPQcO2QcRjkyHf6xCM6Hi1qQL4OnXMNE/ZTX0lnOj1/pH93TlzSHZMP TaiiA/MBD3vGsXBmBg== Organization: FreeBSD Message-ID: Date: Fri, 25 May 2018 12:58:12 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <201805251650.w4PGoGai004442@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4sQiRIWu5YkfikhXavwrZwLcv21lZKvRE" X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 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, 25 May 2018 19:58:18 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --4sQiRIWu5YkfikhXavwrZwLcv21lZKvRE Content-Type: multipart/mixed; boundary="2SC1KqwBHanLIRGaPeZUGmFZMwFr6W3e2"; protected-headers="v1" From: Bryan Drewery To: Mark Felder , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Message-ID: Subject: Re: svn commit: r470852 - branches/2018Q2/devel/awscli References: <201805251650.w4PGoGai004442@repo.freebsd.org> In-Reply-To: <201805251650.w4PGoGai004442@repo.freebsd.org> --2SC1KqwBHanLIRGaPeZUGmFZMwFr6W3e2 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 5/25/2018 9:50 AM, Mark Felder wrote: > Author: feld > Date: Fri May 25 16:50:16 2018 > New Revision: 470852 > URL: https://svnweb.freebsd.org/changeset/ports/470852 >=20 > Log: > MFH: r466130 > =20 > devel/awscli: Update 1.4.63 -> 1.4.68 >=20 > Modified: > branches/2018Q2/devel/awscli/Makefile > branches/2018Q2/devel/awscli/distinfo > Directory Properties: > branches/2018Q2/ (props changed) >=20 > Modified: branches/2018Q2/devel/awscli/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2018Q2/devel/awscli/Makefile Fri May 25 16:31:21 2018 (r47= 0851) > +++ branches/2018Q2/devel/awscli/Makefile Fri May 25 16:50:16 2018 (r47= 0852) > @@ -2,7 +2,7 @@ > # $FreeBSD$ > =20 > PORTNAME=3D awscli > -PORTVERSION=3D 1.14.63 > +PORTVERSION=3D 1.14.68 > CATEGORIES=3D devel > MASTER_SITES=3D CHEESESHOP > =20 > @@ -12,7 +12,7 @@ COMMENT=3D Universal Command Line Interface for Amazo= n W > LICENSE=3D APACHE20 > LICENSE_FILE=3D ${WRKSRC}/LICENSE.txt > =20 > -RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}botocore>=3D1.9.16:devel/py-boto= core@${PY_FLAVOR} \ > +RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}botocore>=3D1.9.21:devel/py-boto= core@${PY_FLAVOR} \ =3D=3D=3D> awscli-1.14.68 depends on package: py27-botocore>=3D1.9.21 -= not found devel/py-botocore is currently at 1.9.16 in quarterly. > ${PYTHON_PKGNAMEPREFIX}colorama>=3D0.2.5:devel/py-colorama@${PY_FLAV= OR} \ > ${PYTHON_PKGNAMEPREFIX}s3transfer>=3D0.1.12:net/py-s3transfer@${PY_F= LAVOR} \ > ${PYTHON_PKGNAMEPREFIX}docutils>=3D0.10:textproc/py-docutils@${PY_FL= AVOR} \ >=20 > Modified: branches/2018Q2/devel/awscli/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2018Q2/devel/awscli/distinfo Fri May 25 16:31:21 2018 (r47= 0851) > +++ branches/2018Q2/devel/awscli/distinfo Fri May 25 16:50:16 2018 (r47= 0852) > @@ -1,3 +1,3 @@ > -TIMESTAMP =3D 1522013564 > -SHA256 (awscli-1.14.63.tar.gz) =3D 9938aabc2b442ddf49d94a63b1ea2b36086= 280982796029c63c9d966dd8addf5 > -SIZE (awscli-1.14.63.tar.gz) =3D 588003 > +TIMESTAMP =3D 1522526554 > +SHA256 (awscli-1.14.68.tar.gz) =3D 4aeca66dff5d1dee82d4af13da148a6b798= 9238441c42a6d70900a544cb530ae > +SIZE (awscli-1.14.68.tar.gz) =3D 588249 >=20 --=20 Regards, Bryan Drewery --2SC1KqwBHanLIRGaPeZUGmFZMwFr6W3e2-- --4sQiRIWu5YkfikhXavwrZwLcv21lZKvRE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJbCGrUAAoJEDXXcbtuRpfPOWUH/jyZ1OX/iaw3zdQQDAHcgKWu EohaQ9aWLBvBDjZBfsfoQL3nOU/61o1znJXSzTz3HTBUbcPrJZFgD/up+ZU1DtK8 HhwNinExK+UKB7a8PASDpRbuxiauYpK4wQniQuilbIQ4R2I1+Q7cuS9dlbHt7k/O jblhO8smx7Y+wJgKKM23B+8ZCUH+W8VnVk0YJuFWio9zDUwohXLG4skXtjBYdhXp AYHRUAwkaNaHXueMyypl9+xsj5vZz/u0YpbiZi8/64uupTncyQDTrDGjUuxOR6S2 0gBecCHbFCaVcvP+zGz1rLpwxEI6vIS4CJI8TdfeE9gTVfTL4bq4OZRz1JmWl5I= =oXzx -----END PGP SIGNATURE----- --4sQiRIWu5YkfikhXavwrZwLcv21lZKvRE-- From owner-svn-ports-branches@freebsd.org Fri May 25 21:06:18 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF922EF473B; Fri, 25 May 2018 21:06:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 91EE0747BA; Fri, 25 May 2018 21:06:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5493B26244; Fri, 25 May 2018 21:06:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4PL6HHr070964; Fri, 25 May 2018 21:06:17 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4PL6GN5070961; Fri, 25 May 2018 21:06:16 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201805252106.w4PL6GN5070961@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 25 May 2018 21:06:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470865 - branches/2018Q2/ftp/curl X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: branches/2018Q2/ftp/curl X-SVN-Commit-Revision: 470865 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.26 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, 25 May 2018 21:06:18 -0000 Author: sunpoet Date: Fri May 25 21:06:16 2018 New Revision: 470865 URL: https://svnweb.freebsd.org/changeset/ports/470865 Log: MFH: r470160 Update to 7.60.0 Changes: https://curl.haxx.se/changes.html Security: 04fe6c8d-2a34-4009-a81e-e7a7e759b5d2 Approved by: ports-secteam Modified: branches/2018Q2/ftp/curl/Makefile branches/2018Q2/ftp/curl/distinfo branches/2018Q2/ftp/curl/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/ftp/curl/Makefile ============================================================================== --- branches/2018Q2/ftp/curl/Makefile Fri May 25 20:40:43 2018 (r470864) +++ branches/2018Q2/ftp/curl/Makefile Fri May 25 21:06:16 2018 (r470865) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.59.0 +PORTVERSION= 7.60.0 CATEGORIES= ftp net www MASTER_SITES= https://curl.haxx.se/download/ \ LOCAL/sunpoet @@ -162,7 +162,7 @@ post-install: post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/ cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ - cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.m4 ${STAGEDIR}${DOCSDIR}/libcurl/ + cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.m4 ${STAGEDIR}${DOCSDIR}/libcurl/ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ Modified: branches/2018Q2/ftp/curl/distinfo ============================================================================== --- branches/2018Q2/ftp/curl/distinfo Fri May 25 20:40:43 2018 (r470864) +++ branches/2018Q2/ftp/curl/distinfo Fri May 25 21:06:16 2018 (r470865) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521050363 -SHA256 (curl-7.59.0.tar.xz) = e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc -SIZE (curl-7.59.0.tar.xz) = 2318988 +TIMESTAMP = 1526504732 +SHA256 (curl-7.60.0.tar.xz) = 8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0 +SIZE (curl-7.60.0.tar.xz) = 2338104 Modified: branches/2018Q2/ftp/curl/pkg-plist ============================================================================== --- branches/2018Q2/ftp/curl/pkg-plist Fri May 25 20:40:43 2018 (r470864) +++ branches/2018Q2/ftp/curl/pkg-plist Fri May 25 21:06:16 2018 (r470865) @@ -126,6 +126,7 @@ man/man3/CURLOPT_DNS_INTERFACE.3.gz man/man3/CURLOPT_DNS_LOCAL_IP4.3.gz man/man3/CURLOPT_DNS_LOCAL_IP6.3.gz man/man3/CURLOPT_DNS_SERVERS.3.gz +man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3.gz man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3.gz man/man3/CURLOPT_EGDSOCKET.3.gz man/man3/CURLOPT_ERRORBUFFER.3.gz @@ -151,6 +152,7 @@ man/man3/CURLOPT_FTP_USE_EPSV.3.gz man/man3/CURLOPT_FTP_USE_PRET.3.gz man/man3/CURLOPT_GSSAPI_DELEGATION.3.gz man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3.gz +man/man3/CURLOPT_HAPROXYPROTOCOL.3.gz man/man3/CURLOPT_HEADER.3.gz man/man3/CURLOPT_HEADERDATA.3.gz man/man3/CURLOPT_HEADERFUNCTION.3.gz From owner-svn-ports-branches@freebsd.org Sat May 26 00:54:28 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 C1729EF93C4; Sat, 26 May 2018 00:54: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 72B7D7BCF6; Sat, 26 May 2018 00:54: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 53E8A8A7; Sat, 26 May 2018 00:54: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 w4Q0sRFw004623; Sat, 26 May 2018 00:54:27 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4Q0sQOe004621; Sat, 26 May 2018 00:54:26 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805260054.w4Q0sQOe004621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 26 May 2018 00:54:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470878 - in branches/2018Q2/www/waterfox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/www/waterfox: . files X-SVN-Commit-Revision: 470878 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.26 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, 26 May 2018 00:54:28 -0000 Author: jbeich Date: Sat May 26 00:54:26 2018 New Revision: 470878 URL: https://svnweb.freebsd.org/changeset/ports/470878 Log: MFH: r470877 www/waterfox: apply some FF61 fixes Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1462682 - copied unchanged from r470877, head/www/waterfox/files/patch-bug1462682 branches/2018Q2/www/waterfox/files/patch-bug1463244 - copied unchanged from r470877, head/www/waterfox/files/patch-bug1463244 Modified: branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Sat May 26 00:53:50 2018 (r470877) +++ branches/2018Q2/www/waterfox/Makefile Sat May 26 00:54:26 2018 (r470878) @@ -3,7 +3,7 @@ PORTNAME= waterfox DISTVERSION= 56.2.0-13 DISTVERSIONSUFFIX= -gd2cdd42f4115b -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q2/www/waterfox/files/patch-bug1462682 (from r470877, head/www/waterfox/files/patch-bug1462682) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1462682 Sat May 26 00:54:26 2018 (r470878, copy of r470877, head/www/waterfox/files/patch-bug1462682) @@ -0,0 +1,32 @@ +commit dc5382e1b765 +Author: Lee Salzman +Date: Fri May 25 00:57:45 2018 -0400 + + Bug 1462682 - Skia path bounds rounding fix. r=rhunt, a=RyanVM + + MozReview-Commit-ID: Lm0XhyLLCCV + + --HG-- + extra : source : 784deba1907770c8f4c3482509ae99d474c4439f +--- + gfx/skia/skia/src/core/SkScan_Path.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git gfx/skia/skia/src/core/SkScan_Path.cpp gfx/skia/skia/src/core/SkScan_Path.cpp +index 2373e62d46ff2..90a22305260f1 100644 +--- gfx/skia/skia/src/core/SkScan_Path.cpp ++++ gfx/skia/skia/src/core/SkScan_Path.cpp +@@ -564,7 +564,12 @@ static bool clip_to_limit(const SkRegion& orig, SkRegion* reduced) { + // Bias used for conservative rounding of float rects to int rects, to nudge the irects a little + // larger, so we don't "think" a path's bounds are inside a clip, when (due to numeric drift in + // the scan-converter) we might walk beyond the predicted limits. +-static const double kConservativeRoundBias = 0.5 + 0.5 / SK_FDot6One; ++// ++// This value has been determined trial and error: pick the smallest value (after the 0.5) that ++// fixes any problematic cases (e.g. crbug.com/844457) ++// NOTE: cubics appear to be the main reason for needing this slop. If we could (perhaps) have a ++// more accurate walker for cubics, we may be able to reduce this fudge factor. ++static const double kConservativeRoundBias = 0.5 + 1.5 / SK_FDot6One; + + /** + * Round the value down. This is used to round the top and left of a rectangle, Copied: branches/2018Q2/www/waterfox/files/patch-bug1463244 (from r470877, head/www/waterfox/files/patch-bug1463244) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1463244 Sat May 26 00:54:26 2018 (r470878, copy of r470877, head/www/waterfox/files/patch-bug1463244) @@ -0,0 +1,161 @@ +commit 937a30033acb +Author: Lee Salzman +Date: Fri May 25 00:56:22 2018 -0400 + + Bug 1463244 - Cleanup of swizzle stride calculations. r=rhunt, a=RyanVM + + MozReview-Commit-ID: GMXRKnu8zHB + + --HG-- + extra : source : 2aaf8f2a1975c57f5467968734d110ac7becc7ee +--- + gfx/2d/DataSurfaceHelpers.cpp | 33 ++++++++++++++++++++++++--------- + gfx/2d/Swizzle.cpp | 34 +++++++++++++++++++++++++++------- + 2 files changed, 51 insertions(+), 16 deletions(-) + +diff --git gfx/2d/DataSurfaceHelpers.cpp gfx/2d/DataSurfaceHelpers.cpp +index f13be059c8ba0..7af32ff005771 100644 +--- gfx/2d/DataSurfaceHelpers.cpp ++++ gfx/2d/DataSurfaceHelpers.cpp +@@ -157,9 +157,16 @@ SurfaceToPackedBGRA(DataSourceSurface *aSurface) + } + + IntSize size = aSurface->GetSize(); +- +- UniquePtr imageBuffer( +- new (std::nothrow) uint8_t[size.width * size.height * sizeof(uint32_t)]); ++ if (size.width < 0 || size.width >= INT32_MAX / 4) { ++ return nullptr; ++ } ++ int32_t stride = size.width * 4; ++ CheckedInt bufferSize = ++ CheckedInt(stride) * CheckedInt(size.height); ++ if (!bufferSize.isValid()) { ++ return nullptr; ++ } ++ UniquePtr imageBuffer(new (std::nothrow) uint8_t[bufferSize.value()]); + if (!imageBuffer) { + return nullptr; + } +@@ -170,14 +177,14 @@ SurfaceToPackedBGRA(DataSourceSurface *aSurface) + } + + CopySurfaceDataToPackedArray(map.mData, imageBuffer.get(), size, +- map.mStride, 4 * sizeof(uint8_t)); ++ map.mStride, 4); + + aSurface->Unmap(); + + if (format == SurfaceFormat::B8G8R8X8) { + // Convert BGRX to BGRA by setting a to 255. +- SwizzleData(imageBuffer.get(), size.width * sizeof(uint32_t), SurfaceFormat::X8R8G8B8_UINT32, +- imageBuffer.get(), size.width * sizeof(uint32_t), SurfaceFormat::A8R8G8B8_UINT32, ++ SwizzleData(imageBuffer.get(), stride, SurfaceFormat::X8R8G8B8_UINT32, ++ imageBuffer.get(), stride, SurfaceFormat::A8R8G8B8_UINT32, + size); + } + +@@ -196,8 +203,16 @@ SurfaceToPackedBGR(DataSourceSurface *aSurface) + } + + IntSize size = aSurface->GetSize(); +- +- uint8_t* imageBuffer = new (std::nothrow) uint8_t[size.width * size.height * 3 * sizeof(uint8_t)]; ++ if (size.width < 0 || size.width >= INT32_MAX / 3) { ++ return nullptr; ++ } ++ int32_t stride = size.width * 3; ++ CheckedInt bufferSize = ++ CheckedInt(stride) * CheckedInt(size.height); ++ if (!bufferSize.isValid()) { ++ return nullptr; ++ } ++ uint8_t* imageBuffer = new (std::nothrow) uint8_t[bufferSize.value()]; + if (!imageBuffer) { + return nullptr; + } +@@ -209,7 +224,7 @@ SurfaceToPackedBGR(DataSourceSurface *aSurface) + } + + SwizzleData(map.mData, map.mStride, SurfaceFormat::B8G8R8X8, +- imageBuffer, size.width * 3, SurfaceFormat::B8G8R8, ++ imageBuffer, stride, SurfaceFormat::B8G8R8, + size); + + aSurface->Unmap(); +diff --git gfx/2d/Swizzle.cpp gfx/2d/Swizzle.cpp +index 99bd1e17662c4..acbe2cabf9819 100644 +--- gfx/2d/Swizzle.cpp ++++ gfx/2d/Swizzle.cpp +@@ -259,7 +259,8 @@ static inline IntSize + CollapseSize(const IntSize& aSize, int32_t aSrcStride, int32_t aDstStride) + { + if (aSrcStride == aDstStride && +- aSrcStride == 4 * aSize.width) { ++ (aSrcStride & 3) == 0 && ++ aSrcStride / 4 == aSize.width) { + CheckedInt32 area = CheckedInt32(aSize.width) * CheckedInt32(aSize.height); + if (area.isValid()) { + return IntSize(area.value(), 1); +@@ -268,6 +269,16 @@ CollapseSize(const IntSize& aSize, int32_t aSrcStride, int32_t aDstStride) + return aSize; + } + ++static inline int32_t ++GetStrideGap(int32_t aWidth, SurfaceFormat aFormat, int32_t aStride) ++{ ++ CheckedInt32 used = CheckedInt32(aWidth) * BytesPerPixel(aFormat); ++ if (!used.isValid() || used.value() < 0) { ++ return -1; ++ } ++ return aStride - used.value(); ++} ++ + bool + PremultiplyData(const uint8_t* aSrc, int32_t aSrcStride, SurfaceFormat aSrcFormat, + uint8_t* aDst, int32_t aDstStride, SurfaceFormat aDstFormat, +@@ -278,9 +289,12 @@ PremultiplyData(const uint8_t* aSrc, int32_t aSrcStride, SurfaceFormat aSrcForma + } + IntSize size = CollapseSize(aSize, aSrcStride, aDstStride); + // Find gap from end of row to the start of the next row. +- int32_t srcGap = aSrcStride - BytesPerPixel(aSrcFormat) * aSize.width; +- int32_t dstGap = aDstStride - BytesPerPixel(aDstFormat) * aSize.width; ++ int32_t srcGap = GetStrideGap(aSize.width, aSrcFormat, aSrcStride); ++ int32_t dstGap = GetStrideGap(aSize.width, aDstFormat, aDstStride); + MOZ_ASSERT(srcGap >= 0 && dstGap >= 0); ++ if (srcGap < 0 || dstGap < 0) { ++ return false; ++ } + + #define FORMAT_CASE_CALL(...) __VA_ARGS__(aSrc, srcGap, aDst, dstGap, size) + +@@ -404,9 +418,12 @@ UnpremultiplyData(const uint8_t* aSrc, int32_t aSrcStride, SurfaceFormat aSrcFor + } + IntSize size = CollapseSize(aSize, aSrcStride, aDstStride); + // Find gap from end of row to the start of the next row. +- int32_t srcGap = aSrcStride - BytesPerPixel(aSrcFormat) * aSize.width; +- int32_t dstGap = aDstStride - BytesPerPixel(aDstFormat) * aSize.width; ++ int32_t srcGap = GetStrideGap(aSize.width, aSrcFormat, aSrcStride); ++ int32_t dstGap = GetStrideGap(aSize.width, aDstFormat, aDstStride); + MOZ_ASSERT(srcGap >= 0 && dstGap >= 0); ++ if (srcGap < 0 || dstGap < 0) { ++ return false; ++ } + + #define FORMAT_CASE_CALL(...) __VA_ARGS__(aSrc, srcGap, aDst, dstGap, size) + +@@ -702,9 +719,12 @@ SwizzleData(const uint8_t* aSrc, int32_t aSrcStride, SurfaceFormat aSrcFormat, + } + IntSize size = CollapseSize(aSize, aSrcStride, aDstStride); + // Find gap from end of row to the start of the next row. +- int32_t srcGap = aSrcStride - BytesPerPixel(aSrcFormat) * aSize.width; +- int32_t dstGap = aDstStride - BytesPerPixel(aDstFormat) * aSize.width; ++ int32_t srcGap = GetStrideGap(aSize.width, aSrcFormat, aSrcStride); ++ int32_t dstGap = GetStrideGap(aSize.width, aDstFormat, aDstStride); + MOZ_ASSERT(srcGap >= 0 && dstGap >= 0); ++ if (srcGap < 0 || dstGap < 0) { ++ return false; ++ } + + #define FORMAT_CASE_CALL(...) __VA_ARGS__(aSrc, srcGap, aDst, dstGap, size) + From owner-svn-ports-branches@freebsd.org Sat May 26 14:44:16 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2AD0EF77FAD; Sat, 26 May 2018 14:44:16 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D0AF27272A; Sat, 26 May 2018 14:44:15 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B1253113D2; Sat, 26 May 2018 14:44:15 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4QEiFZK019834; Sat, 26 May 2018 14:44:15 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4QEiFki019833; Sat, 26 May 2018 14:44:15 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201805261444.w4QEiFki019833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 26 May 2018 14:44:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470891 - branches/2018Q2/audio/soundconverter X-SVN-Group: ports-branches X-SVN-Commit-Author: pi X-SVN-Commit-Paths: branches/2018Q2/audio/soundconverter X-SVN-Commit-Revision: 470891 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.26 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, 26 May 2018 14:44:16 -0000 Author: pi Date: Sat May 26 14:44:15 2018 New Revision: 470891 URL: https://svnweb.freebsd.org/changeset/ports/470891 Log: MFH: r470881 audio/soundconverter: fix configure with NLS option disabled - by adding USES=gettext-tools PR: 220671 Submitted by: zaphod@berentweb.com Approved by: Chris Hutchinson Approved by: portmgr (miwi) Modified: branches/2018Q2/audio/soundconverter/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/audio/soundconverter/Makefile ============================================================================== --- branches/2018Q2/audio/soundconverter/Makefile Sat May 26 14:33:07 2018 (r470890) +++ branches/2018Q2/audio/soundconverter/Makefile Sat May 26 14:44:15 2018 (r470891) @@ -17,7 +17,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:multimedia/py-gstreamer@${PY_FLAVOR} NO_ARCH= yes -USES= desktop-file-utils gmake python:2.7 shebangfix tar:xz +USES= desktop-file-utils gettext-tools gmake python:2.7 \ + shebangfix tar:xz SHEBANG_FILES= bin/soundconverter.py From owner-svn-ports-branches@freebsd.org Sat May 26 17:19: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 7FF08EEEF03; Sat, 26 May 2018 17:19:24 +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 2C7F477EFA; Sat, 26 May 2018 17:19:24 +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 0457512C95; Sat, 26 May 2018 17:19:24 +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 w4QHJNuO095876; Sat, 26 May 2018 17:19:23 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4QHJN4D095874; Sat, 26 May 2018 17:19:23 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201805261719.w4QHJN4D095874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 26 May 2018 17:19:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470902 - branches/2018Q2/audio/musicpd X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q2/audio/musicpd X-SVN-Commit-Revision: 470902 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.26 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, 26 May 2018 17:19:24 -0000 Author: riggs Date: Sat May 26 17:19:23 2018 New Revision: 470902 URL: https://svnweb.freebsd.org/changeset/ports/470902 Log: MFH: r470899 Update to upstream version 0.20.20 Approved by: ports-secteam (riggs) Modified: branches/2018Q2/audio/musicpd/Makefile branches/2018Q2/audio/musicpd/distinfo Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/audio/musicpd/Makefile ============================================================================== --- branches/2018Q2/audio/musicpd/Makefile Sat May 26 17:14:20 2018 (r470901) +++ branches/2018Q2/audio/musicpd/Makefile Sat May 26 17:19:23 2018 (r470902) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.20.18 -PORTREVISION= 1 +PORTVERSION= 0.20.20 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} Modified: branches/2018Q2/audio/musicpd/distinfo ============================================================================== --- branches/2018Q2/audio/musicpd/distinfo Sat May 26 17:14:20 2018 (r470901) +++ branches/2018Q2/audio/musicpd/distinfo Sat May 26 17:19:23 2018 (r470902) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519569665 -SHA256 (mpd-0.20.18.tar.xz) = 6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434 -SIZE (mpd-0.20.18.tar.xz) = 792416 +TIMESTAMP = 1527332444 +SHA256 (mpd-0.20.20.tar.xz) = a9e458c6e07cdf62649de7722e1e5a7f13aa82eeb397bfbbebc07cf5cf273584 +SIZE (mpd-0.20.20.tar.xz) = 793776