richard pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: 3c23c8a8 by Nicolas Vigier at 2023-07-07T11:46:30+02:00 Bug 40889: Add mullvad sha256sums URL to download-unsigned-sha256sums-gpg-signatures-from-people-tpo

- - - - -

2 changed files:

- + keyring/jb.gpg - tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo

Changes:

===================================== keyring/jb.gpg ===================================== Binary files /dev/null and b/keyring/jb.gpg differ

===================================== tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo ===================================== @@ -3,16 +3,24 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions"

-for builder in $tb_builders +for builder in $tb_builders jb do - for file in sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.incrementals.txt.asc + for file in sha256sums-unsigned-build.txt sha256sums-unsigned-build.incrementals.txt do tmpfile=$(mktemp) chmod 644 "$tmpfile" - for url in \ - "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ver..." \ - "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tb..." \ - "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tb..." + if test "$builder" = 'jb'; then + file="$file.gpg" + urls=("https://cdn.devmole.eu/hashes//$SIGNING_PROJECTNAME/$tbb_version-build$tbb_v...") + else + file="$file.asc" + urls=( \ + "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ver..." \ + "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tb..." \ + "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tb..." \ + ) + fi + for url in "${urls[@]}" do if wget -q -O "$tmpfile" "$url"; then mv "$tmpfile" "$signed_version_dir/$file-$builder"

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3c...