Merge pull request #5014 from chef/msys2

Updating omnibus dependencies to take advantage of new msys2 toolchain

11 files changed, 86 insertions, 81 deletions

diff --git a/.travis.yml b/.travis.yml
index b81c538737..d7c2f7ec4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,9 @@ matrix:
   - env:
       AUDIT_CHECK: 1
     rvm: 2.1
-    script: bundle exec bundle-audit check --update
+    # TODO stop ignoring nokogiri CVE when we update to 1.6.8
+    # script: bundle exec bundle-audit check --update
+    script: bundle exec bundle-audit check --update --ignore CVE-2015-8806
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
   #
diff --git a/Gemfile b/Gemfile
index 40d608e66b..91a49678af 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,8 +20,9 @@ gem "cheffish"
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
-  gem "nokogiri"
+  gem "nokogiri", "= 1.6.7.2"
 end
+
 group(:omnibus_package, :pry) do
   gem "pry"
   gem "pry-byebug"
@@ -78,7 +79,7 @@ end
 
 group(:travis) do
   # See `bundler-audit` in .travis.yml
-  gem "bundler-audit", git: "https://github.com/rubysec/bundler-audit.git", ref: "4e32fca"
+  gem "bundler-audit", git: "https://github.com/rubysec/bundler-audit.git"
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
diff --git a/Gemfile.lock b/Gemfile.lock
index 5cd0539227..a6dcacd76c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,9 @@ GIT
 
 GIT
   remote: https://github.com/rubysec/bundler-audit.git
-  revision: 4e32fca89d75f0e249671431ff38aadc02bfb28b
-  ref: 4e32fca
+  revision: 2c876da51beeee3b535c4524d3eabd0f6a067113
   specs:
-    bundler-audit (0.4.0)
+    bundler-audit (0.5.0)
       bundler (~> 1.2)
       thor (~> 0.18)
 
@@ -100,12 +99,12 @@ GEM
       mixlib-cli (~> 1.4)
     artifactory (2.3.2)
     ast (2.3.0)
-    aws-sdk (2.3.13)
-      aws-sdk-resources (= 2.3.13)
-    aws-sdk-core (2.3.13)
+    aws-sdk (2.3.14)
+      aws-sdk-resources (= 2.3.14)
+    aws-sdk-core (2.3.14)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.13)
-      aws-sdk-core (= 2.3.13)
+    aws-sdk-resources (2.3.14)
+      aws-sdk-core (= 2.3.14)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -216,7 +215,7 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.0.0)
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-cli (1.6.0)
@@ -246,12 +245,10 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     netrc (0.11.0)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    nokogiri (1.6.8-x86-mingw32)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.7.2-x86-mingw32)
+      mini_portile2 (~> 2.0.0.rc2)
     nori (2.6.0)
     oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
@@ -275,7 +272,6 @@ GEM
       wmi-lite (~> 1.0)
     parser (2.3.1.2)
       ast (~> 2.2)
-    pkg-config (1.1.7)
     plist (3.2.0)
     poise (2.7.0)
       halite (~> 1.0)
@@ -297,7 +293,7 @@ GEM
       pry (>= 0.9.11)
     rack (1.6.4)
     rainbow (2.1.0)
-    rake (11.1.2)
+    rake (11.2.2)
     rb-readline (0.5.3)
     retryable (2.0.3)
     rspec (3.4.0)
@@ -416,7 +412,7 @@ DEPENDENCIES
   halite
   knife-windows
   netrc
-  nokogiri
+  nokogiri (= 1.6.7.2)
   octokit
   poise
   pry
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 840e1a49c4..6abf73932f 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,13 +11,13 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.3.2)
-    aws-sdk (2.3.9)
-      aws-sdk-resources (= 2.3.9)
-    aws-sdk-core (2.3.9)
+    aws-sdk (2.3.14)
+      aws-sdk-resources (= 2.3.14)
+    aws-sdk-core (2.3.14)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.9)
-      aws-sdk-core (= 2.3.9)
-    berkshelf (4.3.3)
+    aws-sdk-resources (2.3.14)
+      aws-sdk-core (= 2.3.14)
+    berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)
@@ -29,6 +29,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
+      mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 4.5)
@@ -52,7 +53,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.10.24)
+    chef-config (12.11.18)
       fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
@@ -75,17 +76,17 @@ GEM
     hashie (3.4.4)
     hitimes (1.2.4)
     httpclient (2.7.2)
-    inspec (0.22.1)
+    inspec (0.26.0)
       hashie (~> 3.4)
       json (~> 1.8)
       method_source (~> 0.8)
       pry (~> 0)
-      r-train (~> 0.12)
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
       thor (~> 0.19)
+      train (~> 0.13)
     jmespath (1.2.4)
       json_pure (>= 1.8.1)
     json (1.8.3)
@@ -107,13 +108,11 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-authentication (1.4.0)
+    mixlib-archive (0.1.0)
+    mixlib-authentication (1.4.1)
       mixlib-log
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.12)
+    mixlib-install (1.0.13)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -134,14 +133,6 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    r-train (0.12.1)
-      docker-api (~> 1.26)
-      json (~> 1.8)
-      mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 4.0)
-      winrm (~> 1.6)
-      winrm-fs (~> 0.3)
     rainbow (2.1.0)
     retryable (2.0.3)
     ridley (4.5.1)
@@ -189,7 +180,7 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    test-kitchen (1.9.0)
+    test-kitchen (1.9.2)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -199,6 +190,14 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
+    train (0.13.1)
+      docker-api (~> 1.26)
+      json (~> 1.8)
+      mixlib-shellout (~> 2.0)
+      net-scp (~> 1.2)
+      net-ssh (>= 2.9, < 4.0)
+      winrm (~> 1.6)
+      winrm-fs (~> 0.3)
     varia_model (0.4.1)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 4.0.0)
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index 31e49b3e18..407b685236 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -5,4 +5,4 @@ cookbook "base", path: "cookbooks/base"
 
 cookbook "php", "~> 1.5.0"
 
-cookbook "resolver", github: "chef-cookbooks/resolver", branch: "lcg/docker"
+cookbook "resolver", github: "chef-cookbooks/resolver"
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index f4a9de89e2..d24f5d7bfe 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -4,8 +4,7 @@ DEPENDENCIES
   php (~> 1.5.0)
   resolver
     git: git://github.com/chef-cookbooks/resolver.git
-    revision: dd65ab8e2346cc0739c13682c74868f5b939b06a
-    branch: lcg/docker
+    revision: 8bf9034dabc47d29a07870e4059c32114f2c820a
   webapp
     path: cookbooks/webapp
 
diff --git a/omnibus/.kitchen.yml b/omnibus/.kitchen.yml
index 90283f8afb..ed060a8ef8 100644
--- a/omnibus/.kitchen.yml
+++ b/omnibus/.kitchen.yml
@@ -24,6 +24,10 @@ provisioner:
   attributes:
     vagrant:
       this_key_exists_so_we_have_a_vagrant_key: true
+    omnibus:
+      build_user:          vagrant
+      build_user_group:    vagrant
+      build_user_password: vagrant
   chef_omnibus_install_options: -P angrychef
   chef_omnibus_root: /opt/angrychef
 
@@ -91,12 +95,30 @@ platforms:
       # at `C:\vagrant\code\chef`
       - ['../..', '/vagrant/code']
     provisioner:
+      attributes:
+        omnibus:
+          build_user:          vagrant
+          build_user_group:    Administrators
+          build_user_password: vagrant
+      chef_omnibus_root: /opscode/angrychef
+  # By adding an `i386` to the name the Omnibus cookbook's `load-omnibus-toolchain.bat`
+  # will load the 32-bit version of the MinGW toolchain.
+  - name: windows-2012r2-standard-i386
+    driver:
+      box: chef/windows-server-2012r2-standard # private
+      synced_folders:
+      # We have to mount this repos enclosing folder as the Omnibus build
+      # gets cranky if the mounted ChefDK source folder is a symlink. This
+      # mounts at `C:\vagrant\code` and the ChefDK source folder is available
+      # at `C:\vagrant\code\chef-dk`
+      - ['../..', '/vagrant/code']
+    provisioner:
+      attributes:
+        omnibus:
+          build_user:          vagrant
+          build_user_group:    Administrators
+          build_user_password: vagrant
       chef_omnibus_root: /opscode/angrychef
-
-attribute_defaults: &attribute_defaults
-  build_user:          vagrant
-  build_user_group:    vagrant
-  build_user_password: vagrant
 
 suites:
   # - name: angrychef
@@ -109,7 +131,6 @@ suites:
   - name: chef
     attributes:
       omnibus:
-        <<: *attribute_defaults
         install_dir: /opt/chef
     run_list:
       - omnibus::default
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f165fa5d12..8e3011984e 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,13 +1,13 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: 2f04eff7dbec575cb2985d846dacd02a422cd36f
+  revision: 60eea7a3971d764fca2c7104a8aa46dff4261625
   specs:
     omnibus-software (4.0.0)
       omnibus (>= 5.2.0)
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: a36e70caedceadfcf0d85e2adef44ba0218a60a6
+  revision: 2a597277f1a5e13901d116ef852611fe88f6b76b
   specs:
     omnibus (5.4.0)
       aws-sdk (~> 2)
@@ -37,13 +37,13 @@ GEM
   specs:
     addressable (2.3.8)
     artifactory (2.3.2)
-    awesome_print (1.6.1)
-    aws-sdk (2.3.9)
-      aws-sdk-resources (= 2.3.9)
-    aws-sdk-core (2.3.9)
+    awesome_print (1.7.0)
+    aws-sdk (2.3.14)
+      aws-sdk-resources (= 2.3.14)
+    aws-sdk-core (2.3.14)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.9)
-      aws-sdk-core (= 2.3.9)
+    aws-sdk-resources (2.3.14)
+      aws-sdk-core (= 2.3.14)
     berkshelf (3.3.0)
       addressable (~> 2.3.4)
       berkshelf-api-client (~> 1.2)
@@ -75,13 +75,13 @@ GEM
     buff-shell_out (0.2.0)
       buff-ruby_engine (~> 0.1.0)
     builder (3.2.2)
-    byebug (9.0.4)
+    byebug (9.0.5)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.10.24)
+    chef-config (12.11.18)
       fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
@@ -93,7 +93,6 @@ GEM
     dep_selector (1.0.3)
       dep-selector-libgecode (~> 1.0)
       ffi (~> 1.9)
-    diff-lcs (1.2.5)
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -125,14 +124,11 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-authentication (1.4.0)
+    mixlib-authentication (1.4.1)
       mixlib-log
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
     mixlib-cli (1.6.0)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.12)
+    mixlib-install (1.0.13)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -194,15 +190,6 @@ GEM
       retryable (~> 2.0)
       semverse (~> 1.1)
       varia_model (~> 0.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
     ruby-progressbar (1.8.1)
     rubyntlm (0.6.0)
     rubyzip (1.2.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index d971dd99fa..2f22da0511 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
 override :rubygems, version: "2.6.4"
-override :bundler, version: "1.11.2"
+override :bundler, version: "1.12.5"
 override "libffi", version: "3.2.1"
 override "libiconv", version: "1.14"
 override "liblzma", version: "5.2.2"
diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb
index eb4bb1f44f..0b216f8e52 100644
--- a/tasks/dependencies.rb
+++ b/tasks/dependencies.rb
@@ -85,13 +85,11 @@ namespace :dependencies do
                                                      other_platforms: false, leave_frozen: false
   gemfile_lock_task :update_kitchen_tests_gemfile_lock, dirs: %w{
     kitchen-tests
-    kitchen-tests/test/integration/webapp/serverspec
   }
   berksfile_lock_task :update_kitchen_tests_berksfile_lock, dirs: %w{
     kitchen-tests
     kitchen-tests/cookbooks/audit_test
   }
-  # kitchen-tests/cookbooks/webapp isn't solving right now ....
 
   desc "Update omnibus overrides, including versions in version_policy.rb and latest version of gems: #{OMNIBUS_RUBYGEMS_AT_LATEST_VERSION.keys}."
   task :update_omnibus_overrides do |t, rake_args|
diff --git a/version_policy.rb b/version_policy.rb
index 8d450010d3..128b52d0ba 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -73,6 +73,7 @@ OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = {
 # slop - expected to disappear with new pry release
 # stove - halite pins to ~> 3.2 in 1.2.1
 # rubocop - chef-style pins to 0.39.0 in 0.3.1
+# TODO remove nokogiri when we can update to 1.6.8
 #
 ACCEPTABLE_OUTDATED_GEMS = %w{
   gherkin
@@ -81,6 +82,7 @@ ACCEPTABLE_OUTDATED_GEMS = %w{
   slop
   stove
   rubocop
+  nokogiri
 }
 
 #