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

Commits:

2 changed files:

Changes:

  • keyring/jb.gpg
    No preview for this file type
  • tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo
    ... ... @@ -3,16 +3,24 @@ set -e
    3 3
     script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
    
    4 4
     source "$script_dir/functions"
    
    5 5
     
    
    6
    -for builder in $tb_builders
    
    6
    +for builder in $tb_builders jb
    
    7 7
     do
    
    8
    -  for file in sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.incrementals.txt.asc
    
    8
    +  for file in sha256sums-unsigned-build.txt sha256sums-unsigned-build.incrementals.txt
    
    9 9
       do
    
    10 10
         tmpfile=$(mktemp)
    
    11 11
         chmod 644 "$tmpfile"
    
    12
    -    for url in \
    
    13
    -      "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file" \
    
    14
    -      "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \
    
    15
    -      "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file"
    
    12
    +    if test "$builder" = 'jb'; then
    
    13
    +      file="$file.gpg"
    
    14
    +      urls=("https://cdn.devmole.eu/hashes//$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file")
    
    15
    +    else
    
    16
    +      file="$file.asc"
    
    17
    +      urls=( \
    
    18
    +        "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file" \
    
    19
    +        "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \
    
    20
    +        "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \
    
    21
    +      )
    
    22
    +    fi
    
    23
    +    for url in "${urls[@]}"
    
    16 24
         do
    
    17 25
           if wget -q -O "$tmpfile" "$url"; then
    
    18 26
             mv "$tmpfile" "$signed_version_dir/$file-$builder"