CVS commit: pkgsrc/www/firefox

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Jan  7 23:36:39 UTC 2023

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo mozilla-common.mk
        pkgsrc/www/firefox/patches: patch-browser_app_profile_firefox.js
            patch-toolkit_components_terminator_nsTerminator.cpp

Log Message:
firefox: Update to 108.0.1

* Use devel/py-curses during build to avoid errors from Python 3.10.
* uniffi-js defines amd64 specific symbols. I have added a hack for i386.
  If you build www/firefox under NetBSD/aarch64, you will get 'undefined
  reference' error during linking libxul.so. Please send your error messages
  to me. I will try to fix link breakage.
* Disable Web MIDI explicitly, it causes runtime segfault under NetBSD.

Changelog:
108.0.1
Fixed
  * Fixes a crash for some users on Mac OS X 10.12-10.14 during video playback
    (bug 1806391).
  * Fixes a crash that might occur when managing browser history (bug 1806408).

Changed
  * The "Tabs sharing devices" menu item for WebRTC is now located in the tools
    menu on macOS only (bug 1807697).

108.0.1
Fixed
  * Fixes the default search engine being reset on upgrade for profiles which
    were previously copied from a different location.

108.0
New
  * Import maps, which allow web pages to control the behavior of JavaScript
    imports, are now enabled by default.

  * Processes used for background tabs now use efficiency mode on Windows 11 to
    limit resource use.

  * The shift+esc keyboard shortcut now opens the Process Manager, offering a
    way to quickly identify processes that are using too many resources.

  * Improved frame scheduling when under load; this substantially improves
    Firefox's MotionMark scores.

Fixed
  * Firefox now supports properly color correcting images tagged with ICCv4
    profiles.

  * Support for non-English characters when saving and printing PDF forms.

  * The bookmarks toolbar's default "Only show on New Tab" state works
    correctly for blank new tabs. As before, you can change the bookmark
    toolbar's behavior using the toolbar context menu.

  * Various security fixes.

Changed
  * Firefox now supports the WebMIDI API and a new experimental mechanism for
    controlling access to dangerous capabilities.

Security fixes:
#CVE-2022-46871: libusrsctp library out of date
#CVE-2022-46872: Arbitrary file read from a compromised content process
#CVE-2022-46873: Firefox did not implement the CSP directive unsafe-hashes
#CVE-2022-46874: Drag and Dropped Filenames could have been truncated to
 malicious extensions
#CVE-2022-46875: Download Protections were bypassed by .atloc and .ftploc files
 on Mac OS
#CVE-2022-46877: Fullscreen notification bypass
#CVE-2022-46878: Memory safety bugs fixed in Firefox 108 and Firefox ESR 102.6
#CVE-2022-46879: Memory safety bugs fixed in Firefox 108


To generate a diff of this commit:
cvs rdiff -u -r1.543 -r1.544 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.486 -r1.487 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.245 -r1.246 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.17 -r1.18 \
    pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/www/firefox/patches/patch-toolkit_components_terminator_nsTerminator.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.543 pkgsrc/www/firefox/Makefile:1.544
--- pkgsrc/www/firefox/Makefile:1.543   Tue Jan  3 17:38:23 2023
+++ pkgsrc/www/firefox/Makefile Sat Jan  7 23:36:39 2023
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.543 2023/01/03 17:38:23 wiz Exp $
+# $NetBSD: Makefile,v 1.544 2023/01/07 23:36:39 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            107.0
-MOZ_BRANCH_MINOR=      .1
+MOZ_BRANCH=            108.0
+MOZ_BRANCH_MINOR=      .2
 
 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-95.0.tgz
@@ -106,6 +106,15 @@ MOZILLA_NAME=              Browser
 MOZILLA_BRANDING=      unofficial
 .endif
 
+.if ${MACHINE_ARCH} == "i386"
+SUBST_CLASSES+=                bindgen
+SUBST_STAGE.bindgen=   pre-configure
+SUBST_MESSAGE.bindgen= Adjust funcation names for i386 architecture
+SUBST_FILES.bindgen+=  toolkit/components/uniffi-js/UniFFIGeneratedScaffolding.cpp
+SUBST_FILES.bindgen+=  toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.jsm
+SUBST_SED.bindgen=     -e 's,tabs_4d51_,tabs_1c79_,g'
+.endif
+
 pre-configure:
 # As of 106.0, .in template files are not patched.
 #      cd ${WRKSRC} && autoconf

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.486 pkgsrc/www/firefox/distinfo:1.487
--- pkgsrc/www/firefox/distinfo:1.486   Fri Dec 23 12:35:05 2022
+++ pkgsrc/www/firefox/distinfo Sat Jan  7 23:36:39 2023
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.486 2022/12/23 12:35:05 nia Exp $
+$NetBSD: distinfo,v 1.487 2023/01/07 23:36:39 ryoon Exp $
 
-BLAKE2s (firefox-107.0.1.source.tar.xz) = b2c7102eacf1f3aa7b3919f2af5511e3a5da245a81a8d26437dc39951d4336d3
-SHA512 (firefox-107.0.1.source.tar.xz) = e57e4bfcecbcc6dbe73f23577a14a2998c8c3f3d602f85ea06f99e0974e78481b9f7bdb019cb4e9733e59f56be1407edd64a2adb7b284bb4a87b46b1e2295dea
-Size (firefox-107.0.1.source.tar.xz) = 508678860 bytes
+BLAKE2s (firefox-108.0.2.source.tar.xz) = 1c8222cfd83d37aae10efb6d5957cb404d30476cd7f34bcf17a2b53a798ebf56
+SHA512 (firefox-108.0.2.source.tar.xz) = f856ef034fa4a526e19968aed092c9ee99e124d2d271ec1c1bbd091d9a03e23293d69c7a9ae17c43258cde7e73c294534b471e36441e576377854f607c9bfa3a
+Size (firefox-108.0.2.source.tar.xz) = 509638740 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) = ee173b41332c1292d863aa6c8e9ee9553cb18c89
+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
@@ -38,7 +38,7 @@ SHA1 (patch-third__party_libwebrtc_modul
 SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_video__capture__v4l2.cc) = 28b9bb8b078b479d9cc0f8ccdc4d04e5a281c1b9
 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) = bd7b2a0f2407c3ab95515b2f143c41c3ca6fb0c4
+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_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.245 pkgsrc/www/firefox/mozilla-common.mk:1.246
--- pkgsrc/www/firefox/mozilla-common.mk:1.245  Sun Dec 11 21:06:32 2022
+++ pkgsrc/www/firefox/mozilla-common.mk        Sat Jan  7 23:36:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.245 2022/12/11 21:06:32 tsutsui Exp $
+# $NetBSD: mozilla-common.mk,v 1.246 2023/01/07 23:36:39 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -16,6 +16,8 @@ PYTHON_VERSIONS_INCOMPATIBLE+=        311
 PYTHON_FOR_BUILD_ONLY=         tool
 ALL_ENV+=                      PYTHON3=${PYTHONBIN}
 
+REPLACE_PYTHON=                build/cargo-linker
+
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 USE_TOOLS+=            pkg-config perl gmake gm4 unzip zip # autoconf213
@@ -35,6 +37,7 @@ USE_TOOLS+=           diff
 CONFIGURE_ENV+=                NODEJS="${FILESDIR}/node-wrapper.sh"
 .endif
 
+BUILD_DEPENDS+=                ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
@@ -82,7 +85,6 @@ CHECK_PORTABILITY_SKIP+=      ${MOZILLA_DIR}b
 CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}third_party/libwebrtc/tools_webrtc/iwyu/apply-iwyu
 
-CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
 CONFIGURE_ARGS+=       --enable-release
 # Disable Rust SIMD option to fix build with lang/rust-1.33.0
 # This should be enabled later again.
@@ -108,8 +110,6 @@ CONFIGURE_ARGS+=    --with-system-webp
 CONFIGURE_ARGS+=       --disable-icf
 CONFIGURE_ARGS+=       --disable-updater
 
-CONFIGURE_ARGS+=       --enable-new-pass-manager
-
 .include "../../mk/compiler.mk"
 
 .if empty(PKGSRC_COMPILER:Mclang)
@@ -134,12 +134,6 @@ CONFIGURE_ENV+=            WASM_CXX=${PREFIX}/bin/
 CONFIGURE_ARGS+=       --without-wasm-sandboxed-libraries
 .endif
 
-SUBST_CLASSES+=                        fix-paths
-SUBST_STAGE.fix-paths=         pre-configure
-SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
-SUBST_FILES.fix-paths+=                ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
-SUBST_SED.fix-paths+=          -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
-
 .include "../../sysutils/pciutils/libname.mk"
 SUBST_CLASSES+=                                fix-libpci-soname
 SUBST_STAGE.fix-libpci-soname=         pre-configure
@@ -236,6 +230,9 @@ BUILDLINK_API_DEPENDS.pixman+= pixman>=0
 .include "../../x11/gtk3/buildlink3.mk"
 PLIST_VARS+=           wayland
 .if ${PKG_BUILD_OPTIONS.gtk3:Mwayland}
+CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3-x11-wayland
 PLIST.wayland=         yes
+.else
+CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
 .endif
-.include "../../lang/python/pyversion.mk"
+.include "../../lang/python/application.mk"

Index: pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js
diff -u pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js:1.17 pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js:1.18
--- pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js:1.17        Fri Dec 23 12:35:05 2022
+++ pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js     Sat Jan  7 23:36:39 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-browser_app_profile_firefox.js,v 1.17 2022/12/23 12:35:05 nia Exp $
+$NetBSD: patch-browser_app_profile_firefox.js,v 1.18 2023/01/07 23:36:39 ryoon Exp $
 
 This patch modifies default Firefox settings - see the comments above
 each one.
 
---- browser/app/profile/firefox.js.orig        2022-11-28 16:47:25.000000000 +0000
+--- browser/app/profile/firefox.js.orig        2022-12-15 22:31:34.000000000 +0000
 +++ browser/app/profile/firefox.js
-@@ -2087,7 +2087,11 @@ pref("reader.pocket.ctaVersion", "");
+@@ -2099,7 +2099,11 @@ pref("reader.pocket.ctaVersion", "");
  
  pref("view_source.tab", true);
  
@@ -18,7 +18,7 @@ each one.
  
  // Enable Push API.
  pref("dom.push.enabled", true);
-@@ -2250,6 +2254,20 @@ pref("app.normandy.onsync_skew_sec", 600
+@@ -2279,6 +2283,27 @@ pref("app.normandy.onsync_skew_sec", 600
  pref("toolkit.coverage.enabled", false);
  pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org";);
  
@@ -36,6 +36,13 @@ each one.
 +// level.
 +pref("gfx.webrender.all", true);
 +
++// Disable Web MIDI support
++// NetBSD gets immediate SIGSEGV when Web MIDI is enabled.
++pref("midi.testing", true);
++pref("dom.webmidi.enabled", true);
++pref("midi.prompt.testing", true);
++pref("media.navigator.permission.disabled", true);
++
  // Discovery prefs
  pref("browser.discovery.enabled", true);
  pref("browser.discovery.containers.enabled", true);

Index: pkgsrc/www/firefox/patches/patch-toolkit_components_terminator_nsTerminator.cpp
diff -u pkgsrc/www/firefox/patches/patch-toolkit_components_terminator_nsTerminator.cpp:1.7 pkgsrc/www/firefox/patches/patch-toolkit_components_terminator_nsTerminator.cpp:1.8
--- pkgsrc/www/firefox/patches/patch-toolkit_components_terminator_nsTerminator.cpp:1.7 Mon Jul  4 14:34:08 2022
+++ pkgsrc/www/firefox/patches/patch-toolkit_components_terminator_nsTerminator.cpp     Sat Jan  7 23:36:39 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-toolkit_components_terminator_nsTerminator.cpp,v 1.7 2022/07/04 14:34:08 ryoon Exp $
+$NetBSD: patch-toolkit_components_terminator_nsTerminator.cpp,v 1.8 2023/01/07 23:36:39 ryoon Exp $
 
 * Fix segfault on exit under NetBSD
 
@@ -19,8 +19,8 @@ $NetBSD: patch-toolkit_components_termin
  #else
 -    usleep(HEARTBEAT_INTERVAL_MS * 1000 /* usec */);
 +    struct timespec tickd;
-+    tickd.tv_sec = HEARTBEAT_INTERVAL_MS;
-+    tickd.tv_nsec = 0;
++    tickd.tv_sec = 0;
++    tickd.tv_nsec = HEARTBEAT_INTERVAL_MS * 1000 * 1000;
 +    nanosleep(&tickd, NULL);
  #endif