April 2021 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40291: Correctly print the fenix minSdkVersion
by sysrqb＠torproject.org 30 Apr '21

30 Apr '21

commit 140a3aa26aead876fa7db60ea723ba99d45bfcfe Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 28 10:52:11 2021 +0200 Bug 40291: Correctly print the fenix minSdkVersion --- projects/fenix/list_toolchain_updates_checks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fenix/list_toolchain_updates_checks b/projects/fenix/list_toolchain_updates_checks index 43dd1b4..1b8e02c 100644 --- a/projects/fenix/list_toolchain_updates_checks +++ b/projects/fenix/list_toolchain_updates_checks @@ -45,7 +45,7 @@ if (m/const\\s+val\\s+minSdkVersion\\s+=\\s+([^"]+)/) { EOF needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p") current=21 -check_update_needed compileSdkVersion "$needed" "$current" +check_update_needed minSdkVersion "$needed" "$current" # gradle

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40291'
by sysrqb＠torproject.org 30 Apr '21

30 Apr '21

commit bc6519bab313267581dee0c586621e2fe3c2f9f5 Merge: 3f77bdc 140a3aa Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 30 16:39:41 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40291' projects/fenix/list_toolchain_updates_checks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 40285: Make projects/container-image use origin_step
by sysrqb＠torproject.org 30 Apr '21

30 Apr '21

commit 1973054e2f232f46dfcf99645c6e58c1f46ed051 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 21 18:50:46 2021 +0200 Bug 40285: Make projects/container-image use origin_step --- projects/container-image/config | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/projects/container-image/config b/projects/container-image/config index e1274f2..721da60 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -5,8 +5,8 @@ pkg_type: build var: container: use_container: 1 - suite: '[% pc(c("origin_project"), "var/container/suite") %]' - arch: '[% pc(c("origin_project"), "var/container/arch") %]' + suite: '[% pc(c("origin_project"), "var/container/suite", { step => c("origin_step") }) %]' + arch: '[% pc(c("origin_project"), "var/container/arch", { step => c("origin_step") }) %]' lsb_release: id: Debian @@ -31,8 +31,8 @@ pre: | # Update the package cache so the container installs the most recent # version of required packages. apt-get update -y -q - [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] - [% pc(c('origin_project'), 'var/pre_pkginst') %] + [% IF pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) -%] + [% pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) %] # Update the package cache again because `pre_pkginst` may change the # package manager configuration. apt-get update -y -q @@ -40,14 +40,14 @@ pre: | apt-get upgrade -y -q [% deps = []; - IF pc(c('origin_project'), 'var/deps'); - CALL deps.import(pc(c('origin_project'), 'var/deps')); + IF pc(c('origin_project'), 'var/deps', { step => c('origin_step') }); + CALL deps.import(pc(c('origin_project'), 'var/deps', { step => c('origin_step') })); END; - IF pc(c('origin_project'), 'var/arch_deps'); - CALL deps.import(pc(c('origin_project'), 'var/arch_deps')); + IF pc(c('origin_project'), 'var/arch_deps', { step => c('origin_step') }); + CALL deps.import(pc(c('origin_project'), 'var/arch_deps', { step => c('origin_step') })); END; IF deps.size; - IF pc(c('origin_project'), 'var/sort_deps'); + IF pc(c('origin_project'), 'var/sort_deps', { step => c('origin_step') }); deps = deps.sort; END; FOREACH pkg IN deps; @@ -59,8 +59,8 @@ pre: | END; END; -%] - [% IF pc(c('origin_project'), 'var/post_pkginst') -%] - [% pc(c('origin_project'), 'var/post_pkginst') %] + [% IF pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) -%] + [% pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) %] [% END -%] remote_get: |

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40271_v4'
by sysrqb＠torproject.org 30 Apr '21

30 Apr '21

commit 3f77bdc701a1d1edc513a93edb8e940532e514ab Merge: 4545059 e2f729a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 30 16:38:02 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40271_v4' Makefile | 15 +++++++++++++++ projects/application-services/config | 17 ++++++++++++++--- projects/cbindgen/config | 9 +++++++++ projects/container-image/config | 22 +++++++++++----------- projects/lucetc/config | 10 ++++++++-- projects/uniffi-rs/config | 9 ++++++++- rbm.conf | 30 ++++++++++++++++++++++++++++++ 7 files changed, 95 insertions(+), 17 deletions(-)

1 0

[tor-browser-build/master] Bug 40271: Improve process to generate rust vendor tarballs
by sysrqb＠torproject.org 30 Apr '21

30 Apr '21

commit e2f729af199613ae593947cf6c64235f3dbf90a0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 21 17:23:40 2021 +0200 Bug 40271: Improve process to generate rust vendor tarballs --- Makefile | 15 +++++++++++++++ projects/application-services/config | 17 ++++++++++++++--- projects/cbindgen/config | 9 +++++++++ projects/lucetc/config | 10 ++++++++-- projects/uniffi-rs/config | 9 ++++++++- rbm.conf | 30 ++++++++++++++++++++++++++++++ 6 files changed, 84 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1d16fa4..94010c1 100644 --- a/Makefile +++ b/Makefile @@ -228,6 +228,21 @@ get_gradle_dependencies_list-application-services: submodule-update get_gradle_dependencies_list-android-components: submodule-update $(rbm) build android-components --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 +cargo_vendor-application-services: submodule-update + $(rbm) build application-services --step cargo_vendor --target nightly + +cargo_vendor-cbindgen-android: submodule-update + $(rbm) build cbindgen --step cargo_vendor --target nightly --target android + +cargo_vendor-cbindgen: submodule-update + $(rbm) build cbindgen --step cargo_vendor --target nightly + +cargo_vendor-lucetc: submodule-update + $(rbm) build lucetc --step cargo_vendor --target nightly + +cargo_vendor-uniffi-rs: submodule-update + $(rbm) build uniffi-rs --step cargo_vendor --target nightly + submodule-update: git submodule update --init diff --git a/projects/application-services/config b/projects/application-services/config index 456ce87..ba5acc1 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -79,9 +79,7 @@ input_files: - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2 sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2 enable: '[% !c("var/fetch_gradle_dependencies") %]' - # `cargo vendor vendor -s components/external/nimbus-sdk/nimbus/Cargo.toml` - # in the `application-services` directory has vendored the sources, - # after applying update-cargo-lock.patch and viaduct-workaround.patch + # Use `make cargo_vendor-application-services` to re-generate the vendor tarball - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-v… c('var/rust_vendor_version') %].tar.bz2 sha256sum: 5f1c9e1bc0db283e88516bd1d78187145bacbf4aeb72972ac09875c1147d2215 - filename: no-git.patch @@ -106,3 +104,16 @@ steps: get_gradle_dependencies_list: '[% INCLUDE build %]' var: fetch_gradle_dependencies: 1 + + cargo_vendor: + filename: '[% project %]-vendor-[% c("version") %].tar.bz2' + var: + cargo_vendor_opts: '-s components/external/nimbus-sdk/nimbus/Cargo.toml' + pre_cargo_vendor: | + patch -p1 < $rootdir/update-cargo-lock.patch + patch -d components/external/nimbus-sdk -p1 < $rootdir/viaduct-workaround.patch + input_files: + - project: container-image + pkg_type: build + - filename: viaduct-workaround.patch + - filename: update-cargo-lock.patch diff --git a/projects/cbindgen/config b/projects/cbindgen/config index a4e9cb7..43c2fb8 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -23,5 +23,14 @@ input_files: - name: rust project: rust # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources. + # Use `make cargo_vendor-cbindgen` or `make cargo_vendor-cbindgen-android` + # (for the Android version) to re-generate the vendor tarball - URL: https://people.torproject.org/~gk/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 sha256sum: '[% c("var/cbindgen_vendor_hash") %]' + +steps: + cargo_vendor: + filename: '[% project %]-vendor-[% c("version") %].tar.bz2' + input_files: + - project: container-image + pkg_type: build diff --git a/projects/lucetc/config b/projects/lucetc/config index 0007201..1177b4f 100644 --- a/projects/lucetc/config +++ b/projects/lucetc/config @@ -27,8 +27,14 @@ input_files: project: rust - name: wasi-sysroot project: wasi-sysroot - # `cargo vendor vendor` in the `lucetc-sandbox-compiler` directory has vendored - # the sources. + # Use `make cargo_vendor-lucetc` to re-generate the vendor tarball - URL: https://people.torproject.org/~gk/mirrors/sources/lucetc-vendor.tar.bz2 sha256sum: 12ba97fca12177e7ed5b5409fcfdbd31dc7db2e82282768d99dee5bcb1b1246a - filename: Remove-march-native-from-COMMON_CFLAGS.patch + +steps: + cargo_vendor: + filename: '[% project %]-vendor-[% c("version") %].tar.bz2' + input_files: + - project: container-image + pkg_type: build diff --git a/projects/uniffi-rs/config b/projects/uniffi-rs/config index acd9d2d..c8ad51c 100644 --- a/projects/uniffi-rs/config +++ b/projects/uniffi-rs/config @@ -12,7 +12,14 @@ input_files: - project: container-image - name: rust project: rust - # `cargo vendor vendor` in the `uniffi-rs` directory has vendored the sources. + # Use `make cargo_vendor-uniffi-rs` to re-generate the vendor tarball - URL: https://people.torproject.org/~boklm/mirrors/sources/uniffi-rs-vendor-[% c('version') %].tar.bz2 sha256sum: 8f201df618b3e7bcaaf01a87e0d55171605b80abeb1b660fe4dd0b9bfc10a0d8 - filename: btreeset.patch + +steps: + cargo_vendor: + filename: '[% project %]-vendor-[% c("version") %].tar.bz2' + input_files: + - project: container-image + pkg_type: build diff --git a/rbm.conf b/rbm.conf index a7023f2..ec38441 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,40 @@ steps: set -e mkdir -p '[% dest_dir %]' mv -vf '[% project %]-[% c("version") %].tar.xz' '[% dest_dir %]/[% c("filename") %]' + list_toolchain_updates: build_log: '-' list_toolchain_updates: '[% INCLUDE list_toolchain_updates %]' + cargo_vendor: + output_dir: "out/[% project %]/cargo_vendor" + var: + container: + suite: buster + arch: amd64 + pre_pkginst: '' + deps: + - cargo + - patch + cargo_vendor: | + #!/bin/bash + [% c("var/set_default_env") %] + tar -xf [% project %]-[% c('version') %].tar.gz + cd [% project %]-[% c('version') %] + [% c("var/pre_cargo_vendor") %] + cargo vendor vendor [% c("var/cargo_vendor_opts") %] + [% c('tar', { + tar_src => [ 'vendor' ], + tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), + }) %] + cd [% dest_dir %] + fname="out/[% project %]/cargo_vendor/[% c('filename') %]" + echo + echo "Finished creating $fname" + sha256sum "[% c('filename') %]" + echo "You can upload it with:" + echo " scp -p $fname people.torproject.org:public_html/mirrors/sources" + # buildconf contains build options that the user can change in rbm.local.conf # When adding a new option to buildconf, a default value should be defined # in var/build_id, so that changing this option does not affect the build_id.

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40283'
by sysrqb＠torproject.org 30 Apr '21

30 Apr '21

commit 45450596db474b382c96511dabaf3f578f9cb2a7 Merge: a612f50 8345837 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 30 16:16:39 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40283' README | 7 +++---- README.BUILD_ERRORS => doc/BUILD_ERRORS.txt | 0 README.HACKING => doc/HACKING.txt | 0 README.MAKEFILE => doc/MAKEFILE.txt | 0 .../common => doc}/how-to-create-gradle-dependencies-list.txt | 0 {projects/common => doc}/how-to-update-glean-parser.txt | 0 doc/rbm | 1 + projects/android-components/gradle-dependencies-list.txt | 2 +- projects/application-services/gradle-dependencies-list.txt | 2 +- projects/common/gen_gradle_deps_file.sh | 4 ++-- projects/fenix/gradle-dependencies-list.txt | 2 +- projects/geckoview/gradle-dependencies-list.txt | 2 +- projects/tor-android-service/gradle-dependencies-list.txt | 2 +- projects/tor-onion-proxy-library/gradle-dependencies-list.txt | 2 +- 14 files changed, 12 insertions(+), 12 deletions(-)

1 0

[tor-browser-build/master] Bug 40283: Move all documentation to the doc directory
by sysrqb＠torproject.org 30 Apr '21

30 Apr '21

commit 8345837ad4bb81f619fee93bb81dfdc46ceb06d4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 20 18:26:14 2021 +0200 Bug 40283: Move all documentation to the doc directory --- README | 7 +++---- README.BUILD_ERRORS => doc/BUILD_ERRORS.txt | 0 README.HACKING => doc/HACKING.txt | 0 README.MAKEFILE => doc/MAKEFILE.txt | 0 .../common => doc}/how-to-create-gradle-dependencies-list.txt | 0 {projects/common => doc}/how-to-update-glean-parser.txt | 0 doc/rbm | 1 + projects/android-components/gradle-dependencies-list.txt | 2 +- projects/application-services/gradle-dependencies-list.txt | 2 +- projects/common/gen_gradle_deps_file.sh | 4 ++-- projects/fenix/gradle-dependencies-list.txt | 2 +- projects/geckoview/gradle-dependencies-list.txt | 2 +- projects/tor-android-service/gradle-dependencies-list.txt | 2 +- projects/tor-onion-proxy-library/gradle-dependencies-list.txt | 2 +- 14 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README b/README index 1582743..5407b0c 100644 --- a/README +++ b/README @@ -212,20 +212,19 @@ with the following command: Common Build Errors ------------------- -You can look at the README.BUILD_ERRORS file for a list of common build +You can look at the file doc/BUILD_ERRORS.txt for a list of common build errors and their solutions. Hacking on the Tor Browser build -------------------------------- -The file README.HACKING tries to list the main things to know when +The file doc/HACKING.txt tries to list the main things to know when making changes to the Tor Browser build. Description of makefile rules ----------------------------- -You can find a description of the Makefile rules in the README.MAKEFILE -file. +You can find a description of the Makefile rules in the file doc/MAKEFILE.txt. diff --git a/README.BUILD_ERRORS b/doc/BUILD_ERRORS.txt similarity index 100% rename from README.BUILD_ERRORS rename to doc/BUILD_ERRORS.txt diff --git a/README.HACKING b/doc/HACKING.txt similarity index 100% rename from README.HACKING rename to doc/HACKING.txt diff --git a/README.MAKEFILE b/doc/MAKEFILE.txt similarity index 100% rename from README.MAKEFILE rename to doc/MAKEFILE.txt diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/doc/how-to-create-gradle-dependencies-list.txt similarity index 100% rename from projects/common/how-to-create-gradle-dependencies-list.txt rename to doc/how-to-create-gradle-dependencies-list.txt diff --git a/projects/common/how-to-update-glean-parser.txt b/doc/how-to-update-glean-parser.txt similarity index 100% rename from projects/common/how-to-update-glean-parser.txt rename to doc/how-to-update-glean-parser.txt diff --git a/doc/rbm b/doc/rbm new file mode 120000 index 0000000..aaaec74 --- /dev/null +++ b/doc/rbm @@ -0,0 +1 @@ +../rbm/doc \ No newline at end of file diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index ab3da10..1ae9cb9 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -1,4 +1,4 @@ -# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt +# On how to update dependencies see doc/how-to-create-gradle-dependencies-list.txt # Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url d1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d | https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/ac… diff --git a/projects/application-services/gradle-dependencies-list.txt b/projects/application-services/gradle-dependencies-list.txt index bd001d9..8686f74 100644 --- a/projects/application-services/gradle-dependencies-list.txt +++ b/projects/application-services/gradle-dependencies-list.txt @@ -1,4 +1,4 @@ -# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt +# On how to update dependencies see doc/how-to-create-gradle-dependencies-list.txt # Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url d1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d | https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/ac… diff --git a/projects/common/gen_gradle_deps_file.sh b/projects/common/gen_gradle_deps_file.sh index 99d0517..3ea8f16 100755 --- a/projects/common/gen_gradle_deps_file.sh +++ b/projects/common/gen_gradle_deps_file.sh @@ -32,7 +32,7 @@ # Usage: # 1) Point to a log file with all the dependency download attempts (for its -# generation see: projects/common/how-to-create-gradle-dependencies-list.txt) +# generation see: doc/how-to-create-gradle-dependencies-list.txt) # 2) Double-check that you get the same SHA-256 sums when downloaded from a # different network location. E.g. by using `torsocks` with this script after # having made a copy of `gradle-dependencies-list.txt` from 1) and comparing @@ -57,7 +57,7 @@ do done < dl-attempts # Step 3: Add the header at the beginning of the final dependency file. -echo "# On how to update dependencies see projects/common/how-to-create-gradle\ +echo "# On how to update dependencies see doc/how-to-create-gradle\ -dependencies-list.txt" > gradle-dependencies-list.txt echo "# Don't forget to update var/gradle_dependencies_version when modifying \ this file" >> gradle-dependencies-list.txt diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index 1cbaeee..a172735 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -1,4 +1,4 @@ -# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt +# On how to update dependencies see doc/how-to-create-gradle-dependencies-list.txt # Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url 1996c36d3d2d62db5020b8ec634b5f854b1a698960c3552e1a00c69221baeabe | https://dl.google.com/dl/android/maven2/androidx/activity/activity-ktx/1.1.… diff --git a/projects/geckoview/gradle-dependencies-list.txt b/projects/geckoview/gradle-dependencies-list.txt index f429a3a..1d73d70 100644 --- a/projects/geckoview/gradle-dependencies-list.txt +++ b/projects/geckoview/gradle-dependencies-list.txt @@ -1,4 +1,4 @@ -# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt +# On how to update dependencies see doc/how-to-create-gradle-dependencies-list.txt # Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url 857db5645aaefbd7fbe9ba6454b072bc0518ebaba08a93d5eae89a9850e949c4 | https://jcenter.bintray.com/com/getkeepsafe/dexcount/dexcount-gradle-plugin… diff --git a/projects/tor-android-service/gradle-dependencies-list.txt b/projects/tor-android-service/gradle-dependencies-list.txt index 9adfa6b..5109de6 100644 --- a/projects/tor-android-service/gradle-dependencies-list.txt +++ b/projects/tor-android-service/gradle-dependencies-list.txt @@ -1,4 +1,4 @@ -# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt +# On how to update dependencies see doc/how-to-create-gradle-dependencies-list.txt # Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url 3a616a32f433e9e23f556b38575c31b013613d3ae85206263b7625fe1f4c151a | https://dl.google.com/dl/android/maven2/android/arch/core/common/1.1.1/comm… diff --git a/projects/tor-onion-proxy-library/gradle-dependencies-list.txt b/projects/tor-onion-proxy-library/gradle-dependencies-list.txt index 1612a54..5260377 100644 --- a/projects/tor-onion-proxy-library/gradle-dependencies-list.txt +++ b/projects/tor-onion-proxy-library/gradle-dependencies-list.txt @@ -1,4 +1,4 @@ -# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt +# On how to update dependencies see doc/how-to-create-gradle-dependencies-list.txt # Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url 3a616a32f433e9e23f556b38575c31b013613d3ae85206263b7625fe1f4c151a | https://dl.google.com/dl/android/maven2/android/arch/core/common/1.1.1/comm…

1 0

[tor-browser-build/master] Bug 40293: Patch app-services' vendored uniffi_bindgen
by boklm＠torproject.org 29 Apr '21

29 Apr '21

commit a612f504aafd18c3356cbfec20f3f5dfcfc2497f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 28 19:38:39 2021 +0000 Bug 40293: Patch app-services' vendored uniffi_bindgen --- ...niverse-of-known-types-in-an-ordered-BTre.patch | 51 ++++++++++++++++++++++ projects/application-services/build | 9 ++++ projects/application-services/config | 1 + 3 files changed, 61 insertions(+) diff --git a/projects/application-services/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch b/projects/application-services/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch new file mode 100644 index 0000000..947b2f6 --- /dev/null +++ b/projects/application-services/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch @@ -0,0 +1,51 @@ +From 4b9826025ac3242580efd7549d9b55d4466112e3 Mon Sep 17 00:00:00 2001 +From: Matthew Finkel <sysrqb(a)torproject.org> +Date: Wed, 28 Apr 2021 18:38:47 +0000 +Subject: [PATCH] Store the universe of known types in an ordered BTreeSet + (#374) + +The set of types is used in multiple places during FFI creation. When +the data structure does not guarantee the order of elements, such as +HashSet, the resulting generated source code is not deterministic. Using +a BTreeSet resolves this issue by providing a well-defined element order +over which the the set may be iterated. +--- + uniffi_bindgen/src/interface/types/mod.rs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/uniffi_bindgen/src/interface/types/mod.rs b/uniffi_bindgen/src/interface/types/mod.rs +index c4b0094..670b4bb 100644 +--- a/uniffi_bindgen/src/interface/types/mod.rs ++++ b/uniffi_bindgen/src/interface/types/mod.rs +@@ -21,7 +21,7 @@ + //! about how these API-level types map into the lower-level types of the FFI layer as represented + //! by the [`ffi::FFIType`] enum, but that's a detail that is invisible to end users. + +-use std::{collections::hash_map::Entry, collections::HashMap, collections::HashSet}; ++use std::{collections::hash_map::Entry, collections::BTreeSet, collections::HashMap}; + + use anyhow::{bail, Result}; + +@@ -35,7 +35,7 @@ pub(super) use resolver::{resolve_builtin_type, TypeResolver}; + /// Represents all the different high-level types that can be used in a component interface. + /// At this level we identify user-defined types by name, without knowing any details + /// of their internal structure apart from what type of thing they are (record, enum, etc). +-#[derive(Debug, Clone, Eq, PartialEq, Hash)] ++#[derive(Debug, Clone, Eq, PartialEq, Hash, Ord, PartialOrd)] + pub enum Type { + // Primitive types. + UInt8, +@@ -159,8 +159,8 @@ impl Into<FFIType> for &Type { + pub(crate) struct TypeUniverse { + // Named type definitions (including aliases). + type_definitions: HashMap<String, Type>, +- // All the types in the universe, by canonical type name. +- all_known_types: HashSet<Type>, ++ // All the types in the universe, by canonical type name, in a well-defined order. ++ all_known_types: BTreeSet<Type>, + } + + impl TypeUniverse { +-- +2.25.1 + diff --git a/projects/application-services/build b/projects/application-services/build index 40001cd..b22b4c7 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -49,6 +49,15 @@ directory = "/var/tmp/build/application-services/vendor" offline=true EOF +# Bug 40293: Patch vendored uniffi_bindgen. +pushd /var/tmp/build/application-services/vendor/ +patch -p1 < $rootdir/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch +# Update the expected checksum in the vendored source. +sed -i \ + 's/e39e61458d0d28c2b3425852c8a55625cc185ce806fbc7c0c6682f8cc93dec8d/0909e5214eedf1f2e709909176b1cbda39887002b26388535c3bc551fb04da1b/' \ + uniffi_bindgen/.cargo-checksum.json +popd + patch -p1 < $rootdir/update-cargo-lock.patch cd components/external/nimbus-sdk patch -p1 < $rootdir/viaduct-workaround.patch diff --git a/projects/application-services/config b/projects/application-services/config index 456ce87..32aa7ec 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -92,6 +92,7 @@ input_files: - filename: update-cargo-lock.patch - filename: gen_gradle_deps_file.sh enable: '[% c("var/fetch_gradle_dependencies") %]' + - filename: 0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch steps: list_toolchain_updates:

1 0

[tor-browser-build/master] Pick up fixes for rbm#40020 and rbm#40026
by gk＠torproject.org 26 Apr '21

26 Apr '21

commit 51b056d1e4159f5f2a297ea35b6cf00fef3ea6d7 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 26 16:24:58 2021 +0000 Pick up fixes for rbm#40020 and rbm#40026 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 4072294..ac75418 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 407229448b4e714b4761a1a4f73208170671087a +Subproject commit ac7541882a965a14107b7b7016f341605f405267

1 0

[rbm/master] Bug 40020: Set origin_step in project_step_config and build_run
by gk＠torproject.org 26 Apr '21

26 Apr '21

commit 80a3350a52d66e95684e351ec925ad3dfa93d691 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 21 17:37:05 2021 +0200 Bug 40020: Set origin_step in project_step_config and build_run --- doc/rbm_input_files.asc | 6 ++++-- doc/rbm_templates.asc | 4 +++- lib/RBM.pm | 18 +++++++++--------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/doc/rbm_input_files.asc b/doc/rbm_input_files.asc index 55aaebf..abe366b 100644 --- a/doc/rbm_input_files.asc +++ b/doc/rbm_input_files.asc @@ -70,12 +70,14 @@ project:: of this project. You can add config options such as +version+, +git_hash+ or +target+ to configure the build. The command line options are not forwarded. The name of the current project is - available to that other project in the +origin_project+ option. + available to that other project in the +origin_project+ option, + and the current step in the +origin_step+ option. pkg_type:: When the input file is an other project, this option can be used to select a different type of build (which we call a step). - This is equivalent to the --step command line option. + This is equivalent to the --step command line option. The + previous step is available in the +origin_step+ option. target:: An array defining the build targets for the selected project. If this diff --git a/doc/rbm_templates.asc b/doc/rbm_templates.asc index 4c1a619..200043f 100644 --- a/doc/rbm_templates.asc +++ b/doc/rbm_templates.asc @@ -82,7 +82,9 @@ pc:: used in this lookup. The current +target+ is used, unless an other +target+ option is defined in the options argument. The current project name is available to the requested option in - the +origin_project+ option. + the +origin_project+ option. The current +step+ is used, unless + an other +step+ option is defined in the options argument. The + previous step is available in the +origin_step+ option. project:: The name of the project for which we are processing a template. diff --git a/lib/RBM.pm b/lib/RBM.pm index 57b5dde..1fadf52 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -253,16 +253,15 @@ sub project_config { } sub project_step_config { - my $run_save = $config->{run}; - my $step_save = $config->{step}; - if ($_[2] && $_[2]->{step}) { - $config->{step} = $_[2]->{step}; - } + my ($run_save, $step_save, $origin_step_save) = + ($config->{run}, $config->{step}, $config->{origin_step}); + $config->{origin_step} = $config->{step}; + $config->{step} = $_[2]->{step} if $_[2]->{step}; $config->{run} = { target => $_[2]->{target} }; $config->{run}{target} //= $run_save->{target}; my $res = project_config(@_); - $config->{run} = $run_save; - $config->{step} = $step_save; + ($config->{run}, $config->{step}, $config->{origin_step}) = + ($run_save, $step_save, $origin_step_save); return $res; } @@ -1021,7 +1020,8 @@ sub log_end_time { sub build_run { my ($project, $script_name, $options) = @_; - my $old_step = $config->{step}; + my ($old_step, $old_origin_step) = ($config->{step}, $config->{origin_step}); + $config->{origin_step} = $config->{step}; $config->{step} = $script_name; $options //= {}; my $error; @@ -1185,7 +1185,7 @@ sub build_run { $error ||= "Error finishing remote"; } } - $config->{step} = $old_step; + ($config->{step}, $config->{origin_step}) = ($old_step, $old_origin_step); chdir $old_cwd; exit_error $error if $error; }

1 0