microsoft · vicroms · Jan 13, 2020 · Sep 12, 2019 · Sep 12, 2019 · Sep 12, 2019
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
@@ -30,6 +30,7 @@ else()
 endif()
 if("ssl" IN_LIST FEATURES)
     list(APPEND ACE_FEATURE_LIST "ssl=1")
+    list(APPEND ACE_FEATURE_LIST "openssl11=1")
 else()
     list(APPEND ACE_FEATURE_LIST "ssl=0")
 endif()

diff --git a/ports/freetds/CONTROL b/ports/freetds/CONTROL
@@ -1,5 +1,5 @@
 Source: freetds
-Version: 1.1.6-1
+Version: 1.1.17
 Homepage: https://www.freetds.org
 Description: Implementation of the Tabular Data Stream protocol
 Default-Features: openssl

diff --git a/ports/freetds/crypt32.patch b/ports/freetds/crypt32.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 796625e17..fc9076f54 100644
+--- a/CMakeLists.txt	
++++ b/CMakeLists.txt
+@@ -149,6 +149,9 @@ if(OPENSSL_FOUND)
+ 	config_write("#define HAVE_OPENSSL 1\n\n")
+ 	include_directories(${OPENSSL_INCLUDE_DIR})
+ 	set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
++    if(WIN32)
++        list(APPEND CMAKE_REQUIRED_LIBRARIES crypt32 ws2_32)
++    endif()
+ 	check_function_exists_define(BIO_get_data)
+ 	check_function_exists_define(RSA_get0_key)
+ 	check_function_exists_define(ASN1_STRING_get0_data)
+@@ -441,7 +444,10 @@ else(WIN32)
+ endif(WIN32)
+
+ if(OPENSSL_FOUND)
+ 	set(lib_NETWORK ${lib_NETWORK} ${OPENSSL_LIBRARIES})
++   if(WIN32)
++       list(APPEND lib_NETWORK crypt32)
++   endif()
+ elseif(GNUTLS_FOUND)
+ 	set(lib_NETWORK ${lib_NETWORK} ${lib_GNUTLS})
+ endif(OPENSSL_FOUND)
diff --git a/ports/freetds/portfile.cmake b/ports/freetds/portfile.cmake
@@ -1,14 +1,16 @@
 include(vcpkg_common_functions)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.freetds.org/files/stable/freetds-1.1.6.tar.bz2"
-    FILENAME "freetds-1.1.6.tar.bz2"
-    SHA512 160c8638302fd36a3f42d031dbd58525cde899b64d320f6187ce5865ea2c049a1af63be419623e4cd18ccf229dd2ee7ec509bc5721c3371de0f31710dad7470d
+    URLS "https://www.freetds.org/files/stable/freetds-1.1.17.tar.bz2"
+    FILENAME "freetds-1.1.17.tar.bz2"
+    SHA512 3746ea009403960950fd619ffaf6433cfc92c34a8261b15e61009f01a1446e5a5a59413cd48e5511bbf3a0224f54b40daa713187bd20ca43105c5f8c68f4b88e
 )
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
+    PATCHES
+        crypt32.patch
 )
 
 set(BUILD_freetds_openssl OFF)

diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
@@ -113,7 +113,17 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
   # Setup PostgreSQL libraries + include path
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PGSQL_INCLUDE_DIR)
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpq.lib" PGSQL_LIBRARY_REL)
-  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.lib" PGSQL_LIBRARY_DBG)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpq.lib" PGSQL_LIBRARY_DBG)
+
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpgcommon.lib" TMP_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpgcommon.lib" TMP_DBG)
+  set(PGSQL_LIBRARY_REL "${PGSQL_LIBRARY_REL} ${TMP_REL}")
+  set(PGSQL_LIBRARY_DBG "${PGSQL_LIBRARY_DBG} ${TMP_DBG}")
+
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpgport.lib" TMP_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpgport.lib" TMP_DBG)
+  set(PGSQL_LIBRARY_REL "${PGSQL_LIBRARY_REL} ${TMP_REL}")
+  set(PGSQL_LIBRARY_DBG "${PGSQL_LIBRARY_DBG} ${TMP_DBG}")
 
   # Setup OpenJPEG libraries + include path
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" OPENJPEG_INCLUDE_DIR)
@@ -136,8 +146,8 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib" LZMA_LIBRARY_DBG)
 
   # Setup openssl libraries path
-  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libeay32.lib ${CURRENT_INSTALLED_DIR}/lib/ssleay32.lib" OPENSSL_LIBRARY_REL)
-  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libeay32.lib ${CURRENT_INSTALLED_DIR}/debug/lib/ssleay32.lib" OPENSSL_LIBRARY_DBG)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/lib/libssl.lib" OPENSSL_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.lib" OPENSSL_LIBRARY_DBG)
 
   # Setup libiconv libraries path
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libiconv.lib ${CURRENT_INSTALLED_DIR}/lib/libcharset.lib" ICONV_LIBRARY_REL)

diff --git a/ports/libevent/CONTROL b/ports/libevent/CONTROL
@@ -7,7 +7,7 @@ Default-Features: thread
 
 Feature: openssl
 Description: Support for openssl
-Build-Depends: openssl
+Build-Depends: openssl, libevent[thread]
 
 Feature: thread
-Description: Support for thread
+Description: Support for thread
diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL
@@ -1,5 +1,5 @@
 Source: libmysql
-Version: 8.0.4-4
+Version: 8.0.4-5
 Homepage: https://github.com/mysql/mysql-server
 Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib
 Description: A MySQL client library for C development.
diff --git a/ports/libmysql/system-libs.patch b/ports/libmysql/system-libs.patch
@@ -97,17 +97,18 @@ diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
 index 8af9699..2bdfe14 100644
 --- a/cmake/ssl.cmake
 +++ b/cmake/ssl.cmake
-@@ -104,6 +104,16 @@ ENDMACRO()
+@@ -104,6 +104,17 @@ ENDMACRO()
  # Provides the following configure options:
  # WITH_SSL=[yes|bundled|system|<path/to/custom/installation>]
  MACRO (MYSQL_CHECK_SSL)
 +  find_package(OpenSSL REQUIRED)
++  find_package(Threads REQUIRED)
 +  set(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY} CACHE STRING "")
 +  set(CRYPTO_LIBRARY ${OPENSSL_CRYPTO_LIBRARY} CACHE STRING "")
 +  FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
 +        DOC "path to the openssl executable")
 +  SET(SSL_DEFINES "-DHAVE_OPENSSL")
-+  set(SSL_LIBRARIES ${OPENSSL_LIBRARIES})
++  set(SSL_LIBRARIES ${OPENSSL_LIBRARIES} Threads::Threads)
 +ENDMACRO()
 +
 +MACRO (MYSQL_CHECK_SSL_OLD)

diff --git a/ports/libpq/CMakeLists.txt b/ports/libpq/CMakeLists.txt
diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL
@@ -1,5 +1,82 @@
 Source: libpq
-Version: 9.6.3
+Version: 12.0
+Build-Depends: libpq[bonjour] (osx)
 Homepage: https://www.postgresql.org/
 Description: The official database access API of postgresql
-Build-Depends: openssl, zlib (linux)
+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: perl
+Build-Depends: perl
+Description: build the server programming language PL/Perl (dynamic only?) (--with-perl)
+
+Feature: python
+Build-Depends: python
+Description: build the PL/Python server programming language (dynamic only?) (--with-python)
+
+Feature: tcl
+Build-Depends: tcl
+Description: build the PL/Tcl procedural language(dynamic only?) (--with-tcl)
+
+Feature: nls
+Build-Depends: gettext
+Description: Native Language Support (--enable-nls[=LANGUAGES])
+
+Feature: kerberos
+Build-Depends: kerberos
+Description: Kerberos Support (--with-gssapi)
+
+Feature: systemd
+Description: Build with support for systemd service notifications. (--with-systemd)
+
+Feature: ldap
+Build-Depends: openldap (linux)
+Description: LDAP Support (--with-ldap)
+
+Feature: bsd
+Build-Depends: openbsd
+Description: OpenBSD Support (--with-bsd-auth)
+
+Feature: pam
+Build-Depends: pam
+Description: Build with PAM (Pluggable Authentication Modules) support. (--with-pam)
+
+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.