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

[Curl] Upgrades 2019.05.08 #6429

Merged
merged 9 commits into from
May 26, 2019
Merged

[Curl] Upgrades 2019.05.08 #6429

merged 9 commits into from
May 26, 2019

Conversation

PhoebeHui
Copy link
Contributor

@PhoebeHui PhoebeHui commented May 13, 2019

Related PR #6382

  1. Update the patch
  2. Update the name of share/curl/curl-target-release.cmake to share/curl/CURLTargets-release.cmake
  3. Case sensitive in Linux, the name(curl -> CURL) changed in curl by commit 6932849.
  4. Fix same case value issue in cpr.

The new upgrade in Curl, it moved deprecated #define CURLE_SSL_CACERT CURLE_PEER_FAILED_VERIFICATION to ifndef block in commit 0fd4427f, we didn’t define CURL_NO_OLDIES, so the following code enabled:
#define CURLE_SSL_CACERT CURLE_PEER_FAILED_VERIFICATION

In cpr\error.cpp reference 2 cases that both have same case value, so it failed with ‘error C2196: case value '60' already used’.

case CURLE_PEER_FAILED_VERIFICATION:
return ErrorCode::SSL_REMOTE_CERTIFICATE_ERROR;
case CURLE_SSL_CACERT:
return ErrorCode::SSL_CACERT_ERROR;

So I removed one of them to fix it.

@ras0219-msft ras0219-msft added the info:internal This PR or Issue was filed by the vcpkg team. label May 14, 2019
@LilyWangL
Copy link
Contributor

Related issue: #4691 and #5845.

ports/curl/0002_fix_uwp.patch Show resolved Hide resolved
ports/curl/portfile.cmake Show resolved Hide resolved
@past-due
Copy link
Contributor

@ras0219-msft: A heads-up: CURL 7.64.1 breaks the darwinssl feature - and, hence, will break curl[ssl] on macOS.

This is fixed in the next version of CURL, which is scheduled for release 22nd of May 2019. (Note: This will require renaming the USE_DARWINSSL option to USE_SECTRANSP in ports/curl/portfile.cmake, with that new version of CURL.)

@past-due
Copy link
Contributor

past-due commented May 22, 2019

CURL 7.65 is now available.

Per the above, the USE_DARWINSSL option should be renamed to USE_SECTRANSP in ports/curl/portfile.cmake, for 7.65+.

@ras0219-msft
Copy link
Contributor

Thanks a bunch for the heads-up, @past-due!

ports/curl/portfile.cmake Outdated Show resolved Hide resolved
@vicroms
Copy link
Member

vicroms commented May 25, 2019

ping @ras0219-msft

Something holding this PR from merging?

@ras0219-msft ras0219-msft merged commit 9ffac4d into microsoft:master May 26, 2019
@ras0219-msft
Copy link
Contributor

No, LGTM. Thanks for the great work @PhoebeHui and the review @past-due!

@ray42 ray42 mentioned this pull request May 27, 2019
@PhoebeHui PhoebeHui deleted the dev/Phoebe/UpgradeCurl_2019.05.08 branch May 29, 2019 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants