- tbb-commits - lists.torproject.org

[torbutton/master] Revert "Revert "Bug 28082: Add locales cs, el, hu, ka""
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit b9d1a5a7f2808f533d32ffab11ad7ddb566888ec Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 25 11:19:21 2018 +0000 Revert "Revert "Bug 28082: Add locales cs, el, hu, ka"" This reverts commit 8f1ff9017e9f793156d1edce38dde8cfcf590b2b. --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index d13f8259..8f562208 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[torbutton/master] Update translations
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit a62f5e98572d2dd6bcc5d7310dfbb431bcd6fec7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 09:44:57 2018 +0000 Update translations --- src/chrome/locale/fr/aboutTor.dtd | 20 +++++++++---------- src/chrome/locale/he/browserOnboarding.properties | 2 +- src/chrome/locale/ru/aboutTor.dtd | 2 +- src/chrome/locale/ru/browserOnboarding.properties | 2 +- src/chrome/locale/vi/aboutTor.dtd | 24 +++++++++++------------ src/chrome/locale/zh-TW/aboutTor.dtd | 16 +++++++-------- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 52c4d062..f373d753 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -27,16 +27,16 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor : l’union fait la force"> -<!ENTITY aboutTor.donationBanner.line2a "L’anonymat adore la compagnie"> -<!ENTITY aboutTor.donationBanner.line2b "Améliorer les droits de la personne."> -<!ENTITY aboutTor.donationBanner.line2c "Se lever pour la liberté."> -<!ENTITY aboutTor.donationBanner.line2d "Protéger la confidentialité de millions de personnes."> -<!ENTITY aboutTor.donationBanner.line2e "Garder Tor robuste."> -<!ENTITY aboutTor.donationBanner.line2f "On a besoin de votre soutien !"> +<!ENTITY aboutTor.donationBanner.line2a "L’anonymat est contagieux."> +<!ENTITY aboutTor.donationBanner.line2b "Promouvoir les droits universels de la personne."> +<!ENTITY aboutTor.donationBanner.line2c "Défendre la liberté."> +<!ENTITY aboutTor.donationBanner.line2d "Protéger la vie privée de millions de personnes."> +<!ENTITY aboutTor.donationBanner.line2e "Assurer la robustesse de Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Nous avons besoin de votre soutien !"> -<!ENTITY aboutTor.donationBanner.line3 "Donnez aujourd'hui, et Mozilla recevra votre donation."> +<!ENTITY aboutTor.donationBanner.line3 "Faites un don aujourd’hui et Mozilla fera un don équivalent."> -<!ENTITY aboutTor.donationBanner.buttonA "Donnez dès maintenant"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> +<!ENTITY aboutTor.donationBanner.buttonB "Comptez sur moi"> diff --git a/src/chrome/locale/he/browserOnboarding.properties b/src/chrome/locale/he/browserOnboarding.properties index 8865f0c8..13cb89ab 100644 --- a/src/chrome/locale/he/browserOnboarding.properties +++ b/src/chrome/locale/he/browserOnboarding.properties @@ -34,7 +34,7 @@ onboarding.tour-tor-expect-differences.button=ראה שאלות נפוצות onboarding.tour-tor-onion-services=שירותי בצל onboarding.tour-tor-onion-services.title=הייה אקסטרה מוגן. -onboarding.tour-tor-onion-services.description=שירותי בצל הם אתרים המסתיימים עם .onion המספק הגנות אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה שהתווספו נגד צנזורה. שירותי בצל מתירים לכל אחד לספק תוכן ושירותים באופן אלמוני. לחץ למטה כדי לבקר באתר הבצל DuckDuckGo. +onboarding.tour-tor-onion-services.description=שירותי בצל הם אתרים המסתיימים עם .onion המספקים הגנות אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה שהתווספו נגד צנזורה. שירותי בצל מתירים לכל אחד לספק תוכן ושירותים באופן אלמוני. לחץ למטה כדי לבקר באתר הבצל DuckDuckGo. onboarding.tour-tor-onion-services.button=בקר בבצל # Circuit Display onboarding. diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 30da9663..879d708e 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -39,4 +39,4 @@ <!ENTITY aboutTor.donationBanner.line3 "Пожертвуйте сегодня и Mozilla удвоит Ваше пожертвование."> <!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonB "Посчитайте"> diff --git a/src/chrome/locale/ru/browserOnboarding.properties b/src/chrome/locale/ru/browserOnboarding.properties index 1833487f..4e8e4a4a 100644 --- a/src/chrome/locale/ru/browserOnboarding.properties +++ b/src/chrome/locale/ru/browserOnboarding.properties @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=Для каждого посещ onboarding.tour-tor-circuit-display.button=Ваш цикл onboarding.tour-tor-security=Безопасность -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=Выберете свой опыт. onboarding.tour-tor-security.description=Мы также предоставляем вам дополнительные настройки для повышения безопасности вашего браузера. Наши Параметры Безопасности позволяют блокировать элементы, которые могут быть использованы для атаки вашего компьютера. Нажмите ниже, чтобы посмотреть, что делают разные функции. onboarding.tour-tor-security.button=Настройки Просмотра diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index b087f9ea..820d92c9 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Thông tin về Tor"> -<!ENTITY aboutTor.ready.label "Khám phá. Riêng tư."> +<!ENTITY aboutTor.ready.label "Truy cập Internet. Một cách riêng tư."> <!ENTITY aboutTor.ready2.label "Bạn đã sẵn sàng cho trải nghiệm duyệt web riêng tư nhất trên thế giới."> <!ENTITY aboutTor.failure.label "Có Lỗi Xảy Ra!"> <!ENTITY aboutTor.failure2.label "Tor không hoạt động trên trình duyệt này."> @@ -15,28 +15,28 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Những câu hỏi?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Xem qua Hướng dẫn Trình duyệt Tor »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Xem qua Hướng dẫn sử dụng trình duyệt Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn Trình duyệt Tor"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn sử dụng trình duyệt Tor"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project là một tổ chức phi lợi nhuận US 501(c)(3) của Hoa Kỳ thúc đẩy quyền con người và tự do bằng cách tạo và triển khai các công nghệ bảo mật và ẩn danh miễn phí và mã nguồn mở, hỗ trợ tính sẵn có và sử dụng không hạn chế của chúng và nâng cao hiểu biết khoa học và phổ biến của họ."> +<!ENTITY aboutTor.tor_mission.label "The Tor Project là một tổ chức phi lợi nhuận 501(c)(3) của Hoa Kỳ nhằm thúc đẩy quyền con người và tự do bằng cách tạo và triển khai các công nghệ đảm bảo quyền riêng tư và ẩn danh miễn phí và dựa trên mã nguồn mở, hỗ trợ tính sẵn có và sử dụng không hạn chế của chúng, và giúp phổ biến hơn nữa sự hiểu biết về tính khoa học của những công nghệ này đối với cộng đồng."> <!ENTITY aboutTor.getInvolved.label "Tham gia »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mói nhất từ Tor vào hộp thư của bạn."> +<!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mới nhất từ Tor được gửi tới hộp thư của bạn."> <!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Sức mạnh nằm ở Số lượng người tham gia mạng lưới"> -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Nâng cao nhân quyền phổ thông."> +<!ENTITY aboutTor.donationBanner.line2a "Việc ẩn danh cần sự đồng hành của cộng đồng"> +<!ENTITY aboutTor.donationBanner.line2b "Nâng cao phổ biến nhân quyền."> <!ENTITY aboutTor.donationBanner.line2c "Đứng lên vì tự do."> <!ENTITY aboutTor.donationBanner.line2d "Bảo vệ sự riêng tư của hàng triệu người."> <!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ."> -<!ENTITY aboutTor.donationBanner.line2f "Chúng toi cần sự hỗ trợ của bạn!"> +<!ENTITY aboutTor.donationBanner.line2f "Chúng tôi cần sự hỗ trợ của bạn!"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "Hãy đóng góp ngay hôm nay, và Mozilla sẽ đóng góp tương ứng với phần của bạn."> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Ngay bây giờ"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ"> +<!ENTITY aboutTor.donationBanner.buttonB "Hãy cho tôi tham gia"> diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index b08ffa26..a679ed55 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -4,14 +4,14 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "關於洋蔥路由"> +<!ENTITY aboutTor.title "關於 Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready.label "探索。隱密。"> <!ENTITY aboutTor.ready2.label "您已準備好使用全世界最私密的瀏覽體驗。"> <!ENTITY aboutTor.failure.label "發生錯誤！"> -<!ENTITY aboutTor.failure2.label "洋蔥路由無法在此瀏覽器中運作。"> +<!ENTITY aboutTor.failure2.label "Tor 無法在此瀏覽器中運作。"> -<!ENTITY aboutTor.search.label "用 DuckDuckGo 搜尋"> +<!ENTITY aboutTor.search.label "使用 DuckDuckGo 搜尋"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "有什麼問題？"> @@ -25,7 +25,7 @@ <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> <!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> @@ -34,9 +34,9 @@ <!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "我們需要您的支持"> +<!ENTITY aboutTor.donationBanner.line2f "我們需要您的支援！"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "今日您捐款，Mozilla 也會捐出相同數額。"> <!ENTITY aboutTor.donationBanner.buttonA "立刻捐款"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonB "我也要加入！">

1 0

[tor-browser-build/master] Bug 26697: Add Android toolchain
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit 10c58d9a2f9fc37f7ba3e1b7028d2b5a730b1e6f Author: sisbell <shane.isbell(a)gmail.com> Date: Thu Sep 27 20:44:56 2018 -0700 Bug 26697: Add Android toolchain --- projects/android-toolchain/build | 43 +++++++++++++++++++++++++++++++++++++++ projects/android-toolchain/config | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build new file mode 100644 index 0000000..325a543 --- /dev/null +++ b/projects/android-toolchain/build @@ -0,0 +1,43 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +export PROJECT_PATH=/var/tmp/dist/[% project %] +export SDK_HOME=$PROJECT_PATH/android-sdk-linux +export NDK_HOME=$PROJECT_PATH/android-ndk +export GRADLE_HOME=$PROJECT_PATH/gradle + +#Make directories +mkdir -p $NDK_HOME $SDK_HOME $GRADLE_HOME + +# Compiler Archives +unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME +unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME +unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME + +# NDK Archive +cd $NDK_HOME +mv android-ndk-r15c/* . +rm -fR android-ndk-r15c +./build/tools/make_standalone_toolchain.py --api 26 --arch arm --install-dir=./arm + +# Tool Archives +cd $SDK_HOME +unzip -qq $HOME/[% c("input_files_by_name/build_tools_26") %] -d $SDK_HOME +mkdir -p build-tools/26.0.2 +mv android-8.1.0/* build-tools/26.0.2 + +unzip -qq $HOME/[% c("input_files_by_name/platform_26") %] -d $SDK_HOME +mkdir -p platforms/android-26 +mv android-8.0.0/* platforms/android-26 + +unzip -qq $HOME/[% c("input_files_by_name/platform_tools_26") %] -d $SDK_HOME + +# Cleanup +rm -fR android-8.1.0 +rm -fR android-8.0.0 + +# Archive dist directory +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config new file mode 100644 index 0000000..122ae5f --- /dev/null +++ b/projects/android-toolchain/config @@ -0,0 +1,36 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: 26.0.2 +var: + container: + use_container: 1 + deps: + - unzip + - python + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] + export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux + export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk + export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + google_repo: https://dl.google.com/android/repository +input_files: + - project: container-image + - URL: '[% c("var/google_repo") %]/build-tools_r26.0.2-linux.zip' + name: build_tools_26 + sha256sum: a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce + - URL: '[% c("var/google_repo") %]/platform-26_r02.zip' + name: platform_26 + sha256sum: 2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a + - URL: '[% c("var/google_repo") %]/platform-tools_r26.0.2-linux.zip' + name: platform_tools_26 + sha256sum: 63b15a38c2b64e6ec8b54febe9f69fce5fe6c898c554c73b826b49daf7b52519 + - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' + name: android_sdk_tools + sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 + - URL: '[% c("var/google_repo") %]/android-ndk-r15c-linux-x86_64.zip' + name: android_ndk_compiler + sha256sum: f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c + - URL: http://services.gradle.org/distributions/gradle-4.1-bin.zip + name: gradle_bin + sha256sum: d55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43

1 0

[tor-launcher/master] Revert "Bug 28082: Add locales cs, el, hu, ka"
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 670882ad2936a906f3e2d84230714446e98a214c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 08:50:09 2018 +0000 Revert "Bug 28082: Add locales cs, el, hu, ka" This reverts commit 3aa20983122b4aaed6ae77cfc5bdb48107aa33a4. --- src/chrome/content/network-settings.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 1599c28..aaa91ac 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -306,21 +306,17 @@ function populateLocaleList(aLangPackAddons) "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", "ca" : "català", - "cs" : "\u010De\u0161tina", "da" : "Dansk", "de" : "Deutsch", - "el" : "\u03B5\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", "ga" : "Gaeilge (Irish)", "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", - "hu" : "Magyar nyelv", "id" : "bahasa Indonesia", "is" : "\u0355slenska", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", - "ka" : "\u10E5\u10D0\u10E0\u10D7\u10E3\u10DA\u10D8", "ko" : "\ud55c\uad6d\uc5b4", "nl" : "Nederlands", "nb" : "Norsk bokmå\u0345l",

1 0

[torbutton/master] Revert "Bug 28082: Add locales cs, el, hu, ka"
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 8f1ff9017e9f793156d1edce38dde8cfcf590b2b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 08:49:40 2018 +0000 Revert "Bug 28082: Add locales cs, el, hu, ka" This reverts commit c94a5589ffeabf71ea95c3c5c1a3396bdbe14da5. --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 8f562208..d13f8259 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[tor-browser-build/master] Revert "Bug 28082: Add locales cs, el, hu, ka"
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 6803d9a8a4e7c851629cab47342a6579a60f64cd Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 08:48:35 2018 +0000 Revert "Bug 28082: Add locales cs, el, hu, ka" This reverts commit fbb72c65a24ac70619062ebcd16c67a9afb4feae. --- rbm.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rbm.conf b/rbm.conf index 5e981ac..23f3598 100644 --- a/rbm.conf +++ b/rbm.conf @@ -53,21 +53,17 @@ var: locales: - ar - ca - - cs - da - de - - el - es-ES - fa - fr - ga-IE - he - - hu - id - is - it - '[% c("var/locale_ja") %]' - - ka - ko - nb-NO - nl

1 0

[tor-browser-build/master] Bug 27441: Add support for stretch in debootstrap-image
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 5cd65aaa478a41bd8c98a5405a5bf5b82256ca67 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Sep 25 10:32:39 2018 -0700 Bug 27441: Add support for stretch in debootstrap-image --- projects/debootstrap-image/config | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 10e2afe..5ee8c9a 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -3,7 +3,7 @@ filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/ar pkg_type: build var: - ubuntu_version: 16.04.3 + ubuntu_version: 18.04.1 container: use_container: 1 @@ -44,9 +44,13 @@ targets: container: suite: buster arch: amd64 + stretch-amd64: + var: + container: + suite: stretch + arch: amd64 input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2 - + sha256sum: ed76e649f65548a80b361b68011085ec4dde7bb762d667657acbef87765e1a12

1 0

[tor-browser-build/master] Bug 26696: Add definition for new platform in rbm.conf
by gk＠torproject.org 24 Oct '18

24 Oct '18

commit 51aae94ab13e575ddbcba0cff4dbb9c69c4a612e Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Sep 24 20:37:18 2018 -0700 Bug 26696: Add definition for new platform in rbm.conf --- rbm.conf | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/rbm.conf b/rbm.conf index 7f5dfa4..5e981ac 100644 --- a/rbm.conf +++ b/rbm.conf @@ -141,6 +141,27 @@ targets: # Don't create mar files to save time build_mar: 0 + torbrowser-android-armv7: + - android-armv7 + android-armv7: + arch: armv7 + var: + android: 1 + osname: android-armv7 + compiler: android-toolchain + snowflake: 0 + fteproxy: 0 + container: + suite: stretch + arch: amd64 + deps: + - build-essential + - python + - bison + - automake + - libtool + - zip + - unzip torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser-build/master] Backout patch for #27827 for Linux build bustage
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit 2b270ede9341f8ce496e811f7af9077e3eed9049 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 10:58:24 2018 +0000 Backout patch for #27827 for Linux build bustage --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 - rbm.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3b699d5..38b0b9a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,7 +21,6 @@ Tor Browser 8.5a4 -- October 23 2018 * Bug 28002: Fix the precomplete file in the en-US installer * OS X * Bug 26263: App icon positioned incorrectly in macOS DMG installer window - * Bug 27827: Fix snowflake reproducibility issues * Bug 26475: Fix Stylo related reproducibilitiy issue * Linux * Bug 26475: Fix Stylo related reproducibilitiy issue diff --git a/rbm.conf b/rbm.conf index b68c80a..7f5dfa4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a3 project_name: tor-browser

1 0

[tor-browser-build/master] Revert "Merge remote-tracking branch 'dcf/bug_27827'"
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit 4ae6ba4f9d62113a818e706f63a8c3fb9c011e06 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 10:55:55 2018 +0000 Revert "Merge remote-tracking branch 'dcf/bug_27827'" This reverts commit 889be4318d80f11f2b5b2b845ab11868149c48f1, reversing changes made to d8ce7fca64a15cf9b71f7685ef2a8f36dae6a21a. The patch for bug 27827 leads to a busted Linux build. --- projects/go/config | 4 ++-- projects/snowflake/build | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/projects/go/config b/projects/go/config index 1841705..2a3b1ad 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.11.1 +version: 1.8.3 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -84,7 +84,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 + sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/snowflake/build b/projects/snowflake/build index a66a1e9..f3616f4 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -30,13 +30,32 @@ cd client [% IF c("var/osx") -%] # Without faketime, snowflake-client would contain the timestamp of the # temporary client.a file created during "go build". - # The -tmpdir flag overrides what would otherwise be a randomly generated - # path, /tmp/go-link-RANDOMNUM/go.o. - mkdir -p /var/tmp/go-link.tmpdir - [% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir' + [% c("var/faketime") %] go build -ldflags '-s' [% ELSE -%] go build -ldflags '-s' [% END -%] +[% IF c("var/osx") -%] + # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 + # on Darwin embeds such paths and the issue is unsolved in upstream Go as of + # 2016-06-28: + # https://github.com/golang/go/issues/9206#issuecomment-310476743 + # The two kinds of paths are ("000000000" stands for 9 random digits): + # /tmp/go-build000000000 + # /tmp/go-link-000000000 + # Such paths are the output of ioutil.TempDir("", "go-build") and + # ioutil.TempDir("", "go-link-"). + cp -a client client.stomped + sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped + # Sanity check: make sure the file actually changed. If it did not, it could + # mean that a change in go or clang has made this step unnecessary. + if cmp client client.stomped + then + echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." + echo "Check projects/snowflake/build" + exit 1 + fi + mv -f client.stomped client +[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd ..

1 0