From: Peter Michael Green Date: Thu, 3 Nov 2022 09:17:23 +0000 (+0000) Subject: Manual merge of version 102.3.0esr-1+rpi1 and 102.4.0esr-1~deb11u1 to produce 102... X-Git-Tag: archive/raspbian/102.4.0esr-1_deb11u1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ff0d02220f987708900e9ee662caada24f843290;p=firefox-esr.git Manual merge of version 102.3.0esr-1+rpi1 and 102.4.0esr-1~deb11u1 to produce 102.4.0esr-1~deb11u1+rpi1 * No need to patch atomics files anymore, upstream has adjusted them. --- f9736a8c0ae406954a1134b188ef8353a82ffcc2 diff --cc debian/changelog index 4baeb930cd3,c81268d271c..be5f08f0583 --- a/debian/changelog +++ b/debian/changelog @@@ -1,38 -1,12 +1,44 @@@ - firefox-esr (102.3.0esr-1+rpi1) bookworm-staging; urgency=medium ++firefox-esr (102.4.0esr-1~deb11u1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green at Wed, 05 Dec 2018 06:56:52 +0000] + * Hack broken rust target selection so it produces the right target + on raspbian. + * Fix clean target. + + [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green] + * Use a fake homedir for build (Closes: 933757). + + [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green] + * Disable webrtc, it seems to fail to build on raspbian. + * Try to disable Neon + + [changes introduced in 78.3.0esr-2+rpi1 by Peter Michael Green] + * Clean up pycache directories. + * Disable neon in qcms. + + [changes brought over from thunderbird 1:91.3.2-1+rpi1 by Peter Michael Green] + * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting + definitions error. + + [changes brought over from thunderbird 1:102.1.1-1+rpi1 by Peter Michael Green] + * Disable more armv7/neon stuff. + + [changes introduced in 102.2.0esr-1+rpi1 by Peter Michael Green] + * Disable jit (or at least try to) + + Pass disable-jit from debian/rules + + Nerf jit detection in s/moz.configure - + Disable arm atomics (which require armv7) in js/src/jit/GenerateAtomicOperations.py - + Remove architecture restrictions in jit/shared/AtomicOperations-feeling-lucky-gcc.h + - -- Raspbian forward porter Mon, 26 Sep 2022 05:42:10 +0000 ++ -- Raspbian forward porter Fri, 21 Oct 2022 01:45:18 +0000 + - firefox-esr (102.3.0esr-1) unstable; urgency=medium + firefox-esr (102.4.0esr-1~deb11u1) bullseye-security; urgency=medium + + * New upstream release. + * Fixes for mfsa2022-45, also known as: + CVE-2022-42927, CVE-2022-42928, CVE-2022-42929, CVE-2022-42932. + + -- Mike Hommey Wed, 19 Oct 2022 05:04:39 +0900 + + firefox-esr (102.3.0esr-1~deb11u1) bullseye-security; urgency=medium * New upstream release. * Fixes for mfsa2022-41, also known as: diff --cc debian/patches/disable-jit.patch index 9af7c74aaa3,00000000000..5a6634dd957 mode 100644,000000..100644 --- a/debian/patches/disable-jit.patch +++ b/debian/patches/disable-jit.patch @@@ -1,96 -1,0 +1,41 @@@ +From: Peter Michael Green - Date: Tue, 20 Sep 2022 21:54:38 +0000 - X-Dgit-Generated: 102.2.0esr-1+rpi1 e351c33a6ff4b5d2ff37573db2b0b8e6df0a0b8a +Subject: Disable jit. + + +--- + +diff --git a/js/moz.configure b/js/moz.configure +index 7a241cac76d..a040b58407f 100644 +--- a/js/moz.configure ++++ b/js/moz.configure +@@ -154,18 +154,18 @@ set_define("ENABLE_RECORD_TUPLE", enable_record_tuple) + # ======================================================= + @depends(target, "--enable-record-tuple") + def jit_default(target, enable_record_tuple): +- if enable_record_tuple: +- return False +- if target.cpu in ( +- "x86", +- "x86_64", +- "arm", +- "aarch64", +- "mips32", +- "mips64", +- "loongarch64", +- ): +- return True ++ #if enable_record_tuple: ++ # return False ++ #if target.cpu in ( ++ # "x86", ++ # "x86_64", ++ # "arm", ++ # "aarch64", ++ # "mips32", ++ # "mips64", ++ # "loongarch64", ++ #): ++ # return True + return False + + - diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py - index d8a38a0bbbc..63878e99a74 100644 - --- a/js/src/jit/GenerateAtomicOperations.py - +++ b/js/src/jit/GenerateAtomicOperations.py - @@ -32,13 +32,13 @@ def gen_seqcst(fun_name): - }""" % { - "fun_name": fun_name, - } - - if cpu_arch == "arm": - - return r""" - - INLINE_ATTR void %(fun_name)s() { - - asm volatile ("dmb sy\n\t" ::: "memory"); - - }""" % { - - "fun_name": fun_name, - - } - + #if cpu_arch == "arm": - + # return r""" - + # INLINE_ATTR void %(fun_name)s() { - + # asm volatile ("dmb sy\n\t" ::: "memory"); - + # }""" % { - + # "fun_name": fun_name, - + # } - raise Exception("Unexpected arch") - - - @@ -721,7 +721,7 @@ namespace jit { - - def generate_atomics_header(c_out): - contents = "" - - if cpu_arch in ("x86", "x86_64", "arm", "aarch64"): - + if cpu_arch in ("x86", "x86_64", "aarch64"): - contents += "#define JS_HAVE_GENERATED_ATOMIC_OPS 1" - - # `fence` performs a full memory barrier. - diff --git a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h - index 2e384337a31..e532d8813dc 100644 - --- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h - +++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h - @@ -30,10 +30,10 @@ - - // Explicitly exclude tier-1 platforms. - - -#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || \ - - defined(_M_IX86) || defined(__arm__) || defined(__aarch64__)) - -# error "Do not use on a tier-1 platform where inline assembly is available" - -#endif - +//#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || \ - +// defined(_M_IX86) || defined(__arm__) || defined(__aarch64__)) - +//# error "Do not use on a tier-1 platform where inline assembly is available" - +//#endif - - #if !(defined(__clang__) || defined(__GNUC__)) - # error "This file only for gcc/Clang"