summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-08-31 20:14:59 -0700
committerGitHub <noreply@github.com>2021-08-31 20:14:59 -0700
commit7cdd4543bcbdd887c79b0fbb2de99bd2726ef59d (patch)
tree5d4868041899feea8bcbb5b9dbd126a82f9c6ad9
parent2c6232c52c8b2745eefb417720f7c4188ad8b8ed (diff)
parentd798968fee3cc1097f7353f8e63e446ae55e1372 (diff)
downloadchef-7cdd4543bcbdd887c79b0fbb2de99bd2726ef59d.tar.gz
Merge pull request #11982 from dheerajd-msys/dheeraj/update_openssl_1.0.2za
bump openssl-1.0.2za
-rw-r--r--omnibus/Gemfile.lock8
-rw-r--r--omnibus_overrides.rb2
2 files changed, 5 insertions, 5 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index b631cf1d96..4d123b6016 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: e87ce07718ff421edf72ce869c4c289f71209686
+ revision: b77420348413fc621ebe150a53f3ed0596faa640
branch: main
specs:
omnibus-software (4.0.0)
@@ -33,16 +33,16 @@ GEM
artifactory (3.0.15)
awesome_print (1.9.2)
aws-eventstream (1.1.1)
- aws-partitions (1.491.0)
+ aws-partitions (1.492.0)
aws-sdk-core (3.119.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.46.0)
+ aws-sdk-kms (1.47.0)
aws-sdk-core (~> 3, >= 3.119.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.99.0)
+ aws-sdk-s3 (1.100.0)
aws-sdk-core (~> 3, >= 3.119.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 225a66422d..d4dd1520c6 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -14,7 +14,7 @@ override "libyaml", version: "0.1.7"
override "makedepend", version: "1.0.5"
override "ncurses", version: "5.9"
override "nokogiri", version: "1.11.0"
-override "openssl", version: mac_os_x? ? "1.1.1l" : "1.0.2y"
+override "openssl", version: mac_os_x? ? "1.1.1l" : "1.0.2za"
override "pkg-config-lite", version: "0.28-1"
override "bundler", version: "2.2.22"
override "ruby", version: "3.0.2"