Skip to content

Commit

Permalink
Merge pull request #874 from puppetlabs/revert-873-PA-6507-gem-update…
Browse files Browse the repository at this point in the history
…-rexml

Revert "(PA-6507) Update gem rexml from default to 3.2.9 for CVE-2024-35176"
  • Loading branch information
mhashizume committed Jul 16, 2024
2 parents 0358325 + 7ef63f8 commit 973845b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
12 changes: 2 additions & 10 deletions configs/components/rubygem-rexml.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
component 'rubygem-rexml' do |pkg, settings, platform|
pkg.version '3.2.9'
pkg.md5sum '73fcf4d686d68dafbca57f941097ebf0'
pkg.version '3.2.6'
pkg.md5sum 'a57288ae5afed07dd08c9f1302da7b25'

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

instance_eval File.read('configs/components/_base-rubygem.rb')
end
1 change: 0 additions & 1 deletion configs/projects/_shared-agent-components.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
proj.component 'rubygem-gettext'
proj.component 'rubygem-fast_gettext'
proj.component 'rubygem-ffi'
proj.component 'rubygem-rexml'

if platform.is_windows? || platform.is_solaris? || platform.is_aix?
proj.component 'rubygem-minitar'
Expand Down

0 comments on commit 973845b

Please sign in to comment.