Merging debian version 1.70.0+dfsg1-7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 26 insertions, 0 deletions

diff --git a/debian/patches/d-disable-download-tests.patch b/debian/patches/d-disable-download-tests.patch
new file mode 100644
index 000000000..41531a87f
--- /dev/null
+++ b/debian/patches/d-disable-download-tests.patch
@@ -0,0 +1,26 @@
+Index: rust/src/bootstrap/config/tests.rs
+===================================================================
+--- rust.orig/src/bootstrap/config/tests.rs
++++ rust/src/bootstrap/config/tests.rs
+@@ -11,6 +11,9 @@ fn parse(config: &str) -> Config {
+ 
+ #[test]
+ fn download_ci_llvm() {
++    // Debian: this will attempt to download LLVM
++    return;
++
+     if crate::llvm::is_ci_llvm_modified(&parse("")) {
+         eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change");
+         return;
+@@ -39,7 +42,11 @@ fn download_ci_llvm() {
+ //   - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487
+ #[test]
+ fn detect_src_and_out() {
++    // Debian: this will attempt to download a toolchain
++    return;
++
+     fn test(cfg: Config, build_dir: Option<&str>) {
++
+         // This will bring absolute form of `src/bootstrap` path
+         let current_dir = std::env::current_dir().unwrap();
+