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.

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-6051) Bump Ruby to 3.2.3 #783

Merged
merged 1 commit into from
Jan 23, 2024
Merged
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.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")
Expand Down Expand Up @@ -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?
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.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'

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 @@ -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')

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 @@ -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
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,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
Expand Down
83 changes: 0 additions & 83 deletions resources/patches/ruby_32/uri-redos-cve-2023-36617.patch

This file was deleted.

Loading