Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade openssl and openssl-sys #66008

Closed
wants to merge 1 commit into from
Closed

Upgrade openssl and openssl-sys #66008

wants to merge 1 commit into from

Conversation

dylanaraps
Copy link
Contributor

@dylanaraps dylanaraps commented Oct 31, 2019

Fixes #65808

This PR updates openssl and openssl-sys to support newer versions of libressl in rust builds. I can confirm (at least on my machine) that rust builds and works successfully with the newer versions of libressl.

This is my first contribution to rust, apologies if I have done this incorrectly. For reference, I have based this PR on a previous PR which updates these two dependencies to fix a similar issue. #57263

Thanks / Ευχαριστώ 👍

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 31, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-10-31T20:27:05.7455743Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-31T20:27:06.4592301Z ##[command]git config gc.auto 0
2019-10-31T20:27:06.4594583Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-31T20:27:06.4597893Z ##[command]git config --get-all http.proxy
2019-10-31T20:27:06.4601494Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66008/merge:refs/remotes/pull/66008/merge
---
2019-10-31T20:30:38.9177689Z #####################################                                     52.0%
2019-10-31T20:30:38.9177762Z ######################################################################## 100.0%
2019-10-31T20:30:41.9535877Z extracting /checkout/obj/build/cache/2019-09-25/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
2019-10-31T20:30:42.0133944Z     Updating crates.io index
2019-10-31T20:30:46.1710603Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-10-31T20:30:46.1737887Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-10-31T20:30:46.1776608Z Makefile:67: recipe for target 'prepare' failed
2019-10-31T20:30:46.1777860Z make: *** [prepare] Error 1
2019-10-31T20:30:47.1803935Z Command failed. Attempt 2/5:
2019-10-31T20:30:47.1803935Z Command failed. Attempt 2/5:
2019-10-31T20:30:47.3371209Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-10-31T20:30:47.3383254Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-10-31T20:30:47.3428655Z Makefile:67: recipe for target 'prepare' failed
2019-10-31T20:30:47.3428756Z make: *** [prepare] Error 1
2019-10-31T20:30:49.3443583Z Command failed. Attempt 3/5:
2019-10-31T20:30:49.3443583Z Command failed. Attempt 3/5:
2019-10-31T20:30:49.5064897Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-10-31T20:30:49.5076237Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-10-31T20:30:49.5113750Z Makefile:67: recipe for target 'prepare' failed
2019-10-31T20:30:49.5113863Z make: *** [prepare] Error 1
2019-10-31T20:30:52.5135134Z Command failed. Attempt 4/5:
2019-10-31T20:30:52.5135134Z Command failed. Attempt 4/5:
2019-10-31T20:30:53.5282350Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-10-31T20:30:53.5283468Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-10-31T20:30:53.5283868Z Makefile:67: recipe for target 'prepare' failed
2019-10-31T20:30:53.5283941Z make: *** [prepare] Error 1
2019-10-31T20:30:56.6833749Z Command failed. Attempt 5/5:
2019-10-31T20:30:56.6833749Z Command failed. Attempt 5/5:
2019-10-31T20:30:56.8429806Z error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
2019-10-31T20:30:56.8447077Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
2019-10-31T20:30:56.8486795Z Makefile:67: recipe for target 'prepare' failed
2019-10-31T20:30:56.8487218Z make: *** [prepare] Error 1
2019-10-31T20:30:56.8490399Z The command has failed after 5 attempts.
2019-10-31T20:30:56.8532968Z == clock drift check ==
2019-10-31T20:30:56.8532968Z == clock drift check ==
2019-10-31T20:30:56.8533554Z   local time: Thu Oct 31 20:30:56 UTC 2019
2019-10-31T20:30:56.8646525Z   network time: Thu, 31 Oct 2019 20:30:56 GMT
2019-10-31T20:30:56.8649010Z == end clock drift check ==
2019-10-31T20:31:08.3099675Z 
2019-10-31T20:31:08.3183336Z ##[error]Bash exited with code '1'.
2019-10-31T20:31:08.3208468Z ##[section]Starting: Checkout
2019-10-31T20:31:08.3210438Z ==============================================================================
2019-10-31T20:31:08.3210505Z Task         : Get sources
2019-10-31T20:31:08.3210543Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@dylanaraps dylanaraps mentioned this pull request Oct 31, 2019
22 tasks
@nikomatsakis
Copy link
Contributor

r? @alexcrichton

or maybe @sfackler would be a better choice =)

@alexcrichton
Copy link
Member

Looks good to me, thanks!

I think though you'll need to run ./x.py build locally though since Cargo.lock seems to be changing on CI, so some extra changes may need to be committed here as well?

@dylanaraps
Copy link
Contributor Author

Will do. 👍

@dylanaraps
Copy link
Contributor Author

The bootstrap is still trying to update submodules and will most likely have to download the bootstrap itself afterwards (right?). I have a very bad internet connection and really don't have the time to see this through.

Is a maintainer here able to make the changes? I'll close this PR if so!

@tesuji tesuji mentioned this pull request Nov 9, 2019
@alexcrichton
Copy link
Member

Covered in #66241 now, so closing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update openssl-sys to v0.9.52 to add support for libressl 2.9.X and 3.0.X
4 participants