From 73fccf93485efc5f044cdec07df073107fe1d74f Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Sat, 26 Jan 2019 14:05:15 -0700 Subject: [PATCH] Revert #1501 in a really roundabout way The author of ring has chosen to yank all versions of that crate other than the most recent. This has had the effect of making it so that we cannot modify our `Cargo.toml` without breaking the build. The long term fix will be to get us on the latest version of cookie (which requires updating some unmaintained dependencies). I haven't looked into how much work that will be beyond confirming that it is not as simple as just changing the version number. Right now, this is blocking anything that requires updating an existing dependency, or adding a new dependency. So this is a quick fix to get our builds working again until we have the time to sort out updating everything between us and ring. Unfortunately, this isn't just as simple as reverting #1501, since `[patch]` doesn't force cargo to resolve to yanked versions. It'll instead resolve to really old versions of `cookie` in an attempt to remove `ring` from our dependency tree. So I've instead had to fork cookie, and change its dependency on Ring to use what we had prior to #1501. --- Cargo.lock | 24 +++++++++--------------- Cargo.toml | 3 +++ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 928932f9f6c..1e45bca4bda 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -158,7 +158,7 @@ dependencies = [ "conduit-router 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "conduit-static 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "conduit-test 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cookie 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cookie 0.9.2 (git+https://github.com/sgrif/cookie-rs.git?branch=v0.9)", "derive_deref 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "diesel 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "diesel_full_text_search 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -310,7 +310,7 @@ dependencies = [ "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "conduit 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "conduit-middleware 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cookie 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cookie 0.9.2 (git+https://github.com/sgrif/cookie-rs.git?branch=v0.9)", ] [[package]] @@ -372,10 +372,10 @@ dependencies = [ [[package]] name = "cookie" version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/sgrif/cookie-rs.git?branch=v0.9#bb9ebe4ef1abcd80c05ce6b3fcf79aae2994d01c" dependencies = [ "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ring 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ring 0.11.1 (git+https://github.com/SergioBenitez/ring?branch=v0.11)", "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -854,11 +854,6 @@ dependencies = [ "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "git2" version = "0.6.8" @@ -1704,10 +1699,10 @@ dependencies = [ [[package]] name = "ring" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.11.1" +source = "git+https://github.com/SergioBenitez/ring?branch=v0.11#267d0500e71a22261073a806398f80cffd673426" dependencies = [ - "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2526,7 +2521,7 @@ dependencies = [ "checksum conduit-router 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a70ad2d0c8c41ada8ad4ff35070652972d75da7e7bccfb6d1d23463b1714c3ec" "checksum conduit-static 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c5dadad9ced84acc9f67c778c25cec1c1065d6503d283cc6a1b2a4e545752d51" "checksum conduit-test 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "75684ce3713e1507fbf85796c9e74e7c4c8148bc82bcf823fec83b551189d429" -"checksum cookie 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "477eb650753e319be2ae77ec368a58c638f9f0c4d941c39bad95e950fb1d1d0d" +"checksum cookie 0.9.2 (git+https://github.com/sgrif/cookie-rs.git?branch=v0.9)" = "" "checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980" "checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" @@ -2581,7 +2576,6 @@ dependencies = [ "checksum futf 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "51f93f3de6ba1794dcd5810b3546d004600a59a98266487c8407bc4b24e398f3" "checksum futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "0c84b40c7e2de99ffd70602db314a7a8c26b2b3d830e6f7f7a142a8860ab3ca4" "checksum futures-cpupool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "e86f49cc0d92fe1b97a5980ec32d56208272cbb00f15044ea9e2799dde766fdf" -"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" "checksum git2 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0c1c0203d653f4140241da0c1375a404f0a397249ec818cd2076c6280c50f6fa" "checksum h2 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "a27e7ed946e8335bdf9a191bc1b9b14a03ba822d013d2f58437f4fabcbd7fc2c" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" @@ -2675,7 +2669,7 @@ dependencies = [ "checksum regex-syntax 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05b06a75f5217880fc5e905952a42750bf44787e56a6c6d6852ed0992f5e1d54" "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" "checksum reqwest 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c4265be4dad32ffa4be2cea9c8ecb5e096feca6b4ff024482bfc0f64b6019b2f" -"checksum ring 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2a6dc7fc06a05e6de183c5b97058582e9da2de0c136eafe49609769c507724" +"checksum ring 0.11.1 (git+https://github.com/SergioBenitez/ring?branch=v0.11)" = "" "checksum route-recognizer 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3255338088df8146ba63d60a9b8e3556f1146ce2973bc05a75181a42ce2256" "checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" diff --git a/Cargo.toml b/Cargo.toml index c6326e3e40e..d5e9c7bfdac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,3 +89,6 @@ tokio-service = "0.1" dotenv = "0.11" diesel = { version = "1.3.0", features = ["postgres"] } diesel_migrations = { version = "1.3.0", features = ["postgres"] } + +[patch.crates-io] +cookie = { git = "https://github.com/sgrif/cookie-rs.git", branch = "v0.9" }