From ad30f9dbe6a0946abfcc00532dfcb839c1e32710 Mon Sep 17 00:00:00 2001
From: Jiri Hruska <jihruska@microsoft.com>
Date: Wed, 8 Mar 2017 18:53:04 +0100
Subject: [openssl] Consistently use OPENSSL_VERSION instead of just VERSION

The inner CMakeLists.txt used to reference ${VERSION} everywhere except
as the working directory for patching, where ${OPENSSL_VERSION} was used
and the patches did not get applied because of that.

This changes it to use ${OPENSSL_VERSION} everywhere instead, consistent
with the name of this variable in the parent portfile.cmake.
---
 ports/openssl/CMakeLists.txt | 8 ++++----
 ports/openssl/portfile.cmake | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/openssl/CMakeLists.txt b/ports/openssl/CMakeLists.txt
index a82f14d60..ca1de18c0 100644
--- a/ports/openssl/CMakeLists.txt
+++ b/ports/openssl/CMakeLists.txt
@@ -58,25 +58,25 @@ endif()
 
 vcpkg_execute_required_process(
     COMMAND ${CONFIGURE_COMMAND}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openssl-${VERSION}
+    WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}
 )
 vcpkg_execute_required_process(
     COMMAND ${OPENSSL_DO}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openssl-${VERSION}
+    WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}
 )
 
 if(BUILD_SHARED_LIBS)
     add_custom_command(OUTPUT ${OPENSSLDIR}/bin/ssleay32.dll ${OPENSSLDIR}/bin/libeay32.dll
         COMMAND ${NMAKE} -f ms\\ntdll.mak install
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openssl-${VERSION}
+        WORKING_DIRECTORY ${SOURCE_PATH}
     )
     add_custom_target(openssl ALL DEPENDS ${OPENSSLDIR}/bin/ssleay32.dll ${OPENSSLDIR}/bin/libeay32.dll)
 else()
     add_custom_command(OUTPUT ${OPENSSLDIR}/bin/ssleay32.lib ${OPENSSLDIR}/bin/libeay32.lib
         COMMAND ${NMAKE} -f ms\\nt.mak install
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openssl-${VERSION}
+        WORKING_DIRECTORY ${SOURCE_PATH}
     )
     add_custom_target(openssl ALL DEPENDS ${OPENSSLDIR}/bin/ssleay32.lib ${OPENSSLDIR}/bin/libeay32.lib)
 endif()
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index 042278943..2a18fb654 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -35,7 +35,7 @@ vcpkg_configure_cmake(
         -DOPENSSL_SOURCE_ARCHIVE=${OPENSSL_SOURCE_ARCHIVE}
         -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
         -DTRIPLET_SYSTEM_ARCH=${TRIPLET_SYSTEM_ARCH}
-        -DVERSION=${OPENSSL_VERSION}
+        -DOPENSSL_VERSION=${OPENSSL_VERSION}
         -DTARGET_TRIPLET=${TARGET_TRIPLET}
 )
 
-- 
cgit v1.2.3


From 109a8b90584aa561bd5528c4a5b3de0d5864a140 Mon Sep 17 00:00:00 2001
From: Jiri Hruska <jihruska@microsoft.com>
Date: Wed, 8 Mar 2017 19:01:56 +0100
Subject: [openssl] Make sure to use our own trusted copy of Perl

The build could have exhibited inconsistent behavior or simply failed if
there was another "perl" program already in path - either because it was
too old or too new, from some broken installation, or just a batch file
instead of a plain executable (which would require changing OpenSSL's
scripts to do "call perl x.pl" instead of just "perl x.pl").

This change resolves the ambiguity by putting the downloaded Perl first
in path, so that the same working version is used on all systems.
---
 ports/openssl/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index 2a18fb654..ca3bb7ff6 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -10,7 +10,7 @@ vcpkg_find_acquire_program(PERL)
 find_program(NMAKE nmake)
 
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
-set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")
+set(ENV{PATH} "${PERL_EXE_PATH};$ENV{PATH}")
 
 vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
     URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz"
-- 
cgit v1.2.3