From 73cad11e927cdac657071cc0d3034cc701a480c4 Mon Sep 17 00:00:00 2001
From: LazyWolf Lin <LazyWolfLin@gmail.com>
Date: Thu, 8 Mar 2018 09:27:38 +0800
Subject: [PATCH 1/3] Install sodium.h

---
 ports/libsodium/CONTROL        | 2 +-
 ports/libsodium/portfile.cmake | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL
index 7546bdd14f3dc1..b670f39ff438af 100644
--- a/ports/libsodium/CONTROL
+++ b/ports/libsodium/CONTROL
@@ -1,3 +1,3 @@
 Source: libsodium
-Version: 1.0.16
+Version: 1.0.16-1
 Description: A modern and easy-to-use crypto library
diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake
index d6da66ab49fc0d..ff473b5258f636 100644
--- a/ports/libsodium/portfile.cmake
+++ b/ports/libsodium/portfile.cmake
@@ -34,6 +34,10 @@ ELSE()
     SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE})
 ENDIF()
 
+file(INSTALL
+    ${SOURCE_PATH}/src/libsodium/include/sodium.h
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
 
 file(GLOB LIBSODIUM_HEADERS "${SOURCE_PATH}/src/libsodium/include/sodium/*.h")
 file(INSTALL

From cce0ec29b184aeb62fa11312766b24e97c064ec6 Mon Sep 17 00:00:00 2001
From: LazyWolf Lin <LazyWolfLin@gmail.com>
Date: Thu, 14 Jun 2018 09:55:43 +0800
Subject: [PATCH 2/3] [libodb-mysql] adapter mysql 8.0

---
 ports/libodb-mysql/CONTROL                 |  2 +-
 ports/libodb-mysql/adapter_mysql_8.0.patch | 13 +++++++++++++
 ports/libodb-mysql/portfile.cmake          |  6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 ports/libodb-mysql/adapter_mysql_8.0.patch

diff --git a/ports/libodb-mysql/CONTROL b/ports/libodb-mysql/CONTROL
index d51a5a216c5d5e..3a728cb581d5ba 100644
--- a/ports/libodb-mysql/CONTROL
+++ b/ports/libodb-mysql/CONTROL
@@ -1,4 +1,4 @@
 Source: libodb-mysql
-Version: 2.4.0-1
+Version: 2.4.0-2
 Description: MySQL support for the ODB ORM library
 Build-Depends: libodb, libmysql
\ No newline at end of file
diff --git a/ports/libodb-mysql/adapter_mysql_8.0.patch b/ports/libodb-mysql/adapter_mysql_8.0.patch
new file mode 100644
index 00000000000000..9e2f23745d448b
--- /dev/null
+++ b/ports/libodb-mysql/adapter_mysql_8.0.patch
@@ -0,0 +1,13 @@
+diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx
+index 1254ccd..5396791 100644
+--- a/odb/mysql/mysql-types.hxx
++++ b/odb/mysql/mysql-types.hxx
+@@ -7,7 +7,7 @@
+ 
+ #include <odb/mysql/details/config.hxx>
+ 
+-typedef char my_bool;
++typedef bool my_bool;
+ typedef struct st_mysql_bind MYSQL_BIND;
+ 
+ #ifdef LIBODB_MYSQL_INCLUDE_SHORT
diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake
index 9bb0d04343d5df..e6f1e2441656cd 100644
--- a/ports/libodb-mysql/portfile.cmake
+++ b/ports/libodb-mysql/portfile.cmake
@@ -19,6 +19,12 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/adapter_mysql_8.0.patch
+)
+
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql")
 set(MYSQL_LIB "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib")

From 789768b6cf4434830f5a3c22a80aa4e87cc3b437 Mon Sep 17 00:00:00 2001
From: LazyWolf Lin <LazyWolfLin@gmail.com>
Date: Fri, 20 Jul 2018 13:39:41 +0800
Subject: [PATCH 3/3] [log4cplus] upgrade to REL_2_0_1.

---
 ports/log4cplus/CONTROL        | 2 +-
 ports/log4cplus/portfile.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/log4cplus/CONTROL b/ports/log4cplus/CONTROL
index 6dbcb515c03938..712a7873032d05 100644
--- a/ports/log4cplus/CONTROL
+++ b/ports/log4cplus/CONTROL
@@ -1,4 +1,4 @@
 Source: log4cplus
-Version: REL_2_0_0-RC2
+Version: REL_2_0_1
 Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration
 Build-Depends: catch
diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake
index d6e600221270d9..97a17a4f7f8276 100644
--- a/ports/log4cplus/portfile.cmake
+++ b/ports/log4cplus/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO log4cplus/log4cplus
-    REF REL_2_0_0-RC2
-    SHA512  34392d85088534e0661e6fa9726c5970647a5acaa559bafb5d3746a70f5baca01012f457d50c15e73d9aca1d3ed9ec99028cc65fab07f73cdadbbc0b4329bcb5
+    REF REL_2_0_1
+    SHA512  7a84bf237bb5db3eccd90196c0f97adb75d0dd247d73852150078b9458f169d883f3ae92908217ea668bcf25c64766c86380bbcc64b432eb1bae6427c9268b18
     HEAD_REF master
 )