Merge pull request #9252 from chef/jm/deep_sign_15

Fixes all notarization issues

3 files changed, 28 insertions, 26 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 204abe7f4e..07332962ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,7 +141,7 @@ GEM
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
-    byebug (11.1.0)
+    byebug (11.1.1)
     chef-telemetry (1.0.2)
       chef-config
       concurrent-ruby (~> 1.0)
@@ -289,7 +289,7 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
     pry-remote (0.1.8)
@@ -299,7 +299,7 @@ GEM
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
     public_suffix (4.0.3)
-    rack (2.1.1)
+    rack (2.1.2)
     rainbow (3.0.0)
     rake (12.3.2)
     rb-readline (0.5.5)
@@ -372,7 +372,7 @@ GEM
       strings (~> 0.1.6)
       tty-cursor (~> 0.7)
     tty-color (0.5.1)
-    tty-cursor (0.7.0)
+    tty-cursor (0.7.1)
     tty-prompt (0.20.0)
       necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 66f5d9c44f..bd0c7ea0d3 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 70855aab656d333622c51171828b4f41d04f6ef5
+  revision: d642ae6fd57f4a74846e325fecadebb132069894
   branch: master
   specs:
-    omnibus (6.1.21)
+    omnibus (7.0.1)
       aws-sdk-s3 (~> 1)
       chef-cleanroom (~> 1.0)
       chef-sugar (>= 3.3)
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 1b2dfe467cbc22e0e2e232e2648af3482830bfd7
+  revision: ad7ed679f1b34c20f8be34365d38cb1c21e737cd
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
     artifactory (3.0.12)
     awesome_print (1.8.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.267.0)
+    aws-partitions (1.269.0)
     aws-sdk-core (3.89.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -50,7 +50,7 @@ GEM
     bcrypt_pbkdf (1.0.1)
     bcrypt_pbkdf (1.0.1-x64-mingw32)
     bcrypt_pbkdf (1.0.1-x86-mingw32)
-    berkshelf (7.0.8)
+    berkshelf (7.0.9)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)
@@ -64,12 +64,12 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (15.6.10)
+    chef (15.7.32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.6.10)
-      chef-utils (= 15.6.10)
+      chef-config (= 15.7.32)
+      chef-utils (= 15.7.32)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -96,12 +96,12 @@ GEM
       train-winrm (>= 0.2.5)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (15.6.10-universal-mingw32)
+    chef (15.7.32-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.6.10)
-      chef-utils (= 15.6.10)
+      chef-config (= 15.7.32)
+      chef-utils (= 15.7.32)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -141,15 +141,15 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.2)
-    chef-config (15.6.10)
+    chef-config (15.7.32)
       addressable
-      chef-utils (= 15.6.10)
+      chef-utils (= 15.7.32)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-sugar (5.1.9)
-    chef-utils (15.6.10)
+    chef-utils (15.7.32)
     chef-zero (14.0.17)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
@@ -226,7 +226,7 @@ GEM
     mixlib-versioning (1.2.12)
     molinillo (0.6.6)
     multi_json (1.14.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     necromancer (0.5.1)
     net-scp (2.0.0)
       net-ssh (>= 2.6.5, < 6.0.0)
@@ -257,21 +257,23 @@ GEM
     pastel (0.7.3)
       equatable (~> 0.6)
       tty-color (~> 0.5)
-    pedump (0.5.2)
+    pedump (0.5.4)
       awesome_print
       iostruct (>= 0.0.4)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0)
       progressbar
+      rainbow
       zhexdump (>= 0.0.2)
     plist (3.5.0)
     progressbar (1.10.1)
     proxifier (1.0.3)
     public_suffix (4.0.3)
-    rack (2.1.1)
+    rack (2.1.2)
+    rainbow (3.0.0)
     retryable (3.0.5)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
-    rubyzip (2.0.0)
+    rubyzip (2.1.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -304,7 +306,7 @@ GEM
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.9)
-    train-core (3.2.5)
+    train-core (3.2.14)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 3.0)
@@ -317,7 +319,7 @@ GEM
       strings (~> 0.1.6)
       tty-cursor (~> 0.7)
     tty-color (0.5.1)
-    tty-cursor (0.7.0)
+    tty-cursor (0.7.1)
     tty-prompt (0.20.0)
       necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index b3768a58a5..115dc11490 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -84,7 +84,7 @@ end
 proj_to_work_around_cleanroom = self # wat voodoo hackery is this?
 package :pkg do
   identifier "com.getchef.pkg.#{proj_to_work_around_cleanroom.name}"
-  signing_identity "Developer ID Installer: Chef Software, Inc. (EU3VF8YLX2)"
+  signing_identity "Chef Software, Inc. (EU3VF8YLX2)"
 end
 compress :dmg