diff options
| author | Phoebe <925731795@qq.com> | 2019-05-27 07:53:41 +0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-05-26 16:53:41 -0700 |
| commit | 9ffac4d56eed774419fbb628ea89417a6399db58 (patch) | |
| tree | 63817a836e32db3713fb968440881cddd5848b4d /ports/cpr | |
| parent | 0cbbeda9cd47dd3c5c9126d7e504bc3ca08d6ccc (diff) | |
| download | vcpkg-9ffac4d56eed774419fbb628ea89417a6399db58.tar.gz vcpkg-9ffac4d56eed774419fbb628ea89417a6399db58.zip | |
[Curl] Upgrades 2019.05.08 (#6429)
* [Curl] Upgrades 2019.05.08
* merge changes from master
* Fix cpr failure
* Fix the case issue in Linux
* Update patch and portfile
* Update the portfile that changed by my mistake
* [curl] Update to 7.65.0 to skip USE_DARWINSSL regression. Disable PERL since we don't build the manual anyway.
* Rename DARWINSSL to SECTRANSP
* Update the name and error detect
Diffstat (limited to 'ports/cpr')
| -rw-r--r-- | ports/cpr/002_cpr_fixcase.patch | 13 | ||||
| -rw-r--r-- | ports/cpr/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cpr/portfile.cmake | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/cpr/002_cpr_fixcase.patch b/ports/cpr/002_cpr_fixcase.patch new file mode 100644 index 000000000..4dbc97119 --- /dev/null +++ b/ports/cpr/002_cpr_fixcase.patch @@ -0,0 +1,13 @@ +diff --git a/cpr/error.cpp b/cpr/error.cpp
+index 713cb10..4143f93 100644
+--- a/cpr/error.cpp
++++ b/cpr/error.cpp
+@@ -38,8 +38,6 @@ ErrorCode Error::getErrorCodeForCurlError(std::int32_t curl_code) {
+ return ErrorCode::SSL_LOCAL_CERTIFICATE_ERROR;
+ case CURLE_SSL_CIPHER:
+ return ErrorCode::GENERIC_SSL_ERROR;
+- case CURLE_SSL_CACERT:
+- return ErrorCode::SSL_CACERT_ERROR;
+ case CURLE_USE_SSL_FAILED:
+ return ErrorCode::GENERIC_SSL_ERROR;
+ case CURLE_SSL_ENGINE_INITFAILED:
diff --git a/ports/cpr/CONTROL b/ports/cpr/CONTROL index 2bf591cc2..89cc6b847 100644 --- a/ports/cpr/CONTROL +++ b/ports/cpr/CONTROL @@ -1,4 +1,4 @@ Source: cpr -Version: 1.3.0-6 +Version: 1.3.0-7 Description: C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project. Build-Depends: curl[core] diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index f6ea8e9af..9e2c40a0d 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 001-cpr-config.patch + 002_cpr_fixcase.patch ) vcpkg_configure_cmake( |