diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-05-16 18:33:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 18:33:32 -0700 |
| commit | 9d473a69545ac648b9ea2067c007b57dfad7462b (patch) | |
| tree | b22899ab0422bed99fd9c39e9d119a65aafe7325 /ports/websocketpp | |
| parent | 208bb8eefcc13ab7aa6122b91f38ffec0b378e13 (diff) | |
| download | vcpkg-9d473a69545ac648b9ea2067c007b57dfad7462b.tar.gz vcpkg-9d473a69545ac648b9ea2067c007b57dfad7462b.zip | |
[boost] Update to 1.70.0 (#6141)
* [boost] Update to 1.70.0
* [boost-build] Update to 1.70.0
* [folly][freeopcua][libtorrent][websocketpp] Upgrades/patches to handle boost 1.70
* [boost-variant] Revert to 1.69 due to regression
[fizz][folly] Update and fix for boost 1.70
[libsodium] Use CMake buildsystem replacement to enable non-Windows
* [wangle] Update. [folly] Avoid linking debug libs in release.
* [pcl] Fix compatibility with boost 1.70
* [fizz] Handle merge regression
* [arrow] Modernize and fix cmake targets
* [boost-type-traits] Update patches for arm64-windows
* [boost-locale] Add boost-system and boost-thread as arm64 dependencies
* [ompl] Add missing boost-timer dependency
Diffstat (limited to 'ports/websocketpp')
| -rw-r--r-- | ports/websocketpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/websocketpp/openssl_110.patch | 19 | ||||
| -rw-r--r-- | ports/websocketpp/portfile.cmake | 6 |
3 files changed, 3 insertions, 24 deletions
diff --git a/ports/websocketpp/CONTROL b/ports/websocketpp/CONTROL index 5c7457a2a..206b0d4dd 100644 --- a/ports/websocketpp/CONTROL +++ b/ports/websocketpp/CONTROL @@ -1,4 +1,4 @@ Source: websocketpp -Version: 0.8.1 +Version: 0.8.1-1 Build-Depends: zlib, openssl, boost-asio Description: Library that implements RFC6455 The WebSocket Protocol
\ No newline at end of file diff --git a/ports/websocketpp/openssl_110.patch b/ports/websocketpp/openssl_110.patch deleted file mode 100644 index 93f4302e0..000000000 --- a/ports/websocketpp/openssl_110.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp -index 7b32db8..37173b7 100644 ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -355,7 +355,13 @@ protected: - template <typename ErrorCodeType> - lib::error_code translate_ec(ErrorCodeType ec) { - if (ec.category() == lib::asio::error::get_ssl_category()) { -- if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) { -+ if ( -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ -+#else -+ false -+#endif -+ ) { - return make_error_code(transport::error::tls_short_read); - } else { - // We know it is a TLS related error, but otherwise don't know diff --git a/ports/websocketpp/portfile.cmake b/ports/websocketpp/portfile.cmake index 35514259c..2da84ba26 100644 --- a/ports/websocketpp/portfile.cmake +++ b/ports/websocketpp/portfile.cmake @@ -4,11 +4,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zaphoyd/websocketpp - REF 0.8.1 - SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c + REF 1c699ce46843a787482a703fdeff9271fbb7bb5d + SHA512 9de30e02e09b066dca8d840963e78673ef118e5183f9638b8a5c941116422916fe9fe02bb5271843aeb292a460f159b5957887594c0824a88600e6c4a5620dbd HEAD_REF master - PATCHES - openssl_110.patch ) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/websocketpp) |