From b8991a72afe26fd0762125725d66431735b1962f Mon Sep 17 00:00:00 2001
From: Cheney-Wang <v-xincwa@microsoft.com>
Date: Tue, 31 Jul 2018 00:02:37 -0700
Subject: [PATCH] Update Botan to the latest commit

---
 ports/botan/CONTROL         |  2 +-
 ports/botan/fix-C2338.patch | 13 -------------
 ports/botan/portfile.cmake  | 21 +++++++--------------
 3 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 ports/botan/fix-C2338.patch

diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL
index 33e47b7e80..5582c3a7a4 100644
--- a/ports/botan/CONTROL
+++ b/ports/botan/CONTROL
@@ -1,3 +1,3 @@
 Source: botan
-Version: 2.6.0-2
+Version: 2.8.0
 Description: A cryptography library written in C++11
diff --git a/ports/botan/fix-C2338.patch b/ports/botan/fix-C2338.patch
deleted file mode 100644
index 9ef3bbd458..0000000000
--- a/ports/botan/fix-C2338.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cc/msvc.txt b/cc/msvc.txt
-index ed32a3c..9e78fff 100644
---- a/cc/msvc.txt
-+++ b/cc/msvc.txt
-@@ -10,7 +10,7 @@ add_include_dir_option "/I"
- add_lib_dir_option "/LIBPATH:"
- add_lib_option ""
- 
--compile_flags "/nologo /c"
-+compile_flags "/nologo /c /D_ENABLE_EXTENDED_ALIGNED_STORAGE"
- 
- optimization_flags "/O2 /Oi"
- size_optimization_flags "/O1 /Os"
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
index 60e8e7fd61..200d00f9f7 100644
--- a/ports/botan/portfile.cmake
+++ b/ports/botan/portfile.cmake
@@ -1,20 +1,13 @@
 include(vcpkg_common_functions)
 
-set(BOTAN_VERSION 2.6.0)
-set(BOTAN_HASH 2082b4aaac0802f117a5f75c67a69e6d364b436a0ebe543032e370c3f085752bbe1ca48051462066e13bd42e47573ebc532d1d45074fe406df032f33346ee645)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/Botan-${BOTAN_VERSION})
+set(BOTAN_VERSION 2.8.0)
 
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://botan.randombit.net/releases/Botan-${BOTAN_VERSION}.tgz"
-    FILENAME "Botan-${BOTAN_VERSION}.tgz"
-    SHA512 ${BOTAN_HASH}
-)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}/src/build-data
-	PATCHES
-		${CMAKE_CURRENT_LIST_DIR}/fix-C2338.patch
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO randombit/botan
+    REF cb14e9ce95bcaae2ada7ffe96ef0cce6a2b38593
+    SHA512 3d8fbf1c65e2b0259f225db46ffa4a7eb989a518b230574e94f82dc13afd7dc32cfe6a8a0127e7dd0dea30e06f3946db78db50e107937382eff8ed823e996dc3
+    HEAD_REF master
 )
 
 vcpkg_find_acquire_program(JOM)