pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/www/firefox

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Jun 14 16:22:19 UTC 2023

Modified Files:
        pkgsrc/www/firefox: Makefile PLIST distinfo mozilla-common.mk
        pkgsrc/www/firefox/patches: patch-gfx_skia_skia_src_core_SkVM.cpp
            patch-toolkit_xre_glxtest.cpp
Added Files:
        pkgsrc/www/firefox/patches: patch-third__party_sqlite3_src_moz.build
            patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc
            patch-third__party_wasm2c_wasm2c_wasm-rt-impl.c
Removed Files:
        pkgsrc/www/firefox/patches: patch-Cargo.lock patch-Cargo.toml
            patch-third__party_wasm2c_wasm2c_wasm-rt-os-unix.c

Log Message:
firefox: Update to 114.0.1

* mprotect support for firefox and firefox-bin is insufficient now.

Changelog:
114.0.1

Fixed

  * Fix a startup crash (bug 1837201).

114.0

New

  * Added UI to manage the DNS over HTTPS exception list.

  * Bookmarks can now be searched from the Bookmarks menu. The Bookmarks menu
    is accessible by adding the Bookmarks menu button to the toolbar.

  * Restrict searches to your local browsing history by selecting Search
    history from the History, Library or Application menu buttons.

  * Mac users can now capture video from their cameras in all supported native
    resolutions. This enables resolutions higher than 1280x720.

  * It is now possible to reorder the extensions listed in the extensions
    panel.

  * Users on macOS, Linux, and Windows 7 can now use FIDO2 / WebAuthn
    authenticators over USB. Some advanced features, such as fully passwordless
    logins, require a PIN to be set on the authenticator.

  * Pocket Recommended content can now be seen in France, Italy, and Spain.

Fixed

  * Various security fixes.

Changed

  * DNS over HTTPS settings are now part of the Privacy & Security section of
    the Settings page and allow the user to choose from all the supported
    modes.

Enterprise

  * You can find information about policy updates and enterprise specific bug
    fixes in the Firefox for Enterprise 114 Release Notes.

Developer

  * Developer Information
  * The Copy as cURL feature, available in the Network panel, has been
    enhanced. It now supports the --compressed argument.

  * The Accessibility Inspector has been improved to accurately recognize all
    the ARIA roles like banner, main, navigation, and contentinfo, etc. This
    enhancement is particularly beneficial for web developers working with ARIA
    roles to improve web accessibility.

  * Firefox now provides support for the CSS Cascading Level 4 supports()
    syntax for @import rules. This allows for the importation of other
    stylesheets based on support-dependency. In addition, the Inspector panel
    now accurately displays the conditions at the top of the imported rule.

    developer tools screenshot of the new @import syntax rule

Web Platform

  * DOM: Added support for ES Modules on DedicatedWorker and SharedWorker

  * WebTransport is now enabled by default and will be going to release with
    114. As the original Explainer notes, it enables multiple use-cases that
    are hard or impossible to handle without it, especially for Gaming and live
    streaming. It covers cases that are problematic for alternative mechanisms,
    such as WebSockets.

    Built on top of HTTP3 (HTTP2 support will be coming later). The current
    implementation in Firefox is passing 505 out of 565 Web-Platform Tests.

  * CSS: The infinity and NaN constants are now supported inside the calc()
    function.

Security fixes
#CVE-2023-34414: Click-jacking certificate exceptions through rendering lag
#CVE-2023-34415: Site-isolation bypass on sites that allow open redirects to
 data: urls
#CVE-2023-34416: Memory safety bugs fixed in Firefox 114 and Firefox ESR 102.12
#CVE-2023-34417: Memory safety bugs fixed in Firefox 114


To generate a diff of this commit:
cvs rdiff -u -r1.558 -r1.559 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.181 -r1.182 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.497 -r1.498 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.255 -r1.256 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/www/firefox/patches/patch-Cargo.lock
cvs rdiff -u -r1.1 -r0 pkgsrc/www/firefox/patches/patch-Cargo.toml
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/www/firefox/patches/patch-gfx_skia_skia_src_core_SkVM.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-third__party_sqlite3_src_moz.build \
    pkgsrc/www/firefox/patches/patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc \
    pkgsrc/www/firefox/patches/patch-third__party_wasm2c_wasm2c_wasm-rt-impl.c
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/www/firefox/patches/patch-third__party_wasm2c_wasm2c_wasm-rt-os-unix.c
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/www/firefox/patches/patch-toolkit_xre_glxtest.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/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.558 pkgsrc/www/firefox/Makefile:1.559
--- pkgsrc/www/firefox/Makefile:1.558   Sun Jun  4 09:26:35 2023
+++ pkgsrc/www/firefox/Makefile Wed Jun 14 16:22:18 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.558 2023/06/04 09:26:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.559 2023/06/14 16:22:18 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            113.0
-MOZ_BRANCH_MINOR=      .2
+MOZ_BRANCH=            114.0
+MOZ_BRANCH_MINOR=      .1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
@@ -69,6 +69,9 @@ LDFLAGS.SunOS+=               -lm
 
 # XXX not sure how to test this! likely unnecessary
 NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/plugin-container
+# Should revisit to complete mprotect support.
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox-bin
 
 # Avoid ld "invalid section index" errors.
 BUILDLINK_TRANSFORM.SunOS+=    rm:-fdata-sections

Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.181 pkgsrc/www/firefox/PLIST:1.182
--- pkgsrc/www/firefox/PLIST:1.181      Sat Oct  8 21:18:55 2022
+++ pkgsrc/www/firefox/PLIST    Wed Jun 14 16:22:18 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.181 2022/10/08 21:18:55 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.182 2023/06/14 16:22:18 ryoon Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/chrome/icons/default/default128.png
@@ -17,6 +17,7 @@ lib/firefox/dependentlibs.list
 lib/firefox/firefox
 lib/firefox/firefox-bin
 lib/firefox/fonts/TwemojiMozilla.ttf
+lib/firefox/glxtest
 lib/firefox/gmp-clearkey/0.1/libclearkey.so
 lib/firefox/gmp-clearkey/0.1/manifest.json
 lib/firefox/libipcclientcerts.so
@@ -32,6 +33,7 @@ lib/firefox/pingsender
 lib/firefox/platform.ini
 lib/firefox/plugin-container
 lib/firefox/removed-files
+lib/firefox/vaapitest
 share/applications/firefox.desktop
 share/icons/hicolor/128x128/apps/firefox.png
 share/icons/hicolor/16x16/apps/firefox.png

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.497 pkgsrc/www/firefox/distinfo:1.498
--- pkgsrc/www/firefox/distinfo:1.497   Sun Jun  4 09:26:35 2023
+++ pkgsrc/www/firefox/distinfo Wed Jun 14 16:22:18 2023
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.497 2023/06/04 09:26:35 ryoon Exp $
+$NetBSD: distinfo,v 1.498 2023/06/14 16:22:18 ryoon Exp $
 
-BLAKE2s (firefox-113.0.2.source.tar.xz) = b9ec55cc7b6cd65a375d70a5491a255e8b01b739c42fa541f61f05c0ab17b47f
-SHA512 (firefox-113.0.2.source.tar.xz) = 7b1ff7d547fda02901f54a2593e03598a830698192003d833e27b85db0e00571ff66e03ebd4089e76fa65b09df000cbb2542450beeabb0b310875910603e6743
-Size (firefox-113.0.2.source.tar.xz) = 500503164 bytes
+BLAKE2s (firefox-114.0.1.source.tar.xz) = 2d0d49681ed0244b4cb19f6f62ad2121e6923a5518117a97b718edfcf4d97c41
+SHA512 (firefox-114.0.1.source.tar.xz) = d422982e0271a68aa8064977b3a6b6f9412a30e7261ba06385c416e00e8ba0eb488d81a8929355fc92d35469d3308ec928f00e4de7248ed6390d5d900d7bce8f
+Size (firefox-114.0.1.source.tar.xz) = 499908376 bytes
 BLAKE2s (nodejs-output-113.0.2.tgz) = da79ce7a5ab44378ac326caaa496dc5592bfb645b24b09f11c241933dc8ebb86
 SHA512 (nodejs-output-113.0.2.tgz) = 83c7f21ec8bd1af66aa7ffa4d0ab442c41946f470918100ae50c7792182ed94afc588161a5142cdfbc71b85049beb3c660fce22444fca736a326810cfd8c1d4b
 Size (nodejs-output-113.0.2.tgz) = 216297 bytes
-SHA1 (patch-Cargo.lock) = 6cedfbc82aa0af21e99e8b1035a9d17a28be3d62
-SHA1 (patch-Cargo.toml) = e5478a9268b5891b42573b1954ff584877c75bc1
 SHA1 (patch-browser_app_profile_firefox.js) = 3b01cf7e37ea39bdd358fb14de5ce382b945ae39
 SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a
@@ -17,7 +15,7 @@ SHA1 (patch-dom_webtransport_api_WebTran
 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) = bf556ef959bcf0ef64420fc72ecdb6dbeed90b98
+SHA1 (patch-gfx_skia_skia_src_core_SkVM.cpp) = 11d8084e933f68496fc4d2f57d1eb1065483bf9c
 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
@@ -37,12 +35,14 @@ SHA1 (patch-third__party_libwebrtc_modul
 SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc) = 8848fb05c1e8b45234f74db71602a8a84c0404a4
 SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_video__capture__v4l2.cc) = 8111952a107eb2cd665525ddd0e27c79eee3c1cd
 SHA1 (patch-third__party_libwebrtc_system__wrappers_source_cpu__features__linux.cc) = b90e22b50879f7adcc1da3a993f52c0701b720f8
-SHA1 (patch-third__party_wasm2c_wasm2c_wasm-rt-os-unix.c) = e63607bcad6c25b11f58b0523ed5dfacddf9c36e
+SHA1 (patch-third__party_sqlite3_src_moz.build) = 2786a1f1d173e3774d89b5cdb0fd8f3148e47324
+SHA1 (patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc) = 99d0db944f0c2d0c623460991efd423d9127c988
+SHA1 (patch-third__party_wasm2c_wasm2c_wasm-rt-impl.c) = cd5fd67f53d7a448cc9075a3756e2a03d4f43e4b
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e905e38ef1b88d764c695c019f15609350c1c43b
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 2303b753066298305ccae80d72765dbc4da5e0dc
 SHA1 (patch-toolkit_moz.configure) = c183f8b1566ffed0df17bf856f693b3a288affeb
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662
-SHA1 (patch-toolkit_xre_glxtest.cpp) = 8a6cf6976615130dcbf8c63d9c7d79cd47351894
+SHA1 (patch-toolkit_xre_glxtest.cpp) = adcd5b05fcbd7b41c01a2aa66f3e8f05ed230444
 SHA1 (patch-widget_gtk_DMABufSurface.cpp) = b07836c49c0c9c85e7923d3297ad674453165522
 SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 81d43a046fcef6bf6717d52485686ba8e8738254

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.255 pkgsrc/www/firefox/mozilla-common.mk:1.256
--- pkgsrc/www/firefox/mozilla-common.mk:1.255  Wed Jun  7 14:40:13 2023
+++ pkgsrc/www/firefox/mozilla-common.mk        Wed Jun 14 16:22:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.255 2023/06/07 14:40:13 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.256 2023/06/14 16:22:18 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -19,8 +19,9 @@ UNLIMIT_RESOURCES+=   datasize virtualsize
 
 USE_LANGUAGES+=                c c++
 
-# ERROR: Only GCC 7.1 or newer is supported (found version 5.5.0).
-GCC_REQD+=             7
+# XXX: As of 114.0.2
+# For nested constant initializer support in rlbox, requires 8.
+GCC_REQD+=             8
 
 TOOL_DEPENDS+=         cbindgen>=0.24.3:../../devel/cbindgen
 
@@ -35,6 +36,9 @@ TOOL_DEPENDS+=                ${PYPKGPREFIX}-curses-[0
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
+# malloc_usable_size()
+LDFLAGS.NetBSD+=       -ljemalloc
+
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 TOOL_DEPENDS+=         nasm>=2.14:../../devel/nasm
 TOOL_DEPENDS+=         yasm>=1.1:../../devel/yasm
@@ -132,9 +136,20 @@ CONFIGURE_ARGS+=   --without-wasm-sandboxe
 SUBST_CLASSES+=                                fix-libpci-soname
 SUBST_STAGE.fix-libpci-soname=         pre-configure
 SUBST_MESSAGE.fix-libpci-soname=       Fixing libpci soname
-SUBST_FILES.fix-libpci-soname+=                ${MOZILLA_DIR}toolkit/xre/glxtest.cpp
+SUBST_FILES.fix-libpci-soname+=                ${MOZILLA_DIR}toolkit/xre/glxtest/glxtest.cpp
 SUBST_SED.fix-libpci-soname+=          -e 's,"libpci.so, "lib${PCIUTILS_LIBNAME}.so,'
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
+SQLITE3OPTFLAG=                '-O0',
+.else
+SQLITE3OPTFLAG=                # empty
+.endif
+SUBST_CLASSES+=                                sqlite3-opt
+SUBST_STAGE.sqlite3-opt=               pre-configure
+SUBST_MESSAGE.sqlite3-opt=             Fixing segfault in libmozsqlite3.so
+SUBST_FILES.sqlite3-opt+=              ${MOZILLA_DIR}third_party/sqlite3/src/moz.build
+SUBST_VARS.sqlite3-opt+=               SQLITE3OPTFLAG
+
 # Do not pass '-j1 -j1' for MAKE_JOBS=1 for NetBSD 9.3 or rearlier.
 RUST_MAKE_JOBS=                # empty by default
 .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090400

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.4 pkgsrc/www/firefox/patches/patch-gfx_skia_skia_src_core_SkVM.cpp:1.5
--- pkgsrc/www/firefox/patches/patch-gfx_skia_skia_src_core_SkVM.cpp:1.4        Tue Jan 24 17:57:09 2023
+++ pkgsrc/www/firefox/patches/patch-gfx_skia_skia_src_core_SkVM.cpp    Wed Jun 14 16:22:18 2023
@@ -1,21 +1,21 @@
-$NetBSD: patch-gfx_skia_skia_src_core_SkVM.cpp,v 1.4 2023/01/24 17:57:09 nia Exp $
+$NetBSD: patch-gfx_skia_skia_src_core_SkVM.cpp,v 1.5 2023/06/14 16:22:18 ryoon Exp $
 
 Work with PaX MPROTECT on NetBSD by stating that we will later make this memory
 block executable.
 
 https://bugzilla.mozilla.org/show_bug.cgi?id=1811913
 
---- gfx/skia/skia/src/core/SkVM.cpp.orig       2022-11-28 16:47:38.000000000 +0000
+--- gfx/skia/skia/src/core/SkVM.cpp.orig       2023-05-25 21:19:29.000000000 +0000
 +++ gfx/skia/skia/src/core/SkVM.cpp
-@@ -2076,7 +2076,11 @@ namespace skvm {
-         // Allocate space that we can remap as executable.
-         const size_t page = sysconf(_SC_PAGESIZE);
-         fJITSize = ((a.size() + page - 1) / page) * page;  // mprotect works at page granularity.
+@@ -57,7 +57,11 @@ bool gSkVMJITViaDylib{false};
+             // mprotect doesn't round up for you, and instead requires *len is at page granularity.
+             const size_t page = sysconf(_SC_PAGESIZE);
+             *len = ((*len + page - 1) / page) * page;
 +#ifdef PROT_MPROTECT
-+        fJITBuf = mmap(nullptr,fJITSize, PROT_READ|PROT_WRITE|PROT_MPROTECT(PROT_EXEC), MAP_ANONYMOUS|MAP_PRIVATE, -1,0);
++            return mmap(nullptr,*len, 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);
+             return mmap(nullptr,*len, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1,0);
 +#endif
- 
-         // Assemble the program for real.
-         a = Assembler{fJITBuf};
+         }
+         static void remap_as_executable(void* ptr, size_t len) {
+             mprotect(ptr, len, PROT_READ|PROT_EXEC);

Index: pkgsrc/www/firefox/patches/patch-toolkit_xre_glxtest.cpp
diff -u pkgsrc/www/firefox/patches/patch-toolkit_xre_glxtest.cpp:1.6 pkgsrc/www/firefox/patches/patch-toolkit_xre_glxtest.cpp:1.7
--- pkgsrc/www/firefox/patches/patch-toolkit_xre_glxtest.cpp:1.6        Sun Jun  4 09:26:35 2023
+++ pkgsrc/www/firefox/patches/patch-toolkit_xre_glxtest.cpp    Wed Jun 14 16:22:18 2023
@@ -1,13 +1,13 @@
-$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.6 2023/06/04 09:26:35 ryoon Exp $
+$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.7 2023/06/14 16:22:18 ryoon Exp $
 
 * Do not test Linux-specific entry for non-Linux.
 
---- toolkit/xre/glxtest.cpp.orig       2023-04-14 16:28:10.000000000 +0000
-+++ toolkit/xre/glxtest.cpp
-@@ -289,11 +289,15 @@ static void close_logging() {
- #define PCI_BASE_CLASS_DISPLAY 0x03
- 
+--- toolkit/xre/glxtest/glxtest.cpp.orig       2023-05-25 21:19:41.000000000 +0000
++++ toolkit/xre/glxtest/glxtest.cpp
+@@ -195,11 +195,15 @@ extern "C" {
  static void get_pci_status() {
+   log("GLX_TEST: get_pci_status start\n");
+ 
 +#if defined(__linux__)
    if (access("/sys/bus/pci/", F_OK) != 0 &&
        access("/sys/bus/pci_express/", F_OK) != 0) {

Added files:

Index: pkgsrc/www/firefox/patches/patch-third__party_sqlite3_src_moz.build
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third__party_sqlite3_src_moz.build:1.1
--- /dev/null   Wed Jun 14 16:22:19 2023
+++ pkgsrc/www/firefox/patches/patch-third__party_sqlite3_src_moz.build Wed Jun 14 16:22:18 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-third__party_sqlite3_src_moz.build,v 1.1 2023/06/14 16:22:18 ryoon Exp $
+
+* Fix segfault under NetBSD/i386 9 and pkgsrc/lang/gcc8-8.5.0
+  For NetBSD/i386 9, @SQLITE3OPTFLAG@ will be replaced with "'-O0',".
+
+--- third_party/sqlite3/src/moz.build.orig     2023-06-08 22:35:48.000000000 +0000
++++ third_party/sqlite3/src/moz.build
+@@ -106,4 +106,5 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc')
+     CFLAGS += [
+         '-Wno-sign-compare',
+         '-Wno-type-limits',
++        @SQLITE3OPTFLAG@
+     ]
Index: pkgsrc/www/firefox/patches/patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc:1.1
--- /dev/null   Wed Jun 14 16:22:19 2023
+++ pkgsrc/www/firefox/patches/patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc       Wed Jun 14 16:22:18 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc,v 1.1 2023/06/14 16:22:18 ryoon Exp $
+
+--- third_party/wasm2c/src/prebuilt/wasm2c_source_includes.cc.orig     2023-05-25 21:19:41.000000000 +0000
++++ third_party/wasm2c/src/prebuilt/wasm2c_source_includes.cc
+@@ -20,7 +20,7 @@ R"w2c_template(#include <malloc.h>
+ )w2c_template"
+ R"w2c_template(#define alloca _alloca
+ )w2c_template"
+-R"w2c_template(#elif defined(__FreeBSD__) || defined(__OpenBSD__)
++R"w2c_template(#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ )w2c_template"
+ R"w2c_template(#include <stdlib.h>
+ )w2c_template"
Index: pkgsrc/www/firefox/patches/patch-third__party_wasm2c_wasm2c_wasm-rt-impl.c
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third__party_wasm2c_wasm2c_wasm-rt-impl.c:1.1
--- /dev/null   Wed Jun 14 16:22:19 2023
+++ pkgsrc/www/firefox/patches/patch-third__party_wasm2c_wasm2c_wasm-rt-impl.c  Wed Jun 14 16:22:18 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-third__party_wasm2c_wasm2c_wasm-rt-impl.c,v 1.1 2023/06/14 16:22:18 ryoon Exp $
+
+* I believe that this is insufficient.
+
+--- third_party/wasm2c/wasm2c/wasm-rt-impl.c.orig      2023-05-25 21:19:41.000000000 +0000
++++ third_party/wasm2c/wasm2c/wasm-rt-impl.c
+@@ -144,6 +144,11 @@ static void os_cleanup_signal_handler(vo
+ #else
+ static void* os_mmap(size_t size) {
+   int map_prot = PROT_NONE;
++#ifdef PROT_MPROTECT
++    map_prot |= PROT_MPROTECT(PROT_READ);
++    map_prot |= PROT_MPROTECT(PROT_WRITE);
++    map_prot |= PROT_MPROTECT(PROT_EXEC);
++#endif
+   int map_flags = MAP_ANONYMOUS | MAP_PRIVATE;
+   uint8_t* addr = mmap(NULL, size, map_prot, map_flags, -1, 0);
+   if (addr == MAP_FAILED)
Home | Main Index | Thread Index | Old Index