- tbb-commits - lists.torproject.org

[tor-browser-build/master] Pick up rbm fixes for #33991 and #40019
by gk＠torproject.org 09 Apr '21

09 Apr '21

commit c1bc5e42b0629782db6866bd64a6d185f50d36d4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 9 11:16:42 2021 +0000 Pick up rbm fixes for #33991 and #40019 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index e010657..1ebbf5e 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit e0106571c78a43d1de17f5282b711896750d8462 +Subproject commit 1ebbf5ee34239a58d91e59acd0c2c85e1900aceb

1 0

[rbm/master] Bug 40019: Print build finish date and build time in logs
by gk＠torproject.org 09 Apr '21

09 Apr '21

commit 1ebbf5ee34239a58d91e59acd0c2c85e1900aceb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 8 17:57:47 2021 +0200 Bug 40019: Print build finish date and build time in logs --- lib/RBM.pm | 35 +++++++++++++++++++++++++++++++---- test/.gitignore | 1 + test/projects/test-log/config | 9 +++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 1294b4e..a81a290 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -2,6 +2,7 @@ package RBM; use warnings; use strict; +use DateTime; use Path::Tiny; use Encode qw(encode); use Cwd qw(getcwd); @@ -999,6 +1000,24 @@ sub system_log { exec(@args); } +sub log_start_time { + my ($log_file, $script_name) = @_; + my $start_time = DateTime->now; + my $start_time_txt = $start_time->ymd . ' ' . $start_time->hms; + path($log_file)->append_utf8("Starting build (script: $script_name): $start_time_txt\n"); + return $start_time; +} + +sub log_end_time { + my ($log_file, $script_name, $start_time) = @_; + my $end_time = DateTime->now; + my $end_time_txt = $end_time->ymd . ' ' . $end_time->hms; + path($log_file)->append_utf8("Finishing build (script: $script_name): $end_time_txt\n"); + my $build_time = $end_time - $start_time; + my ($bth, $btm, $bts) = $build_time->in_units('hours', 'minutes', 'seconds'); + path($log_file)->append_utf8("Build time: $bth hours $btm minutes and $bts seconds\n"); +} + sub build_run { my ($project, $script_name, $options) = @_; my $old_step = $config->{step}; @@ -1076,8 +1095,10 @@ sub build_run { $build_log = rbm_path($build_log); unlink $build_log unless $append; make_path(dirname($build_log)); - my $now = localtime; - path($build_log)->append_utf8("Starting build: $now\n"); + if (!-f $build_log) { + my $now = localtime; + path($build_log)->append_utf8("Opening log file: $now\n"); + } print "Build log: $build_log\n"; } chdir $srcdir; @@ -1103,7 +1124,10 @@ sub build_run { exec_name => $s, exec_as_root => $scripts_root{$s}, }); - if (run_script($project, $cmd, sub { system_log($build_log, @_) }) != 0) { + my $start_time = log_start_time($build_log, $s) if $build_log ne '-'; + my $res = run_script($project, $cmd, sub { system_log($build_log, @_) }); + log_end_time($build_log, $s, $start_time) if $build_log ne '-'; + if ($res != 0) { $error = "Error running $script_name"; if (project_config($project, 'debug', $options)) { print STDERR $error, "\nOpening debug shell\n"; @@ -1140,7 +1164,10 @@ sub build_run { foreach my $s (@scripts) { my $cmd = $scripts_root{$s} ? project_config($project, 'suexec', { suexec_cmd => "$srcdir/$s" }) : "$srcdir/$s"; - if (run_script($project, $cmd, sub { system_log($build_log, @_) }) != 0) { + my $start_time = log_start_time($build_log, $s) if $build_log ne '-'; + my $res = run_script($project, $cmd, sub { system_log($build_log, @_) }); + log_end_time($build_log, $s, $start_time) if $build_log ne '-'; + if ($res != 0) { $error = "Error running $script_name"; if (project_config($project, 'debug', $options)) { print STDERR $error, "\nOpening debug shell\n"; diff --git a/test/.gitignore b/test/.gitignore index 21bd609..bf1211f 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,2 +1,3 @@ out hg_clones +logs diff --git a/test/projects/test-log/config b/test/projects/test-log/config new file mode 100644 index 0000000..27c40b7 --- /dev/null +++ b/test/projects/test-log/config @@ -0,0 +1,9 @@ +# this project can be used for checking that log files are working +filename: test-log +build_log: 'logs/test-log.txt' +build: | + #!/bin/sh + echo blablabla + sleep 2 + echo ttttttttt + echo Z > [% dest_dir %]/[% c('filename') %]

1 0

[tor-browser/tor-browser-78.9.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 08 Apr '21

08 Apr '21

commit cac7f1f63e9b9713b1701163176e40931ff43dd7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Apr 8 14:38:26 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index caffa836a4ec..5264bddf8bc7 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit caffa836a4ec7f1bc7bf61951d954961aa6a9eff +Subproject commit 5264bddf8bc71cbb4e88921b55e7b95fa4522b69

1 0

[tor-browser-build/master] Bug 40268: Add Burmese (my) as a locale
by boklm＠torproject.org 08 Apr '21

08 Apr '21

commit d1caec896fbe4d0389805280735ff03b121ebdd1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 7 15:35:07 2021 +0000 Bug 40268: Add Burmese (my) as a locale --- rbm.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rbm.conf b/rbm.conf index d9da670..8c577a0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -86,6 +86,7 @@ var: - lt - mk - ms + - my - nb-NO - nl - pl @@ -119,6 +120,7 @@ var: - ka - ko - lt + - my - nb-rNO - nl - pl

1 0

[tor-launcher/master] Bug 40008: Add Burmese (my) as a locale
by gk＠torproject.org 08 Apr '21

08 Apr '21

commit 3dc433e81bbbc49fafab59cbb648ae1983f15dc5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 7 14:56:56 2021 +0000 Bug 40008: Add Burmese (my) as a locale --- chrome.manifest | 1 + jar.mn | 2 ++ localization/import-translations.sh | 2 +- src/chrome/locale/my/network-settings.dtd | 8 ++++---- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/chrome.manifest b/chrome.manifest index 1ee6e15..ab7aa8e 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -38,6 +38,7 @@ locale torlauncher ko chrome/locale/ko/ locale torlauncher lt chrome/locale/lt/ locale torlauncher mk chrome/locale/mk/ locale torlauncher ms chrome/locale/ms/ +locale torlauncher my chrome/locale/my/ locale torlauncher nb-NO chrome/locale/nb-NO/ locale torlauncher nl chrome/locale/nl/ locale torlauncher pl chrome/locale/pl/ diff --git a/jar.mn b/jar.mn index 8947a82..e229837 100644 --- a/jar.mn +++ b/jar.mn @@ -69,6 +69,8 @@ torlauncher.jar: locale/mk/ (src/chrome/locale/mk/*) % locale torlauncher ms %locale/ms/ locale/ms/ (src/chrome/locale/ms/*) +% locale torlauncher my %locale/my/ + locale/my/ (src/chrome/locale/my/*) % locale torlauncher nb-NO %locale/nb-NO/ locale/nb-NO/ (src/chrome/locale/nb-NO/*) % locale torlauncher nl %locale/nl/ diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 181560f..d5329e5 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -5,7 +5,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko lt mk ms nb-NO nl pl pt-BR ro ru sv-SE th tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sv-SE th tr vi zh-CN zh-TW" TRANSLATION_BRANCHES=" tor-launcher-network-settings diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd index a11cb06..858bb5e 100644 --- a/src/chrome/locale/my/network-settings.dtd +++ b/src/chrome/locale/my/network-settings.dtd @@ -5,7 +5,7 @@  <!ENTITY torlauncher.localePicker.title "Tor ဘရောင်ဇာ ဘာသာစကား"> -<!ENTITY torlauncher.localePicker.prompt "ကျေးဇူးပြု၍ ဘာသာစကားရွေးပါ"> +<!ENTITY torlauncher.localePicker.prompt "ကျေးဇူးပြု၍ ဘာသာစကားရွေးချယ်ပါ">  @@ -20,8 +20,8 @@ <!ENTITY torsettings.restartTor "Tor ကို ပြန်လည်စတင်မယ်"> <!ENTITY torsettings.reconfigTor "ပြန်ချိန်ညှိမယ်"> -<!ENTITY torsettings.discardSettings.prompt "Tor ချိတ်ဆက်တံတားများအား သင်စီမံထားရှိပြီပါပြီ သို့မဟုတ် လိုကယ်ကြားခံ proxy များ၏ အပြင်အဆင်များကို ရိုက်ထည့်ပြီးပါပြီ။   Tor ကွန်ယက်နှင့် တိုက်ရိုက်ချိတ်ဆက်ရန် ၎င်းအပြင်အဆင်များကို ဖယ်ရှားရပါမည်။"> -<!ENTITY torsettings.discardSettings.proceed "အပြင်မဆင်များ ဖယ်ရှားပြီး ချိတ်ဆက်မယ်"> +<!ENTITY torsettings.discardSettings.prompt "Tor ချိတ်ဆက်တံတားများအား သင်စီမံထားရှိပြီးပါပြီ သို့မဟုတ် လိုကယ်ကြားခံ proxy များ၏ အပြင်အဆင်များကို ရိုက်ထည့်ပြီးပါပြီ။   Tor ကွန်ယက်နှင့် တိုက်ရိုက်ချိတ်ဆက်ရန် ၎င်းအပြင်အဆင်များကို ဖယ်ရှားရပါမည်။"> +<!ENTITY torsettings.discardSettings.proceed "အပြင်အဆင်များ ဖယ်ရှားပြီး ချိတ်ဆက်မယ်"> <!ENTITY torsettings.optional "မဖြစ်မနေမဟုတ်"> @@ -59,7 +59,7 @@ <!ENTITY torsettings.bridgeHelp2 "အချို့သောနိုင်ငံများတွင် Tor ကို ပိတ်ပယ်ရန် ကြိုးစားခြင်းကြောင့် အချို့သော ချိတ်ဆက်တံတားများသည် အချို့နိုင်ငံတွင်သာ အလုပ်လုပ်ပြီး အခြားနိုင်ငံများတွင် အလုပ်မလုပ်ပါ။   သင့်နိုင်ငံတွင် မည်သည့် ချိတ်ဆက်တံတားများက အလုပ်လုပ်သည်ကို မသေချာလျှင် torproject.org/about/contact.html သို့ ဝင်ရောက်ကြည့်ရှုပေးပါ။ #support">  -<!ENTITY torprogress.pleaseWait "ကျွန်ုပ်တို့မှ Tor ကွန်ယက်နှင့် ချိတ်ဆက်မှု ထူထောင်နေတုန်း ခေတ္တစောင့်ပေးပါ။   ဤလုပ်ဆောင်မှုသည် မိနစ်အနည်းအငယ်ကြာနိုင်လိမ်းမည်။"> +<!ENTITY torprogress.pleaseWait "ကျွန်ုပ်တို့မှ Tor ကွန်ယက်နှင့် ချိတ်ဆက်မှု ထူထောင်နေတုန်း ခေတ္တစောင့်ပေးပါ။   ဤလုပ်ဆောင်မှုသည် မိနစ်အနည်းအငယ်ကြာနိုင်လိမ့်မည်။">  <!ENTITY torPreferences.categoryTitle "Tor">

1 0

[torbutton/master] Translations update
by gk＠torproject.org 08 Apr '21

08 Apr '21

commit 5264bddf8bc71cbb4e88921b55e7b95fa4522b69 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 7 15:24:02 2021 +0000 Translations update --- chrome/locale/ar/aboutTor.dtd | 4 ---- chrome/locale/bn-BD/aboutTor.dtd | 6 +----- chrome/locale/bn-BD/torbutton.dtd | 5 +++-- chrome/locale/ca/aboutTor.dtd | 4 ---- chrome/locale/cs/aboutTor.dtd | 4 ---- chrome/locale/da/aboutTor.dtd | 4 ---- chrome/locale/de/aboutTor.dtd | 4 ---- chrome/locale/el/aboutTor.dtd | 4 ---- chrome/locale/es-AR/aboutTor.dtd | 4 ---- chrome/locale/es-ES/aboutTor.dtd | 6 +----- chrome/locale/eu/aboutTor.dtd | 4 ---- chrome/locale/fa/aboutTor.dtd | 4 ---- chrome/locale/fr/aboutTor.dtd | 4 ---- chrome/locale/ga-IE/aboutTor.dtd | 4 ---- chrome/locale/he/aboutTor.dtd | 4 ---- chrome/locale/hu/aboutTor.dtd | 4 ---- chrome/locale/id/aboutTor.dtd | 4 ---- chrome/locale/id/torbutton.properties | 6 +++--- chrome/locale/is/aboutTor.dtd | 4 ---- chrome/locale/it/aboutTor.dtd | 4 ---- chrome/locale/ja/aboutTor.dtd | 4 ---- chrome/locale/ka/aboutTor.dtd | 4 ---- chrome/locale/ko/aboutTor.dtd | 4 ---- chrome/locale/lt/aboutTor.dtd | 4 ---- chrome/locale/mk/aboutTor.dtd | 4 ---- chrome/locale/ms/aboutTor.dtd | 4 ---- chrome/locale/nb-NO/aboutTor.dtd | 4 ---- chrome/locale/nl/aboutTor.dtd | 4 ---- chrome/locale/pl/aboutTor.dtd | 4 ---- chrome/locale/pt-BR/aboutTor.dtd | 4 ---- chrome/locale/ro/aboutTor.dtd | 4 ---- chrome/locale/ru/aboutTor.dtd | 4 ---- chrome/locale/sv-SE/aboutTor.dtd | 4 ---- chrome/locale/th/aboutTor.dtd | 4 ---- chrome/locale/tr/aboutTor.dtd | 4 ---- chrome/locale/vi/aboutTor.dtd | 4 ---- chrome/locale/zh-CN/aboutTor.dtd | 4 ---- chrome/locale/zh-TW/aboutTor.dtd | 4 ---- 38 files changed, 8 insertions(+), 151 deletions(-) diff --git a/chrome/locale/ar/aboutTor.dtd b/chrome/locale/ar/aboutTor.dtd index ba01471e..00f2f913 100644 --- a/chrome/locale/ar/aboutTor.dtd +++ b/chrome/locale/ar/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor متاح مجاناً بفضل تبرعات من أشخاص مثلك"> <!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> - - -<!ENTITY aboutTor.ey2020.useamask "لنستخدم قناعًا ،لنستخدم Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "لنواجه جائحة المراقبة."> diff --git a/chrome/locale/bn-BD/aboutTor.dtd b/chrome/locale/bn-BD/aboutTor.dtd index 35fed0f0..e52c4b7a 100644 --- a/chrome/locale/bn-BD/aboutTor.dtd +++ b/chrome/locale/bn-BD/aboutTor.dtd @@ -27,9 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "টর থেকে পাওয়া সর্বশেষ সব খবর সরাসরি আপনার ইনবক্সে দেখুন।"> <!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।"> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "আপনার মতো মানুষদের দানের জন্যই Tor বিনামূল্যে ব্যবহার করা যায়"> <!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! "> - - -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/bn-BD/torbutton.dtd b/chrome/locale/bn-BD/torbutton.dtd index 6e06a21e..6e01a3f2 100644 --- a/chrome/locale/bn-BD/torbutton.dtd +++ b/chrome/locale/bn-BD/torbutton.dtd @@ -24,7 +24,8 @@ <!ENTITY torbutton.prefs.sec_caption "নিরাপত্তার মাত্রা"> <!ENTITY torbutton.prefs.sec_caption_tooltip "সিকিউরিটি স্লাইডার আপনাকে নির্দিষ্ট ব্রাউজারের বৈশিষ্ট্যগুলি অক্ষম করতে দেয় যা আপনার ব্রাউজারকে হ্যাকিংয়ের প্রচেষ্টাগুলিকে আরও দুর্বল করে তুলতে পারে।"> <!ENTITY torbutton.prefs.sec_standard_label "মান"> -<!ENTITY torbutton.prefs.sec_standard_description "সমস্ত টর ব্রাউজার এবং ওয়েবসাইট বৈশিষ্ট্য সক্ষম করা হয়।"> +<!ENTITY torbutton.prefs.sec_standard_description "Tor ব্রাউজার এবং ওয়েবসাইটের সকল বৈশিষ্ট্য চালু আছে। +"> <!ENTITY torbutton.prefs.sec_safer_label "নিরাপদ"> <!ENTITY torbutton.prefs.sec_safer_description "ওয়েবসাইটের বৈশিষ্ট্যগুলি প্রায়ই বিপজ্জনক করে, যা কিছু সাইটগুলি কার্যকারিতা হারাতে বাধা দেয়।"> <!ENTITY torbutton.prefs.sec_safer_list_label "নিরাপদ সেটিংসে:"> @@ -50,4 +51,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "onion সার্ভিস ক্লায়েন্টের অথেনটিকেশন প্রম্পটটি খুলুন"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "এই চাবি বা কি-টিকে মনে রাখুন"> diff --git a/chrome/locale/ca/aboutTor.dtd b/chrome/locale/ca/aboutTor.dtd index 3d5966fc..0741dd00 100644 --- a/chrome/locale/ca/aboutTor.dtd +++ b/chrome/locale/ca/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor és d'ús gratuït gràcies als donatius de persones com vós."> <!ENTITY aboutTor.donationBanner.buttonA "Feu una donació"> - - -<!ENTITY aboutTor.ey2020.useamask "Useu una màscara, useu Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resistiu la pandèmia de la vigilància."> diff --git a/chrome/locale/cs/aboutTor.dtd b/chrome/locale/cs/aboutTor.dtd index 43b8f5f9..4a2a2e2b 100644 --- a/chrome/locale/cs/aboutTor.dtd +++ b/chrome/locale/cs/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor je zdarma k použití díky darům od lidí jako ty."> <!ENTITY aboutTor.donationBanner.buttonA "Přispějte"> - - -<!ENTITY aboutTor.ey2020.useamask "Noste masku, používejte Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Odolávejte pandemii dozoru."> diff --git a/chrome/locale/da/aboutTor.dtd b/chrome/locale/da/aboutTor.dtd index b7113175..09c87f8c 100644 --- a/chrome/locale/da/aboutTor.dtd +++ b/chrome/locale/da/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis at bruge takke være donationer fra personer som dig."> <!ENTITY aboutTor.donationBanner.buttonA "Donér nu"> - - -<!ENTITY aboutTor.ey2020.useamask "Brug en maske, brug Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Modsæt dig den pandemiske overvågning."> diff --git a/chrome/locale/de/aboutTor.dtd b/chrome/locale/de/aboutTor.dtd index 8e82ac2f..65f3834a 100644 --- a/chrome/locale/de/aboutTor.dtd +++ b/chrome/locale/de/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor ist aufgrund von Spenden von Leuten wie dir frei nutzbar."> <!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt"> - - -<!ENTITY aboutTor.ey2020.useamask "Nutze eine Maske, nutze Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Wehre dich gegen die Überwachungspandemie."> diff --git a/chrome/locale/el/aboutTor.dtd b/chrome/locale/el/aboutTor.dtd index 400bb4cc..8d17ba12 100644 --- a/chrome/locale/el/aboutTor.dtd +++ b/chrome/locale/el/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Το Tor είναι ελεύθερο λογισμικό, λόγω δωρεών από άτομα σαν κι εσάς."> <!ENTITY aboutTor.donationBanner.buttonA "Κάνε μια δωρεά τώρα"> - - -<!ENTITY aboutTor.ey2020.useamask "ΒΑΖΟΥΜΕ ΜΑΣΚΑ, ΒΑΖΟΥΜΕ TOR."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Κόντρα στην πανδημία της παρακολούθησης."> diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd index ce843db0..0c4ebb64 100644 --- a/chrome/locale/es-AR/aboutTor.dtd +++ b/chrome/locale/es-AR/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor puede ser usado libremente gracias a las donaciones de personas como vos."> <!ENTITY aboutTor.donationBanner.buttonA "Doná ahora"> - - -<!ENTITY aboutTor.ey2020.useamask "Usá un tapaboca, usá Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resistí a la pandemia de vigilancia."> diff --git a/chrome/locale/es-ES/aboutTor.dtd b/chrome/locale/es-ES/aboutTor.dtd index 04c2b2bb..0671a826 100644 --- a/chrome/locale/es-ES/aboutTor.dtd +++ b/chrome/locale/es-ES/aboutTor.dtd @@ -23,13 +23,9 @@ <!ENTITY aboutTor.torbrowser_user_manual.label "Manual del Tor Browser"> <!ENTITY aboutTor.tor_mission.label "El proyecto Tor es una organización sin fines de lucro definida legalmente en Estados Unidos como 501(c)(3), avanzando libertades y derechos humanos mediante la creación y despliegue de tecnologías de anonimato y privacidad sin costo y de fuente abierta, apoyando su disponibilidad y uso sin restricciones y ampliando su entendimiento científico y popular."> -<!ENTITY aboutTor.getInvolved.label "Involúcrate"> +<!ENTITY aboutTor.getInvolved.label "Involúcrate »"> <!ENTITY aboutTor.newsletter.tagline "Recibe las últimas noticias de Tor directamente en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "Se puede usar Tor libremente por las donaciones de personas como tu."> <!ENTITY aboutTor.donationBanner.buttonA "Dona ahora."> - - -<!ENTITY aboutTor.ey2020.useamask "Usa una mascarilla, usa Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resiste a la pandemia de vigilancia."> diff --git a/chrome/locale/eu/aboutTor.dtd b/chrome/locale/eu/aboutTor.dtd index 8fba9ac7..b115af74 100644 --- a/chrome/locale/eu/aboutTor.dtd +++ b/chrome/locale/eu/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Harpidetu Tor berrietara"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "Egin dohaintza orain"> - - -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/fa/aboutTor.dtd b/chrome/locale/fa/aboutTor.dtd index e1e7257b..44e1efbc 100644 --- a/chrome/locale/fa/aboutTor.dtd +++ b/chrome/locale/fa/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "ثبت‌نام برای اخبار Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor برای استفاده رایگان است، این به خاطر حمایت افرادی مانند شماست."> <!ENTITY aboutTor.donationBanner.buttonA "اکنون حمایت کنید"> - - -<!ENTITY aboutTor.ey2020.useamask "از ماسک استفاده کنید، از Tor استفاده کنید."> -<!ENTITY aboutTor.ey2020.resistsurveillance "در برابر دنیاگیری نظارت مقاومت کنید."> diff --git a/chrome/locale/fr/aboutTor.dtd b/chrome/locale/fr/aboutTor.dtd index 94ad9e03..c3dab6db 100644 --- a/chrome/locale/fr/aboutTor.dtd +++ b/chrome/locale/fr/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor peut être utilisé gratuitement grâce aux dons de personnes telles que vous."> <!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> - - -<!ENTITY aboutTor.ey2020.useamask "Utilisez un masque, utilisez Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Résistez à la pandémie de surveillance."> diff --git a/chrome/locale/ga-IE/aboutTor.dtd b/chrome/locale/ga-IE/aboutTor.dtd index d9d9a5cf..8f03245a 100644 --- a/chrome/locale/ga-IE/aboutTor.dtd +++ b/chrome/locale/ga-IE/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tá Tor saor in aisce a bhuí le bronntanais airgid ó dhaoine cosúil leatsa."> <!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> - - -<!ENTITY aboutTor.ey2020.useamask "Úsáid masc, úsáid Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Seas an fód in aghaidh phaindéim an fhaireachais."> diff --git a/chrome/locale/he/aboutTor.dtd b/chrome/locale/he/aboutTor.dtd index 4b1bd3e1..520d773b 100644 --- a/chrome/locale/he/aboutTor.dtd +++ b/chrome/locale/he/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor חינמי לשימוש בגלל תרומות מאנשים כמוך."> <!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו"> - - -<!ENTITY aboutTor.ey2020.useamask "עטה מסיכה, עטה את Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "התנגד למגפת המעקב הסמוי."> diff --git a/chrome/locale/hu/aboutTor.dtd b/chrome/locale/hu/aboutTor.dtd index 9868c504..0ea02599 100644 --- a/chrome/locale/hu/aboutTor.dtd +++ b/chrome/locale/hu/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez."> <!ENTITY aboutTor.donationBanner.freeToUse "A Tor ingyenes az Önhöz hasonló személyek támogatásai miatt."> <!ENTITY aboutTor.donationBanner.buttonA "Támogasson most"> - - -<!ENTITY aboutTor.ey2020.useamask "Használjon maszkot, használjon Tor-t."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Álljon ellen a lehallgatási pandémiának."> diff --git a/chrome/locale/id/aboutTor.dtd b/chrome/locale/id/aboutTor.dtd index df42da64..be1ecb07 100644 --- a/chrome/locale/id/aboutTor.dtd +++ b/chrome/locale/id/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor bebas digunakan karena donasi dari orang-orang seperti Anda."> <!ENTITY aboutTor.donationBanner.buttonA "Donasi Sekarang"> - - -<!ENTITY aboutTor.ey2020.useamask "Gunakan masker, gunakan Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Lawan pandemi pengawasan."> diff --git a/chrome/locale/id/torbutton.properties b/chrome/locale/id/torbutton.properties index 8b3be3e6..791df540 100644 --- a/chrome/locale/id/torbutton.properties +++ b/chrome/locale/id/torbutton.properties @@ -133,8 +133,8 @@ onionLocation.notNowAccessKey=n onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. onionLocation.tryThis=Try Onion Services onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time +onionLocation.learnMore=Pelajari Selengkapnya... +onionLocation.always=Selalu +onionLocation.askEverytime=Tanyakan setiap saat onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. onionLocation.onionServicesTitle=Layanan Onion diff --git a/chrome/locale/is/aboutTor.dtd b/chrome/locale/is/aboutTor.dtd index 435becb6..14bad9ac 100644 --- a/chrome/locale/is/aboutTor.dtd +++ b/chrome/locale/is/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> <!ENTITY aboutTor.donationBanner.freeToUse "Öllum er frjálst að nota Tor vegna styrkja frá fólki eins og þér."> <!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna"> - - -<!ENTITY aboutTor.ey2020.useamask "Fáðu þér grímu - notaðu Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Verðu þig fyrir eftirlitsfaraldrinum."> diff --git a/chrome/locale/it/aboutTor.dtd b/chrome/locale/it/aboutTor.dtd index 65fb7f49..34fe8006 100644 --- a/chrome/locale/it/aboutTor.dtd +++ b/chrome/locale/it/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "L'utilizzo di Tor è gratuito grazie alle donazioni fatte da persone come te."> <!ENTITY aboutTor.donationBanner.buttonA "Dona Adesso"> - - -<!ENTITY aboutTor.ey2020.useamask "Usa una maschera, usa Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resisti alla pandemia di sorveglianza."> diff --git a/chrome/locale/ja/aboutTor.dtd b/chrome/locale/ja/aboutTor.dtd index f1293ba7..10eb73a1 100644 --- a/chrome/locale/ja/aboutTor.dtd +++ b/chrome/locale/ja/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Tor ニュースに申し込む。"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor は皆さんからの寄付に支えられています。"> <!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> - - -<!ENTITY aboutTor.ey2020.useamask "マスクを使い、Tor も使おう。"> -<!ENTITY aboutTor.ey2020.resistsurveillance "監視パンデミックに対抗しよう。"> diff --git a/chrome/locale/ka/aboutTor.dtd b/chrome/locale/ka/aboutTor.dtd index 91923279..2bbdf85a 100644 --- a/chrome/locale/ka/aboutTor.dtd +++ b/chrome/locale/ka/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor უფასოა, თქვენნაირი ადამიანების შემოწირულობების დამსახურებით."> <!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა"> - - -<!ENTITY aboutTor.ey2020.useamask "გაიკეთეთ ნიღაბი, გამოიყენეთ Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "დაიცავით თავი, მეთვალყურეობის პანდემიისგან."> diff --git a/chrome/locale/ko/aboutTor.dtd b/chrome/locale/ko/aboutTor.dtd index 392643e3..04e6de97 100644 --- a/chrome/locale/ko/aboutTor.dtd +++ b/chrome/locale/ko/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor는 바로 당신과 같은 사람들의 기부 덕분에 자유롭게 사용할 수 있습니다."> <!ENTITY aboutTor.donationBanner.buttonA "기부하기"> - - -<!ENTITY aboutTor.ey2020.useamask "마스크를 쓰고, Tor도 쓰세요."> -<!ENTITY aboutTor.ey2020.resistsurveillance "감시의 대유행에 맞서세요."> diff --git a/chrome/locale/lt/aboutTor.dtd b/chrome/locale/lt/aboutTor.dtd index 66e29b42..4b711723 100644 --- a/chrome/locale/lt/aboutTor.dtd +++ b/chrome/locale/lt/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Užsisakykite Tor naujienas."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor yra nemokamas naudoti dėl paaukojimų iš tokių žmonių kaip jūs."> <!ENTITY aboutTor.donationBanner.buttonA "Paaukokite dabar"> - - -<!ENTITY aboutTor.ey2020.useamask "Dėvėkite kaukę, naudokite Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Pasipriešinkite sekimo pandemijai."> diff --git a/chrome/locale/mk/aboutTor.dtd b/chrome/locale/mk/aboutTor.dtd index 0ff2075f..5853c075 100644 --- a/chrome/locale/mk/aboutTor.dtd +++ b/chrome/locale/mk/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Пријавете се за Tor Вести."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor е бесплатен за користење благодарение на донациите од луѓе како вас."> <!ENTITY aboutTor.donationBanner.buttonA "Донирај сега"> - - -<!ENTITY aboutTor.ey2020.useamask "Користи маска, користи Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Спротивстави се на надзорот за време на пандемијата."> diff --git a/chrome/locale/ms/aboutTor.dtd b/chrome/locale/ms/aboutTor.dtd index 28fd2aaf..b49406f7 100644 --- a/chrome/locale/ms/aboutTor.dtd +++ b/chrome/locale/ms/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Daftar untuk dapatkan Berita Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor sepenuhnya percuma digunakan kerana adanya derma oleh individu seperti anda."> <!ENTITY aboutTor.donationBanner.buttonA "Dermalah Sekarang"> - - -<!ENTITY aboutTor.ey2020.useamask "Guna pelitup muka, guna juga Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Tangani pandemik pengawasan."> diff --git a/chrome/locale/nb-NO/aboutTor.dtd b/chrome/locale/nb-NO/aboutTor.dtd index 7ba3b842..15c0c327 100644 --- a/chrome/locale/nb-NO/aboutTor.dtd +++ b/chrome/locale/nb-NO/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor-nyheter."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis å bruke, grunnet bidrag fra folk som deg."> <!ENTITY aboutTor.donationBanner.buttonA "Donér nå"> - - -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd index 738de6bd..ca46073b 100644 --- a/chrome/locale/nl/aboutTor.dtd +++ b/chrome/locale/nl/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Meld u aan voor de Tor-nieuwsbrief."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is gratis te gebruiken dankzij donaties van mensen zoals u."> <!ENTITY aboutTor.donationBanner.buttonA "Doneer nu"> - - -<!ENTITY aboutTor.ey2020.useamask "Gebruik een masker, gebruik Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Verzet je tegen de surveillancepandemie."> diff --git a/chrome/locale/pl/aboutTor.dtd b/chrome/locale/pl/aboutTor.dtd index da82b8b6..f67d40b9 100644 --- a/chrome/locale/pl/aboutTor.dtd +++ b/chrome/locale/pl/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Zapisz się na newsletter."> <!ENTITY aboutTor.donationBanner.freeToUse "Z przeglądarki Tor można korzystać bezpłatnie dzięki darowiznom od osób takich jak Ty."> <!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz"> - - -<!ENTITY aboutTor.ey2020.useamask "Użyj maski, użyj Tora."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Przeciwstaw się pandemii nadzoru."> diff --git a/chrome/locale/pt-BR/aboutTor.dtd b/chrome/locale/pt-BR/aboutTor.dtd index 1ba8a0bb..10cc06e9 100644 --- a/chrome/locale/pt-BR/aboutTor.dtd +++ b/chrome/locale/pt-BR/aboutTor.dtd @@ -30,7 +30,3 @@ <!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "O Tor é gratuito graças às doações de pessoas como você."> <!ENTITY aboutTor.donationBanner.buttonA "Doe Agora"> - - -<!ENTITY aboutTor.ey2020.useamask "Use uma mascara, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resista à pandemia de vigilância."> diff --git a/chrome/locale/ro/aboutTor.dtd b/chrome/locale/ro/aboutTor.dtd index b3149592..07488af9 100644 --- a/chrome/locale/ro/aboutTor.dtd +++ b/chrome/locale/ro/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Abonează-te la Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor poate fi folosit gratuit datorită donațiilor de la oameni ca tine."> <!ENTITY aboutTor.donationBanner.buttonA "Donează Acum"> - - -<!ENTITY aboutTor.ey2020.useamask "Folosește o mască, folosește Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Rezistă pandemiei de supraveghere."> diff --git a/chrome/locale/ru/aboutTor.dtd b/chrome/locale/ru/aboutTor.dtd index 4986b82e..372bbcd5 100644 --- a/chrome/locale/ru/aboutTor.dtd +++ b/chrome/locale/ru/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor бесплатен благодаря пожертвованиям таких людей, как вы."> <!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> - - -<!ENTITY aboutTor.ey2020.useamask "Используйте Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Не поддавайтесь пандемии слежки."> diff --git a/chrome/locale/sv-SE/aboutTor.dtd b/chrome/locale/sv-SE/aboutTor.dtd index 44cf9c7c..62b20513 100644 --- a/chrome/locale/sv-SE/aboutTor.dtd +++ b/chrome/locale/sv-SE/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor är gratis att använda på grund av donationer från personer som du."> <!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> - - -<!ENTITY aboutTor.ey2020.useamask "Använd en mask, använd Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Stå emot övervakningspandemin."> diff --git a/chrome/locale/th/aboutTor.dtd b/chrome/locale/th/aboutTor.dtd index 0946f46d..d9671769 100644 --- a/chrome/locale/th/aboutTor.dtd +++ b/chrome/locale/th/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "สมัครรับข่าวสารเกี่ยวกับ Tor"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "ร่วมบริจาค"> - - -<!ENTITY aboutTor.ey2020.useamask "ใช้หน้ากาก ใช้ Tor"> -<!ENTITY aboutTor.ey2020.resistsurveillance "ต้านเชื้อสอดแนมระบาด"> diff --git a/chrome/locale/tr/aboutTor.dtd b/chrome/locale/tr/aboutTor.dtd index cb28a8c1..d36cc0fd 100644 --- a/chrome/locale/tr/aboutTor.dtd +++ b/chrome/locale/tr/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Tor Duyurularına Abone Olun"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor sizin gibi insanların bağışları ile desteklendiği için ücretsiz olarak kullanılabilir."> <!ENTITY aboutTor.donationBanner.buttonA "Bağış Yapın"> - - -<!ENTITY aboutTor.ey2020.useamask "Maske kullanın, Tor kullanın."> -<!ENTITY aboutTor.ey2020.resistsurveillance "İzleme salgınından korunun."> diff --git a/chrome/locale/vi/aboutTor.dtd b/chrome/locale/vi/aboutTor.dtd index 30607b19..b6bf4286 100644 --- a/chrome/locale/vi/aboutTor.dtd +++ b/chrome/locale/vi/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor miễn phí là nhờ sự ủng hộ của những người như bạn."> <!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ"> - - -<!ENTITY aboutTor.ey2020.useamask "Hãy dùng khẩu trang, hãy dùng Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Cùng nhau chống đại dịch giám sát."> diff --git a/chrome/locale/zh-CN/aboutTor.dtd b/chrome/locale/zh-CN/aboutTor.dtd index 329f2995..5b4f5fa7 100644 --- a/chrome/locale/zh-CN/aboutTor.dtd +++ b/chrome/locale/zh-CN/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "订阅 Tor 的最新动态"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor 是免费使用的，因为有和您一样的人捐助。"> <!ENTITY aboutTor.donationBanner.buttonA "立即捐助"> - - -<!ENTITY aboutTor.ey2020.useamask "口罩防病毒，Tor防监控。"> -<!ENTITY aboutTor.ey2020.resistsurveillance "抗击“监控”全球流行病。"> diff --git a/chrome/locale/zh-TW/aboutTor.dtd b/chrome/locale/zh-TW/aboutTor.dtd index 2b7abb5e..79e06ab4 100644 --- a/chrome/locale/zh-TW/aboutTor.dtd +++ b/chrome/locale/zh-TW/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> <!ENTITY aboutTor.donationBanner.freeToUse "由於有像您這樣的人的捐款，Tor 可以免費使用。"> <!ENTITY aboutTor.donationBanner.buttonA "立刻捐款"> - - -<!ENTITY aboutTor.ey2020.useamask "口罩維持身體健康，Tor 保護網路安全。"> -<!ENTITY aboutTor.ey2020.resistsurveillance "抵制全面監控。">

1 0

[torbutton/master] Bug 40033: Add Burmese (my) as a locale
by gk＠torproject.org 08 Apr '21

08 Apr '21

commit 08a0ef57daae24d15d509765363a50e7ec100ca9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 7 15:23:38 2021 +0000 Bug 40033: Add Burmese (my) as a locale --- chrome/locale/my/aboutDialog.dtd | 19 ++++ chrome/locale/my/aboutTBUpdate.dtd | 8 ++ chrome/locale/my/aboutTor.dtd | 56 ++++------ chrome/locale/my/brand.dtd | 17 ++- chrome/locale/my/brand.properties | 19 ++-- chrome/locale/my/branding/brand.ftl | 12 +- chrome/locale/my/browserOnboarding.properties | 72 ++++++++++++ chrome/locale/my/torbutton.dtd | 51 +++++++-- chrome/locale/my/torbutton.properties | 155 ++++++++++++++++++++++---- import-translations.sh | 2 +- jar.mn | 2 + 11 files changed, 328 insertions(+), 85 deletions(-) diff --git a/chrome/locale/my/aboutDialog.dtd b/chrome/locale/my/aboutDialog.dtd new file mode 100644 index 00000000..74eef2f4 --- /dev/null +++ b/chrome/locale/my/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; ááá¯ áááºáá®ážáá°áááº "> + +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end "á áááºážáááº á¡áœááºááá¯ááºážáá±á«áºááœááº áááºá áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±áž ááŸáá·áº ááœááºáááºááœáá·áºááá¯ áá¯áá¶áá¬ááœááºáááº áá¯ááºáá±á¬ááºáá±á¬ á¡áá»áá¯ážá¡ááŒááºááá°áá±á¬ á¡ááœá²á·á¡áááºážáááºáá¯ááŒááºáááºá"> + +<!ENTITY help.start "áá°áá®áá»ááºáá«ááá¬áž?"> + +<!ENTITY help.donateLink "ááŸá°áá«ááºážáááº"> +<!ENTITY help.or "ááá¯á·ááá¯ááº"> + +<!ENTITY help.getInvolvedLink "áá«áááºáá¯ááºáá±á¬ááºáááº"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "áá±ážááá¬áá»á¬ážááŸááŠážááá¬áž?"> + +<!ENTITY bottomLinks.grow "Tor ááœááºáááºááá¯ ááŒá®ážááœá¬ážáááºáá°áá®áá«!"> + +<!ENTITY bottomLinks.license "ááá¯ááºáááºá¡ááŒá±á¬ááºáž áááá±á¬ááºážááá¬"> +<!ENTITY tor.TrademarkStatement ""Tor" ááŸáá·áº "Onion Logo" (ááŒááºááœááºáá®á¡ááŸááºáá¶ááááºáááºá¹áá±á) áááº Tor Project, Inc. áááŸááºáá¯á¶áááºáá¬ážáá±á¬áá¯ááºá¡ááŸááºáá¶ááááºááŒááºáááºá"> diff --git a/chrome/locale/my/aboutTBUpdate.dtd b/chrome/locale/my/aboutTBUpdate.dtd new file mode 100644 index 00000000..3878e860 --- /dev/null +++ b/chrome/locale/my/aboutTBUpdate.dtd @@ -0,0 +1,8 @@ +<!ENTITY aboutTBUpdate.changelogTitle "Tor ááá±á¬ááºáá¬ ChangeLog (ááŒá±á¬ááºážáá²ááŸá¯ááŸááºáááºáž)"> +<!ENTITY aboutTBUpdate.updated "Tor ááá±á¬ááºáá¬ááá¯ á¡ááºááááºááŒá¯áá¯ááºáá¬ážáááºá"> +<!ENTITY aboutTBUpdate.linkPrefix "á€áá¯ááºááœáŸááºááŸá¯ááŸáá·áº áááºáááºá áá±á¬ááºáá¯á¶ážáá±á«áº ááááºážá¡áá»ááºá¡áááºáá»á¬ážá¡ááœááº"> +<!ENTITY aboutTBUpdate.linkLabel "áá»áœááºá¯ááºááá¯á·ááááºááºááá¯ááºááá¯á· áááºáá±á¬ááºááŒáá·áºááŸá¯áá«"> +<!ENTITY aboutTBUpdate.linkSuffix "á"> +<!ENTITY aboutTBUpdate.version "áá¬ážááŸááºáž"> +<!ENTITY aboutTBUpdate.releaseDate "ááŒááºá·áá»á®áááºá·áááºááœá²"> +<!ENTITY aboutTBUpdate.releaseNotes "ááŒáá·áºáá»á®ááŸááºáá»ááºáá»á¬áž"> diff --git a/chrome/locale/my/aboutTor.dtd b/chrome/locale/my/aboutTor.dtd index 9f14022b..bdde5b28 100644 --- a/chrome/locale/my/aboutTor.dtd +++ b/chrome/locale/my/aboutTor.dtd @@ -1,47 +1,31 @@  -<!ENTITY aboutTor.title "About Tor"> +<!ENTITY aboutTor.title "Tor á¡ááŒá±á¬ááºáž"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> +<!ENTITY aboutTor.viewChangelog.label "ááŒá±á¬ááºážáá²ááŸááºáááºáž ááŒááºá·áááº"> -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> +<!ENTITY aboutTor.ready.label "áá¯á¶ááŒá¯á¶ááœá¬ áá¯á¶ážááœá²áá«á"> +<!ENTITY aboutTor.ready2.label "áááºáááº á¡ááºáá¬áááºááá¯ á¡áá¯á¶ááŒá¯á¶áá¯á¶ážááœá¬ áá¯á¶ážááœá²ááá¯á· á¡áááºáááºá·ááŒááºáá«ááŒá®á"> +<!ENTITY aboutTor.failure.label "áááºáá¯áá¯ ááŸá¬ážááœááºážááœá¬ážáá«áááº!"> +<!ENTITY aboutTor.failure2.label "á€ ááá±á¬ááºáá¬ááœááº Tor á¡áá¯ááºááá¯ááºáá«á"> -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> +<!ENTITY aboutTor.search.label "DuckDuckGo ááŒááºá· ááŸá¬ááœá±áááº"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "áá±ážááá¬áá»á¬áž ááŸááŠážááá¬áž?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "áá»áœááºá¯ááºááá¯á· Tor ááá±á¬ááºáá¬ áááºááœá²áá¬á¡á¯ááºá¡á¬áž ááŒáá·áºááŒááºá·áá« Â»"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor ááá±á¬ááºáá¬ áááºááœá²áá¬á¡á¯ááº"> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> +<!ENTITY aboutTor.tor_mission.label "Tor Project áááº áá°á·á¡ááœááºá·á¡áá±ážááŸááºá· ááœááºáááºáá±ážááœááºá·áá»á¬ážááá¯ ááá¯ážáááºáá±áááº á¡áá±áááááº á¡áá»áá¯ážá¡ááŒááºááá°áá±á¬ ááá(á)(á) á¡ááœá²á·á¡áááºážáááºáá¯ ááŒááºáá«áááºá ááœááºáááºá á¡áááºááŸááºáá¬ á¡áá»á¬ážáá¯á¶ážááá¯ááºááŒá®áž áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±ážáá±á¬ááºá·ááŸá±á¬ááºáá±á¬ áááºážááá¬áá»á¬áž á¡áá¯á¶ážááŒá¯áá«áááºá áááºážáááºážááá¬áá»á¬ážááá¯ á¡áááºá·á¡áááºáááŸáááœá¬ áá¯á¶ážááœá²ááá¯ááºááŒááºážááŸááºá· áááá¹áá¶ááá¯ááºáá¬ááŸááºá· ááŒááºáá°áá»á¬ážáá¬ážáááºááá¯ááºáá±áááº áá¶á· ááá¯ážáá±á¬ááºáá¶á·áá«áááºá"> +<!ENTITY aboutTor.getInvolved.label "áá«áááºáá« Â»"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.newsletter.tagline "Tor ááŸ áá±á¬ááºáá¯á¶ážááááºážáá»á¬ážááá¯ áááºá· áá¬áááºáá¯á¶ážáá²áááºáž ááá°ááá¯ááºáá«á"> +<!ENTITY aboutTor.newsletter.link_text "Tor News ááááºážáá»á¬ážá¡ááœááº á¡áááº áá¬áááºážááœááºážááá¯ááºáá«á"> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor áááº áááºá·ááá¯ áá¯á¶ážáá°áá»á¬ážááŸ ááŸá°áá«ááºážááœá±ááŒá±á¬ááºá· á¡ááá²á·áá¯á¶ážááá¯ááºáá«áááºá"> +<!ENTITY aboutTor.donationBanner.buttonA "á¡áá¯áá² ááŸá°áááº"> diff --git a/chrome/locale/my/brand.dtd b/chrome/locale/my/brand.dtd index 6b072f5c..6df03e49 100644 --- a/chrome/locale/my/brand.dtd +++ b/chrome/locale/my/brand.dtd @@ -2,11 +2,18 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY brandShorterName "Tor ááá±á¬ááºáá¬"> +<!ENTITY brandShortName "Tor ááá±á¬ááºáá¬"> +<!ENTITY brandFullName "Tor ááá±á¬ááºáá¬"> +<!ENTITY vendorShortName "Tor áá®áá¶ááááºáž ááá±á¬áá»ááº"> +<!ENTITY trademarkInfo.part1 ""Tor" ááŸáá·áº "Onion Logo" (ááŒááºááœááºáá®á¡ááŸááºáá¶ááááºáááºá¹áá±á) áááº Tor Project, Inc. á ááŸááºáá¯á¶áááºáá¬ážáá±á¬ áá¯ááºá¡ááŸááºáá¶ááááºááŒááºáááºá">  -<!ENTITY brandProductName "Tor Browser"> +<!ENTITY brandProductName "Tor ááá±á¬ááºáá¬"> + + +<!ENTITY plugins.installed.find "áááºááœááºážáá¬ážáá±á¬ áááºááá¯ážááááºáá±á¬á·áá²áá»á¬ážááá¯ áááºáá¯á¶ážáááº ááŸáááºáá«"> +<!ENTITY plugins.installed.enable "áááºááá¯áž áá±á¬á·áá²áá»á¬áž ááœááºá·áááº"> +<!ENTITY plugins.installed.disable "áááºááá¯áž áá±á¬á·áá²áá»á¬áž ááááºáááº"> +<!ENTITY plugins.installed.disable.tip "áááºááá¯ážááááºáá±á¬á·áá²áá»á¬ážááá¯ áááºáá¯á¶ážááŒááºážááŸâ ááŸá±á¬ááºááŒá¥áºáááº ááŸáááºáá«"> diff --git a/chrome/locale/my/brand.properties b/chrome/locale/my/brand.properties index 1ba6ed31..385dab96 100644 --- a/chrome/locale/my/brand.properties +++ b/chrome/locale/my/brand.properties @@ -2,18 +2,19 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Tor Browser -brandFullName=Tor Browser +brandShorterName=Tor ááá±á¬ááºáá¬ +brandShortName=Tor ááá±á¬ááºáá¬ +brandFullName=Tor ááá±á¬ááºáá¬ # LOCALIZATION NOTE(brandProductName): # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -brandProductName=Tor Browser -vendorShortName=Tor Project +brandProductName=Tor ááá±á¬ááºáá¬ +vendorShortName=Tor áá®áá¶ááááºáž ááá±á¬áá»ááº -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Startá ááŸá¬ááœá±áááº áááááá¬ááœááºážáá¬ážááŒá®áž áá»ááºááŒááºáá±á¬ áááºááá¬áá»ááºááŸá¬ +homePageImport=%S áá¶ááŸ áááºá· áááºááá¬áá»ááºááŸá¬ áááºááœááºážáá« -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=áááºá áá¬áá»ááºááŸá¬ ááœá±ážáá»ááºááŸá¯ +homePageMigrationDescription=áááºáá¯á¶ážááá¯áá±á¬ áááºááá¬áá»ááºááŸá¬ááá¯ ááœá±ážáá±ážáá« - -syncBrandShortName=Sync +syncBrandShortName=ááá¯ááºááá¯ááºááŸááá°áááº diff --git a/chrome/locale/my/branding/brand.ftl b/chrome/locale/my/branding/brand.ftl index af1fd648..d859549c 100644 --- a/chrome/locale/my/branding/brand.ftl +++ b/chrome/locale/my/branding/brand.ftl @@ -2,11 +2,11 @@ # that is used by Firefox) to avoid picking up the -brand-short-name values # that Mozilla includes in the Firefox language packs. --brand-shorter-name = Tor Browser --brand-short-name = Tor Browser --brand-full-name = Tor Browser +-brand-shorter-name = Tor ááá±á¬ááºáá¬ +-brand-short-name = Tor ááá±á¬ááºáá¬ +-brand-full-name = Tor ááá±á¬ááºáá¬ # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = Tor Browser --vendor-short-name = Tor Project -trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc. +-brand-product-name = Tor ááá±á¬ááºáá¬ +-vendor-short-name = Tor áá®áá¶ááááºáž ááá±á¬áá»ááº +trademarkInfo = 'Tor' ááŸáá·áº 'Onion Logo' (ááŒááºááœááºáá®á¡ááŸááºáá¶ááááºáááºá¹áá±á) áááº Tor Project, Inc. á ááŸááºáá¯á¶áááºáá¬ážáá±á¬ áá¯ááºá¡ááŸááºáá¶ááááºááŒááºáááºá diff --git a/chrome/locale/my/browserOnboarding.properties b/chrome/locale/my/browserOnboarding.properties new file mode 100644 index 00000000..1dbe28c9 --- /dev/null +++ b/chrome/locale/my/browserOnboarding.properties @@ -0,0 +1,72 @@ +# Copyright (c) 2019, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=ááŒáá¯ááá¯áá«áááº +onboarding.tour-tor-welcome.title=áááº á¡áááºáááºá·ááŒááºáá«ááŒá®á +onboarding.tour-tor-welcome.description=Tor ááá±á¬ááºáá¬áááº á¡ááºáá¬áááºáá¯á¶ážááœá²áá¥áº á¡ááŒááºá·áá¯á¶áž áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶ááŸá¯á¡á¬áž áá±ážááá¯á·áá«áááºá áááºá· á¡áœááºááá¯ááºážááŒá±áá¬ááá¯ááºáá¶áááŒááºážá áá±á¬ááºá·ááŒááºá·áá¶áááŒááºáž ááŸááºá· áááºáá¬áá¶áááŒááºážááá¯á·ááŸ ááá¯áá¬ááœááºáá¬ážáá±ážáá«áááºá á€ áááºážááœáŸááºááá¯áááº áááºá·á¡á¬ážáááºáá²á·ááá¯á· áá¬ááœááºáá±ážáááºááá¯ ááŸááºážááŒáá«áááºá +onboarding.tour-tor-welcome.next-button=áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±áž ááá¯á·ááœá¬ážáááº + +onboarding.tour-tor-privacy=áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±áž +onboarding.tour-tor-privacy.title=áááºá· á¡áœááºááá¯ááºážááŒá±áá¬ááá¯ááºáá°áá»á¬ážááŸááºá· ááá±á¬ááºáá»á¬ážááá¯ áááºáá»áá«á +onboarding.tour-tor-privacy.description=Tor ááá±á¬ááºáá¬áááº ááœááºáá®ážáá»á¬ážááá¯ áá®ážááŒá¬ážááœá¬áá¬ážá áááºá· ááá±á¬ááºáá¬ áá¬ááááºá¡á¬áž áááºá¡áá¯á¶ážááŒá¯ááŒá®ážáá»áŸááº áá»ááºááááºážáá±ážáá«áááºá á€áá¯ááºáá±á¬ááºááŸá¯áá»á¬ážáááº ááá±á¬ááºáá¬á¡ááœááºážááŸá áááºá·áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶ááŸá¯ááá¯ áá±á¬ááºá·ááŸá±á¬ááºáá±ážáá«áááºá "Tor ááœááºáááº" ááá¯ááŸáááºá áá»áœááºá¯ááºááá¯á·ááŸ ááœááºáááºá¡áááºá·ááœááº áááºá·ááá¯áááºáá²á·ááá¯á· áá¬ááœááºááŸá¯áá±ážáááºááá¯ áá±á·áá¬áá«á +onboarding.tour-tor-privacy.button=Tor ááœááºáááº ááá¯á·ááœá¬ážáááº + +onboarding.tour-tor-network=Tor ááœááºáááº +onboarding.tour-tor-network.title=áááá¯ááááºážáá»á¯ááºááŸá¯ áááŸááá±á¬ ááœááºáááºáá±á«áº áááºááá¯ááºáá«á +onboarding.tour-tor-network.description=ááá¹áá¬á¡ááŸá¶á·ááŸá áá¯ááºá¡á¬ážáá±ážáá°áá»á¬ážááŸ áááºáááºáá±ážáá±á¬ Tor ááœááºáááºááá¯ áááºááŸááºá· Tor ááá±á¬ááºáá¬ááŸ áá»áááºáá±ážáá«áááºá á¡ááºáá¬áááºááá¯ áá¯á¶ááŒá¯á¶ááœá¬áá¶áá¬ážááá¯ááºáááºá¡ááœááº VPN ááŸááºá·ááá°áá² áá»ááºááœááºááŸá¯áááŸááá« ááá¯á·ááá¯ááº áááá¯áá»á¯ááºá¡áá¬áááºáá¯á¡á¬áž áá¯á¶ááŒááºáááºáááá¯áá«á +onboarding.tour-tor-network.description-para2=á¡áááº - Tor ááœááºáááº á¡ááŒááºá¡áááºáá»á¬ážááá¯ áá»áááºááŸááá»ááºáá»á¬áž (âPreferences) ááá¯áááºá· ááá¹áááœááº ááœá±á·ááŸáááá¯ááºáá«áááºá (á¡áá»ááºážáá»ááºážáá»áááºáááºá áá»áœá±áá¬ááŒááºážáá¯ááºáá¥áºáá»á¬áž (bridges) áá±á¬ááºážááá¯ááá¯ááºááŒááºáž á¡áá«á¡áááº) +onboarding.tour-tor-network.action-button=áááºá· Tor ááœááºáááº á¡ááŒááºá¡áááºáá»á¬áž áá»áááºááŸááá« +onboarding.tour-tor-network.button=áááºážááŒá±á¬ááºážáá¥áº ááá¯á·ááœá¬ážáááº + +onboarding.tour-tor-circuit-display=áááºážááŒá±á¬ááºážáá¥áº +onboarding.tour-tor-circuit-display.title=áááºá·áááºážááŒá±á¬ááºážááá¯ ááŒááºá·áá«á +onboarding.tour-tor-circuit-display.description=áááºáááºáá±á¬ááºááŒááºá·ááŸá¯áááºá· ááá¯ááááºážáááºáá¯áá»ááºážáá®á¡ááœááº áááºá·á¡ááœá¬ážá¡áá¬áá»á¬ážááá¯ áááºáááºá·áááºážá ááá¹áá¬á¡ááŸá¶á·ááŸáâ Tor áááºážááŒá±á¬ááºáž á áá¯áá±á«áºá áá¯ááºááŒááºá·ááŒá±á¬ááºážáá²ááŸááºáá«áááºáâ áááºáááºáááºá·áá±áá¬ááŸ áááºááœááºáá±áááºááá¯ áááºáááºá·áááºááá¯ááºááá»áŸ ááááá«á áá»áœááºá¯ááºááá¯á·á áááºážááŒá±á¬ááºážáá¥áºááŸá "á€ááá¯ááºá¡ááœááº áááºážááŒá±á¬ááºážá¡áááº" ááá¯ ááŸáááºá áááºážááŒá±á¬ááºážá¡áááºááá¯ áááºáá±á¬ááºážááá¯ááá¯ááºáá«áááºá +onboarding.tour-tor-circuit-display.button=áá»áœááºá¯ááºá áááºážááŒá±á¬ááºážááŒááºá·áááº +onboarding.tour-tor-circuit-display.next-button=áá¯á¶ááŒá¯á¶áá±áž ááá¯á·ááœá¬ážáááº + +onboarding.tour-tor-security=áá¯á¶ááŒá¯á¶áá±áž +onboarding.tour-tor-security.title=áááºá· á¡ááœá±á·á¡ááŒá¯á¶ááá¯ ááœá±ážáá«á +onboarding.tour-tor-security.description=áá»áœááºá¯ááºááá¯á·áááº áááºá· ááá±á¬ááºáá¬áá¯á¶ááŒá¯á¶ááŸá¯ááá¯ ááá¯ááá¯áá¯á¶ááŒá¯á¶áá±áááº áááºá·á¡á¬áž á¡ááá¯á¡ááŒááºá¡áááºáá»á¬ážááŸááá«áááºá áá»áœááºá¯ááºááá¯á·á áá¯á¶ááŒá¯á¶áá±áž á¡ááŒááºá¡áááºáá»á¬ážáááº áááºá·ááœááºáá»á°áá¬ááá¯ ááá¯ááºááá¯ááºááá¯ááºáá±á¬ á¡áá¬áá»á¬ážááá¯ ááááºáááºááá¯ááºáá«áááºá á¡á±á¬ááºááœááº ááŸáááºá áááºááá¯á· ááŒááºáááºááá¯ááºáááº áá±á·áá¬áá«á +onboarding.tour-tor-security.description-suffix=ááŸááºáá»ááº - NoScript ááŸááºá· HTTPS Everywhere ááá¯áá±á¬ áááºááá¯ážáá±á¬á·áá²áá»á¬ážáááº áááááá¬á¡á¶áá²ááœááº áá°áááŒááºáááºááŸá¯á¡á ááá«áá«á ááá¯á·áá±á¬áºáºáááºáž áááºááŸ áááááá¬á¡á¶ááá¯ ááááºááŒáá¯ááºááœá¬ ááŒá±á¬ááºážá áááºážááá¯á·ááá¯ áá±á«ááºážáááºá·ááá¯ááºáá«áááºá +onboarding.tour-tor-security-level.button=áááºá· áá¯á¶ááŒá¯á¶áá±ážá¡áááºá·ááá¯ ááŒááºá·áááº +onboarding.tour-tor-security-level.next-button=á¡ááœá±á·á¡ááŒá¯á¶ á¡ááŒá¶áá±ážáá»ááºáá»á¬ážááá¯á· ááœá¬ážáááº + +onboarding.tour-tor-expect-differences=á¡ááœá±á·á¡ááŒá¯á¶ á¡ááŒá¶áá±ážáá»ááºáá»á¬áž +onboarding.tour-tor-expect-differences.title=á¡áá»áá¯á·ááœá¬ááŒá¬ážááŸá¯áá»á¬áž áá»áŸá±á¬áºáááºá·áá¬ážáá«á +onboarding.tour-tor-expect-differences.description=Tor ááŸ áá¶á·ááá¯ážáá±ážáá¬ážáá±á¬ áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±áž á¡ááºá¹áá«áááºáá»á¬ážááŒá±á¬ááºá· áááºá¡ááºáá¬áááºáá¯á¶ážááœá²áá±á¬ á¡ááœá±á·á¡ááŒá¯á¶áááº áá¬áááºáááº ááœá¬ááŒá¬ážááá¯ááºáá«áááºá áááºá· áá¯á¶ááŒá¯á¶áá±ážá¡áááºá·áá±á«áºáá°áááºá áááºááá¯ááºá¡áá¬áá»á¬áž áááºááŒááŒááºážáááº ááá¯ááŸá±ážááá¯ááºáá«áááºá á¡áá»áá¯á·á¡áá¬áá»á¬ážáááº á¡áá¯ááºááá¯ááºááŒááºáž ááá¯á·ááá¯ááº ááááºááŒááá¯ááºááŒááºáž ááá¯á·ááŒááºáááºáá«áááºá áááºáááº áá°áá¯ááºááá¯ááºáááºááá¯ áááºáá±ážááŸá¯áá¶áááá¯ááºáá«á ááºá +onboarding.tour-tor-expect-differences.button=áá±ážáá±á·áá±ážáááŸááá±á¬ áá±ážááœááºážáá»á¬áž áááºáááº +onboarding.tour-tor-expect-differences.next-button=Onion áááºáá±á¬ááºááŸá¯áá»á¬áž ááá¯á·ááœá¬ážáááº + +onboarding.tour-tor-onion-services=Onion áááºáá±á¬ááºááŸá¯áá»á¬áž +onboarding.tour-tor-onion-services.title=á¡ááá¯áá¬ááœááºááŸá¯áá¶áá¬ážáá«á +onboarding.tour-tor-onion-services.description= Onion áááºáá±á¬ááºááŸá¯áá»á¬ážáááº .onion ááŸááºá· áá¯á¶ážáááºá· áááºááá¯ááºáá»á¬ážááŒááºáá«áááºá áááºážáááºáá±á¬ááºááŸá¯áá»á¬ážáááº áá¯ááºáá±áá°áá»á¬ážááŸááºá· áá¯á¶ážááœá²áá°áá»á¬ážááá¯ á¡ááá¯áá¬ááœááºááŸá¯áá»á¬ážáá±ážáááºá·á¡ááŒááº áááºáá¬áá¶áááŒááºážááá¯á·ááá¯áááºáž áááºá·áá»ááºáááº á¡áá¬ááœááºááŸá¯áá»á¬ážáááºážáá«áááºáá«áááºá Onion áááºáá±á¬ááºááŸá¯áá»á¬ážáááº áááºáá°ááá¯áááá¯ á¡áááºááá±á«áºáá² á¡ááŒá±á¬ááºážá¡áá¬áá»á¬áž ááŸááºá· á¡ááŒá¬ážáááºáá±á¬ááºááŸá¯áá»á¬áž áá¯ááºáá±ááá¯ááºáááº á¡ááœááºá·áá áºážáá±ážáá«áááºá á¡á±á¬ááºááœááº ááŸáááºá DuckDuckGo onion ááá¯ááºá¡á¬ážáááºáá±á·áá¬áá«á +onboarding.tour-tor-onion-services.button=Onion ááá¯á·áááºáá±á¬ááºáá« +onboarding.tour-tor-onion-services.next-button=ááŒá®ážááœá¬ážááŒá® + +onboarding.overlay-icon-tooltip-updated2=%S ááœááº\náá¬áá°ážááŒá¬ážáá»ááºááŸááá²ááŒááºá·áá« +onboarding.tour-tor-update.prefix-new=á¡áááº +onboarding.tour-tor-update.prefix-updated=á¡ááºááááºáá¯ááºááŒá®áž + +onboarding.tour-tor-toolbar=áááááá¬á¡á¶ toolbar +onboarding.tour-tor-toolbar-update-9.0.title=ááœááºááá¯ááº Onion ááá¯ááºá +onboarding.tour-tor-toolbar-update-9.0.description=áá»áœááºá¯ááºááá¯á·ááŸ áááº Tor á¡áá¯á¶ážááŒá¯ááŒááºáž á¡ááœá±á·á¡ááŒá¯á¶ááá¯ Tor ááá±á¬ááºáá¬á¡áá²á á¡ááŒááºá·á¡á áá±á«ááºážáááºážáá¬ážáá±áá»ááºáá«áááºá +onboarding.tour-tor-toolbar-update-9.0.description-para2=á¡á²á·áá«ááŒá±á¬ááºá· onion ááá¯ááºáá¯á¶ážáááºá·á¡áá¬áž áááºáááº áááºá· Tor áááºážááŒá±á¬ááºážááá¯ [i] URL á¡ááœááºááœááº ááœá±á·ááŸáááá¯ááºááŒá®áž áááááá¬á¡á¶ (toolbar) ááá¯ááº ááá¯á·ááá¯ááº [â¡] áá®áá°áž áá¯á¶ážá á¡áá±á¬ááºá¡áá¬ážá¡áááºááá¯ áá±á¬ááºážááá¯ááá¯ááºáá«áááºá +onboarding.tour-tor-toolbar-update-9.0.button=á¡áá±á¬ááºá¡áá¬ážá¡áááº áááºááá¯á· áá±á¬ááºážááá¯ááááºáááºáž +onboarding.tour-tor-toolbar-update-9.0.next-button=Tor ááœááºáááºáá±á«áº ááá¯á·ááœá¬ážáá« + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=ááŸá±á·áááºáááº +onboarding.tor-circuit-display.done=ááŒá®ážááœá¬ážááŒá® +onboarding.tor-circuit-display.one-of-three=á áá¯ááŸ á áá¯ +onboarding.tor-circuit-display.two-of-three=á áá¯ááŸ á áá¯ +onboarding.tor-circuit-display.three-of-three=á áá¯ááŸ á áá¯ + +onboarding.tor-circuit-display.intro.title=áááºážááŒá±á¬ááºážáá¥áºáá»á¬áž áááºáá²á·ááá¯á· á¡áá¯ááºáá¯ááºááááºáž? +onboarding.tor-circuit-display.intro.msg=áá¬ážáááºáááºážááŒá±á¬ááºážáá»á¬ážáááº áá»áááºážáááºááŸááºáá¬ážáá±á¬ áááºáááºá·áááºážááŒááºážáá»á¬ážááŒááºá· áááºáá±á¬ááºáá¬ážáá«áááºá áááºážáááºáááºá·áááºážááŸá¯áá»á¬ážáááº ááá¹áá¬á¡ááŸá¶á·ááŸá Tor á¡ááœá¬ážá¡áá¬áá»á¬ážááá¯ áááºáááºá·áááºážááá¯ááºáááº áá»áááºááŸááá¬ážáááºá· ááœááºáá»á°áá¬áá»á¬ážááŒááºáá«áááºá áá¬ážáááºáááºážááŒá±á¬ááºážáá»á¬ážáááºÂ áááºá·ááá¯ á¡ááºáá¬áááºáá¯á¶ááŒá¯á¶ááœá¬áá¯á¶ážááœá²ááá¯ááºáá±áááºááŸááºá· onion áááºáá±á¬ááºááŸá¯áá»á¬ážááŸááºá· áá»áááºáááºáá±ááá¯ááºáá«áááºá + +onboarding.tor-circuit-display.diagram.title=áááºážááŒá±á¬ááºážáá¥áº +onboarding.tor-circuit-display.diagram.msg=á€áá¯á¶áááº áááºážáááºááá¯ááºá¡ááœááº áááºážááŒá±á¬ááºážáá¥áºáá±ážáá±á¬ áááºáááºá·áááºážááŸá¯ááá¯á·ááá¯ ááŒááá«áááºá áááºááá¯ááºáá»á¬áž á¡áá»ááºážáá»ááºáž áá»áááºáááºááŒááºážáá»á¬ážááá¯ áá¬ážááŒááºáááº áááºááá¯ááºáááºáá¯ááá¯ ááá°áá®áá±á¬ áááºážááŒá±á¬ááºážáááºáá¯áá®áá¬ áááŸááá«áááºá + +onboarding.tor-circuit-display.new-circuit.title=áááº áááºážááŒá±á¬ááºážá¡áááº ááá¯á¡ááºáá«ááá¬áž? +onboarding.tor-circuit-display.new-circuit.msg=áááºáááºáá±á¬ááºáááº ááŒáá¯ážáá¬ážáá±áá±á¬ áááºááá¯ááºááŸááºá· áá»áááºáááºááááá»áŸááº áááºáááº á€ááá¯ááºá¡á¬ážá¡áá¯á¶ážááŒá¯á áááºááá¯ááºá¡á¬áž áááºážááŒá±á¬ááºážá¡áááºááŒááºá· ááŒááºáááºááá¯ááºáá«áááºá diff --git a/chrome/locale/my/torbutton.dtd b/chrome/locale/my/torbutton.dtd index eed16215..8f54338e 100644 --- a/chrome/locale/my/torbutton.dtd +++ b/chrome/locale/my/torbutton.dtd @@ -1,11 +1,15 @@ <!ENTITY torbutton.context_menu.new_identity "á¡áá±á¬ááºá¡áá¬áž á¡áááº"> -<!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> -<!ENTITY torbutton.context_menu.downloadUpdate.key "A"> -<!ENTITY torbutton.context_menu.cookieProtections "ááœááºáá®áž áá¬ááœááºááŸá¯áá»á¬áž"> -<!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "Torbutton ááá¯ á¡áááŒá¯áááº ááŸáááºáá«á"> +<!ENTITY torbutton.context_menu.new_identity_key "á"> +<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> +<!ENTITY torbutton.context_menu.new_circuit_key "á"> +<!ENTITY torbutton.context_menu.networksettings "Tor ááœááºáááº á¡ááŒááºá¡áááºáá»á¬áž..."> +<!ENTITY torbutton.context_menu.networksettings.key "á"> +<!ENTITY torbutton.context_menu.downloadUpdate "Tor ááá±á¬ááºáá¬ á¡ááºááááºá¡ááœááº áááºáá±ážáá«..."> +<!ENTITY torbutton.context_menu.downloadUpdate.key "á¡"> +<!ENTITY torbutton.context_menu.cookieProtections "ááœááºáá®áž á¡áá¬á¡ááœááºáá»á¬áž..."> +<!ENTITY torbutton.context_menu.cookieProtections.key "á"> +<!ENTITY torbutton.button.tooltip "Torbutton ááá¯ á¡áááŒá¯áááº ááŸáááºáá«"> +<!ENTITY torbutton.prefs.security_settings "Tor ááá±á¬ááºáá¬ áá¯á¶ááŒá¯á¶áá±áž á¡ááŒááºá¡áááºáá»á¬áž"> <!ENTITY torbutton.cookiedialog.title "ááœááºáá®áž áá¬ááœááºááŸá¯áá»á¬ážááá¯ áá®áá¶áááºá·ááœá²áááº"> <!ENTITY torbutton.cookiedialog.lockCol "á¡áá¬á¡ááœááº áá¯ááºáá¬ážáááº"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -13,8 +17,37 @@ <!ENTITY torbutton.cookiedialog.pathCol "áááºážááŒá±á¬ááºáž"> <!ENTITY torbutton.cookiedialog.protectCookie "ááœááºáá®ážááá¯ áá¬ááœááºáááº"> <!ENTITY torbutton.cookiedialog.removeCookie "ááœááºáá®ážááá¯ áááºáá¯ááºáááº"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "ááœááºáá®ážááá¯ áá¬ááœááºááá¬ážáá«"> -<!ENTITY torbutton.cookiedialog.removeAllBut "á¡á¬ážáá¯á¶ážááá¯ áááºáá¯ááºáá«á ááá¯á·áá±á¬áº á¡áá¬á¡ááœááº áá¯ááºáá¬ážáááº"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "ááœááºáá®ážááá¯ ááá¬ááœááºáá¬ážáá«"> +<!ENTITY torbutton.cookiedialog.removeAllBut "á¡á¬ážáá¯á¶ážááá¯ áááºáá¯ááºáá«á ááá¯á·áá±á¬áº á¡áá¬á¡ááœááº áá¯ááºáá¬ážáááº"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ááœááºáá®ážáááºáá»á¬ážááá¯ áá¬ááœááºáááº"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ááœááºáá®ážáááºáá»á¬ážááá¯ áá¬ááœááºááŒááºáž áááŒá¯áááº"> +<!ENTITY torbutton.prefs.sec_caption "áá¯á¶ááŒá¯á¶âáá±ážá¡áááºá·"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "áááºá· ááá±á¬ááºáá¬ááá¯ áááºáá¬áá»á¬áž (hackers) áá®áááºážáááº ááá¯ááá¯áá¯áá¶á¡á¬ážáááºážáá±áá±á¬ áááºá·ááá±á¬ááºáá¬á á¡áá»áá¯á·áá±á¬á¡ááºá¹áá«áááºáá»á¬ážááá¯ áá¯á¶ááŒá¯á¶áá±áž ááœááºáááºáááááá¬ááŸ ááááºáááºááá¯ááºáá«áááºá"> +<!ENTITY torbutton.prefs.sec_standard_label "áá¯á¶ááŸááº"> +<!ENTITY torbutton.prefs.sec_standard_description "Tor ááá±á¬ááºáá¬ ááŸááºá· áááºááá¯ááº á¡ááºá¹áá«áááºáá»á¬ážá¡á¬ážáá¯á¶ážááá¯ ááœááºá·áá¬ážáá«áááºá"> +<!ENTITY torbutton.prefs.sec_safer_label "ááá¯ááá¯áá¯á¶ááŒá¯á¶áá±á¬"> +<!ENTITY torbutton.prefs.sec_safer_description "Â áááŒá¬áá á¡áá¹ááá¬ááºáá±ážááá¯ááºáá±á¬ áááºááá¯ááºá¡ááºá¹áá«áááºáá»á¬ážááá¯ ááááºáááºáá¬ážáá«áááºá ááá¯á·ááŒááºá á¡áá»áá¯á·áá±á¬ ááá¯ááºááá¯ááºááá¯ááºááœááºážáá»á¬áž áá¯á¶ážááŸá°á¶ážáá±áááºá"> +<!ENTITY torbutton.prefs.sec_safer_list_label "ááá¯ááá¯áá¯á¶ááŒá¯á¶áá±á¬ á¡ááŒááºá¡áááºááœááº -"> +<!ENTITY torbutton.prefs.sec_safest_label "á¡áá¯á¶ááŒá¯á¶áá¯á¶áž"> +<!ENTITY torbutton.prefs.sec_safest_description "áááºááŒáááºáá±á¬ ááá¯ááºáá»á¬ážááŸááºá· á¡ááŒá±áá¶áááºáá±á¬ááºááŸá¯áá»á¬ážá¡ááœááº ááá¯á¡ááºáá±á¬ áááºááºááá¯ááºáá¡ááºá¹áá«áááºáá»á¬ážááá¯áá¬ ááœáá·áºááŒá¯áááºá á€ááŒá±á¬ááºážáá²ááŸá¯áá»á¬ážáááº áá¯ááºáá¯á¶áá»á¬ážá áá®áá®áá¬áá»á¬áž ááŸááºá· áááá¯ááááºáá¬áá¬ááá¬ážáá»á¬áž (scripts) ááá¯á·ááá¯ ááááá¯ááºáá±áááºá"> +<!ENTITY torbutton.prefs.sec_safest_list_label "á¡áá¯á¶ááŒá¯á¶áá¯á¶áž á¡ááŒááºáááºááœááº -"> +<!ENTITY torbutton.prefs.sec_learn_more_label "áááºáá¶áá±á·áá¬áááº"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "HTTPS ááá¯ááºáá»á¬ážáá±á«áº ááá¯ááºáá±á¬ JavaScript ááá¯ááááºáá¬ážáááº"> +<!ENTITY torbutton.prefs.sec_js_disabled "ááá¯ááºáá»á¬ážá¡á¬ážáá¯á¶ážáá±á«áºááœááº JavaScript ááá¯ áá°áá¡ááŒááºá¡áááºá¡á ááááºáá¬ážáááº"> +<!ENTITY torbutton.prefs.sec_limit_typography "á¡áá»áá¯á·áá±á¬ áá¬áá¯á¶ážáááá¯ááºáá»á¬áž ááŸááºá· áááºá¹áá»á¬áááºá¹áá±ááá»á¬ážááá¯ ááááºáá¬ážáááº"> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "á¡áá»áá¯á·áá±á¬ áá¬áá¯á¶ážáááá¯ááºáá»á¬ážá á¡áá¯ááºááœááºáá»á¬ážá áááºá¹áá»á¬áááºá¹áá±ááá»á¬áž ááŸááºá· áá¯ááºáá¯á¶áá»á¬ážááá¯á·ááá¯ ááááºáá¬ážáááº"> +<!ENTITY torbutton.prefs.sec_click_to_play_media "á¡áá¶ ááŸááºá· áá®áá®ááá¯ááá¯ááºáá»á¬áž (HTML5 áá®áá®áá¬) ááŸááºá· WebGL ááá¯á·ááá¯ ááŸáááºááááá¯ááºáááº (click-to-play)"> +<!ENTITY torbutton.prefs.sec_custom_warning "ááááºááŒáá¯ááº "> +<!ENTITY torbutton.prefs.sec_overview "áááºá· áá¯á¶ááŒá¯á¶áá±ážááŸááºá· á¡áááºááŸááºááŸá¯ááá¯á·ááá¯ ááá¯ááºááá¯ááºáá±ááá¯ááºáá±á¬ á¡áá»áá¯á·áá±á¬ áááºá¡ááºá¹áá«áááºáá»á¬ážááá¯ ááááºáá¬ážáááº"> +<!ENTITY torbutton.prefs.sec_standard_tooltip "áá¯á¶ááŒá¯á¶áá±ážá¡áááºá· - áá¯á¶ááŸááº"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "áá¯á¶ááŒá¯á¶áá±ážá¡áááºá· - ááá¯ááá¯áá¯á¶ááŒá¯á¶áá±á¬"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "áá¯á¶ááŒá¯á¶áá±ážá¡áááºá· - á¡áá¯á¶ááŒá¯á¶áá¯á¶áž"> +<!ENTITY torbutton.prefs.sec_custom_summary "áááº ááááºááŒáá¯ááºááœá±ážáá¬ážáá±á¬ ááá±á¬ááºáá¬á áá»áááºááŸáááŸá¯áá»á¬ážáááº áá¯á¶ááŸááºááá¯ááºáá±á¬ áá¯á¶ááŒá¯á¶áá±áž á¡ááŒááºá¡áááºáá»á¬áž ááŒááºáá±á«áºáá±áá²á·áá«áááºá áá¯á¶ááŒá¯á¶áá±ážááŸááºá· áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±áž á¡ááŒá±á¬ááºážááŒáá»ááºáá»á¬ážá¡ááœááº áá°ááá¯á¶ááŒá¯á¶áá±ážá¡áááºá·ááá¯á· ááœá±ážáá¬ážáááº áá»áœááºá¯ááºááá¯á·ááŸ á¡ááŒá¶ááŒá¯áá«áááºá"> <!ENTITY torbutton.prefs.sec_restore_defaults " áá°áá¡ááá¯ááºáž ááŒááºáá¬ážáááº"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "á¡áááºá·ááŒááºá· áá¯á¶ááŒá¯á¶áá±áž á¡ááŒááºá¡áááºáá»á¬áž..."> +<!ENTITY torbutton.circuit_display.title "Tor áááºážááŒá±á¬ááºáž"> +<!ENTITY torbutton.circuit_display.new_circuit "á€ááá¯ááºá¡ááœááº áááºážááŒá±á¬ááºážá¡áááº"> + + +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Onion áááºáá±á¬ááºááŸá¯ áá¯á¶ážáá°á¡áááºááŒá¯áááº áá±á¬ááºážááá¯áá¬ ááœááºá·áá«"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "á€áá®ážáá¯ááºá¡á¬áž ááŸááºáá¬ážáá«"> diff --git a/chrome/locale/my/torbutton.properties b/chrome/locale/my/torbutton.properties index 3fa0d7cd..e8a57655 100644 --- a/chrome/locale/my/torbutton.properties +++ b/chrome/locale/my/torbutton.properties @@ -1,23 +1,140 @@ -extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.external.title = ááŒááºáááŸ á¡ááŒá±á¬ááºážá¡áá¬ááá¯ ááœááºá·áááº -torbutton.popup.external.app = ááŒááºá á¡áá¹ááá®áá±ážááŸááºáž áááºáá¯ááá¯ ááŒá±ááŸááºážáááº ááá¯á¡ááºáááº - \n\n -torbutton.popup.external.note = \n\nááŸááºáá»ááº - ááŒááºá á¡áá¹ááá®áá±ážááŸááºážáá»á¬ážáááº áá¯á¶ááŸááºá¡á¬ážááŒááºá· áá¯á¶ááŒá¯á¶áá±á¬ Tor ááá¯ááºáá«á áááºážá áááºá·ááá¯ áá±á«áºááá¯ááºáááºá\n -torbutton.popup.external.suggest = \ná¡áááºá á€ááá¯ááºááá¯ ááááºááá»áá«áá áááº á¡á±á¬á·ááºááá¯ááºáž ááŸááá±áá»áááºá (ááá¯á·) VM áááºáá¯áá²ááœááº\n ááŸááá±áá»áááºááœááº áááºážááá¯ ááŒááºá·áááº áááº ááááºážáááºážáá¬ážááá¯ááºáááº (ááá¯á·) Tails LiveCD ááá¯á·ááá¯ááº\n torsocks ááá¯á·áá²á·ááá¯á·áá±á¬ Tor ááá±á¬ááºáá®ááá¯ áá¯á¶ážááœá²áááº áááºážáá¬ážáá«á\n -torbutton.popup.launch = á¡áá¹ááá®áá±ážááŸááºážááá¯ ááœááºá·áááº -torbutton.popup.cancel = áá»ááºááááºážáááº -torbutton.popup.dontask = ááá¯á¡áá»áááºááŸáááŒá®áž á¡áá¹ááá®áá±ážááŸááºážáá»á¬ážááá¯ á¡ááŒá² ááœááºá·áááº -torbutton.popup.prompted_language = áááºá· ááá¯ááºáá±ážááá¯ááºáá¬ áá¯á¶ááŒá¯á¶áá±ážááá¯ ááá¯ááá¯ áááŸááááºá Torbutton áááº ááœááºáááº áá¬áá»ááºááŸá¬áá»á¬ážááá¯ á¡ááºá¹áááááº áá¬áá¬ áá¬ážááŸááºážááŒááºá· áá±á¬ááºážáá¶áá±ážááá¯ááºáááºá áááºážááá¯á·ááŒá¯áá¯ááºááŒááºážáááº áááºá· áá¬áá¬ááŒááºá· áááºááŸá¯ááá¯áá±á¬ ááœááºáááº áá¬áá»ááºááŸá¬áá»á¬ážááá¯ á¡ááºá¹áááááº áá¬áá¬áááŒááºá· áá±á«áºááŒáá±áááº ááŒááºáááºá\n\náá¯á¶ááŒá¯á¶ááŸá¯ ááá¯ááŸááááºá¡ááœááº á¡ááºá¹áááááº áá¬áá¬ááŒááºá· ááœááºáááºáá¬áá»ááºááŸá¬áá»á¬ážááá¯ áááº áá±á¬ááºážáá¶ááá¯á áá¬áž? -torbutton.popup.no_newnym = Torbutton áááº áááºá·á¡á¬áž á¡áá±á¬ááºá¡áá¬áž á¡áááºááá¯ áá¯á¶áá¯á¶ááŒá¯á¶ááŒá¯á¶ ááá±ážááá¯ááºáá«á áááºážáááº Tor ááááºážáá»á¯ááºáá±áž Port áá² ááááºáá±á¬ááºááá¯ááºáá«á\n\nTor Browser Bundle ááá¯ áááº áá¯á¶ážááœá²áá±ááá¬áž? -torbutton.title.prompt_torbrowser = Important Torbutton Information -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. -torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. - -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n -torbutton.popup.never_ask_again = Never ask me again +torbutton.circuit_display.internet = á¡ááºáá¬áááº +torbutton.circuit_display.ip_unknown = áááááŸááá±á¬ IP +torbutton.circuit_display.onion_site = Onion ááá¯ááº +torbutton.circuit_display.this_browser = á€ ááá±á¬ááºáá¬ +torbutton.circuit_display.relay = áááºáááºá·áááºáž +torbutton.circuit_display.tor_bridge = Bridge +torbutton.circuit_display.unknown_country = áááááŸááá±á¬ ááá¯ááºáá¶ +torbutton.circuit_display.guard = áá±á¬ááºá· +torbutton.circuit_display.guard_note = áááºá [Guard] node áááºááŒá±á¬ááºážáá²áááº ááá¯ááºáá«á +torbutton.circuit_display.learn_more = áááºáá¶áá±á·áá¬áááº +torbutton.circuit_display.click_to_copy = áá±á¬áºáá®áá°ážáááº ááŸáááºáá« +torbutton.circuit_display.copied = áá±á¬áºáá®áá°ážááŒá®áž! +torbutton.content_sizer.margin_tooltip = Tor ááá±á¬ááºáá¬áááº áááºá· áááºážááá¯ážá á¡áá»ááºááŸááºá· á¡ááŒááºá·ááá¯ ááááºááá°ážááŒá¬ážá¡á±á¬ááº á€á¡áá¬ážáááº áááºáá±á«ááºážáá±ážáá«áááºá ááá¯á·ááŒááºá· á¡ááŒá¬ážáá°áá»á¬ážáááº áááºá·á¡á¬áž á¡áœááºááá¯ááºážáá±á«áºááœááº ááá¯ááºááŸá¬ááœá±ááá¯ááºááŒááºáž áá»á±á¬á·áááºážáá±áááºá +extensions.torbutton(a)torproject.org.description = Torbutton áááº Tor á¡ááŒááºá¡áááºáá»á¬áž áá»áááºááááº ááŸááºá· á¡áœááºááá¯ááºážáá±á«áº ááá¯ááºááá¯ááºááŸá¯ááºááŸá¬ážááŸá¯áá¬ááááºá¡á¬áž ááœááºáá°áá»ááºááŒááºááœá¬ ááŸááºážáááºážáááº ááá¯ááºáááºáá¯ áá±ážáá«áááºá +torbutton.popup.external.title = ááŒááºáááá¯ááºá¡áá»áá¯ážá¡áá¬áž áá±á«ááºážáá¯ááºáá¯ááºáááºáá¬áž? +torbutton.popup.external.app = Tor ááá±á¬ááºáá¬áááº á€ááá¯ááºá¡á¬áž ááŒáááá¯á·áááá«á á¡ááŒá¬áž á¡áá¹ááá®áá±ážááŸááºážááŒááºá· áááºááŸ ááœááºá·áááºááá¯á¡ááºáá«áááºá\n\n +torbutton.popup.external.note = á¡áá»áá¯á·ááá¯ááºá¡áá»áá¯ážá¡áá¬ážáá»á¬ážáááº á¡áá¹ááá®áá±ážááŸááºážáá»á¬ážá¡á¬áž Tor á¡áá¯á¶ážáááŒá¯áá² á¡ááºáá¬áááºááŸááºá· áá»áááºáááº áá±ááá¯ááºáá«áááºá\n\n +torbutton.popup.external.suggest = áá¯á¶ááŒá¯á¶áá±áááº áááºáááº á¡áœááºááá¯ááºážáá±á«áºáááŸááá»áááº ááá¯á·ááá¯ááº Tails ááá¯áá»áá¯áž Tor Live CD á¡áá¯á¶ážááŒá¯ááá¬ áá±á«ááºážáá¯ááºááœá²áá¬ážáá±á¬ááá¯ááºáá»á¬ážááá¯ ááœááºá·áááºá·áá«áááºá\n +torbutton.popup.launch = ááá¯ááºáá±á«ááºážáá¯ááºáááº +torbutton.popup.cancel = áááºáá»ááºáááº +torbutton.popup.dontask = ááá¯á¡áá»áááºááŸáá ááá¯ááºáá»á¬ážááá¯ á¡ááá¯á¡áá»á±á¬ááº áá±á«ááºážáá¯ááºááœá²áááº +torbutton.popup.no_newnym = Torbutton áááº áááºá·á¡á¬áž á¡áá±á¬ááºá¡áá¬áž á¡áááºááá¯ áá¯á¶áá¯á¶ááŒá¯á¶ááŒá¯á¶ ááá±ážááá¯ááºáá«á áááºážáááº Tor ááááºážáá»á¯ááºáá±áž Port áá² áááºáá±á¬ááºááœááºá·áááŸááá«á\n\nTor Browser Bundle ááá¯ áááº áá¯á¶ážááœá²áá±áá«ááá¬áž? +torbutton.security_settings.menu.title = áá¯á¶ááŒá¯á¶áá±áž á¡ááŒááºá¡áááºáá»á¬áž +torbutton.title.prompt_torbrowser = á¡áá±ážááŒá®ážáá±á¬ Torbutton á¡áá»ááºá¡áááº +torbutton.popup.prompt_torbrowser = Torbutton áááº ááá¯á¡áá« á¡áá¯ááºáá¯ááºáá¯á¶ ááá°áá±á¬á·áá«á áááºá áááºážááá¯ááºááá¯ ááááºááá¯á·áááá±á¬á·áá«á\n\nTor ááá«áá² ááá±á¬ááºáá¬ááá¯ á¡áá¯á¶ážááŒá¯áá¯ááºáž Torbutton ááá¯ ááá±á¬ááºáá¬á¡ááœááºáž á¡áá¯á¶ážááŒá¯ááŒááºážáááº ááá¯á¶ááŒá¯á¶á áá»áœááºá¯ááºááá¯á·ááŸ á€ááŒá±á¬ááºážáá²áá»ááº ááŒá¯áá¯ááºáá²á·áá«áááºá áá»ááºááœááºááŸá¯áá»á¬áž áá»á¬ážááœááºážá á¡ááŒá¬ážáááºážáááºážááŸááºá· ááŒá¯ááŒááºááá¯á·áááá±á¬á·ááá¯á·áá«á\n\náááºááŸâ Firefox á¡á¬áž áá¯á¶ááŸááºááá¯áá¯á¶ážááœá²ááá¯áá»áŸááº áááºááŸ Torbutton á¡á¬áž áááºáá¯ááºá áŒá®áž Tor Browser Bundle ááá¯ áá±á«ááºážáá¯ááºáá¯ááºáááºá·áá«áááºá Tor ááá±á¬ááºáá¬ á áá¯áá¹ááá¯ááºáá±ážá¡ááºá¹áá«áááºáá»á¬ážáááº áá¬áááº ááá±á¬ááºáá¬áááº ááá¯áá±á¬ááºážáá«áááºá Firefox ááá¯ Torbutton ááŸááºá·áá¯á¶ážáá¬áááºáááºáž ááá¯áá¬áá«áááºá\n\nTorbutton á¡á¬áž áááºáá¯ááºáááº Tools > Addons > Extensions ááá¯á·ááœá¬ážá Torbutton áá±ážááŸááá±á¬ "áááºáá¯ááºáááº" ááá¯áááºá· ááá¯ááºá¡á¬ážááŸáááºáá±ážáá«á +torbutton.popup.short_torbrowser = á¡áá±ážááŒá®ážáá±á¬ Torbutton á¡áá»ááºá¡áááº!\n\nTorbutton áááº ááá¯á¡ááŒá²ááœááºá·áá¬ážáá«áááºá\n\nTorbutton á¡á¬áž ááŸáááºá á¡áá»ááºá¡áááºáá»á¬áž áááºáá¶áá±á·áá¬áá«á + +torbutton.popup.confirm_plugins = Flash ááá¯áá»áá¯áž ááá¯ážááœá²áá±á¬ ááááºáááº áá±á¬á·áá² (plugins) áá»á¬ážáááº áááºá· áááá¹áá¯áá¯á¶ááŒá¯á¶áá±ážááŸááºá· á¡áááºááŸááºááŒááºážááá¯á·ááá¯ ááááá¯ááºááá¯ááºáá±áá«áááºá\n\náááºážááá¯á·áááº áááºá·ááá¯ áááºáá±áá¬ááŸááºá· IP ááááºáá¬ááá¯á·ááá¯ áá±á«áºáá¯ááºáááº Tor ááá¯ ááŒááºáá»á±á¬áºááá¯ááºáá«áááºá\n\nááá¯ážááœá²áá±á¬ ááááºáááº áá±á¬á·áá² (plugins)Â áá»á¬ážááá¯ ááœááºá·áááºááŸá¬ áá±áá»á¬áá«ááá¬áž?\n\n +torbutton.popup.never_ask_again = áá»áœááºá¯ááºáá¶ áááºáááºá·á¡áá»áááºáá»áŸ áááºááá±ážáá«ááŸááºá· +torbutton.popup.confirm_newnym = Tor ááá±á¬ááºáá¬áááº áááºááá¯ážááŸááºá· áááºááºáá»á¬ážá¡á¬ážáá¯á¶ážááá¯ ááááºáá«áááºá áááºááá¯ááº áááºááŒááºážáá»á¬áž á¡á¬ážáá¯á¶áž áá¯á¶ážááŸá°á¶ážááœá¬ážáá«áááºá\n\náááºá· ááá¯ááºáá±áž á¡áá±á¬ááºá¡áá¬ážáá»á¬áž ááŒááºáááºáááºáááºáá»áááº Tor ááá±á¬ááºáá¬ááá¯ ááááºááŒá®ážááŒááºááœááºá· ááá¬áž?\n\n + +torbutton.maximize_warning = Tor ááá±á¬ááºáá¬ááá¯ á¡ááŒá®ážáá¯á¶ážááá¯ááºá¡áá áá»á²á·ááŒááºážá¡á¬ážááŒááºá· áááºááá¯ááºáá»á¬ážáááº áááºá· ááááºáááº á¡ááœááºá¡áá¬ážááá¯ ááááŸáááá¯ááºááŒá®áž áááºá·á¡á¬áž ááá¯ááºááŸá¬ááá¯á·áááá¯ááºáá«áááºá áá»áœááºá¯ááºááá¯á·ááŸ áááºá· Tor ááá±á¬ááºáá¬ áááºážááá¯ážááá¯ áá°áááºážá¡ááœááºá¡áá¬ážááŒááºá· áá¬ážáááº á¡ááŒá¶ááŒá¯áá«áááºá # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. -canvas.allow=Allow in the Future +canvas.siteprompt=á€áááºááá¯ááºáááº (%S) HTML5 ááá¹áá°áá¯ááºáá¯á¶áá±áá¬ááá¯ áá¯ááºáá°áááº ááŒáá¯ážáá¬ážáá±áá«áááºáâ áááºážáá±áá¬ááŒááºá· áááºá· ááœááºáá»á°áá¬ááá¯ áááá»ááœá¬áá±á«áºáá¯ááºááá¯ááºáá«áááºá\n\nTor ááá±á¬ááºáá¬ááŸ áááºážáááºááá¯ááº HTML5 ááá¹áá°áá¯ááºáá¯á¶áá±áá¬ áá¯ááºáá°ááŒááºážááá¯ ááœááºá·ááŒá¯ááááºáá¬áž? +canvas.notNow=ááá¯ááá¯ááº +canvas.notNowAccessKey=á +canvas.allow=áá±á¬ááºááœááº ááœááºá·ááŒá¯áááº canvas.allowAccessKey=A -canvas.never=Never for This Site +canvas.never=á€ ááá¯ááºá¡ááœááº áááºááá·áºá¡áá»áááºááŸá (á¡ááŒá¶ááŒá¯áááº) canvas.neverAccessKey=e + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=%S áááá¯ááá¯ááº ááŒá¿áá¬ +profileReadOnly=%S á¡á¬áž áááºáááºá¡ááœááºáá¬ áááºááŸááºáá¬ážáá±á¬ ááá¯ááºááááºááŒááºá· (read-only file system) áááœááºá·ááá¯ááºáá«á áá»á±ážáá°ážááŒá¯á áááºážá¡á¬áž áááºáážáá¯á¶ážáá® á¡ááŒá¬ážáá±áá¬ááá¯á· %S á¡á¬áž áá±á¬áºáá®áá°ážáá±ážáá«á +profileReadOnlyMac=%S á¡á¬áž áááºáááºá¡ááœááºáá¬ áááºááŸááºáá¬ážáá±á¬ ááá¯ááºááááºááŒááºá· (read-only file system) áááœááºá·ááá¯ááºáá«á áá»á±ážáá°ážááŒá¯á áááºážá¡á¬áž áááºáážáá¯á¶ážáá® áááºá· Desktop ááá¯á·ááá¯ááº á¡áá¹ááá®áá±ážááŸááºážááá¯ááºááœá² áá²ááá¯á· %S á¡á¬áž áá±á¬áºáá®áá°ážáá±ážáá«á +profileAccessDenied=%S áááº áááá¯ááá¯ááº áá¯á¶ážááœááºá·áááŸááá«á áá»á±ážáá°ážááŒá¯á áááºá· ááá¯ááºááááºááœááºá·ááŒá¯áá»ááºáá»á¬áž ááŒá±á¬ááºážáá²á ááŒááºáááºážááŒááºá·áá±ážáá«á +profileMigrationFailed=áááºá· %SÂ áááá¯ááá¯ááº ááŒá±á¬ááºážáá²ááŒááºážáá¡á±á¬ááºááŒááºáá«á\ná¡ááŒááºá¡áááºá¡áááºáá»á¬áž áá¯á¶ážááœá²áá«áááºá + +# "Downloading update" string for the hamburger menu (see #28885). +# This string is kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +updateDownloadingPanelUILabel=%S á¡ááºáááºá¡á¬áž áá±á«ááºážáá¯ááºááœá²áá±áá«áááº + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=áá»áááºáááºááŸá¯á¡á¬áž áá¯ááºááŒááºá·ááŒá±á¬ááºážáá²ááŸááºááŒá®áž (Onion áááºáá±á¬ááºááŸá¯á %1$S, %2$S bit keys, %3$S) +pageInfo_OnionEncryption=áá»áááºáááºááŸá¯á¡á¬áž áá¯ááºááŒááºá·ááŒá±á¬ááºážáá²ááŸááºááŒá®áž (Onion áááºáá±á¬ááºááŸá¯) +pageInfo_OnionName=Onion á¡áááº - + +# Onion services strings. Strings are kept here for ease of translation. +onionServices.learnMore=áááºáá¶áá±á·áá¬áááº +onionServices.errorPage.browser=ááá±á¬ááºáá¬ +onionServices.errorPage.network=ááœááºáááº +onionServices.errorPage.onionSite=Onionsite +# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with +# an error code, e.g., 0xF3. +# Tor SOCKS error 0xF0: +onionServices.descNotFound.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº +onionServices.descNotFound.header=Onionsite áááœá±á·ááŸááá« +onionServices.descNotFound=á¡ááŒááºááá¯ááºáá¯á¶áž á¡ááŒá±á¬ááºážáááºážáááº Onionsite ááá¯ááºážáá»ááŒááºážááŒá±á¬ááºá·ááŒááºáá«áááºá Onionsite áá®áá¶áá°á¡á¬áž áááºááœááºáá±ážáá«á +onionServices.descNotFound.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá±á¬ááºážááá¯áá¬ážáá±á¬ onion áááºáá±á¬ááºááŸá¯ áá±á«áºááŒáá¬áááº hashring ááœááºáááœá±á·ááŸáá áá¯á¶ážáá°ááŸ áááºáá±á¬ááºááŸá¯á¡á¬áž áááºááŸááºážááá®ááá¯ááºáá«á +# Tor SOCKS error 0xF1: +onionServices.descInvalid.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº +onionServices.descInvalid.header=Onionsite á¡á¬áž ááá®ááá¯ááºáá« +onionServices.descInvalid=Onionsite á¡á¬áž ááá®ááá¯ááºááŒááºážáááº á¡ááœááºážááŒááºáá±á¬ áá»ááºááœááºááŸá¯ááŒá±á¬ááºá·ááŒááºáá«áááºá +onionServices.descInvalid.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá±á¬ááºážááá¯áá¬ážáá±á¬ onion áááºáá±á¬ááºááŸá¯ áá±á«áºááŒáá¬áááº áááºážáááºááááá« ááá¯á·ááá¯ááº áááºááŸááºá¡áááºááŒá¯ááŒááºáž áá¡á±á¬ááºááŒááºáá«á +# Tor SOCKS error 0xF2: +onionServices.introFailed.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº +onionServices.introFailed.header=Onionsite ááŸááºá· áá»áááºáááºááŸá¯ááŒááºááœá¬áž +onionServices.introFailed=á¡ááŒááºááá¯ááºáá¯á¶áž á¡ááŒá±á¬ááºážáááºážáááº Onionsite ááá¯ááºážáá»ááŒááºážááŒá±á¬ááºá·ááŒááºáá«áááºá Onionsite áá®áá¶áá°á¡á¬áž áááºááœááºáá±ážáá«á +onionServices.introFailed.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â ááááºáááºááŸá¯áá¡á±á¬ááºááŒááºáá«á ááá¯áááºááŸá¬ áá±á«áºááŒáá¬ááœá±á·ááŸááá±á¬áºáááºáž áááºáá±á¬ááºááŸá¯áááº ááááºáááºááŸá¯ááŒááºááŒááºážá¡áá áá»áááºáááºááŸá¯ áááŸááá«á ááŒááºááá¯ááºááŒá±ááŸá¬ áááºáá±á¬ááºááŸá¯ááŸ áá±á«áºááŒáá¬á¡á¬áž ááŒá±á¬ááºážáá²áá¬ážáááº ááá¯á·ááá¯ááº áááºážáááº á¡áá¯ááºááá¯ááºáá±á¬á·áá«á +# Tor SOCKS error 0xF3: +onionServices.rendezvousFailed.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº +onionServices.rendezvousFailed.header=Onionsite ááŸááºá· áá»áááºáááºááá +onionServices.rendezvousFailed=Onionsite áááº áá¡á¬ážáá« ááá¯á·ááá¯ááº Tor áá»áááºáááºááŸá¯áááº áááºáááºááœááºážáá±áá«áááºá áá±á¬ááºááŸááŒááºáááºážááŒááºá·áá±ážáá«á +onionServices.rendezvousFailed.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá¯á¶ážáá°áááºááŸ áááºáá±á¬ááºááŸá¯ááŸááºá· ááŒááºáááºááœá±á·áá¯á¶ááŒááºáž áá»ááºááœááºáá²á·á áá¯á¶ážáá°ááŸ áá»áááºáááºááŸá¯á¡á¬áž áááŒá®ážáá®ážááá¯ááºáá«á +# Tor SOCKS error 0xF4: +onionServices.clientAuthMissing.pageTitle=á¡áááºááŒá¯ááŒááºáž ááá¯á¡ááºáá«áááº +onionServices.clientAuthMissing.header=Onionsite áááº á¡áááºááŒá¯ááŒááºáž ááá¯á¡ááºáá«áááº +onionServices.clientAuthMissing=Onionsite áá²áááºáá±á¬ááºáááº áá¯ááºáá±á¬á·áááºáá¯ ááá¯á¡ááºáá«áááºá ááá¯á·áá±á¬áºáááºáž áááºáááºá·áá¯ááºáá±á¬á·ááŸ ááááºáá¶ááœá±á·ááŸááá«á +onionServices.clientAuthMissing.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá¯á¶ážáá°ááŸ áá±á¬ááºážááá¯áá¬ážáá±á¬ Onion áááºáá±á¬ááºááŸá¯á áá±á«áºááŒáá¬á¡á¬áž áá±á«ááºážáá¯ááºááœá²áá²á·áá«áááºáâ ááá¯á·áá±á¬áºáááºáž áá¯á¶ážáá°á¡áááºááŒá¯áááº á¡áá»ááºá¡áááºáá»á¬áž áááœá±á·ááŸáá áááºážá¡áá¬áá»á¬ážááá¯ áá¯ááºááŒááºááŒááºááŒááºážáááá«á +# Tor SOCKS error 0xF5: +onionServices.clientAuthIncorrect.pageTitle=á¡áááºááŒá¯ááŒááºáž áá¡á±á¬ááºááŒááºáá« +onionServices.clientAuthIncorrect.header=Onionsite á¡áááºááŒá¯ááŒááºáž áá¡á±á¬ááºááŒááºáá« +onionServices.clientAuthIncorrect=áááºáá¶áááŸááá¬ážáá±á¬ áá®ážáá¯ááºáááº ááŸá¬ážááœááºážáá±áá«áááº ááá¯á·ááá¯ááº ááŒááºáááºáá¯ááºááááºážáá¶áá¬ážááá«áááºá Onionsite áá®áá¶áá°á¡á¬áž áááºááœááºáá±ážáá«á +onionServices.clientAuthIncorrect.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá¯á¶ážáá°ááŸ áá±á¬ááºážááá¯áá¬ážáá±á¬ Onion áááºáá±á¬ááºááŸá¯á áá±á«áºááŒáá¬á¡á¬áž áá±á«ááºážáá¯ááºááœá²ááá¯ááºáá²á·áá«áááºáâ ááá¯á·áá±á¬áºáááºáž áá¯á¶ážáá°á á¡áááºááŒá¯áá±á¬ á¡áá»ááºá¡áááºáá»á¬ážáá¯á¶ážá áááºážá¡áá¬áá»á¬ážááá¯ áá¯ááºááŒááºááŒááºááŒááºážáááá«á ááá¯áááºááŸá¬ áááºáá±á¬ááºáá¯á¶ážááœááºá· ááŒááºáááºáá¯ááºááááºážáá¶áááŒááºáž ááŒááºááá¯ááºáá«áááºá +# Tor SOCKS error 0xF6: +onionServices.badAddress.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº +onionServices.badAddress.header=Onionsite ááááºáá¬ áááŸááºáááºáá« +onionServices.badAddress=áááºáá¶áá±ážáá¬ážáá±á¬ Onionsite ááááºáá¬áááº áááŸááºáááºáá«áâ áá»á±ážáá°ážááŒá¯á ááŸááºáááºááœá¬ ááŒááºážáá¬ážáá±ážáááº áááºáá±ážáá«á +onionServices.badAddress.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áááºáá¶áá±ážáá¬ážáá±á¬ .onion ááááºáá¬áááº áááŸááºáááºáá«á á€ááŸá¬ážááœááºážááŸá¯áááº á¡á±á¬ááºáá«á¡ááŒá±á¬ááºážááŒáá»ááºáá»á¬ážááŒá±á¬ááºá·ááŒááºáá«áááº - ááááºáá¬áá¬áá¯á¶ážááœá² áááá¯ááºáá®áá«áâ ed25519 á¡áá»á¬ážáá¯á¶ážáá®ážáá¯ááºáááº áááŸááºáááºáá« ááá¯á·áºááá¯ááº áá¯ááºááŒááºá·ááŒá±á¬ááºážáá²ááŸááºááŒááºážáááº á¡áá»á¯á¶ážááááºáá«á +# Tor SOCKS error 0xF7: +onionServices.introTimedOut.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº +onionServices.introTimedOut.header=Onionsite ááŒááºáááºážáááºáá®ážááŒááºáž á¡áá»áááºáá¯ááºáá¯á¶ážááœá¬ážáá«ááŒá® +onionServices.introTimedOut=Onionsite ááŒááºá· áá»áááºáááºááŸá¯ áá¡á±á¬ááºááŒááºáá«á áá»áááºáááºááŸá¯ááá¯ááºáž ááá±á¬ááºážáá±á¬ááŒá±á¬ááºá· ááŒááºááá¯ááºáá«áááºá +onionServices.introTimedOut.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá±á¬ááºážááá¯áá¬ážáá±á¬ Onion áááºáá±á¬ááºááŸá¯ááŒááºá· áá»áááºáááºááŸá¯ ááŒááºáááºážáááºááœááºáá±áá¯ááºáž á¡áá»áááºáá¯ááºáá¯á¶ážááœá¬ážáá«ááŒá®á +# +# LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.authPrompt.description2=%S áááº áááºá¡áááºááŒá¯áááº áá±á¬ááºážááá¯áá±áá«áááºá +onionServices.authPrompt.keyPlaceholder=á€ onion áááºáá±á¬ááºááŸá¯á¡ááœááº áááºá· áá®ážáááºá·áá®ážáá¯ááºá¡á¬áž ááá¯ááºáááºá·áá±ážáá«á +onionServices.authPrompt.done=ááŒá®ážááœá¬ážááŒá® +onionServices.authPrompt.doneAccessKey=d +onionServices.authPrompt.invalidKey=á¡áá»á¯á¶ážáááºáá±á¬ áá®ážáá¯ááº ááá¯ááºáááºá·áá±ážáá«â ((52 base32 áá¬áá¯á¶ážáá»á¬áž ááá¯á·ááá¯ááº 44 base64 áá¬áá¯á¶ážáá»á¬áž) +onionServices.authPrompt.failedToSetKey=áááºá· áá®ážáá¯ááºááŒááºá· Tor á¡á¬áž áá»áááºáááŒááºáááºá áááá« +onionServices.authPreferences.header=Onion áááºáá±á¬ááºááŸá¯áá»á¬áž á¡áááºááŒá¯ááŒááºáž +onionServices.authPreferences.overview=á¡áá»áá¯á· onion áááºáá±á¬ááºááŸá¯áá»á¬áž á¡áá¯á¶ážáááŒá¯áááº áá®ážáá¯ááº (ááá¬ážááŸááºááá¯áá»áá¯áž) ááŒááºá· áááºá·á¡áá±á¬ááºá¡áá¬ážááŒáááº ááá¯á¡ááºáá«áááºá +onionServices.authPreferences.savedKeys=ááááºážáá¬ážáá±á¬ áá®ážáá¯ááºáá»á¬áž... +onionServices.authPreferences.dialogTitle=Onion áááºáá±á¬ááºááŸá¯ áá®ážáá¯ááºáá»á¬áž +onionServices.authPreferences.dialogIntro=á¡á±á¬ááºáá« onionsites áá»á¬ážá¡ááœááº áá®ážáá¯ááºáá»á¬ážáááº áááºá· ááœááºáá»á°áá¬áá±á«áºááœááº ááááºážáááºážáá¬áá«áááº +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=áá®ážáá¯ááº +onionServices.authPreferences.remove=áááºááŸá¬ážáááº +onionServices.authPreferences.removeAll=á¡á¬ážáá¯á¶áž áááºááŸá¬ážáááº +onionServices.authPreferences.failedToGetKeys=Tor ááŸ áá®ážáá¯ááºáá»á¬áž áááá°ááá¯ááºáá« +onionServices.authPreferences.failedToRemoveKey=áá®ážáá¯ááº áááºááŸá¬ážááááá« + +# Onion-Location strings. +onionLocation.alwaysPrioritize=Onions áá»á¬ážááá¯ á¡ááŒá² á¥á®ážáá¬ážáá±ážáááº +onionLocation.alwaysPrioritizeAccessKey=P +onionLocation.notNow=ááá¯ááá¯ááº +onionLocation.notNowAccessKey=P +onionLocation.description=Tor ááœááºáááºáá±á«áºááœááº onion áááºáá±á¬ááºááŸá¯áá»á¬ážááŒááºá· áááºáááºá· ááá¯ááá¯áá¯á¶ááŒá¯á¶ááááºáá»ááá±á¬ áááºážááá¯ááºá áá¬ážááŸááºážááŸááá«áááºá Onion áááºáá±á¬ááºááŸá¯áá»á¬ážáááº áááºááá¯ááºáá¯ááºáá±áá°áá»á¬áž ááŸááºá· áá¯á¶ážáá°áá»á¬ážá¡ááœááº áá±á¬ááºá·ááŒááºá·ááá¯ááºáá¶ááŒááºáž ááŸááºá· áááºáá¬ááŒááºáá¶áááŒááºážááá¯á·ááá¯ ááŸáááºáááºážáá±ážááá¯ááºáá«áááºá +onionLocation.tryThis=Onion áááºáá±á¬ááºááŸá¯áá»á¬áž áááºážáá¯á¶ážááŒááºá·áá« +onionLocation.onionAvailable=.onion áááŸáááá¯ááº +onionLocation.learnMore=áááºáá¶áá±á·áá¬áááº... +onionLocation.always=á¡ááŒá²áááºáž +onionLocation.askEverytime=á¡áá»áááºááá¯ááºážáá±ážáá« +onionLocation.prioritizeOnionsDescription=.onion ááá¯ááºáá»á¬áž ááááŸááá»áŸááº áááºážááá¯á·ááá¯ á¥á®ážáá¬ážáá±ážáá«á +onionLocation.onionServicesTitle=Onion Services diff --git a/import-translations.sh b/import-translations.sh index f2b0fd86..4c202fba 100755 --- a/import-translations.sh +++ b/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko lt nb-NO mk ms nl pl pt-BR ro ru sv-SE th tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko lt nb-NO mk ms my nl pl pt-BR ro ru sv-SE th tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain so Basque XPIs can be diff --git a/jar.mn b/jar.mn index 3838bc9b..c8fd813f 100644 --- a/jar.mn +++ b/jar.mn @@ -66,6 +66,8 @@ torbutton.jar: locale/mk/ (chrome/locale/mk/*) % locale torbutton ms %locale/ms/ locale/ms/ (chrome/locale/ms/*) +% locale torbutton my %locale/my/ + locale/my/ (chrome/locale/my/*) % locale torbutton nb-NO %locale/nb-NO/ locale/nb-NO/ (chrome/locale/nb-NO/*) % locale torbutton nl %locale/nl/

1 0

[tor-browser-build/maint-10.0-android] Bug 40241: Update components for mozilla87-based Fenix (application-services part)
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit 3e88cbe26853cb79212ed7405dfe23ba761feed5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 9 19:35:52 2021 +0100 Bug 40241: Update components for mozilla87-based Fenix (application-services part) --- projects/application-services/config | 22 +- .../gradle-dependencies-list.txt | 125 ++--- .../application-services/update-cargo-lock.patch | 146 +++-- .../application-services/viaduct-workaround.patch | 16 +- .../application-services/viaduct-workaround2.patch | 588 +-------------------- projects/uniffi-rs/config | 8 +- 6 files changed, 164 insertions(+), 741 deletions(-) diff --git a/projects/application-services/config b/projects/application-services/config index 11fc5d7..951d5b0 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 67.2.0 -git_hash: 4cc798c8cd8a1e38ce88e0bb22a05692be63b164 +version: 71.0.0 +git_hash: 1ee6b32f3ee569036fdf1015cf7ffc01ded2860f git_url: https://github.com/mozilla/application-services git_submodule: 1 @@ -9,13 +9,11 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 4 + gradle_dependencies_version: 5 # This should be updated when the list of rust dependencies is changed. - rust_vendor_version: 3 + rust_vendor_version: 4 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 - # application-services is still stuck on an older glean_parser version. - glean_parser: 1.28.6 gradle_version: 6.5 input_files: @@ -68,12 +66,14 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' enable: '[% !c("var/fetch_gradle_dependencies") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2 - sha256sum: bdbb421fdcc9b66aebe8f41b33e254cab722355c59c0f43f10a8322d7d6da6a4 + sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2 enable: '[% !c("var/fetch_gradle_dependencies") %]' - # `cargo vendor vendor` in the `application-services` directory has vendored - # the sources. - - URL: https://people.torproject.org/~gk/mirrors/sources/application-services-vend… c('var/rust_vendor_version') %].tar.bz2 - sha256sum: f2d08275920c6e163617d5f102abc0665fd0f74550a400b1970b5b25bcabd3ef + # `cargo vendor vendor -s components/external/nimbus-sdk/nimbus/Cargo.toml` + # in the `application-services` directory has vendored the sources, + # after applying update-cargo-lock.patch, viaduct-workaround.patch and + # viaduct-workaround2.patch + - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-v… c('var/rust_vendor_version') %].tar.bz2 + sha256sum: 500d0fa471c8ad2037c4bbe648e716e77da1ff1fc5678542b144cd257a34abbf - filename: no-git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' diff --git a/projects/application-services/gradle-dependencies-list.txt b/projects/application-services/gradle-dependencies-list.txt index dee28f3..bd001d9 100644 --- a/projects/application-services/gradle-dependencies-list.txt +++ b/projects/application-services/gradle-dependencies-list.txt @@ -5,21 +5,21 @@ d1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d | https://dl.go 27a4be7462629c312da0b831a0978d2076fc34074145fb61dd4e86d7c8469b82 | https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/ac… d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692 | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.… 2e9372ba7780ef44952adbf86b66e1f08682c1e5277c926185f6564a13799efe | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.… -19944d32b46551a17c347e21894b95837fbd7baaafc9e2082794344f222f7361 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resour… -046011e16cb01b6f14842565661551110ef1b6427483f5d9068493f4c49690f2 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resour… -8d7299bca44cb3bdf17f5595766acbf459fc81fee223e8686cc6acd3a42ab5c0 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/… -340d617121f8ef8e02a6680c8f357aa3e542276d0c8a1cdcb6fd98984b2cb7b9 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/… -fe1237bf029d063e7f29fe39aeaf73ef74c8b0a3658486fc29d3c54326653889 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.… +c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resour… +149dd8cec3664bef8ffde86c396ba1e2ab156ea68793d29800d008bacbc9c0f8 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resour… +3d2131a55a61a777322e2126e0018011efa6339e53b44153eb651b16020cca70 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/… +8eb3cbe823b609853b481646e3d2c1aa39dbde53dd269712fd844ffdef2ebb42 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/… 83bbb3960eaabc600ac366c94cb59414e441532a1d6aa9388b0b8bfface5cf01 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.… +fe1237bf029d063e7f29fe39aeaf73ef74c8b0a3658486fc29d3c54326653889 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.… dd77615bd3dd275afb11b62df25bae46b10b4a117cd37943af45bdcbf8755852 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1… c0c4ed0160cd2ca18390015de8b392b697c173327c6b2c0947d4e62f6958c05d | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1… a7913a5275ad68e555d2612ebe8c14c367b153e14ca48a1872a64899020e54ef | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.… -632a0e5407461de774409352940e292a291037724207a787820c77daf7d33b72 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.… 67e9066ca4acfdc6e3cc508293c31ba0398057ff118e4f70b1e1813c9a3456d1 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.… -dcb74d510d552b35eff73b0dd27b829649535f3902e5b5a1f26040383c10a940 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.2.0/core-k… -29eaddba4e6a35e68a128e594ebae3b72ef7e767f1b273ef93dc2ed019ff97f6 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.2.0/core-k… -524b8b88ceb6a74a7e44e6b567a135660f211799904cb218bfee5be1166820b2 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0… -3d1f4e37b77dd92353879a040ab4ce2f706798bcbdf066147491c3642b3f79a6 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0… +632a0e5407461de774409352940e292a291037724207a787820c77daf7d33b72 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.… +78309600ba6fe4473c045976906649b25b3c9a49b14642f8a8a7dcd9e1afe7c8 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-k… +ba6a806bc1a6faf0cbae08397b3f781feca293ff2b5f3aa600b3d2db142e5ab4 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-k… +94de196cd67950cff6ef3e1ac59015f8eaaf61840bdc238f2cf54ddef8dd0be9 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.2/core-1.3.2… +afb5ea494dd083ed404cd51f580d218e37362f8ae326e893bee521290ed34920 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.2/core-1.3.2… a81c8fe78815fa47df5b749deb52727ad11f9397da58b16017f4eb2c11e28564 | https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapte… 62d95c89850af21030b19f14d5f7ecd6d8bcc9a3014c59002ec99624caac8100 | https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapte… 20e5b8f6526a34595a604f56718da81167c0b40a7a94a57daa355663f2594df2 | https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.… @@ -53,16 +53,16 @@ ba55fb7ac1b2828d5327cda8acf7085d990b2b4c43ef336caa67686249b8523d | https://dl.go 29aa72e339c3e227e74c973a4c85c7b79c926f0d37b61ed94f4d99a137c9a4b4 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… 11f735cb3b55c458d470bed9e25254375b518b4b1bad6926783a7026db0f5025 | https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader… c978d550808b47434aa49a63164110a50b55b0bcc6160a93a2e37d5110df8c5e | https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader… -388d33ff503d8c3d010a5dd7ecfe0e44bb19afcc28fd1e6336755d00ef7ad3c6 | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.1.0/roo… -831d4e3c7e5481e73f37c1cb2e08f24e27306976d3c83916f89b00b28857998b | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.1.0/roo… -175efd0a722810272098282819ebd52d6d0fa0aa5f9bfb25ac54268e1daa041e | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.1.0/ro… -ce8566bc008cc900268c07a4acb8840e4b54cdc404f73081a0986906f205fd7c | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.1.0/ro… +fbb37fcf02b35ba7a909fffb52ce4ccb36874f03c1f927f6338b68ef9f1d6b7a | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/roo… +2b130dd4a1d3d91b6701ed33096d389f01c4fc1197a7acd6b91724ddc5acfc06 | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/roo… +24a5549b796e43e337513d2908adac67f45350d9a90bca7e2e6120692140bb14 | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.2.5/ro… +5d7e35be6728b331c82eed418fee9133d2481ba2c5a12500c182b27545bc4bbb | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.2.5/ro… 2510a5619c37579c9ce1a04574faaf323cd0ffe2fc4e20fa8f8f01e5bb402e83 | https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.… 844d7d22fcea798c78bf5559229daf88ec9cad8136f5eea0a29aa76b3f8fde7c | https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.… -870e3bce33ad21ef034332b083b2925105becfd73d262e3a1270901229e45076 | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite-framework/2.… -c4dedda03bd663e0ff34c8eaaf608ae86be05929a2f7cf2ce1e17160201bca3e | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite-framework/2.… -cdfceb8f6ec64aac217dc5a499a5edb6d610f9d6a575fba7bea06b2bfaf3ea7f | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite/2.0.1/sqlite… -bc69fd52e7eb5563a766319b7a84efda32f15473c4cec0e12b99502d91489cb1 | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite/2.0.1/sqlite… +8673737fdb2efbad91aeaeed1927ebb29212d36a867d93b9639c8069019f8a1e | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite-framework/2.… +ecd1fa9421e442cec59b4e642a51f8398e8d16bb5fcc92ac6fbb085ecc73685c | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite-framework/2.… +8341ff092d6060d62a07227f29237155fff36fb16f96c95fbd9a884e375db912 | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite/2.1.0/sqlite… +a9fe19b196fb25df41719ea6f1bc53f380eaed4bd5e651ec6fd75bcbeeb2a9ee | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite/2.1.0/sqlite… 76da2c502371d9c38054df5e2b248d00da87809ed058f3363eae87ce5e2403f8 | https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawa… 276a20116b705fb75b9003ee9496c56f6fd3b32375fb232472811eba60a040bd | https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawa… 46fd633ac01b49b7fcabc263bf098c5a8b9e9a69774d234edcca04fb02df8e26 | https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawa… @@ -71,10 +71,10 @@ bc69fd52e7eb5563a766319b7a84efda32f15473c4cec0e12b99502d91489cb1 | https://dl.go c729c7be0cc06323bda829d460666e79dbd43b799a21089a44bd3b293dc253b5 | https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versio… 147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682 | https://dl.google.com/dl/android/maven2/androidx/viewpager/viewpager/1.0.0/… 1f72f836339d03c6eb013f65075e76ca87075a577578eb4f95f74a3a5d253128 | https://dl.google.com/dl/android/maven2/androidx/viewpager/viewpager/1.0.0/… -e93836f35d35e47ba501add90fa6559964fa7a70975bf4ffc4a04836189611e9 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime-ktx/2.2.… -7cbb32f2fe880d407d4c53268bcd554c11dc9316a1d6cd556a08fe45a4631f22 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime-ktx/2.2.… -de617480ce64e4e9055e2d0295c87ee20929b06c4f2a5efdaded27dcca8520e4 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.2.0/wo… -960a24728eaedfc4ff7a2f366b9360e02a1d88f9eb0a9c7142ed94ed462797b0 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.2.0/wo… +290d2e9c1a22388b3f0c3dbc204a6176f8c49174126de884820befa83899f129 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime-ktx/2.4.… +3eb66e171b40c9cd2a9b9d9cd61a62d90e4a515491619a8d0a95e98866624b97 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime-ktx/2.4.… +7801441cb973fb007ef311d3db35c3b3c9d011cef890357e7ca33890833354e5 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.4.0/wo… +0ed72c9c5a7be5b0004f226a42fa519093d49985c3eaa1a15b1563f94e9eddda | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.4.0/wo… d2ff1905ff7e7cbed7ecce20408a76b69a52d52fdf655b696ba49007c61a0e11 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary… ec6fe50839c05802cc262ec5611e160d17dff69c5a634bb322b27341f9176e9d | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary… 9a29bf34909bca58b85cacda7d1f09cebe8079e56722911395f1ad6a0b377b94 | https://dl.google.com/dl/android/maven2/com/android/signflinger/4.0.1/signf… @@ -179,9 +179,9 @@ f8698ab46ca996ce889c1afc8ca4f25eb8ac6b034dc898d4583742360016cc04 | https://jcent 317e88291262e0cf2805e956c18850f1d4565c85c2e1112f5d9d08ab1732e696 | https://jcenter.bintray.com/com/google/guava/guava-parent/27.0.1-jre/guava-… f31a5846bd9e14a4c374da1b9b146a5715ecdca925e071e1d2bf4da2daaded90 | https://jcenter.bintray.com/com/google/guava/guava-parent/28.1-jre/guava-pa… 6a8dd041f23a6bb14a86e440fccb993537b62271357a0dac0a3cb0ff39158f36 | https://jcenter.bintray.com/com/google/guava/guava/27.0.1-jre/guava-27.0.1-… -e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069 | https://jcenter.bintray.com/com/google/guava/listenablefuture/1.0/listenabl… 30beb8b8527bd07c6e747e77f1a92122c2f29d57ce347461a4a55eb26e382da4 | https://jcenter.bintray.com/com/google/guava/guava/28.1-jre/guava-28.1-jre.… 74af0e8dd935894ce9bcb8e2842dd0001581b84cb6a7751c3ef9314011399ba4 | https://jcenter.bintray.com/com/google/guava/guava/28.1-jre/guava-28.1-jre.… +e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069 | https://jcenter.bintray.com/com/google/guava/listenablefuture/1.0/listenabl… 53873caf26bc1ed8a567ea6c939ab2aaa3f47a5e32d5cade95ddf5080d23238a | https://jcenter.bintray.com/com/google/guava/listenablefuture/1.0/listenabl… b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99 | https://jcenter.bintray.com/com/google/guava/listenablefuture/9999.0-empty-… 18d4b1db26153d4e55079ce1f76bb1fe05cdb862ef9954a88cbcc4ff38b8679b | https://jcenter.bintray.com/com/google/guava/listenablefuture/9999.0-empty-… @@ -192,8 +192,8 @@ c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://jcent efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom 32ff2307dafc658d0b55b2ad841d625aea5606bb9b0316605165cd6980503243 | https://jcenter.bintray.com/com/google/protobuf/protobuf-bom/3.10.0/protobu… 74ee43b09e711b13d568811e12f33bd16e6087b15f1aeded22b0dfe89ae76856 | https://jcenter.bintray.com/com/google/protobuf/protobuf-bom/3.11.4/protobu… -433ae1f99ae3c330f1b54971b39c2672d49948e6acf661d9bb4f1e9a7743de8e | https://jcenter.bintray.com/com/google/protobuf/protobuf-gradle-plugin/0.8.… -d9fdbf20ea7e2b965a8870d17ebbd2900a64cef3c9a7c2bf0bd4d4857462680a | https://jcenter.bintray.com/com/google/protobuf/protobuf-gradle-plugin/0.8.… +dadf381e55dd54a4e4d2b4070221dc596caff215c061f2c9f0c212966fea134e | https://jcenter.bintray.com/com/google/protobuf/protobuf-gradle-plugin/0.8.… +13811bcb4057c7785afd5451362f37d36c1d7bb7842135255b600e7b6d55315e | https://jcenter.bintray.com/com/google/protobuf/protobuf-gradle-plugin/0.8.… 619b0b0dc344cb141e493cbedc5687c8fb7c985e609a1b035e621bfab2f89021 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java-util/3.10.0/p… 146660182d07798ced06fa8e8ae3b9faa90aa48cf3c6adfc67db9371188ba502 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java-util/3.10.0/p… 161d7d61a8cb3970891c299578702fd079646e032329d6c2cabf998d191437c9 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.10.0/protob… @@ -219,7 +219,7 @@ f879b6e945854c6900b0dbee1c8384d7ab3de7e157fd7ac84937405c416d2a5e | https://jcent 6d704e450a816a45bce806ba22c22fe83d8e8dcf7a71517603de630a1726809f | https://jcenter.bintray.com/com/sun/istack/istack-commons-runtime/3.0.7/ist… 6f83d3c85fdca9ef24010cb2f652aab1a508bff6331c087b60d0301782b78c6f | https://jcenter.bintray.com/com/sun/istack/istack-commons/3.0.7/istack-comm… c2204f54b43593808c9af6502865ee71679823156dabdef341e71d35662c7aa0 | https://jcenter.bintray.com/com/sun/xml/bind/jaxb-bom-ext/2.3.1/jaxb-bom-ex… -8b7d9154594e5b0e2bf1d9de6d2ac8dc7ae84179dfeb571299ce343292e9ed12 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.3.1/jaxb-par… +f699ef37ec7966e284742dfca83075221179041a9a49aef7991280192604462d | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.3.1/jaxb-par… b56383eb4d43498b145d379e2a93d5fcdcd8ff9291f89b58b82cb91658dbf14c | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.3.1/… 7a8473e935504841c606686d84e9c017a739ac2c144fde687aa003a7dd44de7f | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-txw-parent/2.3.1/jaxb… 785861db11ca1bd0d1956682b974ad73eb19cd3e01a4b3fa82d62eca97210aec | https://jcenter.bintray.com/com/sun/xml/fastinfoset/FastInfoset/1.2.15/Fast… @@ -254,8 +254,8 @@ cd1beaa4560dc4dfdb826b9d809e464db22526dfb54264bae78a6ff7efb08e1f | https://jcent 2b9f3497218b32c399d1ecbea0b00d4f4553edcf669919ed1e1a87daa77acf87 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.6.0/jna-5.6.0.aar 5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf | https://jcenter.bintray.com/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar 5fe81b0255978f24616d37b10608b79498a5f3073e1d9b2038d8736a831f2608 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom -5b936f6757872c1b901cb821001652eda746e3b6cffef9c434443534a96bfc9a | https://jcenter.bintray.com/net/java/jvnet-parent/1/jvnet-parent-1.pom -3bc67852756cc2d3e04d8636f3af7d142464ff5bb43c2eda9c32b085be56ac19 | https://jcenter.bintray.com/net/java/jvnet-parent/5/jvnet-parent-5.pom +281440811268e65d9e266b3cc898297e214e04f09740d0386ceeb4a8923d63bf | https://jcenter.bintray.com/net/java/jvnet-parent/1/jvnet-parent-1.pom +1af699f8d9ddab67f9a0d202fbd7915eb0362a5a6dfd5ffc54cafa3465c9cb0a | https://jcenter.bintray.com/net/java/jvnet-parent/5/jvnet-parent-5.pom 26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-… 7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-… f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar @@ -263,7 +263,7 @@ f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcent 75bc89695fa66e75374ecda439b802406f0ab1d826dd386eed0a23b1f0a9d264 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/6.0.3/proguard-ba… 2a823d79f2675582a988d539466d1b175e939782efbe0f6e61f06cb165ed4907 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/6.0.3/proguard-ba… cc12b1168e521491dd0e687cfebec11a4af874b22af70e10cf2a05b47ca00c8f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/6.0.3/proguard-… -dab8d3d71fecb6edb4cc62fcfdd969744975a773b18e09581c63e9a9929dbb3f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/6.0.3/proguard-… +5a5c7317d68ce80d1d40c9d8bd4e38814d42d1b16c265146e333634833a35a57 | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/6.0.3/proguard-… d87266bfd2312c3b036c4ac709310afa35c448ceb18027c3b87a33d03c6de0a0 | https://jcenter.bintray.com/net/sf/proguard/proguard-parent/6.0.3/proguard-… 401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://jcenter.bintray.com/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5… a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar @@ -285,7 +285,7 @@ c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7 | https://jcent 7efc1241e73e7fbb268bfd33242d11ebd3ca07061d7d85f2962dc32a0f0b8855 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.5.6/http… b042b41f2391edb00d35f7f4e509aed2123648c1d246ce58d0f7b905c9fe1f73 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client… 61e9427d4be326c307a7f16ba828d1cb3b14713c9b04fc8ba992a58f376c3136 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-core/4… -3b9ff4e8f7788fbbb3e0011b8a9098e8acf6815709c913aa3d027dfa3a799b3f | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-parent… +caaf967d94afb21753f36082c6086206bd1f48825ff596932cceba72b65d39fa | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-parent… 78ba1096561957db1b55200a159b648876430342d15d461277e62360da19f6fd | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.4.10/httpc… c5c12066df2b3b88a89a2c8602b81ea9a61627e976e5129eea1899ebbaea392b | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.4.10/httpc… 0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.5.6/httpmi… @@ -315,8 +315,9 @@ affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://jcent 310a6aa2d90534c32b8f46f1fc98cd0edae95dcdfca23e2847e5efa9ae0c019a | https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.2018121… 303c422700f79d5d13d528b978c6abd9cd136d78d9f7f6f2556e85a81892f9f1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-… 648025c01c56b234a7458cb6048ae8fcfa941f9ea8ebf059090733237b9df9b6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-… -4c801ff4f5151778762ce2d57080f0cb10a4a94cb76ad24593cca35bff36da48 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-… f120750af0c9e0c6024c3c76469fd4638ef898fc5bc2d4c49f2fe17568f47b9e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-… +baec7911227eec34845439c38876a2dd18eda7c15ac523655411e20e8f053138 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-… +ec86adcccbb839d099b8649c5277a6fbe41d2c04b61b4b296584e7af52ae4ad1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-… ffd156464b8129365423e27b9e53ecbfd32d56b91af977dab2222ca2d271a65f | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/… eb68121782d951a1db37e9a00c8fd9252eafa91388e90987239d75224490d6bb | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/… 2e508e8d23e9ab171f53ae3f71e8218e7242cd138af040d62651ecd9d3417bcd | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processi… @@ -357,18 +358,18 @@ e67e0eaf0d532e4d312947ac4cf02135ea44aee646b32273707dc0c4646a3662 | https://jcent 93f5cb50148dee7da746ed487e6278ee8d94da9a99b670f9f5248456c2f66341 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.7… 5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.7… 24781edf5b0934804930dcafc8911b9e710d146239a82699889132e7b37be9dc | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.7… -4681f2d436a68c7523595d84ed5758e1382f9da0f67c91e6a848690d711274fe | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.1… -63480e72a7d4de742b49a6ff90e45f544ca37f3fe11af8b4839f9cd747515d00 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.1… +812cf197d9c4c67e1f47f95e2d72a9b600f0d1124560617bfe9850773eccbcff | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.2… +cd840ab880f838af0eb76e25930392c6bf0aa2a2adb5e2d4b0bb9f717a295ebd | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.2… b046a5ef54c7006db852e48e547aaff525a9e7a0a5909ffe5fe2c966c1a3a72e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.71/… 7163f88887d050f76f86ad2304f84a9d79c39a96178bf02e4524bdeacc5bb149 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.71/… 40566c0c08d414b9413ba556ff7f8a0b04b98b9f0f424d122dd2088510efccc4 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/… 9d5a13d9abc33445e1366d258af0a77e42f01945acef7c0917b9d539854e2fce | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/… -f9566380c08722c780ce33ceee23e98ddf765ca98fabd3e2fabae7975c8d232b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.10/… -78f2fe1d48e99c64958930ccdc43fce5939460ecdfc65f302823a021d63c520d | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.10/… +50de5f7dad6235064ac6c0ff577f095a91b3306c2547d8bc372291587495024a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.21/… +3b54ad496e7a7f7ad8ad6e846e5c061911242ef474e030ff602beef7565943d6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.21/… 133da70cfc07b56094282eac5c59bccd59f167ee2ead22e5282876d8bc10bf95 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/… a6d50f0321bdb52838c99136930c8dcc78c3074a592d526862ec01be91fa622b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/… -39b7a9442d7a3865e0f4a732c56c1d5da0e11ffb3bb82a461d32deb0c0ca7673 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/… -c2f4d70082dbbfcea68fdfa74289cef32df9e4b5ddf359f006036dff1c5b06d6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/… +8ec3db1516948b2d3524e3afbe75cb5ac59e02d98cb6ef586ef57ba63ca8d11f | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.21/… +5bd2b4922398bd94d1d94e2dca0401089092b453e724a9e746daacacead735b7 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.21/… ab355888358a25478591aafe2cab2dd0b2e44af323a0acc3fd03581b24712430 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.41/… a5e970ffd412599c8159068e670356509193e3238dddf20273ed6a8fb7b09de2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.41/… 1b8355ce90079352de296f3f0b175473e7cbbde34d7338b92e4a80c633baab96 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.41/… @@ -377,19 +378,19 @@ f6837401cbd13a8a31f126a9e22430ab9861602d91a4c310a47805453690f76d | https://jcent ff03e9989faa2d40fa4a9098aaad71e247f27ea4d24b0754da642eb0924bd8c5 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.71/kotli… 3856a7349ebacd6d1be6802b2fed9c4dc2c5a564ea92b6b945ac988243d4b16b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotli… 4f0d574a969ea93c45628a163e1ed3ffabb4584278d72c647ec124f8c8109481 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotli… -01ecb09782c042b931c1839acf21a188340b295d05400afd6e3415d4475b8daa | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.10/kotli… -a4b9cfbb4bbda523af1e24d52c775fb9c0f7cb568e48b065d45aeb56e63c2762 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.10/kotli… +f78c5d8c09db985912ab83a1de3c3b53ddf208d7b151f06a72358ea3e137d01b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.21/kotli… +076c5a29b7a79ba2050b52e12307783d6b18d7701ce5245a3f48d005c51ae2be | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.21/kotli… 71cdc094af3463af5773122941819ce11951e8550c499938bb79a04b3d5ee842 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.71/kotl… ab2b2bd3304dcd40562a2930c53002b1e2d80fb21d0d9cc7d6448a83b9ae6b0b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.71/kotl… 51f7f966cd071ff412df49849bdd0a6a651f800c8816defaa29fcd106eedcdac | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-klib/1.3.71/ko… fae43f08052e63bf49cbcda0ade70c05381c4093521e20f31dd564947c1b7105 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-klib/1.3.71/ko… -3b6529d1872a2c689b2231cf3e75476badd5c5a430206c2c1967e4deb171e50d | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-androi… -504b6599eb3a3b4d8b4db267d1628e79f3e58f17fc4f6d44c24cda530b0edf39 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-androi… -64c6d2b53e52eb65e26c6b828d848d8ceab30473c3511bbd1c116cf9799bc127 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core-j… +5cfd02a5e7dd9be15835522035d32eca33be0e63085d27f7c918fa495e34f81f | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-androi… +58b3ce8be4521230361fe6679b5930e75730164be1c7b900ddca4218072fee85 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-androi… +3286bd65e41eae735600c0e9a441cb4a0988d0d76647923b9c978c90b0cb7311 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core-j… 7177ed4629704537e0252537629886f5409526ecd041d8d8e308e20624b14394 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… 6f7523ea8a56d7f12d11a004cfe5a4577bfba3ed6c84cc5ac48b72d54975552c | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… -6538f458473a42b6e2a92676f00d70d4fa0f6ae824d13c1e31c8051c196d2335 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… -51be6791ac5aed9718a58b297c8c9081c9b704dfd72a849c4754a40da55ee236 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… +99319ebdd562d9519dfd15f78fe79bc09c3a28875083eea4577d9584359a2f61 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… +4cd24a06b2a253110d8afd250e9eec6c6faafea6463d740824743d637e761f12 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… 1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-… 5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-… 518080049ba83181914419d11a25d9bc9833a2d729b6a6e7469fa52851356da8 | https://jcenter.bintray.com/org/json/json/20180813/json-20180813.jar @@ -411,24 +412,24 @@ b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcent fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom 13009fb5ede3cf2be5a8d0f1602155aeaa0ce5ef5f9366892bd258d8d3d4d2b1 | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar 1e1beb22ca906209700122b5cacf6f2719324538c5b1e3c27bf91564c8d31dbd | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.pom -e00994073f2c041891e511707ce991a7671b335f8863099719eb749897c231b9 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/63.0.0… -f16249682aa48169d0508bd5310778241f856df91b57201a99ad78d0b4741f34 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/63.0.0… -be10c6c12568bfb4ce987756c6bfcf60ce01085a2dab185e0aef8092cd5c779c | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.… -ea6cb3d94121d03fefd5329072c7b01d891b8bb25c2c303b28dfd6728eeaa72f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.… -377092988061736b0a6e8ddfd243fb9766598724abe0153767310ad2b0be86f5 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.… -45ea21040eadcdce28620267916dc6fd7c252ec54bed1bbefb8f5b6b456e6a5c | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.… -6215b79ff57a56a1ec3f1937ce9870614f96b5afc3e54837d48239b74a28c185 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/63.0.0… -6a80782f831863c5c592cf2851cbec06f0661a868bca960512b0cc920711bddb | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/63.0.0… -9eadd1526848b5669c6e00bfc4283eb63c2d2c1179db5c1329cca2a2e227003a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/… -ca3c96c281e314f07170bbfa766693ef0d2e4d865433a9622254088ee7e68363 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/… -93fd44998bfeeab9d7137cb34a50d510876ec8362e988b8a4ddf4e1629a69e71 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.… -b3836516ae7c9f1ca38ce636e24e3d10b2b421d94e344f14033daa5f20df3168 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.… -c844c630c520e7ca53db9282380242248fe5c11d9ab6b941ddded5bb51296721 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… -a8cc4657e66af457b8f8ef675ff59b0a1dbfe71466fc93271b6867bc270a7712 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… -5eb5d86577ecf64ba66df368c07dde772d1e82da63f25d73e63118d261ca7a7c | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -d1a407ad60d86df547ca4521ed5355e609bbe09f22ef658c89cade0780468994 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -a1925b30aed9675e339205797eebd0598885cc987fc61890e81f4a2c12dcf6b6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.0.4/glean-3… -477ee8ea2f4bbcf2860553987f3e5fddaac7cfd6bcae7c1bef7a7b29cdc5d9d8 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.0.4/glean-3… +e5801430997ccd358df0b4b48f101402b924a72de87cc5f12d80a32bb6d61865 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0… +5d08cc1bb3c2432ab3ecaaa6c06ca0603a9957ece9524643b9db4fb77a01f7b8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0… +bfbb680afd838af36e4609d1b7236dbef93f47e92b386bb7ca08efca910e2e59 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.… +c65c694e7579c0531eb09f569c97121793c11895e66fe8b206d1e9941b5ea9c8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.… +d5b2a0cf4022b8287b0e515909262c3969fde476d3df71fcc165b4b76de0fdf1 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/71.0.… +b7e1a47fc0a4819023b0356c11b929e22caf101c62318981882a04ecea22d859 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/71.0.… +fe504319fc0bc08ca00d8b951bf5d5f6fa4a5fc467e28b609cd34e8c59c20ad9 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/71.0.0… +d1741144ed2ea215a84f5d94d779cafcfaf778cce8cc7224437a2884cb1101bc | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/71.0.0… +755cd9e2c9d550b7d13e32b2d0fc3838021967405cf6b7bf30c58577fec5827a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/… +7b0a3bd6d32c8002f785db8fdbf3b08e3541366e784cac1304cb3f49642b916a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/… +f7bf27270904abd8639b543151b6eaf268b821b8e6235c8decf8031e02ec8648 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.… +0b80acf7d1dd0d9484b0e82cd1a04ae57270d7f7e6b339ce39424554d48798e3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.… +6f26ffb388a1d23809b99e9c84c0be54e27a90dcc14abcc779b0216bc6356946 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… +a073c6239b797829a580265497d770eabfec2c40cc4d361f72a01c0a0987326a | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… +ccd3a75eb0e0f8ce5882d9d3a3154e3d3c40ce9c44f6c506ad4e28df84bab751 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +a09eccf8b4fbb071e1acf3ea3ce1d30017250ee9c35424a0f98659526ff19597 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +a1db8db94979392030d8a5eb1c5d7eccc8383adbf031575d746c68a92e9b0d20 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-3… +d6394ad35c63daca22246363ff826749deb62d514a1843eea27d8f39dfb778e6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-3… 470564ff0a452da1c96be4ca3a9cdeceaa2912537ee2a8def486f3b383d43f15 | https://plugins.gradle.org/m2/com/jetbrains/python/envs/com.jetbrains.pytho… 6438812f927b505a4c4ef2703b45433a1b99e45334526bfed25e71e1a79abb14 | https://plugins.gradle.org/m2/gradle/plugin/com/jetbrains/python/gradle-pyt… 317aa4c467a37d5fcab6657c326a4069ea8e8c6dda951ec2091ffb95c596a2a3 | https://plugins.gradle.org/m2/gradle/plugin/com/jetbrains/python/gradle-pyt… diff --git a/projects/application-services/update-cargo-lock.patch b/projects/application-services/update-cargo-lock.patch index 283a3a2..5e28cca 100644 --- a/projects/application-services/update-cargo-lock.patch +++ b/projects/application-services/update-cargo-lock.patch @@ -1,11 +1,14 @@ -From 214a01a43691302b52c2fd8c39c26ef66d4c00b8 Mon Sep 17 00:00:00 2001 +From cdcce5ffd9e49d4648dd6b23a6dfbc8011352883 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Fri, 27 Nov 2020 09:55:49 +0000 Subject: [PATCH] update cargo.lock +--- + Cargo.lock | 390 +++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 273 insertions(+), 117 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 21244f27..a28c22d7 100644 +index 813c475c..20b6e4d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,9 +86,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" @@ -52,7 +55,7 @@ index 21244f27..a28c22d7 100644 "proc-macro2", "quote", "serde", -@@ -186,9 +185,9 @@ dependencies = [ +@@ -191,9 +190,9 @@ dependencies = [ [[package]] name = "backtrace" @@ -64,7 +67,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "addr2line", "cfg-if 1.0.0", -@@ -210,6 +209,12 @@ version = "0.12.3" +@@ -215,6 +214,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" @@ -77,7 +80,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "bincode" version = "1.3.1" -@@ -232,6 +237,18 @@ version = "1.2.1" +@@ -237,6 +242,18 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" @@ -96,7 +99,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "blake2b_simd" version = "0.5.11" -@@ -320,9 +337,9 @@ dependencies = [ +@@ -325,9 +342,9 @@ dependencies = [ [[package]] name = "cc" @@ -108,7 +111,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "cfg-if" -@@ -437,11 +454,21 @@ dependencies = [ +@@ -442,11 +459,21 @@ dependencies = [ "winapi-util", ] @@ -132,7 +135,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "const-random-macro", "proc-macro-hack", -@@ -449,12 +476,14 @@ dependencies = [ +@@ -454,12 +481,14 @@ dependencies = [ [[package]] name = "const-random-macro" @@ -149,7 +152,7 @@ index 21244f27..a28c22d7 100644 ] [[package]] -@@ -471,9 +500,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +@@ -476,9 +505,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" @@ -161,7 +164,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "core-foundation-sys", "libc", -@@ -481,9 +510,9 @@ dependencies = [ +@@ -486,9 +515,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" @@ -173,7 +176,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "cpuid-bool" -@@ -543,7 +572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -548,7 +577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ "cfg-if 1.0.0", @@ -182,7 +185,7 @@ index 21244f27..a28c22d7 100644 ] [[package]] -@@ -554,18 +583,18 @@ checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +@@ -559,18 +588,18 @@ checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -205,7 +208,7 @@ index 21244f27..a28c22d7 100644 "lazy_static", "memoffset", "scopeguard", -@@ -573,26 +602,20 @@ dependencies = [ +@@ -578,26 +607,20 @@ dependencies = [ [[package]] name = "crossbeam-utils" @@ -238,7 +241,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "csv" -@@ -738,7 +761,7 @@ version = "1.2.1" +@@ -743,7 +766,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d97f19730c1eb3332d0657d0f3ca72795d77c61d8eb26bdd7f15edc0c61eb2" dependencies = [ @@ -247,7 +250,7 @@ index 21244f27..a28c22d7 100644 "byteorder", "once_cell", "serde", -@@ -1034,6 +1057,16 @@ version = "0.1.1" +@@ -1039,6 +1062,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" @@ -264,7 +267,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "fuchsia-cprng" version = "0.1.1" -@@ -1056,53 +1089,59 @@ version = "0.3.3" +@@ -1061,53 +1094,59 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" @@ -337,7 +340,7 @@ index 21244f27..a28c22d7 100644 "pin-utils", "slab", ] -@@ -1112,7 +1151,7 @@ name = "fxa-client" +@@ -1117,7 +1156,7 @@ name = "fxa-client" version = "0.1.0" dependencies = [ "anyhow", @@ -346,7 +349,7 @@ index 21244f27..a28c22d7 100644 "error-support", "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex", -@@ -1272,7 +1311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1278,7 +1317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7539c8d8699bae53238aacd3f93cfb0bcaef77b85dc963902b9367c5d7a84c48" dependencies = [ "anyhow", @@ -355,7 +358,7 @@ index 21244f27..a28c22d7 100644 "log 0.4.11", "once_cell", "thiserror", -@@ -1361,7 +1400,7 @@ dependencies = [ +@@ -1367,7 +1406,7 @@ dependencies = [ "httparse", "httpdate", "itoa", @@ -364,7 +367,7 @@ index 21244f27..a28c22d7 100644 "socket2", "tokio", "tower-service", -@@ -1488,7 +1527,7 @@ dependencies = [ +@@ -1494,7 +1533,7 @@ dependencies = [ name = "jwcrypto" version = "0.1.0" dependencies = [ @@ -373,7 +376,7 @@ index 21244f27..a28c22d7 100644 "rc_crypto", "serde", "serde_derive", -@@ -1521,6 +1560,19 @@ version = "1.4.0" +@@ -1527,6 +1566,19 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" @@ -392,8 +395,8 @@ index 21244f27..a28c22d7 100644 + [[package]] name = "libc" - version = "0.2.80" -@@ -1673,9 +1725,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + version = "0.2.84" +@@ -1680,9 +1732,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memoffset" @@ -405,7 +408,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "autocfg 1.0.1", ] -@@ -1777,7 +1829,7 @@ dependencies = [ +@@ -1784,7 +1836,7 @@ dependencies = [ "rand 0.7.3", "regex", "serde_json", @@ -414,7 +417,7 @@ index 21244f27..a28c22d7 100644 ] [[package]] -@@ -1800,9 +1852,9 @@ checksum = "ba896fb4d7fe86433ebaf18c532bd9202e54c450a1bf7723855220e0e76d71d1" +@@ -1807,9 +1859,9 @@ checksum = "ba896fb4d7fe86433ebaf18c532bd9202e54c450a1bf7723855220e0e76d71d1" [[package]] name = "native-tls" @@ -426,7 +429,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "lazy_static", "libc", -@@ -1877,11 +1929,23 @@ dependencies = [ +@@ -1884,11 +1936,23 @@ dependencies = [ "version_check", ] @@ -451,15 +454,7 @@ index 21244f27..a28c22d7 100644 "error-support", "nss_sys", "serde", -@@ -1973,15 +2037,15 @@ checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" - - [[package]] - name = "once_cell" --version = "1.4.1" -+version = "1.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" -+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +@@ -1986,9 +2050,9 @@ checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" [[package]] name = "oorandom" @@ -471,7 +466,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "opaque-debug" -@@ -2073,9 +2137,9 @@ dependencies = [ +@@ -2080,9 +2144,9 @@ dependencies = [ [[package]] name = "paste" @@ -483,7 +478,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "paste-impl" -@@ -2113,11 +2177,11 @@ dependencies = [ +@@ -2120,11 +2184,11 @@ dependencies = [ [[package]] name = "pin-project" @@ -498,7 +493,7 @@ index 21244f27..a28c22d7 100644 ] [[package]] -@@ -2133,9 +2197,9 @@ dependencies = [ +@@ -2140,9 +2204,9 @@ dependencies = [ [[package]] name = "pin-project-internal" @@ -510,7 +505,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "proc-macro2", "quote", -@@ -2148,6 +2212,12 @@ version = "0.1.11" +@@ -2155,6 +2219,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" @@ -523,7 +518,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "pin-utils" version = "0.1.0" -@@ -2391,7 +2461,7 @@ dependencies = [ +@@ -2398,7 +2468,7 @@ dependencies = [ name = "push" version = "0.1.0" dependencies = [ @@ -532,7 +527,7 @@ index 21244f27..a28c22d7 100644 "bincode", "error-support", "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -2417,7 +2487,7 @@ dependencies = [ +@@ -2424,7 +2494,7 @@ dependencies = [ name = "push-ffi" version = "0.1.0" dependencies = [ @@ -541,7 +536,7 @@ index 21244f27..a28c22d7 100644 "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static", "log 0.4.11", -@@ -2443,6 +2513,12 @@ dependencies = [ +@@ -2450,6 +2520,12 @@ dependencies = [ "proc-macro2", ] @@ -554,7 +549,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "rand" version = "0.4.6" -@@ -2636,7 +2712,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +@@ -2643,7 +2719,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -563,7 +558,7 @@ index 21244f27..a28c22d7 100644 "lazy_static", "num_cpus", ] -@@ -2645,7 +2721,7 @@ dependencies = [ +@@ -2652,7 +2728,7 @@ dependencies = [ name = "rc_crypto" version = "0.1.0" dependencies = [ @@ -572,7 +567,7 @@ index 21244f27..a28c22d7 100644 "ece", "error-support", "hawk", -@@ -2737,11 +2813,11 @@ dependencies = [ +@@ -2744,11 +2820,11 @@ dependencies = [ [[package]] name = "reqwest" @@ -587,7 +582,7 @@ index 21244f27..a28c22d7 100644 "bytes", "encoding_rs", "futures-core", -@@ -2758,14 +2834,15 @@ dependencies = [ +@@ -2765,14 +2841,15 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding", @@ -605,7 +600,7 @@ index 21244f27..a28c22d7 100644 "web-sys", "winreg", ] -@@ -2822,14 +2899,14 @@ dependencies = [ +@@ -2852,14 +2929,14 @@ dependencies = [ [[package]] name = "rust-argon2" @@ -624,7 +619,7 @@ index 21244f27..a28c22d7 100644 ] [[package]] -@@ -2872,6 +2949,12 @@ dependencies = [ +@@ -2902,6 +2979,12 @@ dependencies = [ "winapi 0.3.9", ] @@ -637,7 +632,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "scopeguard" version = "1.1.0" -@@ -2880,9 +2963,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +@@ -2910,9 +2993,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "security-framework" @@ -649,7 +644,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "bitflags 1.2.1", "core-foundation", -@@ -2893,9 +2976,9 @@ dependencies = [ +@@ -2923,9 +3006,9 @@ dependencies = [ [[package]] name = "security-framework-sys" @@ -661,7 +656,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "core-foundation-sys", "libc", -@@ -2988,6 +3071,18 @@ dependencies = [ +@@ -3018,6 +3101,18 @@ dependencies = [ "url", ] @@ -680,15 +675,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "sha2" version = "0.9.2" -@@ -3015,17 +3110,17 @@ checksum = "797a4eaffb90d896f29698d45676f9f940a71936d7574996a7df54593ba209fa" - - [[package]] - name = "smallvec" --version = "1.4.2" -+version = "1.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" -+checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85" +@@ -3051,11 +3146,11 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" @@ -703,7 +690,7 @@ index 21244f27..a28c22d7 100644 "libc", "redox_syscall", "winapi 0.3.9", -@@ -3042,6 +3137,12 @@ dependencies = [ +@@ -3072,6 +3167,12 @@ dependencies = [ "rusqlite", ] @@ -716,7 +703,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "strsim" version = "0.8.0" -@@ -3074,9 +3175,9 @@ dependencies = [ +@@ -3104,9 +3205,9 @@ dependencies = [ [[package]] name = "syn" @@ -728,7 +715,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "proc-macro2", "quote", -@@ -3087,7 +3188,7 @@ dependencies = [ +@@ -3117,7 +3218,7 @@ dependencies = [ name = "sync-guid" version = "0.1.0" dependencies = [ @@ -737,7 +724,7 @@ index 21244f27..a28c22d7 100644 "rand 0.7.3", "rusqlite", "serde", -@@ -3099,7 +3200,7 @@ name = "sync-test" +@@ -3129,7 +3230,7 @@ name = "sync-test" version = "0.1.0" dependencies = [ "anyhow", @@ -746,7 +733,7 @@ index 21244f27..a28c22d7 100644 "env_logger", "fxa-client", "interrupt-support", -@@ -3127,7 +3228,7 @@ version = "0.1.0" +@@ -3157,7 +3258,7 @@ version = "0.1.0" dependencies = [ "anyhow", "base16", @@ -755,7 +742,7 @@ index 21244f27..a28c22d7 100644 "env_logger", "error-support", "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -3294,6 +3395,12 @@ dependencies = [ +@@ -3324,6 +3425,12 @@ dependencies = [ "viaduct", ] @@ -768,7 +755,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "tempdir" version = "0.3.7" -@@ -3341,18 +3448,18 @@ dependencies = [ +@@ -3371,18 +3478,18 @@ dependencies = [ [[package]] name = "termcolor" @@ -791,7 +778,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "libc", "winapi 0.3.9", -@@ -3428,6 +3535,15 @@ dependencies = [ +@@ -3458,6 +3565,15 @@ dependencies = [ "winapi 0.3.9", ] @@ -807,7 +794,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "tinytemplate" version = "1.1.0" -@@ -3440,15 +3556,24 @@ dependencies = [ +@@ -3470,15 +3586,24 @@ dependencies = [ [[package]] name = "tinyvec" @@ -836,7 +823,7 @@ index 21244f27..a28c22d7 100644 dependencies = [ "bytes", "fnv", -@@ -3458,7 +3583,7 @@ dependencies = [ +@@ -3488,7 +3613,7 @@ dependencies = [ "memchr", "mio", "num_cpus", @@ -845,7 +832,7 @@ index 21244f27..a28c22d7 100644 "slab", ] -@@ -3482,7 +3607,7 @@ dependencies = [ +@@ -3512,7 +3637,7 @@ dependencies = [ "futures-core", "futures-sink", "log 0.4.11", @@ -854,7 +841,7 @@ index 21244f27..a28c22d7 100644 "tokio", ] -@@ -3503,13 +3628,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" +@@ -3533,13 +3658,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" @@ -872,7 +859,7 @@ index 21244f27..a28c22d7 100644 "tracing-core", ] -@@ -3574,18 +3699,18 @@ dependencies = [ +@@ -3604,18 +3729,18 @@ dependencies = [ [[package]] name = "unicode-normalization" @@ -895,7 +882,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "unicode-width" -@@ -3617,7 +3742,7 @@ dependencies = [ +@@ -3647,7 +3772,7 @@ dependencies = [ "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static", "log 0.4.11", @@ -904,7 +891,7 @@ index 21244f27..a28c22d7 100644 ] [[package]] -@@ -3648,10 +3773,11 @@ dependencies = [ +@@ -3678,10 +3803,11 @@ dependencies = [ [[package]] name = "url" @@ -918,7 +905,7 @@ index 21244f27..a28c22d7 100644 "idna", "matches", "percent-encoding", -@@ -3813,6 +3939,30 @@ version = "0.2.68" +@@ -3843,6 +3969,30 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307" @@ -949,7 +936,7 @@ index 21244f27..a28c22d7 100644 [[package]] name = "web-sys" version = "0.3.45" -@@ -3876,7 +4026,7 @@ version = "0.11.0" +@@ -3906,7 +4056,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37" dependencies = [ @@ -958,7 +945,7 @@ index 21244f27..a28c22d7 100644 ] [[package]] -@@ -3956,6 +4106,12 @@ dependencies = [ +@@ -3986,6 +4136,12 @@ dependencies = [ "winapi-build", ] @@ -971,6 +958,3 @@ index 21244f27..a28c22d7 100644 [[package]] name = "x11-clipboard" version = "0.3.3" --- -2.29.2 - diff --git a/projects/application-services/viaduct-workaround.patch b/projects/application-services/viaduct-workaround.patch index 0c74aa7..b5b0121 100644 --- a/projects/application-services/viaduct-workaround.patch +++ b/projects/application-services/viaduct-workaround.patch @@ -1,15 +1,18 @@ -From 2b79903b41133799bcbe72aed2e9e8d54b278d30 Mon Sep 17 00:00:00 2001 +From 5020520a2b240512284a7396e99ed22c54042257 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Wed, 2 Dec 2020 09:26:24 +0000 Subject: [PATCH 1/2] Bug 40156: viaduct*-workaround See: https://github.com/mozilla/application-services/issues/3732. +--- + nimbus/Cargo.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nimbus/Cargo.toml b/nimbus/Cargo.toml -index 3f118b7..0d0fa9b 100644 +index b19acc9..fd267b5 100644 --- a/nimbus/Cargo.toml +++ b/nimbus/Cargo.toml -@@ -25,7 +25,7 @@ serde_derive = "1" +@@ -26,7 +26,7 @@ serde_derive = "1" serde_json = "1" log = "0.4" # Viaduct locked to version same version of app-services as mozilla-central @@ -18,8 +21,8 @@ index 3f118b7..0d0fa9b 100644 thiserror = "1" url = "2.1" rkv = "0.15" -@@ -40,7 +40,7 @@ uniffi = "0.5" - uniffi_build = { version = "0.5", features = [ "builtin-bindgen" ] } +@@ -41,7 +41,7 @@ uniffi = { version = "0.7", optional = true } + uniffi_build = { version = "0.7", features = [ "builtin-bindgen" ], optional = true } [dev-dependencies] -viaduct-reqwest = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"} @@ -27,6 +30,3 @@ index 3f118b7..0d0fa9b 100644 mockito = "0.27" env_logger = "0.7" clap = "2.33.3" --- -2.29.2 - diff --git a/projects/application-services/viaduct-workaround2.patch b/projects/application-services/viaduct-workaround2.patch index df84602..1bc27bb 100644 --- a/projects/application-services/viaduct-workaround2.patch +++ b/projects/application-services/viaduct-workaround2.patch @@ -1,109 +1,17 @@ -From 5d34bb6b8aa779cbb9d9bdb465aa38ff99ecc2d1 Mon Sep 17 00:00:00 2001 +From 9f3cf867a22a807cf997d2b0af283c7ce9d298fe Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Wed, 2 Dec 2020 09:26:43 +0000 Subject: [PATCH 2/2] Bug 40156: Cargo.lock update after viaduct*-workaround +--- + nimbus/Cargo.lock | 43 +++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/nimbus/Cargo.lock b/nimbus/Cargo.lock -index 2339236..dfe0f6f 100644 +index 9caa76c..a73e464 100644 --- a/nimbus/Cargo.lock +++ b/nimbus/Cargo.lock -@@ -30,11 +30,17 @@ version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -+[[package]] -+name = "arrayvec" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" -+ - [[package]] - name = "askama" --version = "0.10.3" -+version = "0.10.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12" -+checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" - dependencies = [ - "askama_derive", - "askama_escape", -@@ -43,13 +49,12 @@ dependencies = [ - - [[package]] - name = "askama_derive" --version = "0.10.3" -+version = "0.10.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881" -+checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" - dependencies = [ - "askama_shared", - "proc-macro2", -- "quote", - "syn", - ] - -@@ -61,12 +66,12 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" - - [[package]] - name = "askama_shared" --version = "0.10.4" -+version = "0.11.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5" -+checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" - dependencies = [ - "askama_escape", -- "nom", -+ "nom 6.0.1", - "proc-macro2", - "quote", - "serde", -@@ -104,9 +109,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - - [[package]] - name = "base64" --version = "0.12.3" -+version = "0.13.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - - [[package]] - name = "bincode" -@@ -124,6 +129,18 @@ version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -+[[package]] -+name = "bitvec" -+version = "0.19.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81" -+dependencies = [ -+ "funty", -+ "radium", -+ "tap", -+ "wyz", -+] -+ - [[package]] - name = "block-buffer" - version = "0.9.0" -@@ -164,9 +181,9 @@ dependencies = [ - - [[package]] - name = "cc" --version = "1.0.61" -+version = "1.0.65" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" -+checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15" - - [[package]] - name = "cfg-if" -@@ -206,6 +223,16 @@ dependencies = [ +@@ -223,6 +223,16 @@ dependencies = [ "winapi 0.3.9", ] @@ -120,262 +28,7 @@ index 2339236..dfe0f6f 100644 [[package]] name = "core-foundation" version = "0.9.1" -@@ -341,6 +368,16 @@ version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -+[[package]] -+name = "form_urlencoded" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" -+dependencies = [ -+ "matches", -+ "percent-encoding", -+] -+ - [[package]] - name = "fuchsia-cprng" - version = "0.1.1" -@@ -363,53 +400,59 @@ version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -+[[package]] -+name = "funty" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8" -+ - [[package]] - name = "futures-channel" --version = "0.3.7" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151" -+checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" - dependencies = [ - "futures-core", - ] - - [[package]] - name = "futures-core" --version = "0.3.7" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46" -+checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" - - [[package]] - name = "futures-io" --version = "0.3.7" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b" -+checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" - - [[package]] - name = "futures-sink" --version = "0.3.7" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11" -+checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" - - [[package]] - name = "futures-task" --version = "0.3.7" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c" -+checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" - dependencies = [ - "once_cell", - ] - - [[package]] - name = "futures-util" --version = "0.3.7" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34" -+checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" - dependencies = [ - "futures-core", - "futures-io", - "futures-task", - "memchr", -- "pin-project 1.0.1", -+ "pin-project 1.0.2", - "pin-utils", - "slab", - ] -@@ -543,7 +586,7 @@ dependencies = [ - "httparse", - "httpdate", - "itoa", -- "pin-project 1.0.1", -+ "pin-project 1.0.2", - "socket2", - "tokio", - "tower-service", -@@ -678,6 +721,19 @@ version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -+[[package]] -+name = "lexical-core" -+version = "0.7.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" -+dependencies = [ -+ "arrayvec", -+ "bitflags", -+ "cfg-if 0.1.10", -+ "ryu", -+ "static_assertions", -+] -+ - [[package]] - name = "libc" - version = "0.2.80" -@@ -790,14 +846,14 @@ dependencies = [ - "rand 0.7.3", - "regex", - "serde_json", -- "serde_urlencoded", -+ "serde_urlencoded 0.6.1", - ] - - [[package]] - name = "native-tls" --version = "0.2.5" -+version = "0.2.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a1cda389c26d6b88f3d2dc38aa1b750fe87d298cc5d795ec9e975f402f00372" -+checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f" - dependencies = [ - "lazy_static", - "libc", -@@ -859,6 +915,18 @@ dependencies = [ - "version_check", - ] - -+[[package]] -+name = "nom" -+version = "6.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0" -+dependencies = [ -+ "bitvec", -+ "lexical-core", -+ "memchr", -+ "version_check", -+] -+ - [[package]] - name = "num-traits" - version = "0.2.14" -@@ -880,9 +948,9 @@ dependencies = [ - - [[package]] - name = "once_cell" --version = "1.4.1" -+version = "1.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" -+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" - - [[package]] - name = "opaque-debug" -@@ -954,9 +1022,9 @@ dependencies = [ - - [[package]] - name = "paste" --version = "1.0.2" -+version = "1.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ba7ae1a2180ed02ddfdb5ab70c70d596a26dd642e097bb6fe78b1bde8588ed97" -+checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9" - - [[package]] - name = "paste-impl" -@@ -984,11 +1052,11 @@ dependencies = [ - - [[package]] - name = "pin-project" --version = "1.0.1" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841" -+checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" - dependencies = [ -- "pin-project-internal 1.0.1", -+ "pin-project-internal 1.0.2", - ] - - [[package]] -@@ -1004,9 +1072,9 @@ dependencies = [ - - [[package]] - name = "pin-project-internal" --version = "1.0.1" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86" -+checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" - dependencies = [ - "proc-macro2", - "quote", -@@ -1019,6 +1087,12 @@ version = "0.1.11" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" - -+[[package]] -+name = "pin-project-lite" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c" -+ - [[package]] - name = "pin-utils" - version = "0.1.0" -@@ -1114,6 +1188,12 @@ dependencies = [ - "proc-macro2", - ] - -+[[package]] -+name = "radium" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" -+ - [[package]] - name = "rand" - version = "0.4.6" -@@ -1227,9 +1307,9 @@ dependencies = [ - - [[package]] - name = "reqwest" --version = "0.10.8" -+version = "0.10.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e" -+checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce" - dependencies = [ - "base64", - "bytes", -@@ -1248,14 +1328,15 @@ dependencies = [ - "mime_guess", - "native-tls", - "percent-encoding", -- "pin-project-lite", -+ "pin-project-lite 0.2.0", - "serde", -- "serde_urlencoded", -+ "serde_urlencoded 0.7.0", - "tokio", - "tokio-tls", +@@ -1326,6 +1336,7 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -383,7 +36,7 @@ index 2339236..dfe0f6f 100644 "web-sys", "winreg", ] -@@ -1299,6 +1380,12 @@ dependencies = [ +@@ -1369,6 +1380,12 @@ dependencies = [ "winapi 0.3.9", ] @@ -396,200 +49,7 @@ index 2339236..dfe0f6f 100644 [[package]] name = "security-framework" version = "2.0.0" -@@ -1381,6 +1468,18 @@ dependencies = [ - "url", - ] - -+[[package]] -+name = "serde_urlencoded" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" -+dependencies = [ -+ "form_urlencoded", -+ "itoa", -+ "ryu", -+ "serde", -+] -+ - [[package]] - name = "sha2" - version = "0.9.2" -@@ -1402,16 +1501,22 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - - [[package]] - name = "socket2" --version = "0.3.15" -+version = "0.3.17" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" -+checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902" - dependencies = [ -- "cfg-if 0.1.10", -+ "cfg-if 1.0.0", - "libc", - "redox_syscall", - "winapi 0.3.9", - ] - -+[[package]] -+name = "static_assertions" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -+ - [[package]] - name = "strsim" - version = "0.8.0" -@@ -1420,9 +1525,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - - [[package]] - name = "syn" --version = "1.0.48" -+version = "1.0.51" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" -+checksum = "3b4f34193997d92804d359ed09953e25d5138df6bcc055a71bf68ee89fdf9223" - dependencies = [ - "proc-macro2", - "quote", -@@ -1441,6 +1546,12 @@ dependencies = [ - "unicode-xid", - ] - -+[[package]] -+name = "tap" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" -+ - [[package]] - name = "tempdir" - version = "0.3.7" -@@ -1467,9 +1578,9 @@ dependencies = [ - - [[package]] - name = "termcolor" --version = "1.1.0" -+version = "1.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" -+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" - dependencies = [ - "winapi-util", - ] -@@ -1514,15 +1625,24 @@ dependencies = [ - - [[package]] - name = "tinyvec" --version = "0.3.4" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" -+dependencies = [ -+ "tinyvec_macros", -+] -+ -+[[package]] -+name = "tinyvec_macros" -+version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" -+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - - [[package]] - name = "tokio" --version = "0.2.22" -+version = "0.2.23" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" -+checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" - dependencies = [ - "bytes", - "fnv", -@@ -1532,7 +1652,7 @@ dependencies = [ - "memchr", - "mio", - "num_cpus", -- "pin-project-lite", -+ "pin-project-lite 0.1.11", - "slab", - ] - -@@ -1556,7 +1676,7 @@ dependencies = [ - "futures-core", - "futures-sink", - "log", -- "pin-project-lite", -+ "pin-project-lite 0.1.11", - "tokio", - ] - -@@ -1577,13 +1697,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" - - [[package]] - name = "tracing" --version = "0.1.21" -+version = "0.1.22" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" -+checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" - dependencies = [ -- "cfg-if 0.1.10", -+ "cfg-if 1.0.0", - "log", -- "pin-project-lite", -+ "pin-project-lite 0.2.0", - "tracing-core", - ] - -@@ -1638,18 +1758,18 @@ dependencies = [ - - [[package]] - name = "unicode-normalization" --version = "0.1.13" -+version = "0.1.16" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" -+checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" - dependencies = [ - "tinyvec", - ] - - [[package]] - name = "unicode-segmentation" --version = "1.6.0" -+version = "1.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" -+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - - [[package]] - name = "unicode-width" -@@ -1675,7 +1795,7 @@ dependencies = [ - "ffi-support", - "lazy_static", - "log", -- "paste 1.0.2", -+ "paste 1.0.3", - ] - - [[package]] -@@ -1706,10 +1826,11 @@ dependencies = [ - - [[package]] - name = "url" --version = "2.1.1" -+version = "2.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -+checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" - dependencies = [ -+ "form_urlencoded", - "idna", - "matches", - "percent-encoding", -@@ -1746,7 +1867,6 @@ checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +@@ -1850,7 +1867,6 @@ checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" [[package]] name = "viaduct" version = "0.1.0" @@ -597,7 +57,7 @@ index 2339236..dfe0f6f 100644 dependencies = [ "ffi-support", "log", -@@ -1762,7 +1882,6 @@ dependencies = [ +@@ -1866,7 +1882,6 @@ dependencies = [ [[package]] name = "viaduct-reqwest" version = "0.1.0" @@ -605,9 +65,9 @@ index 2339236..dfe0f6f 100644 dependencies = [ "ffi-support", "lazy_static", -@@ -1855,6 +1974,30 @@ version = "0.2.68" +@@ -1959,6 +1974,30 @@ version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307" + checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" +[[package]] +name = "wasm-bindgen-test" @@ -635,26 +95,4 @@ index 2339236..dfe0f6f 100644 + [[package]] name = "web-sys" - version = "0.3.45" -@@ -1871,7 +2014,7 @@ version = "0.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37" - dependencies = [ -- "nom", -+ "nom 5.1.2", - ] - - [[package]] -@@ -1935,3 +2078,9 @@ dependencies = [ - "winapi 0.2.8", - "winapi-build", - ] -+ -+[[package]] -+name = "wyz" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" --- -2.29.2 - + version = "0.3.46" diff --git a/projects/uniffi-rs/config b/projects/uniffi-rs/config index 7d89cc2..acd9d2d 100644 --- a/projects/uniffi-rs/config +++ b/projects/uniffi-rs/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 -version: 0.5.0 +version: 0.7.0 git_url: https://github.com/mozilla/uniffi-rs -git_hash: bc4a8570ab8430a4f80c3722ef79ff9a4819969e +git_hash: ea3ff0402438ef1ebceda4c5fbbbd2ed6a9be227 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -13,6 +13,6 @@ input_files: - name: rust project: rust # `cargo vendor vendor` in the `uniffi-rs` directory has vendored the sources. - - URL: https://people.torproject.org/~gk/mirrors/sources/uniffi-rs-vendor-[% c('version') %].tar.bz2 - sha256sum: 71d912237208c35a762b3c812afe0a758823792dd745c1253314bcccc1694b7f + - URL: https://people.torproject.org/~boklm/mirrors/sources/uniffi-rs-vendor-[% c('version') %].tar.bz2 + sha256sum: 8f201df618b3e7bcaaf01a87e0d55171605b80abeb1b660fe4dd0b9bfc10a0d8 - filename: btreeset.patch

1 0

[tor-browser-build/maint-10.0-android] Bug 40241: Update components for mozilla87-based Fenix (fenix part)
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

1 0

[tor-browser-build/maint-10.0-android] Bug 40172: Remove gradle 5.1.1 from android-toolchain
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit e5340d7ef092fe3ad9a98b14bfea526512365606 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 4 20:02:15 2021 +0100 Bug 40172: Remove gradle 5.1.1 from android-toolchain --- projects/android-toolchain/build | 2 -- projects/android-toolchain/config | 4 ---- projects/geckoview/build | 2 ++ projects/geckoview/config | 8 ++++++++ projects/geckoview/mozconfig-android-aarch64 | 2 +- projects/geckoview/mozconfig-android-all | 2 +- projects/geckoview/mozconfig-android-armv7 | 2 +- projects/geckoview/mozconfig-android-x86 | 2 +- projects/geckoview/mozconfig-android-x86_64 | 2 +- projects/gradle/config | 1 + 10 files changed, 16 insertions(+), 11 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index aafc584..c906776 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -16,8 +16,6 @@ unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME # GeckoView is still using an older Android NDK, bundle it, too. unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME -# GeckoView is still using an older Gradle, bundle it, too. -unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME # NDK Archive for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 24a41c2..5d6190b 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -33,7 +33,6 @@ var: android_ndk_version_old: 20 android_ndk_revision: d gradle564: 5.6.4 - gradle511: 5.1.1 input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' @@ -63,6 +62,3 @@ input_files: - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip name: gradle564 sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle511") %]-bin.zip - name: gradle511 - sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 diff --git a/projects/geckoview/build b/projects/geckoview/build index 1c6582c..ab80b81 100644 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -5,6 +5,8 @@ distdir=/var/tmp/dist mkdir -p /var/tmp/build mkdir -p $distdir/[% project %] +tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] + # We need to have the get-moz-build-date script available in the container # but we can't include it via input_files as it is a script shared between # projects. diff --git a/projects/geckoview/config b/projects/geckoview/config index 2735bc2..f424ff6 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -26,6 +26,7 @@ var: use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 6 + gradle_version: 5.1.1 steps: merge_aars: @@ -40,6 +41,8 @@ steps: mkdir -p /var/tmp/build mkdir -p $distdir/[% project %] + tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] + cat > get-moz-build-date << "EOF" [% INCLUDE "get-moz-build-date" %] EOF @@ -99,6 +102,9 @@ steps: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' pkg_type: build + - project: gradle + name: gradle + pkg_type: build - project: node name: node pkg_type: build @@ -141,6 +147,8 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - project: gradle + name: gradle - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - project: binutils diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index 5839477..29be6d2 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -13,7 +13,7 @@ ac_add_options --enable-application=mobile/android ac_add_options --target=aarch64-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle # We do not use Tor Launcher on Android: ac_add_options --disable-tor-launcher diff --git a/projects/geckoview/mozconfig-android-all b/projects/geckoview/mozconfig-android-all index 691b1ab..1b41181 100644 --- a/projects/geckoview/mozconfig-android-all +++ b/projects/geckoview/mozconfig-android-all @@ -7,4 +7,4 @@ ac_add_options --disable-compile-environment ac_add_options --enable-update-channel=beta ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 2530049..538c515 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -13,7 +13,7 @@ ac_add_options --enable-application=mobile/android ac_add_options --target=arm-linux-androideabi ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle # We do not use Tor Launcher on Android: ac_add_options --disable-tor-launcher diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index 160f95f..d3f8d05 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -13,7 +13,7 @@ ac_add_options --enable-application=mobile/android ac_add_options --target=i686-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle # We do not use Tor Launcher on Android: ac_add_options --disable-tor-launcher diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index 5ca74e3..f2fda06 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -13,7 +13,7 @@ ac_add_options --enable-application=mobile/android ac_add_options --target=x86_64-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle # We do not use Tor Launcher on Android: ac_add_options --disable-tor-launcher diff --git a/projects/gradle/config b/projects/gradle/config index 3f0f412..6e2dea1 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -8,6 +8,7 @@ var: deps: - unzip gradle_sha256sum: + 5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f 6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac

1 0

[tor-browser-build/maint-10.0-android] Bug 40162: Build Fenix instrumented tests apk
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit f695effd4dc3384f3e8d401929a807039ee77a63 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Dec 11 23:13:12 2020 +0100 Bug 40162: Build Fenix instrumented tests apk --- projects/fenix/build | 9 +++++---- projects/tor-browser/build.android | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/projects/fenix/build b/projects/fenix/build index f1536f1..c91dce3 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -37,8 +37,10 @@ cd $builddir-[% c("version") %] cp $rootdir/[% c('input_files_by_name/topl') %]/* app/ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ +# XXX We need the build variant in lower case. Do something smarter here. +v=[% c("variant") %] [% IF c("var/fetch_gradle_dependencies") %] - $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint + $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} [% ELSE %] # Add our localized strings [% FOREACH lang = c('var/locales_mobile'); @@ -63,10 +65,9 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ fi version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") %]-[% c("variant") %])' - $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint - # XXX We need the build variant in lower case. Do something smarter here. - v=[% c("variant") %] + $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %] + cp app/build/outputs/apk/androidTest/${v,}/app-${v,}-androidTest.apk $distdir/[% project %] cd $distdir [% c('tar', { diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 71b9d36..e9354bd 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -4,6 +4,8 @@ assets_dir=assets ext_dir=$assets_dir/extensions qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk apk=$rootdir/fenix/app-[% c("var/abi") %]-*.apk +test_out_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-androidTest.apk +test_in_apk=$rootdir/fenix/app-*-androidTest.apk tar xavf $rootdir/[% c('input_files_by_name/fenix') %] @@ -32,3 +34,5 @@ mv $rootdir/allowed_addons.json $assets_dir/allowed_addons.json # Sign a QA build. This .apk is not a debug version and doesn't contain a debug # flag in the manifest. java -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android + +java -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $test_out_apk --in $test_in_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android

1 0

[tor-browser-build/maint-10.0-android] Bug 40172: Remove gradle 6.5.1 from android-toolchain
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit d8619c57cb446b43c6384ceb5700f39af2d75816 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 4 19:41:58 2021 +0100 Bug 40172: Remove gradle 6.5.1 from android-toolchain --- projects/android-toolchain/build | 2 -- projects/android-toolchain/config | 4 ---- projects/fenix/build | 6 ++++-- projects/fenix/config | 3 +++ projects/gradle/config | 1 + 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index a0d5ee8..ff132be 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -20,8 +20,6 @@ unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME # application-services is using a comparatively new Gradle, bundle it, too. unzip -qq [% c("input_files_by_name/gradle63") %] -d $GRADLE_HOME -# Fenix switched to a fairly recent Gradle, add it as well. -unzip -qq [% c("input_files_by_name/gradle651") %] -d $GRADLE_HOME # NDK Archive for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index f3214ab..648b1d9 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -32,7 +32,6 @@ var: android_ndk_version: 21 android_ndk_version_old: 20 android_ndk_revision: d - gradle651: 6.5.1 gradle63: 6.3 gradle564: 5.6.4 gradle511: 5.1.1 @@ -62,9 +61,6 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' name: android_ndk_compiler_old sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle651") %]-bin.zip - name: gradle651 - sha256sum: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle63") %]-bin.zip name: gradle63 sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768 diff --git a/projects/fenix/build b/projects/fenix/build index c91dce3..c2f6f32 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -6,6 +6,8 @@ builddir=/var/tmp/build/[% project %] mkdir -p $distdir/[% project %] mkdir -p /var/tmp/build +tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] + cat > get-moz-build-date << "EOF" [% INCLUDE "get-moz-build-date" %] EOF @@ -40,7 +42,7 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ # XXX We need the build variant in lower case. Do something smarter here. v=[% c("variant") %] [% IF c("var/fetch_gradle_dependencies") %] - $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} + $GRADLE_HOME/gradle/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} [% ELSE %] # Add our localized strings [% FOREACH lang = c('var/locales_mobile'); @@ -65,7 +67,7 @@ v=[% c("variant") %] fi version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") %]-[% c("variant") %])' - $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} + $GRADLE_HOME/gradle/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %] cp app/build/outputs/apk/androidTest/${v,}/app-${v,}-androidTest.apk $distdir/[% project %] diff --git a/projects/fenix/config b/projects/fenix/config index a8a8e39..19ba93c 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -18,6 +18,7 @@ var: # Switch to make it easier to grab all dependencies during a dry-run. # Note: Use the commit that integrates Tor. fetch_gradle_dependencies: 0 + gradle_version: 6.5.1 targets: nightly: @@ -29,6 +30,8 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - project: gradle + name: gradle - name: android-components project: android-components enable: '[% !c("var/fetch_gradle_dependencies") %]' diff --git a/projects/gradle/config b/projects/gradle/config index 4ad4a16..3f0f412 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -9,6 +9,7 @@ var: - unzip gradle_sha256sum: 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f + 6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac input_files:

1 0

[tor-browser-build/maint-10.0-android] Bug 40172: Simplify gradle's project support for mutliple versions
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit 99a817392afc90116d68c316c582b54cb437b3c7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 4 19:12:05 2021 +0100 Bug 40172: Simplify gradle's project support for mutliple versions --- projects/android-components/build | 3 --- projects/android-components/config | 1 + projects/android-toolchain/config | 8 +++++++- projects/application-services/build | 3 --- projects/application-services/config | 6 +----- projects/gradle/build | 2 +- projects/gradle/config | 14 +++++++------- 7 files changed, 17 insertions(+), 20 deletions(-) diff --git a/projects/android-components/build b/projects/android-components/build index 6c62a6c..279525c 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -7,9 +7,6 @@ mkdir $distdir/[% project %] mkdir /var/tmp/build tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] -# XXX: Not needed once we are done with moving Gradle out of our toolchain -# project. -export PATH=$GRADLE_HOME/gradle/bin:$PATH cat > get-moz-build-date << "EOF" [% INCLUDE "get-moz-build-date" %] diff --git a/projects/android-components/config b/projects/android-components/config index 948fcbd..f00e26a 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -17,6 +17,7 @@ var: # Switch to make it easier to grab all dependencies during a dry-run. # Note: Use the commit before support for new GeckoView interfaces gets added. fetch_gradle_dependencies: 0 + gradle_version: 6.6.1 targets: nightly: diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 5268319..f3214ab 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -19,7 +19,13 @@ var: export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME - export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin + # In the PATH we set $GRADLE_HOME/gradle/bin (not included in + # android-toolchain) before $GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin + # (which is included in android-toolchain)). + # + # Project which need a specific gradle version can use the gradle + # project and extract it in $GRADLE_HOME/gradle/bin + export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin google_repo: https://dl.google.com/android/repository android_api_level: 29 android_platform_revision: 04 diff --git a/projects/application-services/build b/projects/application-services/build index 8cf98a8..24a66f8 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -7,9 +7,6 @@ mkdir $distdir mkdir /var/tmp/build tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] -# XXX: Not needed once we are done with moving Gradle out of our toolchain -# project. -export PATH=$GRADLE_HOME/gradle/bin:$PATH cd /var/tmp/dist [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] tar -xf $rootdir/[% c('input_files_by_name/nss-' _ arch) %] diff --git a/projects/application-services/config b/projects/application-services/config index 4c0d184..11fc5d7 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -12,15 +12,11 @@ var: gradle_dependencies_version: 4 # This should be updated when the list of rust dependencies is changed. rust_vendor_version: 3 - # For armv7 we need a different target than the default one we use for - # GeckoView. We set this variable so the Rust project in the `input_files` - # below can set the correct target when built for use in this project, - # querying `origin_project`. - application_services: 1 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 # application-services is still stuck on an older glean_parser version. glean_parser: 1.28.6 + gradle_version: 6.5 input_files: - project: container-image diff --git a/projects/gradle/build b/projects/gradle/build index 06ea3c6..adb5233 100644 --- a/projects/gradle/build +++ b/projects/gradle/build @@ -1,7 +1,7 @@ #!/bin/bash [% c("var/set_default_env") -%] unzip -qq [% c("input_files_by_name/gradle") %] -mv [% project %]-[% c("var/gradle_version") %] [% project %] +mv [% project %]-[% c("version") %] [% project %] [% c('tar', { tar_src => [ project ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), diff --git a/projects/gradle/config b/projects/gradle/config index 4414436..4ad4a16 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -1,18 +1,18 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("var/gradle_version") %].tar.gz' +filename: '[% project %]-[% c("version") %].tar.gz' +version: '[% pc(c("origin_project"), "var/gradle_version", { error_if_undef => 1 }) %]' var: container: use_container: 1 deps: - unzip - # XXX: Think about ways to make this more legible, in particular once more - # Gradle versions get added. - gradle_version: '[% IF pc(c("origin_project"), "var/application_services") %]6.5[% ELSE %]6.6.1[% END %]' - gradle_sha256sum: '[% IF pc(c("origin_project"), "var/application_services") %]23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f[% ELSE %]7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac[% END %]' + gradle_sha256sum: + 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f + 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac input_files: - project: container-image - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip + - URL: https://services.gradle.org/distributions/gradle-[% c("version") %]-bin.zip name: gradle - sha256sum: '[% c("var/gradle_sha256sum") %]' + sha256sum: '[% c("var/gradle_sha256sum/" _ c("version"), { error_if_undef => 1 }) %]'

1 0

[tor-browser-build/maint-10.0-android] Bug 40172: Remove gradle 6.3 from android-toolchain
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit d0096d496ff3381b95b85497afab52642b720235 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 4 19:46:53 2021 +0100 Bug 40172: Remove gradle 6.3 from android-toolchain --- projects/android-toolchain/build | 2 -- projects/android-toolchain/config | 4 ---- 2 files changed, 6 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index ff132be..aafc584 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -18,8 +18,6 @@ unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME # GeckoView is still using an older Gradle, bundle it, too. unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME -# application-services is using a comparatively new Gradle, bundle it, too. -unzip -qq [% c("input_files_by_name/gradle63") %] -d $GRADLE_HOME # NDK Archive for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 648b1d9..24a41c2 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -32,7 +32,6 @@ var: android_ndk_version: 21 android_ndk_version_old: 20 android_ndk_revision: d - gradle63: 6.3 gradle564: 5.6.4 gradle511: 5.1.1 input_files: @@ -61,9 +60,6 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' name: android_ndk_compiler_old sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle63") %]-bin.zip - name: gradle63 - sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768 - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip name: gradle564 sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d

1 0

[tor-browser-build/maint-10.0-android] Bug 40241: Update components for mozilla87-based Fenix (android-components part)
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit 15e911e50750ad01a1b8b0fad234396b70062ef8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 9 19:21:43 2021 +0100 Bug 40241: Update components for mozilla87-based Fenix (android-components part) --- projects/android-components/config | 4 +- projects/android-components/git.patch | 29 +-- .../gradle-dependencies-list.txt | 223 +++++++++++---------- projects/android-toolchain/build | 11 +- projects/android-toolchain/config | 8 + 5 files changed, 151 insertions(+), 124 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index f00e26a..2e91926 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,12 +8,12 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]' var: - android_components_version: 72.0.15 + android_components_version: 73.0.3 torbrowser_branch: 10.0 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 19 + gradle_dependencies_version: 20 # Switch to make it easier to grab all dependencies during a dry-run. # Note: Use the commit before support for new GeckoView interfaces gets added. fetch_gradle_dependencies: 0 diff --git a/projects/android-components/git.patch b/projects/android-components/git.patch index 0f510f7..23cf1c5 100644 --- a/projects/android-components/git.patch +++ b/projects/android-components/git.patch @@ -1,11 +1,15 @@ -From 96fc057633a96188e00a55a0abc28a19d9b1dcf9 Mon Sep 17 00:00:00 2001 +From ad3f56a9e977b8c83643cfcf6f90b03176392c1f Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Sun, 19 Apr 2020 17:59:16 +0000 -Subject: [PATCH] git patch +Subject: [PATCH 1/2] git patch +--- + components/support/base/build.gradle | 2 +- + publish.gradle | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/support/base/build.gradle b/components/support/base/build.gradle -index 094c85e44..1b46c1b84 100644 +index 3a0ae5002..cffb310d5 100644 --- a/components/support/base/build.gradle +++ b/components/support/base/build.gradle @@ -38,7 +38,7 @@ android { @@ -18,18 +22,15 @@ index 094c85e44..1b46c1b84 100644 } diff --git a/publish.gradle b/publish.gradle -index 09280f51f..14da5a6c0 100644 +index 6bbd206d8..e27c00f67 100644 --- a/publish.gradle +++ b/publish.gradle -@@ -61,7 +61,7 @@ ext.configurePublish = { groupIdArg, artifactIdArg, descriptionArg -> - connection = libVcsUrl - developerConnection = libVcsUrl - url = libUrl -- tag = getGitHash() -+ tag = "release build" +@@ -66,7 +66,7 @@ ext.configurePublish = { groupIdArg, artifactIdArg, descriptionArg -> + connection = libVcsUrl + developerConnection = libVcsUrl + url = libUrl +- tag = getGitHash() ++ tag = "release build" + } } } - } --- -2.28.0 - diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index b62555a..34cc330 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -27,6 +27,8 @@ dd77615bd3dd275afb11b62df25bae46b10b4a117cd37943af45bdcbf8755852 | https://dl.go c0c4ed0160cd2ca18390015de8b392b697c173327c6b2c0947d4e62f6958c05d | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1… f7eab60c57addd94bb06275832fe7600611beaaae1a1ec597c231956faf96c8b | https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asyncl… 48167eeedc8da79c4d29deaf0d0cd9b5d8fedcae01f1a6efb3f28f08e8982f71 | https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asyncl… +270c7b7d99942d5ec1dd88594e4648feb33d8e31d8c3c2ab2321d49d9abdfc1f | https://dl.google.com/dl/android/maven2/androidx/biometric/biometric/1.1.0/… +aeb69e76988f43b06c84fca25efab2e418bb98b5aabcd03fa7913bd3ed1bcaa9 | https://dl.google.com/dl/android/maven2/androidx/biometric/biometric/1.1.0/… 8a28c71070271b6f802f5a285ab9ae5b424e60a4f4bb4e73c0c6f53c1375506d | https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.2.0/brow… 0125474b4ff9dd64d9ebaa003ba0a19f782354e4490e270fc9fb2a39b33c1115 | https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.2.0/brow… 1193c04c22a3d6b5946dae9f4e8c59d6adde6a71b6bd5d87fb99d82dda1afec7 | https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/ca… @@ -69,6 +71,8 @@ da6733425a83f5ce850878fa7201082345fed7c668dd58550fdd19c0396c6fa4 | https://dl.go e329d673361e94d2e8f4d4d14e1f0586368bd43fb19efd5766ce7498bcccd162 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.0.0/fr… a14c8b8f2153f128e800fbd266a6beab1c283982a29ec570d2cc05d307d81496 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fr… ef78eb27ac02ddf3545d5f8a3857c73a2837a01853f8d5fcf77251011db52544 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fr… +fdd0eac80c6b26c79093a63fc699303f928cc1fa73ca7196d5590a77eb6d6873 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.0/fr… +295417fbc0edbd706c9415655c111426fba5b20718b4fde601b95ac4f00df9b8 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.0/fr… d19e82d142def6c4e136da70bf92f194c0ecc61d14ab4e84567b2ced0920fa93 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.5/fr… df0aca46b62bb47cc662cbcee63372db6d2a2859478ee38b594fba3433fe30a5 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.5/fr… 33193135a64fe21fa2c35eec6688f1a76e512606c0fc83dc1b689e37add7732a | https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/… @@ -89,8 +93,8 @@ ed88fb124cfb70f2bb928ede1357874374aa45881bcb6d9744c1dc6680fa7c58 | https://dl.go cc30a8a2a97d3767bd169b747c078727308096dd3ab7917d80b2f1f42d118bd6 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common… 8d4072201b6231d67e4192d608d46b1f5c920845106c9831632c2e3ffe706117 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… e18c4bd463eab9432e5a08484d63307aff5205896766802f0978acdb9a37e9c1 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… -bd53c64b038585215b4959c1a388437a3ad525608a31c58e4283c3e371727d4d | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… -510e33b8b6ca33d2fcb3b7615a4528e338b438de398f3ee8de119c26508a5fdd | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… +648c8de1d10b025d524a2e46ac994fc3f6bf186826c09ec1a62d250bf1b877ae | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… +f9b3998f71fc46719f7305d054752d01a9dac0becbee530fd06b70a9cf7ee222 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… 5951f882e95b7e05ceb9adfca0fa2ebd511d63ea5a00da4eae6c6d0c1903da18 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… 85695cce0045ebb9cbba3e2fbe7d7953489bdeb517a1b2e834313ce54556ba22 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… fde334ec7e22744c0f5bfe7caf1a84c9d717327044400577bdf9bd921ec4f7bc | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… @@ -109,8 +113,6 @@ d83af94860aa9f64cbdc51f40796a7cf55b116f0e6efd752e845c0104c8b16f6 | https://dl.go 0d1ce392cc13707fc6b7c1aca584c8c2dbc46790abc0542ba228a731e5d63f8d | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… d8ff6fd844559743050c9ae010a6df230f2a3dbdf3e14498316f30bd8df836b5 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… efd48ae233a32d6f93d155bd1b6dc7ea5c6bc34b145d7730636f32f4e9ddf552 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… -8cddd0c7f4927bbf71fb71fca000786df82cc597c99463d6916ccbe4a205a9ac | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… -8bd43b3a4c017cc9f255f0a33cb216a7b5040d6ee1a8838a95b787987601a4e4 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… 3a977e7778fc8418742d388409daaba7ea8fea8823d21ffb96e4c4236f715070 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… e71869a858f4d933da2f59c273ae1a5c426cfe0b017609bb1f6ab57c02aa4bcd | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… c29fc87694e6ce116b61207221e53ed285862a6628055790b0bcf9ce45d8cc68 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtim… @@ -124,6 +126,10 @@ cb2b15bb0cf14134e953ed8ead96f94265018643f519367d51fd837f7311e9f8 | https://dl.go db21f5e6f286231197131ef184ec7f6ad212e27c1c1bad231bc2625030708029 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-servic… 23516745f34f16ff7850bb1eadd55cf193dd789cba428de4bca120433e3bfd69 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-servic… 6b9e4fe350ed993d0c00b5ac0ff22f28bfc3bfbd9ad7eb7afc9b82f8339e673e | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-servic… +ca2801ffc069555afed8eddd2292130f436956452bc8bbad30fb56f8e4e382a0 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-servic… +f238f90a3d9d1f42779367309127dad8ff1a595dfa0754bbae05d77bfd0b5f33 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-servic… +f4cceafbf86acfc7f3ba6a61d6dc6842a6738c1274610767d3ab8f8a114cba97 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… +37a46395fb334f5d54843d5823f37513c80485dcae6cf16188babc49ebe65e17 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… 3ce866fb822b20fe2f188f974992869a0a6233fe40acbefcff090d6def5e7f33 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… 9f31254e547b214257067611f18fc8a3c08f8df9eba634f6e21badc848596db1 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… 60b758fd1c664089f82d1c018ed4ff7955c14a2b1620af7aa106591f733e0827 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… @@ -339,7 +345,7 @@ efe2431a01a188d3037d02a08e60900ec7406de626e4bd5b4995f28d409c0ebd | https://dl.go 24bd1b4a8f81aea76ae30054df6343b5c0abc27024a5f6fb9c6ee7d4ffb86533 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-measur… d7a2ff3a2fdbd0801f832df3de81dab06d9db7e4a57dfa6d768e7c6e5fa22280 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… 79b705ecf5140d3a2601b44ef058b4588878432eb6fb2f9d65da0551cb0a8e20 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… -ae54afed3e3f65a2e3170b203679e86c78979c0c53dd0d7d7a38cf4fa8d46ca7 | https://download.jetbrains.com/kotlin/native/builds/releases/1.4.21/linux/k… +e953cbf59b797ceb11ce312e8da19bb8afc013ef548d8946711c116bc2500482 | https://download.jetbrains.com/kotlin/native/builds/releases/1.4.30/linux/k… 07c3d82ca7eaf4722f00b2da807dc7860f6169ae60cfedcf5d40218f90880a46 | https://jcenter.bintray.com/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.… 940676b124a8eea8ad7576f9be072c82d7dc7fe350ad895a36081f0c93ae99a6 | https://jcenter.bintray.com/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.… f57c6f089beeedb5b73cdaca7167998ce74505ae9a3d9aeacd72e0ebb0fbf4bc | https://jcenter.bintray.com/com/squareup/okhttp3/parent/3.12.1/parent-3.12.… @@ -348,10 +354,6 @@ f80ce42d2ffac47ad4c47e1d6f980d604d247ceb1a886705cf4581ab0c9fe2b8 | https://jcent cd57f75443ab6a714b203da51994ee64ed0e919fea81f04e4f4b5324e4bb03f0 | https://jcenter.bintray.com/com/squareup/okio/okio/1.17.2/okio-1.17.2.pom ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0… 965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0… -77d7638a32bcae42c929eea307c9a3b48ae1a5abd00cd29f7abf6d51079d83a9 | https://jcenter.bintray.com/org/jetbrains/dokka/dokka-android-gradle-plugin… -b76b0106b4624c5677b758f35a3c0c5d7ffb4ebf1cbf88239d269e8ec16fb961 | https://jcenter.bintray.com/org/jetbrains/dokka/dokka-android-gradle-plugin… -e9215460b1bb674b616cb9c8f1a1b172cdd7b3f4749662d864ebd3f319f0d73d | https://jcenter.bintray.com/org/jetbrains/dokka/dokka-gradle-plugin/0.9.17/… -cef786fa30b52f7c22e2e3255510a4ca52849c7a7b27a2568370a7bc6b9e4cfb | https://jcenter.bintray.com/org/jetbrains/dokka/dokka-gradle-plugin/0.9.17/… affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.2018121… 310a6aa2d90534c32b8f46f1fc98cd0edae95dcdfca23e2847e5efa9ae0c019a | https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.2018121… 79500b867b1194cf781ac98d5c706331a3d3ce8448437f536f8d4cc2faff50c3 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable… @@ -395,57 +397,59 @@ a6d50f0321bdb52838c99136930c8dcc78c3074a592d526862ec01be91fa622b | https://jcent b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom 13009fb5ede3cf2be5a8d0f1602155aeaa0ce5ef5f9366892bd258d8d3d4d2b1 | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar 1e1beb22ca906209700122b5cacf6f2719324538c5b1e3c27bf91564c8d31dbd | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.pom -9ac94a78d28f097fe4717b008f339b5582b42f09bfee4874db84f9f44d04178b | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -ec93cd90a8719f70ac91e837bb387f58209125e089d62e23b9fbadf8c9797a40 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -c851df79b81bff60b33f42b8f3ad3497f94963eecffdd360d588e06b2f5e1902 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/67.2… -24dea3626ba33a81790713097ecdbb0e40acec1f778f3247d687c2def6e7562a | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/67.2… -3de5412e997e57b938c5d820f2b612aa54f9d4e451ded2cd9daa46830b1140a7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/67.2.0/f… -1cba0a74d265432f36ee2643b843f2a1aa1f160f7f95b1d0a674b5f84b61bdda | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/67.2.0/f… -c7506f720eb8f9170ccb0f8ab3bc60a19b4d14585a910e6cb8c70b28b5c45b51 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/67.2.0/… -a11bbacf60c9adb449e9aff67af0f0e7725079f496735c762bc627bac1ba6bd5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/67.2.0/… -7ea4e2f86eb19f108a75ad7a6eab3f04aaabc17fe97721e7af6eaf6016e9ac5e | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/67.2.0/logi… -abc9a481d9a8d0cff2aa2bd64ba3659e7e2a79a4fbdbeda0cdf5f2c3f4f3b20f | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/67.2.0/logi… -fa8d2f9ab6a387a164e0c0b78fd72012db661b3d43848f778fb9288f17de0e52 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/67.… -a9986d9325879d5daa274b0cf140917207134975ca30363c49c7f53008bb0e8d | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/67.… -f1280ce4007d3d6f114c35d747c50ef4b8e972ac20812dc1ad5646c58c874446 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/67.2.0/nimb… -c1bb50d0b6c922aafcb8beb4a0115e4f148f18f15237694fcbc9215806b784ee | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/67.2.0/nimb… -84b1f7298bac034edafc3daef1a8b1fc89543a8ebe5b762c5c3c18abe8a01f7d | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/67.2.0/plac… -20b128955bc1dc0a648cb179337d181c5b8f2c01d17a4eaf778a542007a5ddd3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/67.2.0/plac… -e0876d0f2a8672b608d3d702bc42c8b833a1a146e359c18e0fed2b61d00d3975 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/67.2.0/push-6… -6b6fda096740b2b0293adef4254aec90b43c8061bfa57c95afa6c44998fb4d2e | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/67.2.0/push-6… -8a91c6b51965a76397500c8e3660ec85a4dafe591322c966ce382759baed23d8 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/67.2.0/rus… -2df4bf435be1494030b7e095d3006a88f42ba278d834a46720d2746bac20fb05 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/67.2.0/rus… -57c4acea81f73043ab62dd4dc341a524d38682d6bc2e69bb48822f9e0ac7f48b | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/67.2.0/sync… -2884728eefb23a3e9c91c2d4fd4c91fd95d6b155be7b317ecf70203e68a14428 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/67.2.0/sync… -fd98ace3131929977df6caa61b419956cd704fe7fb46dc20e1d348e710755690 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/67.2.0… -0b41c8ffaa03c0f84bc4ffebcd765c6373162191fa14e480fd1de19e1d9ed2b2 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/67.2.0… -9ff49670a110fd56586229d42673902049a92650257fad81146a25daa5a4e58f | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/67.2.0/tabs-6… -8729ddf632ec417808e0e0b49868cb46bc968fb44c97f5e0b7397ccd4728c8e3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/67.2.0/tabs-6… -e00994073f2c041891e511707ce991a7671b335f8863099719eb749897c231b9 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/63.0.0… -f16249682aa48169d0508bd5310778241f856df91b57201a99ad78d0b4741f34 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/63.0.0… -be10c6c12568bfb4ce987756c6bfcf60ce01085a2dab185e0aef8092cd5c779c | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.… -ea6cb3d94121d03fefd5329072c7b01d891b8bb25c2c303b28dfd6728eeaa72f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.… -377092988061736b0a6e8ddfd243fb9766598724abe0153767310ad2b0be86f5 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.… -45ea21040eadcdce28620267916dc6fd7c252ec54bed1bbefb8f5b6b456e6a5c | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.… -6215b79ff57a56a1ec3f1937ce9870614f96b5afc3e54837d48239b74a28c185 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/63.0.0… -6a80782f831863c5c592cf2851cbec06f0661a868bca960512b0cc920711bddb | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/63.0.0… -9eadd1526848b5669c6e00bfc4283eb63c2d2c1179db5c1329cca2a2e227003a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/… -ca3c96c281e314f07170bbfa766693ef0d2e4d865433a9622254088ee7e68363 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/… -93fd44998bfeeab9d7137cb34a50d510876ec8362e988b8a4ddf4e1629a69e71 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.… -b3836516ae7c9f1ca38ce636e24e3d10b2b421d94e344f14033daa5f20df3168 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.… -816dfaeadb34860eb09f7366163ede45422adfc9e152143a1cda568b815bdba9 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/86.0.… -74dd3e50b176a493a58bc3328b929824126f415f1b5ceb88c1d82ee4d2548bfb | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/86.0.… -5fe022d90f552aae72e0f7f908ade55798ea5a44bdb6c9458dd7706ba60d4eb6 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/87… -a530ccd2c9adfc3b98e3246c33997831ccbe0d66752e968fb90cfa933006cc99 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/87… -230963637e297d1a3edb5b3748731d1243165d3d7dda8ff979d65f8c23a02de5 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/86.0.20210… -0bd06553f02d1cf52e81e83097c37f5bf6790884d9306f08eec8035c14397aa2 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/86.0.20210… -97a9d151ad636acc68eeda046866f0ac24e6f7bf2a81a6b938a3386cc73be529 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… -817736c79269dc217946522fdb8f6ed57547bdd8fbf187687b53ffbe5d813bc3 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… -ccd3a75eb0e0f8ce5882d9d3a3154e3d3c40ce9c44f6c506ad4e28df84bab751 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -a09eccf8b4fbb071e1acf3ea3ce1d30017250ee9c35424a0f98659526ff19597 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -477ee8ea2f4bbcf2860553987f3e5fddaac7cfd6bcae7c1bef7a7b29cdc5d9d8 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.0.4/glean-3… -a1db8db94979392030d8a5eb1c5d7eccc8383adbf031575d746c68a92e9b0d20 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-3… +8f618bf515269c02037d89a555295e39422c759f7b550a74ea3edbe355ebd1ee | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/71.0.0/au… +a1fe528647f8e20b45ea0e32bbec271c32e68b865622c42c9a37816a076be998 | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/71.0.0/au… +d85f563fe91e796d3bc213ee32e98137f0cd92f00cd495d703135d29834d63c7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… +adb969fb3bfef2fc3bb3db62365dd2f68d86203d26746f3c44952c63442f0282 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… +17dbf3d3f2cdcdbd666e6770161066214cc15f58298a9188ee8d58e27e4e5ee6 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/71.0… +8f9fd5e44dacf9f7b5e6e6ca09fde27f8c9877f09f68cd7539f5a3d980a060ff | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/71.0… +525d738af64c99669369b374154dd0d7e4ce32bc034f9736aaa05dc64f373743 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/71.0.0/f… +4f1e345f4e1f41ea2463befa35413ee12b465b3e60f0ab03758b53a17136a091 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/71.0.0/f… +373c9e30a547da6931309ba988242409292f752b0bd41b8a49972bb78546f0a0 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/71.0.0/… +3cb0d177eb6e731633140b2e854c48edee90ef755026b128016e964e5dfbc3e3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/71.0.0/… +4cea81555a8c822e382f18495e2c852a6baa4d599ecde4a11ddd5dc27685e247 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/71.0.0/logi… +86e8a90f5deeb76843286c3afd5e65216b4f05729b4b0d7e93aca51d74b98f48 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/71.0.0/logi… +fa8d2f9ab6a387a164e0c0b78fd72012db661b3d43848f778fb9288f17de0e52 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/71.… +382af2131c727357578c4fdab03a03232a9bdfca3b1036d52fd71ef65a8cf701 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/71.… +8d72e31784fac0c350e063453d537b1d2389f928c67235c897fc4cadfb3a2ca5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/71.0.0/nimb… +d11541433d5795a8d801e03637fc68e6a8baf684a3b7f56ec19684428b5575bf | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/71.0.0/nimb… +54934a2cd59b9562345e019e9b44dd1e23d1e2ede61ae7184e29e4e510e4d422 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/71.0.0/plac… +88e9eed6c49b167ed69864d1d0825123d7c48edfe542cafa203897a75b8fc272 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/71.0.0/plac… +16bc9f4070b9e8bfe0be8a8ce70e922dda4e4fb74d1e20db9dc1739a8d5c5c0d | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/71.0.0/push-7… +a882723e6aca50bb0438a21f2ae1447d9cab19f433181459cf9b7086c2d54892 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/71.0.0/push-7… +04e220d599dd5d5071bc5ee127c5d9db3e6fe378a831c8d002fb1363883711d4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/71.0.0/rus… +eed6764e8fd13edbaa2ceccf976174b4dd618f9807e2ca265c7b193007b2de69 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/71.0.0/rus… +57c4acea81f73043ab62dd4dc341a524d38682d6bc2e69bb48822f9e0ac7f48b | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/71.0.0/sync… +b9a7f2da1c0af1f88fd8bb47d04d11b4cc14f19a0f7dee13bc960ac75e87fd74 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/71.0.0/sync… +a50a7c02a36e5950ab0ca0c3a9486b87fd8de95582d0ddbcaa72af173230254b | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/71.0.0… +3b180681c076339b42e20967f95881fa11b5753ae7f597e3c3c8288c09aa9b5e | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/71.0.0… +6d23b30049cae26d35cbc1c892a785e6bdf9e0399cbbedf5584a48a8dc5cf5c9 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/71.0.0/tabs-7… +383823dd20adbea1eec86fd59097feb3f84f4dda77531a1d79ebe801b4d6d283 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/71.0.0/tabs-7… +e5801430997ccd358df0b4b48f101402b924a72de87cc5f12d80a32bb6d61865 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0… +5d08cc1bb3c2432ab3ecaaa6c06ca0603a9957ece9524643b9db4fb77a01f7b8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0… +bfbb680afd838af36e4609d1b7236dbef93f47e92b386bb7ca08efca910e2e59 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.… +c65c694e7579c0531eb09f569c97121793c11895e66fe8b206d1e9941b5ea9c8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.… +d5b2a0cf4022b8287b0e515909262c3969fde476d3df71fcc165b4b76de0fdf1 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/71.0.… +b7e1a47fc0a4819023b0356c11b929e22caf101c62318981882a04ecea22d859 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/71.0.… +fe504319fc0bc08ca00d8b951bf5d5f6fa4a5fc467e28b609cd34e8c59c20ad9 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/71.0.0… +d1741144ed2ea215a84f5d94d779cafcfaf778cce8cc7224437a2884cb1101bc | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/71.0.0… +755cd9e2c9d550b7d13e32b2d0fc3838021967405cf6b7bf30c58577fec5827a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/… +7b0a3bd6d32c8002f785db8fdbf3b08e3541366e784cac1304cb3f49642b916a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/… +f7bf27270904abd8639b543151b6eaf268b821b8e6235c8decf8031e02ec8648 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.… +0b80acf7d1dd0d9484b0e82cd1a04ae57270d7f7e6b339ce39424554d48798e3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.… +f53d800a8e1a38932fb6d2ce07dea3c0c413e5480a4bda6aadfce9947e7258c5 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/87.0.… +f7d2e354e61287384cd20065f9198153fdaa4da385bb3fb83ae425924b76c278 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/87.0.… +005dc96a0f19c75ac3e83661a4c4e4b6b39fd71ab4d26d4903735fa860da8293 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/88… +cce46579b4a5fd731d5c12f62170287bec4f1ed8a2f24e8cb9a31998c1ea59ab | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/88… +079b282dab3efbdd44aa8f93b73fa3afafefe95b35c8b6a173a07a095a1c2979 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/86.0.20210… +708b41da358580a47e8eeb0512ea4039ec4bd662fd8d72ae1e448f17698bf237 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/86.0.20210… +c9a1855277e7863529fd20a6bdfd09659b472026a98b547b5fa6a19c5ef0d67e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… +22cc8c400823e3fc8eda2e644083b137a9fe867333845ea29c57051349afbb3a | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… +60e34ac4879aa0f8e32fb117669b09ee8946aa34e9372cfe0008995807e876a7 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +0b981a04d70ee3b438359a3da2548f56b188d594dd67bd297a09f0fa0845e348 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… d6394ad35c63daca22246363ff826749deb62d514a1843eea27d8f39dfb778e6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-3… +5d942e4a68aef1fab1b219f51e2882eb61dfd27d4bdcd9265b6d375ce5e5fb3b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/34.1.0/glean-3… +681374f4e97bd97098c1266973d89167ff9c592ccb89617832e224135af72637 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/34.1.0/glean-3… 8f1fec72b91a71ea39ec39f5f778c4d1124b6b097c6d55b3a50b554a52237b27 | https://plugins.gradle.org/m2/com/google/code/gson/gson-parent/2.8.5/gson-p… 233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81 | https://plugins.gradle.org/m2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar b8308557a7fccc92d9fe7c8cd0599258b361285d2ecde7689eda98843255a092 | https://plugins.gradle.org/m2/com/google/code/gson/gson/2.8.5/gson-2.8.5.pom @@ -458,6 +462,10 @@ aa42cf65e9f7475bc7cb2fa7cb7dbf99938dd47de864bbed68135e5a12d3a482 | https://plugi 74a54eb154e18b54fc69ac03ab8d186f3ba293b976eca8b336566248ea2633b4 | https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotli… bdce53a751fdb27af6608039df81214ba22d902ed4169540a3daeb5828c99cad | https://plugins.gradle.org/m2/org/gradle/kotlin/plugins/1.3.6/plugins-1.3.6… 785f12a193912d77fe3b8714567ad5f01d727512a47c5a43aef57852cc1bc9e2 | https://plugins.gradle.org/m2/org/gradle/kotlin/plugins/1.3.6/plugins-1.3.6… +77d7638a32bcae42c929eea307c9a3b48ae1a5abd00cd29f7abf6d51079d83a9 | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-android-gradle-plug… +92f058aef966deca25ddcf1b1ad028d822f94891bf61491ebc914a08a3481e86 | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-android-gradle-plug… +e9215460b1bb674b616cb9c8f1a1b172cdd7b3f4749662d864ebd3f319f0d73d | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-gradle-plugin/0.9.1… +f41e2f85d75abe256ae3f522066ad40ff9b3dc90b0f6e455508a90ba78046871 | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-gradle-plugin/0.9.1… 30278f88cfefb7bb328bedd73374242f8e3e55211e53884e4820dba271132fab | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-android-extension… 5d87527b1f65a82d0a6a4f56cceab960522001a0fd010159a723ab897d58da0c | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-android-extension… 35d8e287a1d74dc55024a42bd788567e1f73e2059eb804319876d652f249ef59 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-annotation-proces… @@ -817,64 +825,65 @@ fde386a7905173a1b103de6ab820727584b50d0e32282e2797787c20a64ffa93 | https://repo. 303c422700f79d5d13d528b978c6abd9cd136d78d9f7f6f2556e85a81892f9f1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… 648025c01c56b234a7458cb6048ae8fcfa941f9ea8ebf059090733237b9df9b6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… f120750af0c9e0c6024c3c76469fd4638ef898fc5bc2d4c49f2fe17568f47b9e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -baec7911227eec34845439c38876a2dd18eda7c15ac523655411e20e8f053138 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -ec86adcccbb839d099b8649c5277a6fbe41d2c04b61b4b296584e7af52ae4ad1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -185520116f93f72b033b9c17280f5282c0df424240ad1aee3a5206505f5d6c28 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -c152d433cb80e15b9666f030fc851250024d6dd82916f1d1686b7e503562f4c7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -a7d247044201f11671c8d3132b5435c0317e9966cc499062b70e969db427a545 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… -99983931bacd18d392d2d7396d972539ed79954becdc3fe0fa4924b3fad14d26 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… -7b42e023a61436990cfa36f53cc2fd6685db5e76bb46e241428fb8da48b9d23b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… -f5f0e2a2f424149de99c2dbd3d3feb81eb26663c8fc9b566dd63383e3507ac2f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… -62b1dc3b2860c65d0231bc73f79299306a8a043bf3810ce98811271aa6780d02 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… -d4a5e8b55dc46a02e525b8c62072877c12f1b4bc743234f0e8d796236b8bf504 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… -86ec85db286befd86dcb7694de77bd36b42e4adc6d842ae74e4396a28afc576a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… -33c2aef1ffd80d944fd9efedeedb3d8b16bfbf78cc6db5c033f631b2ff56cfca | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… -3522e62a91296368df4a00a0db658e81538f892961ce4056adf4c382068610f7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… -895a4b9f993b5d5c5273196289270c8ceb842476bd3619cf31db4d6afdc4ab29 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… -5084253d5a2f6b6b04ea0fdbba27f6b19598b30b60a96362e6f8db89a8e70e68 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… -337d899037380f0403c6d3118d03db6f94ac5b81b2dfc092d9296eb04da2765f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… -d0db9f51efa7ccb5eda0599f53eb04cbdd4084554ba5bf80f7ef34c6bd16f7e1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -79e4e0f22ed1330cb9af97ba697139093fd99f74fc4b4e182f7d0a50db7ce487 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -0e9263f227494e68572d312e10753a9986e1d841de19c4846e0d20603cefced8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -83fda4a1de6e0e164b87fc6eac7ab24b5427bcf43d311f1dabb8a6f557c5ea12 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -c0592d785b285ea1677066913bd7014044379a4694cd4f86faa537bf211d45d0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -d72cb95f92dcc36cf15261ef5d5647f08fdf974839f6b75c0502f5424150a4c5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -7e1ae4f15a7aef746c5b89433f1c5e76b301a635854ef3c6b134b0ca31a36624 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… -58b1dc4a27c380f2a8008fd24d52e5597ec2668d8519d2685abcfae5ad234a70 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… -77e2c30368145180c79e44934bb5901940ee40b6f5f793199b7780ff09fe0ce8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… -f98caea7f4e70b0040a1618aee9a18e4eb92b578419169ead64a8dab11392538 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… -5f400aaea65781039330a5e9755edd55017f36d201c6e5d28aefd6318548afab | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -5f5a780f7369e6a8301062e809e6719a3a694dd61c8ae3e54256e311007fe51f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -96fbbb2d5931d69af3e0d2f2185b0c66b9519acc2e53204cf63fc865977ec698 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -aad1e02bb96a96a5212c43603a06fe941fb66c883b9481b5ac6a5876ef462627 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -fe2df1608a545654a24c04d994bbfde9b6f5433d4a7b56046d336789630ba388 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -9a71c4afcea9b64cf532ca157c9b52618433e035036cc8941e526456908e1e4c | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -68ff14ea2619ba50e425cc34845154f30f5774b18d88bf610de36367aee07da6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -38eab8e158766968d32851e5000623b54d975610c24bbb625eb64f7086772b77 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +f210c702efaea345adf6a14211b8d39231a2679a1f960da2e0692949b9df3ec6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +c9843ec810658da356c5ac2ae9bb2efa912e88b54262a0dc32d52ab40000c2e9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +41eb96531c250a13b9d6023dfcf9bf9d84db0419c4c94d5823104104598399cd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +dd556ad254f4ead2fb38fb88254dfedc8530c76041b20a93ff5744a82de50d9a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +745860fb134d8555a646c863b2e19cff3763f04d193f47d5414f49110bec6bc6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… +8e4c7d39c4a4412a45c752213003bfc138659a529e8f50ac622aae898bce1faa | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… +a061a543aa052e328b22e0a8682b78d336c781110eceadac66d8ad0d265b04f8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… +121d16ce077dc9140c8b4296488c516fd5af464f54beceebc6ed9348dbc25ecd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… +8b997ae2b74b65e0e003e9fb7ffdbbad8f8dcceaae7f1d19d7067200c5a7e315 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… +a88a373df8a2c2ed0c0c72f9575ad7db4433641bfcbb745e13b0e00255fd7261 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… +8738e290afd74dcf64fd29ce4ebe6e82e833ea7802f3083480875aa5cab62f02 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… +3a39769fbf062cb5edc34120c4007ce739f9132f2a1837b377cb3f98ead36586 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… +9ceee49e2fda694fc429ad919b82774df2d414c9116ab3dc3650b92c8150deef | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… +6488337732f4a96c966ae036f3f75e375e48c3a1ae929ca1f90712d3137f52a7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… +81cdfde0c8eb536eecf0e38f4c1a89b4df0ea294369d092877de541cbe3740bb | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… +6bf2a9dcc54eb1a74729160840f43e02d9f0cd0438477375b824a06499a08b5f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… +0ea3333a97e3e4d4ba3aa3d7fe09e02d4fef6c2587bb54470ba602a5b0486d47 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +e48488a1e029d6b585dd797cfd27ec9c889534f01b1702aa05d3e3ea46ed62f3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +e4f96cd6c1ff57be26890ca82a243670f2e82f0afb401774f8fe59fcb44200d0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +4e7bc009cb848b4a4bfdce7fe2f35dea842ec68176b730c802a4379798360375 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +e0050c158cfee4dbc2532e82eab7aebea1d7cd7e34752c9aa27b809c252def2b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +f27cd652e9e1fd4abbf24c074f1ca7a1d8a09518f48e067eb0e941b8cc9ccae2 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +b2b9bc9029d446e2c8cecf709f92196106d11ff7974092880fefdd67ba1b9a49 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… +1efcac305ddab304c2206bb1e511095c11d7e23c0df5374373b1526610188ff3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… +76c0cac89d5e25bfa789cd988810da3ec6fa832bd839d772618766fdedacbf57 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… +d833b01e8539e580dadb806397bdd20062c3046eea1436d9ae153ae60f00575c | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… +3c6308bd5926e57890d299afc748f22fd77c555b67ac5c692d205ff3c2092112 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +1c716dda4f3e72d42bfe820318b1b71fec6a8b577fee46556a72fe30f5d76d43 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +8d72840984b1b67b4fd766c0f65007a5afff05fc9d236e1458c8e0daeb47266d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +9905fa198f34978ca200651ea954020075e888d7b8ae33ead6fafb829b37f1cb | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +c2b66d368147e75efb42f52326ef1729c26a83637fdf858a6283cdff6f6936f4 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +6b8382834df62e29bf612b2c7b799c64782bf4e65b62346b2e9e6343f3540804 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +8ac3e9907fdaba99a59429fdcd7571e8d31691409671baa2a50dd46e219eeb4c | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +88fb3f422066fb4bdf9b4e88a8369e22816ce8c93dd7409775160414700ee1c2 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… 6c91dea17d7dce5f0b550c3de3305767e5fb46247b6d1eb7eca0ca1fe18458de | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… d2e537cd1f7705276242d8cc903a0286b6dc86b41b6e728e967ef719022f2e15 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… -812cf197d9c4c67e1f47f95e2d72a9b600f0d1124560617bfe9850773eccbcff | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… -cd840ab880f838af0eb76e25930392c6bf0aa2a2adb5e2d4b0bb9f717a295ebd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… -50de5f7dad6235064ac6c0ff577f095a91b3306c2547d8bc372291587495024a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… -3b54ad496e7a7f7ad8ad6e846e5c061911242ef474e030ff602beef7565943d6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… -8ec3db1516948b2d3524e3afbe75cb5ac59e02d98cb6ef586ef57ba63ca8d11f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… -5bd2b4922398bd94d1d94e2dca0401089092b453e724a9e746daacacead735b7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +32010683330a6f31b8d309f10433acaa109b61f2df3d252dae7dade9730074c2 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… +2594a44d33068bab2949750cae0c0ea052fc56faf29f06f35bd57cfa68c6736b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… +751cf4a51089dc4c60caec5f30125983cd1d3998a4138ae8e66db0d496f73646 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +7e2a57538390cd609e3a9c6f7e085af5a948c663fda4eddc78907125a960ba20 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +c1ca432b7b4e0533deef6fe372387464f47f49260f706728854a508e413b4e66 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +4a633aa686acf4557f64156ae07889708ac59fb6210f970ace10b2a1425a62eb | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… 6ea3d0921b26919b286f05cbdb906266666a36f9a7c096197114f7495708ffbc | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… 785b5b66f1146317d5ed5b18c8e0c10f83cd5c909434c799a4da9823f028cd63 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… +704fd78960ae046428f69bcd5b951c122e4c180c9400238a866e12cb18494a61 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… ff03e9989faa2d40fa4a9098aaad71e247f27ea4d24b0754da642eb0924bd8c5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… 3db67dafc422b9015e33cfdb3a4df9e8a6912de63c4b733197c8c189cdbc6d4a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… -f78c5d8c09db985912ab83a1de3c3b53ddf208d7b151f06a72358ea3e137d01b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… -076c5a29b7a79ba2050b52e12307783d6b18d7701ce5245a3f48d005c51ae2be | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… -baa182386e8dc9716665812dd87d23bc9e094be9b171616b67c74a78c9b02432 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… -1f22fd66716e91f06ed1c8ef9c8a884d12a578645a3a0e3b11ed0745d301541d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… -06ad4eb7eda10efa9b0dd38ed1d0464c50b21678c9cb37fb6619793a1c5b10ec | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… -0eafc36acad248e5d62475c38d65b1193d680ea2206a4c6a68de6fea81e972a0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… +a7810cf68dd2c8fa79e61a463478880d1df8a5ab9597d151595a9c743b48b90f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… +cc44bf2403bc5d9cbc7515979f5ce15bcff6c01f655f7e4d1db222d26cb575cf | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… +4a6939ca9a54604298b67054668bb7a4fc62178a77b87130de667bb1bdfea2d8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… +16976b913d32635398a3f52233c7cae03249a2015e1d12179fd3348a72b0faae | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… +d8195162f4479312832be7289cc83bd44b3a79c8ff8702a1c6ca7e5bad782747 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… +287998fb67f2b36b49556c7ba9c65203f904f06a2d2553ddc529d17d2bf5b3ff | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… 58b3ce8be4521230361fe6679b5930e75730164be1c7b900ddca4218072fee85 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 5cfd02a5e7dd9be15835522035d32eca33be0e63085d27f7c918fa495e34f81f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 4cd24a06b2a253110d8afd250e9eec6c6faafea6463d740824743d637e761f12 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 3286bd65e41eae735600c0e9a441cb4a0988d0d76647923b9c978c90b0cb7311 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -ad426ec76f52b1dcdf200f55495aea9a2d2796811884e8c4b514645061cf59f3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -9e82078f4dafe1cc2e28f308a317912a45c6a88fc83c51db6ba8cb0ea0829ef1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +f8c8b7485d4a575e38e5e94945539d1d4eccd3228a199e1a9aa094e8c26174ee | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +24ffa65bdfb7d893349cb2e78fb3714a490dd0a9c07375744bb136e9804807fd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 4cd24a06b2a253110d8afd250e9eec6c6faafea6463d740824743d637e761f12 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 99319ebdd562d9519dfd15f78fe79bc09c3a28875083eea4577d9584359a2f61 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 29038be2ba5cf1acac17fc0d9746e553cf90315b8042366169ff6d800dadf239 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index bf93bdb..cd6caec 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -5,6 +5,7 @@ export SDK_HOME=$PROJECT_PATH/android-sdk-linux export NDK_HOME=$PROJECT_PATH/android-ndk android_release_dir=android-10 android_release_dir_old=android-9 +android_release_dir_new=android-11 # Make directories mkdir -p $NDK_HOME $SDK_HOME @@ -39,6 +40,14 @@ unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME mkdir -p platforms/android-[% c("var/android_api_level") %] mv $android_release_dir/* platforms/android-[% c("var/android_api_level") %] +unzip -qq $HOME/[% c("input_files_by_name/build_tools_new") %] -d $SDK_HOME +mkdir -p build-tools/[% c("var/android_api_level_new") %] +mv $android_release_dir_new/* build-tools/[% c("var/android_api_level_new") %] + +unzip -qq $HOME/[% c("input_files_by_name/platform_new") %] -d $SDK_HOME +mkdir -p platforms/android-[% c("var/android_api_level_new") %] +mv $android_release_dir_new/* platforms/android-[% c("var/android_api_level_new") %] + unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME # That's a quirk required by GeckoView but let's have it here instead of in the @@ -47,7 +56,7 @@ mkdir emulator cp tools/emulator emulator/ # Cleanup -rm -fR $android_release_dir $android_release_dir_old +rm -fR $android_release_dir $android_release_dir_old $android_release_dir_new # Archive dist directory cd /var/tmp/dist diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index dc6c3ac..dc30b4d 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -27,6 +27,8 @@ var: google_repo: https://dl.google.com/android/repository android_api_level: 29 android_platform_revision: 04 + android_api_level_new: 30 + android_platform_revision_new: 03 android_ndk_version: 21 android_ndk_revision: d input_files: @@ -40,6 +42,12 @@ input_files: - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") %]_r[% c("var/android_platform_revision") %].zip' name: platform sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69 + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/android_api_level_new") %]-linux.zip' + name: build_tools_new + sha256sum: ed3b7f9b2d15e90a12c2e739adb749d7d834e2f953e677380206bd14db135c6c + - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_new") %]_r[% c("var/android_platform_revision_new") %].zip' + name: platform_new + sha256sum: f3f5b75744dbf6ee6ed3e8174a71e513bfee502d0bc3463ea97e517bff68d84e # ./mach bootstrap is fetching the latest version, so it does not seem to # matter which particular version we are using. Pin to the one fitting best to # SDK version/build-tools version.

1 0

[tor-browser-build/maint-10.0-android] Bug 40241: Update components for mozilla87-based Fenix (GeckoView part)
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit 55f032b08303f453551104ab079c8cd110c81013 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 3 17:00:27 2021 +0100 Bug 40241: Update components for mozilla87-based Fenix (GeckoView part) --- projects/android-toolchain/build | 14 +++++--------- projects/android-toolchain/config | 9 ++++----- projects/application-services/build | 6 ------ projects/geckoview/config | 2 +- projects/geckoview/mozconfig-android-aarch64 | 2 +- projects/geckoview/mozconfig-android-armv7 | 2 +- projects/geckoview/mozconfig-android-x86 | 2 +- projects/geckoview/mozconfig-android-x86_64 | 2 +- projects/nss/build | 8 -------- projects/rust/config | 4 ++-- projects/sqlcipher/build | 8 -------- 11 files changed, 16 insertions(+), 43 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index fa90f64..bf93bdb 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -12,18 +12,14 @@ mkdir -p $NDK_HOME $SDK_HOME # Compiler Archives unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME -# GeckoView is still using an older Android NDK, bundle it, too. -unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME # NDK Archive -for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do - # Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross - # compilation prefix and the one for all the other tools differ. Let's fix that - # so we only have to take care of one. See: #33557 (comment 2674649). - cd $NDK_HOME/android-ndk-r$version/toolchains/llvm/prebuilt/linux-x86_64/bin - for f in `ls arm-linux-androideabi-*`; do +# Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross +# compilation prefix and the one for all the other tools differ. Let's fix that +# so we only have to take care of one. See: #33557 (comment 2674649). +cd $NDK_HOME/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]/toolchains/llvm/prebuilt/linux-x86_64/bin +for f in `ls arm-linux-androideabi-*`; do ln -s $f ${f//arm-linux-androideabi/armv7a-linux-androideabi} - done done # Tool Archives diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 8ee72a1..dc6c3ac 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -15,7 +15,10 @@ var: # By default we use the old NDK which is the one GeckoView is using. # However, we can overwrite that per project if needed (e.g. # application-services is currently on a newer NDK). - export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk/android-ndk-r[% c("var/android_ndk_version_old") %] + export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] + export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME + export ANDROID_NDK_API_VERSION=[% c("var/android_ndk_version") %][% c('var/android_ndk_revision') %] + export NDK_HOST_TAG=linux-x86_64 export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME @@ -25,7 +28,6 @@ var: android_api_level: 29 android_platform_revision: 04 android_ndk_version: 21 - android_ndk_version_old: 20 android_ndk_revision: d input_files: - project: container-image @@ -50,6 +52,3 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux-x86_64.zip' name: android_ndk_compiler sha256sum: dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd - - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' - name: android_ndk_compiler_old - sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 diff --git a/projects/application-services/build b/projects/application-services/build index 24a66f8..4d1ab07 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -19,12 +19,6 @@ tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs') %] export PATH=/var/tmp/dist/rust/bin:/var/tmp/dist/uniffi-rs:$PATH cd $rootdir -# application-services uses a newer NDK, 21, than everything else... -export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r[% pc('android-toolchain', 'var/android_ndk_version') %][% pc('android-toolchain', 'var/android_ndk_revision') %] -# We need to add the new path to our build tools to PATH. -export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH -export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME -export ANDROID_NDK_API_VERSION=[% pc("android-toolchain", "var/android_ndk_version") %][% pc('android-toolchain', 'var/android_ndk_revision') %] export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 [% IF !c('var/fetch_gradle_dependencies') %] diff --git a/projects/geckoview/config b/projects/geckoview/config index f424ff6..06782e7 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 86.0 + geckoview_version: 87.0b4 torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index 29be6d2..c1a191c 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -11,7 +11,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=aarch64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 538c515..3afeb07 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -11,7 +11,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=arm-linux-androideabi -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index d3f8d05..e93486c 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -11,7 +11,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=i686-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index f2fda06..ecf99ca 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -11,7 +11,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=x86_64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/nss/build b/projects/nss/build index c5cfd95..786eec4 100644 --- a/projects/nss/build +++ b/projects/nss/build @@ -7,14 +7,6 @@ mkdir /var/tmp/build tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] export PATH=/var/tmp/dist/ninja:$PATH -# application-services uses a newer NDK, 21d, than all the other projects... -export ANDROID_NDK_API_VERSION=[% pc("android-toolchain", "var/android_ndk_version") %][% pc('android-toolchain', 'var/android_ndk_revision') %] -export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION -# We need to add the new path to our build tools to PATH -export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH -export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME -export NDK_HOST_TAG=linux-x86_64 - nspr_64="" [% IF c("var/cross_prefix") == "armv7a-linux-androideabi" -%] gyp_arch="arm" diff --git a/projects/rust/config b/projects/rust/config index ba820b9..0095a8a 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -11,8 +11,8 @@ var: targets: android: var: - current_version: 1.49.0 - previous_version: 1.48.0 + current_version: 1.50.0 + previous_version: 1.49.0 arch_deps: - libssl-dev - pkg-config diff --git a/projects/sqlcipher/build b/projects/sqlcipher/build index 8942e57..a9609d6 100644 --- a/projects/sqlcipher/build +++ b/projects/sqlcipher/build @@ -6,14 +6,6 @@ builddir=/var/tmp/build/[% project %] mkdir /var/tmp/build tar -C /var/tmp/dist -xf [% c('input_files_by_name/nss') %] -# application-services uses a newer NDK, 21d, than all the other projects... -export ANDROID_NDK_API_VERSION=[% pc("android-toolchain", "var/android_ndk_version") %][% pc('android-toolchain', 'var/android_ndk_revision') %] -export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION -# We need to add the new path to our build tools to PATH -export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH -export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME -export NDK_HOST_TAG=linux-x86_64 - export AR="[% c('var/cross_prefix') %]-ar" # XXX: Mozilla really uses the NDK_API_VERSION here, which is weird. export CC="[% c('var/cross_prefix') %][% pc('android-toolchain', 'var/android_ndk_version') %]-clang"

1 0

[tor-browser-build/maint-10.0-android] Bug 40172: Remove gradle 5.6.4 from android-toolchain
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit 498b618a3c3245bdef84979817d6abdb3b8266bc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 5 15:35:25 2021 +0100 Bug 40172: Remove gradle 5.6.4 from android-toolchain --- projects/android-toolchain/build | 4 +--- projects/android-toolchain/config | 13 ++----------- projects/gradle/config | 1 + projects/tor-android-service/build | 1 + projects/tor-android-service/config | 3 +++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 3 +++ 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index c906776..fa90f64 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -3,19 +3,17 @@ export PROJECT_PATH=/var/tmp/dist/[% project %] export SDK_HOME=$PROJECT_PATH/android-sdk-linux export NDK_HOME=$PROJECT_PATH/android-ndk -export GRADLE_HOME=$PROJECT_PATH/gradle android_release_dir=android-10 android_release_dir_old=android-9 # Make directories -mkdir -p $NDK_HOME $SDK_HOME $GRADLE_HOME +mkdir -p $NDK_HOME $SDK_HOME # Compiler Archives unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME # GeckoView is still using an older Android NDK, bundle it, too. unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME -unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME # NDK Archive for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 5d6190b..8ee72a1 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -19,20 +19,14 @@ var: export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME - # In the PATH we set $GRADLE_HOME/gradle/bin (not included in - # android-toolchain) before $GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin - # (which is included in android-toolchain)). - # - # Project which need a specific gradle version can use the gradle - # project and extract it in $GRADLE_HOME/gradle/bin - export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin + export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin + mkdir -p "$GRADLE_HOME" google_repo: https://dl.google.com/android/repository android_api_level: 29 android_platform_revision: 04 android_ndk_version: 21 android_ndk_version_old: 20 android_ndk_revision: d - gradle564: 5.6.4 input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' @@ -59,6 +53,3 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' name: android_ndk_compiler_old sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip - name: gradle564 - sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d diff --git a/projects/gradle/config b/projects/gradle/config index 6e2dea1..8e732f5 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -9,6 +9,7 @@ var: - unzip gradle_sha256sum: 5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 + 5.6.4: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f 6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 7efd708..68d63cd 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -10,6 +10,7 @@ cp -r $gradle_repo/maven2/* $gradle_repo mkdir -p /var/tmp/build $output_dir [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index d6d2fed..7d375f8 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -12,11 +12,14 @@ var: use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 + gradle_version: 5.6.4 input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - project: gradle + name: gradle - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index c9b1e7a..d4950f6 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -12,6 +12,7 @@ cp -r $gradle_repo/maven2/* $gradle_repo mkdir -p /var/tmp/build $output_dir [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz # Patch projects diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index d07c37b..f4a5c24 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -14,11 +14,14 @@ var: use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 + gradle_version: 5.6.4 input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - project: gradle + name: gradle - project: obfs4 name: obfs4-armv7 target_prepend:

1 0

[tor-browser-build/maint-10.0-android] Add Android pieces for 10.5a13
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

1 0

[tor-browser-build/maint-10.0-android] Pick up Openssl 1.1.1k
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit 2f2acbef264fd04afcfffc7fda1f6f2a3e427c2c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Mar 25 18:09:06 2021 +0000 Pick up Openssl 1.1.1k --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 86f1357..09a8407 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1j +version: 1.1.1k filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -31,4 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf + sha256sum: 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5

1 0

[tor-browser-build/maint-10.0-android] Release preparation for 10.0.15
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit 60d70884fbf8d531aaafdbf6d9ee0294a2b03456 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Apr 5 18:53:32 2021 +0000 Release preparation for 10.0.15 Versions bump and Changelog update --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 20 + projects/tor-browser/allowed_addons.json | 483 +++++++++++---------- projects/tor-browser/config | 4 +- projects/tor/config | 2 +- rbm.conf | 2 +- 5 files changed, 271 insertions(+), 240 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index d277f7b..687723d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,23 @@ +Tor Browser 10.0.15 -- April 7 2021 + * Android + * Update Fenix to 87.0.0 + * Update NoScript to 11.2.4 + * Update Openssl to 1.1.1k + * Update Tor to 0.4.5.7 + * Translations update + * Bug 40030: Add 'noscript' capability to NoScript [torbutton] + * Bug 40045: Add External App Prompt for Sharing Images [android-components] + * Bug 40047: Rebase android-components patches for Fenix 87.0.0 [android-components] + * Bug 40151: Remove survey banner on TBA-stable [fenix] + * Bug 40153: Rebase Fenix patches to Fenix 87.0.0 [fenix] + * Bug 40365: Rebase 10.5 patches on 87.0 [tor-browser] + * Bug 40383: Disable dom.enable_event_timing [tor-browser] + * Build System + * Android + * Bug 40162: Build Fenix instrumented tests apk [tor-browser-build] + * Bug 40172: Move Gradle compilers out of android-toolchain to own gradle project [tor-browser-build] + * Bug 40241: Update components for mozilla87-based Fenix [tor-browser-build] + Tor Browser 10.0.12 -- February 23 2021 * Android * Update Firefox to 86.1.0 diff --git a/projects/tor-browser/allowed_addons.json b/projects/tor-browser/allowed_addons.json index 5f6b16f..7258805 100644 --- a/projects/tor-browser/allowed_addons.json +++ b/projects/tor-browser/allowed_addons.json @@ -12,12 +12,12 @@ { "id": 13299734, "name": "Alexander Shutau", - "url": "https://addons.mozilla.org/en-US/android/user/13299734/", + "url": "https://addons.mozilla.org/en-US/firefox/user/13299734/", "username": "alexanderby", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/13/13299/13299734.png?mo…" } ], - "average_daily_users": 597458, + "average_daily_users": 620722, "categories": { "android": [ "experimental", @@ -31,7 +31,7 @@ "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5168569, + "id": 5210981, "compatibility": { "firefox": { "min": "54.0", @@ -42,19 +42,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/51685…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/52109…", "files": [ { - "id": 3712931, - "created": "2021-01-21T17:44:16Z", - "hash": "sha256:3388ad0c1e91e9fcb5103df1286bb5df0caf192aaf2a85a34acb046ca96b78a1", + "id": 3755341, + "created": "2021-04-05T09:05:03Z", + "hash": "sha256:43da8e70e4d3d2ebde549f5a8dea54b59c8793d32049cdaf8868f3da02e94faa", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 518564, + "size": 533559, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3712931/dark_reader-4.9.2…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3755341/dark_reader-4.9.3…", "permissions": [ "storage", "tabs", @@ -97,10 +97,10 @@ "url": "http://www.opensource.org/licenses/mit-license.php" }, "release_notes": { - "en-US": "- Dynamic mode improvements.\n- Thunderbird support.\n- Users' fixes for websites.\n- Users' translation improvements." + "en-US": "- Fixed performance bottleneck for websites with CSS variables.\n- Users' fixes for websites." }, "reviewed": null, - "version": "4.9.27" + "version": "4.9.31" }, "default_locale": "en-US", "description": { @@ -164,7 +164,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-01-22T09:16:27Z", + "last_updated": "2021-04-05T10:12:36Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -205,12 +205,12 @@ 2400, 1500 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/201/201069.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/201/201069.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/201/201069.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/201/201069.jpg?mo…" }, { "id": 201070, @@ -221,12 +221,12 @@ 2400, 1500 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/201/201070.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/201/201070.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/201/201070.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/201/201070.jpg?mo…" } ], "promoted": { @@ -237,12 +237,12 @@ "category": "recommended" }, "ratings": { - "average": 4.5619, - "bayesian_average": 4.560258202906761, - "count": 3353, - "text_count": 1102 + "average": 4.5609, + "bayesian_average": 4.559483678512808, + "count": 3503, + "text_count": 1155 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/darkreader/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/855413", "slug": "darkreader", @@ -335,8 +335,9 @@ "theme" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/darkreader/", - "weekly_downloads": 24807 + "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", + "weekly_downloads": 23774 }, "notes": null }, @@ -347,12 +348,12 @@ { "id": 5474073, "name": "EFF Technologists", - "url": "https://addons.mozilla.org/en-US/android/user/5474073/", + "url": "https://addons.mozilla.org/en-US/firefox/user/5474073/", "username": "eff-technologists", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modif…" } ], - "average_daily_users": 752696, + "average_daily_users": 748146, "categories": { "firefox": [ "privacy-security" @@ -384,7 +385,7 @@ "platform": "all", "size": 1748610, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3716461/https_everywhere-…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3716461/https_everywhere-…", "permissions": [ "webNavigation", "webRequest", @@ -405,7 +406,7 @@ "name": { "en-US": "Multiple" }, - "url": "https://addons.mozilla.org/en-US/android/addon/https-everywhere/license/202…" + "url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/license/202…" }, "release_notes": { "en-US": "2021.1.27\n* EASE Mode UI Changes\n* NPM Dependency updates\n* Geckodriver pull update\n* Chromedriver pull update\n* Integrate CSS Grid for Options Page and EASE UI\n* Put Options in new tab" @@ -466,12 +467,12 @@ 1280, 800 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/214/214771.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/214/214771.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/214/214771.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/214/214771.jpg?mo…" } ], "promoted": { @@ -482,12 +483,12 @@ "category": "recommended" }, "ratings": { - "average": 4.61, - "bayesian_average": 4.6074823945198755, - "count": 2213, - "text_count": 560 + "average": 4.6686, + "bayesian_average": 4.66611233297302, + "count": 2049, + "text_count": 412 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/https-everywhere/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/229918", "slug": "https-everywhere", @@ -518,7 +519,8 @@ ], "type": "extension", "url": "https://www.eff.org/https-everywhere", - "weekly_downloads": 16892 + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/versions/", + "weekly_downloads": 20809 }, "notes": null }, @@ -529,12 +531,12 @@ { "id": 6937656, "name": "Thomas Rientjes", - "url": "https://addons.mozilla.org/en-US/android/user/6937656/", + "url": "https://addons.mozilla.org/en-US/firefox/user/6937656/", "username": "Synzvato", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/6/6937/6937656.png?modif…" } ], - "average_daily_users": 210128, + "average_daily_users": 211211, "categories": { "android": [ "security-privacy" @@ -569,7 +571,7 @@ "platform": "all", "size": 6857292, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3672658/decentraleyes-2.0…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3672658/decentraleyes-2.0…", "permissions": [ "*://*/*", "privacy", @@ -715,12 +717,12 @@ 700, 521 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/137/137406.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/137/137406.png?modi…", "thumbnail_size": [ - 640, - 476 + 533, + 397 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/137/137406.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/137/137406.jpg?mo…" }, { "id": 205808, @@ -731,12 +733,12 @@ 700, 521 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/205/205808.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/205/205808.png?modi…", "thumbnail_size": [ - 640, - 476 + 533, + 397 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/205/205808.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/205/205808.jpg?mo…" } ], "promoted": { @@ -747,12 +749,12 @@ "category": "recommended" }, "ratings": { - "average": 4.8016, - "bayesian_average": 4.796834743546153, - "count": 1225, - "text_count": 310 + "average": 4.8051, + "bayesian_average": 4.800280079721486, + "count": 1093, + "text_count": 213 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/decentraleyes/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/521554", "slug": "decentraleyes", @@ -844,8 +846,9 @@ "tracking" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/decentraleyes/", - "weekly_downloads": 5661 + "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", + "weekly_downloads": 5083 }, "notes": null }, @@ -856,12 +859,12 @@ { "id": 5474073, "name": "EFF Technologists", - "url": "https://addons.mozilla.org/en-US/android/user/5474073/", + "url": "https://addons.mozilla.org/en-US/firefox/user/5474073/", "username": "eff-technologists", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modif…" } ], - "average_daily_users": 1014979, + "average_daily_users": 999485, "categories": { "android": [ "security-privacy" @@ -896,7 +899,7 @@ "platform": "all", "size": 1237132, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3719726/privacy_badger-20…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3719726/privacy_badger-20…", "permissions": [ "tabs", "http://*/*", @@ -1373,12 +1376,12 @@ 1920, 1080 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/225/225184.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/225/225184.png?modi…", "thumbnail_size": [ - 640, - 360 + 533, + 300 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/225/225184.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/225/225184.jpg?mo…" }, { "id": 171793, @@ -1389,12 +1392,12 @@ 700, 394 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/171/171793.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/171/171793.png?modi…", "thumbnail_size": [ - 640, - 360 + 533, + 300 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/171/171793.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/171/171793.jpg?mo…" } ], "promoted": { @@ -1405,12 +1408,12 @@ "category": "recommended" }, "ratings": { - "average": 4.7854, - "bayesian_average": 4.782131767096186, + "average": 4.7882, + "bayesian_average": 4.785251109857352, "count": 1780, - "text_count": 418 + "text_count": 362 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/privacy-badger17/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/506646", "slug": "privacy-badger17", @@ -1426,8 +1429,9 @@ }, "tags": [], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/privacy-badger17/", - "weekly_downloads": 37713 + "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", + "weekly_downloads": 18656 }, "notes": null }, @@ -1438,12 +1442,12 @@ { "id": 11423598, "name": "Raymond Hill", - "url": "https://addons.mozilla.org/en-US/android/user/11423598/", + "url": "https://addons.mozilla.org/en-US/firefox/user/11423598/", "username": "gorhill", "picture_url": null } ], - "average_daily_users": 5065937, + "average_daily_users": 5028879, "categories": { "android": [ "security-privacy" @@ -1455,7 +1459,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5174693, + "id": 5196606, "compatibility": { "firefox": { "min": "57.0", @@ -1466,19 +1470,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/51…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/51…", "files": [ { - "id": 3719054, - "created": "2021-02-01T14:04:16Z", - "hash": "sha256:5c3a5ef6f5b5475895053238026360020d6793b05541d20032ea9dd1c9cae451", + "id": 3740966, + "created": "2021-03-10T13:37:51Z", + "hash": "sha256:96783b4e9abed66af81a30f7dbb6560911a9d828b12aadf0ec88b181200c3bfe", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 2742973, + "size": 2758798, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3719054/ublock_origin-1.3…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3740966/ublock_origin-1.3…", "permissions": [ "dns", "menus", @@ -1534,10 +1538,10 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "<a href=\"https://outgoing.prod.mozaws.net/v1/a24fd1d9a1598d49cdc2cdc6d3ecd4359712543…" rel=\"nofollow\">Complete release notes</a>.\n\nClosed as fixed:\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/0e94bcfacc284b39a3164377711e52b9ded21cd…" rel=\"nofollow\">After downgrading to 1.32.4, uBO is broken</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/88ab9531e629dc0a259dbe61b357b13316fa1a9…" rel=\"nofollow\">Whitelisting a site on Chromium Edge still blocks resources fetched by service worker</a></li></ul>\n<a href=\"https://outgoing.prod.mozaws.net/v1/35c6fcff904629a7392564335b09eb1fe5f661f…" rel=\"nofollow \">Commits history since 1.33.0</a>." + "en-US": "<a href=\"https://outgoing.prod.mozaws.net/v1/993c4844a604f9df4adc7d0327dfedbaacd28a1…" rel=\"nofollow\">Complete release notes</a>.\n\nClosed as fixed:\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/cb47cb2c01a2d7d899dd8ef6772c49d6af16956…" rel=\"nofollow\">Picker glitch with elements with special characters in their tag name</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/6e6b773c126fb1313b0eb5553db2155115cc012…" rel=\"nofollow\">Expose CNAME-uncloaking as a Privacy option in the Settings pane</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/5a91bdb688dcfe2a791c54906113d2130664c9d…" rel=\"nofol low\">Impossible to add explicit exception for implicit strict blocking</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/d79b53998d6800c05d5d65263fe4b708b2a9b51…" rel=\"nofollow\">Invalid network filters suggested in element picker</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/7f4bccb793a0720711a3e3fe72d3c6104474769…" rel=\"nofollow\">Use +/- in the popup to indicate whether 3-p frames were blocked</a></li></ul>\nNotable commits without en entry in the issue tracker\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/719412530be187ade75ed847aac498911d78886…" rel=\"nofollow\">Fix no-scripting switch not working for SVG-based documents</a></li><li><a href=\"https://outgoing.prod. mozaws.net/v1/9369af26872b10a885b78d6a99a5ef102c5bea64d4bd78cc219abcf93c51c…" rel=\"nofollow\">Upgrade CodeMirror to 5.59.2</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/fd96d2d87c29688b7d2a7743d0724ea20654338…" rel=\"nofollow\">Fix 'adsbygoogle' neutered script</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/a03a3a9cae294846e9071e87f309b72e323e1e0…" rel=\"nofollow\">Inject procedural cosmetic filterer's code only when needed</a></li></ul>\n<a href=\"https://outgoing.prod.mozaws.net/v1/6b8477f5206b215b8e4c77dad49cd5a04bb787c…" rel=\"nofollow\">Commits history since 1.33.2</a>." }, "reviewed": null, - "version": "1.33.2" + "version": "1.34.0" }, "default_locale": "en-US", "description": { @@ -1627,7 +1631,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-02-17T14:45:13Z", + "last_updated": "2021-03-14T13:25:14Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1676,12 +1680,12 @@ 1011, 758 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/238/238546.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/238/238546.png?modi…", "thumbnail_size": [ - 640, - 480 + 533, + 400 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/238/238546.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/238/238546.jpg?mo…" }, { "id": 238548, @@ -1692,12 +1696,12 @@ 1011, 758 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/238/238548.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/238/238548.png?modi…", "thumbnail_size": [ - 640, - 480 + 533, + 400 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/238/238548.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/238/238548.jpg?mo…" }, { "id": 238547, @@ -1708,12 +1712,12 @@ 1011, 758 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/238/238547.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/238/238547.png?modi…", "thumbnail_size": [ - 640, - 480 + 533, + 400 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/238/238547.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/238/238547.jpg?mo…" }, { "id": 238549, @@ -1724,12 +1728,12 @@ 1011, 758 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/238/238549.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/238/238549.png?modi…", "thumbnail_size": [ - 640, - 480 + 533, + 400 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/238/238549.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/238/238549.jpg?mo…" }, { "id": 238552, @@ -1740,12 +1744,12 @@ 970, 1800 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/238/238552.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/238/238552.png?modi…", "thumbnail_size": [ - 259, - 480 + 216, + 400 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/238/238552.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/238/238552.jpg?mo…" }, { "id": 230370, @@ -1756,12 +1760,12 @@ 800, 600 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230370.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230370.png?modi…", "thumbnail_size": [ - 640, - 480 + 533, + 400 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230370.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230370.jpg?mo…" } ], "promoted": { @@ -1772,12 +1776,12 @@ "category": "recommended" }, "ratings": { - "average": 4.7339, - "bayesian_average": 4.733470238857273, - "count": 13377, - "text_count": 4446 + "average": 4.7668, + "bayesian_average": 4.766347193086615, + "count": 11539, + "text_count": 3179 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/ublock-origin/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/607454", "slug": "ublock-origin", @@ -1828,8 +1832,9 @@ }, "tags": [], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/ublock-origin/", - "weekly_downloads": 120361 + "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", + "weekly_downloads": 116901 }, "notes": null }, @@ -1840,12 +1845,12 @@ { "id": 11797710, "name": "JanH", - "url": "https://addons.mozilla.org/en-US/android/user/11797710/", + "url": "https://addons.mozilla.org/en-US/firefox/user/11797710/", "username": "JanH", "picture_url": null } ], - "average_daily_users": 67612, + "average_daily_users": 72477, "categories": { "android": [ "photos-media" @@ -1876,7 +1881,7 @@ "platform": "all", "size": 11927, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3630185/videowiedergabe_i…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3630185/videowiedergabe_i…", "permissions": [ "*://*.youtube.com/*", "*://*.youtube-nocookie.com/*", @@ -1958,12 +1963,12 @@ "category": "recommended" }, "ratings": { - "average": 4.5137, - "bayesian_average": 4.508208540483266, - "count": 989, - "text_count": 375 + "average": 4.5177, + "bayesian_average": 4.512756205641316, + "count": 991, + "text_count": 374 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/video-background-play-fix/re…", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/811592", "slug": "video-background-play-fix", @@ -1985,8 +1990,9 @@ "youtube" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/video-background-play-fix/", - "weekly_downloads": 42 + "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", + "weekly_downloads": 38 }, "notes": null }, @@ -1997,12 +2003,12 @@ { "id": 12808157, "name": "cowlicks", - "url": "https://addons.mozilla.org/en-US/android/user/12808157/", + "url": "https://addons.mozilla.org/en-US/firefox/user/12808157/", "username": "cowlicks", "picture_url": null } ], - "average_daily_users": 97387, + "average_daily_users": 95564, "categories": { "android": [ "experimental", @@ -2038,7 +2044,7 @@ "platform": "all", "size": 284724, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3360398/privacy_possum-20…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3360398/privacy_possum-20…", "permissions": [ "tabs", "http://*/*", @@ -2125,12 +2131,12 @@ 640, 400 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/201/201244.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/201/201244.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/201/201244.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/201/201244.jpg?mo…" } ], "promoted": { @@ -2141,12 +2147,12 @@ "category": "recommended" }, "ratings": { - "average": 4.4967, - "bayesian_average": 4.478734818461856, - "count": 300, - "text_count": 83 + "average": 4.4873, + "bayesian_average": 4.471953145299084, + "count": 316, + "text_count": 88 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/privacy-possum/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/953945", "slug": "privacy-possum", @@ -2168,8 +2174,9 @@ "tracking" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/privacy-possum/", - "weekly_downloads": 1341 + "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", + "weekly_downloads": 1304 }, "notes": null }, @@ -2180,12 +2187,12 @@ { "id": 12929064, "name": "Armin Sebastian", - "url": "https://addons.mozilla.org/en-US/android/user/12929064/", + "url": "https://addons.mozilla.org/en-US/firefox/user/12929064/", "username": "dessant", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/12/12929/12929064.png?mo…" } ], - "average_daily_users": 176675, + "average_daily_users": 178150, "categories": { "android": [ "photos-media", @@ -2196,7 +2203,7 @@ "search-tools" ] }, - "contributions_url": "https://www.paypal.me/ArminSebastian/5?utm_content=product-page-contribute&…", + "contributions_url": "https://www.paypal.com/donate?hosted_button_id=GLL4UNSNU6SQN&utm_content=pr…", "created": "2017-06-17T15:23:33Z", "current_version": { "id": 5177612, @@ -2222,7 +2229,7 @@ "platform": "all", "size": 653210, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3721973/search_by_image-3…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3721973/search_by_image-3…", "permissions": [ "contextMenus", "storage", @@ -2307,12 +2314,12 @@ 1280, 800 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230000.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230000.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230000.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230000.jpg?mo…" }, { "id": 230001, @@ -2321,12 +2328,12 @@ 1280, 800 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230001.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230001.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230001.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230001.jpg?mo…" }, { "id": 230002, @@ -2335,12 +2342,12 @@ 1280, 800 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230002.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230002.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230002.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230002.jpg?mo…" }, { "id": 230003, @@ -2349,12 +2356,12 @@ 1280, 800 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230003.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230003.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230003.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230003.jpg?mo…" }, { "id": 230004, @@ -2363,12 +2370,12 @@ 1280, 800 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230004.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230004.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230004.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230004.jpg?mo…" }, { "id": 230005, @@ -2377,12 +2384,12 @@ 1280, 800 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230005.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230005.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230005.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230005.jpg?mo…" }, { "id": 230006, @@ -2391,12 +2398,12 @@ 1280, 800 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230006.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/230/230006.png?modi…", "thumbnail_size": [ - 640, - 400 + 533, + 333 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230006.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/230/230006.jpg?mo…" } ], "promoted": { @@ -2407,12 +2414,12 @@ "category": "recommended" }, "ratings": { - "average": 4.661, - "bayesian_average": 4.654175268957434, - "count": 826, - "text_count": 169 + "average": 4.6475, + "bayesian_average": 4.64166350289875, + "count": 868, + "text_count": 173 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/search_by_image/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/824288", "slug": "search_by_image", @@ -2444,8 +2451,9 @@ "yandex" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/search_by_image/", - "weekly_downloads": 8365 + "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", + "weekly_downloads": 3793 }, "notes": null }, @@ -2456,19 +2464,19 @@ { "id": 13394925, "name": "Thomas Wisniewski", - "url": "https://addons.mozilla.org/en-US/android/user/13394925/", + "url": "https://addons.mozilla.org/en-US/firefox/user/13394925/", "username": "wisniewskit", "picture_url": null }, { "id": 6084813, "name": "Rob W", - "url": "https://addons.mozilla.org/en-US/android/user/6084813/", + "url": "https://addons.mozilla.org/en-US/firefox/user/6084813/", "username": "RobW", "picture_url": null } ], - "average_daily_users": 40775, + "average_daily_users": 44681, "categories": { "android": [ "other" @@ -2499,7 +2507,7 @@ "platform": "all", "size": 13786, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3655036/google_search_fix…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3655036/google_search_fix…", "permissions": [ "webRequest", "webRequestBlocking", @@ -2750,12 +2758,12 @@ "category": "recommended" }, "ratings": { - "average": 4.4416, - "bayesian_average": 4.436088053776032, - "count": 967, - "text_count": 261 + "average": 4.4551, + "bayesian_average": 4.450236090325366, + "count": 991, + "text_count": 267 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/google-search-fixer/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/869140", "slug": "google-search-fixer", @@ -2771,8 +2779,9 @@ }, "tags": [], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/google-search-fixer/", - "weekly_downloads": 42 + "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", + "weekly_downloads": 62 }, "notes": null }, @@ -2783,12 +2792,12 @@ { "id": 143, "name": "Giorgio Maone", - "url": "https://addons.mozilla.org/en-US/android/user/143/", + "url": "https://addons.mozilla.org/en-US/firefox/user/143/", "username": "giorgio-maone", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/0/0/143.png?modified=150…" } ], - "average_daily_users": 406718, + "average_daily_users": 390704, "categories": { "android": [ "performance", @@ -2802,7 +2811,7 @@ "contributions_url": "https://www.paypal.me/NoScript?utm_content=product-page-contribute&utm_medi…", "created": "2005-05-13T10:51:32Z", "current_version": { - "id": 5183180, + "id": 5206025, "compatibility": { "firefox": { "min": "59.0", @@ -2813,19 +2822,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5183180", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5206025", "files": [ { - "id": 3727540, - "created": "2021-02-16T15:49:15Z", - "hash": "sha256:1d8126b5b76229d98b7f531879a1f59d16eecca32f8d6cede4d7ff9113f4e41a", + "id": 3750385, + "created": "2021-03-26T19:23:21Z", + "hash": "sha256:278ee526d7c3ce5236c1a04aa5b6605c81b82399b846e43cdf6f93f11fef1ec9", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 609320, + "size": 612139, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3727540/noscript_security…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3750385/noscript_security…", "permissions": [ "contextMenus", "storage", @@ -2872,10 +2881,10 @@ "url": "http://www.gnu.org/licenses/gpl-2.0.html" }, "release_notes": { - "en-US": "v 11.2.2\n============================================================\nx Fixed typo in version checked on noscript capability update.\nx [L10n] Updated bn, br, ca, da, de, el, es, fr, he, is, it, ja, lt, mk, ms, nb, nl, \n pt_BR, ru, sq, sv_SE, tr, zh_CN, zh_TW." + "en-US": "v 11.2.4\n============================================================\nx CSS resources prefetching as a mitigation against CSS PP0\n (<a href=\"https://outgoing.prod.mozaws.net/v1/4c9c509b2dcb75bd1907cb1eacded56e1b55224…" rel=\"nofollow\">https://github.com/Yossioren/pp0</a>)\nx [L10n] Updated br, de, el, es, fr, he, is, nl, pl, pt_BR,\n ru, sq, tr, zh_CN\nx [nscl] Inteception of webgl context creation in\n OffscreenCanvas too\n x Fixed configuration upgrades not applied on manual updates\n (thanks Nan for reporting)\nx Mitigation for misbehaving pages repeating failed requests\n in a tight loop\nx [UI] More understandable label for the cascading\n restrictions option\nx [nscl] More refactoring out in NoScript Commons Library\nx [nscl] patchWindow improvements" }, "reviewed": null, - "version": "11.2.2" + "version": "11.2.4" }, "default_locale": "en-US", "description": { @@ -2925,7 +2934,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-02-16T23:20:10Z", + "last_updated": "2021-04-01T22:30:12Z", "name": { "de": "NoScript", "el": "NoScript", @@ -2949,12 +2958,12 @@ 291, 244 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/0/846.png?modified=…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/0/846.png?modified=…", "thumbnail_size": [ 291, 244 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/0/846.png?modifie…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/0/846.jpg?modifie…" }, { "id": 1060, @@ -2965,12 +2974,12 @@ 423, 447 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/1/1060.png?modified…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/1/1060.png?modified…", "thumbnail_size": [ - 423, - 447 + 379, + 400 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/1/1060.png?modifi…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/1/1060.jpg?modifi…" }, { "id": 1062, @@ -2981,12 +2990,12 @@ 457, 428 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/1/1062.png?modified…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/1/1062.png?modified…", "thumbnail_size": [ - 457, - 428 + 427, + 400 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/1/1062.png?modifi…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/1/1062.jpg?modifi…" }, { "id": 52395, @@ -2997,12 +3006,12 @@ 504, 385 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/52/52395.png?modifi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/52/52395.png?modifi…", "thumbnail_size": [ 504, 385 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/52/52395.png?modi…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/52/52395.jpg?modi…" } ], "promoted": { @@ -3013,12 +3022,12 @@ "category": "recommended" }, "ratings": { - "average": 4.5384, - "bayesian_average": 4.5368145665758375, - "count": 3451, - "text_count": 2375 + "average": 4.3626, + "bayesian_average": 4.359934440648107, + "count": 1765, + "text_count": 720 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/noscript/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/722", "slug": "noscript", @@ -3071,8 +3080,9 @@ "xss" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/noscript/", - "weekly_downloads": 10153 + "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", + "weekly_downloads": 9239 }, "notes": null }, @@ -3083,12 +3093,12 @@ { "id": 4010195, "name": "Baris Derin", - "url": "https://addons.mozilla.org/en-US/android/user/4010195/", + "url": "https://addons.mozilla.org/en-US/firefox/user/4010195/", "username": "baris-derin", "picture_url": null } ], - "average_daily_users": 132136, + "average_daily_users": 130107, "categories": { "android": [ "performance", @@ -3125,7 +3135,7 @@ "platform": "all", "size": 234119, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3719055/youtube_high_defi…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3719055/youtube_high_defi…", "permissions": [ "tabs", "storage", @@ -3205,12 +3215,12 @@ 256, 256 ], - "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/104/104784.png?modi…", + "image_url": "https://addons.cdn.mozilla.net/user-media/previews/full/104/104784.png?modi…", "thumbnail_size": [ 256, 256 ], - "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/104/104784.png?mo…" + "thumbnail_url": "https://addons.cdn.mozilla.net/user-media/previews/thumbs/104/104784.jpg?mo…" } ], "promoted": { @@ -3221,12 +3231,12 @@ "category": "recommended" }, "ratings": { - "average": 4.1111, - "bayesian_average": 4.106908765393005, - "count": 1161, - "text_count": 554 + "average": 3.9206, + "bayesian_average": 3.9162193335341775, + "count": 945, + "text_count": 340 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/youtube-high-definition/revi…", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/328839", "slug": "youtube-high-definition", @@ -3261,8 +3271,9 @@ "youtube hd" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/youtube-high-definition/", - "weekly_downloads": 1954 + "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", + "weekly_downloads": 1591 }, "notes": null } diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c316377..58cf4bc 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -78,9 +78,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 1d8126b5b76229d98b7f531879a1f59d16eecca32f8d6cede4d7ff9113f4e41a + sha256sum: 278ee526d7c3ce5236c1a04aa5b6605c81b82399b846e43cdf6f93f11fef1ec9 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index ab5458a..edd6391 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.5.6 +version: 0.4.5.7 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index c474201..7546f1f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,7 +24,7 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0.12' + torbrowser_version: '10.0.15' torbrowser_build: 'build1' torbrowser_incremental_from: - 10.5a1

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-88.0.0b4-10.5-1
by Matthew Finkel 06 Apr '21

06 Apr '21

Matthew Finkel pushed new branch tor-browser-88.0.0b4-10.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-88.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-74.0.6-10.5-1
by Matthew Finkel 06 Apr '21

06 Apr '21

Matthew Finkel pushed new branch android-components-74.0.6-10.5-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40262: Remove -march=native from lucetc build flags
by gk＠torproject.org 06 Apr '21

06 Apr '21

commit d628abb8f6a8301c93f5315a8ff3b19269401783 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 29 13:49:12 2021 +0200 Bug 40262: Remove -march=native from lucetc build flags --- .../Remove-march-native-from-COMMON_CFLAGS.patch | 24 ++++++++++++++++++++++ projects/lucetc/build | 2 ++ projects/lucetc/config | 1 + 3 files changed, 27 insertions(+) diff --git a/projects/lucetc/Remove-march-native-from-COMMON_CFLAGS.patch b/projects/lucetc/Remove-march-native-from-COMMON_CFLAGS.patch new file mode 100644 index 0000000..13b16db --- /dev/null +++ b/projects/lucetc/Remove-march-native-from-COMMON_CFLAGS.patch @@ -0,0 +1,24 @@ +From ce82762aef3f8cdbdd340f39f95d2491f69a7da0 Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Mon, 29 Mar 2021 13:42:48 +0200 +Subject: [PATCH] Remove -march=native from COMMON_CFLAGS + +The -march=native flag is causing an error on some hardware. It can also +make the build non-reproducible when not building on the same hardware. +--- + lucet-builtins/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lucet-builtins/Makefile b/lucet-builtins/Makefile +index 6ddbcfd..de7e540 100644 +--- a/lucet-builtins/Makefile ++++ b/lucet-builtins/Makefile +@@ -7,7 +7,7 @@ LIBBUILTINS_OBJS:=$(addprefix build/, \ + strcmp.o \ + strlen.o ) + +-COMMON_CFLAGS:= --std=gnu99 -Ofast -Wall -Werror -march=native -fPIC \ ++COMMON_CFLAGS:= --std=gnu99 -Ofast -Wall -Werror -fPIC \ + -I../lucet-runtime/include + + default: build/libbuiltins.so diff --git a/projects/lucetc/build b/projects/lucetc/build index 208f4e1..e06c272 100644 --- a/projects/lucetc/build +++ b/projects/lucetc/build @@ -47,6 +47,8 @@ replace-with = "vendored-sources" directory = "/var/tmp/build/lucetc/vendor" EOF +patch -p1 < $rootdir/Remove-march-native-from-COMMON_CFLAGS.patch + make -j[% c("buildconf/num_procs") %] build # XXX: Should not be needed, just the lucetc binary, see: taskcluster/scripts/misc/build-lucetc.sh make install diff --git a/projects/lucetc/config b/projects/lucetc/config index 72b79fe..0007201 100644 --- a/projects/lucetc/config +++ b/projects/lucetc/config @@ -31,3 +31,4 @@ input_files: # the sources. - URL: https://people.torproject.org/~gk/mirrors/sources/lucetc-vendor.tar.bz2 sha256sum: 12ba97fca12177e7ed5b5409fcfdbd31dc7db2e82282768d99dee5bcb1b1246a + - filename: Remove-march-native-from-COMMON_CFLAGS.patch

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/250'
by gk＠torproject.org 06 Apr '21

06 Apr '21

commit b06cd24c172f4e54a2586e2e55aedbb5fe3caac8 Merge: 663a42c d628abb Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 6 07:41:40 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/250' .../Remove-march-native-from-COMMON_CFLAGS.patch | 24 ++++++++++++++++++++++ projects/lucetc/build | 2 ++ projects/lucetc/config | 1 + 3 files changed, 27 insertions(+)

1 0

[tor-browser-spec/master] Update FF78/87 audits
by sysrqb＠torproject.org 06 Apr '21

06 Apr '21

commit 9e063f9d09855fb38770d06ea6b8afb00100e259 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Apr 5 22:09:37 2021 +0000 Update FF78/87 audits --- audits/FF78_NETWORK_AUDIT | 2 +- audits/FF87_NETWORK_AUDIT | 8 ++++---- audits/code_audit.sh | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/audits/FF78_NETWORK_AUDIT b/audits/FF78_NETWORK_AUDIT index d73f450..6626dda 100644 --- a/audits/FF78_NETWORK_AUDIT +++ b/audits/FF78_NETWORK_AUDIT @@ -1,6 +1,6 @@ Summary of findings: https://gitlab.torproject.org/tpo/applications/fenix/-/issues/34177 -`git diff 8da33f6c34c0ca5b1d7bca58ca86cb5e436333e8 bace0d2a46cabd36f5bdc738c000f15ae4a4225c` +`git diff 8da33f6c34c0ca5b1d7bca58ca86cb5e436333e8 4735a392536150f49518c48aa9510cf313603b92` and then go over all the changes containing the above mentioned potentially dangerous calls and features. Grep the diff for the following strings and examine surrounding usage. diff --git a/audits/FF87_NETWORK_AUDIT b/audits/FF87_NETWORK_AUDIT index 8874897..fba3a86 100644 --- a/audits/FF87_NETWORK_AUDIT +++ b/audits/FF87_NETWORK_AUDIT @@ -1,7 +1,7 @@ Start: fe9560804bef331ff346f3fd3b05e74122fdd30b # FIREFOX_86_0_BUILD2 -End: 1be3d58406ce4dd8af63a169482ae4ca1709d8e5 # FIREFOX_87_0b9_BUILD1 +End: 4068febfd76d9ec557591240d7496be42c27c17f # FIREFOX_87_0_BUILD3 -`git diff fe9560804bef331ff346f3fd3b05e74122fdd30b 1be3d58406ce4dd8af63a169482ae4ca1709d8e5` +`git diff fe9560804bef331ff346f3fd3b05e74122fdd30b 4068febfd76d9ec557591240d7496be42c27c17f` and then go over all the changes containing the below mentioned potentially dangerous calls and features. Grep the diff for the following strings and examine surrounding usage. @@ -120,7 +120,7 @@ End: 1ee6b32f3ee569036fdf1015cf7ffc01ded2860f # v71.0.0 ============ Android Components Portion ============= Start: 095c0ef007ada4dab8561bef69e43bf6db1d3298 # v72.0.15 -End: ecccbf2da2b0572a1d600cce447d47f2eae0de9a # v73.0.3 +End: bea80bbaccc431994a534a087b223563826ac256 # v73.0.11 # FF87 (using `java_audit.sh`) # Commit 6edfec5fe464e4b1d0eb82ed8825526036d861c8 @@ -138,7 +138,7 @@ End: ecccbf2da2b0572a1d600cce447d47f2eae0de9a # v73.0.3 ============ Fenix Portion ============= Start: db196d0e49eb0f69ab620856491deb8c4c7ccf57 # v86.1.0 -End: 82c8a64ca0b8bd5e6ea88395cba41c0db68d0a36 # v87.0.0-beta.4 +End: 9d91b8eeb9d287ee95937b5edfffde383982267a # v87.0.0-rc.1 # FF87: (using `java_audit.sh`) # - c9b8f57f96e9188746391885a065428df62f3ff9 diff --git a/audits/code_audit.sh b/audits/code_audit.sh index 3586470..c7c0848 100755 --- a/audits/code_audit.sh +++ b/audits/code_audit.sh @@ -53,6 +53,8 @@ initialize_java_symbols() { KEYWORDS+=(AppLinksInterceptor) KEYWORDS+=(AppLinksUseCases) KEYWORDS+=(ActivityDelegate) + # Added in FF87 audit + KEYWORDS+=(AutofillService) } initialize_rust_symbols() {

1 0