diff options
-rw-r--r-- | omnibus_overrides.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index c25e2c65c8..b4e7d73904 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -5,9 +5,9 @@ # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock override :rubygems, version: "3.0.3" # rubygems ships its own bundler which may differ from bundler defined below and then we get double bundler which results in performance issues / CLI warnings. Make sure these versions match before bumping either. override :bundler, version: "1.17.2" # currently pinned to what ships in Ruby to prevent double bundler -override "libarchive", version: "3.4.3" -override "libffi", version: "3.2.1" -override "libiconv", version: "1.15" +override "libarchive", version: "3.5.0" +override "libffi", version: "3.3" +override "libiconv", version: "1.16" override "liblzma", version: "5.2.5" override "libtool", version: "2.4.2" override "libxml2", version: "2.9.10" @@ -16,7 +16,7 @@ override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "nokogiri", version: "1.10.10" -override "openssl", version: "1.0.2w" +override "openssl", version: "1.0.2x" override "pkg-config-lite", version: "0.28-1" override "ruby", version: "2.6.6" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" @@ -29,5 +29,5 @@ override "zlib", version: "1.2.11" # is in master, which won't match what's in the Gemfile.lock and used by the chef # definition. This pin will ensure that ohai and chef-client commands use the # same (released) version of ohai. -gemfile_lock = File.join(File.expand_path(File.dirname(__FILE__)), "Gemfile.lock") +gemfile_lock = File.join(File.expand_path(__dir__), "Gemfile.lock") override "ohai", version: "#{::File.readlines(gemfile_lock).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; "v" + $1}" # rubocop: disable Layout/SpaceInsideStringInterpolation |