- tbb-commits - lists.torproject.org

[torbutton/master] Bug 40001: Generate tor-browser-brand.ftl when importing translations
by gk＠torproject.org 08 Jul '20

08 Jul '20

commit e486ef2454a7a9b3751407e3f5d532f939610a5d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Apr 15 16:16:42 2020 +0200 Bug 40001: Generate tor-browser-brand.ftl when importing translations --- chrome/locale/ar/branding/tor-browser-brand.ftl | 4 +-- chrome/locale/cs/branding/tor-browser-brand.ftl | 2 +- chrome/locale/da/branding/tor-browser-brand.ftl | 4 +-- chrome/locale/es-ES/branding/tor-browser-brand.ftl | 2 +- chrome/locale/fa/branding/tor-browser-brand.ftl | 8 ++--- chrome/locale/fr/branding/tor-browser-brand.ftl | 2 +- chrome/locale/hu/branding/tor-browser-brand.ftl | 8 ++--- chrome/locale/id/branding/tor-browser-brand.ftl | 2 +- chrome/locale/lt/branding/tor-browser-brand.ftl | 12 +++---- chrome/locale/ms/branding/tor-browser-brand.ftl | 12 +++---- chrome/locale/nb-NO/branding/tor-browser-brand.ftl | 4 +-- chrome/locale/nl/branding/tor-browser-brand.ftl | 10 +++--- chrome/locale/ru/branding/tor-browser-brand.ftl | 2 +- chrome/locale/sv-SE/branding/tor-browser-brand.ftl | 2 +- chrome/locale/th/branding/tor-browser-brand.ftl | 4 +-- chrome/locale/tr/branding/tor-browser-brand.ftl | 2 +- chrome/locale/zh-CN/branding/tor-browser-brand.ftl | 8 ++--- chrome/locale/zh-TW/branding/tor-browser-brand.ftl | 4 +-- import-translations.sh | 37 ++++++++++++++++++++++ 19 files changed, 83 insertions(+), 46 deletions(-) diff --git a/chrome/locale/ar/branding/tor-browser-brand.ftl b/chrome/locale/ar/branding/tor-browser-brand.ftl index 9595f702..1bcc7d0a 100644 --- a/chrome/locale/ar/branding/tor-browser-brand.ftl +++ b/chrome/locale/ar/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = متصفح تور # 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 = متصفح تور +-brand-product-name = متصفح Tor -vendor-short-name = مشروع تور -trademarkInfo = "تور" و "شعار البصلة" علامات تجارية مسجلة باسم شركة مشروع تور المحدودة +trademarkInfo = 'تور' و 'شعار البصلة' علامات تجارية مسجلة باسم شركة مشروع تور المحدودة diff --git a/chrome/locale/cs/branding/tor-browser-brand.ftl b/chrome/locale/cs/branding/tor-browser-brand.ftl index 61719fb2..604c023d 100644 --- a/chrome/locale/cs/branding/tor-browser-brand.ftl +++ b/chrome/locale/cs/branding/tor-browser-brand.ftl @@ -9,4 +9,4 @@ # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Prohlížeč Tor -vendor-short-name = Tor Project -trademarkInfo = "Tor" a "Onion logo" jsou registrované ochranné známky společnosti Tor Project, Inc. +trademarkInfo = Tor a logo Onion jsou ochrannými známkami společnosti Tor Project, Inc. diff --git a/chrome/locale/da/branding/tor-browser-brand.ftl b/chrome/locale/da/branding/tor-browser-brand.ftl index c8554742..65c61062 100644 --- a/chrome/locale/da/branding/tor-browser-brand.ftl +++ b/chrome/locale/da/branding/tor-browser-brand.ftl @@ -8,5 +8,5 @@ # 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-projektet -trademarkInfo = "Tor" og "løg-logoet" er registrerede varemærker tilhørende Tor Project, Inc. +-vendor-short-name = Tor-projekt +trademarkInfo = 'Tor' og 'løg-logoet' er registrerede varemærker tilhørende Tor Project, Inc. diff --git a/chrome/locale/es-ES/branding/tor-browser-brand.ftl b/chrome/locale/es-ES/branding/tor-browser-brand.ftl index 7c301ac8..6c35c786 100644 --- a/chrome/locale/es-ES/branding/tor-browser-brand.ftl +++ b/chrome/locale/es-ES/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = Tor Browser # 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 +-brand-product-name = Navegador Tor -vendor-short-name = Proyecto Tor trademarkInfo = 'Tor' y el 'Onion Logo' (logo de la cebolla) son marcas registradas de la Tor Project, Inc. diff --git a/chrome/locale/fa/branding/tor-browser-brand.ftl b/chrome/locale/fa/branding/tor-browser-brand.ftl index 11b305c4..67f426de 100644 --- a/chrome/locale/fa/branding/tor-browser-brand.ftl +++ b/chrome/locale/fa/branding/tor-browser-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 = مرورگر تور --brand-short-name = مرورگر تور --brand-full-name = مرورگر تور +-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 = مرورگر تور --vendor-short-name = پروژهٔ تور +-vendor-short-name = پروژه Tor trademarkInfo = 'Tor' و 'Onion Logo' علامت های تجاری ثبت شده از پروژه Tor هستند diff --git a/chrome/locale/fr/branding/tor-browser-brand.ftl b/chrome/locale/fr/branding/tor-browser-brand.ftl index 293fa032..88f33470 100644 --- a/chrome/locale/fr/branding/tor-browser-brand.ftl +++ b/chrome/locale/fr/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = Le Navigateur 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 = Le Navigateur Tor +-brand-product-name = Navigateur Tor -vendor-short-name = Le Projet Tor trademarkInfo = « Tor » et le « logo Onion » sont des marques de commerce de « The Projet Tor, Inc. » diff --git a/chrome/locale/hu/branding/tor-browser-brand.ftl b/chrome/locale/hu/branding/tor-browser-brand.ftl index ab8ff46d..399c1231 100644 --- a/chrome/locale/hu/branding/tor-browser-brand.ftl +++ b/chrome/locale/hu/branding/tor-browser-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 Böngésző +-brand-short-name = Tor Böngésző +-brand-full-name = Tor Böngésző # 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 +-brand-product-name = Tor Böngésző -vendor-short-name = Tor Project trademarkInfo = A 'Tor' és az 'Onion Logo' a Tor Project, Inc. bejegyzett védjegyei. diff --git a/chrome/locale/id/branding/tor-browser-brand.ftl b/chrome/locale/id/branding/tor-browser-brand.ftl index b220851c..1724e411 100644 --- a/chrome/locale/id/branding/tor-browser-brand.ftl +++ b/chrome/locale/id/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = Tor Browser # 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 +-brand-product-name = Peramban Tor -vendor-short-name = Proyek Tor trademarkInfo = 'Tor' dan 'Logo Onion' adalah merek dagang terdaftar Tor Project, Inc. diff --git a/chrome/locale/lt/branding/tor-browser-brand.ftl b/chrome/locale/lt/branding/tor-browser-brand.ftl index af1fd648..aeebaec4 100644 --- a/chrome/locale/lt/branding/tor-browser-brand.ftl +++ b/chrome/locale/lt/branding/tor-browser-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 Naršyklė +-brand-short-name = Tor Naršyklė +-brand-full-name = Tor Naršyklė # 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 Naršyklė +-vendor-short-name = Tor projektas +trademarkInfo = 'Tor' ir 'Onion logotipas' yra registruoti Tor Project, Inc. prekių ženklai. diff --git a/chrome/locale/ms/branding/tor-browser-brand.ftl b/chrome/locale/ms/branding/tor-browser-brand.ftl index af1fd648..058e7c9a 100644 --- a/chrome/locale/ms/branding/tor-browser-brand.ftl +++ b/chrome/locale/ms/branding/tor-browser-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 = Pelayar Tor +-brand-short-name = Pelayar Tor +-brand-full-name = Pelayar 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 = Pelayar Tor +-vendor-short-name = Projek Tor +trademarkInfo = 'Tor' dan 'Logo Onion' adalah cap dagangan berdaftar bagi Projek Tor, Inc. diff --git a/chrome/locale/nb-NO/branding/tor-browser-brand.ftl b/chrome/locale/nb-NO/branding/tor-browser-brand.ftl index b09f8a20..8f5ec614 100644 --- a/chrome/locale/nb-NO/branding/tor-browser-brand.ftl +++ b/chrome/locale/nb-NO/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = Tor-nettleseren # 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-nettleseren +-brand-product-name = Tor Browser -vendor-short-name = Tor Project -trademarkInfo = "Tor" og "Løk-logoen" er registrerte varemerker tilhørende the Tor Project, Inc. +trademarkInfo = 'Tor' og 'Løk-logoen' er registrerte varemerker tilhørende the Tor Project, Inc. diff --git a/chrome/locale/nl/branding/tor-browser-brand.ftl b/chrome/locale/nl/branding/tor-browser-brand.ftl index 8ae5a2c6..77d51761 100644 --- a/chrome/locale/nl/branding/tor-browser-brand.ftl +++ b/chrome/locale/nl/branding/tor-browser-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-browser +-brand-short-name = Tor-browser +-brand-full-name = Tor-browser # 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’ en het ‘Onion-logo’ zijn geregistreerde handelsmerken van het Tor Project, Inc. +-vendor-short-name = Tor-project +trademarkInfo = ‘Tor’ en het ‘Onion-logo’ zijn geregistreerde handelsmerken van Tor Project, Inc. diff --git a/chrome/locale/ru/branding/tor-browser-brand.ftl b/chrome/locale/ru/branding/tor-browser-brand.ftl index 44a1226e..c712a1b7 100644 --- a/chrome/locale/ru/branding/tor-browser-brand.ftl +++ b/chrome/locale/ru/branding/tor-browser-brand.ftl @@ -8,5 +8,5 @@ # 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 +-vendor-short-name = Tor Project trademarkInfo = 'Tor' и логотип 'Onion' являются зарегистрированными торговыми марками Tor Project, Inc. diff --git a/chrome/locale/sv-SE/branding/tor-browser-brand.ftl b/chrome/locale/sv-SE/branding/tor-browser-brand.ftl index a7f08cfc..56cdff04 100644 --- a/chrome/locale/sv-SE/branding/tor-browser-brand.ftl +++ b/chrome/locale/sv-SE/branding/tor-browser-brand.ftl @@ -9,4 +9,4 @@ # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser -vendor-short-name = Tor-projektet -trademarkInfo = 'Tor' och 'Onion Logotypen' är registerade varumärken av Tor Project, Inc. +trademarkInfo = 'Tor' och 'Onion-logotypen' är registerade varumärken av Tor Project, Inc. diff --git a/chrome/locale/th/branding/tor-browser-brand.ftl b/chrome/locale/th/branding/tor-browser-brand.ftl index af1fd648..b1812e82 100644 --- a/chrome/locale/th/branding/tor-browser-brand.ftl +++ b/chrome/locale/th/branding/tor-browser-brand.ftl @@ -8,5 +8,5 @@ # 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. +-vendor-short-name = โครงการ Tor +trademarkInfo = 'Tor 'และ' Onion Logo 'เป็นเครื่องหมายการค้าจดทะเบียนของโครงการ Tor Project, Inc. diff --git a/chrome/locale/tr/branding/tor-browser-brand.ftl b/chrome/locale/tr/branding/tor-browser-brand.ftl index 606a088b..d77b5427 100644 --- a/chrome/locale/tr/branding/tor-browser-brand.ftl +++ b/chrome/locale/tr/branding/tor-browser-brand.ftl @@ -9,4 +9,4 @@ # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser -vendor-short-name = Tor Projesi -trademarkInfo = 'Tor' ve 'Onion Logo' Tor Project, Inc. tarafından tescillenmiş markalardır. +trademarkInfo = 'Tor' ve 'Onion Logo' Tor Project, Inc. tarafından tescil edilmiş markalardır. diff --git a/chrome/locale/zh-CN/branding/tor-browser-brand.ftl b/chrome/locale/zh-CN/branding/tor-browser-brand.ftl index acaab16c..bd16e2af 100644 --- a/chrome/locale/zh-CN/branding/tor-browser-brand.ftl +++ b/chrome/locale/zh-CN/branding/tor-browser-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 +-brand-product-name = Tor 浏览器 -vendor-short-name = Tor Project trademarkInfo = “Tor”和“Onion Logo”是 Tor Project, Inc 的注册商标。 diff --git a/chrome/locale/zh-TW/branding/tor-browser-brand.ftl b/chrome/locale/zh-TW/branding/tor-browser-brand.ftl index 67938d57..eca78d7c 100644 --- a/chrome/locale/zh-TW/branding/tor-browser-brand.ftl +++ b/chrome/locale/zh-TW/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = 洋蔥路由瀏覽器 # 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 = 洋蔥路由瀏覽器 --vendor-short-name = 洋蔥路由專案 +-brand-product-name = Tor 瀏覽器 +-vendor-short-name = Tor 計畫 trademarkInfo = 「Tor」和「Onion Logo」皆是 Tor Project, Inc 的註冊商標。 diff --git a/import-translations.sh b/import-translations.sh index 06060a3c..78b4b8b9 100755 --- a/import-translations.sh +++ b/import-translations.sh @@ -64,6 +64,7 @@ else fi # Update each translated file for each locale. +( echo "Locales: $BUNDLE_LOCALES" cd translation for KEYVAL in "${FILEMAP[@]}"; do @@ -87,3 +88,39 @@ for KEYVAL in "${FILEMAP[@]}"; do $i/"$SRCFILE" > ../$LOCALE_DIR/$i/"$DEST_FILE" done done +) + +# Autogenerate tor-browser-brand.ftl based on brand.properties +# and brand.dtd. +REGEX_ENTITY='<!ENTITY +([^" ]+) +"(.+)">'; +for LOCALE in $BUNDLE_LOCALES; +do + BRAND_PATH="$LOCALE_DIR/$LOCALE/brand.properties" + BRAND_DTD_PATH="$LOCALE_DIR/$LOCALE/brand.dtd" + TOR_BRAND_PATH="$(dirname "$BRAND_PATH")/branding/tor-browser-brand.ftl" + + BRAND_SHORTER_NAME="$(sed -n -e '/^brandShorterName/p' $BRAND_PATH | cut -d= -f2)" + BRAND_SHORT_NAME="$(sed -n -e '/^brandShortName/p' $BRAND_PATH | cut -d= -f2)" + BRAND_FULL_NAME="$(sed -n -e '/^brandFullName/p' $BRAND_PATH | cut -d= -f2)" + BRAND_PRODUCT_NAME="$(sed -n -e '/^brandProductName/p' $BRAND_PATH | cut -d= -f2)" + VENDOR_SHORT_NAME="$(sed -n -e '/^vendorShortName/p' $BRAND_PATH | cut -d= -f2)" + TRADEMARK_INFO='{ " " }' + if [[ "$(sed -n -e '/trademarkInfo/p' $BRAND_DTD_PATH)" =~ $REGEX_ENTITY ]] + then + # Replace some HTML entities (now just ") for tor-browser-brand.ftl. + TRADEMARK_INFO="${BASH_REMATCH[2]//"/\'}" + fi + + echo "# For Tor Browser, we use a new file (different than the brand.ftl file" > $TOR_BRAND_PATH + echo "# that is used by Firefox) to avoid picking up the -brand-short-name values" >> $TOR_BRAND_PATH + echo "# that Mozilla includes in the Firefox language packs." >> $TOR_BRAND_PATH + echo "" >> $TOR_BRAND_PATH + echo "-brand-shorter-name = $BRAND_SHORTER_NAME" >> $TOR_BRAND_PATH + echo "-brand-short-name = $BRAND_SHORT_NAME" >> $TOR_BRAND_PATH + echo "-brand-full-name = $BRAND_FULL_NAME" >> $TOR_BRAND_PATH + echo "# This brand name can be used in messages where the product name needs to" >> $TOR_BRAND_PATH + echo "# remain unchanged across different versions (Nightly, Beta, etc.)." >> $TOR_BRAND_PATH + echo "-brand-product-name = $BRAND_PRODUCT_NAME" >> $TOR_BRAND_PATH + echo "-vendor-short-name = $VENDOR_SHORT_NAME" >> $TOR_BRAND_PATH + echo "trademarkInfo = $TRADEMARK_INFO" >> $TOR_BRAND_PATH +done

1 0

[tor-browser-build/master] Release preparations for 10.0a3
by sysrqb＠torproject.org 06 Jul '20

06 Jul '20

commit ca6280fe98cb140f05f397ce2bb99e0c41b90902 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jul 7 03:16:13 2020 +0000 Release preparations for 10.0a3 Changelog update and versions bump --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 019dfc1..7c700a8 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.10.0 + firefox_platform_version: 68.10.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.0 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index fd03cd1..a6b6408 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 10.0a3 -- July 7 2020 + * Android + * Update Firefox to 68.10.1esr + Tor Browser 10.0a2 -- June 30 2020 * All Platforms * Update Firefox to 68.10.0esr diff --git a/rbm.conf b/rbm.conf index 0ccfc9d..92c3293 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,7 +24,7 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0a2' + torbrowser_version: '10.0a3' torbrowser_build: 'build1' torbrowser_incremental_from: - 10.0a1

1 0

[tor-browser-build/maint-9.5] Release preparations for 9.5.2
by sysrqb＠torproject.org 06 Jul '20

06 Jul '20

commit b5fb6a531f4723c63eea4ff4ea58d56377578cb4 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jul 6 19:46:17 2020 +0000 Release preparations for 9.5.2 Changelog update and versions bump --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 1398149..414097f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.10.0 + firefox_platform_version: 68.10.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c204a38..bd49a23 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 9.5.2 -- July 7 2020 + * Android + * Update Firefox to 68.10.1esr + Tor Browser 9.5.1 -- June 30 2020 * All Platforms * Update Firefox to 68.10.0esr diff --git a/rbm.conf b/rbm.conf index c65d3a8..05ffcf2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,8 +24,8 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5.1' - torbrowser_build: 'build2' + torbrowser_version: '9.5.2' + torbrowser_build: 'build1' torbrowser_incremental_from: - 9.5 project_name: tor-browser

1 0

[tor-browser-build/maint-9.5] Bug 40012: Add build target for all Android arches
by gk＠torproject.org 06 Jul '20

06 Jul '20

commit aca5c381638beacf86d2660d3d6e94f4e5996acf Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jul 6 18:39:31 2020 +0000 Bug 40012: Add build target for all Android arches --- Makefile | 12 ++++++++++++ projects/release/config | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/Makefile b/Makefile index 6d82f93..cb7edc5 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,9 @@ all: release release: submodule-update $(rbm) build release --target release --target torbrowser-all +release-android: submodule-update + $(rbm) build release --target release --target torbrowser-all-android + release-android-armv7: submodule-update $(rbm) build release --target release --target torbrowser-android-armv7 @@ -41,6 +44,9 @@ release-src: submodule-update alpha: submodule-update $(rbm) build release --target alpha --target torbrowser-all +alpha-android: submodule-update + $(rbm) build release --target alpha --target torbrowser-all-android + alpha-android-armv7: submodule-update $(rbm) build release --target alpha --target torbrowser-android-armv7 @@ -77,6 +83,9 @@ alpha-src: submodule-update nightly: submodule-update $(rbm) build release --target nightly --target torbrowser-all +nightly-android: submodule-update + $(rbm) build release --target nightly --target torbrowser-all-android + nightly-android-armv7: submodule-update $(rbm) build release --target nightly --target torbrowser-android-armv7 @@ -113,6 +122,9 @@ nightly-src: submodule-update testbuild: submodule-update $(rbm) build release --target testbuild --target torbrowser-all +testbuild-android: submodule-update + $(rbm) build release --target testbuild --target torbrowser-all-android + testbuild-android-armv7: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-armv7 diff --git a/projects/release/config b/projects/release/config index 17db3d0..c6e883b 100644 --- a/projects/release/config +++ b/projects/release/config @@ -19,6 +19,12 @@ targets: - torbrowser-android-x86_64 - torbrowser-android-aarch64 - torbrowser-src + torbrowser-all-android: + - torbrowser-android-armv7 + - torbrowser-android-x86 + - torbrowser-android-x86_64 + - torbrowser-android-aarch64 + - torbrowser-src torbrowser-android-armv7: var: torbrowser-android-armv7: 1 @@ -60,6 +66,7 @@ targets: notarget: - release - torbrowser-all + - torbrowser-all-android noversiondir: var:

1 0

[tor-browser-build/master] Bug 40012: Add build target for all Android arches
by gk＠torproject.org 06 Jul '20

06 Jul '20

commit 83846ea03d86523f9f74505e34bb2d073487e3b8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jul 6 18:39:31 2020 +0000 Bug 40012: Add build target for all Android arches --- Makefile | 12 ++++++++++++ projects/release/config | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/Makefile b/Makefile index 6d82f93..cb7edc5 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,9 @@ all: release release: submodule-update $(rbm) build release --target release --target torbrowser-all +release-android: submodule-update + $(rbm) build release --target release --target torbrowser-all-android + release-android-armv7: submodule-update $(rbm) build release --target release --target torbrowser-android-armv7 @@ -41,6 +44,9 @@ release-src: submodule-update alpha: submodule-update $(rbm) build release --target alpha --target torbrowser-all +alpha-android: submodule-update + $(rbm) build release --target alpha --target torbrowser-all-android + alpha-android-armv7: submodule-update $(rbm) build release --target alpha --target torbrowser-android-armv7 @@ -77,6 +83,9 @@ alpha-src: submodule-update nightly: submodule-update $(rbm) build release --target nightly --target torbrowser-all +nightly-android: submodule-update + $(rbm) build release --target nightly --target torbrowser-all-android + nightly-android-armv7: submodule-update $(rbm) build release --target nightly --target torbrowser-android-armv7 @@ -113,6 +122,9 @@ nightly-src: submodule-update testbuild: submodule-update $(rbm) build release --target testbuild --target torbrowser-all +testbuild-android: submodule-update + $(rbm) build release --target testbuild --target torbrowser-all-android + testbuild-android-armv7: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-armv7 diff --git a/projects/release/config b/projects/release/config index 17db3d0..c6e883b 100644 --- a/projects/release/config +++ b/projects/release/config @@ -19,6 +19,12 @@ targets: - torbrowser-android-x86_64 - torbrowser-android-aarch64 - torbrowser-src + torbrowser-all-android: + - torbrowser-android-armv7 + - torbrowser-android-x86 + - torbrowser-android-x86_64 + - torbrowser-android-aarch64 + - torbrowser-src torbrowser-android-armv7: var: torbrowser-android-armv7: 1 @@ -60,6 +66,7 @@ targets: notarget: - release - torbrowser-all + - torbrowser-all-android noversiondir: var:

1 0

[tor-browser-spec/master] Bug 40001: Add rebasing process document
by gk＠torproject.org 06 Jul '20

06 Jul '20

commit f857ef5ae6c8af955198bd28c7b54bf7df624b53 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 22 18:17:44 2020 +0200 Bug 40001: Add rebasing process document --- processes/Rebasing | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/processes/Rebasing b/processes/Rebasing new file mode 100644 index 0000000..144f5ab --- /dev/null +++ b/processes/Rebasing @@ -0,0 +1,161 @@ +Rebasing Tor Browser patches on top of a new Firefox version +============================================================ + +These instructions assume branches of Tor Browser code are maintained with git, +and consist of a sequence of patches (commits) applied on top of some commit +from the https://github.com/mozilla/gecko-dev.git mirror of the Mercurial +Gecko repositories. + +1) Rebase +--------- + +This consists of applying the Tor Browser patches (commits) from some branch on +top of a newer Firefox branch, and fixing up possible conflicts. There should be +a helper script that automates as much of this process as possible: + +Steps: + +- Move to the branch that contains the patches to be rebased and create a new + one, since it will be modified during the rebasing process: + `git checkout [current_tor_browser_branch] -b [new_rebased_branch_name]` +- Execute the rebase helper script: `./git-tbrebase [target_firefox_branch]`. + Responsibilities of the script: + - Get the list of Tor Browser patches from `current_tor_browser_branch`. + - Check whether some of the patches are already in `target_firefox_branch` + (e.g. backports) and mark them to be skipped in that case. + - Move to `target_firefox_branch` (e.g. + `git reset --hard [target_firefox_branch]`) and apply patches. + - Keep a log of all the process in a way that it can be used as a "rebase + report" for the reviewer. + - This should include, among other things, the time needed for resolving + patch conflicts. + - For each conflict, show the bugzilla tickets responsible for it, based on + `git blame` on the conflicting lines. + - After resolving a patch conflict, ask the rebaser whether comments need to + be added, and make sure these are included in the "rebase report". + - If there are patches that require manual steps when rebasing (e.g. copying + nightly branding folder to alpha, etc.), stop and warn about it. + - There could be instructions encoded in the commit message using some + convention. + - Or maybe run some script automatically, similarly to git hooks. +- In case of conflict: + - Resolve manually. + - Check whether the commit message needs to be changed due to the conflict + resolution (e.g. a partially uplifted patch), and do so if needed. + - Run `./git-tbrebase --continue` to continue with the process (or `--skip` or + `--abort`, similarly to `git rebase`). + +2) Build +-------- + +Ideally, we should do a full tor-browser-build here. But: + +- These can take quite long, and are not incremental. +- The `tor-browser-build` toolchains might need changes for newer Firefox + versions. + +At this stage, it should be fine to do a local build and use a `repackage_tb` +script which takes the latest linux64 Tor Browser build and repackages it with +the locally built Tor Browser from `obj-x86_64-pc-linux-gnu`. + +Steps: + +- Copy `tor-launcher` master to `browser/extensions`. +- Make sure `torbutton` submodule is correctly loaded: + `git submodule update --init` +- Edit `.mozconfig` to set + - `ac_add_options --enable-tests` + - `ac_add_options --enable-debug` + - `ac_add_options --enable-tor-launcher` + - `ac_add_options --enable-tor-browser-update` +- Optionally, add + `ac_add_options --with-ccache=/home/user/.mozbuild/sccache/sccache` to use + `sccache` for speeding up subsequent builds. +- `./mach build && ./mach package` +- `./repackage_tb` + +At the end, there should be a `tor-browser-linux64-version_en-US.tar.xz` +artifact, which is the repackaged Tor Browser. + +3) Manual testing +----------------- + +This should ideally not be needed, but until everything is covered by automated +testing we can do a quick manual test to catch the most obvious breakage: + +- Launch the repackaged browser and check: + - Tor is launched correctly. + - `about:tor` is displayed with no errors + - `about:preferences` is not broken. + - It's possible to navigate to some website (e.g. duckduckgo search) + - The circuit display is working and displayed correctly. + +4) Automated testing +-------------------- + +There should be a single script that runs all tests, but for now let's +list the individual commands: + +- `./run-tbb-tests` should run the Tor Browser unit tests locally. +- + `./tor-browser-bundle-testsuite/tbb-testsuite --no-xdummy tor-browser-linux64-version_en-US.tar.xz` + should run the Tor Browser testsuite. +- `./mach lint` should check for linting errors. + +5) Debug/Fix +------------ + +For each issue found while running tests, debug and/or fix it, then iterate 2-5 +until no more test failures are found. + +For fixing up a commit, a script `./git-tbedit [commit]` should be used, so that +the time spent editing the patch is tracked and included in the rebase report. + +6) Push for review +------------------ + +In the ticket for the rebase work, the rebaser should add a reference to the +rebased branch that has to be reviewed, and a rebase report, which should +contain, for every Tor Browser commit in the original branch: + +``` +[SKIPPED|PICKED|CONFLICT][original_hash][commit_summary] + (optional) Total time editing commit: + (optional) Comments: + Some comments relevant for the reviewer. + (optional) Conflicts: + List of conflicting files. +``` + +Other +----- + +- Picking Tor Browser patches and changes that landed after the rebase started. + +The rebasing and reviewing process can last long enough for newer patches and +changes to have landed after the process started. + +Doing a full rebase with a later tor-browser branch would be too costly, so we +need to identify the changes that landed between the branch that was originally +rebased and the newer Tor Browser branch and only apply those. + +Until this is properly automated, a suggested manual approach is to do: + +`git range-diff original_starting_commit~1..original_ending_commit new_starting_commit~1..new_ending_commit`, +so basically doing a range-diff between the original set of patches that were +rebased, and a more up-to-date set of patches. Then, we should manually be able +to pick the missing changes, as fixup or squash commits. + +- Reordering/squashing patches + +We should not mix rebasing changes + fixing conflicts with patch reordering and +squashing. More concretely, it should be possible to check with +`git diff original_tb_branch..reordered_and_squashed_tb_branch` that the +reordered branch contents are equivalent to the previous branch. + +- Double-checking that no patch was accidentally lost in the process + +While this should not be possible if most of the process is properly automated, +it should not be very costly to double-check it. For this, there could be a +script that compares the current rebased branch with the latest tor-browser +branch, and shows the differences (comparing the set of commit messages).

1 0

[tor-browser-spec/master] Change torbutton fixup instructions in ReleaseProcess
by gk＠torproject.org 03 Jul '20

03 Jul '20

commit 031a48a9c00b24ac6d71649e892fd306713276ca Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jul 3 12:57:24 2020 +0200 Change torbutton fixup instructions in ReleaseProcess --- processes/ReleaseProcess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 1c2076e..563f263 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -7,7 +7,8 @@ # In particular: before tagging the tor-browser tag, the final code from # Torbutton needs to get included and in order to avoid unnecessary commit # inflation the commit for bumping the git submodule should be a fixup commit -# to the one with "Pick up latest Torbutton code" in its commit message. +# to the one with "Bug 25013: Add torbutton as a tor-browser submodule" in +# its commit message. #. Update changelog and relevant config files in tor-browser-build. cd tor-browser-build

1 0

[tor-browser-build/master] Fold in 9.5.1 Changelog
by gk＠torproject.org 01 Jul '20

01 Jul '20

commit 860a8a38dbca4c9e1ce21277f51860d194aec8d8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 1 10:19:19 2020 +0000 Fold in 9.5.1 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e9126c2..fd03cd1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -15,6 +15,19 @@ Tor Browser 10.0a2 -- June 30 2020 * Android * Bug 34372: Disable GeckoNetworkManager +Tor Browser 9.5.1 -- June 30 2020 + * All Platforms + * Update Firefox to 68.10.0esr + * Update NoScript to 11.0.32 + * Translations update + * Bug 40009: Improve tor's client auth stability + * Windows + OS X + Linux + * Bug 34361: "Prioritize .onion sites when known" appears under General + * Bug 34362: Improve Onion Service Authentication prompt + * Bug 34369: Fix learn more link in Onion Auth prompt + * Bug 34379: Fix learn more for Onion-Location + * Bug 34347: The Tor Network part on the onboarding is not new anymore + Tor Browser 10.0a1 -- June 2 2020 * All Platforms * Update Firefox to 68.9.0esr

1 0

[tor-browser-build/master] Release preparations for 10.0a2
by sysrqb＠torproject.org 26 Jun '20

26 Jun '20

commit a0cf2d77e652d2c5188c1e11b613d04e5d47da1b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jun 26 17:56:29 2020 +0000 Release preparations for 10.0a2 Versions bump and Changelog update. --- projects/firefox/config | 2 +- projects/tba-translation/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- rbm.conf | 4 ++-- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index a64763e..019dfc1 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.9.0 + firefox_platform_version: 68.10.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.0 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tba-translation/config b/projects/tba-translation/config index ab5c04e..520f570 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: d5bd416ac0cda30893e18f2eb511514bd2e698bd +git_hash: e93401f698cca39971395625e1f8de54b978ab88 version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 224248c..e9126c2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser 10.0a2 -- June 30 2020 + * All Platforms + * Update Firefox to 68.10.0esr + * Update NoScript to 11.0.32 + * Update Tor to 0.4.4.1-alpha + * Translations update + * Bug 34209: about:tor and about:tbupdate fail to load in debug build + * Bug 34250: Only listen to 'started' in noscript-control.js + * Bug 34383: Accept request if GetHost() in mixed content blocking check fails + * Windows + OS X + Linux + * Bug 34361: "Prioritize .onion sites when known" appears under General + * Bug 34362: Improve Onion Service Authentication prompt + * Bug 34369: Fix learn more link in Onion Auth prompt + * Bug 34379: Fix learn more for Onion-Location + * Android + * Bug 34372: Disable GeckoNetworkManager + Tor Browser 10.0a1 -- June 2 2020 * All Platforms * Update Firefox to 68.9.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 809bfa0..da6e40b 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,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: 99a70a78733fe7e21852f67bde090f6a57b5bdbd34ecbbdfcf481dc861965fd8 + sha256sum: 088c0b0f08529d88aacee3b1c09cfafe304b98cb2847c3fc255e05d1bf10bd6d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index 912f839..72d7a8a 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.3.5 +version: 0.4.4.1-alpha 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 d0afe9a..0ccfc9d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0a1' + torbrowser_version: '10.0a2' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a13 + - 10.0a1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Merge remote-tracking branch 'gk/bug_34372_v2' into tor-browser-68.9.0esr-10.0-1
by sysrqb＠torproject.org 26 Jun '20

26 Jun '20

commit 4a1c5a32c190b219c3c520a72710aa2ff7b5f3f5 Merge: a745de73db61 4912857cacd8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jun 26 18:30:04 2020 +0000 Merge remote-tracking branch 'gk/bug_34372_v2' into tor-browser-68.9.0esr-10.0-1 .../geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0