mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-05-13 00:04:14 +08:00
Squashed 'Sources/OpenVPNAdapter/Libraries/Vendors/openvpn/' changes from 6608878d5..934f4e741
934f4e741 Merge remote-tracking branch 'origin/qa' 8c87c7696 [UCONNECT-1027] use proper io_context when initializing AsyncResolve class c3026c65a Merge remote-tracking branch 'origin/qa' f33fe7665 [UCONNECT-1027] perform async DNS resolution in a detached thread 0c0af6781 [OVPN3-342] Generate ICMP "packet too big" reply c93af60a7 Move files from ovpn3-common to openvpn3 repo d5eeb78ed ClientAPI: print core version when starting 04de9c425 Merge branch 'qa' 2c0dbc6c3 buildep.py: add asio patching 600c68012 Allow updating auth-token during session 7391096b9 [OC-85] tunprop: exclude routes for additional remotes also on macOS 3587628d7 [OC-84] tunprop: exclude routes for additional remotes also on Windows 25471635d Revert "[UCONNECT-868] When no network is present pause instead of stopping" 5713ff34a Fixed some breakage caused by recent endian/ffs commits a9ce44a22 endian.hpp: break out endian compile-time tests to endian_platform.hpp 72181f9e7 [UCONNECT-868] When no network is present pause instead of stopping 10d636cfe version: switch to 3.2 git-subtree-dir: Sources/OpenVPNAdapter/Libraries/Vendors/openvpn git-subtree-split: 934f4e741f760160dc65a6f4b29af57bb5be8f93
This commit is contained in:
+6
-2
@@ -25,10 +25,14 @@ def build_asio(parms):
|
||||
sys.exit("Checksum mismatch, expected %s, actual %s" % (parms["ASIO_CSUM"], checksum))
|
||||
with ModEnv('PATH', "%s\\bin;%s" % (parms.get('GIT'), os.environ['PATH'])):
|
||||
extract(arch_path, "gz")
|
||||
rmtree("asio")
|
||||
os.rename("asio-%s" % asio_ver, "asio")
|
||||
dist = os.path.realpath('asio')
|
||||
rmtree(dist)
|
||||
os.rename("asio-%s" % asio_ver, dist)
|
||||
rm(arch_path)
|
||||
|
||||
for patch_file in glob.glob(os.path.join(parms.get('OVPN3'), "core", "deps", "asio", "patches", "*.patch")):
|
||||
call(["git", "apply", "--whitespace=nowarn", "--ignore-space-change", "--verbose", patch_file], cwd=dist)
|
||||
|
||||
def build_mbedtls(parms):
|
||||
print "**************** MBEDTLS"
|
||||
with Cd(build_dir(parms)):
|
||||
|
||||
@@ -233,6 +233,7 @@
|
||||
<ClInclude Include="..\openvpn\init\engineinit.hpp" />
|
||||
<ClInclude Include="..\openvpn\init\initprocess.hpp" />
|
||||
<ClInclude Include="..\openvpn\io\io.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\csum.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\dhcp.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\eth.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\icmp4.hpp" />
|
||||
@@ -240,6 +241,9 @@
|
||||
<ClInclude Include="..\openvpn\ip\ip4.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\ip6.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\ipcommon.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\ping4.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\ping6.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\ptb.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\tcp.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\udp.hpp" />
|
||||
<ClInclude Include="..\openvpn\kovpn\kocrypto.hpp" />
|
||||
|
||||
@@ -424,6 +424,10 @@
|
||||
<ClInclude Include="..\client\ovpncli.hpp" />
|
||||
<ClInclude Include="..\openvpn\transport\mssfix.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\tcp.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\ptb.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\ping4.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\ping6.hpp" />
|
||||
<ClInclude Include="..\openvpn\ip\csum.hpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\test\ovpncli\cli.cpp" />
|
||||
|
||||
Reference in New Issue
Block a user