- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40133: Bump Rust version for ESR 78 to 1.43.0
by sysrqb＠torproject.org 20 Oct '20

20 Oct '20

commit 79e1bd00f2e2cc35e0670b30c649eb5c4b24a0ff Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 19 10:57:14 2020 +0000 Bug 40133: Bump Rust version for ESR 78 to 1.43.0 --- projects/rust/config | 4 ++-- projects/rust/unwind.patch | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/projects/rust/config b/projects/rust/config index 4d4cd51..af94f05 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -5,8 +5,8 @@ version: '[% c("input_file_var/rust_version") %]' # Those values can be changed from the input_files section of other # projects. See bug 32436. input_file_var: - rust_version: 1.41.1 - prev_version: 1.40.0 + rust_version: 1.43.0 + prev_version: 1.42.0 var: prev_version: '[% c("input_file_var/prev_version") %]' diff --git a/projects/rust/unwind.patch b/projects/rust/unwind.patch index c25d9d2..65c51f9 100644 --- a/projects/rust/unwind.patch +++ b/projects/rust/unwind.patch @@ -1,4 +1,4 @@ -From 212ea02a0743a3bd4fcab1288682d3d780da960b Mon Sep 17 00:00:00 2001 +From 90ddcca6235b5f24c57df6a648e8d489c7e3eae5 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard <bjorn(a)neersighted.com> Date: Sat, 9 Feb 2019 19:39:23 +0000 Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux @@ -32,10 +32,10 @@ rethinking of how iOS is special-cased above, to avoid further duplication. Input on how to best structure this file is requested. diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index 831053bc0f7..13ec5da3e3d 100644 +index 65a00db3394..e821507c341 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs -@@ -208,6 +208,11 @@ pub fn std_cargo(builder: &Builder<'_>, +@@ -207,6 +207,11 @@ pub fn std_cargo(builder: &Builder<'_>, target: Interned<String>, cargo: &mut Ca let mut features = builder.std_features(); features.push_str(&compiler_builtins_c_feature); @@ -44,14 +44,14 @@ index 831053bc0f7..13ec5da3e3d 100644 + features.push_str(" sjlj_eh"); + } + - if compiler.stage != 0 && builder.config.sanitizers { - // This variable is used by the sanitizer runtime crates, e.g. - // rustc_lsan, to build the sanitizer runtime from C code + cargo + .arg("--features") + .arg(features) diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml -index a22e162bbff..e1c8f164916 100644 +index b147aa55b2a..cad4d88caa2 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml -@@ -78,6 +78,7 @@ panic_immediate_abort = ["core/panic_immediate_abort"] +@@ -68,6 +68,7 @@ panic_immediate_abort = ["core/panic_immediate_abort"] # https://github.com/rust-lang/stdarch/blob/master/crates/std_detect/Cargo.to… std_detect_file_io = [] std_detect_dlsym_getauxval = [] @@ -78,12 +78,12 @@ index 77bcfffd506..9d9fc5fbff5 100644 llvm-libunwind = [] +sjlj_eh = [] diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs -index 0b39503c0d0..ec8681c2985 100644 +index 0c57861f70a..44c767ebfc5 100644 --- a/src/libunwind/libunwind.rs +++ b/src/libunwind/libunwind.rs -@@ -74,8 +74,8 @@ pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reaso - any(target_os = "fuchsia", target_os = "linux")), - link(name = "unwind", kind = "static"))] +@@ -79,8 +79,8 @@ pub type _Unwind_Exception_Cleanup_Fn = + link(name = "unwind", kind = "static") + )] extern "C" { - #[unwind(allowed)] - pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; @@ -92,7 +92,7 @@ index 0b39503c0d0..ec8681c2985 100644 pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void; pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr; -@@ -216,32 +216,50 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm +@@ -222,32 +222,50 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm } // cfg_if! cfg_if::cfg_if! { @@ -159,5 +159,5 @@ index 0b39503c0d0..ec8681c2985 100644 } // cfg_if! -- -2.27.0 +2.28.0

1 0

[tor-browser-build/master] ChangeLog fixups
by sysrqb＠torproject.org 20 Oct '20

20 Oct '20

commit 6067db2246f06bf387d147581a29e21af902b548 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Oct 20 13:48:41 2020 +0000 ChangeLog fixups --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 997646b..a95a67d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -100,7 +100,6 @@ Tor Browser 10.0a8 -- October 8 2020 * Bug 40014: Set correct default Security Level [android-components] * Bug 40015: Modify Fenix Home Menu [fenix] * Bug 40016: Modify Fenix Settings Menu [fenix] - * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] * Bug 40018: Disable Push functionality [fenix] * Bug 40019: Ensure missing Adjust token does not throw an exception [fenix] @@ -141,7 +140,6 @@ Tor Browser 10.0a8 -- October 8 2020 * Bug 40098: Initialize torbutton for Geckoview and make sure its features work as expected in Fenix [tor-browser] * Bug 40112: Check that caching stylesheets per document group adheres to FPI [tor-browser] * Bug 40119: Update Fenix dependencies for 81.1.2 [fenix] - * Bug 40124: Implement Network settings [fenix] * Bug 40125: Geckoview: Expose security level interface [tor-browser] * Bug 40172: Security UI not updated for non-https .onion pages in Fenix [tor-browser] * Bug 40173: Initialize security_slider in GeckoView at 4 [tor-browser] @@ -268,7 +266,6 @@ Tor Browser 10.0 -- September 22 2020 * Bug 40006: Fix new identity for 81 [torbutton] * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton] * Bug 40008: Style fixes for 78 [torbutton] - * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] * Bug 40022: Update new icons in Tor Browser branding [tor-browser] * Bug 40025: Revert add-on permissions due to Mozilla's 1560059 [tor-browser]

1 0

[tor-browser-build/maint-10.0] Changelog fixups
by sysrqb＠torproject.org 20 Oct '20

20 Oct '20

commit 34ee0c92ab6efbc34b15646d5e4e081be5a6c286 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Oct 20 13:45:25 2020 +0000 Changelog fixups --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 8e7181b..99e54bb 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,10 +2,10 @@ Tor Browser 10.0.2 -- October 20 2020 * Windows + OS X + Linux * Update Firefox to 78.4.0esr * Update NoScript to 11.1.3 - * Bug 40192: Backport Mozilla Bug 1658881 + * Bug 40192: Backport Mozilla Bug 1658881 [tor-browser] * Translations update * Linux - * Bug 40193: Add `AT_EMPTY_PATH` definition + * Bug 40193: Add `AT_EMPTY_PATH` definition [tor-browser] Tor Browser 10.0.1 -- October 13 2020 * Windows + OS X + Linux @@ -24,7 +24,7 @@ Tor Browser 10.0.1 -- October 13 2020 * Bump Go to 1.14.9 * Bump openssl to 1.1.1h * Windows - * Bug 40051: Remove SOURCE_DATE_EPOCH patch [tor-browser-build] + * Bug 40051: Remove SOURCE_DATE_EPOCH patch [tor-browser-build] Tor Browser 10.0 -- September 22 2020 * Windows + OS X + Linux @@ -76,7 +76,6 @@ Tor Browser 10.0 -- September 22 2020 * Bug 40006: Fix new identity for 81 [torbutton] * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton] * Bug 40008: Style fixes for 78 [torbutton] - * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] * Bug 40022: Update new icons in Tor Browser branding [tor-browser] * Bug 40025: Revert add-on permissions due to Mozilla's 1560059 [tor-browser]

1 0

[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