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

[tor-browser/tor-browser-78.2.0esr-10.0-1] Bug 1650281 - P2: Make sure `gCombinedSizes` won't be underflowed r=gerald
by gk＠torproject.org 03 Sep '20

03 Sep '20

commit 965a049f6bb123f384e72029feded2550f20027d Author: Chun-Min Chang <chun.m.chang(a)gmail.com> Date: Tue Jul 21 23:39:14 2020 +0000 Bug 1650281 - P2: Make sure `gCombinedSizes` won't be underflowed r=gerald In any case, `gCombinedSizes` should be larger than or equal to the buffer within `MemoryClockCache`. Differential Revision: https://phabricator.services.mozilla.com/D84274 --- dom/media/MemoryBlockCache.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dom/media/MemoryBlockCache.cpp b/dom/media/MemoryBlockCache.cpp index bf073e6769d0..2848a3f3812c 100644 --- a/dom/media/MemoryBlockCache.cpp +++ b/dom/media/MemoryBlockCache.cpp @@ -52,6 +52,7 @@ MemoryBlockCache::MemoryBlockCache(int64_t aContentLength) } MemoryBlockCache::~MemoryBlockCache() { + MOZ_ASSERT(gCombinedSizes >= mBuffer.Length()); size_t sizes = static_cast<size_t>(gCombinedSizes -= mBuffer.Length()); LOG("~MemoryBlockCache() - destroying buffer of size %zu; combined sizes now " "%zu",

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] Merge branch 'bug_40109' into tor-browser-78.2.0esr-10.0-1
by gk＠torproject.org 03 Sep '20

03 Sep '20

commit 885968e7a8374d3215e48cd27621fa7928200a38 Merge: b1f49b0a36f1 965a049f6bb1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 09:36:50 2020 +0000 Merge branch 'bug_40109' into tor-browser-78.2.0esr-10.0-1 dom/media/MemoryBlockCache.cpp | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor-browser-spec/master] Merge branch !6 into master
by gk＠torproject.org 03 Sep '20

03 Sep '20

commit 62045ea62ab28d8b1e9c25b7dc2b5ebdb509e145 Merge: f857ef5 1b265d8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 08:04:26 2020 +0000 Merge branch !6 into master .../xxx-canvas-tainting-for-fp-resistance.txt | 134 +++++++++++++++++++++ 1 file changed, 134 insertions(+)

1 0

[tor-browser-spec/master] Bug 40003: Document the Canvas Breakage Ideas conversation from [tbb-dev]
by gk＠torproject.org 03 Sep '20

03 Sep '20

commit 1b265d8711626b6511e8ce4a3300360d873d8da7 Author: Sanketh Menda <sanketh(a)c1own.com> Date: Mon Aug 17 16:15:16 2020 -0400 Bug 40003: Document the Canvas Breakage Ideas conversation from [tbb-dev] --- .../xxx-canvas-tainting-for-fp-resistance.txt | 134 +++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/proposals/ideas/xxx-canvas-tainting-for-fp-resistance.txt b/proposals/ideas/xxx-canvas-tainting-for-fp-resistance.txt new file mode 100644 index 0000000..0c4fd17 --- /dev/null +++ b/proposals/ideas/xxx-canvas-tainting-for-fp-resistance.txt @@ -0,0 +1,134 @@ +Filename: xxx-canvas-tainting-for-fp-resistance.txt +Title: Canvas Tainting for Fingerprinting Resistance +Authors: David Fifield, Matthew Finkel, Sanketh Menda, and Tom Ritter +Created: 21-Aug-2020 +Status: Draft + +1. Motivation + + Canvas permissions currently break the following workflow: + 1. user uploads image + 2. website tries to display the image back to the user + 3. this image is white or noise (if canvas fuzzing is enabled.) + + Here are some instances of this breakage: + 1. Uploading images to WhatsApp Web: + https://bugzilla.mozilla.org/show_bug.cgi?id=1631673 + 2. Image cropping in Expensify: + https://bugzilla.mozilla.org/show_bug.cgi?id=1456378 + 3. Uploading images to Craigslist: + https://bugzilla.mozilla.org/show_bug.cgi?id=1573834 + + This workflow does not seem to be invading the user's privacy so it would be + nice to support it. Currently, to unbreak this functionality, the user has to + give full canvas permissions which may be abused by websites. + + This proposal specifies an approach towards allowing some use of the canvas + without sacrificing privacy. + +2. Proposal + +2.1 The Key Idea + + Keep track of whether the canvas is safe (in terms of fingerprintability) to + extract or not, and allow extractions if it is safe. + + This idea was first proposed by Gijs Kruitbosch [0] in analogy to canvas + tainting used to prevent cross-origin image loading [1]. + +2.2 Canvas Tainting for Fingerprinting Resistance + + We attach a state variable `isFPSafe` to the canvas, define three classes + of operations: safe, unsafe, and extraction, and when the canvas is + manipulated, we perform the following depending on whether the operation is + safe or not. + + ``` + if (safe operation) pass; + elif (unsafe operation) isFPSafe = false; + elif (extraction operation) { + if (isFPSafe) extract; + else return placeholder; + } + ``` + + See the canvas element section of the HTML spec [2] for details on canvas + operations. + +2.2.1 Safe Operations + + - `canvas.getContext`: returns the canvas object + - `canvas.drawImage` for user uploaded images: draws the given image onto the + canvas + + We hypothesize that allowing these operations unbreaks the aforementioned + workflow (see Research Question 1) and is safe (see Research Question 2). + + These operations are also probably safe: + - `canvas.getContextAttributes` + +2.2.2 Unsafe Operations + + All operations that have not been classified as safe (i.e., not listed in + Section 2.2.1) are considered unsafe. + +2.2.3 Extraction Operations + + - .toDataURL`: returns a dataURL of the canvas + - `canvas.toBlob`: returns a blob of the canvas + +3. Concerns + +3.1 Scaling inside drawImage + + The specification [3] does not specify how to scale images, so the scaling + algorithm may be implementation dependent and is a possible fingerprinting + vector. + +3.2 Image format encoding + + The specification [4] does not specify how to do image format encoding so it + may be implementation dependent and is a possible fingerprinting vector. + + Gómez-Boix, Laperdrix, and Baudry [3, p.314] noticed that compressing a canvas + to an image format adds entropy. However, in the case of user uploaded images, + this might be less of an issue (see Research Question 3.) + +3.2.1 `quality` levels + + `quality` levels add another layer of uncertainty to image format encoding as + they are not standardized [4]. + +3.2.1 Wide-gamut colors + + This does not seem to be in the HTML standard yet but it seems like WebKit and + Chrome already support it so it is worth looking into (see Research Question + 3). + + WebKit: https://github.com/whatwg/html/issues/299 + Chrome: https://github.com/whatwg/html/issues/4167 + +4. Research + + We would like to perform experiments to answer the following questions. + 1. Does this approach unbreak the motivating workflow? + 2. Are "safe operations" (the ones listed in 2.2.1) safe against + fingerprinting attacks? + 3. How bad are issues mentioned in the concerns? + +5. Acknowledgements + + We thank Alex Catarineu and Gijs Kruitbosch for insightful conversations, + and Georg Koppen for valuable comments on drafts of this document. + +6. References + +[0]: https://bugzilla.mozilla.org/show_bug.cgi?id=1631673#c8 +[1]: https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image +[2]: https://html.spec.whatwg.org/multipage/canvas.html +[3]: https://html.spec.whatwg.org/multipage/canvas.html#drawing-images +[4]: +https://html.spec.whatwg.org/multipage/canvas.html#serialising-bitmaps-to-a-file +[5]: Hiding in the Crowd: an Analysis of the Effectiveness of Browser +Fingerprinting at Large Scale. Gómez-Boix, Laperdrix, and Baudry. WWW '18. +https://doi.org/10.1145/3178876.3186097

1 0

[tor-browser-build/master] Bug 40058: Build Fenix with tor-android-service and topl
by gk＠torproject.org 02 Sep '20

02 Sep '20

commit 6bb6ec3650e28c07d9076ffa1f72099393f9e44a Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Aug 28 19:32:52 2020 +0200 Bug 40058: Build Fenix with tor-android-service and topl With this tor-onion-proxy-library and tor-android-service will build fat aars with all the archs we support. We copy those over the fenix/app/ folder so that the Fenix build system picks them up for the final apks. --- projects/fenix/build | 5 ++++ projects/fenix/config | 6 ++++- projects/fenix/gradle-dependencies-list.txt | 10 +++++--- projects/tor-android-service/build | 4 ++- projects/tor-android-service/config | 16 +++++++++++- projects/tor-onion-proxy-library/build | 38 ++++++++++++++++++----------- projects/tor-onion-proxy-library/config | 32 ++++++++++++++++++++++-- 7 files changed, 89 insertions(+), 22 deletions(-) diff --git a/projects/fenix/build b/projects/fenix/build index 9726bc4..fdc6499 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -24,6 +24,11 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd $builddir-[% c("version") %] + +# Move Android library dependencies so they will be included in the apk during the build +cp $rootdir/[% c('input_files_by_name/topl') %]/* app/ +cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ + [% IF c("var/fetch_gradle_dependencies") %] gradle --debug --no-daemon app:assemble[% c('build_flavor') %] -x lint [% ELSE %] diff --git a/projects/fenix/config b/projects/fenix/config index 2f8ae66..7a8b2f9 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -16,7 +16,7 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 1 + gradle_dependencies_version: 2 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 @@ -47,3 +47,7 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' + - project: tor-android-service + name: tor-android-service + - project: tor-onion-proxy-library + name: topl diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index 86c4be0..f8a97a9 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -462,6 +462,8 @@ f014af749024c57989ca2aa51b0a986f9d86d2669d074c1dee068a8f8da19562 | https://jcent 943e12b100627804638fa285805a0ab788a680266531e650921ebfe4621a8bfa | https://jcenter.bintray.com/javax/inject/javax.inject/1/javax.inject-1.pom b5e60cd8b7b5ff01ce4a74c5dd008f4fbd14ced3495d0b47b85cfedc182211f2 | https://jcenter.bintray.com/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/jax… 2092a7d8d9bc5698c59b094bdea46622915c48c83ae66d5b5ad549c7bf16155b | https://jcenter.bintray.com/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/jax… +ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0… +3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0… c83a9c71358d781539c34b38d76a88e3ec8e2d587c7f04b611acc9041919b310 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.aar aafe6935d6bedb89a6aa32563d441fbe305da1de193d6f71a45a0212acf9b756 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.pom 281440811268e65d9e266b3cc898297e214e04f09740d0386ceeb4a8923d63bf | https://jcenter.bintray.com/net/java/jvnet-parent/1/jvnet-parent-1.pom @@ -645,9 +647,11 @@ c0e82b220b0a52c71c7ca2a58c99a2530696c7b58b173052b9d48fe3efb10073 | https://jcent 0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b | https://jcenter.bintray.com/org/ow2/ow2/1.5/ow2-1.5.pom 6e58dad0b8565b95c6fb14b4bfbf570523d1c5290244cfb33822789fa53b1d25 | https://jcenter.bintray.com/org/python/jython-installer/2.7.1/jython-instal… 2a42db37f9a565f1baa833b7cb7e9f901bd9fd750d10b9bd7ca76b2385b22387 | https://jcenter.bintray.com/org/python/jython-installer/2.7.1/jython-instal… -baf3c7fe15fefeaf9e5b000d94547379dc48370f22a8797e239c127e7d7756ec | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.24/slf4j-api-1.7.24.jar -d7a15266d22fadc1c81bbc3b62637801d116e484eb6c831217dc36c537be48d2 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.24/slf4j-api-1.7.24.pom -36367d127a586d502b60bf54db2d7397ec94573620eff523873ec12a12e54839 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.24/slf4j-parent-1.7.… +fbd7b254e02d8aef60c418a5f0e14a783b38a16162caffb2d2a16ccd5d2c09b4 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.… +bd9b9cb1a3987b1427f7a18babe7f92078e32bbe2e1dca6dced00cc0e3a077a9 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.… +18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar +7cd9d7a0b5d93dfd461a148891b43509cf403a9c7f9fb49060d3554df1c81e1e | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom +18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.… b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom d3f7f09989d5b0ce5c4791818ef937ee7663f1e359c2ef2d312f938aad0763da | https://jcenter.bintray.com/org/yaml/snakeyaml/1.24/snakeyaml-1.24.jar diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 4fb41bc..df83673 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -17,7 +17,9 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # Replace pre-packaged tor library with the latest build rm -fR service/src/main/jniLibs/* -tar -C service/src/main -xf $rootdir/[% c('input_files_by_name/tor') %]/tor.tar.gz +[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] + tar -C service/src/main -xf $rootdir/[% c('input_files_by_name/tor-' _ arch) %]/tor.tar.gz +[% END -%] # Replace libraries with the config dependencies rm service/libs/* diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 1f833ba..e2bb2db 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -23,4 +23,18 @@ input_files: - project: tor-onion-proxy-library name: topl - project: tor - name: tor + name: tor-armv7 + target_prepend: + - torbrowser-android-armv7 + - project: tor + name: tor-aarch64 + target_prepend: + - torbrowser-android-aarch64 + - project: tor + name: tor-x86 + target_prepend: + - torbrowser-android-x86 + - project: tor + name: tor-x86_64 + target_prepend: + - torbrowser-android-x86_64 diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 3e02fb4..edeb8ae 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -23,20 +23,30 @@ patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch -# Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy -tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] - -# Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake -tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake') %] - -# Overwrite the obfs4proxy binary provided by Pluto and add Snowflake -for d in external/pluto/bin/*; do - cp obfs4proxy $d/ - cp snowflake-client $d/ -done - -rm obfs4proxy -rm snowflake-client +[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] + # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy + tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4-' _ arch) %] + + # Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake + tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake-' _ arch) %] + + # Overwrite the obfs4proxy binary provided by Pluto and add Snowflake + [% IF arch == "armv7" -%] + cp obfs4proxy external/pluto/bin/armeabi-v7a/ + cp obfs4proxy external/pluto/bin/armeabi/ + cp snowflake-client external/pluto/bin/armeabi-v7a/ + cp snowflake-client external/pluto/bin/armeabi/ + [% ELSIF arch == "aarch64" -%] + cp obfs4proxy external/pluto/bin/arm64-v8a/ + cp snowflake-client external/pluto/bin/arm64-v8a/ + [% ELSE -%] + cp obfs4proxy external/pluto/bin/[% arch %]/ + cp snowflake-client external/pluto/bin/[% arch %]/ + [% END -%] + + rm obfs4proxy + rm snowflake-client +[% END -%] # Build Android Libraries and Apps gradle --offline --no-daemon -P androidplugin=3.6.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 58aa4f6..671e988 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -20,9 +20,37 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - project: obfs4 - name: obfs4 + name: obfs4-armv7 + target_prepend: + - torbrowser-android-armv7 + - project: obfs4 + name: obfs4-aarch64 + target_prepend: + - torbrowser-android-aarch64 + - project: obfs4 + name: obfs4-x86 + target_prepend: + - torbrowser-android-x86 + - project: obfs4 + name: obfs4-x86_64 + target_prepend: + - torbrowser-android-x86_64 + - project: snowflake + name: snowflake-armv7 + target_prepend: + - torbrowser-android-armv7 + - project: snowflake + name: snowflake-aarch64 + target_prepend: + - torbrowser-android-aarch64 + - project: snowflake + name: snowflake-x86 + target_prepend: + - torbrowser-android-x86 - project: snowflake - name: snowflake + name: snowflake-x86_64 + target_prepend: + - torbrowser-android-x86_64 - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]'

1 0

[tor-browser-build/master] Downgrade NSS and SQLCipher for 61.0.10
by sysrqb＠torproject.org 01 Sep '20

01 Sep '20

commit 933d4b890546abc07729e455c3074783c5da62f2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 21 20:14:00 2020 +0000 Downgrade NSS and SQLCipher for 61.0.10 We are about to switch to a previous `application-services` version which is the proper dependency for the `android-components` and `fenix` commits we'll use. However, that version requires an NSS and SQLCipher downgrade. The code that landed previously was based on a later `application-services` commit in the assumption that we'll use a tag which includes those changes by the time we would wire all our requirements for `fenix` together. --- projects/nss/config | 6 +++--- projects/sqlcipher/config | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/nss/config b/projects/nss/config index b260e77..2b5b4d3 100644 --- a/projects/nss/config +++ b/projects/nss/config @@ -2,8 +2,8 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' # The required versions for application-services can be found at the respective # commit in libs/build-all.sh -version: 3.54 -nspr_version: 4.26 +version: 3.53.1 +nspr_version: 4.25 var: container: use_container: 1 @@ -19,7 +19,7 @@ input_files: project: ninja - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version") | replace("\\.", "_") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz' name: nss - sha256sum: e0e81f0ff264d810f130d3cd9334722f7f883c752430483131d1ca5ac62d3f70 + sha256sum: 132ce527f3963e3ae5be3337ed4e1099e160b9402be177b5704de3ed2f5271d2 - filename: configure.patch - filename: config.patch - filename: bug_13028.patch diff --git a/projects/sqlcipher/config b/projects/sqlcipher/config index fb4ae3a..da78dcd 100644 --- a/projects/sqlcipher/config +++ b/projects/sqlcipher/config @@ -2,7 +2,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' # The required versions for application-services can be found at the respective # commit in libs/build-all.sh -version: 4.4.0 +version: 4.3.0 var: container: use_container: 1 @@ -18,4 +18,4 @@ input_files: project: nss - URL: 'https://github.com/sqlcipher/sqlcipher/archive/v[% c("version") %].tar.gz' name: sqlcipher - sha256sum: 0924b2ae1079717954498bda78a30de20ce2a6083076b16214a711567821d148 + sha256sum: fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f

1 0

[tor-browser-build/master] Bug 34101: Add missing dependencies manually
by sysrqb＠torproject.org 01 Sep '20

01 Sep '20

commit f33d3e07b0a183d7cfd1fad662c884e98e466210 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 24 07:31:26 2020 +0000 Bug 34101: Add missing dependencies manually For yet unknown reasons not all dependencies which we need get exposed via Gradle's --debug flag. We therefore add them manually, so we can use them with mavenLocal() in our offline builds. tor-browser-build#40056 is the ticket for resolving that problem. --- projects/application-services/gradle-dependencies-list.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/application-services/gradle-dependencies-list.txt b/projects/application-services/gradle-dependencies-list.txt index dc57592..ffad4f0 100644 --- a/projects/application-services/gradle-dependencies-list.txt +++ b/projects/application-services/gradle-dependencies-list.txt @@ -3,15 +3,18 @@ sha256sum | url d1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d | https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/ac… 27a4be7462629c312da0b831a0978d2076fc34074145fb61dd4e86d7c8469b82 | https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/ac… +d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692 | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.… 2e9372ba7780ef44952adbf86b66e1f08682c1e5277c926185f6564a13799efe | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.… 8d7299bca44cb3bdf17f5595766acbf459fc81fee223e8686cc6acd3a42ab5c0 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/… 340d617121f8ef8e02a6680c8f357aa3e542276d0c8a1cdcb6fd98984b2cb7b9 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/… 19944d32b46551a17c347e21894b95837fbd7baaafc9e2082794344f222f7361 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resour… 046011e16cb01b6f14842565661551110ef1b6427483f5d9068493f4c49690f2 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resour… +fe1237bf029d063e7f29fe39aeaf73ef74c8b0a3658486fc29d3c54326653889 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.… 83bbb3960eaabc600ac366c94cb59414e441532a1d6aa9388b0b8bfface5cf01 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.… dd77615bd3dd275afb11b62df25bae46b10b4a117cd37943af45bdcbf8755852 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1… c0c4ed0160cd2ca18390015de8b392b697c173327c6b2c0947d4e62f6958c05d | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1… a7913a5275ad68e555d2612ebe8c14c367b153e14ca48a1872a64899020e54ef | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.… +632a0e5407461de774409352940e292a291037724207a787820c77daf7d33b72 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.… 67e9066ca4acfdc6e3cc508293c31ba0398057ff118e4f70b1e1813c9a3456d1 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.… 524b8b88ceb6a74a7e44e6b567a135660f211799904cb218bfee5be1166820b2 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0… 3d1f4e37b77dd92353879a040ab4ce2f706798bcbdf066147491c3642b3f79a6 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0… @@ -32,6 +35,7 @@ a14c8b8f2153f128e800fbd266a6beab1c283982a29ec570d2cc05d307d81496 | https://dl.go ef78eb27ac02ddf3545d5f8a3857c73a2837a01853f8d5fcf77251011db52544 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fr… 33193135a64fe21fa2c35eec6688f1a76e512606c0fc83dc1b689e37add7732a | https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/… 0ddc07cc39699f48ecd9ec894b5830c0f09e22e82959294edf37217224c88b7b | https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/… +76db6be533bd730fb361c2feb12a2c26d9952824746847da82601ef81f082643 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common… 692c2a60437a95220c8fbb6e8943196f255f535d1a7c58714e6c46530782f276 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common… bd53c64b038585215b4959c1a388437a3ad525608a31c58e4283c3e371727d4d | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… 510e33b8b6ca33d2fcb3b7615a4528e338b438de398f3ee8de119c26508a5fdd | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… @@ -49,6 +53,7 @@ ba55fb7ac1b2828d5327cda8acf7085d990b2b4c43ef336caa67686249b8523d | https://dl.go 29aa72e339c3e227e74c973a4c85c7b79c926f0d37b61ed94f4d99a137c9a4b4 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… 11f735cb3b55c458d470bed9e25254375b518b4b1bad6926783a7026db0f5025 | https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader… c978d550808b47434aa49a63164110a50b55b0bcc6160a93a2e37d5110df8c5e | https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader… +388d33ff503d8c3d010a5dd7ecfe0e44bb19afcc28fd1e6336755d00ef7ad3c6 | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.1.0/roo… 831d4e3c7e5481e73f37c1cb2e08f24e27306976d3c83916f89b00b28857998b | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.1.0/roo… 175efd0a722810272098282819ebd52d6d0fa0aa5f9bfb25ac54268e1daa041e | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.1.0/ro… ce8566bc008cc900268c07a4acb8840e4b54cdc404f73081a0986906f205fd7c | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.1.0/ro… @@ -175,6 +180,7 @@ bd99d75006131ae25c9860a1d63e84e36371f112fdb0c2fe3d5d6ab38e9eb271 | https://jcent f8698ab46ca996ce889c1afc8ca4f25eb8ac6b034dc898d4583742360016cc04 | https://jcenter.bintray.com/com/google/guava/guava-parent/26.0-android/guav… 317e88291262e0cf2805e956c18850f1d4565c85c2e1112f5d9d08ab1732e696 | https://jcenter.bintray.com/com/google/guava/guava-parent/27.0.1-jre/guava-… d3610165c6de2b4d8d6418487717b63c52b5a39c5e35a553e24873ecb60e0628 | https://jcenter.bintray.com/com/google/guava/guava-parent/27.1-jre/guava-pa… +e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069 | https://jcenter.bintray.com/com/google/guava/listenablefuture/1.0/listenabl… 53873caf26bc1ed8a567ea6c939ab2aaa3f47a5e32d5cade95ddf5080d23238a | https://jcenter.bintray.com/com/google/guava/listenablefuture/1.0/listenabl… b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99 | https://jcenter.bintray.com/com/google/guava/listenablefuture/9999.0-empty-… 18d4b1db26153d4e55079ce1f76bb1fe05cdb862ef9954a88cbcc4ff38b8679b | https://jcenter.bintray.com/com/google/guava/listenablefuture/9999.0-empty-… @@ -372,9 +378,11 @@ f6837401cbd13a8a31f126a9e22430ab9861602d91a4c310a47805453690f76d | https://jcent ab2b2bd3304dcd40562a2930c53002b1e2d80fb21d0d9cc7d6448a83b9ae6b0b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.71/kotl… 51f7f966cd071ff412df49849bdd0a6a651f800c8816defaa29fcd106eedcdac | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-klib/1.3.71/ko… fae43f08052e63bf49cbcda0ade70c05381c4093521e20f31dd564947c1b7105 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-klib/1.3.71/ko… +cedeb99d252f51190e4cbf84e788fbe6d64e42216c42786aac029bfc4f1e2d65 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-androi… fa64623d47d5f03553b4b9dc7902d30943c65c334487029681a03045fb13172c | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-androi… 7177ed4629704537e0252537629886f5409526ecd041d8d8e308e20624b14394 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… 6f7523ea8a56d7f12d11a004cfe5a4577bfba3ed6c84cc5ac48b72d54975552c | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… +6d3ddc759cd2094b1495198a8501e22a51c4c3d011ec801f5fc45a2cd25b8f11 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… f4a306487c17b8cdca8d3e5da50369a2e5ac7c665200516d427726dff5a56f92 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… 1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-… 5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…

1 0

[tor-browser-build/master] Update our Gradle dependencies creation instructions
by sysrqb＠torproject.org 01 Sep '20

01 Sep '20

commit 1f4a684fb6cb1c83a092171bd529259c896daa6b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 24 08:27:19 2020 +0000 Update our Gradle dependencies creation instructions --- projects/common/how-to-create-gradle-dependencies-list.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt index 3ecdbf6..3435c31 100644 --- a/projects/common/how-to-create-gradle-dependencies-list.txt +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -3,8 +3,9 @@ If additional Android dependencies are required by the project's build, then the Gradle build will fail due to missing dependencies. To find out what the missing dependencies are take the following steps. -When calling gradle in the project's build script replace the `--offline` flag -with `--debug` and remove any `-Dmaven.repo.local` arguments. +If the dependencies for `application-services`, `android-components`, or `fenix` +are needed, set the `fetch_gradle_dependencies` flag in their `config` files to +`1`. For the firefox project, comment out the following line in the project's build file: @@ -14,7 +15,10 @@ Also modify the gradle flags to include the debug option so the download logs wi export GRADLE_FLAGS="--no-daemon --debug" -Then allow network access during the build by setting +Otherwise, when calling gradle in the project's build script replace the +`--offline` flag with `--debug` and remove any `-Dmaven.repo.local` arguments. + +Finally, allow network access during the build by setting `var/container/disable_network/build` to `0` in rbm.conf, and rerun the build. Dependent artifacts will show up as downloads in the logs. You can pull out @@ -26,4 +30,4 @@ list script in the tools directory: Copy the resulting `gradle-dependencies-list.txt` over the one in the respective project. Then, in the project's config file, increment the `var/gradle_dependencies_version` and make sure to restore the project's build -file back to original. +file back to original or set `fetch_gradle_dependencies` to `0` again.

1 0

[tor-browser-build/master] Bug 40061: Remove Android SDK 28
by sysrqb＠torproject.org 01 Sep '20

01 Sep '20

commit e596732bca82b78e3f5182595f8cffcd0b9b2024 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 28 07:25:31 2020 +0000 Bug 40061: Remove Android SDK 28 --- projects/android-toolchain/build | 10 +++------- projects/android-toolchain/config | 6 +----- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 0619ce7..74a49f1 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -38,8 +38,9 @@ unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME mkdir -p build-tools/[% c("version") %] mv $android_release_dir/* build-tools/[% c("version") %] -# Fenix has not updated to build-tools 29 yet, bundle therefore build-tools 28, -# too. +# Apart from GeckoView all other projects do still need build-tools 28.0.3 as +# they are using the Gradle plugin 3.2.1 - 3.6.0 without specifying +# `buildToolsVersion`. unzip -qq $HOME/[% c("input_files_by_name/build_tools_old") %] -d $SDK_HOME mkdir -p build-tools/[% c("version_old") %] mv $android_release_dir_old/* build-tools/[% c("version_old") %] @@ -48,11 +49,6 @@ unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME mkdir -p platforms/android-[% c("var/android_api_level") %] mv $android_release_dir/* platforms/android-[% c("var/android_api_level") %] -# Fenix has not updated to Android 29 yet, bundle therefore Android 28, too. -unzip -qq $HOME/[% c("input_files_by_name/platform_old") %] -d $SDK_HOME -mkdir -p platforms/android-[% c("var/android_api_level_old") %] -mv $android_release_dir_old/* platforms/android-[% c("var/android_api_level_old") %] - unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME # That's a quirk required by GeckoView but let's have it here instead of in the diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index c01ca91..9fd997d 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("version_old") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: 29.0.3 version_old: 28.0.3 var: @@ -22,7 +22,6 @@ var: export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle_version") %]/bin google_repo: https://dl.google.com/android/repository android_api_level: 29 - android_api_level_old: 28 android_platform_revision: 04 android_ndk_version: 21 android_ndk_version_old: 20 @@ -41,9 +40,6 @@ input_files: - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") %]_r[% c("var/android_platform_revision") %].zip' name: platform sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69 - - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_old") %]_r[% c("var/android_platform_revision") %].zip' - name: platform_old - sha256sum: 967f8ca99b71d337aa9c7781f9d65dd8110bf5c4746f44304047bf71b20d0ded # ./mach bootstrap is fetching the latest version, so it does not seem to # matter which particular version we are using. Pin to the one fitting best to # SDK version/build-tools version.

1 0

[tor-browser-build/master] Pick up tor-android-service#40001
by sysrqb＠torproject.org 01 Sep '20

01 Sep '20

commit 3dad656fd01c4fcf3c4168e4dde5babeb6c86e79 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 1 07:28:40 2020 +0000 Pick up tor-android-service#40001 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index e4419fb..1f833ba 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 8f40b9b2a6f4f8c05b84c5a0fec26a4b7ad77098 +git_hash: 68b91198066cf89a3664295116b5249b499461d6 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0