CVS commit: pkgsrc/www/firefox

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jan 14 13:36:15 UTC 2025

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo mozilla-common.mk
        pkgsrc/www/firefox/files: node-wrapper.sh
        pkgsrc/www/firefox/patches:
            patch-netwerk_protocol_http_nsHttpHandler.cpp
Added Files:
        pkgsrc/www/firefox/patches:
            patch-third__party_rust_quinn-udp_src_unix.rs
Removed Files:
        pkgsrc/www/firefox/patches: patch-intl_lwbrk_LineBreaker.cpp
            patch-js_src_tests_lib_results.py
            patch-testing_mozbase_mozdevice_mozdevice_adb.py
            patch-testing_xpcshell_runxpcshelltests.py

Log Message:
www/firefox: Update to 134.0

Changelog:
134.0:
New

  * Firefox now supports touchpad hold gestures on Linux. This means that
    kinetic (momentum) scrolling can now be interrupted by placing two fingers
    on the touchpad.

  * Hardware-accelerated playback of HEVC video content is now supported on
    Windows.

  * Ecosia's availability has been expanded to all languages in the German
    region along with Austria, Belgium, Italy, Netherlands, Spain, Sweden and
    Switzerland.

Fixed

  * Various security fixes.

Changed

  * Firefox now follows the model HTML specification for transient user
    activation more closely. This change makes popup blocking less strict in
    cases where previous versions of Firefox were overly aggressive, reducing
    erroneous blocking prompts.

  * A refreshed New Tab layout is being rolled out to users in the US and
    Canada, featuring a repositioned logo and weather widget to prioritize Web
    Search, Shortcuts, and Recommended Stories at the top. The update includes
    changes to the card UI for recommended stories and allows users with larger
    screens to see up to four columns, making better use of space.

    Currently available in: Canada, United States
    [progressiv]

    This feature is part of a progressive roll out.

Security fixes:
Mozilla Foundation Security Advisory 2025-01
#CVE-2025-0244: Address bar spoofing using an invalid protocol scheme on
 Firefox for Android
#CVE-2025-0245: Lock screen setting bypass in Firefox Focus for Android
#CVE-2025-0246: Address bar spoofing using an invalid protocol scheme on
 Firefox for Android
#CVE-2025-0237: WebChannel APIs susceptible to confused deputy attack
#CVE-2025-0238: Use-after-free when breaking lines in text
#CVE-2025-0239: Alt-Svc ALPN validation failure when redirected
#CVE-2025-0240: Compartment mismatch when parsing JavaScript JSON module
#CVE-2025-0241: Memory corruption when using JavaScript Text Segmentation
#CVE-2025-0242: Memory safety bugs fixed in Firefox 134, Thunderbird 134,
 Firefox ESR 115.19, Firefox ESR 128.6, Thunderbird 115.19, and Thunderbird
 128.6
#CVE-2025-0243: Memory safety bugs fixed in Firefox 134, Thunderbird 134,
 Firefox ESR 128.6, and Thunderbird 128.6
#CVE-2025-0247: Memory safety bugs fixed in Firefox 134 and Thunderbird 134


To generate a diff of this commit:
cvs rdiff -u -r1.621 -r1.622 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.548 -r1.549 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.291 -r1.292 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/firefox/files/node-wrapper.sh
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/firefox/patches/patch-intl_lwbrk_LineBreaker.cpp \
    pkgsrc/www/firefox/patches/patch-js_src_tests_lib_results.py \
    pkgsrc/www/firefox/patches/patch-testing_mozbase_mozdevice_mozdevice_adb.py \
    pkgsrc/www/firefox/patches/patch-testing_xpcshell_runxpcshelltests.py
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/www/firefox/patches/patch-netwerk_protocol_http_nsHttpHandler.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-third__party_rust_quinn-udp_src_unix.rs

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.621 pkgsrc/www/firefox/Makefile:1.622
--- pkgsrc/www/firefox/Makefile:1.621   Fri Dec 27 08:20:49 2024
+++ pkgsrc/www/firefox/Makefile Tue Jan 14 13:36:14 2025
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.621 2024/12/27 08:20:49 wiz Exp $
+# $NetBSD: Makefile,v 1.622 2025/01/14 13:36:14 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            133.0
-MOZ_BRANCH_MINOR=      .3
+MOZ_BRANCH=            134.0
+MOZ_BRANCH_MINOR=      
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
-PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
 
-NODEJSKIT=             nodejs-output-132.0.tgz
+NODEJSKIT=             nodejs-output-134.0.tgz
 DISTFILES=             ${DEFAULT_DISTFILES} ${NODEJSKIT}
 SITES.${NODEJSKIT}=    ${MASTER_SITE_LOCAL}
 

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.548 pkgsrc/www/firefox/distinfo:1.549
--- pkgsrc/www/firefox/distinfo:1.548   Wed Dec 25 13:30:10 2024
+++ pkgsrc/www/firefox/distinfo Tue Jan 14 13:36:15 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.548 2024/12/25 13:30:10 ryoon Exp $
+$NetBSD: distinfo,v 1.549 2025/01/14 13:36:15 ryoon Exp $
 
-BLAKE2s (firefox-133.0.3.source.tar.xz) = 92b62c1a1fa8e7034cbefbf470e8d40fbc75a542a00ff78f07fe2a0e9ab875ac
-SHA512 (firefox-133.0.3.source.tar.xz) = ce48beaa5bb1717d9b6dbfff035b1bb5de1456df14b6a91adfaf3ccfb7ac550ab7ee854546231424a920e01d981825253609fce2ec326c4aa1ca316bbbdb31f8
-Size (firefox-133.0.3.source.tar.xz) = 580071280 bytes
-BLAKE2s (nodejs-output-132.0.tgz) = df80a8b098b4d9eb831e249054acf45b7ea5e3d9797782515819532490d83153
-SHA512 (nodejs-output-132.0.tgz) = 9af2e28ad6f02606c3b2ba8a07dbb813d80a88088092d76e474220d9db2c963f22d0d98f3e58b2a275d7ceb84ba8de55e9ae5e7f65f6bd9b61667c3237dcc3f0
-Size (nodejs-output-132.0.tgz) = 242465 bytes
+BLAKE2s (firefox-134.0.source.tar.xz) = 7e704e27bdc9db50d8a324171f450fc2f13ebae5f19d1fe66030cf335ef2d91a
+SHA512 (firefox-134.0.source.tar.xz) = 1275a686dc0a27b48df4ae05616511512f676e03474e3095b2521eac25a385d345aa3e8786716dbe812af49e07d72b32772479089d648968e2004ca0c9c35344
+Size (firefox-134.0.source.tar.xz) = 604421068 bytes
+BLAKE2s (nodejs-output-134.0.tgz) = 1d900a20f884e28a27c0c06e69a1e18f15b54091f7ef6428bd80516402a7a317
+SHA512 (nodejs-output-134.0.tgz) = 90f4b184bf7505bd490d9be399e21f3e077f760eab1e2e4591359da9131fa6b78751984aa492bd4b192b251f02e2bad650e50425edef88b8208a03d6bc021496
+Size (nodejs-output-134.0.tgz) = 248692 bytes
 SHA1 (patch-browser_app_profile_firefox.js) = bc719edef37d18655ba79b030270438ee166fdaf
 SHA1 (patch-build_moz.configure_init.configure) = 65deb3c233df0aab81eb1fca05d708e5a4ed169a
 SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678
@@ -16,24 +16,20 @@ 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_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb
-SHA1 (patch-intl_lwbrk_LineBreaker.cpp) = e2eaf7d66f1255ba5baf7f7edadbb1fa8cb39b13
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 298642a3527804115b398fb7904a3596962932e3
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 753bb4e90758f5b42a51bbc073b328de673988cf
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 63fbee04321f7ade20db4ccc1a1218b848344ce1
 SHA1 (patch-js-src-jit-arm64-vixl-MozCpu-vixl.cpp) = d90fca47d79551fd74214d47f8184670b901b792
 SHA1 (patch-js_public_Utility.h) = bb5464a0398b91693ab362e6b9b06d48429b9e7d
 SHA1 (patch-js_src_jit_FlushICache.cpp) = d1e611eaf7d7be22abfac6b39fbcd99df3570e47
-SHA1 (patch-js_src_tests_lib_results.py) = 5634207e249cab7270b47f4515657740e803d616
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
 SHA1 (patch-js_src_vm_TypedArrayObject-inl.h) = e7913c8d4b2b05b67040baa64dae62d6ba40390e
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
 SHA1 (patch-media_libpng_pngpriv.h) = 8320a1f7534ed5c4914b597bb3d6117d0060318f
 SHA1 (patch-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e
-SHA1 (patch-netwerk_protocol_http_nsHttpHandler.cpp) = ff6df620e9da46d58350e8330e31b345dd867e99
+SHA1 (patch-netwerk_protocol_http_nsHttpHandler.cpp) = 67493b4635041d21ff9fbfda80b3197fed542a26
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 753fd4d62088c870aefe7c4b739286259848446e
 SHA1 (patch-python_mozbuild_mozbuild_backend_recursivemake.py) = 5be4183d9075f5a3a3c6b3e0338473af185fb50e
-SHA1 (patch-testing_mozbase_mozdevice_mozdevice_adb.py) = 14d5107ce2c945d8b8d60a8edc968443a9970291
-SHA1 (patch-testing_xpcshell_runxpcshelltests.py) = 1c42e8794da0bdd6248bd53d1450b982616aa536
 SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
 SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_desktop__capture__gn_moz.build) = d0454784eb72be49162f619579e060a0de3c480f
 SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 455be625b5de2f6f1f4b2dbb6c8cb33ca16c2583
@@ -42,6 +38,7 @@ SHA1 (patch-third__party_libwebrtc_modul
 SHA1 (patch-third__party_libwebrtc_rtc__base_physical__socket__server.cc) = 6909c4da9e7b3785252e5bce9be0ff47ebb87e01
 SHA1 (patch-third__party_libwebrtc_system__wrappers_source_cpu__features__linux.cc) = b90e22b50879f7adcc1da3a993f52c0701b720f8
 SHA1 (patch-third__party_python_dlmanager_check.py) = 69054522d8ced8cb47e65e5a8b1a87ed5ce6708e
+SHA1 (patch-third__party_rust_quinn-udp_src_unix.rs) = 1c59c052dbf8169e8527bf3fd9d34a9533d2e62f
 SHA1 (patch-third__party_sqlite3_ext_moz.build) = 2df374daa1c974b52db602613508e4fc965a7bcd
 SHA1 (patch-third__party_sqlite3_src_moz.build) = b26856a4b87aa12211575d9982f62dc899474b52
 SHA1 (patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc) = 99d0db944f0c2d0c623460991efd423d9127c988

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.291 pkgsrc/www/firefox/mozilla-common.mk:1.292
--- pkgsrc/www/firefox/mozilla-common.mk:1.291  Sat Dec 28 03:18:27 2024
+++ pkgsrc/www/firefox/mozilla-common.mk        Tue Jan 14 13:36:15 2025
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.291 2024/12/28 03:18:27 gutteridge Exp $
+# $NetBSD: mozilla-common.mk,v 1.292 2025/01/14 13:36:15 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -41,6 +41,20 @@ TOOL_DEPENDS+=               yasm>=1.1:../../devel/ya
 CFLAGS+=               -msse2
 .endif
 
+CKSUM_CRATES+= third_party/rust/quinn-udp
+
+CKSUMS+=       b8e595499055115d15bfb95259c0c585934adf55f61e365bcc9fc47ab8fa9cdd
+CKSUMS+=       7be04be65b1606fd2560d572ba5a6238a645075555085d5e9cef15d10b0b8024
+
+SUBST_CLASSES+=                cksum
+SUBST_STAGE.cksum=     pre-configure
+.for crate in ${CKSUM_CRATES}
+SUBST_FILES.cksum+=    ${crate}/.cargo-checksum.json
+.endfor
+.for from to in ${CKSUMS}
+SUBST_SED.cksum+=      -e 's,${from},${to},g'
+.endfor
+
 # This is to work around build failures where an upstream configuration script
 # is confused by having more than one approximate match to MACHINE_GNU_PLATFORM
 # "i486" when attempting to select the Rust compiler target.

Index: pkgsrc/www/firefox/files/node-wrapper.sh
diff -u pkgsrc/www/firefox/files/node-wrapper.sh:1.24 pkgsrc/www/firefox/files/node-wrapper.sh:1.25
--- pkgsrc/www/firefox/files/node-wrapper.sh:1.24       Tue Oct 29 14:33:40 2024
+++ pkgsrc/www/firefox/files/node-wrapper.sh    Tue Jan 14 13:36:15 2025
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-VERS=v22.10.0
+VERS=v23.6.0
 
 if [ "$1" = "-v" ] || [ "$1" = "--version" ]; then
        printf "${VERS}\n"

Index: pkgsrc/www/firefox/patches/patch-netwerk_protocol_http_nsHttpHandler.cpp
diff -u pkgsrc/www/firefox/patches/patch-netwerk_protocol_http_nsHttpHandler.cpp:1.4 pkgsrc/www/firefox/patches/patch-netwerk_protocol_http_nsHttpHandler.cpp:1.5
--- pkgsrc/www/firefox/patches/patch-netwerk_protocol_http_nsHttpHandler.cpp:1.4        Tue Oct 29 14:33:40 2024
+++ pkgsrc/www/firefox/patches/patch-netwerk_protocol_http_nsHttpHandler.cpp    Tue Jan 14 13:36:15 2025
@@ -1,14 +1,14 @@
-$NetBSD: patch-netwerk_protocol_http_nsHttpHandler.cpp,v 1.4 2024/10/29 14:33:40 ryoon Exp $
+$NetBSD: patch-netwerk_protocol_http_nsHttpHandler.cpp,v 1.5 2025/01/14 13:36:15 ryoon Exp $
 
 * Do not freeze user-agent string as Linux under NetBSD.
 
---- netwerk/protocol/http/nsHttpHandler.cpp.orig       2024-10-18 13:19:10.000000000 +0000
+--- netwerk/protocol/http/nsHttpHandler.cpp.orig       2024-12-26 14:27:48.719857849 +0000
 +++ netwerk/protocol/http/nsHttpHandler.cpp
-@@ -1048,6 +1048,8 @@ void nsHttpHandler::InitUserAgentCompone
-   mOscpu.AssignLiteral("Intel Mac OS X 10.15");
- #elif defined(ANDROID)
+@@ -1063,6 +1063,8 @@ void nsHttpHandler::InitUserAgentCompone
    mOscpu.AssignLiteral("Linux armv81");
-+#  elif defined(__NetBSD__)
+ #elif defined(XP_IOS)
+   mOscpu.AssignLiteral("iPhone");
++#elif defined(__NetBSD__)
 +  mOscpu.AssignLiteral("NetBSD x86_64");
  #else
    mOscpu.AssignLiteral("Linux x86_64");

Added files:

Index: pkgsrc/www/firefox/patches/patch-third__party_rust_quinn-udp_src_unix.rs
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third__party_rust_quinn-udp_src_unix.rs:1.1
--- /dev/null   Tue Jan 14 13:36:15 2025
+++ pkgsrc/www/firefox/patches/patch-third__party_rust_quinn-udp_src_unix.rs    Tue Jan 14 13:36:15 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-third__party_rust_quinn-udp_src_unix.rs,v 1.1 2025/01/14 13:36:15 ryoon Exp $
+
+--- third_party/rust/quinn-udp/src/unix.rs.orig        2024-12-26 15:01:19.823476326 +0000
++++ third_party/rust/quinn-udp/src/unix.rs
+@@ -445,7 +445,7 @@ fn send(state: &UdpSocketState, io: Sock
+     Ok(())
+ }
+ 
+-#[cfg(not(any(apple, target_os = "openbsd", target_os = "solaris")))]
++#[cfg(not(any(apple, target_os = "openbsd", target_os = "netbsd", target_os = "solaris")))]
+ fn recv(io: SockRef<'_>, bufs: &mut [IoSliceMut<'_>], meta: &mut [RecvMeta]) -> io::Result<usize> {
+     let mut names = [MaybeUninit::<libc::sockaddr_storage>::uninit(); BATCH_SIZE];
+     let mut ctrls = [cmsg::Aligned(MaybeUninit::<[u8; CMSG_LEN]>::uninit()); BATCH_SIZE];