[libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d (#8566)

* [ports] Update openssl-unix to 1.1.1c

* [ports] Update openssl-unix to 1.1.1d

* [ports] openssl-unix platform 'AMD64' is called 'x86_64' on Linux

* [ports] fix openssl platform

* [ports] openssl-windows update openssl to 1.1.1d

* [ports] Fix openssl post build

* [ports] openssl add EnableUWPSupport.patch

Reference:
https://github.com/openssl/openssl/pull/8917
https://github.com/openssl/openssl/pull/9440

* [ports] openssl-uwp update openssl to 1.1.1d

* Updated support for OpenSSL v1.1

With OpenSSL v1.1 we need an additional flag for ACE

* update to 12.0 and change to vcpkg_configure_make

* remove msys line

* remove custom cmakelists

* use --without-readline on linux

* Update CONTROL

Fix version

* fix portfile

* add all possible libpq features

* create vcpkg_get_build_depends

* create vcpkg_read_dependent_port_info

* add vcpkg_write_port_info

* fix a few bugs

* libpq first succesful x86 build with core features.
(files still must be moved)

* always write the variable

* Fix separate make and install execution error issue.

* trigger CI system.

* add openssl and win_bison win_flex patch

* add configuration dependent patches

* add bonjour as a dependency on macosx

* apply patches and configure features

* more patches to fix the windows build

* more install fixes

* remove unnecessary code

* bit of code cleanup

* remove unrelated files

* remove unrelated function call. function was removed with last commit

* removed hardcoded platform

* fix patch

* build only the interface libraries and nothing more

* forgot to remove tool ecpg from install

* seperate minimal install patch from normal install patch and introduce client feature

* fix x86 Platform variable being x86 and not Win32 as required by the generated project

* make linux build work

* make more linux work

* openssl return version number directly without calling openssl
(should probably be done differently)

* fix some more path and platform identification

* comments to reduce install. currently libpq installs static and shared libraries and some tools on linux

* patch arm

* fix platform detection logic

* make libpq osx buildable

* Rename debug import library after build.
(So that we don't affect external CMake users.)

* revert debug naming and install a wrapper instead.

* fix gdal regression due to name change

* fix cutelyst regression due to qt5-base wrapper
(why was it not using the target in the first place?)

* correct wrapper install path

* correct the arm patch.

* trying to fix static gdal build

* gdal still needs more work

* update version of openssl in libpq openssl patch

* nmap fix openssl

* qt5 fix openssl

* gdal fix openssl

* librtmp migrate to openssl 1.1.1

* fail in patch since what is intended is not going to work in openssl 1.1.1

* fix static yara build

* freedtds deactivate openssl feature until freetds decides to upgrade to 1.1

* fix libwebsockets cmakelists

* fix the patch so that the generated targets also include crypt32

* xmlsec add threads dependency

* bump control since I am unable to reproduce the regression

* add pthread to openssl detection logic

* fix freetds linkage missing crypt32 and fix the cmake checks.

* fix the openssl wrapper to add the threads library

* fix libmysql regression

* add threads to openssl libraries.

* upgrade libssh to 0.9

* fix nmap regression

* fix mosquitto regression

* fix openssl wrapper to make libarchive work

* fix quickfix

* changed patch a bit

* improve freetds patch

* fix case in librtmp

* update control

* bump control

* fix case

* make jasper a dependency of qt5-imageformats to fix flaky CI build.

* add jasper libraries explicitly

* jasper depends on freeglut so add it as a dependency. turbo_jpeg is also a dependency but that should already be handled in qt5-base

* more glut names

* bump control for macosx ci retry

* fix slikenet regression

* fix linebreak in qt5-base

* update baseline

* Update ci.baseline.txt

those ports are not supported on UWP

* [libevent] add dependency on libevent[threads] to openssl feature

* [pdal,freerdp] Update CI baseline to fail

* fix static pdal build

* fix freerdp on linux

* trying to revert some changes

* revert changes in build make

* revert x264 version bump

Co-authored-by: Force Charlie <6904176+fcharlie@users.noreply.github.com>
Co-authored-by: Johnny Willemsen <jwillemsen@remedy.nl>
Co-authored-by: Lennart Trunk <lennart.trunk@outlook.de>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>

3 files changed, 31 insertions, 4 deletions

diff --git a/ports/freetds/CONTROL b/ports/freetds/CONTROL
index 77be05f40..bfd1e44d4 100644
--- 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
new file mode 100644
index 000000000..a3af75693
--- /dev/null
+++ 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
index a03fd0c9c..eb833b30a 100644
--- 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)