CVS commit: pkgsrc/www/arcticfox

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 21 15:11:51 UTC 2024

Modified Files:
        pkgsrc/www/arcticfox: Makefile distinfo
Added Files:
        pkgsrc/www/arcticfox/patches:
            patch-js_src_jit_ExecutableAllocatorPosix.cpp
            patch-js_src_vm_ArrayBufferObject.cpp

Log Message:
arcticfox: PaX MPROTECT safety for NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/www/arcticfox/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/arcticfox/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/arcticfox/patches/patch-js_src_jit_ExecutableAllocatorPosix.cpp \
    pkgsrc/www/arcticfox/patches/patch-js_src_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/www/arcticfox/Makefile
diff -u pkgsrc/www/arcticfox/Makefile:1.43 pkgsrc/www/arcticfox/Makefile:1.44
--- pkgsrc/www/arcticfox/Makefile:1.43  Thu Mar 21 12:47:19 2024
+++ pkgsrc/www/arcticfox/Makefile       Thu Mar 21 15:11:51 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2024/03/21 12:47:19 nia Exp $
+# $NetBSD: Makefile,v 1.44 2024/03/21 15:11:51 nia Exp $
 
 DISTNAME=      arcticfox-43.1
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rmottola/}
 GITHUB_PROJECT=        Arctic-Fox
@@ -92,9 +93,6 @@ REPLACE_PYTHON+=              xpcom/typelib/xpt/tool
 PYTHON_VERSIONS_ACCEPTED=      27
 PYTHON_FOR_BUILD_ONLY=         tool
 
-NOT_PAX_MPROTECT_SAFE+=                lib/${PKGNAME_NOREV}/arcticfox
-NOT_PAX_MPROTECT_SAFE+=                lib/${PKGNAME_NOREV}/arcticfox-bin
-
 pre-configure:
        ${MKDIR} ${CONFIGURE_DIRS}
        cd ${WRKSRC} && autoconf-2.13

Index: pkgsrc/www/arcticfox/distinfo
diff -u pkgsrc/www/arcticfox/distinfo:1.12 pkgsrc/www/arcticfox/distinfo:1.13
--- pkgsrc/www/arcticfox/distinfo:1.12  Thu Mar 21 12:47:19 2024
+++ pkgsrc/www/arcticfox/distinfo       Thu Mar 21 15:11:51 2024
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.12 2024/03/21 12:47:19 nia Exp $
+$NetBSD: distinfo,v 1.13 2024/03/21 15:11:51 nia Exp $
 
 BLAKE2s (arcticfox-43.1.tar.gz) = 26cdcdf7ff023250df4aed3dcc7119031aa86f7466be2315bff9032f94227230
 SHA512 (arcticfox-43.1.tar.gz) = 19f2934fcf4cb07192176957fb7427d17d8ab4cd5cd10eadbc3630e4deb0a3ad3de5b1656e68b26d6537cff43d3c2997fa3e189fcf05ad70c6e62cb4d943818b
 Size (arcticfox-43.1.tar.gz) = 213148775 bytes
 SHA1 (patch-configure.in) = ccea0e59b808d8743b66c58bda07a2719e89e74f
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 98dd10e2eaa3ec2160f517d1a6cee01caa37ffb0
+SHA1 (patch-js_src_jit_ExecutableAllocatorPosix.cpp) = 91e900b6d995edc70b3234468580f7db5aa88446
+SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 7af433cde0b6391facdf7f785f8f1b660f458a73
 SHA1 (patch-media_libcubeb_src_cubeb.c) = b3c4bd8146e2f7146baf1c2050260f7629cdb09a
 SHA1 (patch-media_libcubeb_src_moz.build) = e98b39b6272b58d4183c526f36987ea239fadd5d
 SHA1 (patch-xpcom_reflect_xptcall_genstubs.pl) = 88a431a961fd910e1e7043877eba77d377185bc3

Added files:

Index: pkgsrc/www/arcticfox/patches/patch-js_src_jit_ExecutableAllocatorPosix.cpp
diff -u /dev/null pkgsrc/www/arcticfox/patches/patch-js_src_jit_ExecutableAllocatorPosix.cpp:1.1
--- /dev/null   Thu Mar 21 15:11:51 2024
+++ pkgsrc/www/arcticfox/patches/patch-js_src_jit_ExecutableAllocatorPosix.cpp  Thu Mar 21 15:11:51 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-js_src_jit_ExecutableAllocatorPosix.cpp,v 1.1 2024/03/21 15:11:51 nia Exp $
+
+PaX MPROTECT safety for NetBSD.
+
+--- js/src/jit/ExecutableAllocatorPosix.cpp.orig       2024-03-21 14:18:03.401738129 +0000
++++ js/src/jit/ExecutableAllocatorPosix.cpp
+@@ -48,6 +48,9 @@ js::jit::AllocateExecutableMemory(void* 
+                                   size_t pageSize)
+ {
+     MOZ_ASSERT(bytes % pageSize == 0);
++#ifdef PROT_MPROTECT
++    permissions |= PROT_MPROTECT(PROT_READ | PROT_WRITE | PROT_EXEC);
++#endif
+     void* p = MozTaggedAnonymousMmap(addr, bytes, permissions, MAP_PRIVATE | MAP_ANON, -1, 0, tag);
+     return p == MAP_FAILED ? nullptr : p;
+ }
Index: pkgsrc/www/arcticfox/patches/patch-js_src_vm_ArrayBufferObject.cpp
diff -u /dev/null pkgsrc/www/arcticfox/patches/patch-js_src_vm_ArrayBufferObject.cpp:1.1
--- /dev/null   Thu Mar 21 15:11:51 2024
+++ pkgsrc/www/arcticfox/patches/patch-js_src_vm_ArrayBufferObject.cpp  Thu Mar 21 15:11:51 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-js_src_vm_ArrayBufferObject.cpp,v 1.1 2024/03/21 15:11:51 nia Exp $
+
+PaX MPROTECT safety for NetBSD.
+
+--- js/src/vm/ArrayBufferObject.cpp.orig       2024-03-21 14:19:53.458599709 +0000
++++ js/src/vm/ArrayBufferObject.cpp
+@@ -393,7 +393,11 @@ ReleaseWasmMappedMemory(void* base)
+ static void*
+ AllocateWasmMappedMemory(uint32_t numBytes)
+ {
+-    void* data = MozTaggedAnonymousMmap(nullptr, wasm::MappedSize, PROT_NONE,
++    int prot = PROT_NONE;
++#ifdef PROT_MPROTECT
++    prot |= PROT_MPROTECT(PROT_READ | PROT_WRITE | PROT_EXEC);
++#endif
++    void* data = MozTaggedAnonymousMmap(nullptr, wasm::MappedSize, prot,
+                                         MAP_PRIVATE | MAP_ANON, -1, 0, "wasm-reserved");
+     if (data == MAP_FAILED)
+         return nullptr;