CVS commit: pkgsrc/lang/mozjs68

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Nov  6 09:11:31 UTC 2020

Modified Files:
        pkgsrc/lang/mozjs68: Makefile distinfo
Added Files:
        pkgsrc/lang/mozjs68/patches: patch-vm_ArrayBufferObject.cpp

Log Message:
mozjs68: add one more patch necessary for paxctl-safety.

affects wasm. found while using firefox, which experiences a lot more js.

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/mozjs68/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/mozjs68/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/mozjs68/patches/patch-vm_ArrayBufferObject.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/mozjs68/Makefile
diff -u pkgsrc/lang/mozjs68/Makefile:1.10 pkgsrc/lang/mozjs68/Makefile:1.11
--- pkgsrc/lang/mozjs68/Makefile:1.10   Thu Nov  5 16:35:24 2020
+++ pkgsrc/lang/mozjs68/Makefile        Fri Nov  6 09:11:31 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2020/11/05 16:35:24 nia Exp $
+# $NetBSD: Makefile,v 1.11 2020/11/06 09:11:31 maya Exp $
 
 DISTNAME=      mozjs68_68.6.0.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    lang
 MASTER_SITES=  http://deb.debian.org/debian/pool/main/m/mozjs68/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/lang/mozjs68/distinfo
diff -u pkgsrc/lang/mozjs68/distinfo:1.3 pkgsrc/lang/mozjs68/distinfo:1.4
--- pkgsrc/lang/mozjs68/distinfo:1.3    Thu Nov  5 16:35:24 2020
+++ pkgsrc/lang/mozjs68/distinfo        Fri Nov  6 09:11:31 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2020/11/05 16:35:24 nia Exp $
+$NetBSD: distinfo,v 1.4 2020/11/06 09:11:31 maya Exp $
 
 SHA1 (mozjs68_68.6.0.orig.tar.xz) = 98eb63629e8889caa738fa15591fe8eeba73b227
 RMD160 (mozjs68_68.6.0.orig.tar.xz) = 7b00f416e1e767b0595fbd7e4c26c42c83ccd7a1
@@ -7,5 +7,6 @@ Size (mozjs68_68.6.0.orig.tar.xz) = 7530
 SHA1 (patch-.._.._config_rules.mk) = cf3421d991e1cbfab4c0cdcb7b648b1388fa32d5
 SHA1 (patch-.._.._python_mozbuild_mozbuild_backend_recursivemake.py) = dda670432e5673c5d28dcf6c4902d4a724e71170
 SHA1 (patch-jit_ProcessExecutableMemory.cpp) = 575c1ab68e6558344c09481927c40f0b4308319a
+SHA1 (patch-vm_ArrayBufferObject.cpp) = c8460d3b59eb57731e5a1df8d61ff3f02344d8d2
 SHA1 (patch-vm_JSONPrinter.cpp) = 384f26d9602844a3a586184c8971d48a07453645
 SHA1 (patch-vm_JSONPrinter.h) = b92c335185886f79d15f2d9d348bf10e4a714c6e

Added files:

Index: pkgsrc/lang/mozjs68/patches/patch-vm_ArrayBufferObject.cpp
diff -u /dev/null pkgsrc/lang/mozjs68/patches/patch-vm_ArrayBufferObject.cpp:1.1
--- /dev/null   Fri Nov  6 09:11:31 2020
+++ pkgsrc/lang/mozjs68/patches/patch-vm_ArrayBufferObject.cpp  Fri Nov  6 09:11:31 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-vm_ArrayBufferObject.cpp,v 1.1 2020/11/06 09:11:31 maya Exp $
+
+PaX MPROTECT safety for NetBSD.
+
+--- vm/ArrayBufferObject.cpp.orig      2020-03-05 20:57:04.000000000 +0000
++++ vm/ArrayBufferObject.cpp
+@@ -179,9 +179,17 @@ void* js::MapBufferMemory(size_t mappedS
+     return nullptr;
+   }
+ #else   // XP_WIN
++
++#ifdef PROT_MPROTECT
++  void* data =
++      MozTaggedAnonymousMmap(nullptr, mappedSize,
++                             PROT_MPROTECT(PROT_EXEC | PROT_WRITE | PROT_READ),
++                             MAP_PRIVATE | MAP_ANON, -1, 0, "wasm-reserved");
++#else
+   void* data =
+       MozTaggedAnonymousMmap(nullptr, mappedSize, PROT_NONE,
+                              MAP_PRIVATE | MAP_ANON, -1, 0, "wasm-reserved");
++#endif
+   if (data == MAP_FAILED) {
+     liveBufferCount--;
+     return nullptr;