diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2017-11-28 23:56:40 -0500 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2017-11-28 23:56:40 -0500 |
| commit | 0722c2221576b5e6575d1298326e382da701c730 (patch) | |
| tree | ca9da39c3e23096042fa961fec03dfe7306237a6 | |
| parent | 2c0122af6e307720b32096d92c402f10e9ea2c20 (diff) | |
| download | chef-btm/chef-12-travis.tar.gz | |
Update Omnibus dependencies for security fixesbtm/chef-12-travis
Signed-off-by: Bryan McLellan <btm@loftninjas.org>
| -rw-r--r-- | omnibus_overrides.rb | 12 | ||||
| -rw-r--r-- | version_policy.rb | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index b02d2384db..ffee796a3c 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,13 +1,13 @@ # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead. override :rubygems, version: "2.6.14" -override :bundler, version: "1.12.5" +override :bundler, version: "1.16.0" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" -override "liblzma", version: "5.2.2" +override "liblzma", version: "5.2.3" override "libtool", version: "2.4.2" -override "libxml2", version: "2.9.4" -override "libxslt", version: "1.1.29" -override "libyaml", version: "0.1.6" +override "libxml2", version: "2.9.5" +override "libxslt", version: "1.1.30" +override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "pkg-config-lite", version: "0.28-1" @@ -16,4 +16,4 @@ 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.2j" +override "openssl", version: "1.0.2m" diff --git a/version_policy.rb b/version_policy.rb index 38e956ca32..5083428ddc 100644 --- a/version_policy.rb +++ b/version_policy.rb @@ -20,7 +20,7 @@ OMNIBUS_OVERRIDES = { # Lower level library pins ## according to comment in omnibus-sw, latest versions don't work on solaris # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23 - :bundler => "1.12.5", # until we figure out how to work with 1.13.0 + :bundler => "1.16.0", "libffi" => "3.2.1", "libiconv" => "1.15", "liblzma" => "5.2.3", @@ -33,7 +33,7 @@ OMNIBUS_OVERRIDES = { "makedepend" => "1.0.5", "ncurses" => "5.9", "pkg-config-lite" => "0.28-1", - "ruby" => "2.3.1", + "ruby" => "2.3.5", # Leave dev-kit pinned to 4.5 on 32-bit, because 4.7 is 20MB larger and we don't want # to unnecessarily make the client any fatter. (Since it's different between # 32 and 64, we have to do it in the project file still.) @@ -45,7 +45,7 @@ OMNIBUS_OVERRIDES = { ## These can float as they are frequently updated in a way that works for us #override "cacerts" =>"???", - "openssl" => "1.0.2l", + "openssl" => "1.0.2m", } # |