From 88bc18918c91b6bccc95b41b5d4333a482102730 Mon Sep 17 00:00:00 2001
From: the-j0k3r <31389848+the-j0k3r@users.noreply.github.com>
Date: Sun, 2 Sep 2018 10:28:10 +0100
Subject: [openssl] bump to 1.0.2p CVE-2018-0732 (#4130)

* [openssl] bump to 1.0.2p CVE-2018-0732

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0732

https://www.openssl.org/news/vulnerabilities.html

* [openssl-unix][openssl-windows] Update control files for 1.0.2p

* [openssl-windows][openssl-uwp] Update hashes

* [libusbmuxd][libplist] Disable LTCG to enable compiler upgrades

* [libirecovery] Add missing getopt dependency
---
 ports/libirecovery/CONTROL           | 4 ++--
 ports/libplist/CONTROL               | 2 +-
 ports/libplist/portfile.cmake        | 3 +++
 ports/libusbmuxd/CONTROL             | 2 +-
 ports/libusbmuxd/portfile.cmake      | 3 +++
 ports/openssl-unix/CONTROL           | 2 +-
 ports/openssl-unix/portfile.cmake    | 4 ++--
 ports/openssl-windows/CONTROL        | 2 +-
 ports/openssl-windows/portfile.cmake | 4 ++--
 9 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ports/libirecovery/CONTROL b/ports/libirecovery/CONTROL
index 0916cd698..c3f423b93 100644
--- a/ports/libirecovery/CONTROL
+++ b/ports/libirecovery/CONTROL
@@ -1,4 +1,4 @@
 Source: libirecovery
-Version: 1.0.25-1
+Version: 1.0.25-2
 Description: Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux
-Build-Depends: libusbmuxd, readline
\ No newline at end of file
+Build-Depends: libusbmuxd, readline, getopt
\ No newline at end of file
diff --git a/ports/libplist/CONTROL b/ports/libplist/CONTROL
index 22e209d14..bb7db384c 100644
--- a/ports/libplist/CONTROL
+++ b/ports/libplist/CONTROL
@@ -1,3 +1,3 @@
 Source: libplist
-Version: 2.0.1.197-1
+Version: 2.0.1.197-2
 Description: A library to handle Apple Property List format in binary or XML 
diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake
index e7761884d..51549e4ca 100644
--- a/ports/libplist/portfile.cmake
+++ b/ports/libplist/portfile.cmake
@@ -11,6 +11,9 @@ vcpkg_from_github(
     PATCHES dllexport.patch
 )
 
+set(ENV{_CL_} "$ENV{_CL_} /GL-")
+set(ENV{_LINK_} "$ENV{_LINK_} /LTCG:OFF")
+
 vcpkg_install_msbuild(
     SOURCE_PATH ${SOURCE_PATH}
     PROJECT_SUBPATH libplist.sln
diff --git a/ports/libusbmuxd/CONTROL b/ports/libusbmuxd/CONTROL
index b93c9d379..3773d17f9 100644
--- a/ports/libusbmuxd/CONTROL
+++ b/ports/libusbmuxd/CONTROL
@@ -1,4 +1,4 @@
 Source: libusbmuxd
-Version: 1.0.107-1
+Version: 1.0.107-2
 Description: A client library to multiplex connections from and to iOS devices
 Build-Depends: libplist
diff --git a/ports/libusbmuxd/portfile.cmake b/ports/libusbmuxd/portfile.cmake
index 36414f68d..c4d338b19 100644
--- a/ports/libusbmuxd/portfile.cmake
+++ b/ports/libusbmuxd/portfile.cmake
@@ -11,6 +11,9 @@ vcpkg_from_github(
     PATCHES dllexport.patch
 )
 
+set(ENV{_CL_} "$ENV{_CL_} /GL-")
+set(ENV{_LINK_} "$ENV{_LINK_} /LTCG:OFF")
+
 vcpkg_install_msbuild(
     SOURCE_PATH ${SOURCE_PATH}
     PROJECT_SUBPATH libusbmuxd.sln
diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL
index db47c018b..6413eb371 100644
--- a/ports/openssl-unix/CONTROL
+++ b/ports/openssl-unix/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl-unix
-Version: 1.0.2o-1
+Version: 1.0.2p
 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-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake
index 7bfbb06e5..1484fc66c 100644
--- a/ports/openssl-unix/portfile.cmake
+++ b/ports/openssl-unix/portfile.cmake
@@ -3,7 +3,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM
 endif()
 
 include(vcpkg_common_functions)
-set(OPENSSL_VERSION 1.0.2o)
+set(OPENSSL_VERSION 1.0.2p)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
 
 vcpkg_find_acquire_program(PERL)
@@ -11,7 +11,7 @@ vcpkg_find_acquire_program(PERL)
 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 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
+    SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16
 )
 
 vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
diff --git a/ports/openssl-windows/CONTROL b/ports/openssl-windows/CONTROL
index a9c10c583..f2e196982 100644
--- a/ports/openssl-windows/CONTROL
+++ b/ports/openssl-windows/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl-windows
-Version: 1.0.2o
+Version: 1.0.2p
 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 7c93a5bce..b57d38996 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.2o)
+set(OPENSSL_VERSION 1.0.2p)
 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 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
+    SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16
 )
 
 vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
-- 
cgit v1.2.3