CVS commit: pkgsrc/www/firefox

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/firefox
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Wed, 5 Apr 2023 14:22:36 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Apr  5 14:22:36 UTC 2023

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo options.mk
        pkgsrc/www/firefox/files: node-wrapper.sh
        pkgsrc/www/firefox/patches: patch-media_libcubeb_src_cubeb__alsa.c
            patch-toolkit_moz.configure patch-widget_gtk_DMABufSurface.cpp
Added Files:
        pkgsrc/www/firefox/patches:
            patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
Removed Files:
        pkgsrc/www/firefox/patches: patch-media_libcubeb_src_moz.build

Log Message:
firefox: Update to 111.0.1

* Enable eventfd(2) for NetBSD 10 or later.
* Fix LICENSE in official Firefox branding case.

Changelog:
111.0.1
Fixed

  * Fixed a crash on macOS while pinch-zooming under some circumstances (bug
    1658986).

  * Fixed a bug causing Firefox to freeze on startup for some Windows users (
    bug 1823159).

111.0
New

  * Windows native notifications are now enabled.

  * Firefox Relay users can now opt-in to create Relay email masks directly
    from the Firefox credential manager. You must be signed in with your
    Firefox Account.

  * We've added two new locales: Silhe Friulian (fur) and Sardinian (sc).

Fixed

  * Various security fixes.

Security fixes
#CVE-2023-28159: Fullscreen Notification could have been hidden by download
 popups on Android
#CVE-2023-25748: Fullscreen Notification could have been hidden by window
 prompts on Android
#CVE-2023-25749: Firefox for Android may have opened third-party apps without a
 prompt
#CVE-2023-25750: Potential ServiceWorker cache leak during private browsing
 mode
#CVE-2023-25751: Incorrect code generation during JIT compilation
#CVE-2023-28160: Redirect to Web Extension files may have leaked local path
#CVE-2023-28164: URL being dragged from a removed cross-origin iframe into the
 same tab triggered navigation
#CVE-2023-28161: One-time permissions granted to a local file were extended to
 other local files loaded in the same tab
#CVE-2023-28162: Invalid downcast in Worklets
#CVE-2023-25752: Potential out-of-bounds when accessing throttled streams
#CVE-2023-28163: Windows Save As dialog resolved environment variables
#CVE-2023-28176: Memory safety bugs fixed in Firefox 111 and Firefox ESR 102.9
#CVE-2023-28177: Memory safety bugs fixed in Firefox 111


To generate a diff of this commit:
cvs rdiff -u -r1.549 -r1.550 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.493 -r1.494 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.72 -r1.73 pkgsrc/www/firefox/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/firefox/files/node-wrapper.sh
cvs rdiff -u -r1.31 -r1.32 \
    pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
cvs rdiff -u -r1.22 -r0 \
    pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
cvs rdiff -u -r1.15 -r1.16 \
    pkgsrc/www/firefox/patches/patch-toolkit_moz.configure
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/www/firefox/patches/patch-widget_gtk_DMABufSurface.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.549 pkgsrc/www/firefox/Makefile:1.550
--- pkgsrc/www/firefox/Makefile:1.549   Mon Mar  6 11:47:26 2023
+++ pkgsrc/www/firefox/Makefile Wed Apr  5 14:22:35 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.549 2023/03/06 11:47:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.550 2023/04/05 14:22:35 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            110.0
+MOZ_BRANCH=            111.0
 MOZ_BRANCH_MINOR=      .1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
@@ -11,7 +11,7 @@ MASTER_SITES+=        ${MASTER_SITE_MOZILLA:=fi
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
 
-NODEJSKIT=             nodejs-output-95.0.tgz
+NODEJSKIT=             nodejs-output-111.0.tgz
 DISTFILES=             ${DEFAULT_DISTFILES} ${NODEJSKIT}
 SITES.${NODEJSKIT}=    ${MASTER_SITE_LOCAL}
 

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.493 pkgsrc/www/firefox/distinfo:1.494
--- pkgsrc/www/firefox/distinfo:1.493   Mon Mar  6 11:47:26 2023
+++ pkgsrc/www/firefox/distinfo Wed Apr  5 14:22:35 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.493 2023/03/06 11:47:26 ryoon Exp $
+$NetBSD: distinfo,v 1.494 2023/04/05 14:22:35 ryoon Exp $
 
-BLAKE2s (firefox-110.0.1.source.tar.xz) = 7239913cb6a2bd9ab70f5d7b396eb7bc675550309c3b0a23936e6932f52ff4e6
-SHA512 (firefox-110.0.1.source.tar.xz) = 42c6a99a3874a0f60121188c43788fb35577734d9366c3f89ad41b8328cc542ce172ec81ca35b9ea551eaa698197ccdb43922ec3215d311e0770aaaa59625d21
-Size (firefox-110.0.1.source.tar.xz) = 494223300 bytes
-BLAKE2s (nodejs-output-95.0.tgz) = c44b37d3605524a49157002f01c29f568f04194b0e635bc312de7ffdeb9a74c9
-SHA512 (nodejs-output-95.0.tgz) = 2faf326f4e100b66f8597c365cc2eb5d0eee26aae92a7e2446891f2178041aa71ba16eae37000acacd43a657025ec11c18db73b112f5c49cc21cdb882da6d798
-Size (nodejs-output-95.0.tgz) = 200627 bytes
+BLAKE2s (firefox-111.0.1.source.tar.xz) = 064fd7728894107ce1ad41b382c2d153aacdb6382bbdd4c6f1b1db2b1f654f5f
+SHA512 (firefox-111.0.1.source.tar.xz) = b16c9399a19cb1de2d865a023d54fbe71c23a363ea4d36cd58f41f64f7ad04bc1b9d8a8448943417516e17337e0ee2afd370c29a72b51b0947161f4ffab6935f
+Size (firefox-111.0.1.source.tar.xz) = 496209640 bytes
+BLAKE2s (nodejs-output-111.0.tgz) = 5e61c766822fdb7f5ef9e358de2ed00ba1c5074a2dad1e1d491772532f2bfe09
+SHA512 (nodejs-output-111.0.tgz) = 79ff7d122c48453a10312918b315acbe8dff6695042311be1b4aaa69c59fb77c7c14affc4f24fe23d9a6707d4c4dccf90c063e0f3af7de5807cdc45df5d0829e
+Size (nodejs-output-111.0.tgz) = 208870 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
@@ -24,8 +24,7 @@ SHA1 (patch-js_src_jit_ProcessExecutable
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
 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_moz.build) = 77d33aee556babe2f45638d06be9944c063ca171
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = e827ae7db2407f27e0310a17c690452276a70389
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
 SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f
 SHA1 (patch-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e
@@ -33,14 +32,15 @@ SHA1 (patch-mozglue_misc_Uptime.cpp) = d
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = b0d1f6a6e0eb852b0fd0238ad3f8ed3166c60a50
 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_desktop__capture_linux_wayland_egl__dmabuf.cc) = 8bae28e76062b12b06ba20db675cd9dc947e1034
 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-toolkit_components_terminator_nsTerminator.cpp) = e905e38ef1b88d764c695c019f15609350c1c43b
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 2303b753066298305ccae80d72765dbc4da5e0dc
-SHA1 (patch-toolkit_moz.configure) = 6c54fbcf6cb0e1ab718dc6c115b460767679d8a0
+SHA1 (patch-toolkit_moz.configure) = c183f8b1566ffed0df17bf856f693b3a288affeb
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662
-SHA1 (patch-widget_gtk_DMABufSurface.cpp) = aea8998364945f0a435ad63860ab50d56d5c0895
+SHA1 (patch-widget_gtk_DMABufSurface.cpp) = a953dd0ddf37a3719c61e60b8e89f1216e3be876
 SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 81d43a046fcef6bf6717d52485686ba8e8738254

Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.72 pkgsrc/www/firefox/options.mk:1.73
--- pkgsrc/www/firefox/options.mk:1.72  Sat Oct  8 21:18:55 2022
+++ pkgsrc/www/firefox/options.mk       Wed Apr  5 14:22:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.72 2022/10/08 21:18:55 ryoon Exp $
+# $NetBSD: options.mk,v 1.73 2023/04/05 14:22:35 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=      --disable-necko-wifi
 
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 CONFIGURE_ARGS+=       --enable-official-branding
-LICENSE=               mozilla-trademark-license
+LICENSE+=              AND mozilla-trademark-license
 RESTRICTED=            Trademark holder prohibits distribution of modified versions.
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}

Index: pkgsrc/www/firefox/files/node-wrapper.sh
diff -u pkgsrc/www/firefox/files/node-wrapper.sh:1.5 pkgsrc/www/firefox/files/node-wrapper.sh:1.6
--- pkgsrc/www/firefox/files/node-wrapper.sh:1.5        Thu Nov 11 16:48:04 2021
+++ pkgsrc/www/firefox/files/node-wrapper.sh    Wed Apr  5 14:22:35 2023
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-VERS=v14.18.1
+VERS=v19.7.0
 
 if [ "$1" = "-v" ] || [ "$1" = "--version" ]; then
        printf "${VERS}\n"

Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.31 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.32
--- pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.31      Thu Sep 30 14:18:28 2021
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c   Wed Apr  5 14:22:36 2023
@@ -1,12 +1,14 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.31 2021/09/30 14:18:28 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.32 2023/04/05 14:22:36 ryoon Exp $
 
---- media/libcubeb/src/cubeb_alsa.c.orig       2021-09-04 13:25:19.000000000 +0000
+--- media/libcubeb/src/cubeb_alsa.c.orig       2023-03-02 21:15:48.000000000 +0000
 +++ media/libcubeb/src/cubeb_alsa.c
-@@ -7,6 +7,7 @@
+@@ -7,6 +7,9 @@
  #undef NDEBUG
  #define _DEFAULT_SOURCE
  #define _BSD_SOURCE
-+#define _NETBSD_SOURCE
++#if defined(__NetBSD__)
++#define _NETBSD_SOURCE /* timersub() */
++#endif
  #define _XOPEN_SOURCE 500
  #include "cubeb-internal.h"
  #include "cubeb/cubeb.h"

Index: pkgsrc/www/firefox/patches/patch-toolkit_moz.configure
diff -u pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.15 pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.16
--- pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.15 Tue Jan 24 17:57:09 2023
+++ pkgsrc/www/firefox/patches/patch-toolkit_moz.configure      Wed Apr  5 14:22:36 2023
@@ -1,32 +1,10 @@
-$NetBSD: patch-toolkit_moz.configure,v 1.15 2023/01/24 17:57:09 nia Exp $
+$NetBSD: patch-toolkit_moz.configure,v 1.16 2023/04/05 14:22:36 ryoon 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.orig 2023-03-02 21:15:57.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:
-@@ -216,6 +220,7 @@ option(
-         "oss",
-         "pulseaudio",
-         "sndio",
-+        "sunaudio",
-         "wasapi",
-     ),
-     default=audio_backends_default,
-@@ -236,6 +241,7 @@ def imply_alsa(values, target):
+@@ -243,6 +243,7 @@ def imply_alsa(values, target):
          any("alsa" in value for value in values)
          and target.kernel != "Linux"
          and target.os != "FreeBSD"
@@ -34,26 +12,3 @@ https://bugzilla.mozilla.org/show_bug.cg
      ):
          die("Cannot enable ALSA on %s", target.os)
      return any("alsa" in value for value in values) or None
-@@ -290,6 +296,13 @@ def imply_sndio(values, target):
-         die("Cannot enable sndio on %s", target.os)
-     return any("sndio" in value for value in values) or None
- 
-+@depends("--enable-audio-backends", target)
-+def imply_sunaudio(values, target):
-+    if any("sunaudio" in value for value in values) and (
-+        target.os != "NetBSD" and target.os != "SunOS"
-+    ):
-+        die("Cannot enable sunaudio on %s", target.os)
-+    return any("sunaudio" in value for value in values) or None
- 
- @depends("--enable-audio-backends", target)
- def imply_wasapi(values, target):
-@@ -314,6 +327,8 @@ imply_option("--enable-pulseaudio", impl
- 
- imply_option("--enable-sndio", imply_sndio, reason="--enable-audio-backends")
- 
-+set_config("MOZ_SUNAUDIO", imply_sunaudio, when="--enable-audio-backends")
-+
- set_config("MOZ_WASAPI", imply_wasapi, when="--enable-audio-backends")
- 
- # ALSA cubeb backend

Index: pkgsrc/www/firefox/patches/patch-widget_gtk_DMABufSurface.cpp
diff -u pkgsrc/www/firefox/patches/patch-widget_gtk_DMABufSurface.cpp:1.3 pkgsrc/www/firefox/patches/patch-widget_gtk_DMABufSurface.cpp:1.4
--- pkgsrc/www/firefox/patches/patch-widget_gtk_DMABufSurface.cpp:1.3   Tue Jan 24 17:57:09 2023
+++ pkgsrc/www/firefox/patches/patch-widget_gtk_DMABufSurface.cpp       Wed Apr  5 14:22:36 2023
@@ -1,28 +1,38 @@
-$NetBSD: patch-widget_gtk_DMABufSurface.cpp,v 1.3 2023/01/24 17:57:09 nia Exp $
+$NetBSD: patch-widget_gtk_DMABufSurface.cpp,v 1.4 2023/04/05 14:22:36 ryoon Exp $
 
 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.orig  2023-03-02 21:15:57.000000000 +0000
 +++ widget/gtk/DMABufSurface.cpp
-@@ -18,7 +18,9 @@
+@@ -6,6 +6,9 @@
+ 
+ #include "DMABufSurface.h"
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
+ #include <fcntl.h>
+ #include <getopt.h>
+ #include <signal.h>
+@@ -18,7 +21,9 @@
  #include <sys/time.h>
  #include <dlfcn.h>
  #include <sys/mman.h>
-+#ifndef __NetBSD__
++#if !(defined(__NetBSD__) && (__NetBSD_Version__ - 0 < 1000000000))
  #include <sys/eventfd.h>
 +#endif
  #include <poll.h>
  #include <sys/ioctl.h>
  
-@@ -97,6 +99,7 @@ void DMABufSurface::GlobalRefAdd() {
+@@ -128,6 +133,7 @@ void DMABufSurface::GlobalRefAdd() {
  }
  
  void DMABufSurface::GlobalRefCountCreate() {
-+#ifndef __NetBSD__
++#if !(defined(__NetBSD__) && (__NetBSD_Version__ - 0 < 1000000000))
    MOZ_ASSERT(!mGlobalRefCountFd);
    mGlobalRefCountFd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK | EFD_SEMAPHORE);
    if (mGlobalRefCountFd < 0) {
-@@ -106,6 +109,7 @@ void DMABufSurface::GlobalRefCountCreate
+@@ -137,6 +143,7 @@ void DMABufSurface::GlobalRefCountCreate
      mGlobalRefCountFd = 0;
      return;
    }

Added files:

Index: pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc:1.1
--- /dev/null   Wed Apr  5 14:22:36 2023
+++ pkgsrc/www/firefox/patches/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc       Wed Apr  5 14:22:36 2023
@@ -0,0 +1,20 @@
+$NetBSD: patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc,v 1.1 2023/04/05 14:22:36 ryoon Exp $
+
+--- third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig     2023-03-02 21:15:55.000000000 +0000
++++ third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
+@@ -10,11 +10,15 @@
+ 
+ #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h"
+ 
++#if defined(__linux__)
+ #include <asm/ioctl.h>
++#endif
+ #include <dlfcn.h>
+ #include <fcntl.h>
+ #include <libdrm/drm_fourcc.h>
++#if defined(__linux__)
+ #include <linux/types.h>
++#endif
+ #include <spa/param/video/format-utils.h>
+ #include <unistd.h>
+ #include <xf86drm.h>

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index