summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Oliveira <thiagoo@yahoo-inc.com>2016-10-12 11:58:52 -0700
committerThiago Oliveira <thiagoo@yahoo-inc.com>2016-10-13 18:58:31 -0700
commit2352eb3479f697e38a850a5b5dd2cfe74ef838f3 (patch)
tree85abe8ba9b6cf96c1b8f491982ca78c685e6b0e1
parent50a13cce536f071bffed2ac02bc05bf1a39ba013 (diff)
downloadchef-2352eb3479f697e38a850a5b5dd2cfe74ef838f3.tar.gz
update openssl to 1.0.2j to address vulnerabilities
Signed-off-by: Thiago Oliveira <thiagoo@yahoo-inc.com>
-rw-r--r--Gemfile.lock40
-rw-r--r--acceptance/Gemfile.lock16
-rw-r--r--kitchen-tests/Berksfile.lock15
-rw-r--r--kitchen-tests/Gemfile.lock21
-rw-r--r--omnibus/Gemfile.lock7
-rw-r--r--omnibus_overrides.rb4
-rw-r--r--version_policy.rb2
7 files changed, 54 insertions, 51 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 253ee5d314..02ec46e8e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chef-server
- revision: 6fde9680c6efdcd0792bec840b7fe7f6fbee790f
+ revision: 1a7d867ed8deb6097a55a704559dc3796d9e1444
specs:
oc-chef-pedant (2.2.0)
activesupport (>= 4.2.7.1, < 6.0)
@@ -16,7 +16,7 @@ GIT
GIT
remote: https://github.com/chef/chefstyle.git
- revision: c36dcbd6c2c21d2e19db77d9fbdf2402d0bacccf
+ revision: 6d24969bd7c5471e089bd47f45e4832d03e9f8a2
branch: master
specs:
chefstyle (0.4.0)
@@ -125,12 +125,12 @@ GEM
mixlib-cli (~> 1.4)
artifactory (2.5.0)
ast (2.3.0)
- aws-sdk (2.6.5)
- aws-sdk-resources (= 2.6.5)
- aws-sdk-core (2.6.5)
+ aws-sdk (2.6.6)
+ aws-sdk-resources (= 2.6.6)
+ aws-sdk-core (2.6.6)
jmespath (~> 1.0)
- aws-sdk-resources (2.6.5)
- aws-sdk-core (= 2.6.5)
+ aws-sdk-resources (2.6.6)
+ aws-sdk-core (= 2.6.6)
aws-sdk-v1 (1.66.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
@@ -178,6 +178,7 @@ GEM
url
coderay (1.1.1)
concurrent-ruby (1.0.2)
+ connection_pool (2.2.0)
cucumber (2.4.0)
builder (>= 2.1.2)
cucumber-core (~> 1.5.0)
@@ -299,10 +300,11 @@ GEM
mixlib-log
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
- mixlib-install (2.0.3)
+ mixlib-install (2.1.1)
artifactory
mixlib-shellout
mixlib-versioning
+ thor
mixlib-log (1.7.1)
mixlib-shellout (2.2.7)
mixlib-shellout (2.2.7-universal-mingw32)
@@ -313,7 +315,8 @@ GEM
multi_test (0.1.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
- net-http-persistent (2.9.4)
+ net-http-persistent (3.0.0)
+ connection_pool (~> 2.2)
net-http-pipeline (1.0.1)
net-http-spy (0.2.1)
net-scp (1.2.1)
@@ -328,12 +331,10 @@ GEM
net-ssh-gateway (>= 1.2.0)
net-telnet (0.1.1)
netrc (0.11.0)
- nokogiri (1.6.8)
+ nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
- pkg-config (~> 1.1.7)
- nokogiri (1.6.8-x86-mingw32)
+ nokogiri (1.6.8.1-x86-mingw32)
mini_portile2 (~> 2.1.0)
- pkg-config (~> 1.1.7)
nori (2.6.0)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
@@ -357,16 +358,15 @@ GEM
wmi-lite (~> 1.0)
parser (2.3.1.4)
ast (~> 2.2)
- pkg-config (1.1.7)
plist (3.2.0)
poise (2.7.1)
halite (~> 1.0)
- poise-boiler (1.13.0)
+ poise-boiler (1.13.1)
bundler
chefspec (~> 5.0)
codeclimate-test-reporter (~> 0.4)
codecov (~> 0.0, >= 0.0.2)
- foodcritic (~> 8.0)
+ foodcritic (>= 7, < 9)
fuubar (~> 2.0)
git (~> 1.2)
halite (~> 1.2)
@@ -461,19 +461,19 @@ GEM
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
- serverspec (2.36.1)
+ serverspec (2.37.1)
multi_json
rspec (~> 3.0)
rspec-its
specinfra (~> 2.53)
- sfl (2.2)
+ sfl (2.3)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
- specinfra (2.63.1)
+ specinfra (2.63.3)
net-scp
net-ssh (>= 2.7, < 4.0)
net-telnet
@@ -539,7 +539,7 @@ GEM
ffi-win32-extensions
windows-api (0.4.4)
win32-api (>= 1.4.5)
- winrm (2.0.3)
+ winrm (2.1.0)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 55da7b77a8..e527310a35 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,12 +11,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.5.0)
- aws-sdk (2.6.5)
- aws-sdk-resources (= 2.6.5)
- aws-sdk-core (2.6.5)
+ aws-sdk (2.6.6)
+ aws-sdk-resources (= 2.6.6)
+ aws-sdk-core (2.6.6)
jmespath (~> 1.0)
- aws-sdk-resources (2.6.5)
- aws-sdk-core (= 2.6.5)
+ aws-sdk-resources (2.6.6)
+ aws-sdk-core (= 2.6.6)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -61,7 +61,7 @@ GEM
cleanroom (1.0.0)
coderay (1.1.1)
diff-lcs (1.2.5)
- docker-api (1.32.0)
+ docker-api (1.32.1)
excon (>= 0.38.0)
json
erubis (2.7.0)
@@ -77,7 +77,7 @@ GEM
hashie (3.4.6)
hitimes (1.2.4)
httpclient (2.7.2)
- inspec (1.0.0)
+ inspec (1.2.0)
hashie (~> 3.4)
json (>= 1.8, < 3.0)
method_source (~> 0.8)
@@ -211,7 +211,7 @@ GEM
hashie (>= 2.0.2, < 4.0.0)
windows_chef_zero (2.0.0)
test-kitchen (>= 1.2.1)
- winrm (2.0.3)
+ winrm (2.1.0)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index f08e94dc94..9261f6f481 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -52,7 +52,7 @@ GRAPH
sudo (>= 0.0.0)
ubuntu (>= 0.0.0)
users (>= 0.0.0)
- build-essential (7.0.0)
+ build-essential (7.0.1)
compat_resource (>= 12.14)
mingw (>= 1.1)
seven_zip (>= 0.0.0)
@@ -64,16 +64,16 @@ GRAPH
chef_hostname (0.4.2)
compat_resource (>= 0.0.0)
compat_resource (12.14.7)
- cron (2.0.0)
+ cron (3.0.0)
database (6.0.0)
postgresql (>= 1.0.0)
firewall (2.5.2)
chef-sugar (>= 0.0.0)
httpd (0.4.4)
compat_resource (>= 12.14.6)
- iis (5.0.1)
+ iis (5.0.4)
windows (>= 1.34.6)
- iptables (3.0.0)
+ iptables (3.0.1)
compat_resource (>= 12.14.3)
logrotate (2.1.0)
compat_resource (>= 0.0.0)
@@ -98,7 +98,8 @@ GRAPH
ntp (3.2.0)
openssh (2.1.0)
iptables (>= 1.0)
- openssl (6.0.0)
+ openssl (4.4.0)
+ chef-sugar (>= 3.1.1)
php (1.5.0)
build-essential (>= 0.0.0)
iis (>= 0.0.0)
@@ -106,10 +107,10 @@ GRAPH
windows (>= 0.0.0)
xml (>= 0.0.0)
yum-epel (>= 0.0.0)
- postgresql (3.4.16)
+ postgresql (4.0.6)
apt (>= 1.9.0)
build-essential (>= 0.0.0)
- openssl (>= 0.0.0)
+ openssl (~> 4.0)
rbac (1.0.3)
resolver (1.3.1)
selinux (0.9.0)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index f1e544cc08..45157ce61a 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,12 +3,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.5.0)
- aws-sdk (2.6.5)
- aws-sdk-resources (= 2.6.5)
- aws-sdk-core (2.6.5)
+ aws-sdk (2.6.6)
+ aws-sdk-resources (= 2.6.6)
+ aws-sdk-core (2.6.6)
jmespath (~> 1.0)
- aws-sdk-resources (2.6.5)
- aws-sdk-core (= 2.6.5)
+ aws-sdk-resources (2.6.6)
+ aws-sdk-core (= 2.6.6)
berkshelf (5.1.0)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (>= 2.0.2, < 4.0)
@@ -51,7 +51,7 @@ GEM
cleanroom (1.0.0)
coderay (1.1.1)
diff-lcs (1.2.5)
- docker-api (1.32.0)
+ docker-api (1.32.1)
excon (>= 0.38.0)
json
erubis (2.7.0)
@@ -69,7 +69,7 @@ GEM
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
httpclient (2.8.2.4)
- inspec (1.0.0)
+ inspec (1.2.0)
hashie (~> 3.4)
json (>= 1.8, < 3.0)
method_source (~> 0.8)
@@ -86,7 +86,7 @@ GEM
jmespath (1.3.1)
json (2.0.2)
kitchen-appbundle-updater (0.1.2)
- kitchen-dokken (1.0.0)
+ kitchen-dokken (1.0.3)
docker-api (~> 1.29)
test-kitchen (~> 1.5)
kitchen-ec2 (1.2.0)
@@ -111,10 +111,11 @@ GEM
mixlib-authentication (1.4.1)
mixlib-log
mixlib-config (2.2.4)
- mixlib-install (2.0.3)
+ mixlib-install (2.1.1)
artifactory
mixlib-shellout
mixlib-versioning
+ thor
mixlib-log (1.7.1)
mixlib-shellout (2.2.7)
mixlib-shellout (2.2.7-universal-mingw32)
@@ -211,7 +212,7 @@ GEM
hashie (>= 2.0.2, < 4.0.0)
win32-process (0.8.3)
ffi (>= 1.0.0)
- winrm (2.0.3)
+ winrm (2.1.0)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 8f1318ab61..8179c294ab 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/chef/license_scout.git
- revision: 4fd26d99d0617d6336ae372f026c190617800e6b
+ revision: ca9e8fe08581bc6352d6d23389dcfdcddc44a76b
specs:
license_scout (0.1.2)
ffi-yajl (~> 2.2)
@@ -127,10 +127,11 @@ GEM
mixlib-log
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
- mixlib-install (2.1.0)
+ mixlib-install (2.1.1)
artifactory
mixlib-shellout
mixlib-versioning
+ thor
mixlib-log (1.7.1)
mixlib-shellout (2.2.7)
mixlib-shellout (2.2.7-universal-mingw32)
@@ -227,7 +228,7 @@ GEM
hashie (>= 2.0.2, < 4.0.0)
win32-process (0.8.3)
ffi (>= 1.0.0)
- winrm (2.0.3)
+ winrm (2.1.0)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 53946131cd..119fcd1cd1 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,5 +1,5 @@
# DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
-override :rubygems, version: "2.6.7"
+override :rubygems, version: "2.6.7 ruby, 2.0.6"
override :bundler, version: "1.12.5"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.14"
@@ -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.8"
-override "openssl", version: "1.0.2h"
+override "openssl", version: "1.0.2j"
diff --git a/version_policy.rb b/version_policy.rb
index bfe08e91e4..5621ea43ff 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -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.2h",
+ "openssl" => "1.0.2j",
}
#