Merge branch 'master' into maint/master/PA-4718_solaris-11-x86_64_upd…

…ates_for_ruby_3

configs/components/openssl-1.1.1.rb

@@ -1,6 +1,6 @@
 component 'openssl' do |pkg, settings, platform|
-  pkg.version '1.1.1t'
-  pkg.sha256sum '8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b'
+  pkg.version '1.1.1u'
+  pkg.sha256sum 'e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6'
   pkg.url "https://openssl.org/source/openssl-#{pkg.get_version}.tar.gz"
   pkg.mirror "#{settings[:buildsources_url]}/openssl-#{pkg.get_version}.tar.gz"
 
@@ -110,13 +110,6 @@
     end
   end
 
-  # OpenSSL 1.1.1q has a bug with a test not including a required library that caueses
-  # packing failures on macos. Probably safe to look at the 1.1.1r release to see if
-  # this can be removed.
-  if platform.is_macos?
-    pkg.apply_patch 'resources/patches/openssl/openssl_1.1.1q_fix_c_include.patch'
-  end
-
   # OpenSSL Configure doesn't honor CFLAGS or LDFLAGS as environment variables.
   # Instead, those should be passed to Configure at the end of its options, as
   # any unrecognized options are passed straight through to ${CC}. Defining

configs/components/openssl-3.0.rb

@@ -1,6 +1,6 @@
 component 'openssl' do |pkg, settings, platform|
-  pkg.version '3.0.8'
-  pkg.sha256sum '6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e'
+  pkg.version '3.0.9'
+  pkg.sha256sum 'eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90'
   pkg.url "https://openssl.org/source/openssl-#{pkg.get_version}.tar.gz"
   pkg.mirror "#{settings[:buildsources_url]}/openssl-#{pkg.get_version}.tar.gz"
 

configs/components/rubygem-hiera-eyaml.rb

@@ -1,6 +1,6 @@
 component 'rubygem-hiera-eyaml' do |pkg, settings, platform|
-  pkg.version '3.3.0'
-  pkg.md5sum '6f3eee8a30aa6c77736be2e640afafe9'
+  pkg.version '3.4.0'
+  pkg.sha256sum 'cdacb683dc5efefcae9bc668ab881f17ce5597cac1c0493aee7c4387c7c8ff54'
 
   instance_eval File.read('configs/components/_base-rubygem.rb')