Skip to content
This repository has been archived by the owner on Jan 15, 2025. It is now read-only.

(PA-7105) Update Ruby 3.2.5 to 3.2.6 #931

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The file name of the ruby component must match the ruby_version
component 'ruby-3.2.5' do |pkg, settings, platform|
pkg.version '3.2.5'
pkg.sha256sum 'ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16'
component 'ruby-3.2.6' do |pkg, settings, platform|
pkg.version '3.2.6'
pkg.sha256sum 'd9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370'

# rbconfig-update is used to munge rbconfigs after the fact.
pkg.add_source("file://resources/files/ruby/rbconfig-update.rb")
Expand Down
5 changes: 0 additions & 5 deletions configs/projects/_shared-agent-components.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@
proj.component 'rubygem-fast_gettext'
proj.component 'rubygem-ffi'

# We add rexml explicitly in here because even though ruby 3 ships with rexml as its default gem, the version
# of rexml it ships with contains CVE-2024-41946, CVE-2024-41123, CVE-2024-35176 and CVE-2024-39908.
# So, we add it here to update to a higher version
# free from the CVEs.
proj.component 'rubygem-rexml'

if platform.is_windows? || platform.is_solaris? || platform.is_aix?
proj.component 'rubygem-minitar'
Expand Down
6 changes: 6 additions & 0 deletions configs/projects/agent-runtime-7.x.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@
proj.component 'rubygem-thor'
proj.component 'rubygem-scanf'

# We add rexml explicitly in here because even though ruby 3 ships with rexml as its default gem, the version
# of rexml it ships with contains CVE-2024-41946, CVE-2024-41123, CVE-2024-35176 and CVE-2024-39908.
# So, we add it here to update to a higher version
# free from the CVEs.
proj.component 'rubygem-rexml'

if platform.is_linux?
proj.component "virt-what"
proj.component "dmidecode" unless platform.architecture =~ /ppc64/
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/agent-runtime-main.rb
Original file line number Diff line number Diff line change
@@ -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.5'
proj.setting :ruby_version, '3.2.6'
proj.setting :rubygem_deep_merge_version, '1.2.2'
proj.setting :rubygem_highline_version, '3.0.1'
proj.setting :rubygem_hocon_version, '1.4.0'
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/bolt-runtime.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project 'bolt-runtime' do |proj|
# Used in component configurations to conditionally include dependencies
proj.setting(:runtime_project, 'bolt')
proj.setting(:ruby_version, '3.2.5')
proj.setting(:ruby_version, '3.2.6')
proj.setting(:openssl_version, '3.0')
# Legacy algos must be enabled in OpenSSL >= 3.0 for Bolt's WinRM transport to work.
proj.setting(:use_legacy_openssl_algos, true)
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/pdk-runtime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
proj.setting(:includedir, File.join(proj.prefix, 'include'))
proj.setting(:bindir, File.join(proj.prefix, 'bin'))

proj.setting(:ruby_version, '3.2.5')
proj.setting(:ruby_version, '3.2.6')
proj.setting(:ruby_major_version, 3)
proj.setting(:ruby_api, '3.2.0')

Expand Down
2 changes: 1 addition & 1 deletion configs/projects/pe-bolt-server-runtime-2023.8.x.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Once we are no longer using ruby 2.5 we can update.
proj.setting(:no_doc, true)

proj.setting(:ruby_version, '3.2.5')
proj.setting(:ruby_version, '3.2.6')
proj.setting(:openssl_version, '3.0')

# We enable legacy algorithms for winrm transport. Currently the winrm transport
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/pe-bolt-server-runtime-main.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Once we are no longer using ruby 2.5 we can update.
proj.setting(:no_doc, true)

proj.setting(:ruby_version, '3.2.5')
proj.setting(:ruby_version, '3.2.6')
proj.setting(:openssl_version, '3.0')

# We enable legacy algorithms for winrm transport. Currently the winrm transport
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/pe-installer-runtime-2023.8.x.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project 'pe-installer-runtime-2023.8.x' do |proj|
proj.setting(:ruby_version, '3.2.5')
proj.setting(:ruby_version, '3.2.6')
proj.setting(:openssl_version, '3.0')
# NLTM uses MD4 unconditionally in its protocol, so legacy algos must be
# enabled in OpenSSL >= 3.0 for Bolt's WinRM transport to work.
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/pe-installer-runtime-main.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project 'pe-installer-runtime-main' do |proj|
proj.setting(:ruby_version, '3.2.5')
proj.setting(:ruby_version, '3.2.6')
proj.setting(:openssl_version, '3.0')
# NLTM uses MD4 unconditionally in its protocol, so legacy algos must be
# enabled in OpenSSL >= 3.0 for Bolt's WinRM transport to work.
Expand Down