 @@ -1,47 +1,47 @@
-$NetBSD: distinfo,v 1.488 2023/01/21 01:14:07 ryoon Exp $
+$NetBSD: distinfo,v 1.489 2023/01/24 17:57:09 nia Exp $
 BLAKE2s (firefox-109.0.source.tar.xz) = ac0452efd5ea92e5de2682815e0634ca8b89b5995b0ac6e81f20849dd80575ef
 SHA512 (firefox-109.0.source.tar.xz) = 9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7
 Size (firefox-109.0.source.tar.xz) = 493231972 bytes
 BLAKE2s (nodejs-output-95.0.tgz) = c44b37d3605524a49157002f01c29f568f04194b0e635bc312de7ffdeb9a74c9
 SHA512 (nodejs-output-95.0.tgz) = 2faf326f4e100b66f8597c365cc2eb5d0eee26aae92a7e2446891f2178041aa71ba16eae37000acacd43a657025ec11c18db73b112f5c49cc21cdb882da6d798
 Size (nodejs-output-95.0.tgz) = 200627 bytes
 SHA1 (patch-browser_app_profile_firefox.js) = 18041d7fe211d61578863cfc53349278925f8e56
 SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a
 SHA1 (patch-config_makefiles_rust.mk) = 188178b184d79737247ed3770cc8f4370cd7f6c0
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 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) = 93e26b6981197870d8197e0ca3a0f384d6e13f55
+SHA1 (patch-gfx_skia_skia_src_core_SkVM.cpp) = bf556ef959bcf0ef64420fc72ecdb6dbeed90b98
 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
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 6cdd0fe60455eab8f9846257c2bfea207f19478b
 SHA1 (patch-js_src_jit_FlushICache.cpp) = b7536050d06e87612fbedc7ce269b5f120eb0ce9
-SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = fad103cc698f9828ad58f742231984ec2bc27605
+SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = 1e25924a29e3700b0e0e5d143f1db35029b431fb
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
-SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 0501fdcae11568ae4ea78e0d2f6b3750b7a67d47
+SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 374ffc0ce12e1c5babf2e553aba96612b0a30b1e
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 2ef11da83c90c41490db4c0d9809c3e1826b488a
 SHA1 (patch-media_libcubeb_src_cubeb__jack.cpp) = fc546c5e6582fd5eda64ba83287dfbbb3c9e229f
-SHA1 (patch-media_libcubeb_src_moz.build) = e027285ea24f2626b1328d4c6e9a31ed55445f99
+SHA1 (patch-media_libcubeb_src_moz.build) = 77d33aee556babe2f45638d06be9944c063ca171
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
 SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f
 SHA1 (patch-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e
 SHA1 (patch-mozglue_misc_Uptime.cpp) = daefe25ef1ebc8e4d3735017b9e8ac68c4710a00
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
 SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
-SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc) = a38d6a7acbc8ba8060f2cf3c8325f7d96902b3f0
+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) = 28b9bb8b078b479d9cc0f8ccdc4d04e5a281c1b9
+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-toolkit_components_terminator_nsTerminator.cpp) = e905e38ef1b88d764c695c019f15609350c1c43b
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 2303b753066298305ccae80d72765dbc4da5e0dc
-SHA1 (patch-toolkit_moz.configure) = 8de54693dc47b0993f220cc5a04af98925de1fb5
+SHA1 (patch-toolkit_moz.configure) = 6c54fbcf6cb0e1ab718dc6c115b460767679d8a0
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662
-SHA1 (patch-widget_gtk_DMABufSurface.cpp) = 72bc9554f075734df12e1748fb8965dce8318de5
+SHA1 (patch-widget_gtk_DMABufSurface.cpp) = aea8998364945f0a435ad63860ab50d56d5c0895
 SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = f7e491c7b62a5332066473bfc815e0050672a372
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 81d43a046fcef6bf6717d52485686ba8e8738254

 @@ -1,18 +1,20 @@
-$NetBSD: patch-gfx_skia_skia_src_core_SkVM.cpp,v 1.3 2022/12/23 12:35:05 nia Exp $
+$NetBSD: patch-gfx_skia_skia_src_core_SkVM.cpp,v 1.4 2023/01/24 17:57:09 nia 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
 @@ -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.
 +#ifdef PROT_MPROTECT
 +        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
          // Assemble the program for real.

 @@ -1,17 +1,19 @@
-$NetBSD: patch-js_src_jit_ProcessExecutableMemory.cpp,v 1.2 2021/02/23 17:02:04 ryoon Exp $
+$NetBSD: patch-js_src_jit_ProcessExecutableMemory.cpp,v 1.3 2023/01/24 17:57:09 nia Exp $
 PaX MPROTECT safety for NetBSD.
 https://bugzilla.mozilla.org/show_bug.cgi?id=1811913
 --- js/src/jit/ProcessExecutableMemory.cpp.orig	2021-02-11 21:17:13.000000000 +0000
 +++ js/src/jit/ProcessExecutableMemory.cpp
 @@ -362,9 +362,16 @@ static void* ReserveProcessExecutableMem
    // Note that randomAddr is just a hint: if the address is not available
    // mmap will pick a different address.
    void* randomAddr = ComputeRandomAllocationAddress();
 +#ifdef PROT_MPROTECT
 +  void* p = MozTaggedAnonymousMmap(randomAddr, bytes,
 +                                   PROT_MPROTECT(PROT_EXEC | PROT_WRITE | PROT_READ),
 +                                   MAP_PRIVATE | MAP_ANON, -1, 0,
 +                                   "js-executable-memory");
 +#else
    void* p = MozTaggedAnonymousMmap(randomAddr, bytes, PROT_NONE,

 @@ -1,17 +1,19 @@
-$NetBSD: patch-js_src_vm_ArrayBufferObject.cpp,v 1.2 2021/06/30 15:09:56 ryoon Exp $
+$NetBSD: patch-js_src_vm_ArrayBufferObject.cpp,v 1.3 2023/01/24 17:57:09 nia Exp $
 PaX MPROTECT safety for NetBSD.
 https://bugzilla.mozilla.org/show_bug.cgi?id=1811913
 --- js/src/vm/ArrayBufferObject.cpp.orig	2021-05-20 21:29:34.000000000 +0000
 +++ js/src/vm/ArrayBufferObject.cpp
 @@ -189,9 +189,17 @@ void* js::MapBufferMemory(size_t mappedS
    MOZ_ASSERT(data);
    memset(data, 0, mappedSize);
  #else   // !XP_WIN && !__wasi__
++
 +#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

 @@ -1,16 +1,16 @@
-$NetBSD: patch-widget_gtk_DMABufSurface.cpp,v 1.2 2021/04/19 13:50:07 ryoon Exp $
+$NetBSD: patch-widget_gtk_DMABufSurface.cpp,v 1.3 2023/01/24 17:57:09 nia Exp $
-No eventfd on netbsd, fix build
+No eventfd on NetBSD 9 and older, fix build
 --- widget/gtk/DMABufSurface.cpp.orig	2021-04-08 21:20:12.000000000 +0000
 +++ widget/gtk/DMABufSurface.cpp
 @@ -18,7 +18,9 @@
  #include <sys/time.h>
  #include <dlfcn.h>
  #include <sys/mman.h>
 +#ifndef __NetBSD__
  #include <sys/eventfd.h>
 +#endif
  #include <poll.h>
  #include <sys/ioctl.h>

 @@ -1,16 +1,18 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.21 2022/05/13 14:12:53 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.22 2023/01/24 17:57:09 nia Exp $
 * Add Sun audio support
 https://bugzilla.mozilla.org/show_bug.cgi?id=1811911
 --- media/libcubeb/src/moz.build.orig	2022-04-28 22:02:59.000000000 +0000
 +++ media/libcubeb/src/moz.build
 @@ -22,6 +22,12 @@ if CONFIG['MOZ_ALSA']:
+     ]
      DEFINES['USE_ALSA'] = True
 +if CONFIG['MOZ_SUNAUDIO']:
 +    SOURCES += [
 +        'cubeb_sun.c',
 +    ]
 +    DEFINES['USE_SUN'] = True
++

 @@ -1,16 +1,16 @@
-$NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc,v 1.1 2022/12/11 13:49:09 ryoon Exp $
+$NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc,v 1.2 2023/01/24 17:57:09 nia Exp $
-* Fix buiuld under older NetBSD.
+* Fix build under NetBSD 9 and older.
   The older NetBSD's sys/videoio.h does not have v4l2_capability.device_caps.
 --- third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc.orig	2022-10-19 18:00:20.000000000 +0000
 +++ third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc
 @@ -193,11 +193,13 @@ uint32_t DeviceInfoV4l2::NumberOfDevices
    for (int n = 0; n < 64; n++) {
      snprintf(device, sizeof(device), "/dev/video%d", n);
      if ((fd = open(device, O_RDONLY)) != -1) {
 +#if defined(VIDIOC_QUERYCAP)
        // query device capabilities and make sure this is a video capture device
        if (ioctl(fd, VIDIOC_QUERYCAP, &cap) < 0 || !IsVideoCaptureDevice(&cap)) {
          close(fd);
          continue;

 @@ -1,16 +1,16 @@
-$NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_video__capture__v4l2.cc,v 1.1 2022/12/11 13:49:09 ryoon Exp $
+$NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_video__capture__v4l2.cc,v 1.2 2023/01/24 17:57:09 nia Exp $
-* Fix buiuld under older NetBSD.
+* Fix build under NetBSD 9 and older.
   The older NetBSD's sys/videoio.h does not have v4l2_capability.device_caps.
 --- third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc.orig	2022-10-06 21:19:29.000000000 +0000
 +++ third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc
 @@ -77,6 +77,7 @@ int32_t VideoCaptureModuleV4L2::Init(con
      if ((fd = open(device, O_RDONLY)) != -1) {
        // query device capabilities
        struct v4l2_capability cap;
 +#if defined(VIDIOC_QUERYCAP)
        if (ioctl(fd, VIDIOC_QUERYCAP, &cap) == 0) {
          if (cap.bus_info[0] != 0) {
            if (strncmp((const char*)cap.bus_info,
 @@ -89,6 +90,7 @@ int32_t VideoCaptureModuleV4L2::Init(con

 @@ -1,18 +1,20 @@
-$NetBSD: patch-toolkit_moz.configure,v 1.14 2022/05/13 14:12:53 ryoon Exp $
+$NetBSD: patch-toolkit_moz.configure,v 1.15 2023/01/24 17:57:09 nia Exp $
 * Add Sun audio support and enable for NetBSD and SunOS by default.
 * Enable ALSA for NetBSD too.
 https://bugzilla.mozilla.org/show_bug.cgi?id=1811911
 --- toolkit/moz.configure.orig	2022-04-28 23:01:47.000000000 +0000
 +++ toolkit/moz.configure
 @@ -198,6 +198,10 @@ def audio_backends_default(target):
          return ("sndio",)
      elif target.os == "OSX":
          return ("audiounit",)
 +    elif target.os == "NetBSD":
 +        return ("sunaudio",)
 +    elif target.os == "SunOS":
 +        return ("sunaudio",)
      elif target.os == "WINNT":
          return ("wasapi",)
      else:

 @@ -1,15 +1,17 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.13 2020/12/17 09:53:15 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.14 2023/01/24 17:57:09 nia Exp $
 Make NetBSD/sparc64 use the same xptcall bindings as all other sparc64 ports
 https://bugzilla.mozilla.org/show_bug.cgi?id=1505360
 --- xpcom/reflect/xptcall/md/unix/moz.build.orig	2020-12-03 23:14:25.000000000 +0000
 +++ xpcom/reflect/xptcall/md/unix/moz.build
 @@ -225,7 +225,7 @@ if CONFIG["OS_ARCH"] == "OpenBSD" and CO
+     ]
  if (
 -    CONFIG["OS_ARCH"] in ("OpenBSD", "FreeBSD", "Linux", "SunOS")
 +    CONFIG["OS_ARCH"] in ("OpenBSD", "FreeBSD", "NetBSD", "Linux", "SunOS")
      and CONFIG["CPU_ARCH"] == "sparc64"
  ):
      SOURCES += [