deps/asio: Rebase patch-set on top of asio 1.36.0

Signed-off-by: Frank Lichtenheld <[email protected]>

Author: flichtenheld

deps/asio/patches/0001-Added-Apple-NAT64-support-when-both-ASIO_HAS_GETADDR.patch

@@ -1,4 +1,4 @@
-From a010aecab8091de53193c456f9b5fde03a933f80 Mon Sep 17 00:00:00 2001
+From 3152d98dec56afe201a4055880632017e0d4d51e Mon Sep 17 00:00:00 2001
 From: James Yonan <[email protected]>
 Date: Mon, 19 Mar 2018 11:24:10 +0800
 Subject: [PATCH 1/6] Added Apple NAT64 support when both ASIO_HAS_GETADDRINFO
@@ -18,7 +18,7 @@ Signed-off-by: Frank Lichtenheld <[email protected]>
  1 file changed, 17 insertions(+)
 
 diff --git a/asio/include/asio/detail/impl/socket_ops.ipp b/asio/include/asio/detail/impl/socket_ops.ipp
-index af895bd8d..c207e25cf 100644
+index e4699a6b1..e69775c0a 100644
 --- a/asio/include/asio/detail/impl/socket_ops.ipp
 +++ b/asio/include/asio/detail/impl/socket_ops.ipp
 @@ -3811,6 +3811,23 @@ asio::error_code getaddrinfo(const char* host,

deps/asio/patches/0002-Added-user-code-hook-async_connect_post_open-to-be-c.patch

@@ -1,4 +1,4 @@
-From 7c39f42a92ecb2eb84f5fdc2585200ac71e78fed Mon Sep 17 00:00:00 2001
+From 642d7e371ef02cbb1f4f28c6ae7fa2b27a3f9c37 Mon Sep 17 00:00:00 2001
 From: James Yonan <[email protected]>
 Date: Mon, 27 Feb 2017 13:01:26 -0700
 Subject: [PATCH 2/6] Added user code hook async_connect_post_open() to be
@@ -10,7 +10,7 @@ Signed-off-by: Frank Lichtenheld <[email protected]>
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/asio/include/asio/basic_socket.hpp b/asio/include/asio/basic_socket.hpp
-index b999e87b7..5a064cc47 100644
+index 1ff7ecf25..55248c72d 100644
 --- a/asio/include/asio/basic_socket.hpp
 +++ b/asio/include/asio/basic_socket.hpp
 @@ -975,6 +975,8 @@ public:

deps/asio/patches/0003-error_code.ipp-Use-English-for-Windows-error-message.patch

@@ -1,4 +1,4 @@
-From fdbbdc4ff0dee43aa4a878d11daea2870499a1b5 Mon Sep 17 00:00:00 2001
+From b4a8d9dfc1ea8f2ba9d5545f3ebe9b5d4460876f Mon Sep 17 00:00:00 2001
 From: Lev Stipakov <[email protected]>
 Date: Mon, 29 Apr 2019 10:26:13 +0300
 Subject: [PATCH 3/6] error_code.ipp: Use English for Windows error messages
@@ -13,7 +13,7 @@ Signed-off-by: Frank Lichtenheld <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/asio/include/asio/impl/error_code.ipp b/asio/include/asio/impl/error_code.ipp
-index caeb1967c..4f5f6ed8e 100644
+index 4ab017051..0747c8e6d 100644
 --- a/asio/include/asio/impl/error_code.ipp
 +++ b/asio/include/asio/impl/error_code.ipp
 @@ -80,7 +80,7 @@ public:

deps/asio/patches/0004-Added-kovpn-route_id-support-to-endpoints-for-sendto.patch

@@ -1,4 +1,4 @@
-From 4c6d776f582375c73bf38af5f6093b3f24f47942 Mon Sep 17 00:00:00 2001
+From d9a37d216adc73cd8a7e94e2b9aceed12dd77985 Mon Sep 17 00:00:00 2001
 From: James Yonan <[email protected]>
 Date: Wed, 27 Jun 2018 23:12:31 -0600
 Subject: [PATCH 4/6] Added kovpn route_id support to endpoints for
@@ -13,7 +13,7 @@ Signed-off-by: Frank Lichtenheld <[email protected]>
  3 files changed, 79 insertions(+)
 
 diff --git a/asio/include/asio/ip/basic_endpoint.hpp b/asio/include/asio/ip/basic_endpoint.hpp
-index 3dfb1248d..883405035 100644
+index eff8e3572..e9b3401bc 100644
 --- a/asio/include/asio/ip/basic_endpoint.hpp
 +++ b/asio/include/asio/ip/basic_endpoint.hpp
 @@ -187,6 +187,18 @@ public:
@@ -36,7 +36,7 @@ index 3dfb1248d..883405035 100644
    friend bool operator==(const basic_endpoint<InternetProtocol>& e1,
        const basic_endpoint<InternetProtocol>& e2) noexcept
 diff --git a/asio/include/asio/ip/detail/endpoint.hpp b/asio/include/asio/ip/detail/endpoint.hpp
-index 2c4e3cd43..ee93ae2f3 100644
+index 82fbf7678..4816cb7c0 100644
 --- a/asio/include/asio/ip/detail/endpoint.hpp
 +++ b/asio/include/asio/ip/detail/endpoint.hpp
 @@ -24,6 +24,11 @@
@@ -99,8 +99,8 @@ index 2c4e3cd43..ee93ae2f3 100644
  private:
    // The underlying IP socket address.
    union data_union
-@@ -125,6 +171,15 @@ private:
-     asio::detail::socket_addr_type base;
+@@ -129,6 +175,15 @@ private:
+ #endif // defined(_FORTIFY_SOURCE)
      asio::detail::sockaddr_in4_type v4;
      asio::detail::sockaddr_in6_type v6;
 +#if defined(ASIO_USE_KOVPN_ROUTE_ID)
@@ -116,7 +116,7 @@ index 2c4e3cd43..ee93ae2f3 100644
  };
 
 diff --git a/asio/include/asio/ip/detail/impl/endpoint.ipp b/asio/include/asio/ip/detail/impl/endpoint.ipp
-index ef61208e2..5563bc243 100644
+index 55ad31fea..a4dc165b1 100644
 --- a/asio/include/asio/ip/detail/impl/endpoint.ipp
 +++ b/asio/include/asio/ip/detail/impl/endpoint.ipp
 @@ -37,6 +37,10 @@ endpoint::endpoint() noexcept

deps/asio/patches/0005-basic_resolver_results-added-data-and-cdata-members-.patch

@@ -1,4 +1,4 @@
-From b712a10f6a63526ac154c348c5d0fd472cd5a369 Mon Sep 17 00:00:00 2001
+From b6aa5d5e4c5722425e1cc38aba8ae516a908d9cf Mon Sep 17 00:00:00 2001
 From: James Yonan <[email protected]>
 Date: Wed, 2 Sep 2015 12:18:48 -0700
 Subject: [PATCH 5/6] basic_resolver_results: added data() and cdata() members
@@ -11,7 +11,7 @@ Signed-off-by: Frank Lichtenheld <[email protected]>
  1 file changed, 15 insertions(+)
 
 diff --git a/asio/include/asio/ip/basic_resolver_results.hpp b/asio/include/asio/ip/basic_resolver_results.hpp
-index 7a461f13b..aada6a586 100644
+index 3b68fd55a..ebedccfc6 100644
 --- a/asio/include/asio/ip/basic_resolver_results.hpp
 +++ b/asio/include/asio/ip/basic_resolver_results.hpp
 @@ -18,6 +18,7 @@
@@ -22,7 +22,7 @@ index 7a461f13b..aada6a586 100644
  #include "asio/detail/socket_ops.hpp"
  #include "asio/detail/socket_types.hpp"
  #include "asio/ip/basic_resolver_iterator.hpp"
-@@ -295,6 +296,20 @@ public:
+@@ -291,6 +292,20 @@ public:
      return !a.equal(b);
    }
 

deps/asio/patches/0006-reactive_socket_service_base-add-constructor-for-bas.patch

@@ -1,4 +1,4 @@
-From 499bded8d999e86262deb930724e9d46209c7d65 Mon Sep 17 00:00:00 2001
+From cbe3c93e979615f61e24415067781fa6f0764007 Mon Sep 17 00:00:00 2001
 From: Frank Lichtenheld <[email protected]>
 Date: Mon, 20 Dec 2021 13:36:01 +0100
 Subject: [PATCH 6/6] reactive_socket_service_base: add constructor for
@@ -25,7 +25,7 @@ Signed-off-by: Frank Lichtenheld <[email protected]>
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/asio/include/asio/detail/reactive_socket_service.hpp b/asio/include/asio/detail/reactive_socket_service.hpp
-index 6b7963eb7..d07ab3bc1 100644
+index 9466ca77d..da168e3e9 100644
 --- a/asio/include/asio/detail/reactive_socket_service.hpp
 +++ b/asio/include/asio/detail/reactive_socket_service.hpp
 @@ -65,7 +65,8 @@ public:
@@ -39,7 +39,7 @@ index 6b7963eb7..d07ab3bc1 100644
      }
 
 diff --git a/asio/include/asio/detail/reactive_socket_service_base.hpp b/asio/include/asio/detail/reactive_socket_service_base.hpp
-index ab1f5fcf0..c577c0e94 100644
+index 1e85374f2..aa5339572 100644
 --- a/asio/include/asio/detail/reactive_socket_service_base.hpp
 +++ b/asio/include/asio/detail/reactive_socket_service_base.hpp
 @@ -54,6 +54,14 @@ public: