October 2020 - tbb-commits - lists.torproject.org

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 2 commits: Bug 40088: Use Tor Browser logo in migration screen
by Matthew Finkel 19 Oct '20

19 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: cb13557d by Alex Catarineu at 2020-10-18T23:40:01+02:00 Bug 40088: Use Tor Browser logo in migration screen - - - - - 67007f53 by Matthew Finkel at 2020-10-19T20:08:04+00:00 Merge remote-tracking branch 'acatgl/40088' into tor-browser-82.0.0b4-10.0-1 - - - - - 1 changed file: - app/src/main/res/layout/activity_migration.xml Changes: ===================================== app/src/main/res/layout/activity_migration.xml ===================================== @@ -35,7 +35,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/migration_welcome_title" app:layout_constraintTop_toTopOf="@+id/migration_welcome_title" - app:srcCompat="@drawable/ic_firefox" /> + app:srcCompat="@mipmap/ic_launcher" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/migration_welcome_title" View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/5b768f331552… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/5b768f331552… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 2 commits: fixup! Bug 40028: Implement new home screen
by Matthew Finkel 19 Oct '20

19 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: 4666fc3c by Alex Catarineu at 2020-10-19T16:56:35+02:00 fixup! Bug 40028: Implement new home screen Fixes #40076: "Explore privately" not visible entirely in French - - - - - 5b768f33 by Matthew Finkel at 2020-10-19T20:01:47+00:00 Merge remote-tracking branch 'acatgl/40076' into tor-browser-82.0.0b4-10.0-1 - - - - - 2 changed files: - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/res/layout/fragment_home.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -192,6 +192,15 @@ class HomeFragment : Fragment() { val activity = activity as HomeActivity val components = requireComponents + // Splits by full stops or commas and puts the parts in different lines. + // Ignoring separators at the end of the string, it is expected + // that there are at most two parts (e.g. "Explore. Privately.").. + view.exploreprivately.text = view + .exploreprivately + .text + ?.replace(" *([.,。।]) *".toRegex(), "$1\n") + ?.trim() + currentMode = CurrentMode( view.context, onboarding, ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -84,8 +84,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center|center_vertical" - android:width="199dp" - android:height="110dp" + android:gravity="center_horizontal" android:clickable="false" android:ellipsize="end" android:focusable="false" View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/77e2f0c7b28c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/77e2f0c7b28c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/maint-10.0] Bump Go to 1.14.10
by gk＠torproject.org 19 Oct '20

19 Oct '20

commit d1b39e88923000fb18e730a8a7d1a4ad4d507807 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 19 06:32:57 2020 +0000 Bump Go to 1.14.10 --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 02525e7..5a18dd8 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.14.9 +version: 1.14.10 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: c687c848cc09bcabf2b5e534c3fc4259abebbfc9014dd05a1a2dc6106f404554 + sha256sum: b37699a7e3eab0f90412b3969a90fd072023ecf61e0b86369da532810a95d665 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bump for build4
by sysrqb＠torproject.org 19 Oct '20

19 Oct '20

commit 253966c96da51b913c8530972351b60acf66f005 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Oct 19 01:23:03 2020 +0000 Bump for build4 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 461cced..bc8c3ea 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.5a2' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 10.5a1 project_name: tor-browser

1 0

[tor-browser-build/master] Correct Go sha256sum
by sysrqb＠torproject.org 19 Oct '20

19 Oct '20

commit d9e9e481e0fd284f1c66e2957390ae00d9a0d5d5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Oct 19 00:38:44 2020 +0000 Correct Go sha256sum --- projects/go/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/go/config b/projects/go/config index 35cbce6..5a18dd8 100644 --- a/projects/go/config +++ b/projects/go/config @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 343346686c5372718dbd0a9fd5af422a28a45804e24405e23f8e632eeb55608e + sha256sum: b37699a7e3eab0f90412b3969a90fd072023ecf61e0b86369da532810a95d665 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bug 40051: Remove SOURCE_DATE_EPOCH patch
by sysrqb＠torproject.org 18 Oct '20

18 Oct '20

commit bdc0ef41c5d16a0ce8d0c625eb1e4501fb8808db Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Oct 18 21:04:32 2020 +0000 Bug 40051: Remove SOURCE_DATE_EPOCH patch The patch was removed as an input file during the release prep version bump. --- projects/openssl/build | 3 --- projects/openssl/use-SOURCE_DATE_EPOCH.patch | 25 ------------------------- 2 files changed, 28 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 63ea178..f8c4cbf 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -13,9 +13,6 @@ export CC='gcc -m32' ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] -[% IF c("var/windows") -%] - patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch -[% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] make diff --git a/projects/openssl/use-SOURCE_DATE_EPOCH.patch b/projects/openssl/use-SOURCE_DATE_EPOCH.patch deleted file mode 100644 index 65533bb..0000000 --- a/projects/openssl/use-SOURCE_DATE_EPOCH.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a1625535fc5127ab8e94043280ef7a983bcfc161 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Thu, 5 Mar 2020 20:39:05 +0100 -Subject: [PATCH] If SOURCE_DATE_EPOCH is defined, use it for copyright year - -Using the date from SOURCE_DATE_EPOCH instead of the current date makes -it possible to reproduce a build that was built on a different year: -https://reproducible-builds.org/specs/source-date-epoch/ ---- - util/mkrc.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/mkrc.pl b/util/mkrc.pl -index 6762bc4a56..e15c071af7 100755 ---- a/util/mkrc.pl -+++ b/util/mkrc.pl -@@ -46,7 +46,7 @@ if ( $filename =~ /openssl/i ) { - $vft = "VFT_APP"; - } - --my $YEAR = [localtime()]->[5] + 1900; -+my $YEAR = [localtime($ENV{SOURCE_DATE_EPOCH} || time())]->[5] + 1900; - print <<___; - #include <winver.h> -

1 0

[tor-browser-build/master] Pick up tor-browser build2
by sysrqb＠torproject.org 18 Oct '20

18 Oct '20

commit 26713a6635a535eea5e741da0ad6ab3c09e8b0b2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Oct 18 21:11:58 2020 +0000 Pick up tor-browser build2 --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 91c8a44..f028be5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # 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-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 5fc8843..461cced 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.5a2' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 10.5a1 project_name: tor-browser

1 0

[tor-browser/tor-browser-78.4.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 18 Oct '20

18 Oct '20

commit 38faf8d45d8d991e80982f11bef0d57431bfc4d7 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 18 20:33:50 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 0675516fdb00..ad7c0b884586 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 0675516fdb00677d5a1f8d8b0f1c9e55246d10de +Subproject commit ad7c0b884586f5d1f3cc8e9223ae806f77ca05af

1 0

[tor-browser-build/master] Move OpenSSL in ChangeLog, tag build2
by sysrqb＠torproject.org 18 Oct '20

18 Oct '20

commit 2a1385c77f8025cea91f013140fd4c6bb53c6bb0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Oct 18 18:59:50 2020 +0000 Move OpenSSL in ChangeLog, tag build2 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 531c6b4..997646b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 10.5a2 -- October 20 2020 * Windows + OS X + Linux * Update Firefox to 78.4.0esr * Update NoScript to 11.1.3 + * Update OpenSSL to 1.1.1h * Update Tor Launcher to 0.2.26 * Translations update * Bug 31767: Avoid using intl.locale.requested preference directly @@ -20,7 +21,6 @@ Tor Browser 10.5a2 -- October 20 2020 * Build System * Windows + OS X + Linux * Update Go to 1.14.10 - * Update OpenSSL to 1.1.1h * Bug 40104: Use our TMPDIR when creating our .mar files [tor-browser-build] * Linux * Bug 40118: Add missing libdrm dev package to firefox container [tor-browser-build] diff --git a/rbm.conf b/rbm.conf index 2617fb8..5fc8843 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.5a2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.5a1 project_name: tor-browser

1 0

[tor-browser-build/master] Release preparations for 10.5a2
by sysrqb＠torproject.org 18 Oct '20

18 Oct '20

commit 40468961309db4dd71a4f6ef4c26f2e273f2dac0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Oct 18 02:46:56 2020 +0000 Release preparations for 10.5a2 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/go/config | 4 +-- projects/openssl/config | 6 ++--- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 31 ++++++++++++++++++++++ projects/tor-browser/config | 4 +-- projects/tor-launcher/config | 2 +- rbm.conf | 6 ++--- 8 files changed, 43 insertions(+), 14 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox/config b/projects/firefox/config index a099d45..91c8a44 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.3.0 + firefox_platform_version: 78.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.5 branding_directory: 'browser/branding/alpha' diff --git a/projects/go/config b/projects/go/config index 24ab09a..35cbce6 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.14.7 +version: 1.14.10 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 064392433563660c73186991c0a315787688e7c38a561e26647686f89b6c30e3 + sha256sum: 343346686c5372718dbd0a9fd5af422a28a45804e24405e23f8e632eeb55608e - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/openssl/config b/projects/openssl/config index 91b0f1c..45b4fd6 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1g +version: 1.1.1h filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -31,6 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 - - filename: use-SOURCE_DATE_EPOCH.patch - enable: '[% c("var/windows") %]' + sha256sum: 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e33a54d..531c6b4 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,34 @@ +Tor Browser 10.5a2 -- October 20 2020 + * Windows + OS X + Linux + * Update Firefox to 78.4.0esr + * Update NoScript to 11.1.3 + * Update Tor Launcher to 0.2.26 + * Translations update + * Bug 31767: Avoid using intl.locale.requested preference directly + * Bug 33954: Consider different approach for Bug 2176 + * Bug 40011: Rename tor-browser-brand.ftl to brand.ftl [torbutton] + * Bug 40012: Fix about:tor not loading some images in 82 [torbutton] + * Bug 40013: End of year 2020 Fundraising campaign [torbutton] + * Bug 40016: Fix onion pattern for LTR locales [torbutton] + * Bug 40139: Update Onboarding icon for 10.0 [tor-browser] + * Bug 40148: Disable Picture-in-Picture until we investigate and possibly fix it [tor-browser] + * Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots [tor-browser] + * Bug 40192: Backport Mozilla Bug 1658881 [tor-browser] + * Translations update + * Windows + * Bug 40140: Videos stop working with Tor Browser 10.0 on Windows [tor-browser] + * Build System + * Windows + OS X + Linux + * Update Go to 1.14.10 + * Update OpenSSL to 1.1.1h + * Bug 40104: Use our TMPDIR when creating our .mar files [tor-browser-build] + * Linux + * Bug 40118: Add missing libdrm dev package to firefox container [tor-browser-build] + * Windows + * Bug 34360: Bump binutils to 2.35.1 + * Bug 40051: Remove SOURCE_DATE_EPOCH patch [tor-browser-build] + * Bug 40131: Remove unused binutils patches [tor-browser-build] + Tor Browser 10.0.1 -- October 13 2020 * Windows + OS X + Linux * Update NoScript to 11.1.1 diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 8bb1a67..8b201f8 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -77,9 +77,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: 3b768fa45f94bed9c58962bd7c0c11bc431e639aeedb2e91c7d8303df5fc84ae + sha256sum: 08543e4a03e0becacd10c3cdbf5eaab1ff35a1648babe6f1522ae335e21de7d4 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index f8828db..0c9698a 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.25 +version: 0.2.26 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index aeb089e..2617fb8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.5a1' - torbrowser_build: 'build2' + torbrowser_version: '10.5a2' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.0a7 + - 10.5a1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0