diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-07-01 11:33:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 11:33:54 -0700 |
| commit | 77cfd20b83e71a0c513658e7c4d049d4039905af (patch) | |
| tree | 09991c656e627e716c640663ce047ee071af4b5c | |
| parent | e2049cb9754006b6a2abed781d34030e16702fad (diff) | |
| parent | e27fe911982284788e63f4a92339386554706a4b (diff) | |
| download | vcpkg-77cfd20b83e71a0c513658e7c4d049d4039905af.tar.gz vcpkg-77cfd20b83e71a0c513658e7c4d049d4039905af.zip | |
Merge pull request #6854 from the-j0k3r/openssl-version-bump
Openssl version bump 1.0.2s
| -rw-r--r-- | ports/harfbuzz/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/openssl-unix/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl-unix/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/openssl-windows/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl-windows/portfile.cmake | 6 |
5 files changed, 9 insertions, 7 deletions
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 93c1da645..d7fbd9a0d 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -71,6 +71,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets() + vcpkg_copy_pdbs() if (HAVE_GLIB) diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index 59f686133..4b6ec7405 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,3 +1,3 @@ Source: openssl-unix -Version: 1.0.2q +Version: 1.0.2s Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. diff --git a/ports/openssl-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake index 03e358b4b..a5915f1b9 100644 --- a/ports/openssl-unix/portfile.cmake +++ b/ports/openssl-unix/portfile.cmake @@ -10,14 +10,15 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") return() endif() -set(OPENSSL_VERSION 1.0.2q) vcpkg_find_acquire_program(PERL) +set(OPENSSL_VERSION 1.0.2s) + vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0 + SHA512 9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a ) vcpkg_extract_source_archive_ex( diff --git a/ports/openssl-windows/CONTROL b/ports/openssl-windows/CONTROL index bdbf764ab..33c30e638 100644 --- a/ports/openssl-windows/CONTROL +++ b/ports/openssl-windows/CONTROL @@ -1,3 +1,3 @@ Source: openssl-windows -Version: 1.0.2q-2 +Version: 1.0.2s-1 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake index 856e0979e..3506be9ab 100644 --- a/ports/openssl-windows/portfile.cmake +++ b/ports/openssl-windows/portfile.cmake @@ -10,17 +10,17 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") return() endif() -set(OPENSSL_VERSION 1.0.2q) - vcpkg_find_acquire_program(PERL) +set(OPENSSL_VERSION 1.0.2s) + get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}") vcpkg_download_distfile(ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0 + SHA512 9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a ) vcpkg_extract_source_archive_ex( |