diff options
| author | Jaymala Sinha <jsinha@chef.io> | 2017-07-28 16:46:54 -0400 |
|---|---|---|
| committer | Jaymala Sinha <jsinha@chef.io> | 2017-07-31 10:00:19 -0400 |
| commit | 9c70f4d5a2ca5e7d47693d5ab745d92a36b892b5 (patch) | |
| tree | 88341ff168c3d477db036d3a80531ee7e2b18e03 | |
| parent | 6489fe07a93c49d96ca07c42af47c33f5523c379 (diff) | |
| download | chef-jsinha/BEN-180-chef-12.tar.gz | |
Update libiconv versionjsinha/BEN-180-chef-12
Signed-off-by: Jaymala Sinha <jsinha@chef.io>
| -rw-r--r-- | omnibus_overrides.rb | 2 | ||||
| -rw-r--r-- | version_policy.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 8ea3f3be48..8c97f16d8a 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -2,7 +2,7 @@ override :rubygems, version: "2.6.10" override :bundler, version: "1.12.5" override "libffi", version: "3.2.1" -override "libiconv", version: "1.14" +override "libiconv", version: "1.15" override "liblzma", version: "5.2.2" override "libtool", version: "2.4.2" override "libxml2", version: "2.9.4" diff --git a/version_policy.rb b/version_policy.rb index 85c29a760b..34336f7296 100644 --- a/version_policy.rb +++ b/version_policy.rb @@ -22,7 +22,7 @@ OMNIBUS_OVERRIDES = { # 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 "libffi" => "3.2.1", - "libiconv" => "1.14", + "libiconv" => "1.15", "liblzma" => "5.2.2", ## according to comment in omnibus-sw, the very latest versions don't work on solaris # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23 |