From b7c6e2d5af4357bcf25f7a9bfc0a3ecc8cf66ebe Mon Sep 17 00:00:00 2001
From: Lev Stipakov <lev@openvpn.net>
Date: Thu, 28 Apr 2022 16:03:29 +0300
Subject: [PATCH] dco-win: remove ovpn-dco-win vcpkg dependency

uapi header has been added to the source code, so
we don't need that dependency anymore.

Fix MinGW script accordingly.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
---
 scripts/mingw/build         | 13 +------------
 test/ovpncli/CMakeLists.txt |  5 -----
 vcpkg.json                  |  3 +--
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/scripts/mingw/build b/scripts/mingw/build
index 8a410c52..11a11071 100755
--- a/scripts/mingw/build
+++ b/scripts/mingw/build
@@ -127,15 +127,6 @@ build_tap_windows6()
     cp $DL/tap-windows6/src/tap-windows.h $DEP_DIR_PREFIX-$ARCH/include
 }
 
-build_ovpn_dco_win()
-{
-    ARCH=$1
-    local DST_DIR="$DEP_DIR_PREFIX-$ARCH/include/ovpn-dco-win"
-
-    mkdir -p $DST_DIR
-    cp $DL/ovpn-dco-win/uapi.h $DST_DIR/
-}
-
 build_asio()
 {
     ARCH=$1
@@ -160,7 +151,6 @@ build_deps()
     build_lz4 $ARCH
     build_jsoncpp $ARCH
     build_tap_windows6 $ARCH
-    build_ovpn_dco_win $ARCH
     build_asio $ARCH
     build_openssl $ARCH
 }
@@ -175,8 +165,7 @@ build_core()
     mkdir build-$ARCH
 
     [ -z "$DCO" ] || {
-        WITH_OVPNDCOWIN="-D CLI_OVPNDCOWIN=ON \
-                         -D OVPN_DCO_WIN_INCLUDE_DIRS=$DEP_DIR_PREFIX-$ARCH"
+        WITH_OVPNDCOWIN="-D CLI_OVPNDCOWIN=ON"
     }
 
     pushd build-$ARCH
diff --git a/test/ovpncli/CMakeLists.txt b/test/ovpncli/CMakeLists.txt
index 3cf59c78..200fb30a 100644
--- a/test/ovpncli/CMakeLists.txt
+++ b/test/ovpncli/CMakeLists.txt
@@ -46,13 +46,8 @@ if (WIN32)
                                                     OVPNAGENT_DISABLE_PATH_CHECK)
 
     if (${CLI_OVPNDCOWIN})
-        find_path(OVPN_DCO_WIN_INCLUDE_DIRS "ovpn-dco-win/uapi.h")
-
         target_compile_definitions(ovpncliagent PRIVATE ENABLE_OVPNDCOWIN)
-        target_include_directories(ovpncliagent PRIVATE ${OVPN_DCO_WIN_INCLUDE_DIRS})
-
         target_compile_definitions(ovpncli PRIVATE ENABLE_OVPNDCOWIN)
-        target_include_directories(ovpncli PRIVATE ${OVPN_DCO_WIN_INCLUDE_DIRS})
     endif()
 endif ()
 
diff --git a/vcpkg.json b/vcpkg.json
index 6e69acdd..22a326eb 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -8,7 +8,6 @@
         "openssl",
         "jsoncpp",
         "asio",
-        "tap-windows6",
-        "ovpn-dco-win"
+        "tap-windows6"
     ]
   }