Browse Source

AppVeyorCI: update cyrus-sasl to 2.1.27, remove patch

pull/3/head
Christian Beier 4 years ago
parent
commit
bcd3eaeb83
No known key found for this signature in database
GPG Key ID: 421BB3B45C6067F8
  1. 7
      .appveyor.yml
  2. 26
      deps/sasl-fix-snprintf-macro.patch

7
.appveyor.yml

@ -37,11 +37,10 @@ install:
- msbuild /p:Configuration=Release db_dll.vcxproj
- cd ..\..
# Cyrus 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
- 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
- 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

26
deps/sasl-fix-snprintf-macro.patch vendored

@ -1,26 +0,0 @@
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
Loading…
Cancel
Save