From 6d69bbacd2fbeae957f034dbbd2b454b5e3941fe Mon Sep 17 00:00:00 2001
From: "Stephen E. Baker" <baker.stephen.e@gmail.com>
Date: Tue, 2 May 2023 18:21:40 -0400
Subject: [PATCH] [luasocket] bump to 3.1.0 (#31078)

* [luasocket] Bump to 3.1.0

* vcpkg x-add-version luasocket
---
 ports/luasocket/portfile.cmake | 31 +++++++++++--------------------
 ports/luasocket/vcpkg.json     |  3 +--
 versions/baseline.json         |  4 ++--
 versions/l-/luasocket.json     |  5 +++++
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake
index 2b08c47690..a2a126e8ad 100644
--- a/ports/luasocket/portfile.cmake
+++ b/ports/luasocket/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lunarmodules/luasocket
-    REF v3.0.0
-    SHA512 4f93d6c0b602333df50ee4f939cd0419243f6de333472ffebf99334e301143e8cdee3bc1655c29f81608622d6e7850a9bcf6929a6d4748210a70cdb8218a1ec6
+    REF "v${VERSION}"
+    SHA512 1e9e98484740ec6538fe3d2b0dab74d31f052956ecf9ee3b60e229f2d0b13fcc6d4aaf74cd2a3e2ee330333dabb316fe6a43c60baaea26f0cc01069b6aa4519b
     HEAD_REF master)
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
@@ -18,28 +18,19 @@ vcpkg_copy_pdbs()
 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")
+vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/LICENSE)
 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")
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb")
-    endif()
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll")
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb")
-    endif()
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/bin/socket/core.dll" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb" RESULT temp)
 
 # Handle mime dll name
-    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll")
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb")
-    endif()
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll")
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb")
-    endif()
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb" RESULT temp)
 endif()
 
 # Allow empty include directory
diff --git a/ports/luasocket/vcpkg.json b/ports/luasocket/vcpkg.json
index c8a6525690..7190656960 100644
--- a/ports/luasocket/vcpkg.json
+++ b/ports/luasocket/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "luasocket",
-  "version": "3.0.0",
-  "port-version": 1,
+  "version": "3.1.0",
   "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://lunarmodules.github.io/luasocket/",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index 2d32a91128..55b45f27a6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4945,8 +4945,8 @@
       "port-version": 0
     },
     "luasocket": {
-      "baseline": "3.0.0",
-      "port-version": 1
+      "baseline": "3.1.0",
+      "port-version": 0
     },
     "luminoengine": {
       "baseline": "0.10.1",
diff --git a/versions/l-/luasocket.json b/versions/l-/luasocket.json
index fcddb746f7..93873451e9 100644
--- a/versions/l-/luasocket.json
+++ b/versions/l-/luasocket.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "faad47eddfeeb72b135a34c713c20f821ab0261b",
+      "version": "3.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b4e4099cfa80585c7df33b66e37580cea982e83d",
       "version": "3.0.0",