(PA-6131) Bump openssl version

puppetlabs · Apr 3, 2024 · 4795f9d · 4795f9d
1 parent 68650ed
commit 4795f9d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/configs/components/openssl-3.0.rb b/configs/components/openssl-3.0.rb
@@ -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"
 
@@ -176,6 +176,7 @@
     # See https://github.com/openssl/openssl/issues/513
     # See https://github.com/mingw-w64/mingw-w64/commit/8da1aae7a7ff5bf996878dc8fe30a0e01e210e5a
     pkg.add_source("file://resources/patches/windows/FORCEINLINE-i686-w64-mingw32-winnt.h")
+    pkg.apply_patch 'resources/patches/openssl/openssl-3.0.13-create-dir-win.patch'
     build_commands << "#{platform.patch} --dir #{settings[:gcc_root]}/#{settings[:platform_triple]} --strip=2 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../FORCEINLINE-i686-w64-mingw32-winnt.h"
   end
 

diff --git a/resources/patches/openssl/openssl-3.0.13-create-dir-win.patch b/resources/patches/openssl/openssl-3.0.13-create-dir-win.patch
@@ -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;
+     return realpath($dir);
+ }
+