Merge version 1.85.0+dfsg2-3+rpi1 and 1.85.0+dfsg3-1 to produce 1.85.0+dfsg3-1+rpi1

diff --cc debian/changelog
index e1f11edefabd70aac91d948d53c5eb53d5e9b6bb,0ff29de70637e2acb6ddf59e3f72e29a98f4bbf9..01c6037de95979fa87222d6ec72e475d49dcb649
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,10 +1,27 @@@
- rustc (1.85.0+dfsg2-3+rpi1) trixie-staging; urgency=medium
++rustc (1.85.0+dfsg3-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +  [changes introduced in 1.37.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
 +  [changes introduced in 1.42.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Use the compiler itself rather than dpkg to detect DEB_BUILD_RUST_TYPE
 +  [changes introduced in 1.57.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Disable testsuite for arch all builds as well.
 +  [changes introduced in 1.85.0+dfsg2-2+rpi1 by Peter Michael Green]
 +  * Cherry pick upstream fixes for documentation build on arm32.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 17 Apr 2025 03:41:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 05 May 2025 20:21:05 +0000
++
+ rustc (1.85.0+dfsg3-1) unstable; urgency=medium
+ 
+   * backport fix for gix-features CVE-2025-31130
+   * rust-lldb: fix lldb version (Closes: #1100950)
+   * cherry-pick fix for crossbeam-channel RUSTSEC-2025-0024
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Thu, 24 Apr 2025 17:47:57 +0200
  
  rustc (1.85.0+dfsg2-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index d6ee399d748ecfadfe65b2e81b1e655a7034ca1e,267a22d20fdae7453e349e16ad8b725c94a05c5f..03a67ba6e17743a52d54dd019d74623729696c16
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -46,7 -46,5 +46,9 @@@ build/bootstrap-don-t-attempt-to-downlo
  behaviour/proc-macro-srv-make-usage-of-RTLD_DEEPBIND-portable.patch
  bootstrap/bootstrap-revert-cross-build-breaking-change.patch
  vendor/cargo-update-git2-bindings.patch
+ vendor/gitoxide-backport-fix-for-CVE-2025-31130.patch
+ upstream/RUSTSEC-2025-0024-sync-mpsc-prevent-double-free-on-Drop.patch
 +rustdoc-disable-forbidden-target_feature.patch
 +also-fix-potential-issues-with-mixed-sta.patch
 +add-test.patch
 +also-skip-abi_required_features-check-in.patch