svn commit: r458709 - in branches/2018Q1/www: firefox firefox/files waterfox waterfox/files

[Jan Beich]

Author: jbeich
Date: Thu Jan 11 00:55:34 2018
New Revision: 458709
URL: https://svnweb.freebsd.org/changeset/ports/458709

Log:
  MFH: r458705
  
  www/firefox: work around crash on FreeBSD 10
  
  PR:		224917
  Suggested by:	dim
  Approved by:	ports-secteam blanket

Added:
  branches/2018Q1/www/firefox/files/patch-ipc_glue_MessageChannel.cpp
     - copied unchanged from r458705, head/www/firefox/files/patch-ipc_glue_MessageChannel.cpp
  branches/2018Q1/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp
     - copied unchanged from r458705, head/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp
Modified:
  branches/2018Q1/www/firefox/Makefile
  branches/2018Q1/www/waterfox/Makefile
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/www/firefox/Makefile
==============================================================================
--- branches/2018Q1/www/firefox/Makefile	Thu Jan 11 00:54:57 2018	(r458708)
+++ branches/2018Q1/www/firefox/Makefile	Thu Jan 11 00:55:34 2018	(r458709)
@@ -3,6 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	57.0.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

Copied: branches/2018Q1/www/firefox/files/patch-ipc_glue_MessageChannel.cpp (from r458705, head/www/firefox/files/patch-ipc_glue_MessageChannel.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/www/firefox/files/patch-ipc_glue_MessageChannel.cpp	Thu Jan 11 00:55:34 2018	(r458709, copy of r458705, head/www/firefox/files/patch-ipc_glue_MessageChannel.cpp)
@@ -0,0 +1,14 @@
+--- ipc/glue/MessageChannel.cpp.orig	2017-11-02 16:16:32 UTC
++++ ipc/glue/MessageChannel.cpp
+@@ -685,6 +685,11 @@ MessageChannel::WillDestroyCurrentMessageLoop()
+     mWorkerLoop = nullptr;
+ }
+ 
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 4000
++// Work around UB in __tree crashing mPendingPromises.clear()
++// http://llvm.org/viewvc/llvm-project?view=revision&revision=276003
++[[clang::optnone]]
++#endif
+ void
+ MessageChannel::Clear()
+ {

Modified: branches/2018Q1/www/waterfox/Makefile
==============================================================================
--- branches/2018Q1/www/waterfox/Makefile	Thu Jan 11 00:54:57 2018	(r458708)
+++ branches/2018Q1/www/waterfox/Makefile	Thu Jan 11 00:55:34 2018	(r458709)
@@ -2,6 +2,7 @@
 
 PORTNAME=	waterfox
 DISTVERSION=	56.0.2
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich at FreeBSD.org

Copied: branches/2018Q1/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp (from r458705, head/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp	Thu Jan 11 00:55:34 2018	(r458709, copy of r458705, head/www/waterfox/files/patch-ipc_glue_MessageChannel.cpp)
@@ -0,0 +1,14 @@
+--- ipc/glue/MessageChannel.cpp.orig	2017-11-02 16:16:32 UTC
++++ ipc/glue/MessageChannel.cpp
+@@ -685,6 +685,11 @@ MessageChannel::WillDestroyCurrentMessageLoop()
+     mWorkerLoop = nullptr;
+ }
+ 
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 4000
++// Work around UB in __tree crashing mPendingPromises.clear()
++// http://llvm.org/viewvc/llvm-project?view=revision&revision=276003
++[[clang::optnone]]
++#endif
+ void
+ MessageChannel::Clear()
+ {