diff --git a/Gemfile b/Gemfile index c5aeacdd1..cc0347648 100644 --- a/Gemfile +++ b/Gemfile @@ -56,3 +56,5 @@ end group :deploy do gem "inquirer" end + +gem "openssl", ">= 3.2.0" diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 45884a6e7..4602ffdd8 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main") -gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main") +gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "ss/add-openssl-3.0.15") gem "artifactory" gem "ffi", ">= 1.9.14", "!= 1.13.0" @@ -20,4 +20,4 @@ group :development do gem "kitchen-vagrant", ">= 1.3.1" gem "test-kitchen", ">= 1.23" gem "winrm-fs", "~> 1.0" -end \ No newline at end of file +end diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 2f8a04ac7..fa2700aba 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: dd171125b10e9a457090cc20165ee4ecf2e0d51d - branch: main + revision: 9ef9c8e94e7a7f7432c48207ba427c3b7c1c6ce6 + branch: ss/add-openssl-3.0.15 specs: omnibus-software (24.6.323) omnibus (>= 9.0.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 547202373..f96637a54 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -5,6 +5,6 @@ train_stable = /^train \((.*)\)/.match(`gem list ^train$ --remote`)[1] override "train", version: "v#{train_stable}" override "ruby", version: "3.1.6" -override :openssl, version: "3.0.11" +override :openssl, version: "3.0.15" override "ruby-msys2-devkit", version: "3.1.6-1"