diff --git a/omnibus/.ruby-version b/omnibus/.ruby-version index be94e6f..6cb9d3d 100644 --- a/omnibus/.ruby-version +++ b/omnibus/.ruby-version @@ -1 +1 @@ -3.2.2 +3.4.3 diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 37cc824..5861b6e 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -5,7 +5,5 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end -gem 'omnibus', github: 'chef/omnibus', ref: '1d97cd9e79a062dfc12f0c047215f3a9e4d65b09' -gem 'omnibus-software', github: 'chef/omnibus-software', ref: '76b31d11c1fbbc43a4ed1a1990a2662d05b28644' - -gem 'ffi-yajl', '>=2.6' +gem 'omnibus' +gem 'omnibus-software' diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 9d304f1..e836c42 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,128 +1,129 @@ -GIT - remote: https://github.com/chef/omnibus-software.git - revision: 76b31d11c1fbbc43a4ed1a1990a2662d05b28644 - ref: 76b31d11c1fbbc43a4ed1a1990a2662d05b28644 - specs: - omnibus-software (4.0.0) - omnibus (>= 8.0.0) - -GIT - remote: https://github.com/chef/omnibus.git - revision: 1d97cd9e79a062dfc12f0c047215f3a9e4d65b09 - ref: 1d97cd9e79a062dfc12f0c047215f3a9e4d65b09 - specs: - omnibus (8.1.8) - aws-sdk-s3 (~> 1) - chef-cleanroom (~> 1.0) - chef-utils (>= 15.4) - ffi-yajl (~> 2.2) - license_scout (~> 1.0) - mixlib-shellout (>= 2.0, < 4.0) - mixlib-versioning - ohai (>= 15, < 17) - pedump - ruby-progressbar (~> 1.7) - thor (>= 0.18, < 2.0) - GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) awesome_print (1.9.2) - aws-eventstream (1.1.1) - aws-partitions (1.449.0) - aws-sdk-core (3.114.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.43.0) - aws-sdk-core (~> 3, >= 3.112.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.94.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-eventstream (1.4.0) + aws-partitions (1.1178.0) + aws-sdk-core (3.235.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 + bigdecimal + jmespath (~> 1, >= 1.6.1) + logger + aws-sdk-kms (1.115.0) + aws-sdk-core (~> 3, >= 3.234.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.116.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) - chef-cleanroom (1.0.2) - chef-config (16.13.16) + base64 (0.3.0) + bigdecimal (3.3.1) + chef-cleanroom (1.0.5) + chef-config (18.8.46) addressable - chef-utils (= 16.13.16) + chef-utils (= 18.8.46) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-utils (16.13.16) + chef-utils (18.8.46) + concurrent-ruby citrus (3.0.2) - ffi (1.15.0) - ffi-yajl (2.4.0) + concurrent-ruby (1.3.5) + contracts (0.16.1) + ffi (1.16.3) + ffi-yajl (2.6.0) libyajl2 (>= 1.2) fuzzyurl (0.9.0) - iostruct (0.0.4) + iostruct (0.5.0) ipaddress (0.8.3) - jmespath (1.4.0) - json (2.5.1) + jmespath (1.6.2) + json (2.15.2) libyajl2 (2.1.0) - license_scout (1.2.10) + license_scout (1.4.0) ffi-yajl (~> 2.2) mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) + logger (1.7.0) mixlib-cli (2.1.8) - mixlib-config (3.0.9) + mixlib-config (3.0.27) tomlrb - mixlib-log (3.0.9) - mixlib-shellout (3.2.5) + mixlib-log (3.2.3) + ffi (>= 1.15.5) + mixlib-shellout (3.3.9) chef-utils mixlib-versioning (1.2.12) - multipart-post (2.1.1) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) - net-ssh (6.1.0) - ohai (16.13.0) - chef-config (>= 12.8, < 17) - chef-utils (>= 16.0, < 17) - ffi (~> 1.9) + multipart-post (2.4.1) + net-scp (4.1.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-ssh (7.3.0) + ohai (18.2.6) + chef-config (>= 14.12, < 19) + chef-utils (>= 16.0, < 19) + ffi (~> 1.9, <= 1.17.0) ffi-yajl (~> 2.2) ipaddress mixlib-cli (>= 1.7.0) mixlib-config (>= 2.0, < 4.0) mixlib-log (>= 2.0.1, < 4.0) - mixlib-shellout (>= 2.0, < 4.0) + mixlib-shellout (~> 3.2, >= 3.2.5) plist (~> 3.1) train-core wmi-lite (~> 1.0) - pedump (0.6.2) + omnibus (9.0.24) + aws-sdk-s3 (~> 1.116.0) + chef-cleanroom (~> 1.0) + chef-utils (>= 15.4) + contracts (>= 0.16.0, < 0.17.0) + ffi-yajl (~> 2.2) + license_scout (~> 1.0) + mixlib-shellout (>= 2.0, < 4.0) + mixlib-versioning + ohai (>= 16, < 19) + pedump + rexml (~> 3.2) + ruby-progressbar (~> 1.7) + thor (>= 0.18, < 2.0) + omnibus-software (23.7.295) + omnibus (>= 9.0.0) + pedump (0.6.10) awesome_print iostruct (>= 0.0.4) multipart-post (>= 2.0.0) rainbow zhexdump (>= 0.0.2) - plist (3.6.0) - public_suffix (4.0.6) - rainbow (3.0.0) - ruby-progressbar (1.11.0) - thor (1.1.0) - toml-rb (2.0.1) + plist (3.7.2) + public_suffix (6.0.2) + rainbow (3.1.1) + rexml (3.4.4) + ruby-progressbar (1.13.0) + thor (1.4.0) + toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.7.0) + train-core (3.13.4) addressable (~> 2.5) - ffi (!= 1.13.0) + ffi (~> 1.16.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 4.0) - net-ssh (>= 2.9, < 7.0) - wmi-lite (1.0.5) - zhexdump (0.0.2) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 2.9, < 8.0) + wmi-lite (1.0.7) + zhexdump (0.3.0) PLATFORMS ruby DEPENDENCIES - omnibus! - omnibus-software! + omnibus + omnibus-software BUNDLED WITH - 2.4.22 + 2.6.9 diff --git a/omnibus/config/software/libffi.rb b/omnibus/config/software/libffi.rb index 5f7e386..af59465 100644 --- a/omnibus/config/software/libffi.rb +++ b/omnibus/config/software/libffi.rb @@ -15,7 +15,7 @@ # name "libffi" -default_version "3.4.2" +default_version "3.4.8" license "MIT" license_file "LICENSE" @@ -23,7 +23,7 @@ # version_list: url=https://github.com/libffi/libffi/releases filter=*.tar.gz -version("3.4.2") { source sha256: "540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620" } +version("3.4.8") { source sha256: "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b" } source url: "https://github.com/libffi/libffi/releases/download/v#{version}/libffi-#{version}.tar.gz"