From ee06958df61dc0154c5bfdde77cd1b84e77034f4 Mon Sep 17 00:00:00 2001
From: Andrey Volk <andywolk@gmail.com>
Date: Mon, 30 Aug 2021 21:19:19 +0300
Subject: [PATCH] [Build-System] Windows: Update OpenSSL to 1.1.1l, libpq to
 10.18, curl to 7.78.0, libks to 1.7.0, signalwire-c to 1.3.0, rabbitmq-c to
 0.11.0

---
 libs/iksemel/src/stream.c             | 1 +
 w32/curl-version.props                | 2 +-
 w32/curl.props                        | 2 +-
 w32/libks-version.props               | 2 +-
 w32/libpq-version.props               | 2 +-
 w32/openssl-version.props             | 2 +-
 w32/openssl.props                     | 3 +--
 w32/rabbitmq-c-version.props          | 2 +-
 w32/signalwire-client-c-version.props | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libs/iksemel/src/stream.c b/libs/iksemel/src/stream.c
index a35f29223a..e05e5d06ef 100644
--- a/libs/iksemel/src/stream.c
+++ b/libs/iksemel/src/stream.c
@@ -23,6 +23,7 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #ifdef WIN32
+#include "Winsock2.h"
 typedef unsigned __int32 uint32_t;
 #else
 #ifdef HAVE_SYS_SELECT_H
diff --git a/w32/curl-version.props b/w32/curl-version.props
index f42593d627..fe37b46801 100644
--- a/w32/curl-version.props
+++ b/w32/curl-version.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <curlVersion>7.61.0</curlVersion>
+    <curlVersion>7.78.0</curlVersion>
   </PropertyGroup>
   <PropertyGroup>
     <curlVersionImported>true</curlVersionImported>
diff --git a/w32/curl.props b/w32/curl.props
index 3136e3589c..ea86ea4bd6 100644
--- a/w32/curl.props
+++ b/w32/curl.props
@@ -65,7 +65,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(curlLibDir)\binaries\$(Platform)\$(LibraryConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>curl.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>curl.lib;Wldap32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
diff --git a/w32/libks-version.props b/w32/libks-version.props
index db4eb626b8..d3880e33c1 100644
--- a/w32/libks-version.props
+++ b/w32/libks-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <libksVersion>1.3.0</libksVersion>
+    <libksVersion>1.7.0</libksVersion>
   </PropertyGroup>
   <PropertyGroup>
     <libksVersionImported>true</libksVersionImported>
diff --git a/w32/libpq-version.props b/w32/libpq-version.props
index 7d92fe6980..2bd87afc9e 100644
--- a/w32/libpq-version.props
+++ b/w32/libpq-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <libpqVersion>10.3</libpqVersion>
+    <libpqVersion>10.18</libpqVersion>
   </PropertyGroup>
   <PropertyGroup>
     <libpqVersionImported>true</libpqVersionImported>
diff --git a/w32/openssl-version.props b/w32/openssl-version.props
index 21e8ca66e6..f0147f9baf 100644
--- a/w32/openssl-version.props
+++ b/w32/openssl-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <OpenSSLVersion>1.0.2k</OpenSSLVersion>
+    <OpenSSLVersion>1.1.1l</OpenSSLVersion>
     <OpenSSLLibDir>$(BaseDir)libs\openssl-$(OpenSSLVersion)</OpenSSLLibDir>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/w32/openssl.props b/w32/openssl.props
index 4ba5878305..c3eaa3632b 100644
--- a/w32/openssl.props
+++ b/w32/openssl.props
@@ -72,8 +72,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(OpenSSLLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies Condition="'$(Platform)'=='Win32'">ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Platform)'=='x64'">ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;crypt32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file
diff --git a/w32/rabbitmq-c-version.props b/w32/rabbitmq-c-version.props
index cea5739846..0688988cfb 100644
--- a/w32/rabbitmq-c-version.props
+++ b/w32/rabbitmq-c-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <rabbitmq_cVersion>0.8.0</rabbitmq_cVersion>
+    <rabbitmq_cVersion>0.11.0</rabbitmq_cVersion>
   </PropertyGroup>
   <PropertyGroup>
     <rabbitmq_cVersionImported>true</rabbitmq_cVersionImported>
diff --git a/w32/signalwire-client-c-version.props b/w32/signalwire-client-c-version.props
index c62174b6a7..56b4dc5545 100644
--- a/w32/signalwire-client-c-version.props
+++ b/w32/signalwire-client-c-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <signalwire-client-cVersion>1.2.0</signalwire-client-cVersion>
+    <signalwire-client-cVersion>1.3.0</signalwire-client-cVersion>
   </PropertyGroup>
   <PropertyGroup>
     <signalwire-client-cVersionImported>true</signalwire-client-cVersionImported>