From 345ac44ab8d6a16239d3af55df9608bf725e7a48 Mon Sep 17 00:00:00 2001
From: An Tao <antao2002@gmail.com>
Date: Sat, 10 Feb 2024 12:40:41 +0800
Subject: [PATCH] [drogon, trantor] Bump drogon to 1.9.3 and trantor to 1.5.17
 (#36671)

---
 ports/drogon/portfile.cmake  |  2 +-
 ports/drogon/vcpkg.json      |  2 +-
 ports/trantor/001-uwp.patch  | 36 ------------------------------------
 ports/trantor/portfile.cmake |  3 +--
 ports/trantor/vcpkg.json     |  2 +-
 versions/baseline.json       |  4 ++--
 versions/d-/drogon.json      |  5 +++++
 versions/t-/trantor.json     |  5 +++++
 8 files changed, 16 insertions(+), 43 deletions(-)
 delete mode 100644 ports/trantor/001-uwp.patch

diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
index d00dacdb2b9454..d9d7386559a011 100644
--- a/ports/drogon/portfile.cmake
+++ b/ports/drogon/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/drogon
     REF "v${VERSION}"
-    SHA512 54565dac787795cd297206f6222e260abc012790c4b662834864ec31f5b00735b89b7134f317f2b01f0377abd4222ee445631ee1f3cd1f50c918e6d3645582df
+    SHA512 cb1ace1e6fcc9112c71c221d24b80dea62245b908037f5f1065b899c62142c568f0e3410a06210ddb599f7771b56ea8acd1c7b5070893f4effb07cfd4b61f8e4
     HEAD_REF master
     PATCHES
          0001-vcpkg.patch
diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json
index 612ce8a546915a..da7fed884c802f 100644
--- a/ports/drogon/vcpkg.json
+++ b/ports/drogon/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "drogon",
-  "version-semver": "1.9.2",
+  "version-semver": "1.9.3",
   "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
   "homepage": "https://github.com/an-tao/drogon",
   "documentation": "https://drogon.docsforge.com/master/overview/",
diff --git a/ports/trantor/001-uwp.patch b/ports/trantor/001-uwp.patch
deleted file mode 100644
index 55ff3651b8a9d0..00000000000000
--- a/ports/trantor/001-uwp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/trantor/net/inner/FileBufferNodeWin.cc b/trantor/net/inner/FileBufferNodeWin.cc
-index eb9fcbd..a0b9791 100644
---- a/trantor/net/inner/FileBufferNodeWin.cc
-+++ b/trantor/net/inner/FileBufferNodeWin.cc
-@@ -1,5 +1,11 @@
- #include <trantor/net/inner/BufferNode.h>
- #include <windows.h>
-+#include <fileapi.h>
-+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
-+#define UWP 1
-+#else
-+#define UWP 0
-+#endif
- 
- namespace trantor
- {
-@@ -9,6 +15,11 @@ class FileBufferNode : public BufferNode
-   public:
-     FileBufferNode(const wchar_t *fileName, long long offset, long long length)
-     {
-+#if UWP
-+        sendHandle_ = CreateFile2(
-+            fileName, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr);
-+
-+#else
-         sendHandle_ = CreateFileW(fileName,
-                                   GENERIC_READ,
-                                   FILE_SHARE_READ,
-@@ -16,6 +27,7 @@ class FileBufferNode : public BufferNode
-                                   OPEN_EXISTING,
-                                   FILE_ATTRIBUTE_NORMAL,
-                                   nullptr);
-+#endif
-         if (sendHandle_ == INVALID_HANDLE_VALUE)
-         {
-             LOG_SYSERR << fileName << " open error";
diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake
index 061540f21915ab..77e49016ba696c 100644
--- a/ports/trantor/portfile.cmake
+++ b/ports/trantor/portfile.cmake
@@ -2,11 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/trantor
     REF "v${VERSION}"
-    SHA512 14380d3781dabaff22041c4b9abcbfc591640bbb30a08badc9724ccc6ba817ab895774e37f24311f83b1bd139ad50d232d9eab510a4ede20bf2dff89cd308728
+    SHA512 43202240968b90d0e6d211d3b7a918567587e4ad26c360848efee2661cc1d49d35de408db5e2ff7314be879faac99ffa29ffa1f3735f9606d95874130db05250
     HEAD_REF master
     PATCHES
         000-fix-deps.patch
-        001-uwp.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/trantor/vcpkg.json b/ports/trantor/vcpkg.json
index 0be9572d0fb23c..fdfcc25f7f15ae 100644
--- a/ports/trantor/vcpkg.json
+++ b/ports/trantor/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version-semver": "1.5.16",
+  "version-semver": "1.5.17",
   "description": "A non-blocking I/O cross-platform TCP network library, using C++14",
   "homepage": "https://github.com/an-tao/trantor",
   "license": "BSD-2-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index c20dd7f2ce43b3..dcbce88aa78a0b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2305,7 +2305,7 @@
       "port-version": 0
     },
     "drogon": {
-      "baseline": "1.9.2",
+      "baseline": "1.9.3",
       "port-version": 0
     },
     "dstorage": {
@@ -8681,7 +8681,7 @@
       "port-version": 0
     },
     "trantor": {
-      "baseline": "1.5.16",
+      "baseline": "1.5.17",
       "port-version": 0
     },
     "tre": {
diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json
index c5380c9eee9d0a..7acdfc97243702 100644
--- a/versions/d-/drogon.json
+++ b/versions/d-/drogon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "963d27de10dfedc9f4980726aa5c8e4731c1bdb8",
+      "version-semver": "1.9.3",
+      "port-version": 0
+    },
     {
       "git-tree": "881a2d3fe8ed95836190c20c36471e47168954c5",
       "version-semver": "1.9.2",
diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json
index ef6d73141828b7..a02c532f20274d 100644
--- a/versions/t-/trantor.json
+++ b/versions/t-/trantor.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9df007af7927374a349d44eebc57fd98ebcaebfd",
+      "version-semver": "1.5.17",
+      "port-version": 0
+    },
     {
       "git-tree": "87607f8f4115c05d79fdcb63b060c0cf4cba7ece",
       "version-semver": "1.5.16",