diff options
| author | Raul Metsma <raul@metsma.ee> | 2021-03-10 21:32:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-10 13:32:41 -0600 |
| commit | 18376a2f2ce989e022db5c1199b468e43f7c1a79 (patch) | |
| tree | 65a6e315828a804cc177569fa8af13a35b67cd48 | |
| parent | f5bfe6dc188f26d541f57333dc74922f9801a70a (diff) | |
| download | vcpkg-18376a2f2ce989e022db5c1199b468e43f7c1a79.tar.gz vcpkg-18376a2f2ce989e022db5c1199b468e43f7c1a79.zip | |
[openssl] update to 1.1.1j (#16525)
* [openssl] update to 1.1.1j
Fix #16407
Signed-off-by: Raul Metsma <raul@metsma.ee>
* Update JSON file
Signed-off-by: Raul Metsma <raul@metsma.ee>
| -rw-r--r-- | ports/openssl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/openssl/uwp/EnableUWPSupport.patch | 6 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/o-/openssl.json | 5 |
5 files changed, 9 insertions, 10 deletions
diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index 2538dd836..df1c9ced4 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,4 +1,4 @@ Source: openssl -Version: 1.1.1i +Version: 1.1.1j Homepage: https://www.openssl.org 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/portfile.cmake b/ports/openssl/portfile.cmake index d5b888ab0..cd7884f17 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -2,11 +2,11 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") endif() -set(OPENSSL_VERSION 1.1.1i) +set(OPENSSL_VERSION 1.1.1j) vcpkg_download_distfile(ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.1.1/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 fe12e0ab9e1688f24dd862ac633d0ab703b499c0f34b53c3560aa0d3879d81d647aa0678ed517dda5efb2711f669fcb1a1e0e24f6eac2efc2cf4eae6b62014d8 + SHA512 51e44995663b5258b0018bdc1e2b0e7e8e0cce111138ca1f80514456af920fce4e409a411ce117c0f3eb9190ac3e47c53a43f39b06acd35b7494e2bec4a607d5 ) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl/uwp/EnableUWPSupport.patch b/ports/openssl/uwp/EnableUWPSupport.patch index 4313220f1..fe7837445 100644 --- a/ports/openssl/uwp/EnableUWPSupport.patch +++ b/ports/openssl/uwp/EnableUWPSupport.patch @@ -135,12 +135,6 @@ diff --git a/Configure b/Configure index 5a699836f3..de45f1e299 100755 --- a/Configure +++ b/Configure -@@ -1,4 +1,5 @@ - #! /usr/bin/env perl -+#! /usr/bin/env perl - # -*- mode: perl; -*- - # Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. - # @@ -407,6 +408,7 @@ my @disablables = ( "ubsan", "ui-console", diff --git a/versions/baseline.json b/versions/baseline.json index 27cb3afd2..cc41d2482 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4381,7 +4381,7 @@ "port-version": 0 }, "openssl": { - "baseline": "1.1.1i", + "baseline": "1.1.1j", "port-version": 0 }, "openssl-unix": { diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 3dc1fae1b..56c4f2c66 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "009a7ee95741b939859c77b8e1ddd6c146ffe54e", + "version-string": "1.1.1j", + "port-version": 0 + }, + { "git-tree": "30228fb5d272c8554937ac94b77fb971249c7c8a", "version-string": "1.1.1i", "port-version": 0 |