August 2022 - tbb-commits - lists.torproject.org

[tor-browser] branch tor-browser-102.2.0esr-12.0-1 updated (0b39923ea81c0 -> 661eb5e548db2)
by gitolite role 31 Aug '22

31 Aug '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.2.0esr-12.0-1 in repository tor-browser. from 0b39923ea81c0 squash! Bug 40562: Added Tor-related preferences to 000-tor-browser.js new de57e6ff0fccb fixup! Base Browser's .mozconfigs. new 661eb5e548db2 fixup! TB3: Tor Browser's official .mozconfigs. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: mozconfig-linux-arm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 mozconfig-linux-arm -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[Git][tpo/applications/android-components][android-components-102.0.14-12.0-1] Improve search term performance on the toolbar
by Richard Pospesel (＠richard) 30 Aug '22

30 Aug '22

Richard Pospesel pushed to branch android-components-102.0.14-12.0-1 at The Tor Project / Applications / android-components Commits: 18a85e4a by sarah541 at 2022-08-30T20:29:32+00:00 Improve search term performance on the toolbar - - - - - 2 changed files: - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/BrowserToolbar.kt - components/browser/toolbar/src/test/java/mozilla/components/browser/toolbar/BrowserToolbarTest.kt Changes: ===================================== components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/BrowserToolbar.kt ===================================== @@ -75,7 +75,8 @@ class BrowserToolbar @JvmOverloads constructor( defStyleAttr: Int = 0 ) : ViewGroup(context, attrs, defStyleAttr), Toolbar { private var state: State = State.DISPLAY - private var searchTerms: String = "" + @VisibleForTesting + internal var searchTerms: String = "" private var urlCommitListener: ((String) -> Boolean)? = null /** @@ -219,11 +220,11 @@ class BrowserToolbar @JvmOverloads constructor( } override fun setSearchTerms(searchTerms: String) { + this.searchTerms = searchTerms.take(MAX_URI_LENGTH) + if (state == State.EDIT) { - edit.editSuggestion(searchTerms) + edit.editSuggestion(this.searchTerms) } - - this.searchTerms = searchTerms } override fun displayProgress(progress: Int) { ===================================== components/browser/toolbar/src/test/java/mozilla/components/browser/toolbar/BrowserToolbarTest.kt ===================================== @@ -152,6 +152,38 @@ class BrowserToolbarTest { assertEquals("c".repeat(MAX_URI_LENGTH - 1), capturedValues[2]) } + @Test + fun `searchTerms is truncated in case it is greater than MAX_URI_LENGTH`() { + val toolbar = BrowserToolbar(testContext) + toolbar.edit = spy(toolbar.edit) + toolbar.editMode() + + toolbar.setSearchTerms("a".repeat(MAX_URI_LENGTH + 1)) + + // Value was too long and should've been truncated + assertEquals(toolbar.searchTerms.length, MAX_URI_LENGTH) + verify(toolbar.edit).editSuggestion("a".repeat(MAX_URI_LENGTH)) + } + + @Test + fun `searchTerms is not truncated in case it is equal or less than MAX_URI_LENGTH`() { + val toolbar = BrowserToolbar(testContext) + toolbar.edit = spy(toolbar.edit) + toolbar.editMode() + + toolbar.setSearchTerms("b".repeat(MAX_URI_LENGTH)) + + // Value should be the same as before + assertEquals(toolbar.searchTerms.length, MAX_URI_LENGTH) + verify(toolbar.edit).editSuggestion("b".repeat(MAX_URI_LENGTH)) + + toolbar.setSearchTerms("c".repeat(MAX_URI_LENGTH - 1)) + + // Value should be the same as before + assertEquals(toolbar.searchTerms.length, MAX_URI_LENGTH - 1) + verify(toolbar.edit).editSuggestion("c".repeat(MAX_URI_LENGTH - 1)) + } + @Test fun `last URL will be forwarded to edit toolbar when switching mode`() { val toolbar = BrowserToolbar(testContext) View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/commit/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/commit/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser] branch tor-browser-102.2.0esr-12.0-1 updated (3a79382bda2a4 -> 0b39923ea81c0)
by gitolite role 30 Aug '22

30 Aug '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.2.0esr-12.0-1 in repository tor-browser. from 3a79382bda2a4 fixup! Bug 10760: Integrate TorButton to TorBrowser core new 294e26eec8fa1 fixup! Firefox preference overrides. new 0b39923ea81c0 squash! Bug 40562: Added Tor-related preferences to 000-tor-browser.js The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: browser/app/profile/000-tor-browser.js | 4 ++++ browser/app/profile/001-base-profile.js | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-launcher] annotated tag 0.2.39 created (now 4168b9b)
by gitolite role 30 Aug '22

30 Aug '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag 0.2.39 in repository tor-launcher. at 4168b9b (tag) tagging 9cada61ef1373d9efd11ce797b97b756f1e00cab (commit) replaces 0.2.38 by Richard Pospesel on Tue Aug 30 19:04:09 2022 +0000 - Log ----------------------------------------------------------------- Release preparations for 0.2.39 -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmMOXzIXHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSywBFw/7Bt/Jc9uT6mv6m96+sQdteKFv m7X4Q0BunNL+hwEyd7Y84sBag+zJH+T5EiqOYIw4kjVi0QRxjvFVsu6/he48mL98 i0ZOiXab3S4lQyymhZxZ3GK7AWgoG/quQTJU/PZ51/sYOy99ynIp3FjUspcgj9Vj sxrgPBZ/ev5K8FfkorreL9gnOE8ZxlWTQ7JqjTIKZafSGmui7BWgwySIY+bP6pB0 EvUc8cKB1hTGqwVrVcaZaPjFcRZWBHEnl6e1o/NhZnOPqF2LL4LT2DZG9tijECkc LEFG3hPPHI9Et7n+cBCtoIlNt5fpcNRB1ZWwH347FbFaCB80fAc3U+iS5gvDxc8y j+rOh3fBXrXx1Ghx4C2Bemy1WnnnjDP1aJajs8FOks3DZDGuzbtK2U8yXSmNqKKW tHrjWzFeL6LyqAFbu4U0PeyvWaMdPCQJ/tPp+xiEeL6Fzxqiu1tRavw+5DJZ9yQ2 kDVapK8TmrC5fO1i1l5Di9fPTGxhGN7I0gjy4yF1BRjRR1AF46ZFz3qTbKr+bNxD F/SCQEPngRi5QwgFNlPCAbWLAJ6MZG1Z0v+AKeNptn1wkc+oxgsRz1gkZCDNEl/v xXGMVyNsGYP1I2XxFxQ6C4sDxFlJzjzbKTvXyrNWxRN4yeLnRXYus5YjlIMoXsEO 3BSEm8I5ex2+VkSN1mg= =1lW0 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-launcher] branch main updated (dc6f823 -> 9cada61)
by gitolite role 30 Aug '22

30 Aug '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository tor-launcher. from dc6f823 Bug 40580: Add support for uk (ukranian) locale new ca3344a fixup! Bug 40730: Update tor-launcher for Firefox 102. new 2806a0f Update translations new 9cada61 Release preparations for 0.2.39 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: jar.mn.in | 2 ++ src/chrome/locale/bg/torlauncher.properties | 2 +- src/chrome/locale/cs/network-settings.dtd | 4 ++-- src/chrome/locale/hy-AM/network-settings.dtd | 10 +++++----- src/chrome/locale/hy-AM/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/id/network-settings.dtd | 2 +- src/chrome/locale/it/torlauncher.properties | 4 ++-- src/chrome/locale/pt-BR/network-settings.dtd | 24 ++++++++++++------------ src/chrome/locale/zh-CN/network-settings.dtd | 14 +++++++------- src/install.rdf | 2 +- 10 files changed, 45 insertions(+), 43 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[torbutton] branch main updated: Translation updates
by gitolite role 30 Aug '22

30 Aug '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new d52ddb7d Translation updates d52ddb7d is described below commit d52ddb7d38790b5c2ccccb540514e2db7b443c26 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Aug 30 18:25:13 2022 +0000 Translation updates --- chrome/locale/cs/torbutton.dtd | 2 +- chrome/locale/cs/torbutton.properties | 38 +++++++++++++++--------------- chrome/locale/es-ES/torbutton.properties | 2 +- chrome/locale/ka/aboutDialog.dtd | 4 ++-- chrome/locale/ka/aboutTBUpdate.dtd | 2 +- chrome/locale/ka/aboutTor.dtd | 6 ++--- chrome/locale/ka/brand.dtd | 2 +- chrome/locale/ka/brand.properties | 2 +- chrome/locale/ka/branding/brand.ftl | 2 +- chrome/locale/pt-BR/aboutTor.dtd | 7 +++--- chrome/locale/zh-CN/torbutton.properties | 40 ++++++++++++++++---------------- 11 files changed, 53 insertions(+), 54 deletions(-) diff --git a/chrome/locale/cs/torbutton.dtd b/chrome/locale/cs/torbutton.dtd index 4351bd38..dba0a8fd 100644 --- a/chrome/locale/cs/torbutton.dtd +++ b/chrome/locale/cs/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio, video (HTML5 média) a WebGL se přehrávají po kliknutí."> <!ENTITY torbutton.prefs.sec_custom_warning "Vlastní"> <!ENTITY torbutton.prefs.sec_overview "Vypnout některé webové funkce, které mohou být zneužity k ohrožení vaší bezpečnosti a anonymity."> -<!ENTITY torbutton.prefs.sec_standard_tooltip "Úroveň zabezpečení: běžná"> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Úroveň zabezpečení: Standardní"> <!ENTITY torbutton.prefs.sec_safer_tooltip "Úroveň zabezpečení: bezpečnější"> <!ENTITY torbutton.prefs.sec_safest_tooltip "Úroveň zabezpečení: nejbezpečnější"> <!ENTITY torbutton.prefs.sec_custom_summary "Vaše nastavení prohlížeče neodpovídá standardnímu nastavení zabezpečení. Z důvodu ochrany soukromí a zvýšení bezpečnosti vám doporučujeme vybrat si jednu z výchozích bezpečnostních úrovní."> diff --git a/chrome/locale/cs/torbutton.properties b/chrome/locale/cs/torbutton.properties index ed35b894..139b8ecf 100644 --- a/chrome/locale/cs/torbutton.properties +++ b/chrome/locale/cs/torbutton.properties @@ -156,32 +156,32 @@ cryptoSafetyPrompt.secondaryAction=Odmítnout varování cryptoSafetyPrompt.secondaryActionAccessKey=B # about:rulesets strings. -rulesets.warningTitle=Proceed with Caution -rulesets.warningDescription=Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing. -rulesets.warningEnable=Warn me when I attempt to access these preferences -rulesets.warningButton=Accept the Risk and Continue +rulesets.warningTitle=Pokračujte po uvážení +rulesets.warningDescription=Přidávání nebo úprava sad pravidel může umožnit útočníkům zneužít váš prohlížeč. Pokračujte pouze pokud více, co děláte. +rulesets.warningEnable=Varujte mě, když se pokusím o přístup k těmto nastavením. +rulesets.warningButton=Souhlasit s rizikem a pokračovat # Ruleset list -rulesets.rulesets=Rulesets -rulesets.noRulesets=No rulesets found -rulesets.noRulesetsDescr=When you save a ruleset in Tor Browser, it will show up here. +rulesets.rulesets=Sady pravidel +rulesets.noRulesets=Sady pravidel nenalezeny +rulesets.noRulesetsDescr=Když máte sadu pravidel v Prohlížeči Tor, zobrazí se zde. # LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component) -rulesets.lastUpdated=Last updated %S -rulesets.neverUpdated=Never updated, or last update failed +rulesets.lastUpdated=Naposledy aktualizováno %S +rulesets.neverUpdated=Nikdy neaktualizováno a nebo poslední aktualizace selhala rulesets.enabled=Povoleno rulesets.disabled=Vypnuto # Ruleset details/edit ruleset rulesets.edit=Změnit rulesets.name=Název rulesets.jwk=JWK -rulesets.pathPrefix=Path Prefix -rulesets.scope=Scope -rulesets.enable=Enable this ruleset -rulesets.checkUpdates=Check for Updates -rulesets.jwkPlaceholder=The key used to sign this ruleset in the JWK (JSON Web Key) format -rulesets.jwkInvalid=The JWK could not be parsed, or it is not a valid key -rulesets.pathPrefixPlaceholder=URL prefix that contains the files needed by the ruleset -rulesets.pathPrefixInvalid=The path prefix is not a valid HTTP(S) URL -rulesets.scopePlaceholder=Regular expression for the scope of the rules -rulesets.scopeInvalid=The scope could not be parsed as a regular expression +rulesets.pathPrefix=Předpona cesty +rulesets.scope=Rámec +rulesets.enable=Zapnout tuto sadu pravidel +rulesets.checkUpdates=Zkontrolovat aktualizace +rulesets.jwkPlaceholder=Klíč použitý pro podepsání této sady pravidel v JWK (JSON Web Key) formátu +rulesets.jwkInvalid=JWK nemůže být zpracován a nebo nejde o platný klíč +rulesets.pathPrefixPlaceholder=URL předpona, která obsahuje soubory, potřebné pro sadu pravidel +rulesets.pathPrefixInvalid=Předpona cesty není platnou HTTP(S) adresou +rulesets.scopePlaceholder=Regulární výraz pro rámec pravidel +rulesets.scopeInvalid=Rámec nemohl být zpracován jako regulární výraz rulesets.save=Uložit rulesets.cancel=Zrušit diff --git a/chrome/locale/es-ES/torbutton.properties b/chrome/locale/es-ES/torbutton.properties index 8b387517..5180c749 100644 --- a/chrome/locale/es-ES/torbutton.properties +++ b/chrome/locale/es-ES/torbutton.properties @@ -162,7 +162,7 @@ rulesets.warningEnable=Avisarme cuando intente acceder a estas preferencias rulesets.warningButton=Aceptar el riesgo y continuar # Ruleset list rulesets.rulesets=Conjunto de reglas -rulesets.noRulesets=No se han encontrado conjunto de reglas +rulesets.noRulesets=No se ha encontrado ningún conjunto de reglas rulesets.noRulesetsDescr=Cuando guardes un conjunto de reglas en el Navegador Tor, aparecerá aquí. # LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component) rulesets.lastUpdated=Última actualización %S diff --git a/chrome/locale/ka/aboutDialog.dtd b/chrome/locale/ka/aboutDialog.dtd index 3320ad18..c8ef0ce3 100644 --- a/chrome/locale/ka/aboutDialog.dtd +++ b/chrome/locale/ka/aboutDialog.dtd @@ -13,7 +13,7 @@  <!ENTITY bottomLinks.questions "კითხვები გაქვთ?">  -<!ENTITY bottomLinks.grow "დაეხმარეთ Tor ქსელს გაფართოებაში!"> +<!ENTITY bottomLinks.grow "დაეხმარეთ Tor-ქსელს გაფართოებაში!">  <!ENTITY bottomLinks.license "სალიცენზიო მონაცემები"> -<!ENTITY tor.TrademarkStatement "„Tor“ და „Onion Logo“ წარმოადგენს Tor Project Inc-ის კუთვნილ სავაჭრო ნიშნებს."> +<!ENTITY tor.TrademarkStatement "„Tor“ და „Onion Logo“ წარმოადგენს სავაჭრო ნიშნებს, რომელთა მესაკუთრეცაა Tor Project Inc."> diff --git a/chrome/locale/ka/aboutTBUpdate.dtd b/chrome/locale/ka/aboutTBUpdate.dtd index 0b1b779c..a8f2a496 100644 --- a/chrome/locale/ka/aboutTBUpdate.dtd +++ b/chrome/locale/ka/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.changelogTitle "Tor-ბრაუზერის ცვლილებების ისტორია"> <!ENTITY aboutTBUpdate.updated "Tor-ბრაუზერი განახლებულია."> -<!ENTITY aboutTBUpdate.linkPrefix "ამ გამოშვების შესახებ უახლესი ინფორმაციის მისაღებად, "> +<!ENTITY aboutTBUpdate.linkPrefix "ამ გამოშვების შესახებ უახლესი ინფორმაციის მისაღებად"> <!ENTITY aboutTBUpdate.linkLabel "ეწვიეთ ჩვენს ვებსაიტს"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "ვერსია"> diff --git a/chrome/locale/ka/aboutTor.dtd b/chrome/locale/ka/aboutTor.dtd index 3c444ded..4e9aa276 100644 --- a/chrome/locale/ka/aboutTor.dtd +++ b/chrome/locale/ka/aboutTor.dtd @@ -22,12 +22,12 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "ხ"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor-ბრაუზერის სახელმძღვანელო"> -<!ENTITY aboutTor.tor_mission.label "Tor-პროექტი წარმოადგენს 501(c)(3) არამომგებიან დაწესებულებას, რომელიც ხელს უწყობს ადამიანის უფლებების დაცვისა და თავისუფლების ხარისხის გაუმჯობესებას, უფასო და ღია წყაროს მქონე, ვინაობისა და პირადი მონაცემების გამჟღავნებისგან ასარიდებელი საშუალებების შექმნითა და გავრცელებით, მათზე შეუზღუდავი წვდომისა და გამოყენების უზრუნველყოფით, შემდგომ კი მათთან დაკავშირე ბით, მეცნიერული გაგებისა და საზოგადოების ცნობიერების დონის ამაღლებით."> +<!ENTITY aboutTor.tor_mission.label "Tor-პროექტი წარმოადგენს 501(c)(3) არამომგებიან დაწესებულებას, რომელიც ხელს უწყობს ადამიანის უფლებების დაცვისა და თავისუფლების ხარისხის გაუმჯობესებას უფასო და ღია წყაროს მქონე, ვინაობისა და პირადი მონაცემების გამჟღავნებისგან ასარიდებელი საშუალებების შექმნითა და გავრცელებით, მათზე შეუზღუდავი წვდომისა და გამოყენების უზრუნველყოფით, შემდგომ კი მათთან დაკავშირე� ��ით, მეცნიერული გაგებისა და საზოგადოების ცნობიერების დონის ამაღლებით."> <!ENTITY aboutTor.getInvolved.label "შემოგვიერთდით »"> <!ENTITY aboutTor.newsletter.tagline "მიიღეთ სიახლეები Tor-ისგან პირდაპირ თქვენს საფოსტო ყუთში."> <!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor უფასოა, თქვენნაირი ადამიანების შემოწირულობების წყალობით."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor უფასოა თქვენნაირი ადამიანების შემოწირულობების წყალობით."> <!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა"> <!ENTITY aboutTor.alpha.ready.label "გამოცადეთ. გულდასმით."> @@ -37,5 +37,5 @@ <!ENTITY aboutTor.nightly.ready.label "გამოცადეთ. გულდასმით."> <!ENTITY aboutTor.nightly.ready2.label "თქვენ მზად ხართ მსოფლიოში ყველაზე მეტად დაცული და პირადი ბრაუზერის გამოსაცდელად."> -<!ENTITY aboutTor.nightly.bannerDescription "Tor-ბრაუზერი Nightly მეტად არამდგრადი ვერსიის Tor-ბრაუზერია, რომელიც გამოსადეგია ახალი შესაძლებლობების წინასწარ მოსასინჯად, წარმადობის შესაფასებლად და მოსაზრებების მოსახსენებლად საბოლოო გამოშვებამდე."> +<!ENTITY aboutTor.nightly.bannerDescription "Tor-ბრაუზერი Nightly მეტად არამდგრადი ვერსიის Tor-ბრაუზერია და გამოიყენება ახალი შესაძლებლობების წინასწარ მოსასინჯად, წარმადობის შესაფასებლად და მოსაზრებების მოსახსენებლად საბოლოო გამოშვებამდე."> <!ENTITY aboutTor.nightly.bannerLink "მოგვახსენეთ ხარვეზის შესახებ Tor-ის ფორუმზე"> \ No newline at end of file diff --git a/chrome/locale/ka/brand.dtd b/chrome/locale/ka/brand.dtd index dce3bc74..e3fd367d 100644 --- a/chrome/locale/ka/brand.dtd +++ b/chrome/locale/ka/brand.dtd @@ -6,7 +6,7 @@ <!ENTITY brandShortName "Tor-ბრაუზერი"> <!ENTITY brandFullName "Tor-ბრაუზერი"> <!ENTITY vendorShortName "Tor-პროექტი"> -<!ENTITY trademarkInfo.part1 "„Tor“ და „Onion Logo“ წარმოადგენს Tor Project Inc-ის კუთვნილ სავაჭრო ნიშნებს."> +<!ENTITY trademarkInfo.part1 "„Tor“ და „Onion Logo“ წარმოადგენს სავაჭრო ნიშნებს, რომელთა მესაკუთრეცაა Tor Project Inc.">  diff --git a/chrome/locale/ka/brand.properties b/chrome/locale/ka/brand.properties index 5bd19f43..8848da4b 100644 --- a/chrome/locale/ka/brand.properties +++ b/chrome/locale/ka/brand.properties @@ -12,7 +12,7 @@ brandProductName=Tor-ბრაუზერი vendorShortName=Tor-პროექტი homePageSingleStartMain=Firefox Start, სწრაფი საწყისი გვერდი ჩაშენებული ძიების ველით -homePageImport=გადმოიტანეთ თქვენი საწყისი გვერდი %S-იდან +homePageImport=გადმოიტანეთ თქვენი საწყისი გვერდი – %S homePageMigrationPageTitle=საწყისი გვერდის არჩევა homePageMigrationDescription=გთხოვთ აირჩიოთ სასურველი საწყისი გვერდი: diff --git a/chrome/locale/ka/branding/brand.ftl b/chrome/locale/ka/branding/brand.ftl index 73298249..df85c165 100644 --- a/chrome/locale/ka/branding/brand.ftl +++ b/chrome/locale/ka/branding/brand.ftl @@ -9,4 +9,4 @@ # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor-ბრაუზერი -vendor-short-name = Tor-პროექტი -trademarkInfo = „Tor“ და „Onion Logo“ წარმოადგენს Tor Project Inc-ის კუთვნილ სავაჭრო ნიშნებს. +trademarkInfo = „Tor“ და „Onion Logo“ წარმოადგენს სავაჭრო ნიშნებს, რომელთა მესაკუთრეცაა Tor Project Inc. diff --git a/chrome/locale/pt-BR/aboutTor.dtd b/chrome/locale/pt-BR/aboutTor.dtd index 3efba596..e11775f1 100644 --- a/chrome/locale/pt-BR/aboutTor.dtd +++ b/chrome/locale/pt-BR/aboutTor.dtd @@ -23,12 +23,11 @@ <!ENTITY aboutTor.torbrowser_user_manual.label "Manual do Navegador Tor"> <!ENTITY aboutTor.tor_mission.label "O Projeto Tor é uma organização sem fins lucrativos dos EUA 501 (c) (3) que promove direitos humanos e liberdades, criando e implementando tecnologias de privacidade e anonimato, de código aberto e livre, apoiando a sua disponibilidade e uso irrestrito e promovendo o seu entendimento científico e popular"> -<!ENTITY aboutTor.getInvolved.label "Ficar envolvido -"> +<!ENTITY aboutTor.getInvolved.label "Envolva-se»"> <!ENTITY aboutTor.newsletter.tagline "Receba as últimas notícias do Tor diretamente na sua caixa de e-mail."> <!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.freeToUse "O Tor é gratuito para uso graças às doações de pessoas como você."> <!ENTITY aboutTor.donationBanner.buttonA "Doe Agora"> <!ENTITY aboutTor.alpha.ready.label "Teste. Completamente."> @@ -38,5 +37,5 @@ <!ENTITY aboutTor.nightly.ready.label "Teste. Completamente."> <!ENTITY aboutTor.nightly.ready2.label "Você está pronto para testar a experiência de navegação mais privada do mundo."> -<!ENTITY aboutTor.nightly.bannerDescription "Tor Browser Nightly is an unstable version of Tor Browser you can use to preview new features, test their performance and provide feedback before release."> +<!ENTITY aboutTor.nightly.bannerDescription "O Tor Browser está em versão instável do Tor Browser que você usa para pré-visualizar novos recursos, testar seu desempenho e prover feedback antes do lançamento."> <!ENTITY aboutTor.nightly.bannerLink "Relate um bug no Fórum Tor"> \ No newline at end of file diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index d78c9eab..36b94181 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -132,7 +132,7 @@ onionServices.v2Deprecated.tryAgain=了解了 onionServices.v2Deprecated.tooltip=该洋葱网站将很快无法访问 # Onion-Location strings. -onionLocation.alwaysPrioritize=始终优先洋葱服务 +onionLocation.alwaysPrioritize=始终优先选用洋葱服务 onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=暂不 onionLocation.notNowAccessKey=n @@ -156,32 +156,32 @@ cryptoSafetyPrompt.secondaryAction=消除警告 cryptoSafetyPrompt.secondaryActionAccessKey=B # about:rulesets strings. -rulesets.warningTitle=Proceed with Caution -rulesets.warningDescription=Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing. -rulesets.warningEnable=Warn me when I attempt to access these preferences -rulesets.warningButton=Accept the Risk and Continue +rulesets.warningTitle=请小心操作 +rulesets.warningDescription=加入或修改规则集可能导致浏览器遭受攻击。仅在知道自己在做什么事情的情况下继续。 +rulesets.warningEnable=试图访问这些首选项时警告我 +rulesets.warningButton=接受风险并继续 # Ruleset list -rulesets.rulesets=Rulesets -rulesets.noRulesets=No rulesets found -rulesets.noRulesetsDescr=When you save a ruleset in Tor Browser, it will show up here. +rulesets.rulesets=规则集 +rulesets.noRulesets=未找到规则集 +rulesets.noRulesetsDescr=规则集在 Tor 浏览器保存时会显示。 # LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component) -rulesets.lastUpdated=Last updated %S -rulesets.neverUpdated=Never updated, or last update failed +rulesets.lastUpdated=最近更新 %S +rulesets.neverUpdated=从未更新，或上次更新失败 rulesets.enabled=启用 rulesets.disabled=禁用 # Ruleset details/edit ruleset rulesets.edit=编辑 rulesets.name=名称 rulesets.jwk=JWK -rulesets.pathPrefix=Path Prefix -rulesets.scope=Scope -rulesets.enable=Enable this ruleset -rulesets.checkUpdates=Check for Updates -rulesets.jwkPlaceholder=The key used to sign this ruleset in the JWK (JSON Web Key) format -rulesets.jwkInvalid=The JWK could not be parsed, or it is not a valid key -rulesets.pathPrefixPlaceholder=URL prefix that contains the files needed by the ruleset -rulesets.pathPrefixInvalid=The path prefix is not a valid HTTP(S) URL -rulesets.scopePlaceholder=Regular expression for the scope of the rules -rulesets.scopeInvalid=The scope could not be parsed as a regular expression +rulesets.pathPrefix=路径前缀 +rulesets.scope=范围 +rulesets.enable=启用此规则集 +rulesets.checkUpdates=检查更新 +rulesets.jwkPlaceholder=该密钥用于在 JWK（JSON Web 密钥）格式签名此规则集 +rulesets.jwkInvalid=JWK 无法解析，或不是一个有效密钥 +rulesets.pathPrefixPlaceholder=含有规则集所需文件的 URL 前缀 +rulesets.pathPrefixInvalid=路径前缀不是一个有效 HTTP（S）的 URL +rulesets.scopePlaceholder=规则范围的正则表达式 +rulesets.scopeInvalid=范围无法解析为一个正则表达式 rulesets.save=保存 rulesets.cancel=取消 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40614: Update release templates with feedback from ma1
by gitolite role 30 Aug '22

30 Aug '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new cc37607 Bug 40614: Update release templates with feedback from ma1 cc37607 is described below commit cc3760710715c4bdb49b4a10e2112103ebd6e59b Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Aug 30 01:03:59 2022 +0000 Bug 40614: Update release templates with feedback from ma1 --- .gitlab/issue_templates/Release Prep - Alpha.md | 37 +++++++++----- .gitlab/issue_templates/Release Prep - Stable.md | 61 ++++++++++++++++-------- 2 files changed, 65 insertions(+), 33 deletions(-) diff --git a/.gitlab/issue_templates/Release Prep - Alpha.md b/.gitlab/issue_templates/Release Prep - Alpha.md index f6352a5..10432e1 100644 --- a/.gitlab/issue_templates/Release Prep - Alpha.md +++ b/.gitlab/issue_templates/Release Prep - Alpha.md @@ -59,11 +59,11 @@ ### **tba-translation** : https://git.torproject.org/translation.git - [ ] Fetch latest and identify new `HEAD` of `fenix-torbrowserstringsxml` branch - - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT_COMMIT_HASH_HERE>` + - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT COMMIT HASH HERE>` ### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git - [ ] Fetch latest and identify new `HEAD` of `main` branch - - [ ] `origin/main` : `<INSERT_COMMIT_HASH_HERE>` + - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>` ### ***Security Vulnerabilities Backport*** : https://www.mozilla.org/en-US/security/advisories/ - [ ] Go through any `Security Vulnerabilities fixed in Firefox $(RR_VERSION)` (or similar) and create list of CVEs which affect Android that need to be a backported @@ -114,8 +114,13 @@ - Message : `Hg tag $(ESR_TAG)` - [ ] Push new branch and tag to origin - [ ] Rebase `tor-browser` patches - - [ ] Perform rangediff to ensure nothing weird happened resolving conflicts - - `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..$(TOR_BROWSER_BRANCH)` + - [ ] Compare patch-sets (ensure nothing *weird* happened during rebase): + - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..$(TOR_BROWSER_BRANCH)` + - [ ] diff of diffs: + - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred `$(DIFF_TOOL)` and look at differences on lines that starts with + or - + - [ ] `git diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) > current_patchset.diff` + - [ ] `git diff $(ESR_TAG)..$(TOR_BROWSER_BRANCH) > rebased_patchset.diff` + - [ ] `$(DIFF_TOOL) current_patchset.dif rebased_patchset.deff` - [ ] Open MR for the rebase - [ ] Sign/Tag `base-browser` commit: - **NOTE** : Currently we are using the `Bug 27511: Add new identity button to toolbar` commit as the dividing line between `base-browser` and `tor-browser` @@ -139,8 +144,8 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` -- [ ] `var/torbrowser_incremental_from` : update to previous version - - [ ] **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail + - [ ] ***(Desktop Only)*** `var/torbrowser_incremental_from` : update to previous Desktop version + - [ ] **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail - [ ] Update `projects/firefox/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased @@ -154,13 +159,15 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Update `projects/tor-android-service/config` - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch - [ ] Update `projects/application-services/config`: - - [ ] `git_hash` : update the `$(BUILD_N)` section to match alpha `application-services` tag + **NOTE** we don't have any of our own patches for this project + - [ ] `git_hash` : update to appropriate git commit associated with $(ESR_VERSION) - [ ] Update `projects/android-components/config`: - [ ] `git_hash` : update the `$(BUILD_N)` section to match alpha `android-components` tag - [ ] Update `projects/fenix/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `fenix` tag - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(ESR_VERSION)` if rebased -- [ ] Update allowed_addons.json by running (from `tor-browser-build` root) `./tools/fetch_allowed_addons.py > projects/tor-browser/allowed_addons.json` +- [ ] Update allowed_addons.json by running (from `tor-browser-build` root): + - `./tools/fetch_allowed_addons.py > projects/tor-browser/allowed_addons.json` - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` - [ ] `URL` @@ -259,15 +266,17 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - **NOTE**: at this point the signed binaries should have been copied to `staticiforme` - [ ] Update `staticiforme.torproject.org`: - From `screen` session on `staticiforme.torproject.org`: + - [ ] Remove old release data from following places: + - **NOTE** : Skip this step if the current release is Android or Desktop *only* + - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` + - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` - [ ] Enable update responses : - [ ] alpha: `./deploy_update_responses-alpha.sh` - [ ] release: `./deploy_update_responses-release.sh` - [ ] Publish APKs to Google Play: - [ ] Log into https://play.google.com/apps/publish - - Select correct app: - - [ ] Tor Browser - - [ ] Tor Browser Alpha + - [ ] Select `Tor Browser (Alpha)` app - [ ] Navigate to `Release > Production` and click `Create new release` button - [ ] Upload the `*.multi.apk` APKs - [ ] If necessary, update the 'Release Name' (should be automatically populated) @@ -277,8 +286,12 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Save, review, and configure rollout percentage - [ ] 25% rollout when publishing a scheduled update - [ ] 100% rollout when publishing a security-driven release - - [ ] Update rollout percentage to 100% after confirmed no major issues + - [ ] Update rollout percentage to 100% after confirmed no major issues + +### tor-announce mailing list +- [ ] Send an email to tor-announce(a)lists.torproject.org, using the same content as the blog post and subject "Tor Browser $version is released". </details> /label ~"Release Prep" + diff --git a/.gitlab/issue_templates/Release Prep - Stable.md b/.gitlab/issue_templates/Release Prep - Stable.md index ec9234c..a93f472 100644 --- a/.gitlab/issue_templates/Release Prep - Stable.md +++ b/.gitlab/issue_templates/Release Prep - Stable.md @@ -41,15 +41,16 @@ ### **torbutton** ***(Optional)***: https://git.torproject.org/torbutton.git - [ ] ***(Optional)*** Update translations : - - **NOTE** : mandatory if we have added new string dependencies - - [ ] `./import-translations.sh` - - [ ] Commit with message `Translation updates` - - **NOTE** : only add files which are already being tracked + - **NOTE** We only update strings in stable if a backported feature depends on new strings + - [ ] `./import-translations.sh` + - **NOTE** : if there are no new strings imported then we are done here + - [ ] Commit with message `Translation updates` + - **NOTE** : only add files which are already being tracked - [ ] fixup! `tor-browser`'s `Bug 10760 : Integrate TorButton to TorBrowser core` issue to point to updated `torbutton` commit ### **tor-launcher** ***(Optional)***: https://git.torproject.org/tor-launcher.git - [ ] ***(Optional)*** Update translations: - - **NOTE** : mandatory if we have added new string dependencies + - **NOTE** We only update strings in stable if a backported feature depends on new strings - [ ] ./localization/import-translations.sh - [ ] Commit with message `Translation updates` - [ ] Update `install.rdf` file with new version @@ -78,7 +79,7 @@ - [ ] `git diff $(ESR_TAG)..$(TOR_BROWSER_BRANCH) > rebased_patchset.diff` - [ ] `$(DIFF_TOOL) current_patchset.dif rebased_patchset.deff` - [ ] Open MR for the rebase -- [ ] ***(Optional)*** Backport any required patches to Stable +- [ ] ***(Optional)*** Backport any required Alpha patches to Stable - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue) - [ ] Close associated `Backport` issues - [ ] Open MR for the backport commits @@ -123,12 +124,22 @@ - [ ] Push tag to `origin` ### **tba-translation** ***(Optional)***: https://git.torproject.org/translation.git +- **NOTE** We only update strings in stable if a backported feature depends on new strings - [ ] Fetch latest and identify new `HEAD` of `fenix-torbrowserstringsxml` branch - - [ ] `origin/fenix-torbrowserstringsxml` :`<INSERT COMMIT HASH HERE>` + - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT COMMIT HASH HERE>` +### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git +- [ ] Fetch latest and identify new `HEAD` of `main` branch + - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>` + +### **application-services** : *TODO: we need to setup a gitlab copy of this repo that we can apply security backports to* +- [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release +- [ ] Sign/Tag commit: + - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based (alpha|stable)` +- [ ] Push tag to `origin` ### **android-components** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/android-components.git - [ ] ***(Optional)*** Rebase to `$(RR_VERSION)` - - Upstream git repo : https://github.com/mozilla-mobile/android-components.git - [ ] Identify the `mozilla-mobile` git tag to start from by first updating `fenix` and then checking which `android-components` tag is used in `buildSrc/src/main/java/AndroidComponents.kt` - Alternatively search for commit message like `Update Android-Components` - [ ] Create new branch from tag named `android-components-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1` @@ -137,19 +148,15 @@ - [ ] Perform rangediff to ensure nothing weird happened resolving conflicts - [ ] Open MR for the rebase - [ ] Merge + Push - - [ ] ***(Optional)*** Backport any required patches to Stable +- [ ] ***(Optional)*** Backport any required patches to Stable - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue) - [ ] Close associated `Backport` issues - [ ] Open MR for the backport commits - [ ] Merge + Push -- [ ] Sign/Tag commit: + [ ] Sign/Tag commit: - Tag : `android-components-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - Message: `Tagging $(BUILD_N) for $(RR_VERSION)-based (alpha|stable)` -- [ ] Push tag to origin - -### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git -- [ ] Fetch latest and identify new `HEAD` of `main` branch - - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>` + - [ ] Push tag to origin ### **fenix** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/fenix.git - [ ] ***(Optional)*** Rebase to `$(RR_VERSION)` @@ -184,9 +191,9 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - - [ ] `var/torbrowser_incremental_from` : update to previous version + - [ ] ***(Desktop Only)*** `var/torbrowser_incremental_from` : update to previous Desktop version - [ ] **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail -- [ ] Update `projects/firefox/config` +- [ ] ***(Desktop Only)*** Update `projects/firefox/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - [ ] ***(Android Only)*** Update `projects/geckoview/config` @@ -196,10 +203,17 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch - [ ] ***(Android Only, Optional)*** Update `projects/tor-android-service/config` - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch +- [ ] ***(Android Only, Optional)*** Update `projects/application-services/config`: + **NOTE** we don't have any of our own patches for this project + - [ ] `git_hash` : update to appropriate git commit associated with $(RR_VERSION) +- [ ] ***(Android Only, Optional)*** Update `projects/android-components/config` + - [ ] `git_hash` : update the `$(BUILD_N)` section to match `android-components` tag + - [ ] ***(Optional)*** `var/android_components_version` : update to latest `$(RR_VERSION)` if rebased - [ ] ***(Android Only, Optional)*** Update `projects/fenix/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `fenix` tag - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(RR_VERSION)` if rebased -- [ ] ***(Android Only)*** Update allowed_addons.json by running (from `tor-browser-build` root)`./tools/fetch_allowed_addons.py > projects/tor-browser/allowed_addons.json` +- [ ] ***(Android Only)*** Update allowed_addons.json by running (from `tor-browser-build` root): + - `./tools/fetch_allowed_addons.py > projects/tor-browser/allowed_addons.json` - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/tor-browser/config` - [ ] `URL` @@ -298,15 +312,17 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - **NOTE**: at this point the signed binaries should have been copied to `staticiforme` - [ ] Update `staticiforme.torproject.org`: - From `screen` session on `staticiforme.torproject.org`: + - [ ] Remove old release data from following places: + - **NOTE** : Skip this step if the current release is Android or Desktop *only* + - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` + - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` - [ ] Enable update responses : - [ ] alpha: `./deploy_update_responses-alpha.sh` - [ ] release: `./deploy_update_responses-release.sh` - [ ] ***(Android Only)*** : Publish APKs to Google Play: - [ ] Log into https://play.google.com/apps/publish - - Select correct app: - - [ ] Tor Browser - - [ ] Tor Browser Alpha + - [ ] Select `Tor Browser` app - [ ] Navigate to `Release > Production` and click `Create new release` button - [ ] Upload the `*.multi.apk` APKs - [ ] If necessary, update the 'Release Name' (should be automatically populated) @@ -322,3 +338,6 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Send an email to tor-announce(a)lists.torproject.org, using the same content as the blog post and subject "Tor Browser $version is released". </details> + +/label ~"Release Prep" + -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40574: Improve tools/signing/android-signing
by gitolite role 26 Aug '22

26 Aug '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 751756c Bug 40574: Improve tools/signing/android-signing 751756c is described below commit 751756c2e7d7239df0636bf5ac8cc22d4781cbc6 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Tue Jul 12 16:48:51 2022 +0200 Bug 40574: Improve tools/signing/android-signing * use projects/android-toolchain/config to download android build-tools * download unsigned apk files for pkgstage and upload them to pkgstage when signed * use set-config.android-signing --- projects/android-toolchain/config | 21 +++++++- tools/signing/android-signing | 93 +++++++++++++++++++++++--------- tools/signing/set-config.android-signing | 7 +++ 3 files changed, 93 insertions(+), 28 deletions(-) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 57c38c1..a2f34ae 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -47,11 +47,13 @@ var: sdk_tools_version: 4333796 commandlinetools_version: 7583922 commandlinetools_version_string: 5.0 + build_tools_filename: build-tools_r31-linux.zip + build_tools_sha256sum: f90c22f5562638a2e00762e1711eebd55e7f0a05232b65200d387307d057bfe8 input_files: - project: container-image - - URL: '[% c("var/google_repo") %]/build-tools_r31-linux.zip' + - URL: '[% c("var/google_repo") %]/[% c("var/build_tools_filename") %]' name: build_tools - sha256sum: f90c22f5562638a2e00762e1711eebd55e7f0a05232b65200d387307d057bfe8 + sha256sum: '[% c("var/build_tools_sha256sum") %]' - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_30") %]-linux.zip' name: build_tools_30 sha256sum: 565af786dc0cc1941002174fb945122eabd080b222cd4c7c3d9a2ae0fabf5dc4 @@ -85,3 +87,18 @@ 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 +steps: + # The get_build_tools step is used by tools/signing/android-signing + get_build_tools: + filename: 'android-[% c("var/build_tools_filename") %]' + get_build_tools: | + #!/bin/bash + set -e + mv -v [% c("input_files_by_name/build_tools") %] [% dest_dir _ '/' _ c('filename') %] + var: + container: + use_container: 0 + input_files: + - URL: '[% c("var/google_repo") %]/[% c("var/build_tools_filename") %]' + name: build_tools + sha256sum: '[% c("var/build_tools_sha256sum") %]' diff --git a/tools/signing/android-signing b/tools/signing/android-signing index 7c2ee50..16610e7 100755 --- a/tools/signing/android-signing +++ b/tools/signing/android-signing @@ -1,23 +1,64 @@ #!/bin/bash # Sign apk for each target architecture. -# This script requires two command line arguments. -# Usage: android-signing <version> <path/to/signing/key> +# This script does not require command line argument, but it needs +# some configuration options to be set in set-config.android-signing: +# - ssh_host_pkgstage is the host which you use for staging packages +# during signing. The script will download the unsigned .apk files +# from this host, and upload the signed .apk there +# - pkgstage_tor_browser_build_dir: this is the path to tor-browser-build +# on pkgstage +# - android_signing_key_dir: the local path where the android signing +# keys are located. That directory should contains files tba_alpha.p12 +# and tba_release.p12 for alpha and release signing keys. +# The Tor Browser version is taken from set-config.tbb-version -# In addition, hard-coding the path to an Android SDK build-tools version, as -# BUILD_TOOLS, is required. - -set -x set -e +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source "$script_dir/functions" +source "$script_dir/set-config.android-signing" -VERSION=$1 -SIGNING_KEY_PATH=$2 +topdir="$script_dir/../.." +ARCHS="armv7 aarch64 x86 x86_64" -# TODO set correctly. -BUILD_TOOLS=/path/to/build-tools/version -export PATH="${BUILD_TOOLS}:${PATH}" +android_signing_key_path="$android_signing_key_dir/tba_$tbb_version_type.p12" +test -f "$android_signing_key_path" || exit_error "$android_signing_key_path is missing" -ARCHS="armv7 aarch64 x86 x86_64" +check_installed_packages() { + local packages='unzip openjdk-11-jdk-headless openjdk-11-jre-headless' + for package in $packages + do + dpkg -s "$package" | grep -q '^Status: install ok installed$' || \ + exit_error "package $package is missing" + done +} + +setup_build_tools() { + local rbm="$topdir/rbm/rbm" + local build_tools_zipfile="$topdir/out/android-toolchain/$("$rbm" showconf --step get_build_tools android-toolchain filename)" + if ! test -f "$build_tools_zipfile"; then + "$rbm" build --step get_build_tools android-toolchain + test -f "$build_tools_zipfile" || exit_error "$build_tools_zipfile is missing" + fi + local build_tools_dir=$(mktemp -d) + trap "rm -Rf $build_tools_dir" EXIT + unzip -d "$build_tools_dir" "$build_tools_zipfile" + test -f "$build_tools_dir"/android-12/apksigner || \ + exit_error "$build_tools_dir/android-12/apksigner is missing" + export PATH="$build_tools_dir/android-12:${PATH}" +} + +download_unsigned_apks() { + apks_dir=$(mktemp -d) + trap "rm -Rf $apks_dir" EXIT + rsync -avH "$ssh_host_pkgstage:$pkgstage_tor_browser_build_dir/$tbb_version_type/signed/$tbb_version/*-qa.apk" "$apks_dir/" +} + +upload_signed_apks() { + rsync -avH --exclude="*-qa.apk" --exclude="*-unaligned.apk" \ + --exclude="*-unsigned.apk" "$apks_dir/" \ + "$ssh_host_pkgstage:$pkgstage_tor_browser_build_dir/$tbb_version_type/signed/$tbb_version/" +} # Sign individual apk sign_apk() { @@ -57,7 +98,7 @@ sign_apk() { # Step 3: Sign # Use this command if reading key from file - apksigner sign --verbose -ks ${SIGNING_KEY_PATH} --ks-type pkcs12 --ks-pass env:KSPASS --debuggable-apk-permitted=false --out "${SIGNED_APK}" "${UNSIGNED_APK}" + apksigner sign --verbose -ks ${android_signing_key_path} --ks-type pkcs12 --ks-pass env:KSPASS --debuggable-apk-permitted=false --out "${SIGNED_APK}" "${UNSIGNED_APK}" # Or, use below command if using a hardware token # apksigner sign --verbose --provider-class sun.security.pkcs11.SunPKCS11 --provider-arg pkcs11_java.cfg --ks NONE --ks-type PKCS11 --debuggable-apk-permitted=false --out "${SIGNED_APK}" "${UNSIGNED_APK}" @@ -81,18 +122,18 @@ sign_apk() { # Rename and verify signing certificate finalize() { for arch in ${ARCHS}; do - mv tor-browser-${VERSION}-android-${arch}-multi{-qa,}.apk + mv tor-browser-${tbb_version}-android-${arch}-multi{-qa,}.apk done for arch in ${ARCHS}; do - verified=`apksigner verify --print-certs --verbose tor-browser-${VERSION}-android-${arch}-multi.apk` + verified=`apksigner verify --print-certs --verbose tor-browser-${tbb_version}-android-${arch}-multi.apk` scheme_v1= scheme_v2= cert_digest= pubkey_digest= # Verify the expected signing key was used, Alpha verses Release based on the filename. - if `echo ${VERSION} | grep -q a`; then + if test "$tbb_version_type" = "alpha"; then scheme_v1="Verified using v1 scheme (JAR signing): true" scheme_v2="Verified using v2 scheme (APK Signature Scheme v2): true" cert_digest="Signer #1 certificate SHA-256 digest: 15f760b41acbe4783e667102c9f67119be2af62fab07763f9d57f01e5e1074e1" @@ -117,15 +158,7 @@ finalize() { echo Done. } -if [ -z "$VERSION" ]; then - echo Provide version number - exit -fi - -if [ -z "${SIGNING_KEY_PATH}" ]; then - echo Provide the path to the signing key: release or alpha - exit -fi +check_installed_packages if [ -z "$KSPASS" ]; then echo "Enter keystore passphrase" @@ -133,9 +166,17 @@ if [ -z "$KSPASS" ]; then export KSPASS fi +setup_build_tools + +download_unsigned_apks + +cd $apks_dir + # Sign all packages for arch in ${ARCHS}; do - sign_apk tor-browser-${VERSION}-android-${arch}-multi-qa.apk + sign_apk tor-browser-${tbb_version}-android-${arch}-multi-qa.apk done finalize + +upload_signed_apks diff --git a/tools/signing/set-config.android-signing b/tools/signing/set-config.android-signing new file mode 100644 index 0000000..1731efc --- /dev/null +++ b/tools/signing/set-config.android-signing @@ -0,0 +1,7 @@ +# The following line should be uncommented and updated: + +#ssh_host_pkgstage=tbbuild +#pkgstage_tor_browser_build_dir=/home/user/tor-browser-build +#android_signing_key_dir=/path/to/signing/key/dir + +var_is_defined ssh_host_pkgstage android_signing_key_dir -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-spec] branch main updated: Bug 40034: Add Android signing to processes/ReleaseProcess
by gitolite role 26 Aug '22

26 Aug '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-browser-spec. The following commit(s) were added to refs/heads/main by this push: new ecdd135 Bug 40034: Add Android signing to processes/ReleaseProcess ecdd135 is described below commit ecdd135421dd57dd1f253c1ebcbcf1bd223b63f1 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Wed Jul 13 14:14:44 2022 +0200 Bug 40034: Add Android signing to processes/ReleaseProcess --- processes/ReleaseProcess | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 82c7bfa..e97b2f2 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -61,6 +61,38 @@ # For stable releases put tails-dev(a)boum.org into Cc. +####################### +### Android signing ### +####################### + +#. The Android signing is done separately from the desktop signing. To +# do the Android signing you'll need to boot from a Tails usb stick, +# with persistent storage enabled. + +#. Install the openjdk-11-jdk-headless package + apt install openjdk-11-jdk-headless + +#. Make sure you have the android keys, for example in the +# ~/Persistent/android-keys directory. This directory should include +# the tba_alpha.p12 and tba_release.p12 files. + +#. Clone tor-browser-build, and checkout the tag for the release + git tag -v tbb-$TORBROWSER_VERSION-buildN + git checkout tbb-$TORBROWSER_VERSION-buildN + +#. Update set-config.tbb-version and set-config.android-signing + cd tools/signing + vim set-config.tbb-version + vim set-config.android-signing + +#. Run the android-signing script. This script will download the +# unsigned apks from the `pkgstage` machine (where `do-all-signing` +# is run), signed them, and upload back the signed apks to the +# `pkgstage` machine. It should be done before the hash_signed_bundles.sh +# step. + ./android-signing + + ########################## ### Signing and upload ### ########################## -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] annotated tag tbb-11.5.3-build1 created (now 2f70e0c)
by gitolite role 26 Aug '22

26 Aug '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag tbb-11.5.3-build1 in repository builders/tor-browser-build. at 2f70e0c (tag) tagging 38afab6c639e8aeee86d3f1c65fb222d3b34b725 (commit) replaces tbb-11.5.2-build1 by Richard Pospesel on Fri Aug 26 18:20:03 2022 +0000 - Log ----------------------------------------------------------------- Tagging build1 for 11.5.3 -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmMJDtMXHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSyzuyQ/+PwOWS/wbiNXKGZSq886z5QRr lcsh9atJHDapuLZ0Gihx/5wTxb4Lz2/nX0nrFJyqhTrio6fywnvxxUBQGZejjJ78 Ftez2YvWOo3rq5YrJa+eGy+8zs+HYi9uqmA7Ytw9b2v1+/XFlpoRLlt7A7Z0heQD F0EKkcI+91OEYSpmiTGcql8DVgpIOkm3SUP4dyVC1i4e6yh3A0+3ou5aVaYDr3wz HSIBR56Am7blsrt6nsOFQZak8GkEJy4ilMZjvJep6wvh5n2bDHNV6yA3DTy/Jalb 5sCOkkCi+5ghJwd5M6dkLInFixFFAN+TDorMUmsf7SYFuCmMxZJyIsf1v3bRDOAl 4I4oSfgY7ESWnaSVqABOmSqKvcTLlf8AxjzgmthUCagcD8tSYzG/8Q7tTsxzniUh CuDWTsVm/0AlLGFS/G0LRCqK8IYegzk4XdVHOejPfp6c5Grl3gFogFD9ss+gz3ge PGrPoQJ3yGWogIxBBcVugVA46EEr8rln3X3jKIqYTkj/19CCcMXUx80IsCl3bDob wvZacmQqVism/REX7LwHlyn9auaMXHj3C6cbtThynWd/Wkj0M/KRwbEG9ENXhKcQ 3RM1l7Ipbq5sJ7+Bw4Y5qfDwNLKxXJHKJE2lD9+hxidcqFH5Zh3MaNpmGof+IaDd 0KdpCLA+D9LOkTsvaCo= =Vyyj -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0