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

ensure libressl compatibility #3644

Merged
merged 2 commits into from
Feb 6, 2017
Merged

ensure libressl compatibility #3644

merged 2 commits into from
Feb 6, 2017

Conversation

Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Feb 3, 2017

It looks like master still isn't compatible with libressl.

With this patch it builds and runs fine and all tests pass here.

Update libgit2-sys, openssl-sys and openssl
as the versions currently in Cargo.lock are
not compatible with libressl.
Also update tests accordingly

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (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.

@sfackler
Copy link
Member

sfackler commented Feb 5, 2017

@Keruspe
Copy link
Contributor Author

Keruspe commented Feb 6, 2017

The failing test is really awkward and looks like a problem on the appveyor side somehow.

This seems to be the only place where User-Agent is constructed in libgit2 and the commit that changes form Git/1.0 to Git/2.0 doesn't make it conditionally: libgit2/libgit2@fafafb1f37 (this commit is part of libgit2-sys 0.6.6).

It's rather suspicious that out of 4 tests on appveyor, 1 gets that weir error and the 3 others consider that nothing needs actual testing, isn't it?

@alexcrichton
Copy link
Member

The three other entries in the AppVeyor matrix are skipped for PRs, which is why they passed. We'll need to update this PR somehow to allow it to land by passing tests on AppVeyor

@Keruspe
Copy link
Contributor Author

Keruspe commented Feb 6, 2017

Ok, I actually found the problem, alongside "http.c" in libgit2 there is a "winhttp.c" which has the 1.0 in it.

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 6, 2017

📌 Commit 2096c95 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Feb 6, 2017

⌛ Testing commit 2096c95 with merge de2919f...

bors added a commit that referenced this pull request Feb 6, 2017
ensure libressl compatibility

It looks like master still isn't compatible with libressl.

With this patch it builds and runs fine and all tests pass here.
@Keruspe
Copy link
Contributor Author

Keruspe commented Feb 6, 2017

Is there a way to get this backported as well? Should I open other pull requests for the other branches?

@alexcrichton
Copy link
Member

Sure yeah, you can just send a PR to the rust-1.16.0 branch

@bors
Copy link
Contributor

bors commented Feb 6, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing de2919f to master...

@bors bors merged commit 2096c95 into rust-lang:master Feb 6, 2017
bors added a commit that referenced this pull request Feb 6, 2017
ensure libressl compatibility

like #3644 but for the rust-1.16.0 branch
@ehuss ehuss added this to the 1.17.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants