summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Morrow <jmorrow@chef.io>2019-11-21 09:07:59 -0800
committerJon Morrow <jmorrow@chef.io>2020-01-23 10:12:52 -0800
commit120c01a414db79a7111b3c89eba5999031718f96 (patch)
treebb2e250c2419a1b46c8a67d063fbb4a6cda1d3cd
parent5296043451ec30ac5b0e7f5d68034ac7dd0121ca (diff)
downloadchef-120c01a414db79a7111b3c89eba5999031718f96.tar.gz
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>
-rw-r--r--omnibus/Gemfile.lock10
-rw-r--r--omnibus/config/projects/chef.rb2
2 files changed, 6 insertions, 6 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 0b41eb8307..07113591e1 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.266.0)
+ aws-partitions (1.267.0)
aws-sdk-core (3.89.1)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -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