summaryrefslogtreecommitdiff
path: root/omnibus_overrides.rb
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2019-09-04 12:15:44 -0700
committerTim Smith <tsmith84@gmail.com>2019-09-04 12:15:44 -0700
commit4850ab435e2243e905091021eb645034967369e7 (patch)
tree80c0a6862799f7d9e80b82c8d261c504f42a2db2 /omnibus_overrides.rb
parentd32c038c7b6401bda4a357c2182a9414f4b39860 (diff)
downloadchef-4850ab435e2243e905091021eb645034967369e7.tar.gz
Update libarchive to 3.4.0 and pin in omnibus_overrides.rb
May 18, 2019: Fixes for reading Android APK and JAR archives Apr 16, 2019: Support for non-recursive list and extract Apr 14, 2019: New tar option: --exclude-vcs Mar 27, 2019: Support for file and directory symlinks on Windows Mar 12, 2019: Important fixes for storing file attributes and flags Jan 20, 2019: Support for xz, lzma, ppmd8 and bzip2 decompression in ZIP files Oct 06, 2018: RAR 5.0 reader Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'omnibus_overrides.rb')
-rw-r--r--omnibus_overrides.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 96342de8db..1f33f9be1f 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -6,7 +6,7 @@
# 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 "nokogiri", version: "1.10.2"
+override "libarchive", version: "3.4.0"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.15"
override "liblzma", version: "5.2.4"
@@ -16,13 +16,14 @@ override "libxslt", version: "1.1.30"
override "libyaml", version: "0.1.7"
override "makedepend", version: "1.0.5"
override "ncurses", version: "5.9"
+override "nokogiri", version: "1.10.2"
+override "openssl", version: "1.0.2s"
override "pkg-config-lite", version: "0.28-1"
override "ruby", version: "2.6.3"
override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
override "util-macros", version: "1.19.0"
override "xproto", version: "7.0.28"
override "zlib", version: "1.2.11"
-override "openssl", version: "1.0.2s"
# we build both a chef and ohai omnibus-software defintion which create the
# chef-client and ohai binstubs. Out of the box the ohai definition uses whatever