[Build-System] Windows: Update OpenSSL to v3.4.0, rabbitmq-c to 0.15.0

diff --git a/w32/curl-version.props b/w32/curl-version.props
index 65f768859d667cce67a88bb450ee90b520e6e101..db7ea15b297030f2783e5c77cf7095eb6c55f402 100644 (file)
--- 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 ea86ea4bd6ce203ba96435e0894e2fd147adaaa4..5b306aa4171f8ab581c5ab0a09130dbe22a14f63 100644 (file)
--- a/w32/curl.props
+++ b/w32/curl.props
@@ -41,7 +41,7 @@
 \r
   <Target Name="curlBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">\r
       <DownloadPackageTask\r
-           package="http://files.freeswitch.org/windows/packages/curl/$(curlVersion)/curl-$(curlVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"\r
+           package="https://files.freeswitch.org/windows/packages/curl/$(curlVersion)_$(curlBuildNumber)/curl-$(curlVersion)_$(curlBuildNumber)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"\r
            expectfileordirectory="$(curlLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\curl.lib"\r
            outputfolder=""\r
            outputfilename=""\r
@@ -50,7 +50,7 @@
   </Target>\r
   <Target Name="curlHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">\r
       <DownloadPackageTask\r
-           package="http://files.freeswitch.org/windows/packages/curl/$(curlVersion)/curl-$(curlVersion)-headers.zip"\r
+           package="https://files.freeswitch.org/windows/packages/curl/$(curlVersion)_$(curlBuildNumber)/curl-$(curlVersion)_$(curlBuildNumber)-headers.zip"\r
            expectfileordirectory="$(curlLibDir)\include\curl\curl.h"\r
            outputfolder=""\r
            outputfilename=""\r

diff --git a/w32/libks-version.props b/w32/libks-version.props
index f360ce8322e63249d83524eb93f8db035cd36433..f4fcab9af8745e5595c5f1b676f6004e24db6a63 100644 (file)
--- a/w32/libks-version.props
+++ b/w32/libks-version.props
@@ -5,7 +5,7 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
     <libksVersion>2.0.6</libksVersion>\r
-    <libksBuildNumber>0</libksBuildNumber>\r
+    <libksBuildNumber>1</libksBuildNumber>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
     <libksVersionImported>true</libksVersionImported>\r

diff --git a/w32/libks.props b/w32/libks.props
index df0b9721f387698ce0ea03475755418d3174338c..781f6495f595629e0a1b4c3b3c70d8c84048e241 100644 (file)
--- a/w32/libks.props
+++ b/w32/libks.props
@@ -36,7 +36,7 @@
 \r
   <Target Name="libksBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
       <DownloadPackageTask \r
-           package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"\r
+           package="https://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"\r
            expectfileordirectory="$(libksDir)\binaries\$(Platform)\$(Configuration)\ks2.dll" \r
            outputfolder=""\r
            outputfilename="" \r
@@ -45,7 +45,7 @@
   </Target> \r
   <Target Name="libksHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
       <DownloadPackageTask \r
-           package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-headers.zip"\r
+           package="https://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-headers.zip"\r
            expectfileordirectory="$(libksDir)\libks\src\include\libks\ks.h" \r
            outputfolder=""\r
            outputfilename="" \r

diff --git a/w32/libpq-version.props b/w32/libpq-version.props
index 2463086a509cd874374d0563f19f032a32f4d0fc..0916386357aac470e5d6815f467bbc8a341fe360 100644 (file)
--- 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 0b5af2895c04f1aac10a92c27aa4f4aaba520f82..e55b68dc2caf5d7a7b8657f3599a10dc8c7a5122 100644 (file)
--- 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 2d88e736e75c00d02f5e97e118e76d99c8ba15a4..062e8740637444742d0d9f712f6069d47728bb96 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.1.1t</OpenSSLVersion>\r
+    <OpenSSLVersion>3.4.0</OpenSSLVersion>\r
     <OpenSSLLibDir>$(BaseDir)libs\openssl-$(OpenSSLVersion)</OpenSSLLibDir>\r
   </PropertyGroup>\r
   <PropertyGroup>\r

diff --git a/w32/openssl.props b/w32/openssl.props
index aa31668a75f00b0ce9d97aea2b9f012749ba1c7f..110c48f0d2ed9a993b02af734eb1820de3826703 100644 (file)
--- 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 6716df2314847dd64a8c1a58180d8774e2ecb723..885ccb6986149ab3f5ff04bb5887b4ce10476cb2 100644 (file)
--- 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 30db81dfdd9e5926220db10b7d387000ebb27d88..9ed46830da3e55c0827fa13ccd0a2f50f217946c 100644 (file)
--- 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 db6eb873cb43c96fa01e6eb58dbf2ce96b746aa0..423004cf9293e246399eac0599bd369ff1f1df08 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>2.0.0</signalwire-client-cVersion>\r
+    <signalwire-client-cVersion>2.0.1</signalwire-client-cVersion>\r
     <signalwire-client-cBuildNumber>1</signalwire-client-cBuildNumber>\r
   </PropertyGroup>\r
   <PropertyGroup>\r

diff --git a/w32/signalwire-client-c.props b/w32/signalwire-client-c.props
index df82dff00e98e0d9fa0bab510f76f2b1ce3b27b6..4dd691717daa9879e93bdc4fd0b8c4119fa21c6f 100644 (file)
--- a/w32/signalwire-client-c.props
+++ b/w32/signalwire-client-c.props
@@ -34,7 +34,7 @@
 \r
   <Target Name="signalwire-client-cBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
       <DownloadPackageTask \r
-           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"\r
+           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"\r
            expectfileordirectory="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\signalwire_client2.dll" \r
            outputfolder=""\r
            outputfilename="" \r
@@ -43,7 +43,7 @@
   </Target> \r
   <Target Name="signalwire-client-cHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
       <DownloadPackageTask \r
-           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"\r
+           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"\r
            expectfileordirectory="$(signalwire-client-cDir)\include\signalwire-client-c\client.h" \r
            outputfolder=""\r
            outputfilename="" \r