Merge pull request #783 from skyamgarp/PA-6051

(PA-6051) Bump Ruby to 3.2.3
puppetlabs · Jan 23, 2024 · 0103919 · 0103919
2 parents 2f16000 + 72fd75e
commit 0103919
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 91 deletions.
diff --git a/configs/components/ruby-3.2.2.rb → configs/components/ruby-3.2.3.rb b/configs/components/ruby-3.2.2.rb → configs/components/ruby-3.2.3.rb
@@ -1,7 +1,7 @@
 # The file name of the ruby component must match the ruby_version
-component 'ruby-3.2.2' do |pkg, settings, platform|
-  pkg.version '3.2.2'
-  pkg.sha256sum '96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc'
+component 'ruby-3.2.3' do |pkg, settings, platform|
+  pkg.version '3.2.3'
+  pkg.sha256sum 'af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba'
 
   # rbconfig-update is used to munge rbconfigs after the fact.
   pkg.add_source("file://resources/files/ruby/rbconfig-update.rb")
@@ -38,7 +38,6 @@
 
   base = 'resources/patches/ruby_32'
 
-  pkg.apply_patch "#{base}/uri-redos-cve-2023-36617.patch"
 
   if platform.is_cross_compiled?
     unless platform.is_macos?

diff --git a/configs/projects/agent-runtime-main.rb b/configs/projects/agent-runtime-main.rb
@@ -1,7 +1,7 @@
 project 'agent-runtime-main' do |proj|
 
   # Set preferred component versions if they differ from defaults:
-  proj.setting :ruby_version, '3.2.2'
+  proj.setting :ruby_version, '3.2.3'
   proj.setting :rubygem_deep_merge_version, '1.2.2'
   proj.setting :rubygem_hocon_version, '1.4.0'
 

diff --git a/configs/projects/pdk-runtime.rb b/configs/projects/pdk-runtime.rb
@@ -48,7 +48,7 @@
   proj.setting(:includedir, File.join(proj.prefix, 'include'))
   proj.setting(:bindir, File.join(proj.prefix, 'bin'))
 
-  proj.setting(:ruby_version, '3.2.2')
+  proj.setting(:ruby_version, '3.2.3')
   proj.setting(:ruby_major_version, 3)
   proj.setting(:ruby_api, '3.2.0')
 

diff --git a/configs/projects/pe-bolt-server-runtime-main.rb b/configs/projects/pe-bolt-server-runtime-main.rb
@@ -7,7 +7,7 @@
   # Once we are no longer using ruby 2.5 we can update.
   proj.setting(:no_doc, true)
 
-  proj.setting(:ruby_version, '3.2.2')
+  proj.setting(:ruby_version, '3.2.3')
   proj.setting(:openssl_version, '3.0')
 
   # We enable legacy algorithms for winrm transport. Currently the winrm transport

diff --git a/configs/projects/pe-installer-runtime-main.rb b/configs/projects/pe-installer-runtime-main.rb
@@ -1,7 +1,7 @@
 project 'pe-installer-runtime-main' do |proj|
   # Used in component configurations to conditionally include dependencies
   proj.setting(:runtime_project, 'pe-installer')
-  proj.setting(:ruby_version, '3.2.2')
+  proj.setting(:ruby_version, '3.2.3')
   proj.setting(:augeas_version, '1.14.1')
   proj.setting(:openssl_version, '3.0')
   # NLTM uses MD4 unconditionally in its protocol, so legacy algos must be

diff --git a/resources/patches/ruby_32/uri-redos-cve-2023-36617.patch b/resources/patches/ruby_32/uri-redos-cve-2023-36617.patch