Merge branch 'master' of https://github.com/yurybura/vcpkg

6 files changed, 39 insertions, 29 deletions

diff --git a/ports/openssl/CMakeLists.txt b/ports/openssl/CMakeLists.txt
index 40e82abb4..a2d863452 100644
--- a/ports/openssl/CMakeLists.txt
+++ b/ports/openssl/CMakeLists.txt
@@ -14,7 +14,9 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
         set(PLATFORM linux-generic32)

     endif()

 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

-  set(PLATFORM darwin64-x86_64-cc)

+    set(PLATFORM darwin64-x86_64-cc)

+elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")

+    set(PLATFORM BSD-generic64)

 else()

     message(FATAL_ERROR "Unknown platform")

 endif()

diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index e1cea2799..fe7ea5c01 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl
-Version: 1.0.2n-2
+Version: 1.0.2o-2
 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/RemoveNonASCIIChar.patch b/ports/openssl/RemoveNonASCIIChar.patch
deleted file mode 100644
index 5c4553b0a..000000000
--- a/ports/openssl/RemoveNonASCIIChar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ssl/bad_dtls_test.c b/ssl/bad_dtls_test.c
-index 34af37d..ff754e1 100644
---- a/ssl/bad_dtls_test.c
-+++ b/ssl/bad_dtls_test.c
-@@ -19,7 +19,7 @@
-  * Note that unlike other SSL tests, we don't test against our own SSL
-  * server method. Firstly because we don't have one; we *only* support
-  * DTLS1_BAD_VER as a client. And secondly because even if that were
-- * fixed up it's the wrong thing to test against — because if changes
-+ * fixed up it's the wrong thing to test against - because if changes
-  * are made in generic DTLS code which don't take DTLS1_BAD_VER into
-  * account, there's plenty of scope for making those changes such that
-  * they break *both* the client and the server in the same way.
diff --git a/ports/openssl/portfile-nonwindows.cmake b/ports/openssl/portfile-nonwindows.cmake
index 67e739af1..c324b132a 100644
--- a/ports/openssl/portfile-nonwindows.cmake
+++ b/ports/openssl/portfile-nonwindows.cmake
@@ -4,6 +4,9 @@ if(CMAKE_HOST_WIN32)
     set(MAKE ${MSYS_ROOT}/usr/bin/make.exe)

 else()

     find_program(MAKE make)

+    if(NOT MAKE)

+        message(FATAL_ERROR "Could not find make. Please install it through your package manager.")

+    endif()

 endif()

 

 vcpkg_configure_cmake(

@@ -28,3 +31,7 @@ endforeach()
 

 file(INSTALL ${RESOLVED_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/openssl)

 file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl RENAME copyright)

+

+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl)

+endif()

diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index fe26c0c31..a6e5fd110 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -4,25 +4,18 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()
 
 include(vcpkg_common_functions)
-set(OPENSSL_VERSION 1.0.2n)
+set(OPENSSL_VERSION 1.0.2o)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
 
-if(CMAKE_HOST_WIN32)
-    vcpkg_find_acquire_program(PERL)
-    vcpkg_find_acquire_program(NASM)
-else()
-    find_program(PERL perl)
-    find_program(NASM nasm)
-endif()
+vcpkg_find_acquire_program(PERL)
 
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
-get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
-set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH};${PERL_EXE_PATH}")
+set(ENV{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 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687
+    SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
 )
 
 vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
@@ -31,7 +24,6 @@ vcpkg_apply_patches(
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/ConfigureIncludeQuotesFix.patch
             ${CMAKE_CURRENT_LIST_DIR}/STRINGIFYPatch.patch
             ${CMAKE_CURRENT_LIST_DIR}/EmbedSymbolsInStaticLibsZ7.patch
-            ${CMAKE_CURRENT_LIST_DIR}/RemoveNonASCIIChar.patch
 )
 
 if(VCPKG_CMAKE_SYSTEM_NAME)
@@ -39,6 +31,10 @@ if(VCPKG_CMAKE_SYSTEM_NAME)
     return()
 endif()
 
+vcpkg_find_acquire_program(NASM)
+get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
+set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH}")
+
 vcpkg_find_acquire_program(JOM)
 
 set(CONFIGURE_COMMAND ${PERL} Configure
@@ -95,7 +91,7 @@ execute_process(
     ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log
 )
 vcpkg_execute_required_process(
-    COMMAND ${JOM} -j 1 -f ${OPENSSL_MAKEFILE} install
+    COMMAND nmake -f ${OPENSSL_MAKEFILE} install
     WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
     LOGNAME build-${TARGET_TRIPLET}-rel-1)
 
@@ -128,7 +124,7 @@ execute_process(
     ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log
 )
 vcpkg_execute_required_process(
-    COMMAND ${JOM} -j 1 -f ${OPENSSL_MAKEFILE} install
+    COMMAND nmake -f ${OPENSSL_MAKEFILE} install
     WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
     LOGNAME build-${TARGET_TRIPLET}-dbg-1)
 
@@ -155,6 +151,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/)
 endif()
 
+file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" _contents)
+string(REPLACE "<winsock.h>" "<winsock2.h>" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" "${_contents}")
+
+file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" _contents)
+string(REPLACE "#  include <windows.h>" "#ifndef _WINSOCKAPI_\n#define _WINSOCKAPI_\n#endif\n#  include <windows.h>" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" "${_contents}")
+
 vcpkg_copy_pdbs()
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake b/ports/openssl/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..82313bdab
--- /dev/null
+++ b/ports/openssl/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,10 @@
+_find_package(${ARGS})

+if(OPENSSL_FOUND)

+    find_library(OPENSSL_DL_LIBRARY NAMES dl)

+    if(OPENSSL_DL_LIBRARY)

+        list(APPEND OPENSSL_LIBRARIES "dl")

+        if(TARGET OpenSSL::Crypto)

+            set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl")

+        endif()

+    endif()

+endif()