diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-10-16 17:17:28 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-10-16 17:17:28 -0700 |
| commit | ee2831c548b54cdccf064663b3fffda5d6a4c6b8 (patch) | |
| tree | 70390dc6e2e22877cb6ede677076c8005fab8a1c /ports/websocketpp | |
| parent | d88f53de9c284cfc67ba21707d60a44ba41ede8a (diff) | |
| parent | 374253cb1b12a60925693130132f1a6ab6c3a83a (diff) | |
| download | vcpkg-ee2831c548b54cdccf064663b3fffda5d6a4c6b8.tar.gz vcpkg-ee2831c548b54cdccf064663b3fffda5d6a4c6b8.zip | |
Merge from master
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, 26 insertions, 1 deletions
diff --git a/ports/websocketpp/CONTROL b/ports/websocketpp/CONTROL index f812dc565..f15164de2 100644 --- a/ports/websocketpp/CONTROL +++ b/ports/websocketpp/CONTROL @@ -1,4 +1,4 @@ Source: websocketpp -Version: 0.7.0 +Version: 0.7.0-1 Build-Depends: zlib, openssl, boost 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 new file mode 100644 index 000000000..93f4302e0 --- /dev/null +++ b/ports/websocketpp/openssl_110.patch @@ -0,0 +1,19 @@ +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 98a4d52e6..8531edd7d 100644 --- a/ports/websocketpp/portfile.cmake +++ b/ports/websocketpp/portfile.cmake @@ -9,6 +9,12 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/openssl_110.patch +) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) # Put the license file where vcpkg expects it |