From 5d84ade49223b7f8f7667152677e8642b4608c57 Mon Sep 17 00:00:00 2001
From: Christian Beier <dontmind@freeshell.org>
Date: Fri, 28 Dec 2018 22:30:54 +0100
Subject: [PATCH] Revert "AppVeyorCI: update cyrus-sasl to 2.1.27, remove
 patch"

This reverts commit bcd3eaeb83181ab5491aa6d641e2a7b8d424d88a.
---
 .appveyor.yml                      |  7 ++++---
 deps/sasl-fix-snprintf-macro.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 deps/sasl-fix-snprintf-macro.patch

diff --git a/.appveyor.yml b/.appveyor.yml
index ba44a45..9e4b441 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -37,10 +37,11 @@ install:
   - msbuild /p:Configuration=Release db_dll.vcxproj
   - cd ..\..
   # Cyrus SASL
-  - curl -fsSL -o cyrus-sasl-2.1.27.tar.gz https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
-  - 7z x cyrus-sasl-2.1.27.tar.gz -so | 7z x -si -ttar > nul
-  - move cyrus-sasl-2.1.27 sasl
+  - curl -fsSL -o cyrus-sasl-2.1.26.tar.gz ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
+  - 7z x cyrus-sasl-2.1.26.tar.gz -so | 7z x -si -ttar > nul
+  - move cyrus-sasl-2.1.26 sasl
   - cd sasl
+  - patch -p1 -i ..\sasl-fix-snprintf-macro.patch
   - echo using vsdevcmd %VSDEVCMD_BAT%
   - '%VSDEVCMD_BAT%'
   - nmake /f NTMakefile OPENSSL_INCLUDE=c:\OpenSSL-Win32\include OPENSSL_LIBPATH=c:\OpenSSL-Win32\lib DB_INCLUDE=c:\projects\libvncserver\deps\db\build_win32 DB_LIBPATH=c:\projects\libvncserver\deps\db\build_win32\release DB_LIB=libdb41.lib install
diff --git a/deps/sasl-fix-snprintf-macro.patch b/deps/sasl-fix-snprintf-macro.patch
new file mode 100644
index 0000000..26b5da4
--- /dev/null
+++ b/deps/sasl-fix-snprintf-macro.patch
@@ -0,0 +1,26 @@
+From 310579a87a289588cf8c45587354a90973978510 Mon Sep 17 00:00:00 2001
+From: "Montazeri, Mehrdad" <mmontaze@amazon.com>
+Date: Wed, 31 Jan 2018 09:25:08 -0800
+Subject: [PATCH 2/2] fix snprintf macro
+
+---
+ win32/include/config.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/win32/include/config.h b/win32/include/config.h
+index 8d8548e..304a4a9 100644
+--- a/win32/include/config.h
++++ b/win32/include/config.h
+@@ -117,7 +117,9 @@ typedef int		    intptr_t;
+ /* Windows calls these functions something else
+  */
+ #define strcasecmp   stricmp
++#if defined (_MSC_VER) && (_MSC_VER < 1900)
+ #define snprintf    _snprintf
++#endif
+ #define strncasecmp  strnicmp
+ 
+ #define MAXHOSTNAMELEN 1024
+-- 
+2.11.0.windows.3
+