Merge pull request #2 from freeswitch/openssl340

Use openssl to 3.4.0
freeswitch · Jan 22, 2025 · 4e6ef50 · 4e6ef50
2 parents 33e4de2 + 40b5e0a
commit 4e6ef50
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,8 @@ curl-7.*
 curl-7.*/
 openssl-1.*
 openssl-1.*/
+openssl-3.*
+openssl-3.*/
 zlib-1.*
 zlib-1.*/
 7za*.exe

diff --git a/buildpackages.task b/buildpackages.task
@@ -61,7 +61,7 @@ using System.Diagnostics;
                     File.Copy(from_folder + @"\include\curl\" + f, package_root + @"\include\curl\" + f);
                 }
 
-                ZipFile.CreateFromDirectory(@"$(BaseDir)out\packages\" + package + @"-headers\", @"$(BaseDir)out\" + package + @"-headers.zip".ToLower(), CompressionLevel.Optimal, false);
+                ZipFile.CreateFromDirectory(@"$(BaseDir)out\packages\" + package + @"-headers\", @"$(BaseDir)out\" + package + @"_$(curlBuildNumber)" + @"-headers.zip".ToLower(), CompressionLevel.Optimal, false);
             }
 
             package_root = @"$(BaseDir)out\packages\" + package + @"-binaries-$(Platform)-$(Configuration)\" + package;
@@ -77,7 +77,7 @@ using System.Diagnostics;
                     File.Copy(from_folder + @"build-$(Platform)\lib\$(Configuration)\libcurl.lib", package_root + @"\binaries\$(Platform)\$(Configuration)\curl.lib");
                 }
 
-                ZipFile.CreateFromDirectory(@"$(BaseDir)out\packages\" + package + @"-binaries-$(Platform)-$(Configuration)\", @"$(BaseDir)out\" + package + @"-binaries-$(Platform)-$(Configuration).zip".ToLower(), CompressionLevel.Optimal, false);
+                ZipFile.CreateFromDirectory(@"$(BaseDir)out\packages\" + package + @"-binaries-$(Platform)-$(Configuration)\", @"$(BaseDir)out\" + package + @"_$(curlBuildNumber)" + @"-binaries-$(Platform)-$(Configuration).zip".ToLower(), CompressionLevel.Optimal, false);
             }
 
             return true;

diff --git a/curl-version.props b/curl-version.props
@@ -6,6 +6,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <curlVersion>7.88.0</curlVersion>
+    <curlBuildNumber>1</curlBuildNumber>
     <curlLibDir>$(BaseDir)curl-$(curlVersion)</curlLibDir>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/downloadpackage.task b/downloadpackage.task
@@ -101,6 +101,22 @@ using System.Diagnostics;
                     string urifilename = Path.GetFileName(uri.LocalPath);
                     string output = Path.Combine(outputfolder ?? librarypath, (outputfilename ?? urifilename));
 
+                    string cachedir = Environment.GetEnvironmentVariable("FreeSWITCHBuildCachePath") ?? "";
+                    string cached_file = cachedir != "" ? Path.Combine(cachedir, (outputfilename ?? urifilename)) : "";
+
+                    if (cached_file != "" && File.Exists(cached_file)) {
+                        Log.LogMessage(MessageImportance.High,
+                                            "Found package in cache \"" + cached_file + "\".");
+
+                        if (File.Exists(output))
+                        {
+                             Log.LogMessage(MessageImportance.High,
+                                      "Deleting previously downloaded file " + output + " for package \"" + package + "\".");
+                             File.Delete(output);
+                        }
+
+                        File.Copy(cached_file, output); 
+                    } else
                     //if (!File.Exists(output)) // Uncomment to skip download if exists
                     {
                         var syncObject = new State

diff --git a/openssl-version.props b/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)openssl-$(OpenSSLVersion)</OpenSSLLibDir>
   </PropertyGroup>
   <PropertyGroup>