Tue Jul 9 16:08:38 2019 UTC ()
spidermonkey52: pour a bucket over this wildfire and backport a security fix.

From https://bugs.chromium.org/p/project-zero/issues/detail?id=1823 / mozjs
upstream.

Bump PKGREVISION


(maya)
diff -r1.16 -r1.17 pkgsrc/lang/spidermonkey52/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/spidermonkey52/distinfo
diff -r0 -r1.1 pkgsrc/lang/spidermonkey52/patches/patch-js_src_jit_IonBuilder.cpp
cvs diff -r1.16 -r1.17 pkgsrc/lang/spidermonkey52/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/spidermonkey52/Attic/Makefile 2019/05/24 18:15:38 1.16
+++ pkgsrc/lang/spidermonkey52/Attic/Makefile 2019/07/09 16:08:38 1.17
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.16 2019/05/24 18:15:38 leot Exp $ 1# $NetBSD: Makefile,v 1.17 2019/07/09 16:08:38 maya Exp $
2 2
3DISTNAME= mozjs-52.7.4 3DISTNAME= mozjs-52.7.4
4PKGREVISION= 9 4PKGREVISION= 10
5PKGNAME= ${DISTNAME:S/mozjs/spidermonkey52/} 5PKGNAME= ${DISTNAME:S/mozjs/spidermonkey52/}
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= https://queue.taskcluster.net/v1/task/YqG2fjJJSTGzGX090FjDYg/runs/0/artifacts/public/build/ 7MASTER_SITES= https://queue.taskcluster.net/v1/task/YqG2fjJJSTGzGX090FjDYg/runs/0/artifacts/public/build/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/52 11HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/52
12COMMENT= Standalone JavaScript implementation in C (major version 52) 12COMMENT= Standalone JavaScript implementation in C (major version 52)
13LICENSE= mpl-2.0 13LICENSE= mpl-2.0
14 14
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= pkg-config perl gmake autoconf213 17USE_TOOLS+= pkg-config perl gmake autoconf213
cvs diff -r1.6 -r1.7 pkgsrc/lang/spidermonkey52/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/spidermonkey52/Attic/distinfo 2019/05/24 18:15:38 1.6
+++ pkgsrc/lang/spidermonkey52/Attic/distinfo 2019/07/09 16:08:38 1.7
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: distinfo,v 1.6 2019/05/24 18:15:38 leot Exp $ 1$NetBSD: distinfo,v 1.7 2019/07/09 16:08:38 maya Exp $
2 2
3SHA1 (mozjs-52.7.4.tar.bz2) = ff009853040bb46017204fda4ed69a79484fd321 3SHA1 (mozjs-52.7.4.tar.bz2) = ff009853040bb46017204fda4ed69a79484fd321
4RMD160 (mozjs-52.7.4.tar.bz2) = 71ee71c2444d8b6a1b2b3c744c9f52a2b7129879 4RMD160 (mozjs-52.7.4.tar.bz2) = 71ee71c2444d8b6a1b2b3c744c9f52a2b7129879
5SHA512 (mozjs-52.7.4.tar.bz2) = 7381f251ca9a4983d181eee2198f89b30505a0de636020e52c0c5b174f4d5cd19ca851222b6d8013bb657f2f1ce1ffcb54816eb928e481be2c9242f918d0125e 5SHA512 (mozjs-52.7.4.tar.bz2) = 7381f251ca9a4983d181eee2198f89b30505a0de636020e52c0c5b174f4d5cd19ca851222b6d8013bb657f2f1ce1ffcb54816eb928e481be2c9242f918d0125e
6Size (mozjs-52.7.4.tar.bz2) = 30494311 bytes 6Size (mozjs-52.7.4.tar.bz2) = 30494311 bytes
7SHA1 (patch-CVE-2018-12387) = a0e3198e1009db01bb5a39220764e7dcdfd52591 7SHA1 (patch-CVE-2018-12387) = a0e3198e1009db01bb5a39220764e7dcdfd52591
8SHA1 (patch-build_moz.configure_init.configure) = 63ed71d4269e8fbf990f44eecadca796991d5c1f 8SHA1 (patch-build_moz.configure_init.configure) = 63ed71d4269e8fbf990f44eecadca796991d5c1f
9SHA1 (patch-config_gcc__hidden.h) = c2042035288e01601b6c240fb08c8a1f598b9dfd 9SHA1 (patch-config_gcc__hidden.h) = c2042035288e01601b6c240fb08c8a1f598b9dfd
10SHA1 (patch-intl_icu_source_configure) = 1ff1be8ca68566e153219e15b8db696afd08b746 10SHA1 (patch-intl_icu_source_configure) = 1ff1be8ca68566e153219e15b8db696afd08b746
11SHA1 (patch-js_src_gc_Memory.cpp) = b1bb0c3045163d586c0b4d731d0ed7c23f339f3c 11SHA1 (patch-js_src_gc_Memory.cpp) = b1bb0c3045163d586c0b4d731d0ed7c23f339f3c
 12SHA1 (patch-js_src_jit_IonBuilder.cpp) = b8be1d71d01c5f0e1b1016500be862b73e68df1b
12SHA1 (patch-js_src_jsnativestack.cpp) = 3d0b06ccc3e24b408b97d01faa7758353f2edc85 13SHA1 (patch-js_src_jsnativestack.cpp) = 3d0b06ccc3e24b408b97d01faa7758353f2edc85
13SHA1 (patch-js_src_old-configure_in) = 4fd3df4abde94758429d943641e1bd7bad3ca926 14SHA1 (patch-js_src_old-configure_in) = 4fd3df4abde94758429d943641e1bd7bad3ca926
14SHA1 (patch-js_src_tests_update-test262.sh) = 10d73d95f4b849090bccb8fe656df79cbcea89f3 15SHA1 (patch-js_src_tests_update-test262.sh) = 10d73d95f4b849090bccb8fe656df79cbcea89f3
15SHA1 (patch-js_src_threading_posix_Thread.cpp) = e490d04ed28ffd8b2e9901a24739ad19fe6759e0 16SHA1 (patch-js_src_threading_posix_Thread.cpp) = e490d04ed28ffd8b2e9901a24739ad19fe6759e0
16SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = fd9b836d35d71103c3d8b628a6fe7c446bd4c7da 17SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = fd9b836d35d71103c3d8b628a6fe7c446bd4c7da
17SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 610f7457f6a1993d26fcccd5730113bb48926d99 18SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 610f7457f6a1993d26fcccd5730113bb48926d99
18SHA1 (patch-mfbt_Poison.cpp) = f4560e4552beeb70d0564e3fdfd908c5e0bd94c4 19SHA1 (patch-mfbt_Poison.cpp) = f4560e4552beeb70d0564e3fdfd908c5e0bd94c4
19SHA1 (patch-mfbt_tests_TestPoisonArea.cpp) = 054441d4618bf630be6d6e71babdcdaa884f533a 20SHA1 (patch-mfbt_tests_TestPoisonArea.cpp) = 054441d4618bf630be6d6e71babdcdaa884f533a
20SHA1 (patch-modules_fdlibm_src_math__private.h) = afa40802bfdb917d7906de486eb8882da426c9cf 21SHA1 (patch-modules_fdlibm_src_math__private.h) = afa40802bfdb917d7906de486eb8882da426c9cf
21SHA1 (patch-mozglue_build_moz.build) = f35ffa1a54ccc4cd1ed7983aac792e334c9169b1 22SHA1 (patch-mozglue_build_moz.build) = f35ffa1a54ccc4cd1ed7983aac792e334c9169b1
22SHA1 (patch-python_mozbuild_mozbuild_backend_recursivemake.py) = ffb59ddf2d95eb284d24dad3d3aedc7d7f5b5d96 23SHA1 (patch-python_mozbuild_mozbuild_backend_recursivemake.py) = ffb59ddf2d95eb284d24dad3d3aedc7d7f5b5d96
23SHA1 (patch-python_mozbuild_mozbuild_configure_constants.py) = aed1c08cecc29e29edc8ccee98d032546814d6e4 24SHA1 (patch-python_mozbuild_mozbuild_configure_constants.py) = aed1c08cecc29e29edc8ccee98d032546814d6e4
File Added: pkgsrc/lang/spidermonkey52/patches/Attic/patch-js_src_jit_IonBuilder.cpp
$NetBSD: patch-js_src_jit_IonBuilder.cpp,v 1.1 2019/07/09 16:08:38 maya Exp $

# HG changeset patch
# User Jan de Mooij <jdemooij@mozilla.com>
# Date 1556819484 0
# Node ID dbd28ea2e13c17d9566a8a95370b87a6d3341e71
# Parent  76d84e7aeb3ffc34d0d52cc4adc89bd6ddd0c2e7
Bug 1544792 - Abort on try-catch blocks when doing definite properties analysis. r=nbp, a=pascalc

Ion does not compile the catch block so the analysis fails to account for code
there.

Differential Revision: https://phabricator.services.mozilla.com/D29475

--- js/src/jit/IonBuilder.cpp.orig	2018-04-28 01:04:03.000000000 +0000
+++ js/src/jit/IonBuilder.cpp
@@ -4540,6 +4540,10 @@ IonBuilder::jsop_try()
     // accessing the arguments within the 'catch' block is not accounted for.
     if (info().analysisMode() == Analysis_ArgumentsUsage)
         return abort("Try-catch during arguments usage analysis");
+    // Try-catch during analyses is not yet supported. Code within the 'catch'
+    // block is not accounted for.
+    if (info().isAnalysis())
+        return abort("Try-catch during analysis");
 
     graph().setHasTryBlock();