CVS commit: pkgsrc/www/firefox

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul 20 21:41:39 UTC 2022

Modified Files:
        pkgsrc/www/firefox: distinfo
        pkgsrc/www/firefox/patches: patch-gfx_skia_skia_src_core_SkVM.cpp

Log Message:
firefox: Fix braino in last commit.


To generate a diff of this commit:
cvs rdiff -u -r1.474 -r1.475 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox/patches/patch-gfx_skia_skia_src_core_SkVM.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/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.474 pkgsrc/www/firefox/distinfo:1.475
--- pkgsrc/www/firefox/distinfo:1.474   Wed Jul 20 21:22:35 2022
+++ pkgsrc/www/firefox/distinfo Wed Jul 20 21:41:39 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.474 2022/07/20 21:22:35 nia Exp $
+$NetBSD: distinfo,v 1.475 2022/07/20 21:41:39 nia Exp $
 
 BLAKE2s (firefox-102.0.1.source.tar.xz) = 43e2f34c0e39d1a3d3d341e55d474a9e5551865ace57f9f0fd1d7eb16676ef64
 SHA512 (firefox-102.0.1.source.tar.xz) = a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417
@@ -14,7 +14,7 @@ SHA1 (patch-dom_base_nsAttrName.h) = ac7
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = b2adce9e65662283a11b6dcff40e95523e940045
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
-SHA1 (patch-gfx_skia_skia_src_core_SkVM.cpp) = cdb2c2b0d512c0eb8403abba9b74c218d3a306ea
+SHA1 (patch-gfx_skia_skia_src_core_SkVM.cpp) = 13c058199ca1d91a8b7964f6626952ce8bd933a4
 SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 298642a3527804115b398fb7904a3596962932e3
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658

Index: pkgsrc/www/firefox/patches/patch-gfx_skia_skia_src_core_SkVM.cpp
diff -u pkgsrc/www/firefox/patches/patch-gfx_skia_skia_src_core_SkVM.cpp:1.1 pkgsrc/www/firefox/patches/patch-gfx_skia_skia_src_core_SkVM.cpp:1.2
--- pkgsrc/www/firefox/patches/patch-gfx_skia_skia_src_core_SkVM.cpp:1.1        Wed Jul 20 21:22:35 2022
+++ pkgsrc/www/firefox/patches/patch-gfx_skia_skia_src_core_SkVM.cpp    Wed Jul 20 21:41:39 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-gfx_skia_skia_src_core_SkVM.cpp,v 1.1 2022/07/20 21:22:35 nia Exp $
+$NetBSD: patch-gfx_skia_skia_src_core_SkVM.cpp,v 1.2 2022/07/20 21:41:39 nia Exp $
 
 Work with PaX MPROTECT on NetBSD by stating that we will later make this memory
 block executable.
@@ -10,7 +10,7 @@ block executable.
          const size_t page = sysconf(_SC_PAGESIZE);
          fJITSize = ((a.size() + page - 1) / page) * page;  // mprotect works at page granularity.
 +#ifdef PROT_MPROTECT
-+        fJITBuf = mmap(nullptr,fJITSize, PROT_READ|PROT_WRITE|PROT_MPROTECT(PROT_WRITE), MAP_ANONYMOUS|MAP_PRIVATE, -1,0);
++        fJITBuf = mmap(nullptr,fJITSize, PROT_READ|PROT_WRITE|PROT_MPROTECT(PROT_EXEC), MAP_ANONYMOUS|MAP_PRIVATE, -1,0);
 +#else
          fJITBuf = mmap(nullptr,fJITSize, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1,0);
 +#endif