Skip to content
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

(PA-6131) Bump openssl version #807

Closed
wants to merge 1 commit into from
Closed

(PA-6131) Bump openssl version #807

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
6 changes: 4 additions & 2 deletions configs/components/openssl-3.0.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component 'openssl' do |pkg, settings, platform|
pkg.version '3.0.12'
pkg.sha256sum 'f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61'
pkg.version '3.0.13'
pkg.sha256sum '88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313'
pkg.url "https://openssl.org/source/openssl-#{pkg.get_version}.tar.gz"
pkg.mirror "#{settings[:buildsources_url]}/openssl-#{pkg.get_version}.tar.gz"

Expand All @@ -27,6 +27,8 @@
pkg.environment 'CYGWIN', settings[:cygwin]
pkg.environment 'MAKE', platform[:make]

pkg.apply_patch 'resources/patches/openssl/openssl-3.0.13-create-dir-win.patch'

target = platform.architecture == 'x64' ? 'mingw64' : 'mingw'
# elsif platform.is_cross_compiled_linux?
# pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH)"
Expand Down
14 changes: 14 additions & 0 deletions resources/patches/openssl/openssl-3.0.13-create-dir-win.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/Configure b/Configure
index 84cc409464..bdf4f3c460 100755
--- a/Configure
+++ b/Configure
@@ -3409,7 +3409,8 @@ sub absolutedir {
# We use realpath() on Unix, since no other will properly clean out
# a directory spec.
use Cwd qw/realpath/;
-
+
+ mkdir $dir unless -d $dir;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works around the issue, but it seems less than ideal to create a directory as a side effect of calling absolutedir. It looks like this issue has been fixed upstream already and backported to the 3.0.x branch openssl/openssl@7b3eda5 I'm thinking we should pull in that patch instead.

return realpath($dir);
}

Loading