Merge commit '84ad2a289f33a43dd71276cc494f337d0fbb3ed6' into feature/update-dependencies

2026-04-24 00:00:05 +08:00 · 2018-04-04 12:34:20 +03:00
parent f3baaed4df 84ad2a289f
commit 3030551e3d
81 changed files with 5189 additions and 856 deletions
@@ -21,13 +21,28 @@ fi

 PACKAGE=${ASIO_VERSION}
 FNAME=${ASIO_VERSION}.tar.gz
-PV=${ASIO_VERSION#*-}
-URL=https://github.com/chriskohlhoff/asio/archive/${PV}.tar.gz
+URL=https://github.com/chriskohlhoff/asio/archive/${ASIO_VERSION}.tar.gz
 CSUM=${ASIO_CSUM}
+DIST=asio

 download

-cd $DEP_DIR
-rm -rf asio*
-tar xf $DL/$ASIO_VERSION.tar.gz
-cp -a $ASIO_VERSION asio
+if [ "$NO_WIPE" = "1" ]; then
+    echo RETAIN existing source
+else
+    echo WIPE and reunzip source
+    cd $DEP_DIR
+    rm -rf $DIST asio-$ASIO_VERSION
+    tar xfz $DL/$FNAME
+    cd asio-$ASIO_VERSION
+
+    # apply pre-generated patches
+    for file in $O3/core/deps/asio/patches/*.patch; do
+        echo Applying patch: $file
+        git apply $file
+    done
+
+    cd ..
+
+    cp -a asio-$ASIO_VERSION $DIST
+fi
@@ -1,25 +0,0 @@
-From 48f2e874280f0d93d1a3df2e48aacc9e13b8eef5 Mon Sep 17 00:00:00 2001
-From: James Yonan <james@openvpn.net>
-Date: Wed, 1 Mar 2017 13:45:38 -0700
-Subject: Android appears to not support pthread_condattr_setclock
-
---
- asio/include/asio/detail/impl/posix_event.ipp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/asio/include/asio/detail/impl/posix_event.ipp b/asio/include/asio/detail/impl/posix_event.ipp
-index a62c434..c4b7982 100644
--- a/asio/include/asio/detail/impl/posix_event.ipp
-+++ b/asio/include/asio/detail/impl/posix_event.ipp
-@@ -31,7 +31,7 @@ namespace detail {
- posix_event::posix_event()
-   : state_(0)
- {
-#if (defined(__MACH__) && defined(__APPLE__))
-+#if (defined(__MACH__) && defined(__APPLE__)) || defined(__ANDROID__)
-   int error = ::pthread_cond_init(&cond_, 0);
- #else // (defined(__MACH__) && defined(__APPLE__))
-   ::pthread_condattr_t attr;
-- 
-2.7.4
-
@@ -1,8 +1,8 @@
-From 430862dee0dd960be1f702cc5ae0e7c0525d48a4 Mon Sep 17 00:00:00 2001
+From 28cdfe3f923affa87420a47f8ac71e791c77bcde Mon Sep 17 00:00:00 2001
 From: James Yonan <james@openvpn.net>
-Date: Wed, 3 Aug 2016 11:42:38 -0600
-Subject: =?UTF-8?q?Added=20Apple=20NAT64=20support=20when=20both=20ASIO=5F?=
- =?UTF-8?q?HAS=5FGETADDRINFO=0Aand=20ASIO=5FAPPLE=5FNAT64=20are=20defined.?=
+Date: Mon, 19 Mar 2018 11:24:10 +0800
+Subject: [PATCH] Added Apple NAT64 support when both ASIO_HAS_GETADDRINFO and
+ ASIO_APPLE_NAT64 ar defined

 * When calling getaddrinfo(), Apple recommends to set
  AI_DEFAULT flags in hint.
@@ -16,13 +16,14 @@ Subject: =?UTF-8?q?Added=20Apple=20NAT64=20support=20when=20both=20ASIO=5F?=
 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 d72afec..4f66c77 100644
+index b3b1a0cf..e1a07e06 100644
 --- a/asio/include/asio/detail/impl/socket_ops.ipp
 +++ b/asio/include/asio/detail/impl/socket_ops.ipp
-@@ -3276,6 +3276,23 @@ asio::error_code getaddrinfo(const char* host,
+@@ -3338,6 +3338,23 @@ asio::error_code getaddrinfo(const char* host,
+ # endif
 #elif !defined(ASIO_HAS_GETADDRINFO)
   int error = getaddrinfo_emulation(host, service, &hints, result);
-   return ec = translate_addrinfo_error(error);
+  return ec = translate_addrinfo_error(error);
 +#elif defined(ASIO_HAS_GETADDRINFO) && defined(ASIO_APPLE_NAT64)
 +  // For NAT64 compatibility, Apple recommends to set AI_DEFAULT flags
 +  addrinfo_type new_hints = hints;
@@ -33,16 +34,15 @@ index d72afec..4f66c77 100644
 +  // for non-link-local addresses.  Workaround by forcing scope ID to 0 for
 +  // non-link-local addresses.
 +  if (!error && (*result)->ai_family == AF_INET6)
-+    {
-+      sockaddr_in6* a6 = (sockaddr_in6*)(*result)->ai_addr;
-+      if (a6->sin6_scope_id && !(IN6_IS_ADDR_LINKLOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_NODELOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_LINKLOCAL(&a6->sin6_addr)))
-+	a6->sin6_scope_id = 0;
-+    }
+  {
+    sockaddr_in6* a6 = (sockaddr_in6*)(*result)->ai_addr;
+    if (a6->sin6_scope_id && !(IN6_IS_ADDR_LINKLOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_NODELOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_LINKLOCAL(&a6->sin6_addr)))
+      a6->sin6_scope_id = 0;
+  }
 +
-+  return ec = translate_addrinfo_error(error);
+   return ec = translate_addrinfo_error(error);
 #else
   int error = ::getaddrinfo(host, service, &hints, result);
-   return ec = translate_addrinfo_error(error);
 -- 
-1.8.5.2 (Apple Git-48)
+2.16.2

@@ -1,14 +1,15 @@
-From d1758fee525c6adde63ff13df1ce00c63a9b7671 Mon Sep 17 00:00:00 2001
+From c6cb856ac923472e56d8dd631585b4ca58e71c31 Mon Sep 17 00:00:00 2001
 From: James Yonan <james@openvpn.net>
 Date: Wed, 2 Sep 2015 12:18:48 -0700
-Subject: Added randomize() method to asio::ip::tcp::resolver::results_type.
+Subject: [PATCH] Added randomize() method to
+ asio::ip::tcp::resolver::results_type.

 ---
 asio/include/asio/ip/basic_resolver_results.hpp | 7 +++++++
 1 file changed, 7 insertions(+)

 diff --git a/asio/include/asio/ip/basic_resolver_results.hpp b/asio/include/asio/ip/basic_resolver_results.hpp
-index dec2c7e..ae36906 100644
+index 4146a46b..f0ae258c 100644
 --- a/asio/include/asio/ip/basic_resolver_results.hpp
 +++ b/asio/include/asio/ip/basic_resolver_results.hpp
@@ -18,6 +18,7 @@
@@ -33,5 +34,5 @@ index dec2c7e..ae36906 100644
   typedef std::vector<basic_resolver_entry<InternetProtocol> > values_type;
 };
 -- 
-1.8.5.2 (Apple Git-48)
+2.16.2

@@ -1,19 +1,18 @@
-From 630edbebfc2f77ad29480d884e20d0b767883ac2 Mon Sep 17 00:00:00 2001
+From 69a6d6aec54b41f4ceac3ac2ba14465a36bf1984 Mon Sep 17 00:00:00 2001
 From: James Yonan <james@openvpn.net>
 Date: Mon, 27 Feb 2017 13:01:26 -0700
-Subject: =?UTF-8?q?Added=20user=20code=20hook=20async=5Fconnect=5Fpost=5Fo?=
- =?UTF-8?q?pen()=20to=20be=20called=0Aimmediately=20after=20socket=20open?=
- =?UTF-8?q?=20in=20async=5Fconnect.?=
+Subject: [PATCH] Added user code hook async_connect_post_open() to be called
+ immediately after socket open in async_connect.

 ---
 asio/include/asio/basic_socket.hpp | 7 +++++++
 1 file changed, 7 insertions(+)

 diff --git a/asio/include/asio/basic_socket.hpp b/asio/include/asio/basic_socket.hpp
-index cbd9b35..dbc9297 100644
+index 43430161..0d1b0d28 100644
 --- a/asio/include/asio/basic_socket.hpp
 +++ b/asio/include/asio/basic_socket.hpp
-@@ -866,6 +866,8 @@ public:
+@@ -865,6 +865,8 @@ public:
       asio::error_code ec;
       const protocol_type protocol = peer_endpoint.protocol();
       this->get_service().open(this->get_implementation(), protocol, ec);
@@ -22,7 +21,7 @@ index cbd9b35..dbc9297 100644
       if (ec)
       {
         async_completion<ConnectHandler,
-@@ -1742,6 +1744,11 @@ protected:
+@@ -1741,6 +1743,11 @@ protected:
   }
 
 private:
@@ -35,5 +34,5 @@ index cbd9b35..dbc9297 100644
   basic_socket(const basic_socket&) ASIO_DELETED;
   basic_socket& operator=(const basic_socket&) ASIO_DELETED;
 -- 
-1.8.5.2 (Apple Git-48)
+2.16.2