From 67dfa094a7c1ec1e2d752ac7c0094bee4fdde198 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sun, 3 Apr 2016 15:55:09 +0200 Subject: [PATCH] Windows: * Updates to make UnrealIRCd use LibreSSL * Fix HTTPS support in cURL * Forgot to ship curl-ca-bundle.crt (Note: all 3 points from above only affect Windows) --- makefile.win32 | 2 +- src/win32/unrealinst.iss | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/makefile.win32 b/makefile.win32 index 7a2b3a663..e06502764 100644 --- a/makefile.win32 +++ b/makefile.win32 @@ -104,7 +104,7 @@ LIBCURL_LIB=/LIBPATH:"$(LIBCURL_LIB_DIR)" !ENDIF !ENDIF -SSLLIBS=ssleay32.lib libeay32.lib +SSLLIBS=libcrypto-37.lib libssl-38.lib libtls-10.lib !IFDEF OPENSSL_INC_DIR OPENSSL_INC=/I "$(OPENSSL_INC_DIR)" !ENDIF diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss index bec5c5583..65d456de0 100644 --- a/src/win32/unrealinst.iss +++ b/src/win32/unrealinst.iss @@ -66,15 +66,15 @@ Source: "src\modules\extbans\*.dll"; DestDir: "{app}\modules\extbans"; Flags: ig Source: "c:\dev\tre\win32\release\tre.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "c:\dev\pcre2\build\release\pcre2-8.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "c:\dev\c-ares\msvc90\cares\dll-release\cares.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "c:\openssl\bin\openssl.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "c:\openssl\bin\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "c:\openssl\bin\libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "c:\dev\c-ares\msvc110\cares\dll-release\cares.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "c:\dev\libressl\x86\openssl.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "c:\dev\libressl\x86\*.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "c:\dev\setacl.exe"; DestDir: "{app}\tmp"; Flags: ignoreversion #ifdef USE_CURL ; curl with ssl support -Source: "c:\dev\curl-ssl\builds\libcurl-vc-x86-release-dll-sspi\bin\libcurl.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\dev\curl-ssl\builds\libcurl-vc-x86-release-dll-ssl-dll-sspi-obj-lib\libcurl.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "doc\conf\ssl\curl-ca-bundle.crt"; DestDir: "{app}\conf\ssl"; Flags: ignoreversion #endif [Dirs]