From owner-svn-ports-branches@freebsd.org Sun Apr 15 08:51:12 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96EADFA4DB6; Sun, 15 Apr 2018 08:51:12 +0000 (UTC) (envelope-from eugen@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 46CA06FB31; Sun, 15 Apr 2018 08:51:12 +0000 (UTC) (envelope-from eugen@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 41BAF4CA0; Sun, 15 Apr 2018 08:51:12 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3F8pCaA046938; Sun, 15 Apr 2018 08:51:12 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3F8pBpd046933; Sun, 15 Apr 2018 08:51:11 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201804150851.w3F8pBpd046933@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Sun, 15 Apr 2018 08:51:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r467375 - in branches/2018Q2/security/ipsec-tools: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in branches/2018Q2/security/ipsec-tools: . files X-SVN-Commit-Revision: 467375 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Apr 2018 08:51:12 -0000 Author: eugen Date: Sun Apr 15 08:51:11 2018 New Revision: 467375 URL: https://svnweb.freebsd.org/changeset/ports/467375 Log: MFH: r467313 security/ipsec-tools: fix CVE-2016-10396 The racoon daemon in IPsec-Tools 0.8.2 contains a remotely exploitable computational-complexity attack when parsing and storing ISAKMP fragments. The implementation permits a remote attacker to exhaust computational resources on the remote endpoint by repeatedly sending ISAKMP fragment packets in a particular order such that the worst-case computational complexity is realized in the algorithm utilized to determine if reassembly of the fragments can take place. The fix obtained from NetBSD CVS head with a command: cvs diff -D 2017-01-24 -D 2017-09-01 \ src/racoon/handler.h \ src/racoon/isakmp.c \ src/racoon/isakmp_frag.c \ src/racoon/isakmp_inf.c While here, add LICENSE. PR: 225066 Approved by: ports-secteam (riggs) Obtained from: NetBSD Security: CVE-2016-10396 Security: https://www.vuxml.org/freebsd/974a6d32-3fda-11e8-aea4-001b216d295b.html Added: branches/2018Q2/security/ipsec-tools/files/patch-handler.c - copied unchanged from r467313, head/security/ipsec-tools/files/patch-handler.c branches/2018Q2/security/ipsec-tools/files/patch-isakmp.c - copied unchanged from r467313, head/security/ipsec-tools/files/patch-isakmp.c branches/2018Q2/security/ipsec-tools/files/patch-isakmp_frag.c - copied unchanged from r467313, head/security/ipsec-tools/files/patch-isakmp_frag.c branches/2018Q2/security/ipsec-tools/files/patch-isakmp_inf.c - copied unchanged from r467313, head/security/ipsec-tools/files/patch-isakmp_inf.c Modified: branches/2018Q2/security/ipsec-tools/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/security/ipsec-tools/Makefile ============================================================================== --- branches/2018Q2/security/ipsec-tools/Makefile Sun Apr 15 08:33:39 2018 (r467374) +++ branches/2018Q2/security/ipsec-tools/Makefile Sun Apr 15 08:51:11 2018 (r467375) @@ -8,12 +8,14 @@ PORTNAME= ipsec-tools PORTVERSION= 0.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF MAINTAINER= vanhu@FreeBSD.org COMMENT= KAME racoon IKE daemon, ipsec-tools version + +LICENSE= BSD3CLAUSE CONFLICTS= racoon-[0-9]* Copied: branches/2018Q2/security/ipsec-tools/files/patch-handler.c (from r467313, head/security/ipsec-tools/files/patch-handler.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/security/ipsec-tools/files/patch-handler.c Sun Apr 15 08:51:11 2018 (r467375, copy of r467313, head/security/ipsec-tools/files/patch-handler.c) @@ -0,0 +1,22 @@ +Index: src/racoon/handler.h +=================================================================== +RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/handler.h,v +retrieving revision 1.25 +retrieving revision 1.26 +diff -p -u -r1.25 -r1.26 +--- src/racoon/handler.h 17 Nov 2010 10:40:41 -0000 1.25 ++++ src/racoon/handler.h 24 Jan 2017 19:23:56 -0000 1.26 +@@ -1,4 +1,4 @@ +-/* $NetBSD: handler.h,v 1.25 2010/11/17 10:40:41 tteras Exp $ */ ++/* $NetBSD: handler.h,v 1.26 2017/01/24 19:23:56 christos Exp $ */ + + /* Id: handler.h,v 1.19 2006/02/25 08:25:12 manubsd Exp */ + +@@ -141,6 +141,7 @@ struct ph1handle { + #endif + #ifdef ENABLE_FRAG + int frag; /* IKE phase 1 fragmentation */ ++ int frag_last_index; + struct isakmp_frag_item *frag_chain; /* Received fragments */ + #endif + Copied: branches/2018Q2/security/ipsec-tools/files/patch-isakmp.c (from r467313, head/security/ipsec-tools/files/patch-isakmp.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/security/ipsec-tools/files/patch-isakmp.c Sun Apr 15 08:51:11 2018 (r467375, copy of r467313, head/security/ipsec-tools/files/patch-isakmp.c) @@ -0,0 +1,30 @@ +Index: src/racoon/isakmp.c +=================================================================== +RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp.c,v +retrieving revision 1.75 +retrieving revision 1.76 +diff -p -u -r1.75 -r1.76 +--- src/racoon/isakmp.c 9 Mar 2016 22:27:17 -0000 1.75 ++++ src/racoon/isakmp.c 24 Jan 2017 19:23:56 -0000 1.76 +@@ -1,4 +1,4 @@ +-/* $NetBSD: isakmp.c,v 1.75 2016/03/09 22:27:17 christos Exp $ */ ++/* $NetBSD: isakmp.c,v 1.76 2017/01/24 19:23:56 christos Exp $ */ + + /* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */ + +@@ -1077,6 +1077,7 @@ isakmp_ph1begin_i(rmconf, remote, local) + iph1->frag = 1; + else + iph1->frag = 0; ++ iph1->frag_last_index = 0; + iph1->frag_chain = NULL; + #endif + iph1->approval = NULL; +@@ -1181,6 +1182,7 @@ isakmp_ph1begin_r(msg, remote, local, et + #endif + #ifdef ENABLE_FRAG + iph1->frag = 0; ++ iph1->frag_last_index = 0; + iph1->frag_chain = NULL; + #endif + iph1->approval = NULL; Copied: branches/2018Q2/security/ipsec-tools/files/patch-isakmp_frag.c (from r467313, head/security/ipsec-tools/files/patch-isakmp_frag.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/security/ipsec-tools/files/patch-isakmp_frag.c Sun Apr 15 08:51:11 2018 (r467375, copy of r467313, head/security/ipsec-tools/files/patch-isakmp_frag.c) @@ -0,0 +1,151 @@ +Index: src/racoon/isakmp_frag.c +=================================================================== +RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c,v +retrieving revision 1.5 +retrieving revision 1.7 +diff -p -u -r1.5 -r1.7 +--- src/racoon/isakmp_frag.c 22 Apr 2009 11:24:20 -0000 1.5 ++++ src/racoon/isakmp_frag.c 23 Jul 2017 05:40:27 -0000 1.7 +@@ -1,4 +1,4 @@ +-/* $NetBSD: isakmp_frag.c,v 1.5 2009/04/22 11:24:20 tteras Exp $ */ ++/* $NetBSD: isakmp_frag.c,v 1.7 2017/07/23 05:40:27 christos Exp $ */ + + /* Id: isakmp_frag.c,v 1.4 2004/11/13 17:31:36 manubsd Exp */ + +@@ -173,6 +173,43 @@ vendorid_frag_cap(gen) + return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]); + } + ++static int ++isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item) ++{ ++ struct isakmp_frag_item *pitem = NULL; ++ struct isakmp_frag_item *citem = iph1->frag_chain; ++ ++ /* no frag yet, just insert at beginning of list */ ++ if (iph1->frag_chain == NULL) { ++ iph1->frag_chain = item; ++ return 0; ++ } ++ ++ do { ++ /* duplicate fragment number, abort (CVE-2016-10396) */ ++ if (citem->frag_num == item->frag_num) ++ return -1; ++ ++ /* need to insert before current item */ ++ if (citem->frag_num > item->frag_num) { ++ if (pitem != NULL) ++ pitem->frag_next = item; ++ else ++ /* insert at the beginning of the list */ ++ iph1->frag_chain = item; ++ item->frag_next = citem; ++ return 0; ++ } ++ ++ pitem = citem; ++ citem = citem->frag_next; ++ } while (citem != NULL); ++ ++ /* we reached the end of the list, insert */ ++ pitem->frag_next = item; ++ return 0; ++} ++ + int + isakmp_frag_extract(iph1, msg) + struct ph1handle *iph1; +@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg) + item->frag_next = NULL; + item->frag_packet = buf; + +- /* Look for the last frag while inserting the new item in the chain */ +- if (item->frag_last) +- last_frag = item->frag_num; ++ /* Check for the last frag before inserting the new item in the chain */ ++ if (item->frag_last) { ++ /* if we have the last fragment, indices must match */ ++ if (iph1->frag_last_index != 0 && ++ item->frag_last != iph1->frag_last_index) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "Repeated last fragment index mismatch\n"); ++ racoon_free(item); ++ vfree(buf); ++ return -1; ++ } + +- if (iph1->frag_chain == NULL) { +- iph1->frag_chain = item; +- } else { +- struct isakmp_frag_item *current; ++ last_frag = iph1->frag_last_index = item->frag_num; ++ } + +- current = iph1->frag_chain; +- while (current->frag_next) { +- if (current->frag_last) +- last_frag = item->frag_num; +- current = current->frag_next; +- } +- current->frag_next = item; ++ /* insert fragment into chain */ ++ if (isakmp_frag_insert(iph1, item) == -1) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "Repeated fragment index mismatch\n"); ++ racoon_free(item); ++ vfree(buf); ++ return -1; + } + +- /* If we saw the last frag, check if the chain is complete */ ++ /* If we saw the last frag, check if the chain is complete ++ * we have a sorted list now, so just walk through */ + if (last_frag != 0) { ++ item = iph1->frag_chain; + for (i = 1; i <= last_frag; i++) { +- item = iph1->frag_chain; +- do { +- if (item->frag_num == i) +- break; +- item = item->frag_next; +- } while (item != NULL); +- ++ if (item->frag_num != i) ++ break; ++ item = item->frag_next; + if (item == NULL) /* Not found */ + break; + } + +- if (item != NULL) /* It is complete */ ++ if (i > last_frag) /* It is complete */ + return 1; + } + +@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1) + } + data = buf->v; + ++ item = iph1->frag_chain; + for (i = 1; i <= frag_count; i++) { +- item = iph1->frag_chain; +- do { +- if (item->frag_num == i) +- break; +- item = item->frag_next; +- } while (item != NULL); +- +- if (item == NULL) { ++ if (item->frag_num != i) { + plog(LLV_ERROR, LOCATION, NULL, + "Missing fragment #%d\n", i); + vfree(buf); +@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1) + } + memcpy(data, item->frag_packet->v, item->frag_packet->l); + data += item->frag_packet->l; ++ item = item->frag_next; + } + + out: Copied: branches/2018Q2/security/ipsec-tools/files/patch-isakmp_inf.c (from r467313, head/security/ipsec-tools/files/patch-isakmp_inf.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/security/ipsec-tools/files/patch-isakmp_inf.c Sun Apr 15 08:51:11 2018 (r467375, copy of r467313, head/security/ipsec-tools/files/patch-isakmp_inf.c) @@ -0,0 +1,22 @@ +Index: src/racoon/isakmp_inf.c +=================================================================== +RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c,v +retrieving revision 1.50 +retrieving revision 1.51 +diff -p -u -r1.50 -r1.51 +--- src/racoon/isakmp_inf.c 12 Apr 2013 09:53:10 -0000 1.50 ++++ src/racoon/isakmp_inf.c 24 Jan 2017 19:23:56 -0000 1.51 +@@ -1,4 +1,4 @@ +-/* $NetBSD: isakmp_inf.c,v 1.50 2013/04/12 09:53:10 tteras Exp $ */ ++/* $NetBSD: isakmp_inf.c,v 1.51 2017/01/24 19:23:56 christos Exp $ */ + + /* Id: isakmp_inf.c,v 1.44 2006/05/06 20:45:52 manubsd Exp */ + +@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca + #endif + #ifdef ENABLE_FRAG + iph1->frag = 0; ++ iph1->frag_last_index = 0; + iph1->frag_chain = NULL; + #endif + From owner-svn-ports-branches@freebsd.org Sun Apr 15 23:58: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 41F32F98ED5; Sun, 15 Apr 2018 23:58: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 EAF4576080; Sun, 15 Apr 2018 23:58: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 E5FC415C8F; Sun, 15 Apr 2018 23:58: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 w3FNwSp5099362; Sun, 15 Apr 2018 23:58:28 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3FNwS8i099361; Sun, 15 Apr 2018 23:58:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804152358.w3FNwS8i099361@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 15 Apr 2018 23:58:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r467444 - branches/2018Q2/math/ceres-solver X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/math/ceres-solver X-SVN-Commit-Revision: 467444 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Apr 2018 23:58:29 -0000 Author: jbeich Date: Sun Apr 15 23:58:28 2018 New Revision: 467444 URL: https://svnweb.freebsd.org/changeset/ports/467444 Log: MFH: r467441 math/ceres-solver: unbreak OPENMP=off after r465555 $ make config │ │──────────────────────────── Threading support ───────────────────────────│ │ │ │+( ) OPENMP Parallel processing support via OpenMP │ │ │ │+(*) TBB Intel threading building blocks │ │ ====> You cannot select multiple options from the THREADS radio =====> Only one of these must be defined: OPENMP TBB Config is invalid. Re-edit? [Y/n] y Approved by: ports-secteam blanket Modified: branches/2018Q2/math/ceres-solver/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/math/ceres-solver/Makefile ============================================================================== --- branches/2018Q2/math/ceres-solver/Makefile Sun Apr 15 23:57:59 2018 (r467443) +++ branches/2018Q2/math/ceres-solver/Makefile Sun Apr 15 23:58:28 2018 (r467444) @@ -27,7 +27,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/-solver//} PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= CUSTOM_BLAS EXAMPLES DOCS GFLAGS LAPACK OPENMP SCHUR TEST +OPTIONS_DEFINE= CUSTOM_BLAS EXAMPLES DOCS GFLAGS LAPACK SCHUR TEST OPTIONS_DEFAULT=CUSTOM_BLAS CXSPARSE OPENBLAS OPENMP SCHUR SUITESPARSE OPTIONS_RADIO= LAPACK THREADS OPTIONS_RADIO_LAPACK= ATLAS GOTOBLAS NETLIB OPENBLAS From owner-svn-ports-branches@freebsd.org Sun Apr 15 23:58: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 42CE9F98F55; Sun, 15 Apr 2018 23:58:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E61AC7617C; Sun, 15 Apr 2018 23:58:57 +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 E0FC815C90; Sun, 15 Apr 2018 23:58:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3FNwveO099492; Sun, 15 Apr 2018 23:58:57 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3FNwvPI099491; Sun, 15 Apr 2018 23:58:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804152358.w3FNwvPI099491@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 15 Apr 2018 23:58:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r467445 - branches/2018Q2/graphics/freeimage/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/graphics/freeimage/files X-SVN-Commit-Revision: 467445 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Apr 2018 23:58:58 -0000 Author: jbeich Date: Sun Apr 15 23:58:57 2018 New Revision: 467445 URL: https://svnweb.freebsd.org/changeset/ports/467445 Log: MFH: r467442 graphics/freeimage: unbreak build with Clang 6 (C++14 by default) Source/LibRawLite/./internal/dcraw_common.cpp:2042:17: error: constant expression evaluates to -2 which cannot be narrowed to type 'char' [-Wc++11-narrowing] 1,0, 2,2, 2,-2, ^~ Source/LibRawLite/./internal/dcraw_common.cpp:2042:17: note: insert an explicit cast to silence this issue 1,0, 2,2, 2,-2, ^~ static_cast( ) [...] Reported by: pkg-fallout (armv6, armv7, aarch64) Approved by: ports-secteam blanket Modified: branches/2018Q2/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp ============================================================================== --- branches/2018Q2/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp Sun Apr 15 23:58:28 2018 (r467444) +++ branches/2018Q2/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp Sun Apr 15 23:58:57 2018 (r467445) @@ -1,7 +1,17 @@ +https://github.com/LibRaw/LibRaw/commit/f4c0b98581a6 https://github.com/LibRaw/LibRaw/commit/2cef10389486 --- Source/LibRawLite/internal/dcraw_common.cpp.orig 2014-02-07 19:48:10 UTC +++ Source/LibRawLite/internal/dcraw_common.cpp +@@ -2027,7 +2027,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, @@ -3782,22 +3782,22 @@ void CLASS vng_interpolate() -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03, -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06, From owner-svn-ports-branches@freebsd.org Mon Apr 16 00:51:08 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 E19DBF9CF57; Mon, 16 Apr 2018 00:51:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8E4B4801A7; Mon, 16 Apr 2018 00:51:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 77BB5165D4; Mon, 16 Apr 2018 00:51:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3G0p77u025057; Mon, 16 Apr 2018 00:51:07 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3G0p7pY025056; Mon, 16 Apr 2018 00:51:07 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804160051.w3G0p7pY025056@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 16 Apr 2018 00:51:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r467450 - branches/2018Q2/graphics/freeimage X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/graphics/freeimage X-SVN-Commit-Revision: 467450 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Apr 2018 00:51:08 -0000 Author: jbeich Date: Mon Apr 16 00:51:07 2018 New Revision: 467450 URL: https://svnweb.freebsd.org/changeset/ports/467450 Log: MFH: r467449 graphics/freeimage: unbreak consumers on arm* with NEON $ echo 'int main() {}' | cc -xc - -o /dev/null -L/usr/local/lib -lfreeimage -lm /usr/local/lib/libfreeimage.so: undefined reference to `png_init_filter_functions_neon' cc: error: linker command failed with exit code 1 (use -v to see invocation) Approved by: ports-secteam blanket Modified: branches/2018Q2/graphics/freeimage/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/graphics/freeimage/Makefile ============================================================================== --- branches/2018Q2/graphics/freeimage/Makefile Mon Apr 16 00:37:31 2018 (r467449) +++ branches/2018Q2/graphics/freeimage/Makefile Mon Apr 16 00:51:07 2018 (r467450) @@ -3,7 +3,7 @@ PORTNAME= freeimage PORTVERSION= 3.16.0 -PORTREVISION= 3 +PORTREVISION= 4 # Version 3.17.0 is available, but does not build on i386 (and probably # other 32-bit arches) without some not-quite-trivial patching. If one # decides to update the port, please make sure 32-bit builds are tested! @@ -22,7 +22,7 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/FreeImage MAKE_ARGS= CC="${CC}" CPP="${CPP}" CXX="${CXX}" -CFLAGS+= -fexceptions -fvisibility=hidden +CFLAGS+= -DPNG_ARM_NEON_OPT=0 -fexceptions -fvisibility=hidden CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC From owner-svn-ports-branches@freebsd.org Mon Apr 16 12:40: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 633B7FA6D9C; Mon, 16 Apr 2018 12:40:03 +0000 (UTC) (envelope-from garga@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 1848972D89; Mon, 16 Apr 2018 12:40:03 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0ECBB1D5B5; Mon, 16 Apr 2018 12:40:03 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3GCe2Gc082389; Mon, 16 Apr 2018 12:40:02 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3GCe2NS082387; Mon, 16 Apr 2018 12:40:02 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201804161240.w3GCe2NS082387@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 16 Apr 2018 12:40:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r467481 - in branches/2018Q2/sysutils/py-salt: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: garga X-SVN-Commit-Paths: in branches/2018Q2/sysutils/py-salt: . files X-SVN-Commit-Revision: 467481 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Apr 2018 12:40:03 -0000 Author: garga Date: Mon Apr 16 12:40:02 2018 New Revision: 467481 URL: https://svnweb.freebsd.org/changeset/ports/467481 Log: MFH: r467246 Fix saltstack bootstrap renaming desired to be installed package from swig -> swig30 since former package doesn't exist PR: 226830 Submitted by: garga Approved by: maintainer timeout (> 2 weeks) Obtained from: https://github.com/saltstack/salt-bootstrap/issues/1192 Sponsored by: Rubicon communications, LLC (Netgate) Approved by: ports-secteam (delphij) Added: branches/2018Q2/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh - copied unchanged from r467246, head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh Modified: branches/2018Q2/sysutils/py-salt/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/sysutils/py-salt/Makefile ============================================================================== --- branches/2018Q2/sysutils/py-salt/Makefile Mon Apr 16 12:28:44 2018 (r467480) +++ branches/2018Q2/sysutils/py-salt/Makefile Mon Apr 16 12:40:02 2018 (r467481) @@ -3,7 +3,7 @@ PORTNAME= salt PORTVERSION= 2017.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Copied: branches/2018Q2/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh (from r467246, head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh Mon Apr 16 12:40:02 2018 (r467481, copy of r467246, head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh) @@ -0,0 +1,14 @@ +--- salt/cloud/deploy/bootstrap-salt.sh.orig 2018-03-21 17:37:20 UTC ++++ salt/cloud/deploy/bootstrap-salt.sh +@@ -4885,9 +4885,9 @@ install_freebsd_9_stable_deps() { + __configure_freebsd_pkg_details || return 1 + fi + +- # Now install swig ++ # Now install swig30 + # shellcheck disable=SC2086 +- /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig || return 1 ++ /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig30 || return 1 + + # YAML module is used for generating custom master/minion configs + # shellcheck disable=SC2086 From owner-svn-ports-branches@freebsd.org Mon Apr 16 21:37:22 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 832DFFA76BD; Mon, 16 Apr 2018 21:37:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 35EE569AFC; Mon, 16 Apr 2018 21:37:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 30CDC22DB7; Mon, 16 Apr 2018 21:37:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3GLbLOl062465; Mon, 16 Apr 2018 21:37:21 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3GLbLLG062462; Mon, 16 Apr 2018 21:37:21 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201804162137.w3GLbLLG062462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 16 Apr 2018 21:37:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r467539 - in branches/2018Q2/lang/rust: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in branches/2018Q2/lang/rust: . files X-SVN-Commit-Revision: 467539 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Apr 2018 21:37:22 -0000 Author: bdrewery Date: Mon Apr 16 21:37:21 2018 New Revision: 467539 URL: https://svnweb.freebsd.org/changeset/ports/467539 Log: MFH: r467538 Update to 1.25.0. - The ABI patch is no longer needed on head due to fixes being upstreamed to use the pre-ino64 symbols. The ABI patch is still needed for the bootstrap but should be removable for 1.26.0 if it uses beta 2018-03-18. PR: 227130 [based on] Tested by: dumbbell, Charlie Li Submitted by: riggs [based on] Differential Revision: https://reviews.freebsd.org/D14921 [based on] Approved by: portmgr (implicit) Deleted: branches/2018Q2/lang/rust/files/extra-patch-abi Modified: branches/2018Q2/lang/rust/Makefile branches/2018Q2/lang/rust/distinfo branches/2018Q2/lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/lang/rust/Makefile ============================================================================== --- branches/2018Q2/lang/rust/Makefile Mon Apr 16 21:35:26 2018 (r467538) +++ branches/2018Q2/lang/rust/Makefile Mon Apr 16 21:37:21 2018 (r467539) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.24.1 +PORTVERSION?= 1.25.0 PORTREVISION?= CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ @@ -44,13 +44,13 @@ ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap com CONFLICTS_INSTALL?= rust-nightly # See WRKSRC/src/stage0.txt for this date and version values. -BOOTSTRAPS_DATE?= 2018-01-04 +BOOTSTRAPS_DATE?= 2018-02-15 -RUST_BOOTSTRAP_VERSION?= 1.23.0 +RUST_BOOTSTRAP_VERSION?= 1.24.0 RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz -CARGO_BOOTSTRAP_VERSION?= 0.24.0 +CARGO_BOOTSTRAP_VERSION?= 0.25.0 CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//} @@ -96,7 +96,6 @@ PLIST_FILES= lib/rustlib/components \ # https://github.com/rust-lang/rust/issues/42681 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 && !defined(NIGHTLY_DATE) NEED_ABI_PATCH= 1 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-abi .else NEED_ABI_PATCH= 0 .endif Modified: branches/2018Q2/lang/rust/distinfo ============================================================================== --- branches/2018Q2/lang/rust/distinfo Mon Apr 16 21:35:26 2018 (r467538) +++ branches/2018Q2/lang/rust/distinfo Mon Apr 16 21:37:21 2018 (r467539) @@ -1,21 +1,21 @@ -TIMESTAMP = 1520331200 -SHA256 (rust/rustc-1.24.1-src.tar.xz) = 85d5d032a59ff91ae01e2b0b65607e763de8dc2729e4b3d28a69023bdd8f5718 -SIZE (rust/rustc-1.24.1-src.tar.xz) = 42171464 -SHA256 (rust/2018-01-04/rustc-1.23.0-aarch64-unknown-freebsd.tar.gz) = 44ae0e7615c19209fb74dc18dd15668af228bb2135bd74a3d4bd8917af6ec889 -SIZE (rust/2018-01-04/rustc-1.23.0-aarch64-unknown-freebsd.tar.gz) = 56833352 -SHA256 (rust/2018-01-04/rust-std-1.23.0-aarch64-unknown-freebsd.tar.gz) = 248cd23557285c7e43ca5ba69d8c71c810ed95affbd723d21d5ce87058bf66f1 -SIZE (rust/2018-01-04/rust-std-1.23.0-aarch64-unknown-freebsd.tar.gz) = 71207727 -SHA256 (rust/2018-01-04/cargo-0.24.0-aarch64-unknown-freebsd.tar.gz) = b028d83da266259adf81ae00b8263a08bfb0ae1bcdbb79abca2fd565fe550669 -SIZE (rust/2018-01-04/cargo-0.24.0-aarch64-unknown-freebsd.tar.gz) = 3895466 -SHA256 (rust/2018-01-04/rustc-1.23.0-i686-unknown-freebsd.tar.gz) = 47211ab3d9232d08a626f666da1d83f8d713de6010b7c9e1b28565c5c0edf544 -SIZE (rust/2018-01-04/rustc-1.23.0-i686-unknown-freebsd.tar.gz) = 49240849 -SHA256 (rust/2018-01-04/rust-std-1.23.0-i686-unknown-freebsd.tar.gz) = 5c220445e20467b71a76bdffeff87d57e17e99860ee8c0e745509147ea283393 -SIZE (rust/2018-01-04/rust-std-1.23.0-i686-unknown-freebsd.tar.gz) = 67245886 -SHA256 (rust/2018-01-04/cargo-0.24.0-i686-unknown-freebsd.tar.gz) = c15a71df418533e1c1bb4a879b10c819e0f0b5bc831c148ffafe69a60dbd8ccc -SIZE (rust/2018-01-04/cargo-0.24.0-i686-unknown-freebsd.tar.gz) = 5854910 -SHA256 (rust/2018-01-04/rustc-1.23.0-x86_64-unknown-freebsd.tar.gz) = 49576fd518c3bf7b3b665e666d16a8c4875577514cc1864e498d3b0a50cff500 -SIZE (rust/2018-01-04/rustc-1.23.0-x86_64-unknown-freebsd.tar.gz) = 48148869 -SHA256 (rust/2018-01-04/rust-std-1.23.0-x86_64-unknown-freebsd.tar.gz) = 6a7b58f6beb9b5dfad44ee286be552cc96117be3fdce0f2a0ed2904b0ce23186 -SIZE (rust/2018-01-04/rust-std-1.23.0-x86_64-unknown-freebsd.tar.gz) = 66669825 -SHA256 (rust/2018-01-04/cargo-0.24.0-x86_64-unknown-freebsd.tar.gz) = 89878efa237bc0121f3702cd286796c4ce8b0829e671408fe0ea99bf28ce2d4c -SIZE (rust/2018-01-04/cargo-0.24.0-x86_64-unknown-freebsd.tar.gz) = 5912767 +SHA256 (rust/2018-02-15/cargo-0.25.0-aarch64-unknown-freebsd.tar.gz) = b722073829728fb6519b0653f42086d75a3dcfabdc0e760ed950bf2442d3c9b8 +SIZE (rust/2018-02-15/cargo-0.25.0-aarch64-unknown-freebsd.tar.gz) = 4080471 +SHA256 (rust/2018-02-15/cargo-0.25.0-i686-unknown-freebsd.tar.gz) = c0ebc42bc19933220d56238920dcade0750eb64462d55830403e0e7167f09316 +SIZE (rust/2018-02-15/cargo-0.25.0-i686-unknown-freebsd.tar.gz) = 5455389 +SHA256 (rust/2018-02-15/cargo-0.25.0-x86_64-unknown-freebsd.tar.gz) = 9b914574fbdbd4190718ce681041af3ac161aab2bcd5b3b6d52ccb954660c5d3 +SIZE (rust/2018-02-15/cargo-0.25.0-x86_64-unknown-freebsd.tar.gz) = 5604586 +SHA256 (rust/2018-02-15/rust-std-1.24.0-aarch64-unknown-freebsd.tar.gz) = 9e9b4d9ce972e972986b0ebb4f417041400e2be76dcddf645f6d6c8d1b3987bf +SIZE (rust/2018-02-15/rust-std-1.24.0-aarch64-unknown-freebsd.tar.gz) = 78129215 +SHA256 (rust/2018-02-15/rust-std-1.24.0-i686-unknown-freebsd.tar.gz) = 41d21402bd5b29c292c4db4a06b07396271e10824006794138e6f9b581f9f319 +SIZE (rust/2018-02-15/rust-std-1.24.0-i686-unknown-freebsd.tar.gz) = 81013253 +SHA256 (rust/2018-02-15/rust-std-1.24.0-x86_64-unknown-freebsd.tar.gz) = 99d0ca487e292f76e425074ae77f4e12fe1f67d3f90e0b0a8c4b8ed4e87bc163 +SIZE (rust/2018-02-15/rust-std-1.24.0-x86_64-unknown-freebsd.tar.gz) = 80387975 +SHA256 (rust/2018-02-15/rustc-1.24.0-aarch64-unknown-freebsd.tar.gz) = 14efaeb960da1b4524ae9a25657415ca92f6e54d12bb55e95ad4e38b625ef9ab +SIZE (rust/2018-02-15/rustc-1.24.0-aarch64-unknown-freebsd.tar.gz) = 60099868 +SHA256 (rust/2018-02-15/rustc-1.24.0-i686-unknown-freebsd.tar.gz) = f775a54ee18263a12fe9039d98af19c36a7b4e513f54cbd247a32e6b008d40cd +SIZE (rust/2018-02-15/rustc-1.24.0-i686-unknown-freebsd.tar.gz) = 63788470 +SHA256 (rust/2018-02-15/rustc-1.24.0-x86_64-unknown-freebsd.tar.gz) = 2a0110adc137bf241962eb4000bdba8cbf3713e09087edaba499bb917dce9b8e +SIZE (rust/2018-02-15/rustc-1.24.0-x86_64-unknown-freebsd.tar.gz) = 62428675 +SHA256 (rust/rustc-1.25.0-src.tar.xz) = 14fcb82d5959df758aaf422539359300917217fa8420e34bd596e3fb6ed2de87 +SIZE (rust/rustc-1.25.0-src.tar.xz) = 56108536 +TIMESTAMP = 1523914189 Modified: branches/2018Q2/lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs ============================================================================== --- branches/2018Q2/lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs Mon Apr 16 21:35:26 2018 (r467538) +++ branches/2018Q2/lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs Mon Apr 16 21:37:21 2018 (r467539) @@ -1,13 +1,12 @@ Return struct like OpenBSD, see src/librustc_trans/cabi_x86.rs ---- src/librustc_back/target/freebsd_base.rs.orig 2017-11-22 21:33:00 UTC +--- src/librustc_back/target/freebsd_base.rs.orig 2018-03-25 14:26:14 UTC +++ src/librustc_back/target/freebsd_base.rs -@@ -31,6 +31,8 @@ pub fn opts() -> TargetOptions { +@@ -31,6 +31,7 @@ pub fn opts() -> TargetOptions { target_family: Some("unix".to_string()), linker_is_gnu: true, has_rpath: true, + is_like_openbsd: true, -+ eliminate_frame_pointer: false, pre_link_args: args, position_independent_executables: true, - relro_level: RelroLevel::Full, + eliminate_frame_pointer: false, // FIXME 43575 From owner-svn-ports-branches@freebsd.org Tue Apr 17 00:45: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 4B535F8B617; Tue, 17 Apr 2018 00:45: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 E2322741F4; Tue, 17 Apr 2018 00:45: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 DCB4A24C4B; Tue, 17 Apr 2018 00:45: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 w3H0jXra057449; Tue, 17 Apr 2018 00:45:33 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3H0jXgu057441; Tue, 17 Apr 2018 00:45:33 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804170045.w3H0jXgu057441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 17 Apr 2018 00:45:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r467548 - 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: 467548 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Apr 2018 00:45:34 -0000 Author: jbeich Date: Tue Apr 17 00:45:32 2018 New Revision: 467548 URL: https://svnweb.freebsd.org/changeset/ports/467548 Log: MFH: r467545 www/waterfox: apply some FF60 fixes Approved by: ports-secteam blanket Added: branches/2018Q2/www/waterfox/files/patch-bug1393367 - copied unchanged from r467545, head/www/waterfox/files/patch-bug1393367 branches/2018Q2/www/waterfox/files/patch-bug1448863 - copied unchanged from r467545, head/www/waterfox/files/patch-bug1448863 branches/2018Q2/www/waterfox/files/patch-bug1452202 - copied unchanged from r467545, head/www/waterfox/files/patch-bug1452202 branches/2018Q2/www/waterfox/files/patch-bug1452417 - copied unchanged from r467545, head/www/waterfox/files/patch-bug1452417 branches/2018Q2/www/waterfox/files/patch-bug1453339 - copied unchanged from r467545, head/www/waterfox/files/patch-bug1453339 branches/2018Q2/www/waterfox/files/patch-bug1453555 - copied unchanged from r467545, head/www/waterfox/files/patch-bug1453555 branches/2018Q2/www/waterfox/files/patch-bug1453740 - copied unchanged from r467545, head/www/waterfox/files/patch-bug1453740 Modified: branches/2018Q2/www/waterfox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/waterfox/Makefile ============================================================================== --- branches/2018Q2/www/waterfox/Makefile Tue Apr 17 00:44:04 2018 (r467547) +++ branches/2018Q2/www/waterfox/Makefile Tue Apr 17 00:45:32 2018 (r467548) @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.1.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Copied: branches/2018Q2/www/waterfox/files/patch-bug1393367 (from r467545, head/www/waterfox/files/patch-bug1393367) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1393367 Tue Apr 17 00:45:32 2018 (r467548, copy of r467545, head/www/waterfox/files/patch-bug1393367) @@ -0,0 +1,25 @@ +commit 4536ef50d724 +Author: Miko Mynttinen +Date: Thu Apr 12 14:18:03 2018 +0200 + + Bug 1393367 - Change MOZ_ASSERT to MOZ_RELEASE_ASSERT. r=mstange, r=fbraun, a=RyanVM + + --HG-- + extra : source : 1908cd8ed88dd4f77a99dff39c193d7d3f435195 +--- + gfx/2d/FilterNodeSoftware.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git gfx/2d/FilterNodeSoftware.cpp gfx/2d/FilterNodeSoftware.cpp +index 1d55425073b0..f1174f550d41 100644 +--- gfx/2d/FilterNodeSoftware.cpp ++++ gfx/2d/FilterNodeSoftware.cpp +@@ -2798,7 +2798,7 @@ FilterNodeArithmeticCombineSoftware::SetAttribute(uint32_t aIndex, + uint32_t aSize) + { + MOZ_ASSERT(aIndex == ATT_ARITHMETIC_COMBINE_COEFFICIENTS); +- MOZ_ASSERT(aSize == 4); ++ MOZ_RELEASE_ASSERT(aSize == 4); + + mK1 = aFloat[0]; + mK2 = aFloat[1]; Copied: branches/2018Q2/www/waterfox/files/patch-bug1448863 (from r467545, head/www/waterfox/files/patch-bug1448863) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1448863 Tue Apr 17 00:45:32 2018 (r467548, copy of r467545, head/www/waterfox/files/patch-bug1448863) @@ -0,0 +1,214 @@ +commit 7fd98bb22f4c +Author: Byron Campen [:bwc] +Date: Mon Mar 26 10:19:31 2018 -0500 + + Bug 1448863 - Stop sync dispatching in Decode. r=jesup, a=RyanVM + + MozReview-Commit-ID: 3EK0zAsFpHz + + --HG-- + extra : source : 549f0b8075d587eca29a6a72b1b62caf84d4b4fc +--- + .../src/media-conduit/WebrtcGmpVideoCodec.cpp | 122 ++++++++++----------- + .../src/media-conduit/WebrtcGmpVideoCodec.h | 7 +- + media/webrtc/webrtc.mozbuild | 4 + + 3 files changed, 65 insertions(+), 68 deletions(-) + +diff --git media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp +index 6cd4a1e1e200..81fd5f099454 100644 +--- media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp ++++ media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp +@@ -770,14 +770,8 @@ WebrtcGmpVideoDecoder::GmpInitDone(GMPVideoDecoderProxy* aGMP, + nsTArray> temp; + temp.SwapElements(mQueuedFrames); + for (auto& queued : temp) { +- int rv = Decode_g(queued->mImage, +- queued->mMissingFrames, +- nullptr, +- nullptr, +- queued->mRenderTimeMs); +- if (rv) { +- return rv; +- } ++ Decode_g(RefPtr(this), ++ nsAutoPtr(queued.release())); + } + } + +@@ -805,61 +799,58 @@ WebrtcGmpVideoDecoder::Decode(const webrtc::EncodedImage& aInputImage, + const webrtc::CodecSpecificInfo* aCodecSpecificInfo, + int64_t aRenderTimeMs) + { +- int32_t ret; + MOZ_ASSERT(mGMPThread); + MOZ_ASSERT(!NS_IsMainThread()); +- // Would be really nice to avoid this sync dispatch, but it would require a +- // copy of the frame, since it doesn't appear to actually have a refcount. +- // Passing 'this' is safe since this is synchronous. +- mozilla::SyncRunnable::DispatchToThread(mGMPThread, +- WrapRunnableRet(&ret, this, +- &WebrtcGmpVideoDecoder::Decode_g, +- aInputImage, +- aMissingFrames, +- aFragmentation, +- aCodecSpecificInfo, +- aRenderTimeMs)); ++ if (!aInputImage._length) { ++ return WEBRTC_VIDEO_CODEC_ERROR; ++ } ++ ++ nsAutoPtr decodeData(new GMPDecodeData(aInputImage, ++ aMissingFrames, ++ aRenderTimeMs)); ++ ++ mGMPThread->Dispatch(WrapRunnableNM(&WebrtcGmpVideoDecoder::Decode_g, ++ RefPtr(this), ++ decodeData), ++ NS_DISPATCH_NORMAL); + +- return ret; ++ return WEBRTC_VIDEO_CODEC_OK; + } + +-int32_t +-WebrtcGmpVideoDecoder::Decode_g(const webrtc::EncodedImage& aInputImage, +- bool aMissingFrames, +- const webrtc::RTPFragmentationHeader* aFragmentation, +- const webrtc::CodecSpecificInfo* aCodecSpecificInfo, +- int64_t aRenderTimeMs) +-{ +- if (!mGMP) { +- if (mInitting) { ++/* static */ ++// Using nsAutoPtr because WrapRunnable doesn't support move semantics ++void ++WebrtcGmpVideoDecoder::Decode_g(const RefPtr& aThis, ++ nsAutoPtr aDecodeData) ++{ ++ if (!aThis->mGMP) { ++ if (aThis->mInitting) { + // InitDone hasn't been called yet (race) +- GMPDecodeData *data = new GMPDecodeData(aInputImage, +- aMissingFrames, +- aRenderTimeMs); +- mQueuedFrames.AppendElement(data); +- return WEBRTC_VIDEO_CODEC_OK; ++ aThis->mQueuedFrames.AppendElement(aDecodeData.forget()); ++ return; + } + // destroyed via Terminate(), failed to init, or just not initted yet + LOGD(("GMP Decode: not initted yet")); +- return WEBRTC_VIDEO_CODEC_ERROR; ++ return; + } +- MOZ_ASSERT(mQueuedFrames.IsEmpty()); +- MOZ_ASSERT(mHost); + +- if (!aInputImage._length) { +- return WEBRTC_VIDEO_CODEC_ERROR; +- } ++ MOZ_ASSERT(aThis->mQueuedFrames.IsEmpty()); ++ MOZ_ASSERT(aThis->mHost); + + GMPVideoFrame* ftmp = nullptr; +- GMPErr err = mHost->CreateFrame(kGMPEncodedVideoFrame, &ftmp); ++ GMPErr err = aThis->mHost->CreateFrame(kGMPEncodedVideoFrame, &ftmp); + if (err != GMPNoErr) { +- return WEBRTC_VIDEO_CODEC_ERROR; ++ LOG(LogLevel::Error, ("%s: CreateFrame failed (%u)!", ++ __PRETTY_FUNCTION__, static_cast(err))); ++ return; + } + + GMPUniquePtr frame(static_cast(ftmp)); +- err = frame->CreateEmptyFrame(aInputImage._length); ++ err = frame->CreateEmptyFrame(aDecodeData->mImage._length); + if (err != GMPNoErr) { +- return WEBRTC_VIDEO_CODEC_ERROR; ++ LOG(LogLevel::Error, ("%s: CreateEmptyFrame failed (%u)!", ++ __PRETTY_FUNCTION__, static_cast(err))); ++ return; + } + + // XXX At this point, we only will get mode1 data (a single length and a buffer) +@@ -867,18 +858,20 @@ WebrtcGmpVideoDecoder::Decode_g(const webrtc::EncodedImage& aInputImage, + *(reinterpret_cast(frame->Buffer())) = frame->Size(); + + // XXX It'd be wonderful not to have to memcpy the encoded data! +- memcpy(frame->Buffer()+4, aInputImage._buffer+4, frame->Size()-4); ++ memcpy(frame->Buffer()+4, aDecodeData->mImage._buffer+4, frame->Size()-4); + +- frame->SetEncodedWidth(aInputImage._encodedWidth); +- frame->SetEncodedHeight(aInputImage._encodedHeight); +- frame->SetTimeStamp((aInputImage._timeStamp * 1000ll)/90); // rounds down +- frame->SetCompleteFrame(aInputImage._completeFrame); ++ frame->SetEncodedWidth(aDecodeData->mImage._encodedWidth); ++ frame->SetEncodedHeight(aDecodeData->mImage._encodedHeight); ++ frame->SetTimeStamp((aDecodeData->mImage._timeStamp * 1000ll)/90); // rounds down ++ frame->SetCompleteFrame(aDecodeData->mImage._completeFrame); + frame->SetBufferType(GMP_BufferLength32); + + GMPVideoFrameType ft; +- int32_t ret = WebrtcFrameTypeToGmpFrameType(aInputImage._frameType, &ft); ++ int32_t ret = WebrtcFrameTypeToGmpFrameType(aDecodeData->mImage._frameType, &ft); + if (ret != WEBRTC_VIDEO_CODEC_OK) { +- return ret; ++ LOG(LogLevel::Error, ("%s: WebrtcFrameTypeToGmpFrameType failed (%u)!", ++ __PRETTY_FUNCTION__, static_cast(ret))); ++ return; + } + + // Bug XXXXXX: Set codecSpecific info +@@ -889,20 +882,23 @@ WebrtcGmpVideoDecoder::Decode_g(const webrtc::EncodedImage& aInputImage, + nsTArray codecSpecificInfo; + codecSpecificInfo.AppendElements((uint8_t*)&info, sizeof(GMPCodecSpecificInfo)); + +- LOGD(("GMP Decode: %" PRIu64 ", len %zu%s", frame->TimeStamp(), aInputImage._length, +- ft == kGMPKeyFrame ? ", KeyFrame" : "")); +- nsresult rv = mGMP->Decode(Move(frame), +- aMissingFrames, +- codecSpecificInfo, +- aRenderTimeMs); ++ LOGD(("GMP Decode: %" PRIu64 ", len %zu%s", frame->TimeStamp(), ++ aDecodeData->mImage._length, ft == kGMPKeyFrame ? ", KeyFrame" : "")); ++ ++ nsresult rv = aThis->mGMP->Decode(Move(frame), ++ aDecodeData->mMissingFrames, ++ codecSpecificInfo, ++ aDecodeData->mRenderTimeMs); + if (NS_FAILED(rv)) { +- return WEBRTC_VIDEO_CODEC_ERROR; ++ LOG(LogLevel::Error, ("%s: Decode failed (rv=%u)!", ++ __PRETTY_FUNCTION__, static_cast(rv))); + } +- if(mDecoderStatus != GMPNoErr){ +- mDecoderStatus = GMPNoErr; +- return WEBRTC_VIDEO_CODEC_ERROR; ++ ++ if(aThis->mDecoderStatus != GMPNoErr){ ++ aThis->mDecoderStatus = GMPNoErr; ++ LOG(LogLevel::Error, ("%s: Decoder status is bad (%u)!", ++ __PRETTY_FUNCTION__, static_cast(aThis->mDecoderStatus))); + } +- return WEBRTC_VIDEO_CODEC_OK; + } + + int32_t +diff --git media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.h media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.h +index 0f125d0b311a..92b5a270267e 100644 +--- media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.h ++++ media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.h +@@ -469,11 +469,8 @@ private: + RefPtr mInitDone; + }; + +- virtual int32_t Decode_g(const webrtc::EncodedImage& aInputImage, +- bool aMissingFrames, +- const webrtc::RTPFragmentationHeader* aFragmentation, +- const webrtc::CodecSpecificInfo* aCodecSpecificInfo, +- int64_t aRenderTimeMs); ++ static void Decode_g(const RefPtr& aThis, ++ nsAutoPtr aDecodeData); + + nsCOMPtr mMPS; + nsCOMPtr mGMPThread; Copied: branches/2018Q2/www/waterfox/files/patch-bug1452202 (from r467545, head/www/waterfox/files/patch-bug1452202) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1452202 Tue Apr 17 00:45:32 2018 (r467548, copy of r467545, head/www/waterfox/files/patch-bug1452202) @@ -0,0 +1,39 @@ +commit aad12e2cf1e8 +Author: Eric Rahm +Date: Mon Apr 9 11:01:59 2018 -0700 + + Bug 1452202 - Clean up PLDHashTable move operator. r=froydnj, a=RyanVM + + --HG-- + extra : source : 9036c64b7a66ffe93e717ca97642a4400e396d9c +--- + xpcom/ds/PLDHashTable.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git xpcom/ds/PLDHashTable.cpp xpcom/ds/PLDHashTable.cpp +index 9f4954c158f7..6cdf285e367e 100644 +--- xpcom/ds/PLDHashTable.cpp ++++ xpcom/ds/PLDHashTable.cpp +@@ -224,17 +224,17 @@ PLDHashTable::operator=(PLDHashTable&& aOther) + return *this; + } + +- // Destruct |this|. +- this->~PLDHashTable(); +- +- // |mOps| and |mEntrySize| are const so we can't assign them. Instead, we +- // require that they are equal. The justification for this is that they're ++ // |mOps| and |mEntrySize| are required to stay the same, they're + // conceptually part of the type -- indeed, if PLDHashTable was a templated + // type like nsTHashtable, they *would* be part of the type -- so it only + // makes sense to assign in cases where they match. + MOZ_RELEASE_ASSERT(mOps == aOther.mOps); + MOZ_RELEASE_ASSERT(mEntrySize == aOther.mEntrySize); + ++ // Reconstruct |this|. ++ this->~PLDHashTable(); ++ new (KnownNotNull, this) PLDHashTable(aOther.mOps, aOther.mEntrySize, 0); ++ + // Move non-const pieces over. + mHashShift = Move(aOther.mHashShift); + mEntryCount = Move(aOther.mEntryCount); Copied: branches/2018Q2/www/waterfox/files/patch-bug1452417 (from r467545, head/www/waterfox/files/patch-bug1452417) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1452417 Tue Apr 17 00:45:32 2018 (r467548, copy of r467545, head/www/waterfox/files/patch-bug1452417) @@ -0,0 +1,30 @@ +commit 0cd6747277f1 +Author: Valentin Gosu +Date: Tue Apr 10 22:07:47 2018 +0200 + + Bug 1452417 - Hold a ref to mRequest in PACResolver::Notify. r=bagder, a=abillings + + MozReview-Commit-ID: 1QeFlAiTCNt + + --HG-- + extra : source : f7fb95c9979452fe25e42873f54cf56a80a0a0d8 +--- + netwerk/base/ProxyAutoConfig.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git netwerk/base/ProxyAutoConfig.cpp netwerk/base/ProxyAutoConfig.cpp +index 2c965f8e8f4d..d562f321bb45 100644 +--- netwerk/base/ProxyAutoConfig.cpp ++++ netwerk/base/ProxyAutoConfig.cpp +@@ -307,8 +307,9 @@ public: + // nsITimerCallback + NS_IMETHOD Notify(nsITimer *timer) override + { +- if (mRequest) +- mRequest->Cancel(NS_ERROR_NET_TIMEOUT); ++ nsCOMPtr request(mRequest); ++ if (request) ++ request->Cancel(NS_ERROR_NET_TIMEOUT); + mTimer = nullptr; + return NS_OK; + } Copied: branches/2018Q2/www/waterfox/files/patch-bug1453339 (from r467545, head/www/waterfox/files/patch-bug1453339) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1453339 Tue Apr 17 00:45:32 2018 (r467548, copy of r467545, head/www/waterfox/files/patch-bug1453339) @@ -0,0 +1,172 @@ +commit b1ce2aee618c +Author: Boris Zbarsky +Date: Fri Apr 13 19:31:42 2018 -0400 + + Bug 1453339 - Make it harder to mess up Promise::All. r=peterv, a=abillings + + MozReview-Commit-ID: UO4wssYHj7 + + --HG-- + extra : source : 438494d2d17bec92e4f4e38661a85b60680ab087 +--- + dom/base/nsFrameLoader.cpp | 4 +--- + dom/cache/Cache.cpp | 2 +- + dom/promise/Promise.cpp | 27 +++++++++++++++------------ + dom/promise/Promise.h | 19 +++++++++++-------- + layout/style/FontFaceSet.cpp | 12 +----------- + 5 files changed, 29 insertions(+), 35 deletions(-) + +diff --git dom/base/nsFrameLoader.cpp dom/base/nsFrameLoader.cpp +index 705779d87b80..f2730dac80b3 100644 +--- dom/base/nsFrameLoader.cpp ++++ dom/base/nsFrameLoader.cpp +@@ -409,8 +409,6 @@ nsFrameLoader::FireWillChangeProcessEvent() + return nullptr; + } + JSContext* cx = jsapi.cx(); +- GlobalObject global(cx, mOwnerContent->GetOwnerGlobal()->GetGlobalJSObject()); +- MOZ_ASSERT(!global.Failed()); + + // Set our mBrowserChangingProcessBlockers property to refer to the blockers + // list. We will synchronously dispatch a DOM event to collect this list of +@@ -433,7 +431,7 @@ nsFrameLoader::FireWillChangeProcessEvent() + mBrowserChangingProcessBlockers = nullptr; + + ErrorResult rv; +- RefPtr allPromise = Promise::All(global, blockers, rv); ++ RefPtr allPromise = Promise::All(cx, blockers, rv); + return allPromise.forget(); + } + +diff --git dom/cache/Cache.cpp dom/cache/Cache.cpp +index 06df0f2a7cb9..3fb8b6c36040 100644 +--- dom/cache/Cache.cpp ++++ dom/cache/Cache.cpp +@@ -630,7 +630,7 @@ Cache::AddAll(const GlobalObject& aGlobal, + new FetchHandler(mActor->GetWorkerHolder(), this, + Move(aRequestList), promise); + +- RefPtr fetchPromise = Promise::All(aGlobal, fetchList, aRv); ++ RefPtr fetchPromise = Promise::All(aGlobal.Context(), fetchList, aRv); + if (NS_WARN_IF(aRv.Failed())) { + return nullptr; + } +diff --git dom/promise/Promise.cpp dom/promise/Promise.cpp +index d259d6cedfcb..88f026b26976 100644 +--- dom/promise/Promise.cpp ++++ dom/promise/Promise.cpp +@@ -134,37 +134,40 @@ Promise::Reject(nsIGlobalObject* aGlobal, JSContext* aCx, + + // static + already_AddRefed +-Promise::All(const GlobalObject& aGlobal, ++Promise::All(JSContext* aCx, + const nsTArray>& aPromiseList, ErrorResult& aRv) + { +- nsCOMPtr global; +- global = do_QueryInterface(aGlobal.GetAsSupports()); +- if (!global) { ++ JS::Rooted globalObj(aCx, JS::CurrentGlobalOrNull(aCx)); ++ if (!globalObj) { + aRv.Throw(NS_ERROR_UNEXPECTED); + return nullptr; + } + +- JSContext* cx = aGlobal.Context(); ++ nsCOMPtr global = xpc::NativeGlobal(globalObj); ++ if (!global) { ++ aRv.Throw(NS_ERROR_UNEXPECTED); ++ return nullptr; ++ } + +- JS::AutoObjectVector promises(cx); ++ JS::AutoObjectVector promises(aCx); + if (!promises.reserve(aPromiseList.Length())) { +- aRv.NoteJSContextException(cx); ++ aRv.NoteJSContextException(aCx); + return nullptr; + } + + for (auto& promise : aPromiseList) { +- JS::Rooted promiseObj(cx, promise->PromiseObj()); ++ JS::Rooted promiseObj(aCx, promise->PromiseObj()); + // Just in case, make sure these are all in the context compartment. +- if (!JS_WrapObject(cx, &promiseObj)) { +- aRv.NoteJSContextException(cx); ++ if (!JS_WrapObject(aCx, &promiseObj)) { ++ aRv.NoteJSContextException(aCx); + return nullptr; + } + promises.infallibleAppend(promiseObj); + } + +- JS::Rooted result(cx, JS::GetWaitForAllPromise(cx, promises)); ++ JS::Rooted result(aCx, JS::GetWaitForAllPromise(aCx, promises)); + if (!result) { +- aRv.NoteJSContextException(cx); ++ aRv.NoteJSContextException(aCx); + return nullptr; + } + +diff --git dom/promise/Promise.h dom/promise/Promise.h +index 447a2a195152..2c13d0146c40 100644 +--- dom/promise/Promise.h ++++ dom/promise/Promise.h +@@ -111,23 +111,26 @@ public: + return mGlobal; + } + +- // Do the equivalent of Promise.resolve in the current compartment of aCx. +- // Errorrs are reported on the ErrorResult; if aRv comes back !Failed(), this +- // function MUST return a non-null value. ++ // Do the equivalent of Promise.resolve in the compartment of aGlobal. The ++ // compartment of aCx is ignored. Errors are reported on the ErrorResult; if ++ // aRv comes back !Failed(), this function MUST return a non-null value. + static already_AddRefed + Resolve(nsIGlobalObject* aGlobal, JSContext* aCx, + JS::Handle aValue, ErrorResult& aRv); + +- // Do the equivalent of Promise.reject in the current compartment of aCx. +- // Errorrs are reported on the ErrorResult; if aRv comes back !Failed(), this +- // function MUST return a non-null value. ++ // Do the equivalent of Promise.reject in the compartment of aGlobal. The ++ // compartment of aCx is ignored. Errors are reported on the ErrorResult; if ++ // aRv comes back !Failed(), this function MUST return a non-null value. + static already_AddRefed + Reject(nsIGlobalObject* aGlobal, JSContext* aCx, + JS::Handle aValue, ErrorResult& aRv); + ++ // Do the equivalent of Promise.all in the current compartment of aCx. Errors ++ // are reported on the ErrorResult; if aRv comes back !Failed(), this function ++ // MUST return a non-null value. + static already_AddRefed +- All(const GlobalObject& aGlobal, +- const nsTArray>& aPromiseList, ErrorResult& aRv); ++ All(JSContext* aCx, const nsTArray>& aPromiseList, ++ ErrorResult& aRv); + + void + Then(JSContext* aCx, +diff --git layout/style/FontFaceSet.cpp layout/style/FontFaceSet.cpp +index 280bf30d96aa..f9038c8c4b14 100644 +--- layout/style/FontFaceSet.cpp ++++ layout/style/FontFaceSet.cpp +@@ -401,17 +401,7 @@ FontFaceSet::Load(JSContext* aCx, + } + } + +- nsIGlobalObject* globalObject = GetParentObject(); +- if (!globalObject) { +- aRv.Throw(NS_ERROR_FAILURE); +- return nullptr; +- } +- +- JS::Rooted jsGlobal(aCx, globalObject->GetGlobalJSObject()); +- GlobalObject global(aCx, jsGlobal); +- +- RefPtr result = Promise::All(global, promises, aRv); +- return result.forget(); ++ return Promise::All(aCx, promises, aRv); + } + + bool Copied: branches/2018Q2/www/waterfox/files/patch-bug1453555 (from r467545, head/www/waterfox/files/patch-bug1453555) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/waterfox/files/patch-bug1453555 Tue Apr 17 00:45:32 2018 (r467548, copy of r467545, head/www/waterfox/files/patch-bug1453555) @@ -0,0 +1,34 @@ +commit 5b6c49ed5c8d +Author: James Teh +Date: Thu Apr 12 16:32:19 2018 +1000 + + Bug 1453555: Fix accessibility group info for