From 0dc8d26fea717b9b31d9402310d62db46cecf041 Mon Sep 17 00:00:00 2001
From: Jon Morrow <jmorrow@chef.io>
Date: Thu, 21 Nov 2019 09:07:59 -0800
Subject: Fixes all notarization issues

This changes makes the neccessary changes to enable the pkg to pass apples notarization requirements.

1. Update omnibus and omnibus-software to versions that support deep signing
2. Drop 'Developer ID Installer:' from signing key. This lets sigining pick up the correct key for what is being signed.

Signed-off-by: Jon Morrow <jmorrow@chef.io>
---
 omnibus/Gemfile                 |  4 ++--
 omnibus/Gemfile.lock            | 12 ++++++------
 omnibus/config/projects/chef.rb |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 6fca425e62..676ff181cc 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
+gem "omnibus", git: "https://github.com/chef/omnibus", branch: "jm/deep_sign"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "jm/deep_sign_chef"
 gem "artifactory"
 
 gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5fa49b8996..7516ae0f30 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 70855aab656d333622c51171828b4f41d04f6ef5
-  branch: master
+  revision: cba1d5db07e79c5d5717ab468264890d63b8ee67
+  branch: jm/deep_sign
   specs:
-    omnibus (6.1.21)
+    omnibus (7.0.0)
       aws-sdk-s3 (~> 1)
       chef-cleanroom (~> 1.0)
       chef-sugar (>= 3.3)
@@ -18,8 +18,8 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 1b2dfe467cbc22e0e2e232e2648af3482830bfd7
-  branch: master
+  revision: 92d1d03cbefdd694d48ad6a03489535d3dc04d2a
+  branch: jm/deep_sign_chef
   specs:
     omnibus-software (4.0.0)
       omnibus (>= 5.6.1)
@@ -242,7 +242,7 @@ GEM
     octokit (4.15.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (15.7.3)
+    ohai (15.7.4)
       chef-config (>= 12.8, < 16)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
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
 
-- 
cgit v1.2.1