Merge version 1:102.4.1-1+rpi1 and 1:102.5.0-1 to produce 1:102.5.0-1+rpi1

diff --cc debian/changelog
index 83b8177deb9b27c2be9218a409898d4a207668f8,d9af6a20d00bf01abf88e1f44fd6ead352647aa3..c57926dea3503a81ede5f5f4356ca453bf7b4c5d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,46 -1,31 +1,75 @@@
- thunderbird (1:102.4.1-1+rpi1) bookworm-staging; urgency=medium
++thunderbird (1:102.5.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>  Mon, 07 Nov 2022 20:45:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Nov 2022 10:16:48 +0000
++
+ thunderbird (1:102.5.0-1) unstable; urgency=medium
+ 
+   * [2f04265] New upstream version 102.5.0
+     Fixed CVE issues in upstream version 102.5 (MFSA 2022-49):
+     CVE-2022-45403: Service Workers might have learned size of cross-origin
+                     media files
+     CVE-2022-45404: Fullscreen notification bypass
+     CVE-2022-45405: Use-after-free in InputStream implementation
+     CVE-2022-45406: Use-after-free of a JavaScript Realm
+     CVE-2022-45408: Fullscreen notification bypass via windowName
+     CVE-2022-45409: Use-after-free in Garbage Collection
+     CVE-2022-45410: ServiceWorker-intercepted requests bypassed SameSite
+                     cookie policy
+     CVE-2022-45411: Cross-Site Tracing was possible via non-standard
+                     override headers
+     CVE-2022-45412: Symlinks may resolve to partially uninitialized buffers
+     CVE-2022-45416: Keystroke Side-Channel Leakage
+     CVE-2022-45418: Custom mouse cursor could have been drawn over
+                     browser UI
+     CVE-2022-45420: Iframe contents could be rendered outside the iframe
+     CVE-2022-45421: Memory safety bugs fixed in Thunderbird 102.5
+   * [57e94ac] Rebuild patch queue from patch-queue branch
+     Added patches:
+     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
+     (Closes: #1023789)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 15 Nov 2022 19:34:55 +0100
  
  thunderbird (1:102.4.1-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index aa0f7b7aaeeba226932deeb1f93a9ffb7816ba1e,2c459a624c65b6c76b05047bbf8c637ec1be8d8d..d74d308eea45fbfe58084ac162ee91fa34ab150b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -26,12 -26,5 +26,14 @@@ debian-hacks/Make-Thunderbird-build-rep
  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