Skip to content

Use openssl to 3.4.0 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andywolk merged 1 commit into from
Jan 22, 2025
Merged

Use openssl to 3.4.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ curl-7.*
curl-7.*/
openssl-1.*
openssl-1.*/
openssl-3.*
openssl-3.*/
zlib-1.*
zlib-1.*/
7za*.exe
Expand Down
4 changes: 2 additions & 2 deletions buildpackages.task
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions curl-version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
</ImportGroup>
<PropertyGroup Label="UserMacros">
<curlVersion>7.88.0</curlVersion>
<curlBuildNumber>1</curlBuildNumber>
<curlLibDir>$(BaseDir)curl-$(curlVersion)</curlLibDir>
</PropertyGroup>
<PropertyGroup>
Expand Down
16 changes: 16 additions & 0 deletions downloadpackage.task
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion openssl-version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down