May 2021 - tor-commits - lists.torproject.org

[translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
by translation＠torproject.org 07 May '21

07 May '21

commit 32c8fdfe17003ed2f5bf739c8c36554cc3ba2c58 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 08:48:35 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal_comp… --- contents+pt-BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 98b9efecff..f45f44addd 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -22,8 +22,8 @@ # Gus, 2021 # André Marcelo Alvarenga <alvarenga(a)kde.org>, 2021 # Daniel, 2021 -# Emma Peel, 2021 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -31,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 07 May '21

07 May '21

commit 73dd6023df262b1e1b7e1749864b641b583ec4df Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 08:48:25 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+he.po | 10 +++++----- contents+it.po | 4 ++-- contents+pt-BR.po | 12 ++++-------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/contents+he.po b/contents+he.po index af0eeee6ce..29abcd81ac 100644 --- a/contents+he.po +++ b/contents+he.po @@ -5,8 +5,8 @@ # erinm, 2020 # ION, 2020 # Omer I.S. <omeritzicschwartz(a)gmail.com>, 2021 -# Emma Peel, 2021 # Zeev Shilor <zshilor(a)gmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Zeev Shilor <zshilor(a)gmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5672,9 +5672,9 @@ msgid "" "Browser](https://www.torproject.org/download) and then using it to navigate " "to the blocked site will allow access." msgstr "" -"רוב הזמן, להוריד את דפדפן tor ]tor browser[ " -"(https://www.torproject.org/download) ואז לנווט שם לאתר החסום יאפשר לך לגלוש" -" בו" +"רוב הזמן, להוריד את דפדפן [Tor " +"Browser](https://www.torproject.org/download)ואז לנווט שם לאתר החסום יאפשר " +"לך לגלוש בו" #: https//support.torproject.org/censorship/censorship-1/ #: (content/censorship/censorship-1/contents+en.lrquestion.description) diff --git a/contents+it.po b/contents+it.po index 73340ad0e6..af77af7011 100644 --- a/contents+it.po +++ b/contents+it.po @@ -701,8 +701,8 @@ msgid "" "](../operating-system-os), with its mobile version available for Android and" " iOS." msgstr "" -"Firefox è disponibile per i [sistemi operativi] Windows, macOS e Linux " -"(..(sistema-operativo-so), con le versioni mobile disponibili per Android e " +"Firefox è disponibile per i [sistemi operativi](../operating-system-os) " +"Windows, macOS e Linux, con le versioni mobile disponibili per Android e " "iOS." #: https//support.torproject.org/glossary/firewall/ diff --git a/contents+pt-BR.po b/contents+pt-BR.po index c3b9c1b689..9d78ffc475 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -22,8 +22,8 @@ # Gus, 2021 # André Marcelo Alvarenga <alvarenga(a)kde.org>, 2021 # Daniel, 2021 -# Emma Peel, 2021 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -31,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -359,7 +359,7 @@ msgid "" "](../web-browser), and includes information like websites visited and when." msgstr "" "Um histórico de navegador é um registro de solicitações feitas durante o uso" -" de um [navegador web] [#navegador web] e inclui informações sobre quais " +" de um [navegador web](../web-browser) e inclui informações sobre quais " "sites foram visitados em que ocasião." #: https//support.torproject.org/glossary/browsing-history/ @@ -7210,7 +7210,7 @@ msgid "" " X.onion!](../../onionservices/onionservices-3)." msgstr "" "Se você não estiver conseguindo se conectar a um serviço onion, por favor " -"veja [Eu não consigo acessar X.onion(../../onionservices/onionservices-3)." +"veja [Eu não consigo acessar X.onion](../../onionservices/onionservices-3)." #: https//support.torproject.org/censorship/censorship-4/ #: (content/censorship/censorship-4/contents+en.lrquestion.title) @@ -9342,10 +9342,6 @@ msgid "" "team](https://community.torproject.org/relay/community-resources/bad-" "relays/) so we can sort out the issue." msgstr "" -"Se você recebeu essa bandeira, então nós descobrimos um problema e ou " -"atividade suspeita ao encaminhar tráfego através da sua saída e não fomos " -"capazes de contactar você. Por favor entre em contato com a [equipe de " -"retransmissores ruins]" #: https//support.torproject.org/operators/what-type-of-relays-are-most-needed/ #: (content/operators/what-type-of-relays-are-most-needed/contents+en.lrquestion.title)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 07 May '21

07 May '21

commit ee6febc22f6a62b1ac703d99b690c5b3c26f1cb2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 08:45:15 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+mr.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contents+mr.po b/contents+mr.po index e8d39f2e6d..73112777d3 100644 --- a/contents+mr.po +++ b/contents+mr.po @@ -3,6 +3,7 @@ # Prachi Joshi <josprachi(a)yahoo.com>, 2021 # erinm, 2021 # vinay bichave <vinaybichave4(a)gmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-07 12:21+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: vinay bichave <vinaybichave4(a)gmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Marathi (https://www.transifex.com/otf/teams/1519/mr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -283,8 +284,9 @@ msgid "" "community-team) for more help." msgstr "" "हे आपल्या समुदायाचे वर्णन करत असल्यास किंवा आपल्याला खात्री नसल्यास, कृपया " -"अधिक मदतीसाठी [आमच्या समुदाय कार्यसंघाशी संपर्क साधा] " -"(https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-community-team)" +"अधिक मदतीसाठी [आमच्या समुदाय कार्यसंघाशी संपर्क " +"साधा](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-community-" +"team)" #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.title) (dynamic)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 May '21

06 May '21

commit 1d8602dcf4726a1446a812b1a9f23d94000760ec Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 6 14:49:52 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+el.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contents+el.po b/contents+el.po index 64c43105fd..09cff3b7c9 100644 --- a/contents+el.po +++ b/contents+el.po @@ -12,8 +12,8 @@ # A Papac <ap909219(a)protonmail.com>, 2020 # anvo <fragos.george(a)hotmail.com>, 2021 # George Kitsoukakis <norhorn(a)gmail.com>, 2021 -# Emma Peel, 2021 # Christos Vidai <dizzy23designs(a)gmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -21,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Christos Vidai <dizzy23designs(a)gmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -267,8 +267,8 @@ msgid "" "[consensus](../consensus)." msgstr "" "Για τον προσδιορισμό της απόδοσης ενός ρελέ, τα ειδικά ρελέ που ονομάζονται " -"αρχές εύρους ζώνης λαμβάνουν περιοδικές μετρήσεις των [ρελέ] (../ ρελέ) στην" -" [συναίνεση] (../ συναίνεση)." +"αρχές εύρους ζώνης λαμβάνουν περιοδικές μετρήσεις των [ρελέ](../ ρελέ) στην " +"[συναίνεση](../ συναίνεση)." #: https//support.torproject.org/glossary/bridge/ #: (content/glossary/bridge/contents+en.lrword.term) @@ -292,8 +292,8 @@ msgid "" "[Pluggable transports](../pluggable-transports) are a type of bridge that " "helps disguise the fact that you are using Tor." msgstr "" -"Τα [Pluggable Transports] (../ pluggable-transports) είναι ένας τύπος " -"γέφυρας που βοηθά στη μεταμφίεση του γεγονότος ότι χρησιμοποιείτε το Tor." +"Τα [Pluggable Transports](../ pluggable-transports) είναι ένας τύπος γέφυρας" +" που βοηθά στη μεταμφίεση του γεγονότος ότι χρησιμοποιείτε το Tor." #: https//support.torproject.org/glossary/bridge-authority/ #: (content/glossary/bridge-authority/contents+en.lrword.term) @@ -305,7 +305,7 @@ msgstr "εξουσιοδότηση γέφυρας" msgid "" "A special-purpose relay that maintains the list of [bridges](../bridge)." msgstr "" -"Ένα ρελέ ειδικού σκοπού που διατηρεί τη λίστα των [γέφυρες] (../ γέφυρα)." +"Ένα ρελέ ειδικού σκοπού που διατηρεί τη λίστα των [γέφυρες](../ γέφυρα)." #: https//support.torproject.org/glossary/browser-fingerprinting/ #: (content/glossary/browser-fingerprinting/contents+en.lrword.term) @@ -348,7 +348,7 @@ msgid "" "](../web-browser), and includes information like websites visited and when." msgstr "" "Το ιστορικό προγράμματος περιήγησης είναι μια καταγραφή αιτημάτων που " -"υποβάλλονται κατά τη χρήση ενός [προγράμματος περιήγησης ιστού] (../ " +"υποβάλλονται κατά τη χρήση ενός [προγράμματος περιήγησης ιστού](../ " "πρόγραμμα περιήγησης ιστού) και περιλαμβάνει πληροφορίες όπως ιστότοπους που" " επισκέπτονται και πότε." @@ -383,10 +383,10 @@ msgid "" "hard time determining whether or not those requests are coming from humans " "or bots." msgstr "" -"[Tor] (../ tor-tor-network-core-tor) οι χρήστες συχνά εξυπηρετούνται " -"Captchas επειδή το Tor [relay] (../ relay) υποβάλλει τόσα πολλά αιτήματα που" -" μερικές φορές οι ιστότοποι δυσκολεύονται να καθορίσουν εάν αυτά τα αιτήματα" -" ή όχι προέρχονται από ανθρώπους ή ρομπότ." +"[Tor](../ tor-tor-network-core-tor) οι χρήστες συχνά εξυπηρετούνται Captchas" +" επειδή το Tor [relay](../ relay) υποβάλλει τόσα πολλά αιτήματα που μερικές " +"φορές οι ιστότοποι δυσκολεύονται να καθορίσουν εάν αυτά τα αιτήματα ή όχι " +"προέρχονται από ανθρώπους ή ρομπότ." #: https//support.torproject.org/glossary/captcha/ #: (content/glossary/captcha/contents+en.lrword.spelling)

1 0

[translation/gettor-website-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
by translation＠torproject.org 06 May '21

06 May '21

commit 750f169ce830223d958776d83c2dea02b58804a5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 6 14:45:43 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-cont… --- contents+tr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index acaa15427f..aae6f87e71 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -2,8 +2,8 @@ # Translators: # erinm, 2021 # Gus, 2021 -# Emma Peel, 2021 # Kaya Zeren <kayazeren(a)gmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-25 10:47+CET\n" "PO-Revision-Date: 2021-03-24 14:33+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,29 +46,29 @@ msgid "" "- Step 1: Send a request to GetTor (gettor(a)torproject.org) specifying your " "operating system (and your locale). Ex: \"windows es\"" msgstr "" -"- 1. adım: İşletim sisteminizi (ve dil kodunuzu) belirterek GetTor hizmetine" -" (gettor(a)torproject.org) bir istek gönderin. Örnek: \"windows es\"" +"- 1 adım: İşletim sisteminizi (ve dil kodunuzu) belirterek GetTor hizmetine " +"(gettor(a)torproject.org) bir istek gönderin. Örnek: \"windows es\"" #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "" "- Step 2: GetTor will send you back a reply with links to download Tor " "Browser from our supported providers." msgstr "" -"- 2. adım: GetTor, destek veren hizmet sağlayıcılarından Tor Browser indirme" -" bağlantısının bulunduğu bir yanıt gönderir." +"- 2 adım: GetTor, destek veren hizmet sağlayıcılarından Tor Browser indirme " +"bağlantısının bulunduğu bir yanıt gönderir." #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "" "- Step 3: Download Tor Browser from one of the providers. When done, check " "the integrity of the downloaded files by verifying its signature." msgstr "" -"- 3. adım: Bir hizmet sağlayıcı seçip Tor Browser uygulamasını indirin. " +"- 3 adım: Bir hizmet sağlayıcı seçip Tor Browser uygulamasını indirin. " "İndirme tamamlandığında, indirilen dosyaların bütünlüğünü imzası ile " "doğrulayın." #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "- Step 4: If required, get some bridges!" -msgstr "- 4. adım: Gerekiyorsa köprüleri alın!" +msgstr "- 4 adım: Gerekiyorsa köprüleri alın!" #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "## GetTor Responder on Twitter"

1 0

[translation/torcheck_completed] https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed
by translation＠torproject.org 06 May '21

06 May '21

commit ef5b22ac70a75f50e5bdee4386bb561fa1369450 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 6 12:18:30 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 4aaa097180..ae9ab2f93a 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -15,7 +15,7 @@ # monsieurtino <monsieurtino(a)mailoo.org>, 2014-2015 # Onizuka, 2013 # PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2019 -# rike, 2014 +# u <u(a)451f.org>, 2014 # skhaen <skhaen(a)cyphercat.eu>, 2011 msgid "" msgstr ""

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 06 May '21

06 May '21

commit a71ee49b9478a6195b3e705a9458d202693f97e5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 6 12:16:40 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de.po b/de.po index 9115882851..960b88293d 100644 --- a/de.po +++ b/de.po @@ -33,7 +33,7 @@ # Tobias Bannert <tobannert(a)gmail.com>, 2014,2016 # Traumschule Riebau <traumschuleriebau(a)riseup.net>, 2018 # try once, 2015,2019 -# rike, 2014 +# u <u(a)451f.org>, 2014 # Will Smith <info(a)belvenservices.com>, 2018 msgid "" msgstr ""

1 0

[translation/mat-gui_completed] https://gitweb.torproject.org/translation.git/commit/?h=mat-gui_completed
by translation＠torproject.org 06 May '21

06 May '21

commit 17609c4490ac2c03b142aa3a32e0ecf02da77a93 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 6 12:15:29 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=mat-gui_completed --- de.po | 4 ++-- fr.po | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/de.po b/de.po index b969542e3f..cec0d1de6e 100644 --- a/de.po +++ b/de.po @@ -7,13 +7,13 @@ # K.N., 2012 # max weber, 2015,2017 # rike, 2014 -# rike, 2014 +# u <u(a)451f.org>, 2014 # Sacro <Scion(a)T-Online.de>, 2013 # Sacro <Scion(a)T-Online.de>, 2013 # spriver, 2018 # 6d7881afd10822f08493414478ac30ba_4919e85, 2016 # Tobias Bannert <tobannert(a)gmail.com>, 2014 -# rike, 2014-2015 +# u <u(a)451f.org>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" diff --git a/fr.po b/fr.po index d002ad1309..521967bda4 100644 --- a/fr.po +++ b/fr.po @@ -10,7 +10,7 @@ # AO <ao(a)localizationlab.org>, 2016 # Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015-2016 # Onizuka, 2013 -# rike, 2014 +# u <u(a)451f.org>, 2014 msgid "" msgstr "" "Project-Id-Version: Tor Project\n"

1 0

[tor-browser-build/maint-10.0-android] Bug 25934: Disable building of rust docs
by sysrqb＠torproject.org 06 May '21

06 May '21

commit a7604bd5f8963de896a54d6723e04cfb2b472e2a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 22 13:51:22 2021 +0100 Bug 25934: Disable building of rust docs --- projects/rust/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/rust/build b/projects/rust/build index 31e1070..9609758 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -60,7 +60,7 @@ cd /var/tmp/build/rustc-[% c('version') %]-src mkdir build cd build -../configure --prefix=$distdir [% c("var/configure_opt") %] +../configure --prefix=$distdir --disable-docs --disable-compiler-docs [% c("var/configure_opt") %] make -j[% c("buildconf/num_procs") %] make install

1 0

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

06 May '21

commit 1af3fb3ab394e85be844d0f577c57607c4a38a8a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Apr 5 21:38:47 2021 +0000 Bug 40259: Update components for mozilla88-based Fenix (GeckoView part) Now Geckoview uses build-tools 30.0.2, so this patch updates android-toolchain, as well. --- projects/android-toolchain/build | 38 ++++++++++++------------ projects/android-toolchain/config | 36 +++++++++++----------- projects/geckoview/config | 8 ++--- projects/geckoview/list_toolchain_updates_checks | 2 +- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index e352b67..29d79e5 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -3,9 +3,9 @@ export PROJECT_PATH=/var/tmp/dist/[% project %] 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 +android_release_dir_9=android-9 +android_release_dir_10=android-10 +android_release_dir_11=android-11 # Make directories mkdir -p $NDK_HOME $SDK_HOME @@ -26,27 +26,27 @@ done # Tool Archives cd $SDK_HOME unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME -mkdir -p build-tools/[% c("version") %] -mv $android_release_dir/* build-tools/[% c("version") %] +mkdir -p build-tools/[% c("var/version_30") %] +mv $android_release_dir_11/* build-tools/[% c("var/version_30") %] + +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_11/* platforms/android-[% c("var/android_api_level") %] # Apart from GeckoView all other projects do still need build-tools 28.0.3 as # they are using the Gradle plugin 3.2.1 - 3.6.0 without specifying # `buildToolsVersion`. -unzip -qq $HOME/[% c("input_files_by_name/build_tools_old") %] -d $SDK_HOME -mkdir -p build-tools/[% c("version_old") %] -mv $android_release_dir_old/* build-tools/[% c("version_old") %] - -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_28") %] -d $SDK_HOME +mkdir -p build-tools/[% c("var/version_28") %] +mv $android_release_dir_9/* build-tools/[% c("var/version_28") %] -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/build_tools_29") %] -d $SDK_HOME +mkdir -p build-tools/[% c("var/version_29") %] +mv $android_release_dir_10/* build-tools/[% c("var/version_29") %] -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_29") %] -d $SDK_HOME +mkdir -p platforms/android-[% c("var/android_api_level_29") %] +mv $android_release_dir_10/* platforms/android-[% c("var/android_api_level_29") %] unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME @@ -56,7 +56,7 @@ mkdir emulator cp tools/emulator emulator/ # Cleanup -rm -fR $android_release_dir $android_release_dir_old $android_release_dir_new +rm -fR $android_release_dir_9 $android_release_dir_10 $android_release_dir_11 # Archive dist directory cd /var/tmp/dist diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 6d78b37..5196528 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -1,8 +1,10 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 29.0.2 -version_old: 28.0.3 +version: '[% c("var/version_28") %]+[% c("var/version_29") %]+[% c("var/version_30") %]' var: + version_30: 30.0.2 + version_29: 29.0.2 + version_28: 28.0.3 container: use_container: 1 deps: @@ -25,36 +27,36 @@ var: 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_api_level_new: 30 - android_platform_revision_new: 03 + android_api_level: 30 + android_platform_revision: 03 + android_api_level_29: 29 + android_platform_revision_29: 04 android_ndk_version: 21 android_ndk_revision: d sdk_tools_version: 4333796 input_files: - project: container-image - - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_30") %]-linux.zip' name: build_tools + sha256sum: 565af786dc0cc1941002174fb945122eabd080b222cd4c7c3d9a2ae0fabf5dc4 + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_29") %]-linux.zip' + name: build_tools_29 sha256sum: 1e9393cbfd4a4b82e30e7f55ab38db4a5a3259db93d5821c63597bc74522fa08 - - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version_old") %]-linux.zip' - name: build_tools_old + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_28") %]-linux.zip' + name: build_tools_28 sha256sum: 7954956a40633c88f693d638cbc23f68e9e2499dc7a4b7dfdaf6a3e91387749a + - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_29") %]_r[% c("var/android_platform_revision_29") %].zip' + name: platform_29 + sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69 - 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. - - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip' + - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("var/version_30") %]-linux.zip' name: platform_tools - sha256sum: 633b6dfa245f5dc58d15da9ead655bcd14de5784196ec0f0dc7e37a5acb61be4 + sha256sum: f7306a7c66d8149c4430aff270d6ed644c720ea29ef799dc613d3dc537485c6e - URL: '[% c("var/google_repo") %]/sdk-tools-linux-[% c("var/sdk_tools_version") %].zip' name: android_sdk_tools sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 diff --git a/projects/geckoview/config b/projects/geckoview/config index 84d212d..4cc3408 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 87.0 + geckoview_version: 88.0b4 torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -138,10 +138,10 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - git_url: https://github.com/mozilla/gecko-dev.git + #git_url: https://github.com/mozilla/gecko-dev.git # 88.0b8 - git_hash: 43ab49774f70a5c70b2cd69a2b2a8bc0a3be20bf - tag_gpg_id: 0 + #git_hash: 43ab49774f70a5c70b2cd69a2b2a8bc0a3be20bf + #tag_gpg_id: 0 input_files: [] var: container: diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks index ffc5e23..f31fa51 100644 --- a/projects/geckoview/list_toolchain_updates_checks +++ b/projects/geckoview/list_toolchain_updates_checks @@ -44,7 +44,7 @@ if (m/build_tools_version\\s*=\\s*"([^"]+)"/) { } EOF needed=$(cat build/moz.configure/android-sdk.configure | perl -ne "$p") -current='[% pc("android-toolchain", "version") %]' +current='[% pc("android-toolchain", "var/version_30") %]' check_update_needed build_tools "$needed" "$current"

1 0