[Build-System] Windows: Update OpenSSL to 1.1.1l, libpq to 10.18, curl to 7.78.0...

diff --git a/libs/iksemel/src/stream.c b/libs/iksemel/src/stream.c
index a35f29223ae27550ea55b6595ed9cd6db7a0caec..e05e5d06ef6fd1b0aa02678735d304821bdc6fe8 100644 (file)
--- 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 f42593d627465309e82bdd5d33fd253e5bcde816..fe37b46801b787f00d2dd6bb82e8b6e4cea8003f 100644 (file)
--- 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 3136e3589c044d89bff0a5fb815694739fbde2db..ea86ea4bd6ce203ba96435e0894e2fd147adaaa4 100644 (file)
--- a/w32/curl.props
+++ b/w32/curl.props
@@ -65,7 +65,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>$(curlLibDir)\binaries\$(Platform)\$(LibraryConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <AdditionalDependencies>curl.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>curl.lib;Wldap32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
 \r

diff --git a/w32/libks-version.props b/w32/libks-version.props
index db4eb626b8a2ebbb9a520956d1d0f6f875cca72c..d3880e33c125d3f1ff4339e904ee39addf5052fd 100644 (file)
--- a/w32/libks-version.props
+++ b/w32/libks-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
-    <libksVersion>1.3.0</libksVersion>\r
+    <libksVersion>1.7.0</libksVersion>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
     <libksVersionImported>true</libksVersionImported>\r

diff --git a/w32/libpq-version.props b/w32/libpq-version.props
index 7d92fe69801d29242c5bec3b9ab39e1e6368d910..2bd87afc9e70a8ad48d5f00ef0e8b9cea25a40eb 100644 (file)
--- 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 21e8ca66e66412acb7a342c50e338776c3c1c9a2..f0147f9bafebe8a55a3265513daea2e43734cf68 100644 (file)
--- a/w32/openssl-version.props
+++ b/w32/openssl-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
-    <OpenSSLVersion>1.0.2k</OpenSSLVersion>\r
+    <OpenSSLVersion>1.1.1l</OpenSSLVersion>\r
     <OpenSSLLibDir>$(BaseDir)libs\openssl-$(OpenSSLVersion)</OpenSSLLibDir>\r
   </PropertyGroup>\r
   <PropertyGroup>\r

diff --git a/w32/openssl.props b/w32/openssl.props
index 4ba58783059f48127e7b535ad0b3f907543df379..c3eaa3632b1a45229528c11e44464c7e99ab08d6 100644 (file)
--- 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 cea5739846b0c93d421ce10e588329cf33b87d49..0688988cfb5265faa76735a95075b7ced91251f6 100644 (file)
--- 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 c62174b6a7ddfcf7a7041d3574770cbc742d933e..56b4dc554562793e2b0e35a27ca2dbb862f3abd7 100644 (file)
--- a/w32/signalwire-client-c-version.props
+++ b/w32/signalwire-client-c-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
-    <signalwire-client-cVersion>1.2.0</signalwire-client-cVersion>\r
+    <signalwire-client-cVersion>1.3.0</signalwire-client-cVersion>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
     <signalwire-client-cVersionImported>true</signalwire-client-cVersionImported>\r