From ccdb2089ce2a0dd763c3050571bd0044dcb82b41 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Tue, 11 Jan 2022 23:28:39 +0100
Subject: [PATCH] [luasocket] only work on windows (#22432)

---
 ports/luasocket/portfile.cmake | 31 +++++++++++++++----------------
 ports/luasocket/vcpkg.json     | 11 ++++++++---
 scripts/ci.baseline.txt        |  2 --
 versions/baseline.json         |  2 +-
 versions/l-/luasocket.json     |  5 +++++
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake
index 5b4bc34002b..b48185c8de6 100644
--- a/ports/luasocket/portfile.cmake
+++ b/ports/luasocket/portfile.cmake
@@ -5,34 +5,33 @@ vcpkg_from_github(
     SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
     HEAD_REF master)
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 # Remove debug share
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/luasocket)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE ${CURRENT_PACKAGES_DIR}/share/luasocket/copyright)
+file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/luasocket")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE" "${CURRENT_PACKAGES_DIR}/share/luasocket/copyright")
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
 # Handle socket dll name
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll ${CURRENT_PACKAGES_DIR}/bin/socket/core.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb ${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll ${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/bin/socket/core.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb")
 
 # Handle mime dll name
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll ${CURRENT_PACKAGES_DIR}/bin/mime/core.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb ${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll ${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb")
 endif()
 
 # Allow empty include directory
diff --git a/ports/luasocket/vcpkg.json b/ports/luasocket/vcpkg.json
index 06497269920..0fe9652f2ab 100644
--- a/ports/luasocket/vcpkg.json
+++ b/ports/luasocket/vcpkg.json
@@ -1,10 +1,15 @@
 {
   "name": "luasocket",
-  "version-string": "2020-09-14",
-  "port-version": 1,
+  "version-date": "2020-09-14",
+  "port-version": 2,
   "description": "LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.",
   "homepage": "https://github.com/diegonehab/luasocket",
+  "supports": "windows",
   "dependencies": [
-    "lua"
+    "lua",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 4b0de10b1bd..2ec4962d398 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -781,8 +781,6 @@ luafilesystem:arm-uwp=fail
 luafilesystem:x64-uwp=fail
 luasec:x64-windows-static=fail
 luasocket:arm-uwp=fail
-luasocket:x64-linux=fail
-luasocket:x64-osx=fail
 luasocket:x64-uwp=fail
 lzfse:arm-uwp=fail
 magnum:arm64-windows=skip
diff --git a/versions/baseline.json b/versions/baseline.json
index 2198b17f47d..0e1fbb38715 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4214,7 +4214,7 @@
     },
     "luasocket": {
       "baseline": "2020-09-14",
-      "port-version": 1
+      "port-version": 2
     },
     "lv2": {
       "baseline": "1.18.2",
diff --git a/versions/l-/luasocket.json b/versions/l-/luasocket.json
index 40d0976fbc7..568f5f18145 100644
--- a/versions/l-/luasocket.json
+++ b/versions/l-/luasocket.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "94ee0f78bf41cf8d10f7bc25b2305a9a0a33cb36",
+      "version-date": "2020-09-14",
+      "port-version": 2
+    },
     {
       "git-tree": "9eefd1250090f0a85e48d86a1d25f226e1a978d3",
       "version-string": "2020-09-14",