Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 120 commits into from Jan 13, 2020

Conversation

@Neumann-A
Copy link
Contributor

Neumann-A commented Oct 11, 2019

Lets see how far CI gets with this PR and push the openssl upgrade a bit

fcharlie and others added 30 commits Sep 12, 2019
With OpenSSL v1.1 we need an additional flag for ACE
Updated support for OpenSSL v1.1
Fix version
@azure-pipelines

This comment has been minimized.

Copy link

azure-pipelines bot commented Jan 7, 2020

Pull request contains merge conflicts.
…q_with_openssl_111d
@JackBoosY JackBoosY self-assigned this Jan 7, 2020
@JackBoosY

This comment has been minimized.

Copy link
Contributor

JackBoosY commented Jan 9, 2020

/azp run

scripts/ci.baseline.txt Outdated Show resolved Hide resolved
scripts/ci.baseline.txt Outdated Show resolved Hide resolved
Neumann-A added 7 commits Jan 11, 2020
# Conflicts:
#	ports/libpq/portfile.cmake
@vicroms

This comment has been minimized.

Copy link
Member

vicroms commented Jan 13, 2020

/azp run

1 similar comment
@ras0219-msft

This comment has been minimized.

Copy link
Contributor

ras0219-msft commented Jan 13, 2020

/azp run

@ras0219-msft ras0219-msft removed their assignment Jan 13, 2020
@vicroms

This comment has been minimized.

Copy link
Member

vicroms commented Jan 13, 2020

/azp run

…q_with_openssl_111d
@Neumann-A Neumann-A marked this pull request as ready for review Jan 13, 2020
@vicroms vicroms added the reviewed label Jan 13, 2020
@vicroms

This comment has been minimized.

Copy link
Member

vicroms commented Jan 13, 2020

Passing all CI checks.
Thanks for your excellent work @Neumann-A!

@vicroms vicroms merged commit bdae090 into microsoft:master Jan 13, 2020
4 checks passed
4 checks passed
license/cla All CLA requirements met.
Details
vcpkg-Linux-PR-test #25241 succeeded
Details
vcpkg-osx-PR-test #25242 succeeded
Details
vcpkg-windows-PR-test #25240 succeeded
Details
@Neumann-A

This comment has been minimized.

Copy link
Contributor Author

Neumann-A commented Jan 13, 2020

@vicroms you should thank the others too.

sma-github added a commit to sma-github/vcpkg that referenced this pull request Jan 15, 2020
…crosoft#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:
openssl/openssl#8917
openssl/openssl#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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.