diff --git a/keyring/jb.gpg b/keyring/jb.gpg new file mode 100644 index 0000000000000000000000000000000000000000..5759b4f2d31955816a99c511b93f4c64cf4dd9d4 Binary files /dev/null and b/keyring/jb.gpg differ diff --git a/tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo b/tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo index 22fc6895a7e74cf069529da881206e19f2ec4144..be74785f37dadca68e43f21485bde83b1054f23c 100755 --- a/tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo +++ b/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_version-build$tbb_version_build/$file" \ - "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \ - "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" + if test "$builder" = 'jb'; then + file="$file.gpg" + urls=("https://cdn.devmole.eu/hashes//$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file") + else + file="$file.asc" + urls=( \ + "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file" \ + "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \ + "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \ + ) + fi + for url in "${urls[@]}" do if wget -q -O "$tmpfile" "$url"; then mv "$tmpfile" "$signed_version_dir/$file-$builder"