Commit 95ee823b authored by boklm's avatar boklm Committed by morgan
Browse files

Bug 41199: Update rcodesign to 0.27.0 

This also changes the installation directory to `rcodesign-128` instead
of `rcodesign`, since we want to keep the old version for stable
releases signing.
parent 79c986b6

projects/rcodesign/build

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_ta 
tar -C $builddir -xf $rootdir/[% c('input_files_by_name/cargo_vendor') %]



cd $builddir

mkdir .cargo

mkdir -p .cargo

cat >> .cargo/config << 'EOF'



[source.crates-io]

projects/rcodesign/config

+3 −3
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: 0.22.0

git_hash: cb406b5feb1439131f36ec60375f607a7f82439d

version: 0.27.0

git_hash: 703362f818272d43b3844105863739bcb6f1a11a

git_url: https://github.com/indygreg/apple-platform-rs.git

container:

  use_container: 1
@@ -16,4 +16,4 @@ steps: 
        project: rcodesign

        pkg_type: cargo_vendor

        norec:

          sha256sum: 04c21203d2948ebfa59f1039d4481e419e656ec636293b4846fdb7868cfd98f0
 
          sha256sum: c778deb784f68b48a51c6c54095c6cd45e37847d65e9db36ce39b4326874ae9c

tools/signing/rcodesign-notary-submit

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ display_name=$(display_name) 


tar -C "$tmpdir" -xf "$macos_rcodesign_signed_tar_dir/$(project-name)-macos-${tbb_version}-rcodesign-signed.tar.zst"



"$script_dir/../local/rcodesign/rcodesign" notary-submit --api-key-path "$appstoreconnect_api_key_path" --staple "$tmpdir/$display_name.app"

"$script_dir/../local/rcodesign-128/rcodesign" notary-submit --api-key-path "$appstoreconnect_api_key_path" --staple "$tmpdir/$display_name.app"



output_file="$(project-name)-${tbb_version}-notarized+stapled.tar.zst"

tar -C "$tmpdir" -caf "$tmpdir/$output_file" "$display_name.app"

tools/signing/set-config.rcodesign

+2 −2
Original line number Diff line number Diff line 
rcodesign_version=0.22.0-bc8cc7

rcodesign_version=0.27.0-e252fa

rcodesign_filename=rcodesign-${rcodesign_version}.tar.gz

rcodesign_sha256sum=2a9eda016fff116c59f52b358e7a740f6fb5c039974f0acc8266c3605d24092a

rcodesign_sha256sum=c228c5fb06a088bc6c50a212d8d5a15425c2bcdf448bfa7f94ea5cc41321c533

rcodesign_url="https://build-sources.tbb.torproject.org/${rcodesign_filename}"

tools/signing/setup-rcodesign

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ function setup_rcodesign { 
  tar -C "$tmpdir" -xf "$rcodesign_path"

  mv "$tmpdir/rcodesign" "$rcodesign_dir"

  chmod -R go+rX "$rcodesign_dir"

  rm -f "$localdir/rcodesign"

  ln -s "rcodesign-$rcodesign_version" "$localdir/rcodesign"

  rm -f "$localdir/rcodesign-128"

  ln -s "rcodesign-$rcodesign_version" "$localdir/rcodesign-128"

}



download_rcodesign