diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-10-28 18:42:55 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-10-28 18:50:23 +0200 |
| commit | c6e8dbdbd42fc99d297045cf6bd0e3d9474e53ad (patch) | |
| tree | 54f82db639c5f66e01c7c8dbeb694eee21089e43 /community/cargo/tests-fix-build-auth-http_auth_offered.patch | |
| parent | 90ef001dbd5ae2770296b50789454ede393a748e (diff) | |
| download | aports-c6e8dbdbd42fc99d297045cf6bd0e3d9474e53ad.tar.bz2 aports-c6e8dbdbd42fc99d297045cf6bd0e3d9474e53ad.tar.xz | |
community/cargo: upgrade to 0.22.0
We don't download prebuilt cargo binary anymore, mainly because
that URL on S3 doesn't work anymore. They have moved it *again*
and https://static.rust-lang.org/dist/ still does not contain
musl binaries.
However, we need cargo to build rust, so when building cargo, we
must already have cargo anyway. And cargo cannot be built without
rust.
Diffstat (limited to 'community/cargo/tests-fix-build-auth-http_auth_offered.patch')
| -rw-r--r-- | community/cargo/tests-fix-build-auth-http_auth_offered.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/community/cargo/tests-fix-build-auth-http_auth_offered.patch b/community/cargo/tests-fix-build-auth-http_auth_offered.patch new file mode 100644 index 0000000000..8543c2897e --- /dev/null +++ b/community/cargo/tests-fix-build-auth-http_auth_offered.patch @@ -0,0 +1,47 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Thu, 13 Aug 2016 14:47:00 +0200 +Last-Updated: Sat, 28 Oct 2017 14:59:00 +0200 +Subject: [PATCH] Fix test build-auth:http_auth_offered + +The test fails because of hard-coded libgit2 version, that may not be +the same as actually used libgit2... + +--- a/tests/build-auth.rs ++++ b/tests/build-auth.rs +@@ -20,7 +20,7 @@ + let addr = server.local_addr().unwrap(); + + fn headers(rdr: &mut BufRead) -> HashSet<String> { +- let valid = ["GET", "Authorization", "Accept", "User-Agent"]; ++ let valid = ["GET", "Authorization", "Accept"]; + rdr.lines().map(|s| s.unwrap()) + .take_while(|s| s.len() > 2) + .map(|s| s.trim().to_string()) +@@ -33,11 +33,6 @@ + let t = thread::spawn(move|| { + let mut conn = BufStream::new(server.accept().unwrap().0); + let req = headers(&mut conn); +- let user_agent = if cfg!(windows) { +- "User-Agent: git/1.0 (libgit2 0.25.0)" +- } else { +- "User-Agent: git/2.0 (libgit2 0.25.0)" +- }; + conn.write_all(b"\ + HTTP/1.1 401 Unauthorized\r\n\ + WWW-Authenticate: Basic realm=\"wheee\"\r\n +@@ -46,7 +41,6 @@ + assert_eq!(req, vec![ + "GET /foo/bar/info/refs?service=git-upload-pack HTTP/1.1", + "Accept: */*", +- user_agent, + ].into_iter().map(|s| s.to_string()).collect()); + drop(conn); + +@@ -61,7 +55,6 @@ + "GET /foo/bar/info/refs?service=git-upload-pack HTTP/1.1", + "Authorization: Basic Zm9vOmJhcg==", + "Accept: */*", +- user_agent, + ].into_iter().map(|s| s.to_string()).collect()); + }); + |