CVS commit: pkgsrc/www/firefox

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Dec 19 15:09:49 UTC 2021

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo mozilla-common.mk

Log Message:
firefox: Update to 95.0.1

* Enable RLBox WebAssembly sandboxing for i386 and x86_64 architectures.
  Not tested for the other architectures yet.

Changelog:
95.0.1
Fixed

  * Fixed frequent MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING error
    messages when trying to connect to various microsoft.com domains (bug
    1745600)

  * Fix for a WebRender crash on some Linux/X11 systems (bug 1741956)

  * Fix for a frequent Windows shutdown crash (bug 1738984)

  * Fix websites contrast issues for some Linux users with Dark mode set at OS
    level (bug 1740518)


To generate a diff of this commit:
cvs rdiff -u -r1.505 -r1.506 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.455 -r1.456 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.213 -r1.214 pkgsrc/www/firefox/mozilla-common.mk

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.505 pkgsrc/www/firefox/Makefile:1.506
--- pkgsrc/www/firefox/Makefile:1.505   Sun Dec 19 09:47:59 2021
+++ pkgsrc/www/firefox/Makefile Sun Dec 19 15:09:49 2021
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.505 2021/12/19 09:47:59 maya Exp $
+# $NetBSD: Makefile,v 1.506 2021/12/19 15:09:49 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            95.0
+MOZ_BRANCH=            95.0.1
 MOZ_BRANCH_MINOR=      
-PKGREVISION=           2
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
@@ -51,7 +50,8 @@ WRKSRC=               ${WRKDIR}/firefox-${FIREFOX_VER
 
 MOZILLA_DIR=   # empty
 
-# Note: when updating remember to conditionalise about-background.png in PLIST
+# Note: In --enable-chrome-format=flat case,
+#       when updating remember to conditionalise about-background.png in PLIST
 CONFIGURE_ARGS+=       --enable-application=browser
 
 #CFLAGS+=      -I${PREFIX}/include/nspr
@@ -68,6 +68,11 @@ LDFLAGS.SunOS+=              -lm
 
 # XXX not sure how to test this! likely unnecessary
 NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/plugin-container
+# For RLBox WASM sandbox. Sync condition with mozilla-common.mk
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox-bin
+.endif
 
 # Avoid ld "invalid section index" errors.
 BUILDLINK_TRANSFORM.SunOS+=    rm:-fdata-sections

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.455 pkgsrc/www/firefox/distinfo:1.456
--- pkgsrc/www/firefox/distinfo:1.455   Sat Dec 11 14:10:01 2021
+++ pkgsrc/www/firefox/distinfo Sun Dec 19 15:09:49 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.455 2021/12/11 14:10:01 ryoon Exp $
+$NetBSD: distinfo,v 1.456 2021/12/19 15:09:49 ryoon Exp $
 
-BLAKE2s (firefox-95.0.source.tar.xz) = 2cf104a9e2c7161ef19617214307aa8eacfa9527cde3ed0152211e448dff2ccb
-SHA512 (firefox-95.0.source.tar.xz) = 350672a2cd99195c67dafc0e71c6eaf1e23e85a5fe92775697119a054f17c34a736035e23d7f2bb404b544f0f144efef3843cfc293596a6e61d1ea36efc3a724
-Size (firefox-95.0.source.tar.xz) = 382853940 bytes
+BLAKE2s (firefox-95.0.1.source.tar.xz) = 63da362545d9b746ea7076d4c68e6990725ad617cd122901bcc2895e57b80c40
+SHA512 (firefox-95.0.1.source.tar.xz) = 54887c3adbf7202b835ae1ac928c3c95516ef11f9894456561dad500a1a61623f926b37f6e02fef0898e7ee0fd9147a71e5432634e6e0a2c2fecd08509799c37
+Size (firefox-95.0.1.source.tar.xz) = 385073408 bytes
 BLAKE2s (nodejs-output-95.0.tgz) = c44b37d3605524a49157002f01c29f568f04194b0e635bc312de7ffdeb9a74c9
 SHA512 (nodejs-output-95.0.tgz) = 2faf326f4e100b66f8597c365cc2eb5d0eee26aae92a7e2446891f2178041aa71ba16eae37000acacd43a657025ec11c18db73b112f5c49cc21cdb882da6d798
 Size (nodejs-output-95.0.tgz) = 200627 bytes

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.213 pkgsrc/www/firefox/mozilla-common.mk:1.214
--- pkgsrc/www/firefox/mozilla-common.mk:1.213  Fri Dec 17 20:08:42 2021
+++ pkgsrc/www/firefox/mozilla-common.mk        Sun Dec 19 15:09:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.213 2021/12/17 20:08:42 maya Exp $
+# $NetBSD: mozilla-common.mk,v 1.214 2021/12/19 15:09:49 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -104,7 +104,15 @@ CONFIGURE_ARGS+=   --disable-updater
 
 #CONFIGURE_ARGS+=      --with-libclang-path=${PREFIX}/lib
 
+# RLBox WASM sandbox
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+.include "../../lang/wasi-libc/buildlink3.mk"
+.include "../../lang/wasi-libcxx/buildlink3.mk"
+.include "../../lang/wasi-compiler-rt/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-wasi-sysroot=${PREFIX}/wasi
+.else
 CONFIGURE_ARGS+=       --without-wasm-sandboxed-libraries
+.endif
 
 SUBST_CLASSES+=                        fix-paths
 SUBST_STAGE.fix-paths=         pre-configure