mirror of
https://github.com/OpenVPN/openvpn3.git
synced 2024-09-19 19:52:15 +02:00
asio: bump version to 1.24.0
Rebase "async_connect_post_open" patch. Signed-off-by: Lev Stipakov <lev@openvpn.net>
This commit is contained in:
parent
19201beb9f
commit
544522d990
@ -9,19 +9,19 @@ Subject: [PATCH] Added user code hook async_connect_post_open() to be called
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/asio/include/asio/basic_socket.hpp b/asio/include/asio/basic_socket.hpp
|
||||
index e0269678..33df2f98 100644
|
||||
index 29986a02..000e5154 100644
|
||||
--- a/asio/include/asio/basic_socket.hpp
|
||||
+++ b/asio/include/asio/basic_socket.hpp
|
||||
@@ -953,6 +953,8 @@ public:
|
||||
@@ -983,6 +983,8 @@ public:
|
||||
{
|
||||
const protocol_type protocol = peer_endpoint.protocol();
|
||||
impl_.get_service().open(impl_.get_implementation(), protocol, open_ec);
|
||||
+ if (!open_ec)
|
||||
+ async_connect_post_open(protocol, open_ec);
|
||||
+ async_connect_post_open(protocol, open_ec);
|
||||
}
|
||||
|
||||
return async_initiate<ConnectHandler, void (asio::error_code)>(
|
||||
@@ -1791,7 +1793,7 @@ protected:
|
||||
return async_initiate<ConnectToken, void (asio::error_code)>(
|
||||
@@ -1841,7 +1843,7 @@ protected:
|
||||
* This function destroys the socket, cancelling any outstanding asynchronous
|
||||
* operations associated with the socket as if by calling @c cancel.
|
||||
*/
|
||||
@ -30,7 +30,7 @@ index e0269678..33df2f98 100644
|
||||
{
|
||||
}
|
||||
|
||||
@@ -1807,6 +1809,11 @@ protected:
|
||||
@@ -1860,6 +1862,11 @@ protected:
|
||||
#endif
|
||||
|
||||
private:
|
||||
@ -42,6 +42,3 @@ index e0269678..33df2f98 100644
|
||||
// Disallow copying and assignment.
|
||||
basic_socket(const basic_socket&) ASIO_DELETED;
|
||||
basic_socket& operator=(const basic_socket&) ASIO_DELETED;
|
||||
--
|
||||
2.26.0
|
||||
|
||||
|
4
deps/lib-versions
vendored
4
deps/lib-versions
vendored
@ -1,5 +1,5 @@
|
||||
export ASIO_VERSION=asio-1-19-2
|
||||
export ASIO_CSUM=5ee191aee825dfb1325cbacf643d599b186de057c88464ea98f1bae5ba4ff47a
|
||||
export ASIO_VERSION=asio-1-24-0
|
||||
export ASIO_CSUM=cbcaaba0f66722787b1a7c33afe1befb3a012b5af3ad7da7ff0f6b8c9b7a8a5b
|
||||
|
||||
export LZ4_VERSION=lz4-1.8.3
|
||||
export LZ4_CSUM=33af5936ac06536805f9745e0b6d61da606a1f8b4cc5c04dd3cbaca3b9b4fc43
|
||||
|
34
deps/vcpkg-ports/asio/portfile.cmake
vendored
34
deps/vcpkg-ports/asio/portfile.cmake
vendored
@ -1,11 +1,10 @@
|
||||
#header-only library
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO chriskohlhoff/asio
|
||||
REF asio-1-18-1
|
||||
SHA512 c84e6fca448ed419a976756840f3f4543291a5a7d4f62d4de7c06945b2cd9ececca6633049ad5e36367d60f67a4f2735be017445514ae9fa9497d4af2a4d48f8
|
||||
REF asio-1-24-0
|
||||
SHA512 a5d6e597e5611b7293375965f37c09cb73e27639ebdda6163557fab8bbff2ddbb301080ad86ff7f97e8ed8454da25176385cfc43103447a4a04e35a9c41aec3e
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
..\\..\\asio\\patches\\0001-Added-Apple-NAT64-support-when-both-ASIO_HAS_GETADDR.patch
|
||||
@ -15,25 +14,22 @@ vcpkg_from_github(
|
||||
)
|
||||
|
||||
# Always use "ASIO_STANDALONE" to avoid boost dependency
|
||||
file(READ "${SOURCE_PATH}/asio/include/asio/detail/config.hpp" _contents)
|
||||
string(REPLACE "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)" _contents "${_contents}")
|
||||
file(WRITE "${SOURCE_PATH}/asio/include/asio/detail/config.hpp" "${_contents}")
|
||||
vcpkg_replace_string("${SOURCE_PATH}/asio/include/asio/detail/config.hpp" "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)")
|
||||
|
||||
# CMake install
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
)
|
||||
vcpkg_install_cmake()
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH "share/asio")
|
||||
file(INSTALL
|
||||
${CMAKE_CURRENT_LIST_DIR}/asio-config.cmake
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/asio/
|
||||
)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_cmake_config_fixup()
|
||||
file(INSTALL
|
||||
"${CMAKE_CURRENT_LIST_DIR}/asio-config.cmake"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
|
||||
)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/asio/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/asio/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
38
deps/vcpkg-ports/asio/vcpkg.json
vendored
Normal file
38
deps/vcpkg-ports/asio/vcpkg.json
vendored
Normal file
@ -0,0 +1,38 @@
|
||||
{
|
||||
"name": "asio",
|
||||
"version": "1.24.0",
|
||||
"description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
|
||||
"homepage": "https://github.com/chriskohlhoff/asio",
|
||||
"documentation": "https://think-async.com/Asio/asio-1.24.0/doc/",
|
||||
"license": "BSL-1.0",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"coroutine": {
|
||||
"description": "Boost.Coroutine (optional) if you use spawn() to launch coroutines",
|
||||
"dependencies": [
|
||||
"boost-coroutine"
|
||||
]
|
||||
},
|
||||
"openssl": {
|
||||
"description": "OpenSSL (optional) if you use Asio's SSL support.",
|
||||
"dependencies": [
|
||||
"openssl"
|
||||
]
|
||||
},
|
||||
"regex": {
|
||||
"description": "Boost.Regex (optional) if you use any of the read_until() or async_read_until() overloads that take a boost::regex parameter.",
|
||||
"dependencies": [
|
||||
"boost-regex"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user