Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id C61F51A921F for ; Sun, 3 Apr 2022 00:22:33 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6285384E5E; Sun, 3 Apr 2022 00:22:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9DAA584D44 for ; Sun, 3 Apr 2022 00:22:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id GLAGAZ8cZ5Dx for ; Sun, 3 Apr 2022 00:22:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1630884DC2 for ; Sun, 3 Apr 2022 00:22:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0FF14FB24; Sun, 3 Apr 2022 00:22:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1648945351121060" MIME-Version: 1.0 Date: Sun, 3 Apr 2022 00:22:31 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/www/firefox To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20220403002231.0FF14FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1648945351121060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Sun Apr 3 00:22:30 UTC 2022 Modified Files: pkgsrc/www/firefox: Makefile distinfo Added Files: pkgsrc/www/firefox/patches: patch-js_src_jit_GenerateAtomicOperations.py Log Message: firefox: Update to 98.0.2 Changelog: 98.0.2: Fixed * Fixed an issue preventing users from typing in Address Bar after opening new tab and pressing cmd + enter (bug 1757376) * Fixed an issue causing some users to crash in out-of-memory conditions (bug 1757618) * Fixed an issue in session history which caused some sites to fail to load ( bug 1758664) * Fixed an add-on specific compatibility issue (bug 1759162) 98.0.1: Changed * Yandex and Mail.ru have been removed as optional search providers in the drop-down search menu in Firefox. If you previously installed a customized version of Firefox with Yandex or Mail.ru, offered through partner distribution channels, this release removes those customizations, including add-ons and default bookmarks. Where applicable, your browser will revert back to default settings, as offered by Mozilla. All other releases of Firefox remain unaffected by the change. 98.0: New * Firefox has a new optimized download flow. Instead of prompting every time, files will download automatically. However, they can still be opened from the downloads panel with just one click. Easy! More information You'll find you have a number of options, including: + Always Open Similar Files: Make Firefox automatically open downloaded files of the same type with the system default application. + Show In Folder: Open the folder that contains your downloaded files. + Go To Download Page: Surfaces the download reference page even after leaving the site or closing the tab. + Copy Download Link: Copy the download link to share it, save it, or for any applicable use. + Delete: You can now delete downloaded files directly from the download panel and other download views using the context menu. + Remove From History: Remove a file from your list of downloaded files. + Clear Preview Panel: Clear the list of downloaded items in the preview panel that opens when you start a download. In this release, you'll also see that Firefox no longer asks what to do for each file by default. You won't be prompted to choose a helper application or save to disk before downloading a file unless you have changed your download action setting for that type of file. And now, every time you start a download, Firefox will automatically bring up the Downloads panel by default. This means you'll experience minimal interruptions and easily find your downloaded files. Plus, to avoid having to close it several times, the panel won't show if there are multiple downloads in progress. You can now click on a file in the Downloads panel to open it even before it has finished downloading. Firefox will open the file as soon as it is available. Firefox: saving you time and helping you get back to what you care about! Any files you download will be immediately saved on your disk. Depending on the current configuration, they'll be saved in your preferred download folder, or you'll be asked to select a location for each download. Windows and Linux users will find their downloaded files in the destination folder. They'll no longer be put in the Temp folder. * Firefox allows users to choose from a number of built-in search engines to set as their default. In this release, some users who had previously configured a default engine might notice their default search engine has changed since Mozilla was unable to secure formal permission to continue including certain search engines in Firefox. Fixed * Now, you can set a default app to open a file type. Choose the application you want to use to open files of a specific type in your Firefox settings. * After updating to Firefox version 98, "Always ask" download actions will now be reset. * Various security fixes. Security fixes: #CVE-2022-26383: Browser window spoof using fullscreen mode #CVE-2022-26384: iframe allow-scripts sandbox bypass #CVE-2022-26387: Time-of-check time-of-use bug when verifying add-on signatures #CVE-2022-26381: Use-after-free in text reflows #CVE-2022-26382: Autofill Text could be exfiltrated via side-channel attacks #CVE-2022-26385: Use-after-free in thread shutdown #CVE-2022-0843: Memory safety bugs fixed in Firefox 98 To generate a diff of this commit: cvs rdiff -u -r1.514 -r1.515 pkgsrc/www/firefox/Makefile cvs rdiff -u -r1.462 -r1.463 pkgsrc/www/firefox/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/firefox/patches/patch-js_src_jit_GenerateAtomicOperations.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1648945351121060 Content-Disposition: inline Content-Length: 14982 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox/Makefile diff -u pkgsrc/www/firefox/Makefile:1.514 pkgsrc/www/firefox/Makefile:1.515 --- pkgsrc/www/firefox/Makefile:1.514 Mon Mar 28 10:59:30 2022 +++ pkgsrc/www/firefox/Makefile Sun Apr 3 00:22:30 2022 @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.514 2022/03/28 10:59:30 tnn Exp $ +# $NetBSD: Makefile,v 1.515 2022/04/03 00:22:30 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 97.0 +MOZ_BRANCH= 98.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/} EXTRACT_SUFX= .tar.xz Index: pkgsrc/www/firefox/distinfo diff -u pkgsrc/www/firefox/distinfo:1.462 pkgsrc/www/firefox/distinfo:1.463 --- pkgsrc/www/firefox/distinfo:1.462 Sun Mar 6 04:51:48 2022 +++ pkgsrc/www/firefox/distinfo Sun Apr 3 00:22:30 2022 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.462 2022/03/06 04:51:48 ryoon Exp $ +$NetBSD: distinfo,v 1.463 2022/04/03 00:22:30 ryoon Exp $ -BLAKE2s (firefox-97.0.2.source.tar.xz) = 9807fb791d04a9f73008ba50395ac67ddfb5222f48aa7e6d76af7da62d7aa824 -SHA512 (firefox-97.0.2.source.tar.xz) = efbf33723f5979025454b6cc183927afb4bc72a51c00b5d45940122da596b8ac99080f3a6a59f5dd85a725e356349ec57e7eba1c36cdab7d55a28b04895d274c -Size (firefox-97.0.2.source.tar.xz) = 491844932 bytes +BLAKE2s (firefox-98.0.2.source.tar.xz) = 9304273e193d3f8ed5d5d4ddd5cc6dcfcd510a19fb8e9f4721ee94e8ee288e8f +SHA512 (firefox-98.0.2.source.tar.xz) = b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e +Size (firefox-98.0.2.source.tar.xz) = 479907760 bytes BLAKE2s (nodejs-output-95.0.tgz) = c44b37d3605524a49157002f01c29f568f04194b0e635bc312de7ffdeb9a74c9 SHA512 (nodejs-output-95.0.tgz) = 2faf326f4e100b66f8597c365cc2eb5d0eee26aae92a7e2446891f2178041aa71ba16eae37000acacd43a657025ec11c18db73b112f5c49cc21cdb882da6d798 Size (nodejs-output-95.0.tgz) = 200627 bytes @@ -19,6 +19,7 @@ SHA1 (patch-gfx_wr_swgl_build.rs) = df6e SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 6cdd0fe60455eab8f9846257c2bfea207f19478b +SHA1 (patch-js_src_jit_GenerateAtomicOperations.py) = a4f30476f9d8a1889538f27a244b319fde8e4309 SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = fad103cc698f9828ad58f742231984ec2bc27605 SHA1 (patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp) = fdc522e3fb626b1b8a2ebf19ad60bfc25dfa4183 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba Added files: Index: pkgsrc/www/firefox/patches/patch-js_src_jit_GenerateAtomicOperations.py diff -u /dev/null pkgsrc/www/firefox/patches/patch-js_src_jit_GenerateAtomicOperations.py:1.1 --- /dev/null Sun Apr 3 00:22:31 2022 +++ pkgsrc/www/firefox/patches/patch-js_src_jit_GenerateAtomicOperations.py Sun Apr 3 00:22:30 2022 @@ -0,0 +1,242 @@ +$NetBSD: patch-js_src_jit_GenerateAtomicOperations.py,v 1.1 2022/04/03 00:22:30 ryoon Exp $ + +* Fix build under 32-bit architecture, for example NetBSD/i386. + From: https://bugzilla.mozilla.org/show_bug.cgi?id=1756347 + +--- js/src/jit/GenerateAtomicOperations.py.orig 2022-03-03 09:53:14.696789711 +0000 ++++ js/src/jit/GenerateAtomicOperations.py +@@ -10,6 +10,7 @@ import buildconfig + + is_64bit = "JS_64BIT" in buildconfig.defines + cpu_arch = buildconfig.substs["CPU_ARCH"] ++is_gcc = buildconfig.substs["CC_TYPE"] == "gcc" + + + def fmt_insn(s): +@@ -19,21 +20,21 @@ def fmt_insn(s): + def gen_seqcst(fun_name): + if cpu_arch in ("x86", "x86_64"): + return r""" +- inline void %(fun_name)s() { ++ INLINE_ATTR void %(fun_name)s() { + asm volatile ("mfence\n\t" ::: "memory"); + }""" % { + "fun_name": fun_name, + } + if cpu_arch == "aarch64": + return r""" +- inline void %(fun_name)s() { ++ INLINE_ATTR void %(fun_name)s() { + asm volatile ("dmb ish\n\t" ::: "memory"); + }""" % { + "fun_name": fun_name, + } + if cpu_arch == "arm": + return r""" +- inline void %(fun_name)s() { ++ INLINE_ATTR void %(fun_name)s() { + asm volatile ("dmb sy\n\t" ::: "memory"); + }""" % { + "fun_name": fun_name, +@@ -63,7 +64,7 @@ def gen_load(fun_name, cpp_type, size, b + if barrier: + insns += fmt_insn("mfence") + return """ +- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { + %(cpp_type)s res; + asm volatile (%(insns)s + : [res] "=r" (res) +@@ -91,7 +92,7 @@ def gen_load(fun_name, cpp_type, size, b + if barrier: + insns += fmt_insn("dmb ish") + return """ +- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { + %(cpp_type)s res; + asm volatile (%(insns)s + : [res] "=r" (res) +@@ -117,7 +118,7 @@ def gen_load(fun_name, cpp_type, size, b + if barrier: + insns += fmt_insn("dmb sy") + return """ +- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { + %(cpp_type)s res; + asm volatile (%(insns)s + : [res] "=r" (res) +@@ -154,7 +155,7 @@ def gen_store(fun_name, cpp_type, size, + if barrier: + insns += fmt_insn("mfence") + return """ +- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { ++ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { + asm volatile (%(insns)s + : + : [addr] "r" (addr), [val] "r"(val) +@@ -180,7 +181,7 @@ def gen_store(fun_name, cpp_type, size, + if barrier: + insns += fmt_insn("dmb ish") + return """ +- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { ++ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { + asm volatile (%(insns)s + : + : [addr] "r" (addr), [val] "r"(val) +@@ -204,7 +205,7 @@ def gen_store(fun_name, cpp_type, size, + if barrier: + insns += fmt_insn("dmb sy") + return """ +- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { ++ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { + asm volatile (%(insns)s + : + : [addr] "r" (addr), [val] "r"(val) +@@ -235,7 +236,7 @@ def gen_exchange(fun_name, cpp_type, siz + assert size == 64 + insns += fmt_insn("xchgq %[val], (%[addr])") + return """ +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { + asm volatile (%(insns)s + : [val] "+r" (val) + : [addr] "r" (addr) +@@ -266,7 +267,7 @@ def gen_exchange(fun_name, cpp_type, siz + insns += fmt_insn("cbnz %w[scratch], 0b") + insns += fmt_insn("dmb ish") + return """ +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { + %(cpp_type)s res; + uint32_t scratch; + asm volatile (%(insns)s +@@ -297,7 +298,7 @@ def gen_exchange(fun_name, cpp_type, siz + insns += fmt_insn("beq 0b") + insns += fmt_insn("dmb sy") + return """ +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { + %(cpp_type)s res; + uint32_t scratch; + asm volatile (%(insns)s +@@ -321,7 +322,7 @@ def gen_cmpxchg(fun_name, cpp_type, size + # Use a +A constraint to load `oldval` into EDX:EAX as input/output. + # `newval` is loaded into ECX:EBX. + return r""" +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, + %(cpp_type)s oldval, + %(cpp_type)s newval) { + asm volatile ("lock; cmpxchg8b (%%[addr])\n\t" +@@ -337,7 +338,7 @@ def gen_cmpxchg(fun_name, cpp_type, size + } + if cpu_arch == "arm" and size == 64: + return r""" +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, + %(cpp_type)s oldval, + %(cpp_type)s newval) { + uint32_t oldval0 = oldval & 0xffff'ffff; +@@ -380,7 +381,7 @@ def gen_cmpxchg(fun_name, cpp_type, size + assert size == 64 + insns += fmt_insn("lock; cmpxchgq %[newval], (%[addr])") + return """ +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, + %(cpp_type)s oldval, + %(cpp_type)s newval) { + asm volatile (%(insns)s +@@ -425,7 +426,7 @@ def gen_cmpxchg(fun_name, cpp_type, size + insns += fmt_insn("cbnz %w[scratch], 0b") + insns += fmt_insn("1: dmb ish") + return """ +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, + %(cpp_type)s oldval, + %(cpp_type)s newval) { + %(cpp_type)s res, scratch; +@@ -466,7 +467,7 @@ def gen_cmpxchg(fun_name, cpp_type, size + insns += fmt_insn("beq 0b") + insns += fmt_insn("1: dmb sy") + return """ +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, + %(cpp_type)s oldval, + %(cpp_type)s newval) { + %(cpp_type)s res, scratch; +@@ -501,7 +502,7 @@ def gen_fetchop(fun_name, cpp_type, size + assert size == 64 + insns += fmt_insn("lock; xaddq %[val], (%[addr])") + return """ +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { + asm volatile (%(insns)s + : [val] "+&r" (val) + : [addr] "r" (addr) +@@ -539,7 +540,7 @@ def gen_fetchop(fun_name, cpp_type, size + insns = insns.replace("OP", op) + insns += fmt_insn("jnz 0b") + return """ +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { + %(cpp_type)s res, scratch; + asm volatile (%(insns)s + : [res] "=&a" (res), [scratch] "=&r" (scratch) +@@ -581,7 +582,7 @@ def gen_fetchop(fun_name, cpp_type, size + insns += fmt_insn("cbnz %w[scratch2], 0b") + insns += fmt_insn("dmb ish") + return """ +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { + %(cpp_type)s res; + uintptr_t scratch1, scratch2; + asm volatile (%(insns)s +@@ -621,7 +622,7 @@ def gen_fetchop(fun_name, cpp_type, size + insns += fmt_insn("beq 0b") + insns += fmt_insn("dmb sy") + return """ +- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { ++ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { + %(cpp_type)s res; + uintptr_t scratch1, scratch2; + asm volatile (%(insns)s +@@ -665,12 +666,12 @@ def gen_copy(fun_name, cpp_type, size, u + insns += fmt_insn("str %x[scratch], [%x[dst], OFFSET]") + elif cpu_arch == "arm": + if size == 1: +- insns += fmt_insn("ldrb %[scratch], [%[src], OFFSET]") +- insns += fmt_insn("strb %[scratch], [%[dst], OFFSET]") ++ insns += fmt_insn("ldrb %[scratch], [%[src], #OFFSET]") ++ insns += fmt_insn("strb %[scratch], [%[dst], #OFFSET]") + else: + assert size == 4 +- insns += fmt_insn("ldr %[scratch], [%[src], OFFSET]") +- insns += fmt_insn("str %[scratch], [%[dst], OFFSET]") ++ insns += fmt_insn("ldr %[scratch], [%[src], #OFFSET]") ++ insns += fmt_insn("str %[scratch], [%[dst], #OFFSET]") + else: + raise Exception("Unexpected arch") + insns = insns.replace("OFFSET", str(offset * size)) +@@ -681,7 +682,7 @@ def gen_copy(fun_name, cpp_type, size, u + offset -= 1 + + return """ +- inline void %(fun_name)s(uint8_t* dst, const uint8_t* src) { ++ INLINE_ATTR void %(fun_name)s(uint8_t* dst, const uint8_t* src) { + %(cpp_type)s* dst_ = reinterpret_cast<%(cpp_type)s*>(dst); + const %(cpp_type)s* src_ = reinterpret_cast(src); + %(cpp_type)s scratch; +@@ -853,6 +854,13 @@ def generate_atomics_header(c_out): + "constexpr size_t JS_GENERATED_ATOMICS_WORDSIZE = " + str(wordsize) + ";\n" + ) + ++ # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE. ++ # See bug 1756347. ++ if is_gcc and cpu_arch == "x86": ++ contents = contents.replace("INLINE_ATTR", "MOZ_NEVER_INLINE inline") ++ else: ++ contents = contents.replace("INLINE_ATTR", "inline") ++ + c_out.write( + HEADER_TEMPLATE + % { --_----------=_1648945351121060--