mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 22:00:13 +08:00
Merge pull request #2326 from dscho/openssl-1.0.2n
openssl: update to v1.0.2n
This commit is contained in:
commit
48c4b79be5
@ -1,3 +1,3 @@
|
||||
Source: openssl
|
||||
Version: 1.0.2m
|
||||
Version: 1.0.2n
|
||||
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.
|
||||
|
@ -1,35 +0,0 @@
|
||||
diff --git a/util/copy.pl b/util/copy.pl
|
||||
index eba6d58..5d971a2 100644
|
||||
--- a/util/copy.pl
|
||||
+++ b/util/copy.pl
|
||||
@@ -19,7 +19,7 @@ foreach $arg (@ARGV) {
|
||||
next;
|
||||
}
|
||||
$arg =~ s|\\|/|g; # compensate for bug/feature in cygwin glob...
|
||||
- foreach (glob $arg)
|
||||
+ foreach (glob qq("$arg"))
|
||||
{
|
||||
push @filelist, $_;
|
||||
}
|
||||
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
|
||||
index 128a405..fd853da 100644
|
||||
--- a/util/mk1mf.pl
|
||||
+++ b/util/mk1mf.pl
|
||||
@@ -428,7 +428,7 @@ EOF
|
||||
{
|
||||
$extra_install .= <<"EOF"
|
||||
\$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
|
||||
- \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"
|
||||
+ \$(CP) \$(E_SHLIB) \"\$(INSTALLTOP)${o}lib${o}engines\"
|
||||
EOF
|
||||
}
|
||||
}
|
||||
@@ -608,7 +608,7 @@ install: all
|
||||
\$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
|
||||
\$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
|
||||
\$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
|
||||
- \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"
|
||||
+ \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\"
|
||||
\$(MKDIR) \"\$(OPENSSLDIR)\"
|
||||
\$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\"
|
||||
$extra_install
|
@ -4,7 +4,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||||
endif()
|
||||
|
||||
include(vcpkg_common_functions)
|
||||
set(OPENSSL_VERSION 1.0.2m)
|
||||
set(OPENSSL_VERSION 1.0.2n)
|
||||
set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
|
||||
|
||||
vcpkg_find_acquire_program(PERL)
|
||||
@ -19,7 +19,7 @@ set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH};${PERL_EXE_PATH}")
|
||||
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 7619aa223ee50d0f5e270ac9090e95b2b1ba5dfc656c98f625a9a277dda472fb960a4e89a7ba300044cb401b2072b2ca6a6fcce8206d927bf373d1c981806a93
|
||||
SHA512 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
|
||||
|
Loading…
Reference in New Issue
Block a user