Merge pull request #12647 from chef/libarchive_16

Unpin libarchive and update to 3.6.0

2 files changed, 29 insertions, 32 deletions

diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 4bc8923998..6b1024ff89 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: d5ff796a6e5e943016b8ed26aaa802eca30b4afc
+  revision: aa90acf328a6d23125ec498de7a50b6017732f87
   branch: main
   specs:
     omnibus-software (4.0.0)
@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: cf9ef0a34a441d0047bb3113c1a19cc4a376d7b3
+  revision: 124d5960ab2d3ed15b321d12d8da5b475631e16b
   branch: main
   specs:
     omnibus (8.3.2)
@@ -33,27 +33,25 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.557.0)
-    aws-sdk-core (3.126.2)
+    aws-partitions (1.560.0)
+    aws-sdk-core (3.127.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.54.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-kms (1.55.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.112.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-s3 (1.113.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.54.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-secretsmanager (1.58.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt_pbkdf (1.1.0)
-    bcrypt_pbkdf (1.1.0-x64-mingw32)
-    bcrypt_pbkdf (1.1.0-x86-mingw32)
     berkshelf (7.2.2)
       chef (>= 15.7.32)
       chef-config
@@ -68,12 +66,12 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (17.8.25)
+    chef (17.9.52)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.8.25)
-      chef-utils (= 17.8.25)
+      chef-config (= 17.9.52)
+      chef-utils (= 17.9.52)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -99,12 +97,12 @@ GEM
       train-winrm (>= 0.2.5)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (17.8.25-universal-mingw32)
+    chef (17.9.52-universal-mingw32)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.8.25)
-      chef-utils (= 17.8.25)
+      chef-config (= 17.9.52)
+      chef-utils (= 17.9.52)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -142,9 +140,9 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.4)
-    chef-config (17.8.25)
+    chef-config (17.9.52)
       addressable
-      chef-utils (= 17.8.25)
+      chef-utils (= 17.9.52)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -152,7 +150,7 @@ GEM
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (17.8.25)
+    chef-utils (17.9.52)
       concurrent-ruby
     chef-vault (4.1.5)
     chef-zero (15.0.11)
@@ -167,10 +165,10 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     contracts (0.16.1)
-    corefoundation (0.3.4)
+    corefoundation (0.3.13)
       ffi (>= 1.15.0)
     diff-lcs (1.3)
-    ed25519 (1.2.4)
+    ed25519 (1.3.0)
     erubi (1.10.0)
     erubis (2.7.0)
     faraday (1.4.3)
@@ -205,7 +203,7 @@ GEM
     hashie (4.1.0)
     httpclient (2.8.3)
     iniparse (1.5.0)
-    inspec-core (4.50.3)
+    inspec-core (4.52.9)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -283,7 +281,7 @@ GEM
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     nori (2.6.0)
-    octokit (4.21.0)
+    octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (17.9.0)
@@ -303,7 +301,7 @@ GEM
     parslet (1.8.2)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pedump (0.6.4)
+    pedump (0.6.5)
       awesome_print
       iostruct (>= 0.0.4)
       multipart-post (>= 2.0.0)
@@ -322,15 +320,15 @@ GEM
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
@@ -378,7 +376,7 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 4.0)
       net-ssh (>= 2.9, < 7.0)
-    train-winrm (0.2.12)
+    train-winrm (0.2.13)
       winrm (>= 2.3.6, < 3.0)
       winrm-elevated (~> 1.2.2)
       winrm-fs (~> 1.0)
@@ -466,4 +464,4 @@ DEPENDENCIES
   winrm-fs (~> 1.0)
 
 BUNDLED WITH
-   2.2.22
+   2.3.7
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 0ef8acb72d..c9db35560d 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -3,7 +3,6 @@
 #
 # NOTE: You MUST update omnibus-software when adding new versions of
 # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
-override "libarchive", version: "3.5.2"
 override "libffi", version: "3.3"
 override "libiconv", version: "1.16"
 override "liblzma", version: "5.2.5"