Manual merge of version 1:102.13.0-1~deb12u1+rpi1 and 1:115.12.0-1 to produce 1:115...
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 25 Jul 2024 20:07:22 +0000 (20:07 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 25 Jul 2024 20:07:22 +0000 (20:07 +0000)
16 files changed:
1  2 
build/moz.configure/arm.configure
build/moz.configure/rust.configure
config/makefiles/rust.mk
debian/changelog
debian/control
debian/patches/series
debian/rules
gfx/qcms/src/lib.rs
gfx/qcms/src/transform.rs
media/libvpx/sources.mozbuild
modules/fdlibm/src/math_private.h
security/nss/lib/freebl/Makefile
security/nss/lib/freebl/freebl.gyp
security/nss/lib/freebl/gcm.c
third_party/rust/nss_build_common/.cargo-checksum.json
third_party/rust/nss_build_common/src/lib.rs

index 82313257d4bdf33462ccc3f41cc967ce8772e258,5d26f4d73239182a0b139db3e739cbe3e3152957..e0862669c53b8f7911390eccee8aa3006792ad0c
@@@ -261,15 -271,14 +271,13 @@@ set_define("HAVE_ARM_NEON", have_arm_ne
  # This matches media/webrtc/trunk/webrtc/build/common.gypi.
  @depends(arm_target.arm_arch, when=have_arm_neon)
  def build_arm_neon(arm_arch):
 -    return arm_arch >= 7
 +    return arm_arch >= 700
  
  
- #set_config("BUILD_ARM_NEON", build_arm_neon)
- #set_define("BUILD_ARM_NEON", build_arm_neon)
 -set_config("BUILD_ARM_NEON", True, when=build_arm_neon)
 -set_define("BUILD_ARM_NEON", True, when=build_arm_neon)
--
++#set_config("BUILD_ARM_NEON", True, when=build_arm_neon)
++#set_define("BUILD_ARM_NEON", True, when=build_arm_neon)
  
  set_config("ARM_ARCH", depends(arm_target.arm_arch)(lambda x: str(x)))
- add_old_configure_assignment("ARM_ARCH", depends(arm_target.arm_arch)(lambda x: str(x)))
  set_config("MOZ_FPU", arm_target.fpu)
  
  
Simple merge
index 9509002b4be0d08b56ab05f8e966fc351799be34,894e2b341a53be0b3baeb7ff256eb1edd9fef598..ac6a6f093f4c94dfb667aa9af0a19f6732781a90
@@@ -90,7 -92,7 +92,7 @@@ ifndef rustflags_sanco
  # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045.
  ifndef MOZ_CODE_COVERAGE
  ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
- #cargo_rustc_flags += -Clto
 -cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat)
++#cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat)
  endif
  # We need -Cembed-bitcode=yes for all crates when using -Clto.
  RUSTFLAGS += -Cembed-bitcode=yes
index f2d99f6838a72f1a6c21ffe856281cc915a9495f,7d7b2e05ccd7b3f8689ae31456146de4706c5eff..064737d1af3151632fb691080f5205794d858229
- thunderbird (1:102.13.0-1~deb12u1+rpi1) bookworm-staging; urgency=medium
++thunderbird (1:115.12.0-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought over from firefox-esr 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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 introduced in 60.4.0-1+rpi1 by Peter Michael Green]
 +  * Further fixes to clean target (still not completely fixed :( ).
 +
 +  [changes introduced in 1:68.5.0-1~deb10u1+rpi1 by Peter Michael Green]
 +  * Disable neon (patches taken from firefox-esr package)
 +  * Build in a chroot with arm64 binutils-arm-linux-gnueabihf
 +
 +  [changes brought forward from 1:68.5.0-1~deb10u1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 15 Mar 2020 16:27:21 +0000]
 +  * Actually build the binary packages on armhf.
 +  * Yet more clean target fixing.
 +
 +  [changes brought over from firefox-esr 78.3.0esr-2+rpi1 by Peter Michael Green]
 +  * Clean up pycache directories.
 +  * Disable neon in qcms.
 +
 +  [changes introduced in 1:78.4.0-1~deb10u1+rpi1 by Peter Michael Green]
 +  * Add export NSS_DISABLE_ARM32_NEON=1 to hopefully disable neon in nss.
 +  * Adding the define in debian/rules didn't seem to work, try to patch out neon in nss instead
 +
 +  [changes brought forward from 1:78.5.1-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Dec 2020 00:33:33 +0000]
 +  * Actually build thunderbird binary on armhf
 +    (changelog says this was already done, but it got lost somewhere
 +    along the way).
 +
 +  [changes introduced in 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 introduced in 1:91.5.1-1+rpi1 by Peter Micheal Green]
 +  * Further hacks to rust target selection.
 +
 +  [changes introduced in 1:102.1.1-1+rpi1 by Peter Michael Green]
 +  * Don't build rust code with Clto to avoid out of memory errors.
 +  * Disable more armv7/neon stuff.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 30 Jul 2023 03:19:57 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 25 Jul 2024 20:06:05 +0000
 +
- thunderbird (1:102.13.0-1~deb12u1) bookworm-security; urgency=medium
+ thunderbird (1:115.12.0-1) unstable; urgency=medium
  
-   * Rebuild for bookworm-security
-     (Closes: #971790, #1006432)
+   * [3d303c4] d/c-u-t.py: Ignore one more version
+   * [2e7f143] New upstream version 115.12.0
+     Fixed CVE issues in upstream version 115.12 (MFSA 2024-28):
+     CVE-2024-5702: Use-after-free in networking
+     CVE-2024-5688: Use-after-free in JavaScript object transplant
+     CVE-2024-5690: External protocol handlers leaked by timing attack
+     CVE-2024-5691: Sandboxed iframes were able to bypass sandbox restrictions
+                    to open a new window
+     CVE-2024-5692: Bypass of file name restrictions during saving
+     CVE-2024-5693: Cross-Origin Image leak via Offscreen Canvas
+     CVE-2024-5696: Memory Corruption in Text Fragments
+     CVE-2024-5700: Memory safety bugs fixed in Firefox 127, Firefox ESR 115.12,
+                    and Thunderbird 115.12
+   * [9afc3a0] d/logo/thunderbird: Update PNG files from newer SVG
+     (Closes: #1071824)
+   * [a92c8d1] d/thunderbird.install: Install the newer correct SVG graphic
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 14 Jun 2024 13:26:00 +0200
+ thunderbird (1:115.11.0-1) unstable; urgency=medium
+   * [47bb447] d/c-u-t.py: Ignore potentially non ESR versions
+   * [f008566] New upstream version 115.11.0
+     Fixed CVE issues in upstream version 115.11 (MFSA 2024-23):
+     CVE-2024-4367: Arbitrary JavaScript execution in PDF.js
+     CVE-2024-4767: IndexedDB files retained in private browsing mode
+     CVE-2024-4768: Potential permissions request bypass via clickjacking
+     CVE-2024-4769: Cross-origin responses could be distinguished between
+                    script and non-script content-types
+     CVE-2024-4770: Use-after-free could occur when printing to PDF
+     CVE-2024-4777: Memory safety bugs fixed in Firefox 126, Firefox ESR 115.11,
+                    and Thunderbird 115.11
+   * [b029857] d/control: Re-add build and binary dep on rnp library
+     (Closes: #1070871)
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 14 May 2024 21:28:37 +0200
+ thunderbird (1:115.10.1-1) unstable; urgency=medium
+   [ William Desportes ]
+   * [d0cbb66] Fix a typo in the wrapper file
+   [ Carsten Schoenert ]
+   * [47d140b] New upstream version 115.10.1
+     Fixed CVE issues in upstream version 115.10 (MFSA 2024-20):
+     CVE-2024-3852: GetBoundName in the JIT returned the wrong object
+     CVE-2024-3854: Out-of-bounds-read after mis-optimized switch statement
+     CVE-2024-3857: Incorrect JITting of arguments led to use-after-free
+                    during garbage collection
+     CVE-2024-2609: Permission prompt input delay could expire when not in
+                    focus
+     CVE-2024-3859: Integer-overflow led to out-of-bounds-read in the
+                    OpenType sanitizer
+     CVE-2024-3861: Potential use-after-free due to AlignedBuffer self-move
+     CVE-2024-3302: Denial of Service using HTTP/2 CONTINUATION frames
+     CVE-2024-3864: Memory safety bug fixed in Firefox 125, Firefox ESR 115.10,
+                    and Thunderbird 115.10
+   * [5612f7b] d/control: Move libotr5 to libotr5t64 for bin:thunderbird
+     (Closes: #1069337)
+   * [195482a] d/mozconfig.default: Use internal shipped librnp version
+     The Debian package has a RC bug for longer time which would prevent the
+     migration of the thunderbird package to testing.
+   * [cd4de72] d/control: Drop dependencies on librnp{0,-dev}
+   * [761eb83] d/thunderbird.install: Install local built rnp tools
+   * [ce212a8] d/control: Increase Standards-Version to 4.7.0
+     No further changes needed.
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 20 Apr 2024 19:35:18 +0200
+ thunderbird (1:115.9.0-1) unstable; urgency=medium
+   * [c122f7d] New upstream version 115.9.0
+     Fixed CVE issues in upstream version 115.9 (MFSA 2024-14):
+     CVE-2024-0743: Crash in NSS TLS method
+     CVE-2024-2607: JIT code failed to save return registers on Armv7-A
+     CVE-2024-2608: Integer overflow could have led to out of bounds write
+     CVE-2024-2616: Improve handling of out-of-memory conditions in ICU
+     CVE-2023-5388: NSS susceptible to timing attack against RSA decryption
+     CVE-2024-2610: Improper handling of html and body tags enabled CSP nonce
+                    leakage
+     CVE-2024-2611: Clickjacking vulnerability could have led to a user
+                    accidentally granting permissions
+     CVE-2024-2612: Self referencing object could have potentially led to a
+                    use-after-free
+     CVE-2024-2614: Memory safety bugs fixed in Firefox 124, Firefox ESR 115.9,
+                    and Thunderbird 115.9
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 19 Mar 2024 16:55:17 +0100
+ thunderbird (1:115.8.1-1) unstable; urgency=medium
+   * [b9b4842] New upstream version 115.8.1
+     Fixed CVE issues in upstream version 115.8.1 (MFSA 2024-11):
+     CVE-2024-1936: Leaking of encrypted email subjects to other conversations
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Mon, 04 Mar 2024 19:13:14 +0100
+ thunderbird (1:115.8.0-1) unstable; urgency=medium
+   * [68f2fbe] New upstream version 115.8.0
+     Fixed CVE issues in upstream version 115.8 (MFSA 2024-07):
+     CVE-2024-1546: Out-of-bounds memory read in networking channels
+     CVE-2024-1547: Alert dialog could have been spoofed on another site
+     CVE-2024-1548: Fullscreen Notification could have been hidden by select
+                    element
+     CVE-2024-1549: Custom cursor could obscure the permission dialog
+     CVE-2024-1550: Mouse cursor re-positioned unexpectedly could have led to
+                    unintended permission grants
+     CVE-2024-1551: Multipart HTTP Responses would accept the Set-Cookie
+                    header in response parts
+     CVE-2024-1552: Incorrect code generation on 32-bit ARM devices
+     CVE-2024-1553: Memory safety bugs fixed in Firefox 123, Firefox ESR 115.8,
+                    and Thunderbird 115.8
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 21 Feb 2024 17:18:14 +0100
+ thunderbird (1:115.7.0-1) unstable; urgency=medium
+   * [6e0c26c] New upstream version 115.7.0
+     Fixed CVE issues in upstream version 115.7 (MFSA 2024-04):
+     CVE-2024-0741: Out of bounds write in ANGLE
+     CVE-2024-0742: Failure to update user input timestamp
+     CVE-2024-0746: Crash when listing printers on Linux
+     CVE-2024-0747: Bypass of Content Security Policy when directive
+                    unsafe-inline was set
+     CVE-2024-0749: Phishing site popup could show local origin in address bar
+     CVE-2024-0750: Potential permissions request bypass via clickjacking
+     CVE-2024-0751: Privilege escalation through devtools
+     CVE-2024-0753: HSTS policy on subdomain could bypass policy of upper domain
+     CVE-2024-0755: Memory safety bugs fixed in Firefox 122, Firefox ESR 115.7,
+                    and Thunderbird 115.7
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 23 Jan 2024 16:56:31 +0100
+ thunderbird (1:115.6.0-1) unstable; urgency=medium
+   * [aea3623] New upstream version 115.6.0
+     Fixed CVE issues in upstream version 115.6 (MFSA 2023-55):
+     CVE-2023-50762: Truncated signed text was shown with a valid OpenPGP
+                     signature
+     CVE-2023-50761: S/MIME signature accepted despite mismatching message
+                     date
+     CVE-2023-6856: Heap-buffer-overflow affecting WebGL DrawElementsInstanced
+                    method with Mesa VM driver
+     CVE-2023-6857: Symlinks may resolve to smaller than expected buffers
+     CVE-2023-6858: Heap buffer overflow in nsTextFragment
+     CVE-2023-6859: Use-after-free in PR_GetIdentitiesLayer
+     CVE-2023-6860: Potential sandbox escape due to VideoBridge lack
+                    of texture validation
+     CVE-2023-6861: Heap buffer overflow affected nsWindow::PickerOpen(void)
+                    in headless mode
+     CVE-2023-6862: Use-after-free in nsDNSService
+     CVE-2023-6863: Undefined behavior in ShutdownObserver()
+     CVE-2023-6864: Memory safety bugs fixed in Firefox 121, Firefox ESR 115.6,
+                    and Thunderbird 115.6
+   * [6ecaa01] d/control: Remove B-D on libiw-dev
+     (Closes: #1058737)
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 19 Dec 2023 20:24:02 +0100
+ thunderbird (1:115.5.2-1) unstable; urgency=medium
+   * [34f6404] New upstream version 115.5.2
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 08 Dec 2023 21:21:26 +0100
+ thunderbird (1:115.5.1-1) unstable; urgency=medium
+   * [eec913b] New upstream version 115.5.1
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 29 Nov 2023 18:13:11 +0100
+ thunderbird (1:115.5.0-1) unstable; urgency=medium
+   [ intrigeri ]
+   * [a6be3ab] AppArmor: update profile from upstream at commit
+               9d3fa88cdab512e45f6fd80f067337f200d356bc
+   [ Carsten Schoenert ]
+   * [ed61fd6] New upstream version 115.5.0
+     Fixed CVE issues in upstream version 115.5 (MFSA 2023-52):
+     CVE-2023-6204: Out-of-bound memory access in WebGL2 blitFramebuffer
+     CVE-2023-6205: Use-after-free in MessagePort::Entangled
+     CVE-2023-6206: Clickjacking permission prompts using the fullscreen
+                    transition
+     CVE-2023-6207: Use-after-free in ReadableByteStreamQueueEntry::Buffer
+     CVE-2023-6208: Using Selection API would copy contents into X11 primary
+                    selection.
+     CVE-2023-6209: Incorrect parsing of relative URLs starting with "///"
+     CVE-2023-6212: Memory safety bugs fixed in Firefox 120, Firefox ESR 115.5,
+                    and Thunderbird 115.5
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 22 Nov 2023 21:50:16 +0000
+ thunderbird (1:115.4.1-1) unstable; urgency=medium
+   * [c51ab77] New upstream version 115.4.1
+     Fixed CVE issues in upstream version 115.4.1 (MFSA 2023-47):
+     CVE-2023-5721: Queued up rendering could have allowed websites to
+                    clickjack
+     CVE-2023-5732: Address bar spoofing via bidirectional characters
+     CVE-2023-5724: Large WebGL draw could have led to a crash
+     CVE-2023-5725: WebExtensions could open arbitrary URLs
+     CVE-2023-5728: Improper object tracking during GC in the JavaScript
+                    engine could have led to a crash.
+     CVE-2023-5730: Memory safety bugs fixed in Firefox 119, Firefox ESR 115.4,
+                    and Thunderbird 115.4.1
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 25 Oct 2023 21:05:23 +0200
+ thunderbird (1:115.3.1-1) unstable; urgency=medium
+   * [276a53a] New upstream version 115.3.1
+     Fixed CVE issues in upstream version 115.3.1 (MFSA 2023-44):
+     CVE-2023-5217: Heap buffer overflow in libvpx
+   * [a360abf] d/control: Point VCS links to debian/sid
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 29 Sep 2023 19:26:42 +0200
+ thunderbird (1:115.3.0-1) unstable; urgency=medium
+   * [2e67467] New upstream version 115.3.0
+     Fixed CVE issues in upstream version 115.3 (MFSA 2023-43):
+     CVE-2023-5168: Out-of-bounds write in FilterNodeD2D1
+     CVE-2023-5169: Out-of-bounds write in PathOps
+     CVE-2023-5171: Use-after-free in Ion Compiler
+     CVE-2023-5176: Memory safety bugs fixed in Firefox 118, Firefox
+                    ESR 115.3, and Thunderbird 115.3
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 27 Sep 2023 19:07:47 +0200
+ thunderbird (1:115.2.2-1) unstable; urgency=medium
+   * [08bc8c9] d/thunderbird.desktop: Update data with upstream data
+     (Closes: #1042912, #1051261)
+   * [2fd665b] New upstream version 115.2.2
+     Fixed CVE issues in upstream version 115.2.2 (MFSA 2023-40):
+     CVE-2023-4863: Heap buffer overflow in libwebp
+   * [7b862be] d/copyright: Update content due upstream changes
+   * [140b77d] d/s/lintian-overrides: Update data for overrides
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 13 Sep 2023 22:59:59 +0530
+ thunderbird (1:115.2.0-1) unstable; urgency=medium
+   * [1415d01] New upstream version 115.2.0
+     Fixed CVE issues in upstream version 115.2 (MFSA 2023-36):
+     CVE-2023-4573: Memory corruption in IPC CanvasTranslator
+     CVE-2023-4574: Memory corruption in IPC ColorPickerShownCallback
+     CVE-2023-4575: Memory corruption in IPC FilePickerShownCallback
+     CVE-2023-4576: Integer Overflow in RecordedSourceSurfaceCreation
+     CVE-2023-4577: Memory corruption in JIT UpdateRegExpStatics
+     CVE-2023-4051: Full screen notification obscured by file open dialog
+     CVE-2023-4578: Error reporting methods in SpiderMonkey could have
+                    triggered an Out of Memory Exception
+     CVE-2023-4053: Full screen notification obscured by external program
+     CVE-2023-4580: Push notifications saved to disk unencrypted
+     CVE-2023-4581: XLL file extensions were downloadable without warnings
+     CVE-2023-4582: Buffer Overflow in WebGL glGetProgramiv
+     CVE-2023-4583: Browsing Context potentially not cleared when closing
+                    Private Window
+     CVE-2023-4584: Memory safety bugs fixed in Firefox 117, Firefox ESR
+                    102.15, Firefox ESR 115.2, Thunderbird 102.15, and
+                    Thunderbird 115.2
+     CVE-2023-4585: Memory safety bugs fixed in Firefox 117, Firefox ESR 115.2,
+                    and Thunderbird 115.2
+  -- Christoph Goehre <chris@sigxcpu.org>  Wed, 30 Aug 2023 17:41:36 +0200
+ thunderbird (1:115.1.1-1) unstable; urgency=medium
+   [ Christoph Goehre ]
+   * [880cabe] ship glxtest and vaapitest binaries
+     (Closes: #1043057)
  
-  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 08 Jul 2023 08:15:29 +0200
+   [ Carsten Schoenert ]
+   * [8474b9b] d/thunderbird.install: Use upstream graphics for icons
+   * [85f99a2] d/c-u-t.py: Use Version() from python3-packaging
+   * [86e3335] d/thunderbird.desktop: Sort MimeType entries alphabetically
+   * [2bc5f47] New upstream version 115.1.1
+   * [ddec51f] Revert "d/mozconfig.default: Use internal shipped librnp
+               version"
+   * [3ef27e2] Revert "d/control: Drop librnp0 package from Depends"
+   * [9011502] Revert "d/thunderbird.install: Install rnp tools too"
+   * [d5eef62] d/control: Bump version of librnp{0,-dev}
+     (Closes: #1041409)
+   [ Max Nikulin ]
+   * [0e04b0e] d/thunderbird.desktop: Add IANA MIME type for .vcf vcard
+   * [ce01092] d/thunderbird.desktop: Add mid: URI to MIME types
+     (Closes: #1008159)
+   * [c11a22f] d/thunderbird.desktop: Add news: URI to MIME types
+   * [bf5586f] d/thunderbird.desktop: Add webcal: URI to MIME types
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 16 Aug 2023 17:18:04 +0200
+ thunderbird (1:115.1.0-1) unstable; urgency=medium
+   * [8c11865] d/gbp.conf: Adjust upstream branch to new ESR cycle
+   * [fb76340] New upstream version 115.1.0
+     Fixed CVE issues in upstream version 115.1 (MFSA 2023-33):
+     CVE-2023-4045: Offscreen Canvas could have bypassed cross-origin
+                    restrictions
+     CVE-2023-4046: Incorrect value used during WASM compilation
+     CVE-2023-4047: Potential permissions request bypass via clickjacking
+     CVE-2023-4048: Crash in DOMParser due to out-of-memory conditions
+     CVE-2023-4049: Fix potential race conditions when releasing platform
+                    objects
+     CVE-2023-4050: Stack buffer overflow in StorageManager
+     CVE-2023-4055: Cookie jar overflow caused unexpected cookie jar state
+     CVE-2023-4056: Memory safety bugs fixed in Firefox 116,
+                    Firefox ESR 115.1, Firefox ESR 102.14, Thunderbird 115.1,
+                    and Thunderbird 102.14
+     CVE-2023-4057: Memory safety bugs fixed in Firefox 116,
+                    Firefox ESR 115.1, and Thunderbird 115.1
+   * [b562827] Rebuild patch queue from patch-queue branch
+     Removed patches (included upstream):
+     fixes/Bug-1840931-More-properly-handle-files-4GB-in-elfhack.-r-.patch
+     fixes/Bug-1842933-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
+     porting-mips/Bug-1841197-Undefine-the-mips-builtin-macro-on-mips-in-sk.patch
+     porting-mips64el/Bug-1841201-Work-around-tail-call-optimization-not-happen.patch
+     porting-ppc64el/Work-around-bz-1775202-to-fix-FTBFS-on-ppc64el.patch
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 01 Aug 2023 19:19:27 +0200
+ thunderbird (1:115.0.1-2) experimental; urgency=medium
+   [ Carsten Schoenert ]
+   * [39b1576] d/create-upstream-tarballs.py: Catch non existing versions
+   * [f663f6a] d/create-upstream-tarballs.py: Running black formatter
+   * [8e6d7fe] d/create-upstream-tarballs.py: Use speaking variable name
+   [ Christoph Goehre ]
+   * [cdab989] Rebuild patch queue from patch-queue branch
+     Added patch:
+     porting-mips64el/Bug-1841201-Work-around-tail-call-optimization-not-happen.patch
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 29 Jul 2023 09:22:57 +0200
+ thunderbird (1:115.0.1-1) experimental; urgency=medium
+   * [30f2fcc] New upstream version 115.0.1
+     Fixed CVE issues in upstream version 115.0.1 (MFSA 2023-27):
+     CVE-2023-3600: Use-after-free in workers
+     CVE-2023-3417: File Extension Spoofing using the Text Direction
+                    Override Character
+   * [efbb370] Rebuild patch queue from patch-queue branch
+     Added patches:
+     debian-hacks/rnp-Fix-include-for-format-specifiers-for-uint32_t.patch
+     fixes/skia-Cast-SkEndian_SwapBE32-n-to-uint32_t-on-big-endian.patch
+     porting-mips64el/skia-Disable-musttail-on-mips64.patch
+     porting-ppc64el/skia-Disable-musttail-on-ppc64el.patch
+   * [f78b777] d/mozconfig.default: Use internal shipped librnp version
+   * [a606cdb] d/control: Drop librnp0 package from Depends
+   * [104bf35] d/thunderbird.install: Install rnp tools too
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 23 Jul 2023 09:07:08 +0200
+ thunderbird (1:115.0-1) experimental; urgency=medium
+   [ Carsten Schoenert ]
+   * [3a6b0eb] New upstream version 115.0
+   * [1c11a15] Rebuild patch queue from patch-queue branch
+     Dropped patches:
+     debian-hacks/Decrease-Cargo-minimal-version-to-1.46.0.patch
+     debian-hacks/Fix-Floating-Point-Normalization-breakage-on-32bit-Linux.patch
+     debian-hacks/Use-remoting-name-for-call-to-gdk_set_program_class.patch
+     fixes/Bug-1556197-amend-Bug-1544631-for-fixing-mips32.patch
+     fixes/Bug-628252-os2.cc-fails-to-compile-against-GCC-4.6-m.patch
+     porting-armhf/Bug-1526653-Include-struct-definitions-for-user_vfp-and-u.patch
+     porting-kfreebsd-hurd/Allow-ipc-code-to-build-on-GNU-hurd.patch
+     porting-kfreebsd-hurd/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch
+     porting-kfreebsd-hurd/FTBFS-hurd-fixing-unsupported-platform-Hurd.patch
+     porting-kfreebsd-hurd/LDAP-support-building-on-GNU-kFreeBSD-and-GNU-Hurd.patch
+     porting-kfreebsd-hurd/adding-missed-HURD-adoptions.patch
+     porting-kfreebsd-hurd/ipc-chromium-fix-if-define-for-kFreeBSD-and-Hurd.patch
+     porting-ppc64el/work-around-a-build-failure-with-clang-on-ppc64el.patch
+     porting/Work-around-GCC-ICE-on-mips-i386-and-s390x.patch
+     Added patches:
+     fixes/Bug-1840931-More-properly-handle-files-4GB-in-elfhack.-r-.patch
+     fixes/Bug-1842933-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
+     fixes/Fix-math_private.h-for-i386-FTBFS.patch
+     porting-mips/Bug-1841197-Undefine-the-mips-builtin-macro-on-mips-in-sk.patch
+     porting-ppc64el/Work-around-GCC-ICE-on-ppc64el.patch
+     porting-ppc64el/Work-around-bz-1775202-to-fix-FTBFS-on-ppc64el.patch
+   * [8d1d0e0] d/source.filter: Add build/android to list
+   [ Bo YU ]
+   * [ddf55dc] riscv64: Add build support for Riscv64 (Closes: #1026118)
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 16 Jul 2023 12:22:50 +0200
+ thunderbird (1:115.0~b6-1) experimental; urgency=medium
+   * [1d7c51d] New upstream version 115.0~b6
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 29 Jun 2023 20:13:46 +0200
+ thunderbird (1:115.0~b4-1) experimental; urgency=medium
+   * [5685662] New upstream version 115.0~b4
+   * [0ff4fd0] Rebuild patch queue from patch-queue branch
+     Updated patches:
+     porting-kfreebsd-hurd/Allow-ipc-code-to-build-on-GNU-hurd.patch
+     porting-kfreebsd-hurd/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch
+   * [67def1f] d/control: Add libotr5 to Depends
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 23 Jun 2023 16:03:31 +0200
+ thunderbird (1:114.0~b2-1) experimental; urgency=medium
+   * [1f5bec1] New upstream version 114.0~b2
+   * [df5220a] Rebuild patch queue from patch-queue branch
+     Updated patches:
+     porting-kfreebsd-hurd/FTBFS-hurd-fixing-unsupported-platform-Hurd.patch
+     porting/Work-around-GCC-ICE-on-mips-i386-and-s390x.patch
+   * [71e654b] d/rules: Add 2 files to dh_missing
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 16 May 2023 21:38:11 +0200
+ thunderbird (1:113.0~b3-1) experimental; urgency=medium
+   [ Carsten Schoenert ]
+   * [569da29] apparmor: Expand profile folder about .mozilla-thunderbird
+     (Closes: #1030532)
+   * [777be0a] New upstream version 113.0~b3
+   * [ae90792] Rebuild patch queue from patch-queue branch
+     Dropped patch (included upstream):
+     debian-hacks/Make-Thunderbird-build-reproducible.patch
+   [ Timothy Pearson ]
+   * [5dff12c] Explicitly set SQLite endianness on ppc64el
+   [ intrigeri ]
+   * [c0ea3f9] AppArmor: update profile from upstream at
+     commit a03a894c6c30b7a566aa74645802de1cea580bca
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 21 Apr 2023 19:11:41 +0200
+ thunderbird (1:112.0~b1-1) experimental; urgency=medium
+   * [c89a60d] d/source.filter: Update content to filter out
+   * [12cd2c8] New upstream version 112.0~b1
+   * [6655d37] Rebuild patch queue from patch-queue branch
+     Removed patch:
+     debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch
+   * [c4744df] d/control: Increade B-D on rustc to >= 1.65
+   * [ad73ef1] d/thunderbird.docs: Readd Apache-2 related Notice file
+   * [ebf44e8] d/control: Adjust B-D to libfontconfig-dev
+   * [6cea088] d/control: Increase Standards-Version to 4.6.2
+   * [2d0d8ee] d/copyright: Update content due upstream changes
+   * [268ee53] Lintian: Update overrides for source package
+   * [28ffd63] Lintian: Update overrides for thunderbird package
+   * [200f86d] Lintian: Update override for thunderbird-l10n-all
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 18 Mar 2023 19:31:18 +0100
+ thunderbird (1:110.0~b4-1) experimental; urgency=medium
+   [ Amr Ibrahim ]
+   * [22b9eb7] thunderbird.desktop: Update StartupWMClass
+   [ Carsten Schoenert ]
+   * [afe6c6a] d/copyright: Update content due upstream changes
+   * [7b31b9d] d/source.filter: Update content to filter out
+   * [03b50b4] Lintian: Adjust overrides for thunderbird package
+   * [d3510d8] Lintian: Adjust overrides for source package
+   * [57839a2] d/control: Increase version in B-D for libnss-dev
+   * [958648e] d-create-upstream-tarballs.py: Use correct variable
+   * [208f93e] New upstream version 110.0~b4
+     (Closes: #1031541)
+   * [ba87378] Rebuild patch queue from patch-queue branch
+     Added patch:
+     debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch
+     Adjusted patch:
+     debian-hacks/Fix-Floating-Point-Normalization-breakage-on-32bit-Linux.patch
+     porting-kfreebsd-hurd/FTBFS-hurd-fixing-unsupported-platform-Hurd.patch
+   * [3104ede] Drop usage of autoconf calls
+   * [42a2545] d/control: Increase some versions in B-D
+   * [551a17f] d/rules: Don't remove configure on dh_clean
+   * [3b7b408] d/source.filter: Don't filter configure from upstream data
+   * [48913d3] d/thunderbird.docs: Drop install of NOTICE file
+   * [44589db] d/mozconfig.default: Use internal version of ICU
+   * [3eba559] d/control: Drop libicu-dev from B-D for now
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 07 Mar 2023 16:41:43 +0100
+ thunderbird (1:104.0~b2-1) experimental; urgency=medium
+   * [92670b2] d/repack.py: Small rework and adjustments
+   * [06fb656] d/create-upstream-tarballs.py: Adding new helper script
+   * [331247d] d/README.source: Update information on importing data
+   * [57a6dd7] d/source.filter: Relax filter rule for old-configure
+   * [36696b6] d/repack.py: Don't exit(1) if unused filter items exist
+   * [3b14d11] d/create-thunderbird-l10n-tarball.sh: Drop old helper
+   * [5468bb8] d/gbp.conf: Drop 'import-orig' section
+   * [fd4d5c1] d/source.filter: Add files named *.orig and *.rej
+   * [5035e50] New upstream version 104.0~b2
+   * [cc89049] Rebuild patch queue from patch-queue branch
+     Removed patch:
+     debian-hacks/Lower-down-required-NSS-version.patch
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 06 Aug 2022 09:13:35 +0200
+ thunderbird (1:103.0~b5-1) experimental; urgency=medium
+   * [a060ea2] d/gbp.conf: Sign tags automatically
+     (cherry-picked from debian/sid)
+   * [ac331c8] New upstream version 103.0~b5
+   * [00dd354] Rebuild patch queue from patch-queue branch
+     Added patch:
+     debian-hacks/Lower-down-required-NSS-version.patch
+   * [5c35afb] d/watch: Look now for versions starting with 3 digits
+     (cherry-picked from debian/sid)
+   * [a897f48] d/control: Add package thunderbird-l10n-es-mx
+     (cherry-picked from debian/sid)
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 13 Jul 2022 18:08:16 +0200
+ thunderbird (1:102.13.1-1) unstable; urgency=medium
+   * [e803b54] New upstream version 102.13.1
+     Fixed CVE issues in upstream version 102.13.1 (MFSA 2023-28):
+     CVE-2023-3417: File Extension Spoofing using the Text Direction
+                    Override Character
+   * [456ce20] Rebuild patch queue from patch-queue branch
+     Added patch:
+     fixes/gfx-Fix-inclusion-of-C-header.patch
+     fixes/toolkit-Fix-inclusion-of-C-header.patch
+     (Closes: #1037872)
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 26 Jul 2023 19:48:59 +0200
  
  thunderbird (1:102.13.0-1) unstable; urgency=medium
  
diff --cc debian/control
index 7a97bd6ee25c7bd02257196ec01a7e9ec92f6fc6,27f5750c43f7d0ad97d51930ac0c71ca5d43e106..a34fab6e0137f7aa95015b4bdb1e9617002564c3
@@@ -60,10 -58,10 +58,10 @@@ Vcs-Git: https://salsa.debian.org/mozil
  Vcs-Browser: https://salsa.debian.org/mozilla-team/thunderbird/commits/debian/sid/
  Homepage: https://www.thunderbird.net/
  X-Debian-Homepage: http://wiki.debian.org/Thunderbird
- Standards-Version: 4.6.2
+ Standards-Version: 4.7.0
  
  Package: thunderbird
- Architecture: amd64 armhf arm64 i386 mips64el ppc64el s390x ppc64
 -Architecture: amd64 arm64 i386 mips64el ppc64el s390x ppc64 riscv64
++Architecture: amd64 armhf arm64 i386 mips64el ppc64el s390x ppc64 riscv64
  Depends:
   debianutils (>= 1.16),
   fontconfig,
index 4afa475320c6b8b065b4e956a0822822c84638e0,49f68eef6917593f8f22284bab61ffa786eefdff..43b8fb2b1f6ae9babe0425e2c39cceb221ee5fee
@@@ -9,28 -9,13 +9,22 @@@ debian-hacks/Don-t-error-out-when-run-t
  fixes/Load-dependent-libraries-with-their-real-path.patch
  prefs/Set-javascript.options.showInConsole.patch
  prefs/Don-t-auto-disable-extensions-in-system-directories.patch
- fixes/Bug-628252-os2.cc-fails-to-compile-against-GCC-4.6-m.patch
- porting-kfreebsd-hurd/ipc-chromium-fix-if-define-for-kFreeBSD-and-Hurd.patch
- porting-kfreebsd-hurd/FTBFS-hurd-fixing-unsupported-platform-Hurd.patch
- porting-kfreebsd-hurd/adding-missed-HURD-adoptions.patch
  porting-armel/Avoid-using-vmrs-vmsr-on-armel.patch
- porting-armhf/Bug-1526653-Include-struct-definitions-for-user_vfp-and-u.patch
  fixes/Allow-.js-preference-files-to-set-locked-prefs-with-lockP.patch
- fixes/Bug-1556197-amend-Bug-1544631-for-fixing-mips32.patch
  debian-hacks/Set-program-name-from-the-remoting-name.patch
- porting/Work-around-GCC-ICE-on-mips-i386-and-s390x.patch
- porting-ppc64el/work-around-a-build-failure-with-clang-on-ppc64el.patch
- debian-hacks/Make-Thunderbird-build-reproducible.patch
- debian-hacks/Decrease-Cargo-minimal-version-to-1.46.0.patch
- debian-hacks/Fix-Floating-Point-Normalization-breakage-on-32bit-Linux.patch
+ fixes/Fix-math_private.h-for-i386-FTBFS.patch
+ porting-ppc64el/Work-around-GCC-ICE-on-ppc64el.patch
+ debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch
+ fixes/skia-Cast-SkEndian_SwapBE32-n-to-uint32_t-on-big-endian.patch
+ porting-ppc64el/skia-Disable-musttail-on-ppc64el.patch
+ debian-hacks/rnp-Fix-include-for-format-specifiers-for-uint32_t.patch
+ porting-mips64el/skia-Disable-musttail-on-mips64.patch
 +raspbian-rust-triplet-hack.patch
 +try-to-disable-neon.patch
 +try-harder-to-disable-neon.patch
 +disable-neon-in-qcms.patch
 +patch-out-neon-in-freebl.patch
 +use-a-define-instead-of-a-typedef-for-do.patch
 +further-raspbian-hacks-to-rust-target-se.patch
 +dont-build-rust-code-with-clto-to-avoid-.patch
 +disable-more-armv7neon-stuff.patch
diff --cc debian/rules
index cc5df8e5edc578e6853da282a5c5c1578351d72f,42edec7aaa4e28cc1632f7ba5a17dff2e0e87a32..4f1f3f71ed8ec7755c3e458cb627f38e2847027f
@@@ -95,19 -92,10 +94,19 @@@ override_dh_auto_clean
        dh_auto_clean --builddirectory=obj-thunderbird
        find -type f -name "*.pyc" -exec rm {} \;
        rm -rf third_party/python/psutil/tmp
-       rm -f configure old-configure js/src/configure js/src/old-configure mozconfig.*
+       rm -f old-configure js/src/configure js/src/old-configure mozconfig.*
        # needed for thunderbird-l10n
        rm -rf $(THUNDERBIRD_L10N_BUILDDIR)
 +      rm -rf third_party/python/psutil/tmp/
 +      rm -f third_party/python/psutil/psutil/*.so
 +      rm -rf third_party/python/psutil/build/temp*
 +      rm -rf third_party/python/psutil/build/lib*
 +      find . -name '*.pyc' -delete
 +      rm -f mozconfig.*
        rm -rf $(CARGO_HOME)
 +      rm -rf debian/thunderbird-l10n-uz debian/thunderbird-l10n-cak debian/thunderbird-l10n-ka
 +      rm -f config/external/icu/data/icudt64l.dat
 +      find . -name __pycache__ -delete
        rm -rf $(MOZBUILD_STATE_PATH)
  
  override_dh_auto_configure:
Simple merge
Simple merge
Simple merge
index e613522ce530cc6b83394a8171d6ce11e6677b07,632d2c4c61930c17aa65ba8686b04cdaf59cf7b4..b7fecb02e58c756b433e4b70021dff96bdc5e6d3
   * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
   */
  
- #ifdef __LP64__
- typedef double      __double_t;
+ #if defined __FLT_EVAL_METHOD__ && (__FLT_EVAL_METHOD__ == 2)
+ typedef long double      __double_t;
  #else
- typedef long double __double_t;
+ typedef double      __double_t;
  #endif
 -typedef __double_t  double_t;
 +#define double_t __double_t
- typedef float   __float_t;
+ typedef float       __float_t;
  /*
   * The original fdlibm code used statements like:
   *    n0 = ((*(int*)&one)>>29)^1;             * index of high word *
Simple merge
Simple merge
Simple merge
index 6614fc4d7399a1979cd9d7ef4d36f7b5bcef1e24,35980b1aa5e93715feaca01e7cfbc002975529f5..2af74e055206dcd78abb7e8568c5b697e14a23a3
@@@ -1,1 -1,1 +1,1 @@@
- {"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"e1b529d6facc6f16a234a81d4b39904002ee023539a73bd29fae75e9a433fef3"},"package":null}
 -{"files":{"Cargo.toml":"6597b6d5217376ab747534364a58958ddbb23ffda52045e68b610cd8f2dcdfd1","src/lib.rs":"16da98eba3da05784442815d1ead70bbe0cce8440913ee367e72711ee4874d60"},"package":null}
++{"files":{"Cargo.toml":"6597b6d5217376ab747534364a58958ddbb23ffda52045e68b610cd8f2dcdfd1","src/lib.rs":"8ac135cf95f98473ee216a33d963d6ae2ef71f76f0dbf7036bcbb1ee174a981a"},"package":null}
index 2cc52196f25096fa75b0687d884a4ef0067ec275,9dc85bdb9a0d98ac6884dc0531385230a095e58d..4c9220c4a726fb064dac329fdeef22fb4fccd415
@@@ -116,10 -120,11 +120,11 @@@ fn get_nss_libs(kind: LinkingKind) -> V
              }
              if target_arch == "x86_64" || target_arch == "x86" {
                  static_libs.push("gcm-aes-x86_c_lib");
+                 static_libs.push("sha-x86_c_lib");
              }
 -            if target_arch == "arm" {
 -                static_libs.push("gcm-aes-arm32-neon_c_lib")
 -            }
 +            //if target_arch == "arm" {
 +            //    static_libs.push("gcm-aes-arm32-neon_c_lib")
 +            //}
              if target_arch == "aarch64" {
                  static_libs.push("gcm-aes-aarch64_c_lib");
              }