Fix failing tests

diff --git a/debian/changelog b/debian/changelog
index 31647c76f3d17ad9b14e280b40c929149f966744..4eaeeba3bb1ca1ae1ec0486d94b0161d9bdf7b81 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cargo (0.57.0-2) UNRELEASED; urgency=medium
+
+  * Fix failing tests.
+
+ -- Ximin Luo <infinity0@debian.org>  Sun, 24 Oct 2021 12:57:09 +0100
+
 cargo (0.57.0-1) unstable; urgency=medium
 
   * New upstream release for rustc 1.56.0, 2021 Edition.

diff --git a/debian/patches/2111-curl-no-rebuild.patch b/debian/patches/2111-curl-no-rebuild.patch
new file mode 100644 (file)
index 0000000..94dd9fa
--- /dev/null
+++ b/debian/patches/2111-curl-no-rebuild.patch
@@ -0,0 +1,10 @@
+--- a/vendor/curl-sys/build.rs
++++ b/vendor/curl-sys/build.rs
+@@ -4,7 +4,6 @@
+ use std::process::Command;
+ 
+ fn main() {
+-    println!("cargo:rerun-if-changed=curl");
+     let host = env::var("HOST").unwrap();
+     let target = env::var("TARGET").unwrap();
+     let windows = target.contains("windows");

diff --git a/debian/patches/2112-handle-4-siphasher-algorithms.patch b/debian/patches/2112-handle-4-siphasher-algorithms.patch
new file mode 100644 (file)
index 0000000..cf3fde5
--- /dev/null
+++ b/debian/patches/2112-handle-4-siphasher-algorithms.patch
@@ -0,0 +1,17 @@
+--- a/src/cargo/core/source/source_id.rs
++++ b/src/cargo/core/source/source_id.rs
+@@ -621,7 +621,13 @@
+ fn test_cratesio_hash() {
+     let config = Config::default().unwrap();
+     let crates_io = SourceId::crates_io(&config).unwrap();
+-    assert_eq!(crate::util::hex::short_hash(&crates_io), "1ecc6299db9ec823");
++    assert!([
++        "1ecc6299db9ec823",
++        "1285ae84e5963aae",
++        "eae4ba8cbf2ce1c7",
++        "b420f105fcaca6de"
++    ]
++    .contains(&crate::util::hex::short_hash(&crates_io).as_str()));
+ }
+ 
+ /// A `Display`able view into a `SourceId` that will write it as a url

diff --git a/debian/patches/series b/debian/patches/series
index 76b5ff661e54c718be643cfd1d4cda175cb2762d..b0d858d3fe337c1c98dc6309f6aed143960471e9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@
 # wants libgit2 1.3.0, and segfaults with libgit2 1.1.0 without this patch
 2001-Revert-add-bindings-for-git_branch_name_is_valid-715.patch
 2002-Revert-Bump-libgit2-submodule-to-1.2.0-744.patch
+2111-curl-no-rebuild.patch
+2112-handle-4-siphasher-algorithms.patch