Merge version 1:102.5.1-1+rpi1 and 1:102.6.0-1 to produce 1:102.6.0-1+rpi1

diff --cc debian/changelog
index 9c48872c51c3fd032113aca5d287a4a40c75a1c2,ae0d2eb44509c3a3389769afcbeaef0416572296..f388a6cfba0217ea430afe09145689b9607ad1f9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,46 -1,29 +1,73 @@@
- thunderbird (1:102.5.1-1+rpi1) bookworm-staging; urgency=medium
++thunderbird (1:102.6.0-1+rpi1) bookworm-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>  Sat, 10 Dec 2022 02:16:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 24 Dec 2022 18:38:56 +0000
++
+ thunderbird (1:102.6.0-1) unstable; urgency=medium
+ 
+   [ Paul Gevers ]
+   * [6bbbd94] tests: thunderbird no longer builds on armel and armhf, so
+     let's not fail while trying to test there
+   * [d9e09a0] tests: help.sh is really a very superficial test, so let's
+     mark it as such
+ 
+   [ Carsten Schoenert ]
+   * [43b90d6] New upstream version 102.6.0
+     Fixed CVE issues in upstream version 102.6 (MFSA 2022-53):
+     CVE-2022-46880: Use-after-free in WebGL
+     CVE-2022-46872: Arbitrary file read from a compromised content process
+     CVE-2022-46881: Memory corruption in WebGL
+     CVE-2022-46874: Drag and Dropped Filenames could have been truncated to
+                     malicious extensions
+     CVE-2022-46882: Use-after-free in WebGL
+     CVE-2022-46878: Memory safety bugs fixed in Thunderbird 102.6
+   * [745c1a3] Rebuild patch queue from patch-queue branch
+     Removed patches (included upstream):
+     fixes/Bug-1773070-Rename-remove-some-eventState-s-variables.-r-.patch
+     fixes/Bug-1782988-Avoid-build-bustage-when-building-against-gli.patch
+     fixes/Bug-1782988-Fix-use-of-arc4random_buf-use-in-ping.cpp.-r-.patch
+   * [1e74214] d/control: Increase buid dep on libnss3-dev to 3.79.2
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 13 Dec 2022 19:40:57 +0100
  
  thunderbird (1:102.5.1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index d74d308eea45fbfe58084ac162ee91fa34ab150b,5433f461f4889f5e2630beedc2ca25abfb7cd83c..4afa475320c6b8b065b4e956a0822822c84638e0
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -25,15 -25,3 +25,12 @@@ porting-ppc64el/work-around-a-build-fai
  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/Bug-1773070-Rename-remove-some-eventState-s-variables.-r-.patch
- fixes/Bug-1782988-Avoid-build-bustage-when-building-against-gli.patch
- fixes/Bug-1782988-Fix-use-of-arc4random_buf-use-in-ping.cpp.-r-.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