[drogon] Update to 1.4.1 (#16651)

* [drogon] Update to 1.4.1

* Update patch

* Format

* update version

* Revert the ctl feature

* update version

* [libpq] Fix static linkage

* [drogon] Revert direct postgresql library linkage

Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

3 files changed, 140 insertions, 64 deletions

diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL
deleted file mode 100644
index d684fa239..000000000
--- a/ports/libpq/CONTROL
+++ /dev/null
@@ -1,64 +0,0 @@
-Source: libpq
-Version: 12.2
-Port-Version: 12
-Build-Depends: libpq[core,bonjour] (osx)
-Supports: !uwp
-Homepage: https://www.postgresql.org/
-Description: The official database access API of postgresql
-Default-Features: zlib, openssl
-
-Feature: openssl
-Build-Depends: openssl
-Description: support for encrypted client connections and random number generation on platforms that do not have "/dev/urandom" (except windows) (--with-openssl)
-
-Feature: zlib
-Build-Depends: zlib
-Description: Use zlib (else --without-zlib)
-
-Feature: readline
-Build-Depends: readline
-Description: Use readline (else --without-readline)
-
-Feature: libedit
-Build-Depends: libedit
-Description: prefer libedit (--with-libedit-preferred)
-
-Feature: python
-Build-Depends: python3, libpq[core,client]
-Description: build the PL/Python server programming language (dynamic only?) (--with-python)
-
-Feature: tcl
-Build-Depends: tcl, libpq[core,client]
-Description: build the PL/Tcl procedural language(dynamic only?) (--with-tcl)
-
-Feature: nls
-Build-Depends: gettext
-Description: Native Language Support (--enable-nls[=LANGUAGES])
-
-Feature: systemd
-Description: Build with support for systemd service notifications. (--with-systemd)
-
-Feature: llvm
-Build-Depends: llvm
-Description: Build with support for LLVM based JIT compilation (--with-llvm)
-
-Feature: icu
-Build-Depends: icu
-Description: Build with support for the ICU library (--with-icu)
-
-Feature: bonjour
-Description: Build with Bonjour support (--with-bonjour)
-
-Feature: uuid
-Description: Build the uuid-ossp module (which provides functions to generate UUIDs) (--with-uuid=LIBRARY LIBRARY=(bsd|e2fs|ossp))
-
-Feature: xml
-Build-Depends: libxml2
-Description: Build with libxml (--with-libxml)
-
-Feature: xslt
-Build-Depends: libxslt
-Description: Build with libxslt (--with-libxslt)
-
-Feature: client
-Description: Build all client tools and libraries.
diff --git a/ports/libpq/vcpkg-cmake-wrapper.cmake b/ports/libpq/vcpkg-cmake-wrapper.cmake
index 352954ef5..9d97859ec 100644
--- a/ports/libpq/vcpkg-cmake-wrapper.cmake
+++ b/ports/libpq/vcpkg-cmake-wrapper.cmake
@@ -15,3 +15,27 @@ if(PostgreSQL_FOUND AND @USE_DL@)
         endif()

     endif()

 endif()

+if(PostgreSQL_FOUND AND TARGET PostgreSQL::PostgreSQL AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")

+    foreach(LIB_ITEM pgport pgcommon)

+        find_library(PostgreSQL_${LIB_ITEM}_LIBRARY_RELEASE

+            NAMES ${LIB_ITEM}

+            PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH

+        )

+        if(PostgreSQL_${LIB_ITEM}_LIBRARY_RELEASE)

+            set_property(

+                TARGET PostgreSQL::PostgreSQL

+                APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$<NOT:\$<CONFIG:DEBUG>>:${PostgreSQL_${LIB_ITEM}_LIBRARY_RELEASE}>"

+            )

+        endif()

+        find_library(PostgreSQL_${LIB_ITEM}_LIBRARY_DEBUG

+            NAMES ${LIB_ITEM}

+            PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH

+        )

+        if(PostgreSQL_${LIB_ITEM}_LIBRARY_DEBUG)

+            set_property(

+                TARGET PostgreSQL::PostgreSQL

+                APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$<CONFIG:DEBUG>:${PostgreSQL_${LIB_ITEM}_LIBRARY_DEBUG}>"

+            )

+        endif()

+    endforeach()

+endif()

diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json
new file mode 100644
index 000000000..d4029e44c
--- /dev/null
+++ b/ports/libpq/vcpkg.json
@@ -0,0 +1,116 @@
+{
+  "name": "libpq",
+  "version": "12.2",
+  "port-version": 13,
+  "description": "The official database access API of postgresql",
+  "homepage": "https://www.postgresql.org/",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "libpq",
+      "default-features": false,
+      "features": [
+        "bonjour"
+      ],
+      "platform": "osx"
+    }
+  ],
+  "default-features": [
+    "openssl",
+    "zlib"
+  ],
+  "features": {
+    "bonjour": {
+      "description": "Build with Bonjour support (--with-bonjour)"
+    },
+    "client": {
+      "description": "Build all client tools and libraries."
+    },
+    "icu": {
+      "description": "Build with support for the ICU library (--with-icu)",
+      "dependencies": [
+        "icu"
+      ]
+    },
+    "libedit": {
+      "description": "prefer libedit (--with-libedit-preferred)",
+      "dependencies": [
+        "libedit"
+      ]
+    },
+    "llvm": {
+      "description": "Build with support for LLVM based JIT compilation (--with-llvm)",
+      "dependencies": [
+        "llvm"
+      ]
+    },
+    "nls": {
+      "description": "Native Language Support (--enable-nls[=LANGUAGES])",
+      "dependencies": [
+        "gettext"
+      ]
+    },
+    "openssl": {
+      "description": "support for encrypted client connections and random number generation on platforms that do not have \"/dev/urandom\" (except windows) (--with-openssl)",
+      "dependencies": [
+        "openssl"
+      ]
+    },
+    "python": {
+      "description": "build the PL/Python server programming language (dynamic only?) (--with-python)",
+      "dependencies": [
+        {
+          "name": "libpq",
+          "default-features": false,
+          "features": [
+            "client"
+          ]
+        },
+        "python3"
+      ]
+    },
+    "readline": {
+      "description": "Use readline (else --without-readline)",
+      "dependencies": [
+        "readline"
+      ]
+    },
+    "systemd": {
+      "description": "Build with support for systemd service notifications. (--with-systemd)"
+    },
+    "tcl": {
+      "description": "build the PL/Tcl procedural language(dynamic only?) (--with-tcl)",
+      "dependencies": [
+        {
+          "name": "libpq",
+          "default-features": false,
+          "features": [
+            "client"
+          ]
+        },
+        "tcl"
+      ]
+    },
+    "uuid": {
+      "description": "Build the uuid-ossp module (which provides functions to generate UUIDs) (--with-uuid=LIBRARY LIBRARY=(bsd|e2fs|ossp))"
+    },
+    "xml": {
+      "description": "Build with libxml (--with-libxml)",
+      "dependencies": [
+        "libxml2"
+      ]
+    },
+    "xslt": {
+      "description": "Build with libxslt (--with-libxslt)",
+      "dependencies": [
+        "libxslt"
+      ]
+    },
+    "zlib": {
+      "description": "Use zlib (else --without-zlib)",
+      "dependencies": [
+        "zlib"
+      ]
+    }
+  }
+}