summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-04-02 13:53:53 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2017-04-02 13:53:53 -0700
commit93bef87ba9de87a70a86bbcf120b62791a283a29 (patch)
treeee9eb95f5b44c7cccc951858ff620ab6a49f012e
parent40b8dbcc1be0454873b79b04537baa074c221361 (diff)
downloadchef-93bef87ba9de87a70a86bbcf120b62791a283a29.tar.gz
Chef-13: remove iconv from the chef build
pulls in chef/omnibus-software#806 and removes iconv from both nokogiri and ruby. ruby hasn't needed iconv since 1.9.x and everyone should be using the Encoding library by now. nokogiri will lose support for things like Shift-JIS inside of XML but UTF-8, UTF-16LE/BE, ISO-8851-1(Latin-1), ASCII and "HTML" encoding are all supported by nokogiri natively. if users need more they need to be maintaining their own nokogiri installs and accept the maintenance costs themselves. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--omnibus/Gemfile.lock12
-rw-r--r--omnibus/config/software/chef.rb1
-rw-r--r--omnibus/files/chef-gem/build-chef-gem.rb2
3 files changed, 7 insertions, 8 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 32cdf871f2..a3441fa454 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -25,7 +25,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: bc08deef668865990bde3a0f0dc1ef3c3f5be735
+ revision: fee8dea479123a3b19b14244eeee0f8e36579107
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
@@ -38,13 +38,13 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
artifactory (2.8.1)
awesome_print (1.7.0)
- aws-sdk (2.8.14)
- aws-sdk-resources (= 2.8.14)
- aws-sdk-core (2.8.14)
+ aws-sdk (2.9.1)
+ aws-sdk-resources (= 2.9.1)
+ aws-sdk-core (2.9.1)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.8.14)
- aws-sdk-core (= 2.8.14)
+ aws-sdk-resources (2.9.1)
+ aws-sdk-core (= 2.9.1)
aws-sigv4 (1.0.0)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
diff --git a/omnibus/config/software/chef.rb b/omnibus/config/software/chef.rb
index c0af403b20..6130b3d74c 100644
--- a/omnibus/config/software/chef.rb
+++ b/omnibus/config/software/chef.rb
@@ -26,7 +26,6 @@ end
# For nokogiri
dependency "libxml2"
dependency "libxslt"
-dependency "libiconv"
dependency "liblzma"
dependency "zlib"
diff --git a/omnibus/files/chef-gem/build-chef-gem.rb b/omnibus/files/chef-gem/build-chef-gem.rb
index 9e5bf9b996..c9aaaada1d 100644
--- a/omnibus/files/chef-gem/build-chef-gem.rb
+++ b/omnibus/files/chef-gem/build-chef-gem.rb
@@ -99,7 +99,7 @@ module BuildChefGem
--with-xml2-include=#{Shellwords.escape("#{install_dir}/embedded/include/libxml2")}
--with-xslt-lib=#{Shellwords.escape("#{install_dir}/embedded/lib")}
--with-xslt-include=#{Shellwords.escape("#{install_dir}/embedded/include/libxslt")}
- --with-iconv-dir=#{Shellwords.escape("#{install_dir}/embedded")}
+ --without-iconv-dir
--with-zlib-dir=#{Shellwords.escape("#{install_dir}/embedded")}
}.join(" "),
}