Skip to content

Commit 973845b

Browse files
authored
Merge pull request #874 from puppetlabs/revert-873-PA-6507-gem-update-rexml
Revert "(PA-6507) Update gem rexml from default to 3.2.9 for CVE-2024-35176"
2 parents 0358325 + 7ef63f8 commit 973845b

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

configs/components/rubygem-rexml.rb

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
component 'rubygem-rexml' do |pkg, settings, platform|
2-
pkg.version '3.2.9'
3-
pkg.md5sum '73fcf4d686d68dafbca57f941097ebf0'
2+
pkg.version '3.2.6'
3+
pkg.md5sum 'a57288ae5afed07dd08c9f1302da7b25'
44

5-
# If the platform is solaris with sparc architecture in agent-runtime-7.x project, we want to gem install rexml
6-
# ignoring the dependencies, this is because the pl-ruby version used in these platforms is ancient so it gets
7-
# confused when installing rexml. It tries to install rexml's dependency 'strscan' by building native extensions
8-
# but fails. We can ignore insalling that since strscan is already shipped with ruby 2.7.8 as its default gem.
9-
if platform.name =~ /solaris-(10|11)-sparc/ && settings[:ruby_version].to_i < 3
10-
settings["#{pkg.get_name}_gem_install_options".to_sym] = "--ignore-dependencies"
11-
end
12-
135
instance_eval File.read('configs/components/_base-rubygem.rb')
146
end

configs/projects/_shared-agent-components.rb

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
proj.component 'rubygem-gettext'
6262
proj.component 'rubygem-fast_gettext'
6363
proj.component 'rubygem-ffi'
64-
proj.component 'rubygem-rexml'
6564

6665
if platform.is_windows? || platform.is_solaris? || platform.is_aix?
6766
proj.component 'rubygem-minitar'

0 commit comments

Comments
 (0)