CVS commit: pkgsrc/www/firefox102

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Nov 23 14:22:32 UTC 2023

Modified Files:
        pkgsrc/www/firefox102: Makefile distinfo mozilla-common.mk
Added Files:
        pkgsrc/www/firefox102/patches: patch-intl_lwbrk_LineBreaker.cpp

Log Message:
firefox102: Update to 102.15.1

* Fix build with the latest textproc/icu.

Changelog:
Security fixes:
Mozilla Foundation Security Advisory 2023-40
#CVE-2023-4863: Heap buffer overflow in libwebp


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/www/firefox102/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/firefox102/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/firefox102/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox102/patches/patch-intl_lwbrk_LineBreaker.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/firefox102/Makefile
diff -u pkgsrc/www/firefox102/Makefile:1.31 pkgsrc/www/firefox102/Makefile:1.32
--- pkgsrc/www/firefox102/Makefile:1.31 Tue Nov 14 14:03:04 2023
+++ pkgsrc/www/firefox102/Makefile      Thu Nov 23 14:22:32 2023
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2023/11/14 14:03:04 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2023/11/23 14:22:32 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            102.15
-MOZ_BRANCH_MINOR=      .0esr
+MOZ_BRANCH_MINOR=      .1esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox102-/g}
-PKGREVISION=   5
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/firefox102/distinfo
diff -u pkgsrc/www/firefox102/distinfo:1.16 pkgsrc/www/firefox102/distinfo:1.17
--- pkgsrc/www/firefox102/distinfo:1.16 Sun Sep 10 14:42:28 2023
+++ pkgsrc/www/firefox102/distinfo      Thu Nov 23 14:22:32 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2023/09/10 14:42:28 nia Exp $
+$NetBSD: distinfo,v 1.17 2023/11/23 14:22:32 ryoon Exp $
 
-BLAKE2s (firefox-102.15.0esr.source.tar.xz) = 0902dc8bd56f583010de778e62be623d82e3345776eab24b8d2d817ec22097b9
-SHA512 (firefox-102.15.0esr.source.tar.xz) = 87db6e32fda215253f9b3bd233ef7fa91a64349310064b8482e5c634f34cbe99a2a111d74d2b9f2a99a0b3b510dbf9039ebe4ccfc176c2554d65bc9cfb508bf9
-Size (firefox-102.15.0esr.source.tar.xz) = 486592324 bytes
+BLAKE2s (firefox-102.15.1esr.source.tar.xz) = 1dae9aa46405c07d2dcff2c0f74677925b646020c1722ff1034a39c2adb1e5bd
+SHA512 (firefox-102.15.1esr.source.tar.xz) = bdb66b4fb5622af3e60580a3bcd464d98ef13cb38d6ac6c9e5fc046e567a003cf080125d7748950c91c442fde5e8024c50c4180d2f551aa3528160a3c05ae187
+Size (firefox-102.15.1esr.source.tar.xz) = 483198220 bytes
 BLAKE2s (nodejs-output-95.0.tgz) = c44b37d3605524a49157002f01c29f568f04194b0e635bc312de7ffdeb9a74c9
 SHA512 (nodejs-output-95.0.tgz) = 2faf326f4e100b66f8597c365cc2eb5d0eee26aae92a7e2446891f2178041aa71ba16eae37000acacd43a657025ec11c18db73b112f5c49cc21cdb882da6d798
 Size (nodejs-output-95.0.tgz) = 200627 bytes
@@ -16,6 +16,7 @@ SHA1 (patch-gfx_angle_checkout_src_compi
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
 SHA1 (patch-gfx_skia_skia_src_core_SkVM.cpp) = cdb2c2b0d512c0eb8403abba9b74c218d3a306ea
 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) = 35d20981d33ccdb1d8ffb8039e48798777f11658
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 6cdd0fe60455eab8f9846257c2bfea207f19478b

Index: pkgsrc/www/firefox102/mozilla-common.mk
diff -u pkgsrc/www/firefox102/mozilla-common.mk:1.6 pkgsrc/www/firefox102/mozilla-common.mk:1.7
--- pkgsrc/www/firefox102/mozilla-common.mk:1.6 Mon Oct 23 06:37:56 2023
+++ pkgsrc/www/firefox102/mozilla-common.mk     Thu Nov 23 14:22:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.6 2023/10/23 06:37:56 wiz Exp $
+# $NetBSD: mozilla-common.mk,v 1.7 2023/11/23 14:22:32 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -6,14 +6,14 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  27 312
 PYTHON_FOR_BUILD_ONLY=         tool
 ALL_ENV+=                      PYTHON3=${PYTHONBIN}
 
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 USE_TOOLS+=            pkg-config perl gmake autoconf213 gm4 unzip zip
-UNLIMIT_RESOURCES+=    datasize virtualsize
+UNLIMIT_RESOURCES+=    datasize stacksize virtualsize
 
 USE_LANGUAGES+=                c c++
 
@@ -108,21 +108,7 @@ CONFIGURE_ARGS+=   --with-clang-path=${PRE
 .endif
 CONFIGURE_ARGS+=       --with-libclang-path=${PREFIX}/lib
 
-# RLBox WASM sandbox
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
-# For wasm-ld command
-TOOL_DEPENDS+=         lld-[0-9]*:../../devel/lld
-.include "../../lang/wasi-libc/buildlink3.mk"
-.include "../../lang/wasi-libcxx/buildlink3.mk"
-# NB the exact versions of the clang and wasi-compiler-rt dependencies must
-# be kept in sync, or build failures will occur due to path mismatches.
-.include "../../lang/wasi-compiler-rt/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-wasi-sysroot=${PREFIX}/wasi
-CONFIGURE_ENV+=                WASM_CC=${PREFIX}/bin/clang
-CONFIGURE_ENV+=                WASM_CXX=${PREFIX}/bin/clang++
-.else
 CONFIGURE_ARGS+=       --without-wasm-sandboxed-libraries
-.endif
 
 SUBST_CLASSES+=                        fix-paths
 SUBST_STAGE.fix-paths=         pre-configure

Added files:

Index: pkgsrc/www/firefox102/patches/patch-intl_lwbrk_LineBreaker.cpp
diff -u /dev/null pkgsrc/www/firefox102/patches/patch-intl_lwbrk_LineBreaker.cpp:1.1
--- /dev/null   Thu Nov 23 14:22:32 2023
+++ pkgsrc/www/firefox102/patches/patch-intl_lwbrk_LineBreaker.cpp      Thu Nov 23 14:22:32 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-intl_lwbrk_LineBreaker.cpp,v 1.1 2023/11/23 14:22:32 ryoon Exp $
+
+icu 74.1 support.
+
+--- intl/lwbrk/LineBreaker.cpp.orig    2023-10-19 19:54:30.000000000 +0000
++++ intl/lwbrk/LineBreaker.cpp
+@@ -448,7 +448,13 @@ static int8_t GetClass(uint32_t u, LineB
+       /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
+       /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
+       /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
+-      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER};
++      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
++      /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
++      /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
++      /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
++      /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
++      /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
++};
+ 
+   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
+                 "Gecko vs ICU LineBreak class mismatch");