diff options
| author | Jon Morrow <jmorrow@chef.io> | 2019-11-21 09:07:59 -0800 |
|---|---|---|
| committer | Jon Morrow <jmorrow@chef.io> | 2019-12-19 08:09:52 -0800 |
| commit | bea001f46c5d1a82379fbcefc70d12c6bd0adfd3 (patch) | |
| tree | 47d7e48569e9297e7f6c00ac06da6e19d5839541 | |
| parent | f96d7fcc3cbbd771a0902025d588aca47b818818 (diff) | |
| download | chef-jm/deep_sign_14.tar.gz | |
Fixes all notarization issuesjm/deep_sign_14
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 | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 18 | ||||
| -rw-r--r-- | omnibus/config/projects/chef.rb | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 2a12aafccb..80a83e499d 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 ea8f2f32d9..a13d44fea6 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: 9fbb95fd6636a034874e9a7e3a1a02e4c8b74c2f - branch: master + revision: 7c399ab1525ad7d18ddf442913b0f398613b28c9 + branch: jm/deep_sign specs: - omnibus (6.1.18) + 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: bed563eb2e1872ab02b5cdaee07b3ef42491fd85 - branch: master + revision: 4b6f674f7cde84191a93c2d0fe8910377e8eb056 + branch: jm/deep_sign_chef specs: omnibus-software (4.0.0) omnibus (>= 5.6.1) @@ -32,16 +32,16 @@ GEM artifactory (3.0.5) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.251.0) - aws-sdk-core (3.84.0) + aws-partitions (1.257.0) + aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.26.0) + aws-sdk-kms (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.59.0) + aws-sdk-s3 (1.60.0) aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 20c400c2f2..f585bfc76d 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -84,7 +84,7 @@ end proj_to_work_around_cleanroom = self 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 |