Merging debian version 1.73.0+dfsg1-1.

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

1 files changed, 13 insertions, 31 deletions

diff --git a/debian/patches/c-2002_disable-net-tests.patch b/debian/patches/c-2002_disable-net-tests.patch
index 3f8926877..a3f7d112d 100644
--- a/debian/patches/c-2002_disable-net-tests.patch
+++ b/debian/patches/c-2002_disable-net-tests.patch
@@ -523,7 +523,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
 ===================================================================
 --- rust.orig/src/tools/cargo/tests/testsuite/credential_process.rs
 +++ rust/src/tools/cargo/tests/testsuite/credential_process.rs
-@@ -8,7 +8,7 @@ fn toml_bin(proj: &Project, name: &str)
+@@ -7,7 +7,7 @@ fn toml_bin(proj: &Project, name: &str)
      proj.bin(name).display().to_string().replace('\\', "\\\\")
  }
  
@@ -532,16 +532,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
  fn gated() {
      let _alternative = registry::RegistryBuilder::new()
          .alternative()
-@@ -65,7 +65,7 @@ or use environment variable CARGO_REGIST
-         .run();
- }
- 
--#[cargo_test]
-+#[allow(dead_code)]
- fn warn_both_token_and_process() {
-     // Specifying both credential-process and a token in config should issue a warning.
-     let _server = registry::RegistryBuilder::new()
-@@ -212,7 +212,7 @@ fn get_token_test() -> (Project, TestReg
+@@ -120,7 +120,7 @@ fn get_token_test() -> (Project, TestReg
      (p, server)
  }
  
@@ -550,8 +541,8 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
  fn publish() {
      // Checks that credential-process is used for `cargo publish`.
      let (p, _t) = get_token_test();
-@@ -237,7 +237,7 @@ You may press ctrl-c [..]
-     assert_eq!(calls, 1);
+@@ -143,7 +143,7 @@ You may press ctrl-c [..]
+         .run();
  }
  
 -#[cargo_test]
@@ -559,17 +550,17 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
  fn basic_unsupported() {
      // Non-action commands don't support login/logout.
      let registry = registry::RegistryBuilder::new()
-@@ -280,7 +280,7 @@ the credential-process configuration val
+@@ -181,7 +181,7 @@ Caused by:
          .run();
  }
  
 -#[cargo_test]
 +#[allow(dead_code)]
  fn login() {
-     let server = registry::RegistryBuilder::new()
+     let registry = registry::RegistryBuilder::new()
          .no_configure_token()
-@@ -337,7 +337,7 @@ fn login() {
-     );
+@@ -203,7 +203,7 @@ fn login() {
+         .run();
  }
  
 -#[cargo_test]
@@ -577,8 +568,8 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
  fn logout() {
      let server = registry::RegistryBuilder::new()
          .no_configure_token()
-@@ -395,7 +395,7 @@ token for `crates-io` has been erased!
-     );
+@@ -223,7 +223,7 @@ fn logout() {
+         .run();
  }
  
 -#[cargo_test]
@@ -586,7 +577,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
  fn yank() {
      let (p, _t) = get_token_test();
  
-@@ -410,7 +410,7 @@ fn yank() {
+@@ -239,7 +239,7 @@ fn yank() {
          .run();
  }
  
@@ -595,16 +586,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
  fn owner() {
      let (p, _t) = get_token_test();
  
-@@ -425,7 +425,7 @@ fn owner() {
-         .run();
- }
- 
--#[cargo_test]
-+#[allow(dead_code)]
- fn libexec_path() {
-     // cargo: prefixed names use the sysroot
-     let server = registry::RegistryBuilder::new()
-@@ -459,7 +459,7 @@ Caused by:
+@@ -255,7 +255,7 @@ fn owner() {
          .run();
  }
  
@@ -612,4 +594,4 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
 +#[allow(dead_code)]
  fn invalid_token_output() {
      // Error when credential process does not output the expected format for a token.
-     let _server = registry::RegistryBuilder::new()
+     let cred_proj = project()