[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-12.5-1] 2 commits: fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser

Title: GitLab

Pier Angelo Vendrame pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits:

  • f115af33
    by Pier Angelo Vendrame at 2023-05-22T10:36:55+02:00 
    fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser

Bug 41776: Keep shipping the old fontconfig file until users have one
  • 5ec55d20
    by Pier Angelo Vendrame at 2023-05-22T10:36:56+02:00 
    fixup! Firefox preference overrides.

Bug 41732: Use font.system.whitelist also on Linux as a defense-in-depth

4 changed files:

Changes:

  • browser/app/profile/001-base-profile.js
    ... ... @@ -700,6 +700,8 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S
    700 700 
     #endif
    701 701
    702 702 
     #ifdef XP_LINUX
    703 
    +pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Math, Tinos, Twemoji Mozilla");
    704 
    +
    703 705 
     // Arabic
    704 706 
     pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos");
    705 707 
     pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Arimo");

  • tools/update-packaging/common.sh
    ... ... @@ -108,6 +108,28 @@ make_add_if_not_instruction() {
    108 108 
       echo "add-if-not \"$f\" \"$f\"" >> "$filev3"
    109 109 
     }
    110 110
    111 
    +check_for_add_if_update() {
    112 
    +  add_if_file_chk="$1"
    113 
    +
    114 
    +  # tor-browser#41776: We will remove with the old fontconfig file manually
    115 
    +  # outside the update process. So, let the updater add the file if there.
    116 
    +  # TODO: Remove once we do a watershed release.
    117 
    +  if [ "$add_if_file_chk" = "TorBrowser/Data/fontconfig/fonts.conf" ]; then
    118 
    +    ## "true" *giggle*
    119 
    +    return 0;
    120 
    +  fi
    121 
    +  ## 'false'... because this is bash. Oh yay!
    122 
    +  return 1;
    123 
    +}
    124 
    +
    125 
    +make_add_if_instruction() {
    126 
    +  f="$1"
    127 
    +  filev3="$2"
    128 
    +
    129 
    +  verbose_notice " add-if \"$f\" \"$f\""
    130 
    +  echo "add-if \"$f\" \"$f\"" >> "$filev3"
    131 
    +}
    132 
    +
    111 133 
     make_addsymlink_instruction() {
    112 134 
       link="$1"
    113 135 
       target="$2"

  • tools/update-packaging/make_full_update.sh
    ... ... @@ -106,6 +106,9 @@ for ((i=0; $i<$num_files; i=$i+1)); do
    106 106
    107 107 
       if check_for_add_if_not_update "$f"; then
    108 108 
         make_add_if_not_instruction "$f" "$updatemanifestv3"
    109 
    +  elif check_for_add_if_update "$f"; then
    110 
    +    # TODO: Remove once we do a watershed release
    111 
    +    make_add_if_instruction "$f" "$updatemanifestv3"
    109 112 
       else
    110 113 
         make_add_instruction "$f" "$updatemanifestv3"
    111 114 
       fi

  • tools/update-packaging/make_incremental_update.sh
    ... ... @@ -220,6 +220,13 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do
    220 220 
           continue 1
    221 221 
         fi
    222 222
    223 
    +    if check_for_add_if_update "$f"; then
    224 
    +      # TODO: Remove once we do a watershed release
    225 
    +      make_add_if_instruction "$f" "$updatemanifestv3"
    226 
    +      archivefiles="$archivefiles \"$f\""
    227 
    +      continue 1
    228 
    +    fi
    229 
    +
    223 230 
         if check_for_forced_update "$requested_forced_updates" "$f"; then
    224 231 
           # The full workdir may not exist yet, so create it if necessary.
    225 232 
           mkdir -p `dirname "$workdir/$f"`
    ... ... @@ -328,6 +335,9 @@ for ((i=0; $i<$num_newfiles; i=$i+1)); do
    328 335
    329 336 
       if check_for_add_if_not_update "$f"; then
    330 337 
         make_add_if_not_instruction "$f" "$updatemanifestv3"
    338 
    +  elif check_for_add_if_update "$f"; then
    339 
    +    # TODO: Remove once we do a watershed release
    340 
    +    make_add_if_instruction "$f" "$updatemanifestv3"
    331 341 
       else
    332 342 
         make_add_instruction "$f" "$updatemanifestv3"
    333 343 
       fi

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits