From 8d0f86cad7bdaff199d87de8cceb8e782809e997 Mon Sep 17 00:00:00 2001
From: ryanfitzsimon <ryanfitzsimon@outlook.com>
Date: Sat, 19 Oct 2019 07:14:57 +1000
Subject: [PATCH] [mosquitto] Update to 1.6.7 (#8661)

* Remove patch for ssize_t definition issue resolved upstream
---
 ports/mosquitto/CONTROL           |  2 +-
 ports/mosquitto/portfile.cmake    |  4 ++--
 ports/mosquitto/win64-cmake.patch | 14 --------------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/ports/mosquitto/CONTROL b/ports/mosquitto/CONTROL
index 78df68fa1..df10ce2d8 100644
--- a/ports/mosquitto/CONTROL
+++ b/ports/mosquitto/CONTROL
@@ -1,5 +1,5 @@
 Source: mosquitto
-Version: 1.6.3
+Version: 1.6.7
 Build-Depends: c-ares, libwebsockets, openssl, pthreads
 Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.
   MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake
index 44f4d2390..b2fe11da9 100644
--- a/ports/mosquitto/portfile.cmake
+++ b/ports/mosquitto/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eclipse/mosquitto
-    REF be73f792008904c5edcba9a2c17dcb23620edb09
-    SHA512 b6fffffc5363c6242487619d920b34f68389dd0a18313733266e0723773af9b92a481bf6fabe6e9ca82e30ea08895822d9cfbf33c2309c1f213c951983e6d129
+    REF v1.6.7
+    SHA512 bc10a70815a8962e0ead06c36b312ea84e43db4e7c05ad940db91cacea92387a3b4f59f7de1606c4df56cd8c829433957733aa4007111d62bc0134e9cbb9ff3f
     HEAD_REF master
     PATCHES
         archive-dest.patch
diff --git a/ports/mosquitto/win64-cmake.patch b/ports/mosquitto/win64-cmake.patch
index 9105c403f..3fdb93700 100644
--- a/ports/mosquitto/win64-cmake.patch
+++ b/ports/mosquitto/win64-cmake.patch
@@ -29,17 +29,3 @@ index b7a7616..bceb92a 100644
  #  ifndef strcasecmp
  #    define strcasecmp strcmpi
  #  endif
-diff --git a/lib/net_mosq.h b/lib/net_mosq.h
-index b843ebe..8c077eb 100644
---- a/lib/net_mosq.h
-+++ b/lib/net_mosq.h
-@@ -20,6 +20,9 @@ Contributors:
- #include <unistd.h>
- #else
- #include <winsock2.h>
-+#if defined(_MSC_VER) && _MSC_VER > 1900
-+#undef ssize_t
-+#endif
- typedef SSIZE_T ssize_t;
- #endif
-