From 6dc412793363b6512caccd7487a6b55df2d88779 Mon Sep 17 00:00:00 2001 From: RajeshPaul38 <85236476+RajeshPaul38@users.noreply.github.com> Date: Mon, 5 Aug 2024 18:06:07 +0530 Subject: [PATCH] openssl version upgrade to 1.0.2zi (#3248) * upgraded omnibus-software in omnibus gem lock Signed-off-by: Ubuntu * upgraded all gem versions in omnibus gem lock Signed-off-by: Ubuntu * upgraded openssl omnibus dependency version from 1.0.2za to 1.0.2zi Signed-off-by: Ubuntu --------- Signed-off-by: Ubuntu Co-authored-by: Ubuntu --- omnibus/Gemfile.lock | 265 ++++++++++++++----------- omnibus/config/projects/supermarket.rb | 2 +- 2 files changed, 153 insertions(+), 114 deletions(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 178cc4aff..1c48fa079 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,21 +1,23 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 225e3576c48fcd0155f6049cb032b2370eccf29a + revision: 2dc7aa6530d7bf2860c6771f1f572e06d1b52907 branch: main specs: - omnibus-software (23.2.286) + omnibus-software (24.6.323) + ffi (< 1.17.0) omnibus (>= 9.0.0) GIT remote: https://github.com/chef/omnibus.git - revision: cf9761311577e24819625aa1d932f828740e33b4 + revision: 3efa84c1a26daf55c4d477bf3653e5905ab4f737 branch: main specs: - omnibus (9.0.17) + omnibus (9.0.25) aws-sdk-s3 (~> 1.116.0) chef-cleanroom (~> 1.0) chef-utils (>= 15.4) contracts (>= 0.16.0, < 0.17.0) + ffi (< 1.17.0) ffi-yajl (~> 2.2) license_scout (~> 1.0) mixlib-shellout (>= 2.0, < 4.0) @@ -29,32 +31,33 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - artifactory (3.0.15) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.716.0) - aws-sdk-core (3.170.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.961.0) + aws-sdk-core (3.201.3) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.62.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.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.4) - aws-sdk-secretsmanager (1.62.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.2) + aws-sdk-secretsmanager (1.102.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) - bcrypt_pbkdf (1.1.0) - berkshelf (8.0.5) + base64 (0.2.0) + bcrypt_pbkdf (1.1.1) + berkshelf (8.0.9) chef (>= 15.7.32) chef-config cleanroom (~> 1.0) @@ -67,40 +70,44 @@ GEM retryable (>= 2.0, < 4.0) solve (~> 4.0) thor (>= 0.20) - builder (3.2.4) - chef (17.10.0) + bigdecimal (3.1.8) + builder (3.3.0) + chef (18.5.0) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.0) - chef-utils (= 17.10.0) + chef-config (= 18.5.0) + chef-utils (= 18.5.0) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0) erubis (~> 2.7) - ffi (>= 1.5.0) + ffi (>= 1.15.5) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) iniparse (~> 1.4) - inspec-core (~> 4.23) + inspec-core (>= 5, < 6) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.1.1, < 4.0) - net-sftp (>= 2.1.2, < 4.0) - ohai (~> 17.0) + net-ftp + net-sftp (>= 2.1.2, < 5.0) + ohai (~> 18.0) plist (~> 3.2) - proxifier (~> 1.0) + proxifier2 (~> 1.1) syslog-logger (~> 1.6) - train-core (~> 3.2, >= 3.2.28) + train-core (~> 3.10) + train-rest (>= 0.4.1) train-winrm (>= 0.2.5) + unf_ext (~> 0.0.8.2) uuidtools (>= 2.1.5, < 3.0) - vault (~> 0.16) + vault (~> 0.18.2) chef-cleanroom (1.0.5) - chef-cli (5.6.1) + chef-cli (5.6.14) addressable (>= 2.3.5, < 2.9) chef (>= 16.0) cookbook-omnifetch (~> 0.5) @@ -112,9 +119,9 @@ GEM mixlib-shellout (>= 2.0, < 4.0) pastel (~> 0.7) solve (> 2.0, < 5.0) - chef-config (17.10.0) + chef-config (18.5.0) addressable - chef-utils (= 17.10.0) + chef-utils (= 18.5.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -122,9 +129,9 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.10.0) + chef-utils (18.5.0) concurrent-ruby - chef-vault (4.1.10) + chef-vault (4.1.11) chef-zero (15.0.11) ffi-yajl (~> 2.2) hashie (>= 2.0, < 5.0) @@ -132,47 +139,43 @@ GEM rack (~> 2.0, >= 2.0.6) uuidtools (~> 2.1) webrick - chefspec (9.3.3) + chefspec (9.3.8) chef (>= 15) chef-cli - fauxhai-ng (>= 7.5) + fauxhai-chef (>= 9.3) + logger (< 1.6) rspec (~> 3.0) + rspec-expectations (<= 3.12.3) citrus (3.0.2) cleanroom (1.0.0) coderay (1.1.3) - concurrent-ruby (1.2.0) + concurrent-ruby (1.3.3) contracts (0.16.1) - cookbook-omnifetch (0.11.1) + cookbook-omnifetch (0.12.2) mixlib-archive (>= 0.4, < 2.0) - cookstyle (7.32.1) + cookstyle (7.32.8) rubocop (= 1.25.1) corefoundation (0.3.13) ffi (>= 1.15.0) + date (3.3.4) diff-lcs (1.3) + domain_name (0.6.20240107) ed25519 (1.3.0) - erubi (1.12.0) + erubi (1.13.0) erubis (2.7.0) - faraday (1.4.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - multipart-post (>= 1.2, < 3) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday_middleware (1.2.0) - faraday (~> 1.0) - fauxhai-ng (9.3.0) + faraday (2.10.1) + faraday-net_http (>= 2.0, < 3.2) + logger + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.1.1) + net-http + fauxhai-chef (9.3.16) net-ssh - ffi (1.15.5) - ffi-libarchive (1.1.3) + ffi (1.16.3) + ffi-libarchive (1.1.14) ffi (~> 1.0) - ffi-yajl (2.4.0) + ffi-yajl (2.6.0) libyajl2 (>= 1.2) fuzzyurl (0.9.0) gssapi (1.3.1) @@ -181,13 +184,16 @@ GEM builder (>= 2.1.2) rexml (~> 3.0) hashie (4.1.0) + http-accept (1.7.0) + http-cookie (1.0.6) + domain_name (~> 0.5) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.56.20) + inspec-core (5.22.3) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) - faraday (>= 0.9.0, < 1.5) - faraday_middleware (~> 1.0) + faraday (>= 1, < 3) + faraday-follow_redirects (~> 0.3) hashie (>= 3.4, < 5.0) license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) @@ -203,14 +209,14 @@ GEM sslshake (~> 1.2) thor (>= 0.20, < 2.0) tomlrb (>= 1.2, < 2.1) - train-core (~> 3.0) + train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) - iostruct (0.0.5) + iostruct (0.1.3) ipaddress (0.8.3) jmespath (1.6.2) - json (2.6.3) - kitchen-vagrant (1.14.1) + json (2.7.2) + kitchen-vagrant (2.0.1) test-kitchen (>= 1.4, < 4) libyajl2 (2.1.0) license-acceptance (2.1.13) @@ -218,15 +224,19 @@ GEM tomlrb (>= 1.2, < 3.0) tty-box (~> 0.6) tty-prompt (~> 0.20) - license_scout (1.3.4) + license_scout (1.3.10) ffi-yajl (~> 2.2) mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) little-plugger (1.1.4) - logging (2.3.1) + logger (1.5.3) + logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) - method_source (1.0.0) + method_source (1.1.0) + mime-types (3.5.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2024.0702) minitar (0.9) mixlib-archive (1.1.7) mixlib-log @@ -234,31 +244,41 @@ GEM mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb - mixlib-install (3.12.27) + mixlib-install (3.12.30) mixlib-shellout mixlib-versioning thor - mixlib-log (3.0.9) - mixlib-shellout (3.2.7) + mixlib-log (3.1.1) + ffi (< 1.17.0) + mixlib-shellout (3.2.8) chef-utils mixlib-versioning (1.2.12) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.3.0) + multipart-post (2.4.1) + net-ftp (0.3.7) + net-protocol + time + net-http (0.4.1) + uri + net-protocol (0.2.2) + timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) - net-sftp (3.0.0) - net-ssh (>= 5.0.0, < 7.0.0) - net-ssh (6.1.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-ssh (7.2.3) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) - nori (2.6.0) - octokit (4.25.0) + netrc (0.11.0) + nori (2.7.1) + bigdecimal + octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) - ohai (17.9.0) - chef-config (>= 14.12, < 18) - chef-utils (>= 16.0, < 18) + ohai (18.1.18) + chef-config (>= 14.12, < 19) + chef-utils (>= 16.0, < 19) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress @@ -269,45 +289,53 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - parallel (1.22.1) - parser (3.1.1.0) + parallel (1.25.1) + parser (3.3.4.0) ast (~> 2.4.1) + racc parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) - pedump (0.6.5) + pedump (0.6.10) awesome_print iostruct (>= 0.0.4) multipart-post (>= 2.0.0) rainbow zhexdump (>= 0.0.2) - plist (3.7.0) - proxifier (1.0.3) - pry (0.14.1) + plist (3.7.1) + proxifier2 (1.1.0) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.1) - rack (2.2.6.3) + public_suffix (6.0.1) + racc (1.8.1) + rack (2.2.9) rainbow (3.1.1) - regexp_parser (2.2.1) + regexp_parser (2.9.2) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) retryable (3.0.5) - rexml (3.2.5) + rexml (3.3.4) + strscan rspec (3.11.0) rspec-core (~> 3.11.0) rspec-expectations (~> 3.11.0) rspec-mocks (~> 3.11.0) rspec-core (3.11.0) rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-expectations (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.11.1) + rspec-mocks (3.11.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-support (3.11.0) + rspec-support (3.11.1) rubocop (1.25.1) parallel (~> 1.10) parser (>= 3.1.0.0) @@ -317,11 +345,11 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) - parser (>= 3.1.1.0) - ruby-progressbar (1.11.0) - ruby2_keywords (0.0.5) - rubyntlm (0.6.3) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) + rubyntlm (0.6.5) + base64 rubyzip (2.3.2) sawyer (0.9.2) addressable (>= 2.3.5) @@ -336,8 +364,9 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) + strscan (3.1.0) syslog-logger (1.6.8) - test-kitchen (3.5.0) + test-kitchen (3.5.1) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -351,17 +380,24 @@ GEM winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) - thor (1.2.1) + thor (1.3.1) + time (0.3.0) + date + timeout (0.4.1) toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.10.7) + train-core (3.12.6) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 5.0) net-ssh (>= 2.9, < 8.0) + train-rest (0.5.0) + aws-sigv4 (~> 1.5) + rest-client (~> 2.1) + train-core (~> 3.0) train-winrm (0.2.13) winrm (>= 2.3.6, < 3.0) winrm-elevated (~> 1.2.2) @@ -379,25 +415,28 @@ GEM tty-cursor (~> 0.7) tty-screen (~> 0.8) wisper (~> 2.0) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-table (0.12.0) pastel (~> 0.8) strings (~> 0.2.0) tty-screen (~> 0.8) - unicode-display_width (2.4.2) + unf_ext (0.0.8.2) + unicode-display_width (2.5.0) unicode_utils (1.4.0) + uri (0.13.0) uuidtools (2.2.0) - vault (0.17.0) + vault (0.18.2) aws-sigv4 - webrick (1.7.0) - winrm (2.3.6) + webrick (1.8.1) + winrm (2.3.9) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) - nori (~> 2.0) + nori (~> 2.0, >= 2.7.1) + rexml (~> 3.0) rubyntlm (~> 0.6.0, >= 0.6.3) winrm-elevated (1.2.3) erubi (~> 1.8) @@ -410,7 +449,7 @@ GEM winrm (~> 2.0) wisper (2.0.1) wmi-lite (1.0.7) - zhexdump (0.0.2) + zhexdump (0.2.0) PLATFORMS ruby @@ -426,4 +465,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 2.1.4 + 2.2.32 diff --git a/omnibus/config/projects/supermarket.rb b/omnibus/config/projects/supermarket.rb index 6d718109c..5b8aad871 100644 --- a/omnibus/config/projects/supermarket.rb +++ b/omnibus/config/projects/supermarket.rb @@ -33,7 +33,7 @@ override :ruby, version: "3.0.3" override :'openssl-fips', version: '2.0.16' override :'omnibus-ctl', version: 'main' -override :openssl, version: '1.0.2za' +override :openssl, version: '1.0.2zi' override :logrotate, version: '3.21.0' # Creates required build directories