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.

Sign up for GitHub

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

Openssl version bump 1.0.2s #6854

Merged
merged 11 commits into from
Jul 1, 2019
+9 −7
Merged

Openssl version bump 1.0.2s #6854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bb111f2
Add libraqm
tobbi May 28, 2019
7c16642
Merge branch 'master' of https://github.com/Microsoft/vcpkg into add_…
vicroms May 30, 2019
45e57f3
[libraqm] Whitespace changes to force rebuild
vicroms May 30, 2019
cef7f8b
Merge branch 'master' of https://github.com/Microsoft/vcpkg into add_…
vicroms Jun 7, 2019
a7a5dcd
[openssl] unix/windows bump to 1.0.2s
the-j0k3r Jun 11, 2019
874eadc
[harfbuzz] Propagate dependency on glib downstream
vicroms Jun 11, 2019
9244439
Merge branch 'master' of https://github.com/Microsoft/vcpkg into add_…
vicroms Jun 12, 2019
35cb935
[fribidi] Force rebuild on CI
vicroms Jun 12, 2019
da4fd28
[libraqm] Force CI build
vicroms Jun 12, 2019
1586330
Merge branch 'add_libraqm' of https://github.com/tobbi/vcpkg into ope…
grdowns Jun 12, 2019
e27fe91
Merge branch 'master' of https://github.com/Microsoft/vcpkg into open…
grdowns Jun 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/harfbuzz/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()

vcpkg_copy_pdbs()

if (HAVE_GLIB)
Expand Down
2 changes: 1 addition & 1 deletion ports/openssl-unix/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 3 additions & 2 deletions ports/openssl-unix/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion ports/openssl-windows/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 3 additions & 3 deletions ports/openssl-windows/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down