From 11aed43748d7dd194dc6c06a35a16104400d1090 Mon Sep 17 00:00:00 2001 From: Steven Walter Date: Sat, 31 Aug 2019 12:46:23 -0400 Subject: [PATCH] cargo-1.37.0: fix patch fuzz Regenerate context lines with devtool. This fixes a patch-fuzz warning --- .../cargo/cargo-1.37.0/0001-Disable-http2.patch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/recipes-devtools/cargo/cargo-1.37.0/0001-Disable-http2.patch b/recipes-devtools/cargo/cargo-1.37.0/0001-Disable-http2.patch index 9794ec0..c804297 100644 --- a/recipes-devtools/cargo/cargo-1.37.0/0001-Disable-http2.patch +++ b/recipes-devtools/cargo/cargo-1.37.0/0001-Disable-http2.patch @@ -1,4 +1,4 @@ -From 42e65192b6f7520b7a05924856e00600961f6758 Mon Sep 17 00:00:00 2001 +From 0e2384133664ebeb548b782ad763c3a627c1bc66 Mon Sep 17 00:00:00 2001 From: Johan Anderholm Date: Sun, 27 Jan 2019 10:19:00 +0100 Subject: [PATCH] Disable http2 @@ -9,16 +9,17 @@ curl-native. As long as multiplexing is disabled in cargo this should be fine. Upstream-Status: Inappropriate + --- - Cargo.toml | 2 +- + src/tools/cargo/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml -index c3fcacf5..bd6ec50b 100644 +index d15aa2513..ba9c77d25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ bytesize = "1.0" - crates-io = { path = "src/crates-io", version = "0.25" } + crates-io = { path = "crates/crates-io", version = "0.26" } crossbeam-utils = "0.6" crypto-hash = "0.3.1" -curl = { version = "0.4.21", features = ['http2'] } @@ -26,6 +27,3 @@ index c3fcacf5..bd6ec50b 100644 curl-sys = "0.4.18" env_logger = "0.6.0" pretty_env_logger = { version = "0.3", optional = true } --- -2.11.0 -