From 8b57e98f1bc31f5e544d61f0a13779fbc27c2a65 Mon Sep 17 00:00:00 2001
From: Andrey Volk <andywolk@gmail.com>
Date: Wed, 24 Jul 2024 00:13:40 +0300
Subject: [PATCH] [Build-System] Windows: Update OpenSSL to v3.4.0, rabbitmq-c
 to 0.15.0

---
 w32/curl-version.props                | 1 +
 w32/curl.props                        | 4 ++--
 w32/libks-version.props               | 2 +-
 w32/libks.props                       | 4 ++--
 w32/libpq-version.props               | 1 +
 w32/libpq.props                       | 4 ++--
 w32/openssl-version.props             | 2 +-
 w32/openssl.props                     | 4 ++--
 w32/rabbitmq-c-version.props          | 3 ++-
 w32/rabbitmq-c.props                  | 4 ++--
 w32/signalwire-client-c-version.props | 2 +-
 w32/signalwire-client-c.props         | 4 ++--
 12 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/w32/curl-version.props b/w32/curl-version.props
index 65f768859d..db7ea15b29 100644
--- a/w32/curl-version.props
+++ b/w32/curl-version.props
@@ -3,6 +3,7 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <curlVersion>7.88.0</curlVersion>
+    <curlBuildNumber>1</curlBuildNumber>
   </PropertyGroup>
   <PropertyGroup>
     <curlVersionImported>true</curlVersionImported>
diff --git a/w32/curl.props b/w32/curl.props
index ea86ea4bd6..5b306aa417 100644
--- a/w32/curl.props
+++ b/w32/curl.props
@@ -41,7 +41,7 @@
 
   <Target Name="curlBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
       <DownloadPackageTask
-           package="http://files.freeswitch.org/windows/packages/curl/$(curlVersion)/curl-$(curlVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
+           package="https://files.freeswitch.org/windows/packages/curl/$(curlVersion)_$(curlBuildNumber)/curl-$(curlVersion)_$(curlBuildNumber)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
            expectfileordirectory="$(curlLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\curl.lib"
            outputfolder=""
            outputfilename=""
@@ -50,7 +50,7 @@
   </Target>
   <Target Name="curlHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
       <DownloadPackageTask
-           package="http://files.freeswitch.org/windows/packages/curl/$(curlVersion)/curl-$(curlVersion)-headers.zip"
+           package="https://files.freeswitch.org/windows/packages/curl/$(curlVersion)_$(curlBuildNumber)/curl-$(curlVersion)_$(curlBuildNumber)-headers.zip"
            expectfileordirectory="$(curlLibDir)\include\curl\curl.h"
            outputfolder=""
            outputfilename=""
diff --git a/w32/libks-version.props b/w32/libks-version.props
index f360ce8322..f4fcab9af8 100644
--- a/w32/libks-version.props
+++ b/w32/libks-version.props
@@ -5,7 +5,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <libksVersion>2.0.6</libksVersion>
-    <libksBuildNumber>0</libksBuildNumber>
+    <libksBuildNumber>1</libksBuildNumber>
   </PropertyGroup>
   <PropertyGroup>
     <libksVersionImported>true</libksVersionImported>
diff --git a/w32/libks.props b/w32/libks.props
index df0b9721f3..781f6495f5 100644
--- a/w32/libks.props
+++ b/w32/libks.props
@@ -36,7 +36,7 @@
 
   <Target Name="libksBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
+           package="https://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
            expectfileordirectory="$(libksDir)\binaries\$(Platform)\$(Configuration)\ks2.dll" 
            outputfolder=""
            outputfilename="" 
@@ -45,7 +45,7 @@
   </Target> 
   <Target Name="libksHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-headers.zip"
+           package="https://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-headers.zip"
            expectfileordirectory="$(libksDir)\libks\src\include\libks\ks.h" 
            outputfolder=""
            outputfilename="" 
diff --git a/w32/libpq-version.props b/w32/libpq-version.props
index 2463086a50..0916386357 100644
--- a/w32/libpq-version.props
+++ b/w32/libpq-version.props
@@ -5,6 +5,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <libpqVersion>10.23</libpqVersion>
+    <libpqBuildNumber>1</libpqBuildNumber>
   </PropertyGroup>
   <PropertyGroup>
     <libpqVersionImported>true</libpqVersionImported>
diff --git a/w32/libpq.props b/w32/libpq.props
index 0b5af2895c..e55b68dc2c 100644
--- a/w32/libpq.props
+++ b/w32/libpq.props
@@ -35,7 +35,7 @@
 
   <Target Name="libpqBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/libpq/$(libpqVersion)/libpq-$(libpqVersion)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
+           package="https://files.freeswitch.org/windows/packages/libpq/$(libpqVersion)_$(libpqBuildNumber)/libpq-$(libpqVersion)_$(libpqBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
            expectfileordirectory="$(libpqlibDir)\binaries\$(Platform)\$(Configuration)\libpq.dll" 
            outputfolder=""
            outputfilename="" 
@@ -44,7 +44,7 @@
   </Target> 
   <Target Name="libpqHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/libpq/$(libpqVersion)/libpq-$(libpqVersion)-headers.zip"
+           package="https://files.freeswitch.org/windows/packages/libpq/$(libpqVersion)_$(libpqBuildNumber)/libpq-$(libpqVersion)_$(libpqBuildNumber)-headers.zip"
            expectfileordirectory="$(libpqlibDir)\include\libpq-fe.h" 
            outputfolder=""
            outputfilename="" 
diff --git a/w32/openssl-version.props b/w32/openssl-version.props
index 2d88e736e7..062e874063 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.1.1t</OpenSSLVersion>
+    <OpenSSLVersion>3.4.0</OpenSSLVersion>
     <OpenSSLLibDir>$(BaseDir)libs\openssl-$(OpenSSLVersion)</OpenSSLLibDir>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/w32/openssl.props b/w32/openssl.props
index aa31668a75..110c48f0d2 100644
--- a/w32/openssl.props
+++ b/w32/openssl.props
@@ -35,7 +35,7 @@
 
   <Target Name="opensslbinariesTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/openssl/$(OpenSSLVersion)/openssl-$(OpenSSLVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
+           package="https://files.freeswitch.org/windows/packages/openssl/$(OpenSSLVersion)/openssl-$(OpenSSLVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
            expectfileordirectory="$(OpenSSLLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\openssl.exe"
            outputfolder=""
            outputfilename="" 
@@ -45,7 +45,7 @@
 
   <Target Name="opensslheadersTarget" BeforeTargets="CustomBuild" DependsOnTargets="opensslbinariesTarget">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/openssl/$(OpenSSLVersion)/openssl-$(OpenSSLVersion)-headers.zip"
+           package="https://files.freeswitch.org/windows/packages/openssl/$(OpenSSLVersion)/openssl-$(OpenSSLVersion)-headers.zip"
            expectfileordirectory="$(OpenSSLLibDir)\include\openssl\ssl.h" 
            outputfolder=""
            outputfilename="" 
diff --git a/w32/rabbitmq-c-version.props b/w32/rabbitmq-c-version.props
index 6716df2314..885ccb6986 100644
--- a/w32/rabbitmq-c-version.props
+++ b/w32/rabbitmq-c-version.props
@@ -4,7 +4,8 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <rabbitmq_cVersion>0.13.0</rabbitmq_cVersion>
+    <rabbitmq_cVersion>0.15.0</rabbitmq_cVersion>
+    <rabbitmq_cBuildNumber>0</rabbitmq_cBuildNumber>
   </PropertyGroup>
   <PropertyGroup>
     <rabbitmq_cVersionImported>true</rabbitmq_cVersionImported>
diff --git a/w32/rabbitmq-c.props b/w32/rabbitmq-c.props
index 30db81dfdd..9ed46830da 100644
--- a/w32/rabbitmq-c.props
+++ b/w32/rabbitmq-c.props
@@ -31,7 +31,7 @@
 
   <Target Name="rabbitmq-c-binariesTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/rabbitmq-c/$(rabbitmq_cVersion)/rabbitmq-c-$(rabbitmq_cVersion)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
+           package="https://files.freeswitch.org/windows/packages/rabbitmq-c/$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)/rabbitmq-c-$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
            expectfileordirectory="$(rabbitmq_c_libDir)\binaries\$(Platform.ToLower())\$(Configuration.ToLower())\librabbitmq.4.lib" 
            outputfolder=""
            outputfilename="" 
@@ -41,7 +41,7 @@
 
   <Target Name="rabbitmq-c-headersTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/rabbitmq-c/$(rabbitmq_cVersion)/rabbitmq-c-$(rabbitmq_cVersion)-headers.zip"
+           package="https://files.freeswitch.org/windows/packages/rabbitmq-c/$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)/rabbitmq-c-$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)-headers.zip"
            expectfileordirectory="$(rabbitmq_c_libDir)\include\amqp.h" 
            outputfolder=""
            outputfilename="" 
diff --git a/w32/signalwire-client-c-version.props b/w32/signalwire-client-c-version.props
index db6eb873cb..423004cf92 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>2.0.0</signalwire-client-cVersion>
+    <signalwire-client-cVersion>2.0.1</signalwire-client-cVersion>
     <signalwire-client-cBuildNumber>1</signalwire-client-cBuildNumber>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/w32/signalwire-client-c.props b/w32/signalwire-client-c.props
index df82dff00e..4dd691717d 100644
--- a/w32/signalwire-client-c.props
+++ b/w32/signalwire-client-c.props
@@ -34,7 +34,7 @@
 
   <Target Name="signalwire-client-cBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/signalwire-client-c/$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)/signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
+           package="https://files.freeswitch.org/windows/packages/signalwire-client-c/$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)/signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
            expectfileordirectory="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\signalwire_client2.dll" 
            outputfolder=""
            outputfilename="" 
@@ -43,7 +43,7 @@
   </Target> 
   <Target Name="signalwire-client-cHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/signalwire-client-c/$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)/signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)-headers.zip"
+           package="https://files.freeswitch.org/windows/packages/signalwire-client-c/$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)/signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)-headers.zip"
            expectfileordirectory="$(signalwire-client-cDir)\include\signalwire-client-c\client.h" 
            outputfolder=""
            outputfilename=""