summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-11-20 16:06:33 -0800
committerTim Smith <tsmith@chef.io>2018-11-20 16:07:29 -0800
commitd68360e8c3dc939f0e9a98288e47c07af36936aa (patch)
tree4f39568bdbc6d3d02c6b08ad0d6b3a65d1fed524
parentabdfa74d7f34114a3584efa6f8aabe337be8d80f (diff)
downloadchef-openssl_bump.tar.gz
Update to openssl 1.0.2qopenssl_bump
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-5407 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0734 Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--omnibus/Gemfile.lock22
-rw-r--r--omnibus_overrides.rb2
2 files changed, 12 insertions, 12 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a44cfac791..b0a3f8007b 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 6cfec3a04de67aea335c23b5a3bd334a3a68fafe
+ revision: dfb28a83c3cbce42e6e5bbc4985930067e206362
branch: master
specs:
- omnibus (6.0.4)
+ omnibus (6.0.6)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 1a5846d7afb9ab8f3005cd04d771b057b19ab514
+ revision: 8cb4ba11226f61a78d6ef71a83353b95c8fdd528
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,17 +32,17 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.1)
- aws-partitions (1.112.0)
- aws-sdk-core (3.38.0)
+ aws-partitions (1.115.0)
+ aws-sdk-core (3.39.0)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-kms (1.11.0)
- aws-sdk-core (~> 3, >= 3.26.0)
+ aws-sdk-kms (1.12.0)
+ aws-sdk-core (~> 3, >= 3.39.0)
aws-sigv4 (~> 1.0)
- aws-sdk-s3 (1.23.1)
- aws-sdk-core (~> 3, >= 3.26.0)
+ aws-sdk-s3 (1.25.0)
+ aws-sdk-core (~> 3, >= 3.39.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
aws-sigv4 (1.0.3)
@@ -143,11 +143,11 @@ GEM
mixlib-shellout (~> 2.0)
tomlrb (~> 1.2)
chef-sugar (4.1.0)
- chef-zero (14.0.6)
+ chef-zero (14.0.11)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 2.0)
- rack (~> 2.0)
+ rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
citrus (3.0.2)
cleanroom (1.0.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 2499452a44..8664617310 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -22,4 +22,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.2p"
+override "openssl", version: "1.0.2q"