[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>

9 files changed, 167 insertions, 95 deletions

diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL
index 63c9527aa..3e59eddd2 100644
--- a/ports/drogon/CONTROL
+++ b/ports/drogon/CONTROL
@@ -1,8 +1,9 @@
 Source: drogon

-Version: 1.3.0

+Version: 1.4.1

 Homepage: https://github.com/an-tao/drogon

 Description:Drogon: A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows

 Build-Depends: trantor, zlib, jsoncpp, libmariadb (!osx), libmariadb[iconv] (osx), libpq, sqlite3, brotli, libuuid (!windows)

+Default-Features: ctl

 

 Feature: ctl

 Description: Build drogon_ctl tool. 
\ No newline at end of file
diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
index ae53109f9..e23ef9bcc 100644
--- a/ports/drogon/portfile.cmake
+++ b/ports/drogon/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/drogon
-    REF v1.3.0
-    SHA512 cddda4b90d28c15319b9cd1dea561c429b804508fc40678b9906fb70153cb36d7a4fc1c13fee01ec1f49d747a722856ceee364aba4118d922afabc3629ba2115
+    REF v1.4.1
+    SHA512 8611c18e65229095f5443f10c87e91593d619bc3a2d47da6d19d501a64be1aba12a813e44ccfc1c10179e5b0fa10121e8806955c0091258992501b88fa50d939
     HEAD_REF master
     PATCHES
         vcpkg.patch
@@ -11,6 +11,7 @@ vcpkg_from_github(
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
     ctl BUILD_CTL
 )
 
@@ -19,6 +20,7 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DBUILD_EXAMPLES=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
         ${FEATURE_OPTIONS}
 )
 
@@ -32,6 +34,7 @@ if("ctl" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES drogon_ctl
                      AUTO_CLEAN)
 endif()
+
 # # Remove includes in debug
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
@@ -43,4 +46,3 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${
 
 # Copy pdb files
 vcpkg_copy_pdbs()
-
diff --git a/ports/drogon/vcpkg.patch b/ports/drogon/vcpkg.patch
index a4128264f..4eaa56607 100644
--- a/ports/drogon/vcpkg.patch
+++ b/ports/drogon/vcpkg.patch
@@ -1,25 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6df5dac..b79036d 100755
+index 1efecf8..198f429 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -5,13 +5,11 @@ project(drogon)
- message(STATUS "compiler: " ${CMAKE_CXX_COMPILER_ID})
- include(CheckCXXSourceRuns)
- check_cxx_source_runs(
--        ${PROJECT_SOURCE_DIR}/cmake/tests/binary_compatibility_test.cc
--        cross_compiling)
-+        "int main(){return 0;}"
-+        not_cross_compiling)
- 
--if(cross_compiling)
-+if(!not_cross_compiling)
-   set(BUILD_PROGRAMS OFF)
--else(cross_compiling)
--  set(BUILD_PROGRAMS ON)
- endif()
- 
- option(BUILD_CTL "Build drogon_ctl" ${BUILD_PROGRAMS})
-@@ -84,9 +82,9 @@ if(WIN32)
+@@ -87,9 +85,9 @@ if(WIN32)
      PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>)
  endif(WIN32)
  
@@ -31,7 +14,7 @@ index 6df5dac..b79036d 100755
  
  if(NOT WIN32)
    if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-@@ -183,11 +181,11 @@ endif(NOT WIN32)
+@@ -188,11 +196,10 @@ endif(NOT WIN32)
  
  if(BUILD_ORM)
    # find postgres
@@ -42,18 +25,18 @@ index 6df5dac..b79036d 100755
 -    target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib)
 +  find_package(PostgreSQL REQUIRED)
 +  if(PostgreSQL_FOUND)
-+    message(STATUS "libpq inc path:" ${PostgreSQL_INCLUDE_DIRS})
-+    message(STATUS "libpq lib:" ${PostgreSQL_LIBRARIES})
-+    target_link_libraries(${PROJECT_NAME} PRIVATE ${PostgreSQL_LIBRARIES})
++    set(pg_FOUND true)
++    target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL)
      set(DROGON_SOURCES ${DROGON_SOURCES}
                         orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
      if(LIBPQ_BATCH_MODE)
-@@ -206,7 +204,7 @@ if(BUILD_ORM)
+@@ -211,8 +224,7 @@ if(BUILD_ORM)
        set(DROGON_SOURCES ${DROGON_SOURCES}
                           orm_lib/src/postgresql_impl/PgConnection.cc)
      endif(libpq_supports_batch)
 -  endif(pg_FOUND)
+-
 +  endif(PostgreSQL_FOUND)
- 
    # Find mysql, only mariadb client liberary is supported
    find_package(MySQL)
+   if(MySQL_FOUND)
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"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 906fe9231..63afc6218 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1701,7 +1701,7 @@
       "port-version": 0
     },
     "drogon": {
-      "baseline": "1.3.0",
+      "baseline": "1.4.1",
       "port-version": 0
     },
     "dtl": {
@@ -3318,7 +3318,7 @@
     },
     "libpq": {
       "baseline": "12.2",
-      "port-version": 12
+      "port-version": 13
     },
     "libpqxx": {
       "baseline": "7.3.1",
diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json
index 01d38fe06..19c03f30a 100644
--- a/versions/d-/drogon.json
+++ b/versions/d-/drogon.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "689f5dd439df7059e4bec7a5f7e7824070b0a9b8",
+      "version-string": "1.4.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "bbe57dbdbffedb8cd5218f8dc76c1bbe35b59b5d",
       "version-string": "1.3.0",
       "port-version": 0
diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json
index 79bd9d64c..3cd73d421 100644
--- a/versions/l-/libpq.json
+++ b/versions/l-/libpq.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "740637e4b7da153db5afc1a568f6411ff88167c9",
+      "version": "12.2",
+      "port-version": 13
+    },
+    {
       "git-tree": "04f39fd5eb9744d0d5a649098fe92281028d30f1",
       "version-string": "12.2",
       "port-version": 12