From 11bee32d76b1bccce894dab443ccb032d2930700 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierryb@filewave.com>
Date: Thu, 6 Dec 2018 01:28:35 +0100
Subject: [PATCH] Upgrade to openssl 1.0.2q (#4844)

* Upgrade to openssl 1.0.2q

* [qca] Use vcpkg_from_git()
---
 ports/openssl-windows/CONTROL        |  2 +-
 ports/openssl-windows/portfile.cmake |  4 +--
 ports/qca/CONTROL                    |  2 +-
 ports/qca/portfile.cmake             | 51 +++++++---------------------
 4 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/ports/openssl-windows/CONTROL b/ports/openssl-windows/CONTROL
index 881c311d003..a62c2fbdcba 100644
--- a/ports/openssl-windows/CONTROL
+++ b/ports/openssl-windows/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl-windows
-Version: 1.0.2p-1
+Version: 1.0.2q
 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-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake
index f9a8bcbbf78..8a95bd6c1e4 100644
--- a/ports/openssl-windows/portfile.cmake
+++ b/ports/openssl-windows/portfile.cmake
@@ -3,7 +3,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME)
 endif()
 
 include(vcpkg_common_functions)
-set(OPENSSL_VERSION 1.0.2p)
+set(OPENSSL_VERSION 1.0.2q)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
 
 vcpkg_find_acquire_program(PERL)
@@ -14,7 +14,7 @@ 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 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16
+    SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0
 )
 
 vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL
index 4f484666f0f..72f20869f18 100644
--- a/ports/qca/CONTROL
+++ b/ports/qca/CONTROL
@@ -1,4 +1,4 @@
 Source: qca
-Version: 2.2.0-2
+Version: 2.2.0-3
 Description: Qt Cryptographic Architecture (QCA). Sources: https://cgit.kde.org/qca.git/
 Build-Depends: qt5-base
diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake
index 6ad35d1f775..ff667cd6c7e 100644
--- a/ports/qca/portfile.cmake
+++ b/ports/qca/portfile.cmake
@@ -5,50 +5,24 @@
 #   Updated certstore. See certstore.pem in the output dirs
 #
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
 include(vcpkg_common_functions)
 
-find_program(GIT git)
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
-set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")
+vcpkg_add_to_path(${PERL_EXE_PATH})
 
-# Set git variables to qca version 2.2.0 commit 
-set(GIT_URL "git://anongit.kde.org/qca.git")
-set(GIT_REF "19ec49f89a0a560590ec733c549b92e199792837") # Commit
-
-# Prepare source dir
-if(NOT EXISTS "${DOWNLOADS}/qca.git")
-    message(STATUS "Cloning")
-    vcpkg_execute_required_process(
-        COMMAND ${GIT} clone --bare ${GIT_URL} ${DOWNLOADS}/qca.git
-        WORKING_DIRECTORY ${DOWNLOADS}
-        LOGNAME clone
-    )
+if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
+    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
 endif()
-message(STATUS "Cloning done")
 
-if(NOT EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
-    message(STATUS "Adding worktree")
-    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR})
-    vcpkg_execute_required_process(
-        COMMAND ${GIT} worktree add -f --detach ${CURRENT_BUILDTREES_DIR}/src ${GIT_REF}
-        WORKING_DIRECTORY ${DOWNLOADS}/qca.git
-        LOGNAME worktree
-    )
-endif()
-message(STATUS "Adding worktree done")
-
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/)
-
-# Apply the patch to install to the expected folders
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-fix-path-for-vcpkg.patch
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/qca
+    REF 19ec49f89a0a560590ec733c549b92e199792837
+    SHA512 6a83ee6715a9a922f4fde5af571e2aad043ac5cbd522f57365038dd31879b44eb57a099ff797793d7ee19e320e0a151e5beacdff3bed525d39ea0b8e46efca9a
+    PATCHES 0001-fix-path-for-vcpkg.patch
 )
 
 # According to:
@@ -72,9 +46,8 @@ message(STATUS "Importing certstore done")
 # Configure and build
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    CURRENT_PACKAGES_DIR ${CURRENT_PACKAGES_DIR}
+    PREFER_NINJA
     OPTIONS
-        -DBUILD_SHARED_LIBS=ON
         -DUSE_RELATIVE_PATHS=ON
         -DQT4_BUILD=OFF
         -DBUILD_TESTS=OFF